wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

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

02 Dec '09

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 02 Dec '09

02 Dec '09

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

Paul Vriens : kernel32/tests: Add some GetLongPathNameA tests.
by Alexandre Julliard 02 Dec '09

02 Dec '09

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

Rob Shearman : hlink: Fix memory leaks in test.
by Alexandre Julliard 02 Dec '09

02 Dec '09

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

Ilya Shpigor : comctl32: Implementation the WM_GETTEXT processing of datetime control.
by Alexandre Julliard 02 Dec '09

02 Dec '09

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

Alexandre Julliard : rsaenh: Fix padding bytes check for 0-byte payload.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: b402b7878063a3dbd8eda37fae9c660ec78fbf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b402b7878063a3dbd8eda37fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 2 14:59:56 2009 +0100 rsaenh: Fix padding bytes check for 0-byte payload. --- dlls/crypt32/tests/protectdata.c | 20 ++++++-------------- dlls/rsaenh/rsaenh.c | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/tests/protectdata.c b/dlls/crypt32/tests/protectdata.c index c3173c3..91bad8e 100644 --- a/dlls/crypt32/tests/protectdata.c +++ b/dlls/crypt32/tests/protectdata.c @@ -213,7 +213,7 @@ static void test_cryptunprotectdata(void) plain.cbData=0; } -static void test_simpleroundtrip(const char *plaintext, int wine_fails) +static void test_simpleroundtrip(const char *plaintext) { DATA_BLOB input; DATA_BLOB encrypted; @@ -234,17 +234,9 @@ static void test_simpleroundtrip(const char *plaintext, int wine_fails) } res = pCryptUnprotectData(&encrypted, NULL, NULL, NULL, NULL, 0, &output); - if (wine_fails) { - todo_wine - ok(res != 0, "can't unprotect; last error %u\n", GetLastError()); - } else { - ok(res != 0, "can't unprotect; last error %u\n", GetLastError()); - } - - if (res) { - ok(output.cbData == strlen(plaintext), "output wrong length %d for input '%s', wanted %d\n", output.cbData, plaintext, strlen(plaintext)); - ok(!memcmp(plaintext, (char *)output.pbData, output.cbData), "output wrong contents for input '%s'\n", plaintext); - } + ok(res != 0, "can't unprotect; last error %u\n", GetLastError()); + ok(output.cbData == strlen(plaintext), "output wrong length %d for input '%s', wanted %d\n", output.cbData, plaintext, strlen(plaintext)); + ok(!memcmp(plaintext, (char *)output.pbData, output.cbData), "output wrong contents for input '%s'\n", plaintext); } START_TEST(protectdata) @@ -262,8 +254,8 @@ START_TEST(protectdata) protected=FALSE; test_cryptprotectdata(); test_cryptunprotectdata(); - test_simpleroundtrip("", 1); - test_simpleroundtrip("hello", 0); + test_simpleroundtrip(""); + test_simpleroundtrip("hello"); /* deinit globals here */ if (cipher.pbData) LocalFree(cipher.pbData); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 4f13c17..8234688 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2324,7 +2324,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, if (Final) { if (pbData[*pdwDataLen-1] && pbData[*pdwDataLen-1] <= pCryptKey->dwBlockLen && - pbData[*pdwDataLen-1] < *pdwDataLen) { + pbData[*pdwDataLen-1] <= *pdwDataLen) { BOOL padOkay = TRUE; /* check that every bad byte has the same value */

1 0

Huw Davies : gdi32: Fix incorrect initialization of path array.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: b5ca0a9c2a55b0420cda6cea931d1490eda66bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ca0a9c2a55b0420cda6cea9… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 2 12:04:08 2009 +0000 gdi32: Fix incorrect initialization of path array. Found by Valgrind. --- dlls/gdi32/path.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 88b7b0a..4b035d7 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1852,7 +1852,7 @@ static BOOL PATH_WidenPath(DC *dc) { INT i, j, numStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle; BOOL ret = FALSE; - GdiPath *pPath, *pNewPath, **pStrokes, *pUpPath, *pDownPath; + GdiPath *pPath, *pNewPath, **pStrokes = NULL, *pUpPath, *pDownPath; EXTLOGPEN *elp; DWORD obj_type, joint, endcap, penType; @@ -1907,13 +1907,6 @@ static BOOL PATH_WidenPath(DC *dc) numStrokes = 0; - pStrokes = HeapAlloc(GetProcessHeap(), 0, numStrokes * sizeof(GdiPath*)); - pStrokes[0] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); - PATH_InitGdiPath(pStrokes[0]); - pStrokes[0]->pFlags = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(INT)); - pStrokes[0]->pPoints = HeapAlloc(GetProcessHeap(), 0, pPath->numEntriesUsed * sizeof(POINT)); - pStrokes[0]->numEntriesUsed = 0; - for(i = 0, j = 0; i < pPath->numEntriesUsed; i++, j++) { POINT point; if((i == 0 || (pPath->pFlags[i-1] & PT_CLOSEFIGURE)) && @@ -1930,7 +1923,11 @@ static BOOL PATH_WidenPath(DC *dc) } numStrokes++; j = 0; - pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); + if(numStrokes == 1) + pStrokes = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath*)); + else + pStrokes = HeapReAlloc(GetProcessHeap(), 0, pStrokes, numStrokes * sizeof(GdiPath*)); + if(!pStrokes) return FALSE; pStrokes[numStrokes - 1] = HeapAlloc(GetProcessHeap(), 0, sizeof(GdiPath)); PATH_InitGdiPath(pStrokes[numStrokes - 1]); pStrokes[numStrokes - 1]->state = PATH_Open;

