December 2009 - Wine-Commits

Rob Shearman : inetmib1: Fix off-by-one error in findNextOidInTable.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: d0f93223b1ec6cb94bf57bfb97540fe908cabf71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f93223b1ec6cb94bf57bfb9… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 2 14:55:10 2009 +0000 inetmib1: Fix off-by-one error in findNextOidInTable. index is 1-based, so take that into account when calculating the pointer to pass into the compare function. --- dlls/inetmib1/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index b0ff812..1e56710 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -393,7 +393,7 @@ static UINT findNextOidInTable(AsnObjectIdentifier *oid, * an infinite loop. */ for (++index; index <= table->numEntries && compare(key, - &table->entries[tableEntrySize * index]) == 0; ++index) + &table->entries[tableEntrySize * (index - 1)]) == 0; ++index) ; } HeapFree(GetProcessHeap(), 0, key);

1 0

Rob Shearman : advapi32: Fix memory leaks in security tests.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 190a11ddb6ca6f55c7d68bf95ede376991c8ffba URL: http://source.winehq.org/git/wine.git/?a=commit;h=190a11ddb6ca6f55c7d68bf95… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 2 14:32:07 2009 +0000 advapi32: Fix memory leaks in security tests. --- dlls/advapi32/tests/security.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index cce2a27..001b909 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -256,6 +256,7 @@ static void test_sid(void) ok(pisid->SubAuthority[0] == 21, "Invalid subauthority 0 - expceted 21, got %d\n", pisid->SubAuthority[0]); ok(pisid->SubAuthority[3] == 4576, "Invalid subauthority 0 - expceted 4576, got %d\n", pisid->SubAuthority[3]); LocalFree(str); + LocalFree(psid); for( i = 0; i < sizeof(refs) / sizeof(refs[0]); i++ ) { @@ -1248,12 +1249,12 @@ static void test_token_attr(void) DWORD DomainLength = 255; TCHAR Domain[255]; SID_NAME_USE SidNameUse; - pConvertSidToStringSidA(Groups->Groups[i].Sid, &SidString); Name[0] = '\0'; Domain[0] = '\0'; ret = LookupAccountSid(NULL, Groups->Groups[i].Sid, Name, &NameLength, Domain, &DomainLength, &SidNameUse); if (ret) { + pConvertSidToStringSidA(Groups->Groups[i].Sid, &SidString); trace("%s, %s\\%s use: %d attr: 0x%08x\n", SidString, Domain, Name, SidNameUse, Groups->Groups[i].Attributes); LocalFree(SidString); } @@ -1488,6 +1489,8 @@ static void test_CreateWellKnownSid(void) ok(memcmp(buf2, sid_buffer, cb) == 0, "SID create with domain is different than without (%d)\n", i); } } + + LocalFree(domainsid); } static void test_LookupAccountSid(void) @@ -2773,7 +2776,7 @@ static void test_ConvertStringSecurityDescriptor(void) ret = pConvertStringSecurityDescriptorToSecurityDescriptorW( Blank, SDDL_REVISION_1, &pSD, NULL); ok(ret, "ConvertStringSecurityDescriptorToSecurityDescriptor failed with error %d\n", GetLastError()); - + LocalFree(pSD); } static void test_ConvertSecurityDescriptorToString(void) @@ -2885,6 +2888,9 @@ static void test_ConvertSecurityDescriptorToString(void) CHECK_ONE_OF_AND_FREE("O:SYG:S-1-5-21-93476-23408-4576D:S:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)", /* XP */ "O:SYG:S-1-5-21-93476-23408-4576D:NO_ACCESS_CONTROLS:(AU;OICINPIOIDSAFA;CCDCLCSWRPRC;;;SU)(AU;NPSA;0x12019f;;;SU)" /* Vista */); } + + LocalFree(psid2); + LocalFree(psid); } static void test_SetSecurityDescriptorControl (PSECURITY_DESCRIPTOR sec)

1 0

