-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Stefan Dösinger pisze:
> Am Donnerstag, 13. März 2008 10:19:36 schrieb Artur Szymiec:
>> This is a corrected patch. The uuid is common to dx8 and dx9
>> since the UUID is generated inside wined3d.
> Yes, that looks reasonable. Only two small issues:
>
>> +/* Fixes BUG 11897 */
> That's not really needed, specifying a GUID is correct even if it
> wouldn't fix a bug report.
>
> Also, please attach the patch as an extra file to the mail, if you
> inline it like you did in your last mails it most likely suffers
> from line wrapping and can't be applied
Thank you very much for help Stefan !
Best regards
Artur
- --
- --------------------------------------------------------------------------
Registered User No 397465
Linux Debian 2.6.24.2 AMD Athlon(tm) 64 X2 Dual Core 5000+
Conquer your Desktop! http://www.kde.org/trykde/
Reclaim Your Inbox! http://www.mozilla.org/products/thunderbird/
- --------------------------------------------------------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFH2RhMbB2ld6kq2MsRAsltAJ0eZzgQoJlZ1jgPc/8YPHoMJyP1MwCg2c+Z
bDKy0V+CgkyilcTdduIKUbQ=
=TvMs
-----END PGP SIGNATURE-----
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 04af700..2a14979 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -36,6 +36,14 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d);
WINE_DECLARE_DEBUG_CHANNEL(d3d_caps);
+/* The d3d device ID */
+const GUID IID_D3DDEVICE_D3DUID = {
+ 0xaeb2cdd4,
+ 0x6e41,
+ 0x43ea,
+ { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 }
+};
+
/* Extension detection */
static const struct {
const char *extension_string;
@@ -1594,8 +1602,8 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad
*(pIdentifier->DeviceId) = Adapters[Adapter].gl_info.gl_card;
*(pIdentifier->SubSysId) = 0;
*(pIdentifier->Revision) = 0;
-
- /*FIXME: memcpy(&pIdentifier->DeviceIdentifier, ??, sizeof(??GUID)); */
+ memcpy(pIdentifier->DeviceIdentifier,&IID_D3DDEVICE_D3DUID,sizeof(GUID));
+
if (Flags & WINED3DENUM_NO_WHQL_LEVEL) {
*(pIdentifier->WHQLLevel) = 0;
} else {
