September 2009 - Wine-commits

Alexandre Julliard : ntdll: Fix a file descriptor leak.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: c1cb976b66deaf19b58bac9c0df83e1896a4797d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1cb976b66deaf19b58bac9c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 10 10:53:38 2009 +0200 ntdll: Fix a file descriptor leak. --- dlls/ntdll/directory.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 0cd531e..413b96f 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2329,6 +2329,7 @@ NTSTATUS DIR_get_unix_cwd( char **cwd ) else status = FILE_GetNtStatus(); RtlLeaveCriticalSection( &dir_section ); + if (old_cwd != -1) close( old_cwd ); if (needs_close) close( unix_fd ); } if (!curdir->Handle) NtClose( handle );

1 0

Marcus Meissner : wineoss.drv: 2 more close(mixer) added.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 4b0a2f86708bbc72685b357e08e779e8ff2e922d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b0a2f86708bbc72685b357e0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Sep 10 00:33:00 2009 +0200 wineoss.drv: 2 more close(mixer) added. --- dlls/wineoss.drv/mmaux.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index de5ecea..ff62107 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -143,6 +143,7 @@ static DWORD AUX_GetVolume(WORD wDevID, LPDWORD lpdwVol) break; default: WARN("invalid device id=%04X !\n", wDevID); + close(mixer); return MMSYSERR_NOTENABLED; } if (ioctl(mixer, cmd, &volume) == -1) { @@ -205,6 +206,7 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam) break; default: WARN("invalid device id=%04X !\n", wDevID); + close(mixer); return MMSYSERR_NOTENABLED; } if (ioctl(mixer, cmd, &volume) == -1) {

1 0

Nikolay Sivov : include: Move some documented DPA definitions to public header, use PSDK names.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 2c190ab438fc766c228325372c7b91151eaf8348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c190ab438fc766c228325372… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 10 00:02:55 2009 +0400 include: Move some documented DPA definitions to public header, use PSDK names. --- dlls/comctl32/comctl32.h | 12 ------------ dlls/comctl32/dpa.c | 16 ++++++++-------- dlls/comctl32/tests/dpa.c | 11 +++-------- include/commctrl.h | 17 +++++++++++++++++ 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 1f2f63e..3008314 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -183,18 +183,6 @@ DWORD WINAPI GetSize (LPVOID); INT WINAPI Str_GetPtrA (LPCSTR, LPSTR, INT); INT WINAPI Str_GetPtrW (LPCWSTR, LPWSTR, INT); -INT WINAPI DPA_GetPtrIndex (HDPA, LPCVOID); -BOOL WINAPI DPA_Grow (HDPA, INT); - -#define DPAM_NOSORT 0x0001 -#define DPAM_INSERT 0x0004 -#define DPAM_DELETE 0x0008 - -typedef PVOID (CALLBACK *PFNDPAMERGE)(DWORD,PVOID,PVOID,LPARAM); -BOOL WINAPI DPA_Merge (HDPA, HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM); - -#define DPA_GetPtrCount(hdpa) (*(INT*)(hdpa)) - LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet); BOOL WINAPI MirrorIcon(HICON *phicon1, HICON *phicon2); diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 43f2a3a..9a4883a 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -241,7 +241,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, if (IsBadCodePtr ((FARPROC)pfnMerge)) return FALSE; - if (!(dwFlags & DPAM_NOSORT)) { + if (!(dwFlags & DPAM_SORTED)) { TRACE("sorting dpa's!\n"); if (hdpa1->nItemCount > 0) DPA_Sort (hdpa1, pfnCompare, lParam); @@ -269,14 +269,14 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, do { if (nIndex < 0) { - if ((nCount >= 0) && (dwFlags & DPAM_INSERT)) { + if ((nCount >= 0) && (dwFlags & DPAM_UNION)) { /* Now insert the remaining new items into DPA 1 */ TRACE("%d items to be inserted at start of DPA 1\n", nCount+1); for (i=nCount; i>=0; i--) { PVOID ptr; - ptr = (pfnMerge)(3, *pWork2, NULL, lParam); + ptr = (pfnMerge)(DPAMM_INSERT, *pWork2, NULL, lParam); if (!ptr) return FALSE; DPA_InsertPtr (hdpa1, 0, ptr); @@ -293,7 +293,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, { PVOID ptr; - ptr = (pfnMerge)(1, *pWork1, *pWork2, lParam); + ptr = (pfnMerge)(DPAMM_MERGE, *pWork1, *pWork2, lParam); if (!ptr) return FALSE; @@ -306,14 +306,14 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, else if (nResult > 0) { /* item in DPA 1 missing from DPA 2 */ - if (dwFlags & DPAM_DELETE) + if (dwFlags & DPAM_INTERSECT) { /* Now delete the extra item in DPA1 */ PVOID ptr; ptr = DPA_DeletePtr (hdpa1, hdpa1->nItemCount - 1); - (pfnMerge)(2, ptr, NULL, lParam); + (pfnMerge)(DPAMM_DELETE, ptr, NULL, lParam); } nIndex--; pWork1--; @@ -321,12 +321,12 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, else { /* new item in DPA 2 */ - if (dwFlags & DPAM_INSERT) + if (dwFlags & DPAM_UNION) { /* Now insert the new item in DPA 1 */ PVOID ptr; - ptr = (pfnMerge)(3, *pWork2, NULL, lParam); + ptr = (pfnMerge)(DPAMM_INSERT, *pWork2, NULL, lParam); if (!ptr) return FALSE; DPA_InsertPtr (hdpa1, nIndex+1, ptr); diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index d892e31..7d907cf 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -31,17 +31,12 @@ #include "wine/test.h" -#define DPAM_NOSORT 0x1 -#define DPAM_INSERT 0x4 -#define DPAM_DELETE 0x8 - typedef struct _ITEMDATA { INT iPos; PVOID pvData; } ITEMDATA, *LPITEMDATA; -typedef PVOID (CALLBACK *PFNDPAMERGE)(UINT,PVOID,PVOID,LPARAM); typedef HRESULT (CALLBACK *PFNDPASTM)(LPITEMDATA,IStream*,LPARAM); static HDPA (WINAPI *pDPA_Clone)(const HDPA,const HDPA); @@ -388,7 +383,7 @@ static void test_DPA_Merge(void) ok(rc, "dw=0x%x\n", dw); /* Delete all odd entries from dpa2 */ - pDPA_Merge(dpa2, dpa, DPAM_DELETE, + pDPA_Merge(dpa2, dpa, DPAM_INTERSECT, CB_CmpLT, CB_MergeDeleteOddSrc, 0xdeadbeef); todo_wine { @@ -397,9 +392,9 @@ static void test_DPA_Merge(void) } /* Merge dpa3 into dpa2 and dpa */ - pDPA_Merge(dpa, dpa3, DPAM_INSERT|DPAM_NOSORT, + pDPA_Merge(dpa, dpa3, DPAM_UNION|DPAM_SORTED, CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); - pDPA_Merge(dpa2, dpa3, DPAM_INSERT|DPAM_NOSORT, + pDPA_Merge(dpa2, dpa3, DPAM_UNION|DPAM_SORTED, CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); rc = CheckDPA(dpa, 0x123456, &dw); diff --git a/include/commctrl.h b/include/commctrl.h index 1e13f10..55cae1c 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -4979,8 +4979,22 @@ INT WINAPI DSA_InsertItem(HDSA, INT, LPVOID); struct _DPA; typedef struct _DPA *HDPA; +#define DPA_GetPtrCount(hdpa) (*(INT*)(hdpa)) + typedef INT (CALLBACK *PFNDPAENUMCALLBACK)(LPVOID, LPVOID); typedef INT (CALLBACK *PFNDPACOMPARE)(LPVOID, LPVOID, LPARAM); +typedef PVOID (CALLBACK *PFNDPAMERGE)(UINT,PVOID,PVOID,LPARAM); + +/* merge callback codes */ +#define DPAMM_MERGE 1 +#define DPAMM_DELETE 2 +#define DPAMM_INSERT 3 + +/* merge options */ +#define DPAM_SORTED 0x00000001 +#define DPAM_NORMAL 0x00000002 +#define DPAM_UNION 0x00000004 +#define DPAM_INTERSECT 0x00000008 HDPA WINAPI DPA_Create(INT); BOOL WINAPI DPA_Destroy(HDPA); @@ -4988,11 +5002,14 @@ LPVOID WINAPI DPA_DeletePtr(HDPA, INT); BOOL WINAPI DPA_DeleteAllPtrs(HDPA); BOOL WINAPI DPA_SetPtr(HDPA, INT, LPVOID); LPVOID WINAPI DPA_GetPtr(HDPA, INT); +INT WINAPI DPA_GetPtrIndex(HDPA, LPCVOID); +BOOL WINAPI DPA_Grow(HDPA, INT); INT WINAPI DPA_InsertPtr(HDPA, INT, LPVOID); BOOL WINAPI DPA_Sort(HDPA, PFNDPACOMPARE, LPARAM); void WINAPI DPA_EnumCallback(HDPA, PFNDPAENUMCALLBACK, LPVOID); void WINAPI DPA_DestroyCallback(HDPA, PFNDPAENUMCALLBACK, LPVOID); INT WINAPI DPA_Search(HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT); +BOOL WINAPI DPA_Merge(HDPA, HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM); BOOL WINAPI Str_SetPtrW (LPWSTR *, LPCWSTR);

1 0

Nikolay Sivov : comctl32/dpa: Split tests to several functions to avoid undesired dependencies.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: e7304066d1932c6af8106de9794a763a12627917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7304066d1932c6af8106de97… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 9 23:15:32 2009 +0400 comctl32/dpa: Split tests to several functions to avoid undesired dependencies. --- dlls/comctl32/tests/dpa.c | 278 +++++++++++++++++++++++++++++++-------------- 1 files changed, 190 insertions(+), 88 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 741aeb6..d892e31 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -201,7 +201,6 @@ static void test_dpa(void) INT ret, i; PVOID p; DWORD dw, dw2, dw3; - HRESULT hRes; BOOL rc; GetSystemInfo(&si); @@ -336,49 +335,6 @@ static void test_dpa(void) ok(j != i, "i=%d\n", i); } - if(pDPA_Merge) - { - /* Delete all even entries from dpa */ - p = pDPA_DeletePtr(dpa, 1); - p = pDPA_DeletePtr(dpa, 2); - p = pDPA_DeletePtr(dpa, 3); - rc=CheckDPA(dpa, 0x135, &dw); - ok(rc, "dw=0x%x\n", dw); - - /* Delete all odd entries from dpa2 */ - pDPA_Merge(dpa2, dpa, DPAM_DELETE, - CB_CmpLT, CB_MergeDeleteOddSrc, 0xdeadbeef); - todo_wine - { - rc=CheckDPA(dpa2, 0x246, &dw2); - ok(rc, "dw=0x%x\n", dw2); - } - - /* Merge dpa3 into dpa2 and dpa */ - pDPA_Merge(dpa, dpa3, DPAM_INSERT|DPAM_NOSORT, - CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); - pDPA_Merge(dpa2, dpa3, DPAM_INSERT|DPAM_NOSORT, - CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); - - rc=CheckDPA(dpa, 0x123456, &dw); - ok(rc, "dw=0x%x\n", dw); - rc=CheckDPA(dpa2, 0x123456, &dw2); - ok(rc || - broken(!rc), /* win98 */ - "dw2=0x%x\n", dw2); - rc=CheckDPA(dpa3, 0x123456, &dw3); - ok(rc, "dw3=0x%x\n", dw3); - } - - if(pDPA_EnumCallback) - { - nEnum = 0; - pDPA_EnumCallback(dpa2, CB_EnumFirstThree, dpa2); - rc=CheckDPA(dpa2, 0x777456, &dw2); - ok(rc, "dw=0x%x\n", dw2); - ok(nEnum == 3, "nEnum=%d\n", nEnum); - } - /* Setting item with huge index should work */ ok(pDPA_SetPtr(dpa2, 0x12345, (PVOID)0xdeadbeef), "\n"); ret = pDPA_GetPtrIndex(dpa2, (PVOID)0xdeadbeef); @@ -388,61 +344,200 @@ static void test_dpa(void) rc=CheckDPA(dpa2, 0, &dw2); ok(rc, "dw2=0x%x\n", dw2); pDPA_Destroy(dpa2); + pDPA_Destroy(dpa3); +} + +static void test_DPA_Merge(void) +{ + HDPA dpa, dpa2, dpa3; + INT ret, i; + DWORD dw; + BOOL rc; + + if(!pDPA_Merge) + { + win_skip("DPA_Merge() not available\n"); + return; + } + + dpa = pDPA_Create(0); + dpa2 = pDPA_Create(0); + dpa3 = pDPA_Create(0); + + ret = pDPA_InsertPtr(dpa, 0, (PVOID)1); + ok(ret == 0, "ret=%d\n", ret); + ret = pDPA_InsertPtr(dpa, 1, (PVOID)3); + ok(ret == 1, "ret=%d\n", ret); + ret = pDPA_InsertPtr(dpa, 2, (PVOID)5); + ok(ret == 2, "ret=%d\n", ret); + + rc = CheckDPA(dpa, 0x135, &dw); + ok(rc, "dw=0x%x\n", dw); + + for (i = 0; i < 6; i++) + { + ret = pDPA_InsertPtr(dpa2, i, (PVOID)(6-i)); + ok(ret == i, "ret=%d\n", ret); + ret = pDPA_InsertPtr(dpa3, i, (PVOID)(i+1)); + ok(ret == i, "ret=%d\n", ret); + } + + rc = CheckDPA(dpa2, 0x654321, &dw); + ok(rc, "dw=0x%x\n", dw); + rc = CheckDPA(dpa3, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw); + + /* Delete all odd entries from dpa2 */ + pDPA_Merge(dpa2, dpa, DPAM_DELETE, + CB_CmpLT, CB_MergeDeleteOddSrc, 0xdeadbeef); + todo_wine + { + rc = CheckDPA(dpa2, 0x246, &dw); + ok(rc, "dw=0x%x\n", dw); + } + + /* Merge dpa3 into dpa2 and dpa */ + pDPA_Merge(dpa, dpa3, DPAM_INSERT|DPAM_NOSORT, + CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + pDPA_Merge(dpa2, dpa3, DPAM_INSERT|DPAM_NOSORT, + CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + + rc = CheckDPA(dpa, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw); + rc = CheckDPA(dpa2, 0x123456, &dw); + ok(rc || + broken(!rc), /* win98 */ + "dw=0x%x\n", dw); + rc = CheckDPA(dpa3, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw); + + pDPA_Destroy(dpa); + pDPA_Destroy(dpa2); + pDPA_Destroy(dpa3); +} + +static void test_DPA_EnumCallback(void) +{ + HDPA dpa; + BOOL rc; + DWORD dw; + INT i, ret; + + if(!pDPA_EnumCallback) + { + win_skip("DPA_EnumCallback() not available\n"); + return; + } + + dpa = pDPA_Create(0); + + for (i = 0; i < 6; i++) + { + ret = pDPA_InsertPtr(dpa, i, (PVOID)(i+1)); + ok(ret == i, "ret=%d\n", ret); + } + + rc = CheckDPA(dpa, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw); + + nEnum = 0; + /* test callback sets first 3 items to 7 */ + pDPA_EnumCallback(dpa, CB_EnumFirstThree, dpa); + rc = CheckDPA(dpa, 0x777456, &dw); + ok(rc, "dw=0x%x\n", dw); + ok(nEnum == 3, "nEnum=%d\n", nEnum); + + pDPA_Destroy(dpa); +} + +static void test_DPA_DestroyCallback(void) +{ + HDPA dpa; + INT i, ret; + + if(!pDPA_DestroyCallback) + { + win_skip("DPA_DestroyCallback() not available\n"); + return; + } + + dpa = pDPA_Create(0); - if(pDPA_DestroyCallback) + for (i = 0; i < 3; i++) { - nEnum = 0; - pDPA_DestroyCallback(dpa3, CB_EnumFirstThree, dpa3); - ok(nEnum == 3, "nEnum=%d\n", nEnum); + ret = pDPA_InsertPtr(dpa, i, (PVOID)(i+1)); + ok(ret == i, "ret=%d\n", ret); } - else pDPA_Destroy(dpa3); + + nEnum = 0; + pDPA_DestroyCallback(dpa, CB_EnumFirstThree, dpa); + ok(nEnum == 3, "nEnum=%d\n", nEnum); +} + +static void test_dpa_stream(void) +{ + HDPA dpa; + HRESULT hRes; + INT ret, i; + BOOL rc; + + static const WCHAR szStg[] = { 'S','t','g',0 }; + IStorage* pStg = NULL; + IStream* pStm = NULL; + LARGE_INTEGER liZero; + DWORD dwMode, dw; if(!pDPA_SaveStream) - goto skip_stream_tests; + { + win_skip("DPA_SaveStream() not available. Skipping stream tests.\n"); + return; + } hRes = CoInitialize(NULL); - if(hRes == S_OK) + if (hRes != S_OK) { - static const WCHAR szStg[] = { 'S','t','g',0 }; - IStorage* pStg = NULL; - IStream* pStm = NULL; - LARGE_INTEGER liZero; - DWORD dwMode; - liZero.QuadPart = 0; - - dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; - hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); - ok(hRes == S_OK, "hRes=0x%x\n", hRes); + ok(0, "hResult: %d\n", hRes); + return; + } - hRes = IStorage_CreateStream(pStg, szStg, dwMode, 0, 0, &pStm); - ok(hRes == S_OK, "hRes=0x%x\n", hRes); + dpa = pDPA_Create(0); - hRes = pDPA_SaveStream(dpa, CB_Save, pStm, 0xdeadbeef); - todo_wine ok(hRes == S_OK, "hRes=0x%x\n", hRes); - pDPA_Destroy(dpa); - - hRes = IStream_Seek(pStm, liZero, STREAM_SEEK_SET, NULL); - ok(hRes == S_OK, "hRes=0x%x\n", hRes); - hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, 0xdeadbeef); - todo_wine - { - ok(hRes == S_OK, "hRes=0x%x\n", hRes); - rc=CheckDPA(dpa, 0x123456, &dw); - ok(rc, "dw=0x%x\n", dw); - } + for (i = 0; i < 6; i++) + { + ret = pDPA_InsertPtr(dpa, i, (PVOID)(i+1)); + ok(ret == i, "ret=%d\n", ret); + } - ret = IStream_Release(pStm); - ok(!ret, "ret=%d\n", ret); - - ret = IStorage_Release(pStg); - ok(!ret, "ret=%d\n", ret); + dwMode = STGM_DIRECT|STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE; + hRes = StgCreateDocfile(NULL, dwMode|STGM_DELETEONRELEASE, 0, &pStg); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); - CoUninitialize(); - } - else ok(0, "hResult: %d\n", hRes); + hRes = IStorage_CreateStream(pStg, szStg, dwMode, 0, 0, &pStm); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); -skip_stream_tests: + hRes = pDPA_SaveStream(dpa, CB_Save, pStm, 0xdeadbeef); + todo_wine ok(hRes == S_OK, "hRes=0x%x\n", hRes); pDPA_Destroy(dpa); + + liZero.QuadPart = 0; + hRes = IStream_Seek(pStm, liZero, STREAM_SEEK_SET, NULL); + ok(hRes == S_OK, "hRes=0x%x\n", hRes); + hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, 0xdeadbeef); + todo_wine + { + ok(hRes == S_OK, "hRes=0x%x\n", hRes); + rc = CheckDPA(dpa, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw); + } + pDPA_Destroy(dpa); + + ret = IStream_Release(pStm); + ok(!ret, "ret=%d\n", ret); + + ret = IStorage_Release(pStg); + ok(!ret, "ret=%d\n", ret); + + CoUninitialize(); } START_TEST(dpa) @@ -451,8 +546,15 @@ START_TEST(dpa) hcomctl32 = GetModuleHandleA("comctl32.dll"); - if(InitFunctionPtrs(hcomctl32)) - test_dpa(); - else + if(!InitFunctionPtrs(hcomctl32)) + { win_skip("Needed functions are not available\n"); + return; + } + + test_dpa(); + test_DPA_Merge(); + test_DPA_EnumCallback(); + test_DPA_DestroyCallback(); + test_dpa_stream(); }