Rob Shearman : advapi32: Don' t test the contents of memory outside of a valid block of memory.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 8bfc736561537cde05fa61f650be5c1b4afb229b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bfc736561537cde05fa61f65… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 2 14:22:11 2009 +0000 advapi32: Don't test the contents of memory outside of a valid block of memory. --- dlls/advapi32/tests/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 470164a..cce2a27 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3209,7 +3209,7 @@ static void test_GetSidSubAuthority(void) ok(*pGetSidSubAuthority(psid,1) == 93476,"GetSidSubAuthority gave %d expected 93476\n",*pGetSidSubAuthority(psid,1)); ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); SetLastError(0xbebecaca); - todo_wine ok(*pGetSidSubAuthority(psid,4) == 0,"GetSidSubAuthority gave %d,expected 0\n",*pGetSidSubAuthority(psid,4)); + ok(pGetSidSubAuthority(psid,4) != NULL,"Expected out of bounds GetSidSubAuthority to return a non-NULL pointer\n"); ok(GetLastError() == 0,"GetLastError returned %d instead of 0\n",GetLastError()); LocalFree(psid); }

1 0

Rob Shearman : msxml3: Fix double-free of BSTR in domdoc tests.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: 211e4fc0fe0c52236631576da1e187e2bdf32ba5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211e4fc0fe0c52236631576da… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 2 14:21:54 2009 +0000 msxml3: Fix double-free of BSTR in domdoc tests. Using the _bstr_ allocator adds the returned string to a cache, so the string shouldn't be freed with SysFreeString. Therefore, just replace the lone call to _bstr_ in this function by a straight call to SysAllocString. --- dlls/msxml3/tests/domdoc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index a5b207a..de78b65 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -209,6 +209,9 @@ static const CHAR szBasicTransformOutput[] = static const WCHAR szNonExistentFile[] = { 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0 }; +static const WCHAR szNonExistentAttribute[] = { + 'n','o','n','E','x','i','s','i','t','i','n','g','A','t','t','r','i','b','u','t','e',0 +}; static const WCHAR szDocument[] = { '#', 'd', 'o', 'c', 'u', 'm', 'e', 'n', 't', 0 }; @@ -1110,7 +1113,7 @@ static void test_domnode( void ) SysFreeString( str ); attr = (IXMLDOMAttribute*)0xdeadbeef; - str = _bstr_("nonExisitingAttribute"); + str = SysAllocString( szNonExistentAttribute ); r = IXMLDOMElement_getAttributeNode( element, str, &attr); ok( r == S_FALSE, "getAttributeNode ret %08x\n", r ); ok( attr == NULL, "getAttributeNode ret %p, expected NULL\n", attr );

1 0

Ilya Shpigor : comctl32: Implementation the WM_GETTEXT processing of datetime control.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: fa92edfa48a0307fbed7a49a03dc55bfd360d31a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa92edfa48a0307fbed7a49a0… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Wed Dec 2 11:20:05 2009 +0300 comctl32: Implementation the WM_GETTEXT processing of datetime control. --- dlls/comctl32/datetime.c | 23 +++++++++++++++++++++++ dlls/comctl32/tests/datetime.c | 5 ++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 724cba7..a7b433d 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1365,6 +1365,26 @@ DATETIME_Destroy (DATETIME_INFO *infoPtr) } +static INT +DATETIME_GetText (DATETIME_INFO *infoPtr, INT count, LPWSTR dst) +{ + WCHAR buf[80]; + int i; + + if (!dst || (count <= 0)) return 0; + + dst[0] = 0; + for (i = 0; i < infoPtr->nrFields; i++) + { + DATETIME_ReturnTxt(infoPtr, i, buf, sizeof(buf)/sizeof(buf[0])); + if ((strlenW(dst) + strlenW(buf)) < count) + strcatW(dst, buf); + else break; + } + return strlenW(dst); +} + + static LRESULT WINAPI DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1476,6 +1496,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_GETFONT: return (LRESULT) infoPtr->hFont; + case WM_GETTEXT: + return (LRESULT) DATETIME_GetText(infoPtr, wParam, (LPWSTR)lParam); + case WM_SETTEXT: return CB_ERR; diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 9218e07..a871930 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -197,7 +197,7 @@ static void test_dtm_set_format(void) r = SendMessage(hWnd, DTM_SETSYSTEMTIME, 0, (LPARAM)&systime); expect(1, r); GetWindowText(hWnd, txt, 256); - todo_wine ok(strcmp(txt, "hh 12") == 0, "String mismatch (\"%s\" vs \"hh 12\")\n", txt); + ok(strcmp(txt, "hh 12") == 0, "String mismatch (\"%s\" vs \"hh 12\")\n", txt); DestroyWindow(hWnd); } @@ -675,8 +675,7 @@ static void test_wm_set_get_text(void) ok(strcmp(buff, a_str) != 0, "Expected text not to change, got %s\n", buff); GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, time, sizeof(time)); - todo_wine - ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); + ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); DestroyWindow(hWnd); }