1 0

Francois Gouget : dsound: Make id_to_offset() static.
by Alexandre Julliard 02 Dec '09

02 Dec '09

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

Francois Gouget : dsound: Make DSOUND_PrimarySetFormat() static.
by Alexandre Julliard 02 Dec '09

02 Dec '09

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

Francois Gouget : dsound: Make some capture functions static.
by Alexandre Julliard 02 Dec '09

02 Dec '09

Module: wine Branch: master Commit: 5b5f00d5523d8a47dfcc0985425ef4850c3a69dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5f00d5523d8a47dfcc09854… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Dec 2 12:12:47 2009 +0100 dsound: Make some capture functions static. --- dlls/dsound/capture.c | 12 ++++++------ dlls/dsound/dsound_private.h | 22 ---------------------- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 29d9f40..26c86b8 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -821,7 +821,7 @@ DSOUND_capture_callback(HWAVEIN hwi, UINT msg, DWORD_PTR dwUser, DWORD_PTR dw1, TRACE("completed\n"); } -HRESULT IDirectSoundCaptureBufferImpl_Create( +static HRESULT IDirectSoundCaptureBufferImpl_Create( DirectSoundCaptureDevice *device, IDirectSoundCaptureBufferImpl ** ppobj, LPCDSCBUFFERDESC lpcDSCBufferDesc) @@ -1006,7 +1006,7 @@ static HRESULT DirectSoundCaptureDevice_Create( return DS_OK; } -ULONG DirectSoundCaptureDevice_Release( +static ULONG DirectSoundCaptureDevice_Release( DirectSoundCaptureDevice * device) { ULONG ref = InterlockedDecrement(&(device->ref)); @@ -1033,7 +1033,7 @@ ULONG DirectSoundCaptureDevice_Release( return ref; } -HRESULT DirectSoundCaptureDevice_Initialize( +static HRESULT DirectSoundCaptureDevice_Initialize( DirectSoundCaptureDevice ** ppDevice, LPCGUID lpcGUID) { @@ -1221,7 +1221,7 @@ IDirectSoundCaptureImpl_Release( LPDIRECTSOUNDCAPTURE iface ) return ref; } -HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( +static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( LPDIRECTSOUNDCAPTURE iface, LPCDSCBUFFERDESC lpcDSCBufferDesc, LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, @@ -1262,7 +1262,7 @@ HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( return hr; } -HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( +static HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( LPDIRECTSOUNDCAPTURE iface, LPDSCCAPS lpDSCCaps ) { @@ -1294,7 +1294,7 @@ HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( return DS_OK; } -HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( +static HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( LPDIRECTSOUNDCAPTURE iface, LPCGUID lpcGUID ) { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 4a095c7..d52d697 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -273,12 +273,6 @@ struct DirectSoundCaptureDevice CRITICAL_SECTION lock; }; -HRESULT DirectSoundCaptureDevice_Initialize( - DirectSoundCaptureDevice ** ppDevice, - LPCGUID lpcGUID); -ULONG DirectSoundCaptureDevice_Release( - DirectSoundCaptureDevice * device); - /***************************************************************************** * IDirectSoundCaptureBuffer implementation structure */ @@ -301,11 +295,6 @@ struct IDirectSoundCaptureBufferImpl PIDSDRIVERNOTIFY hwnotify; }; -HRESULT IDirectSoundCaptureBufferImpl_Create( - DirectSoundCaptureDevice *device, - IDirectSoundCaptureBufferImpl ** ppobj, - LPCDSCBUFFERDESC lpcDSCBufferDesc); - /***************************************************************************** * IDirectSound3DListener implementation structure */ @@ -416,17 +405,6 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb); HRESULT DSOUND_CaptureCreate(REFIID riid, LPDIRECTSOUNDCAPTURE *ppDSC); HRESULT DSOUND_CaptureCreate8(REFIID riid, LPDIRECTSOUNDCAPTURE8 *ppDSC8); -HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer( - LPDIRECTSOUNDCAPTURE iface, - LPCDSCBUFFERDESC lpcDSCBufferDesc, - LPDIRECTSOUNDCAPTUREBUFFER* lplpDSCaptureBuffer, - LPUNKNOWN pUnk); -HRESULT WINAPI IDirectSoundCaptureImpl_GetCaps( - LPDIRECTSOUNDCAPTURE iface, - LPDSCCAPS lpDSCCaps); -HRESULT WINAPI IDirectSoundCaptureImpl_Initialize( - LPDIRECTSOUNDCAPTURE iface, - LPCGUID lpcGUID); #define STATE_STOPPED 0 #define STATE_STARTING 1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2009