1 0

Paul Vriens : mshtml/tests: Fix test failures on Win9x/WinME.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 5e68c0718236d8bef4649d8735716d0525e7e8d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e68c0718236d8bef4649d873… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Sep 10 08:00:14 2009 +0200 mshtml/tests: Fix test failures on Win9x/WinME. --- dlls/mshtml/tests/events.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index f78e56b..d0ddadb 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -105,9 +105,9 @@ static const char *debugstr_guid(REFIID riid) static int strcmp_wa(LPCWSTR strw, const char *stra) { - WCHAR buf[512]; - MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); - return lstrcmpW(strw, buf); + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); } static BSTR a2bstr(const char *str) @@ -1357,12 +1357,10 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D BSTR state; HRESULT hres; - static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0}; - hres = IHTMLDocument2_get_readyState(notif_doc, &state); ok(hres == S_OK, "get_readyState failed: %08x\n", hres); - if(!lstrcmpW(state, completeW)) + if(!strcmp_wa(state, "complete")) doc_complete = TRUE; SysFreeString(state); @@ -1524,19 +1522,18 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam static HWND create_container_window(void) { - static const WCHAR wszHTMLDocumentTest[] = - {'H','T','M','L','D','o','c','u','m','e','n','t','T','e','s','t',0}; - static WNDCLASSEXW wndclass = { - sizeof(WNDCLASSEXW), + static const CHAR szHTMLDocumentTest[] = "HTMLDocumentTest"; + static WNDCLASSEXA wndclass = { + sizeof(WNDCLASSEXA), 0, wnd_proc, 0, 0, NULL, NULL, NULL, NULL, NULL, - wszHTMLDocumentTest, + szHTMLDocumentTest, NULL }; - RegisterClassExW(&wndclass); - return CreateWindowW(wszHTMLDocumentTest, wszHTMLDocumentTest, + RegisterClassExA(&wndclass); + return CreateWindowA(szHTMLDocumentTest, szHTMLDocumentTest, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, NULL, NULL, NULL, NULL); }

1 0

Paul Vriens : imm32/tests: Fix test failures on Vista/W2K8.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 7517135fe7c8f70adc897402f4c023a08bee481e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7517135fe7c8f70adc897402f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Sep 10 09:08:35 2009 +0200 imm32/tests: Fix test failures on Vista/W2K8. --- dlls/imm32/tests/imm32.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 1951242..edda55b 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -191,10 +191,12 @@ static void test_ImmNotifyIME(void) { imc = ImmGetContext(hwnd); msg_spy_flush_msgs(); + ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); todo_wine { - ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " - "empty composition string should fail.\n"); + ok(!ret || + broken(ret), /* Vista and W2K8 */ + "Canceling an empty composition string should fail.\n"); } ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " @@ -214,10 +216,12 @@ static void test_ImmNotifyIME(void) { msg_spy_flush_msgs(); + ret = ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0); todo_wine { - ok(!ImmNotifyIME(imc, NI_COMPOSITIONSTR, CPS_CANCEL, 0), "Canceling an " - "empty composition string should fail.\n"); + ok(!ret || + broken(ret), /* Vista and W2K8 */ + "Canceling an empty composition string should fail.\n"); } ok(!msg_spy_find_msg(WM_IME_COMPOSITION), "Windows does not post " "WM_IME_COMPOSITION in response to NI_COMPOSITIONSTR / CPS_CANCEL, if " @@ -264,7 +268,9 @@ static void test_ImmSetCompositionString(void) ret = ImmSetCompositionStringW(imc, SCS_SETSTR, NULL, 0, NULL, 0); todo_wine - ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); + ok(!ret || + broken(ret), /* Vista and W2K8 */ + "ImmSetCompositionStringW() succeeded.\n"); ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR, NULL, 0, NULL, 0);

1 0

Paul Vriens : mshtml/tests: Fix some test failures on Win98 and WinME.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 094b6688817e42c74c0a95f65c1c0f8698059944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=094b6688817e42c74c0a95f65… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 9 22:31:50 2009 +0200 mshtml/tests: Fix some test failures on Win98 and WinME. --- dlls/mshtml/tests/htmldoc.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 97d451c..15aeca4 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -202,6 +202,13 @@ static const char *debugstr_guid(REFIID riid) return buf; } +static int strcmp_wa(LPCWSTR strw, const char *stra) +{ + CHAR buf[512]; + WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); + return lstrcmpA(stra, buf); +} + static BOOL is_english(void) { return PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH @@ -2553,18 +2560,13 @@ static void _test_readyState(unsigned line, IUnknown *unk) VARIANT out; HRESULT hres; - static const WCHAR wszUninitialized[] = {'u','n','i','n','i','t','i','a','l','i','z','e','d',0}; - static const WCHAR wszLoading[] = {'l','o','a','d','i','n','g',0}; - static const WCHAR wszInteractive[] = {'i','n','t','e','r','a','c','t','i','v','e',0}; - static const WCHAR wszComplete[] = {'c','o','m','p','l','e','t','e',0}; - - static const LPCWSTR expected_state[] = { - wszUninitialized, - wszLoading, + static const LPCSTR expected_state[] = { + "uninitialized", + "loading", NULL, - wszInteractive, - wszComplete, - wszUninitialized + "interactive", + "complete", + "uninitialized" }; if(!unk) @@ -2581,11 +2583,11 @@ static void _test_readyState(unsigned line, IUnknown *unk) hres = IHTMLDocument2_get_readyState(htmldoc, &state); ok(hres == S_OK, "get_ReadyState failed: %08x\n", hres); - if(!lstrcmpW(state, wszInteractive) && load_state == LD_LOADING) + if(!strcmp_wa(state, "interactive") && load_state == LD_LOADING) load_state = LD_INTERACTIVE; ok_(__FILE__, line) - (!lstrcmpW(state, expected_state[load_state]), "unexpected state %s, expected %d\n", + (!strcmp_wa(state, expected_state[load_state]), "unexpected state %s, expected %d\n", wine_dbgstr_w(state), load_state); SysFreeString(state);

1 0

Paul Vriens : shell32/tests: Fix a crash on Win9x.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 3a656fde1f3f981d5458422a628079d7ec94f7d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a656fde1f3f981d5458422a6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 9 20:24:47 2009 +0200 shell32/tests: Fix a crash on Win9x. --- dlls/shell32/tests/shelllink.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index a1e1cd4..ba2bb33 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -107,6 +107,7 @@ static void test_get_set(void) { HRESULT r; IShellLinkA *sl; + IShellLinkW *slW = NULL; char mypath[MAX_PATH]; char buffer[INFOTIPSIZE]; LPITEMIDLIST pidl, tmp_pidl; @@ -156,8 +157,16 @@ static void test_get_set(void) ok(SUCCEEDED(r), "GetPath failed (0x%08x)\n", r); ok(*buffer=='\0', "GetPath returned '%s'\n", buffer); - r = IShellLinkA_SetPath(sl, NULL); - ok(r==E_INVALIDARG, "SetPath failed (0x%08x)\n", r); + CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (LPVOID*)&slW); + if (!slW) + skip("SetPath with NULL parameter crashes on Win9x\n"); + else + { + IShellLinkW_Release(slW); + r = IShellLinkA_SetPath(sl, NULL); + ok(r==E_INVALIDARG, "SetPath failed (0x%08x)\n", r); + } r = IShellLinkA_SetPath(sl, ""); ok(r==S_OK, "SetPath failed (0x%08x)\n", r);

1 0

Paul Vriens : mscms/tests: Fix some test failures on Win98 and WinME.
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 2c2d0a416082a1d132ebc82f7dfddb6007233d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2d0a416082a1d132ebc82f7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Sep 9 21:11:10 2009 +0200 mscms/tests: Fix some test failures on Win98 and WinME. --- dlls/mscms/tests/profile.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 894d33c..4f71789 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -539,7 +539,8 @@ static void test_GetStandardColorSpaceProfileW() DWORD size; WCHAR oldprofile[MAX_PATH]; WCHAR newprofile[MAX_PATH]; - const WCHAR emptyW[] = {0}; + CHAR newprofileA[MAX_PATH]; + const CHAR empty[] = ""; DWORD zero = 0; DWORD sizeP = sizeof(newprofile); @@ -557,7 +558,9 @@ static void test_GetStandardColorSpaceProfileW() SetLastError(0xfaceabee); /* 2nd param, */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP); - ok( !ret && GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); + ok( (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) || + broken(ret), /* Win98 and WinME */ + "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); SetLastError(0xfaceabee); /* 3rd param, */ ret = pGetStandardColorSpaceProfileW(NULL, LCS_sRGB, NULL, &sizeP); @@ -590,8 +593,9 @@ static void test_GetStandardColorSpaceProfileW() SetLastError(0xfaceabee); /* maybe 2nd param. */ ret = pGetStandardColorSpaceProfileW(NULL, 0, newprofile, &sizeP); + WideCharToMultiByte(CP_ACP, 0, newprofile, -1, newprofileA, sizeof(newprofileA), NULL, NULL); if (!ret) ok( GetLastError() == ERROR_FILE_NOT_FOUND, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); - else ok( !lstrcmpiW( newprofile, emptyW ) && GetLastError() == 0xfaceabee, + else ok( !lstrcmpiA( newprofileA, empty ) && GetLastError() == 0xfaceabee, "GetStandardColorSpaceProfileW() returns %d (GLE=%d)\n", ret, GetLastError() ); /* Functional checks */

1 0

Hans Leidekker : msi: Open the database read/ write when the update count is greater than zero in MsiGetSummaryInformation .
by Alexandre Julliard 10 Sep '09

10 Sep '09

Module: wine Branch: master Commit: 3a7c2d005c244039c5d7e89e7b7e09ecfbea0e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7c2d005c244039c5d7e89e7… Author: Hans Leidekker <hans(a)meelstraat.net> Date: Wed Sep 9 20:11:48 2009 +0200 msi: Open the database read/write when the update count is greater than zero in MsiGetSummaryInformation. --- dlls/msi/suminfo.c | 4 +++- dlls/msi/tests/install.c | 5 +---- dlls/msi/tests/suminfo.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index a02f949..ef16665 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -475,7 +475,9 @@ UINT WINAPI MsiGetSummaryInformationW( MSIHANDLE hDatabase, if( szDatabase ) { - ret = MSI_OpenDatabaseW( szDatabase, NULL, &db ); + LPCWSTR persist = uiUpdateCount ? MSIDBOPEN_TRANSACT : MSIDBOPEN_READONLY; + + ret = MSI_OpenDatabaseW( szDatabase, persist, &db ); if( ret != ERROR_SUCCESS ) return ret; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3a22ca3..9d1237a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4491,10 +4491,7 @@ static void set_transform_summary_info(void) ok(r == ERROR_SUCCESS, "Failed to set summary info\n"); r = MsiSummaryInfoPersist(suminfo); - todo_wine - { - ok(r == ERROR_SUCCESS , "Failed to make summary info persist\n"); - } + ok(r == ERROR_SUCCESS , "Failed to make summary info persist\n"); r = MsiCloseHandle(suminfo); ok(r == ERROR_SUCCESS , "Failed to close suminfo\n"); diff --git a/dlls/msi/tests/suminfo.c b/dlls/msi/tests/suminfo.c index 3afd0d5..f0e7fdd 100644 --- a/dlls/msi/tests/suminfo.c +++ b/dlls/msi/tests/suminfo.c @@ -239,6 +239,32 @@ static void test_suminfo(void) r = MsiCloseHandle(hdb); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + /* filename, non-zero update count */ + MsiGetSummaryInformation(0, msifile, 1, &hsuminfo); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed\n"); + + r = MsiSummaryInfoSetProperty(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Mike"); + ok(r == ERROR_SUCCESS, "MsiSummaryInfoSetProperty wrong error\n"); + + r = MsiSummaryInfoPersist(hsuminfo); + ok(r == ERROR_SUCCESS, "MsiSummaryInfoPersist failed %u\n", r); + + r = MsiCloseHandle(hsuminfo); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed %u\n", r); + + /* filename, zero update count */ + MsiGetSummaryInformation(0, msifile, 0, &hsuminfo); + ok(r == ERROR_SUCCESS, "MsiGetSummaryInformation failed %u\n", r); + + r = MsiSummaryInfoSetProperty(hsuminfo, PID_AUTHOR, VT_LPSTR, 1, &ft, "Mike"); + todo_wine ok(r == ERROR_FUNCTION_FAILED, "MsiSummaryInfoSetProperty wrong error, %u\n", r); + + r = MsiSummaryInfoPersist(hsuminfo); + ok(r == ERROR_FUNCTION_FAILED, "MsiSummaryInfoPersist wrong error %u\n", r); + + r = MsiCloseHandle(hsuminfo); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = DeleteFile(msifile); ok(r, "DeleteFile failed\n"); } @@ -409,6 +435,12 @@ static void test_summary_binary(void) ok(r == ERROR_SUCCESS, "getpropcount failed\n"); todo_wine ok(count == 10, "prop count incorrect\n"); + r = MsiSummaryInfoSetProperty( hsuminfo, PID_TITLE, VT_LPSTR, 0, NULL, "Mike" ); + ok(r == ERROR_FUNCTION_FAILED, "MsiSummaryInfoSetProperty failed %u\n", r); + + r = MsiSummaryInfoPersist( hsuminfo ); + ok(r == ERROR_FUNCTION_FAILED, "MsiSummaryInfoPersist failed %u\n", r); + MsiCloseHandle( hsuminfo ); MsiCloseHandle( hdb );

1 0