1 0

Rob Shearman : hlink: Fix memory leaks in test.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: b84201dca5a09c2ce8b2bfb0f01b590bf2b5fa2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84201dca5a09c2ce8b2bfb0f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 2 14:21:38 2009 +0000 hlink: Fix memory leaks in test. --- dlls/hlink/tests/hlink.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index cea70b5..fc00998 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -660,6 +660,7 @@ static void test_HlinkParseDisplayName(void) ok(hres == S_OK, "IsSystemMoniker failed: %08x\n", hres); ok(issys == MKSYS_FILEMONIKER, "issys=%x\n", issys); + IMoniker_Release(mon); IBindCtx_Release(bctx); } @@ -1061,6 +1062,7 @@ static void test_HlinkGetSetMonikerReference(void) ok(found_trgt == dummy2, "Found target should've been %p, was: %p\n", dummy2, found_trgt); ok(lstrcmpW(found_loc, two) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); + CoTaskMemFree(found_loc); /* set target => dummy, location => one */ hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET | HLINKSETF_LOCATION, dummy, one); @@ -1070,6 +1072,7 @@ static void test_HlinkGetSetMonikerReference(void) ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); + CoTaskMemFree(found_loc); /* no HLINKSETF flags */ hres = IHlink_SetMonikerReference(hlink, 0, dummy2, two); @@ -1079,6 +1082,7 @@ static void test_HlinkGetSetMonikerReference(void) ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); + CoTaskMemFree(found_loc); /* invalid HLINKSETF flags */ hres = IHlink_SetMonikerReference(hlink, 12, dummy2, two); @@ -1088,6 +1092,7 @@ static void test_HlinkGetSetMonikerReference(void) ok(found_trgt == dummy, "Found target should've been %p, was: %p\n", dummy, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); + CoTaskMemFree(found_loc); /* valid & invalid HLINKSETF flags */ hres = IHlink_SetMonikerReference(hlink, 12 | HLINKSETF_TARGET, dummy2, two); @@ -1097,6 +1102,7 @@ static void test_HlinkGetSetMonikerReference(void) ok(found_trgt == dummy2, "Found target should've been %p, was: %p\n", dummy2, found_trgt); ok(lstrcmpW(found_loc, one) == 0, "Found location should've been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(found_loc)); IMoniker_Release(found_trgt); + CoTaskMemFree(found_loc); /* NULL args */ hres = IHlink_SetMonikerReference(hlink, HLINKSETF_TARGET | HLINKSETF_LOCATION, NULL, NULL);

1 0

Francois Gouget : dsound: Make id_to_offset() static.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: c5b346440fe89060f8f4436a6b9db8bd73c63fc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5b346440fe89060f8f4436a6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 2 12:13:14 2009 +0100 dsound: Make id_to_offset() static. --- dlls/dinput/device.c | 2 +- dlls/dinput/device_private.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index cf91153..c0f15ff 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -510,7 +510,7 @@ int id_to_object(LPCDIDATAFORMAT df, int id) return -1; } -int id_to_offset(const DataFormat *df, int id) +static int id_to_offset(const DataFormat *df, int id) { int obj = id_to_object(df->wine_df, id); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index d62e32e..43b28c9 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -81,7 +81,6 @@ extern void release_DataFormat(DataFormat *df) ; extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD time, DWORD seq); /* Helper functions to work with data format */ extern int id_to_object(LPCDIDATAFORMAT df, int id); -extern int id_to_offset(const DataFormat *df, int id); extern int find_property(const DataFormat *df, LPCDIPROPHEADER ph); /* Common joystick stuff */

1 0

Paul Vriens : kernel32/tests: Add some GetLongPathNameA tests.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: be3c97437f500cb087e5b608aad5244dc7807895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3c97437f500cb087e5b608a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Dec 2 15:18:16 2009 +0100 kernel32/tests: Add some GetLongPathNameA tests. --- dlls/kernel32/tests/path.c | 100 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 100 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index de26fc9..ca56002 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -952,6 +952,99 @@ static void test_GetTempPath(void) SetEnvironmentVariableA("TMP", save_TMP); } +static void test_GetLongPathNameA(void) +{ + DWORD length, templength, hostsize; + char tempfile[MAX_PATH]; + char longpath[MAX_PATH]; + char unc_prefix[MAX_PATH]; + char unc_short[MAX_PATH], unc_long[MAX_PATH]; + char temppath[MAX_PATH], temppath2[MAX_PATH]; + HANDLE file; + + if (!pGetLongPathNameA) + return; + + GetTempPathA(MAX_PATH, tempfile); + lstrcatA(tempfile, "longfilename.longext"); + + file = CreateFileA(tempfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + CloseHandle(file); + + /* Test a normal path with a small buffer size */ + memset(temppath, 0, MAX_PATH); + length = pGetLongPathNameA(tempfile, temppath, 4); + /* We have a failure so length should be the minumum plus the terminating '0' */ + ok(length >= lstrlen(tempfile) + 1, "Wrong length\n"); + ok(temppath[0] == 0, "Buffer should not have been touched\n"); + + /* Some UNC syntax tests */ + + memset(temppath, 0, MAX_PATH); + memset(temppath2, 0, MAX_PATH); + lstrcpyA(temppath2, "\\\\?\\"); + lstrcatA(temppath2, tempfile); + templength = length; + + length = pGetLongPathNameA(temppath2, NULL, 0); + ok(length == templength + 4, "Wrong length %d, expected %d\n", length, templength + 4); + + length = pGetLongPathNameA(temppath2, NULL, MAX_PATH); + ok(length == templength + 4, "Wrong length %d, expected %d\n", length, templength + 4); + + length = pGetLongPathNameA(temppath2, temppath, 4); + ok(length == templength + 4, "Wrong length %d, expected %d\n", length, templength + 4); + ok(temppath[0] == 0, "Buffer should not have been touched\n"); + + /* Now an UNC path with the computername */ + lstrcpyA(unc_prefix, "\\\\"); + hostsize = sizeof(unc_prefix) - 2; + GetComputerName(unc_prefix + 2, &hostsize); + lstrcatA(unc_prefix, "\\"); + + /* Create a short syntax for the whole unc path */ + memset(unc_short, 0, MAX_PATH); + GetShortPathNameA(tempfile, temppath, MAX_PATH); + lstrcpyA(unc_short, unc_prefix); + unc_short[lstrlenA(unc_short)] = temppath[0]; + lstrcatA(unc_short, "$\\"); + lstrcatA(unc_short, strchr(temppath, '\\') + 1); + + /* Create a long syntax for reference */ + memset(longpath, 0, MAX_PATH); + pGetLongPathNameA(tempfile, temppath, MAX_PATH); + lstrcpyA(longpath, unc_prefix); + longpath[lstrlenA(longpath)] = temppath[0]; + lstrcatA(longpath, "$\\"); + lstrcatA(longpath, strchr(temppath, '\\') + 1); + + /* NULL test */ + length = pGetLongPathNameA(unc_short, NULL, 0); + todo_wine + ok(length == lstrlenA(longpath) + 1, "Wrong length, expected %d\n", length); + + length = pGetLongPathNameA(unc_short, NULL, MAX_PATH); + todo_wine + ok(length == lstrlenA(longpath) + 1, "Wrong length, expected %d\n", length); + + memset(unc_long, 0, MAX_PATH); + length = pGetLongPathNameA(unc_short, unc_long, lstrlenA(unc_short)); + /* length will include terminating '0' on failure */ + todo_wine + ok(length == lstrlenA(longpath) + 1, "Wrong length, expected %d\n", length); + ok(unc_long[0] == 0, "Buffer should not have been touched\n"); + + memset(unc_long, 0, MAX_PATH); + templength = length; + length = pGetLongPathNameA(unc_short, unc_long, length); + /* length doesn't include terminating '0' on success */ + ok(length == templength - 1, "Wrong length %d, expected %d\n", length, templength - 1); + todo_wine + ok(!lstrcmpiA(unc_long, longpath), "Expected (%s), got (%s)\n", longpath, unc_long); + + DeleteFileA(tempfile); +} + static void test_GetLongPathNameW(void) { DWORD length; @@ -1273,11 +1366,18 @@ START_TEST(path) (void*)GetProcAddress( GetModuleHandleA("kernel32.dll"), "NeedCurrentDirectoryForExePathW" ); + /* Report only once */ + if (!pGetLongPathNameA) + win_skip("GetLongPathNameA is not available\n"); + if (!pGetLongPathNameW) + win_skip("GetLongPathNameW is not available\n"); + test_InitPathA(curdir, &curDrive, &otherDrive); test_CurrentDirectoryA(origdir,curdir); test_PathNameA(curdir, curDrive, otherDrive); test_CleanupPathA(origdir,curdir); test_GetTempPath(); + test_GetLongPathNameA(); test_GetLongPathNameW(); test_GetShortPathNameW(); test_GetSystemDirectory();

1 0

Francois Gouget : dsound: Make DSOUND_PrimarySetFormat() static.
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: ff0717766cd8f180a059bec95f504b6c3bfc9b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0717766cd8f180a059bec95… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 2 12:13:08 2009 +0100 dsound: Make DSOUND_PrimarySetFormat() static. --- dlls/dsound/dsound_private.h | 1 - dlls/dsound/primary.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d52d697..1b25ddd 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -378,7 +378,6 @@ HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device); HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device); HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LPDWORD writepos); LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex); -HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, BOOL forced); HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave); /* duplex.c */ diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 6b3ca35..30a8968 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -465,7 +465,7 @@ LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) return pwfx; } -HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, BOOL forced) +static HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX wfex, BOOL forced) { HRESULT err = DSERR_BUFFERLOST; int i;

1 0

Henri Verbeet : d3d9: Implement IDirect3D9Ex::GetAdapterLUID().
by Alexandre Julliard Dec. 2, 2009

Dec. 2, 2009

Module: wine Branch: master Commit: ed73f0a1b04acff312a261ea8b409255337520d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed73f0a1b04acff312a261ea8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 2 10:41:23 2009 +0100 d3d9: Implement IDirect3D9Ex::GetAdapterLUID(). --- dlls/d3d9/directx.c | 18 ++++++++++++++++-- dlls/wined3d/directx.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 7 +++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 9395381..1fcc8c4 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -481,9 +481,23 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3 static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUID *luid) { - FIXME("iface %p, adapter %u, luid %p stub!\n", iface, adapter, luid); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; + WINED3DADAPTER_IDENTIFIER adapter_id; + HRESULT hr; - return D3DERR_DRIVERINTERNALERROR; + TRACE("iface %p, adapter %u, luid %p.\n", iface, adapter, luid); + + adapter_id.driver_size = 0; + adapter_id.description_size = 0; + adapter_id.device_name_size = 0; + + wined3d_mutex_lock(); + hr = IWineD3D_GetAdapterIdentifier(This->WineD3D, adapter, 0, &adapter_id); + wined3d_mutex_unlock(); + + memcpy(luid, &adapter_id.adapter_luid, sizeof(*luid)); + + return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c990ce9..5e00438 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2424,6 +2424,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad pIdentifier->revision = 0; memcpy(&pIdentifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(pIdentifier->device_identifier)); pIdentifier->whql_level = (Flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; + memcpy(&pIdentifier->adapter_luid, &adapter->luid, sizeof(pIdentifier->adapter_luid)); return WINED3D_OK; } @@ -4678,6 +4679,15 @@ BOOL InitAdapters(IWineD3DImpl *This) adapter->monitorPoint.x = -1; adapter->monitorPoint.y = -1; + if (!AllocateLocallyUniqueId(&adapter->luid)) + { + DWORD err = GetLastError(); + ERR("Failed to set adapter LUID (%#x).\n", err); + goto nogl_adapter; + } + TRACE("Allocated LUID %08x:%08x for adapter.\n", + adapter->luid.HighPart, adapter->luid.LowPart); + if (!WineD3D_CreateFakeGLContext(&fake_gl_ctx)) { ERR("Failed to get a gl context for default adapter\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 12685d2..7bb5b71 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1335,6 +1335,7 @@ struct wined3d_adapter BOOL brokenStencil; /* Set on cards which only offer mixed depth+stencil */ unsigned int TextureRam; /* Amount of texture memory both video ram + AGP/TurboCache/HyperMemory/.. */ unsigned int UsedTextureRam; + LUID luid; }; BOOL initPixelFormats(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 176e602..0658b74 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -42,6 +42,12 @@ typedef struct _RGNDATA RGNDATAHEADER rdh; char Buffer[1]; } RGNDATA; + +typedef struct _LUID +{ + DWORD LowPart; + LONG HighPart; +} LUID, *PLUID; cpp_quote("#endif") cpp_quote("#define WINED3D_OK S_OK") @@ -1699,6 +1705,7 @@ typedef struct _WINED3DADAPTER_IDENTIFIER DWORD revision; GUID device_identifier; DWORD whql_level; + LUID adapter_luid; } WINED3DADAPTER_IDENTIFIER; typedef struct _WINED3DPRESENT_PARAMETERS

1 0