August 2008 - Wine-Commits - list.winehq.org

James Hawkins : msi: Handle converting a value of REG_DWORD in MsiSourceListEnumMediaDisks.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: d880470dbfa1afed2a6f59e54d2f9e8a0a67e3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d880470dbfa1afed2a6f59e54… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:20:46 2008 -0500 msi: Handle converting a value of REG_DWORD in MsiSourceListEnumMediaDisks. --- dlls/msi/source.c | 27 ++++++++++++++++++++++++--- dlls/msi/tests/source.c | 11 ++++------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index d416f0f..5a714b1 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -208,9 +208,10 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, LPWSTR szDiskPrompt, LPDWORD pcchDiskPrompt) { WCHAR squished_pc[GUID_SIZE]; + WCHAR convert[11]; LPWSTR value = NULL; LPWSTR data = NULL; - LPWSTR ptr; + LPWSTR ptr, ptr2; HKEY source, media; DWORD valuesz, datasz = 0; DWORD type; @@ -219,6 +220,8 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, UINT r; static int index = 0; + static const WCHAR fmt[] = {'#','%','d',0}; + TRACE("(%s, %s, %d, %d, %d, %p, %p, %p, %p)\n", debugstr_w(szProductCodeOrPatchCode), debugstr_w(szUserSid), dwContext, dwOptions, dwIndex, szVolumeLabel, pcchVolumeLabel, szDiskPrompt, pcchDiskPrompt); @@ -285,6 +288,7 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, if (pdwDiskId) *pdwDiskId = atolW(value); + ptr2 = data; ptr = strchrW(data, ';'); if (!ptr) ptr = data; @@ -293,11 +297,19 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, if (pcchVolumeLabel) { - size = lstrlenW(data); + if (type == REG_DWORD) + { + sprintfW(convert, fmt, *data); + size = lstrlenW(convert); + ptr2 = convert; + } + else + size = lstrlenW(data); + if (size >= *pcchVolumeLabel) r = ERROR_MORE_DATA; else if (szVolumeLabel) - lstrcpyW(szVolumeLabel, data); + lstrcpyW(szVolumeLabel, ptr2); *pcchVolumeLabel = size; } @@ -307,6 +319,15 @@ UINT WINAPI MsiSourceListEnumMediaDisksW(LPCWSTR szProductCodeOrPatchCode, if (!*ptr) ptr++; + if (type == REG_DWORD) + { + sprintfW(convert, fmt, *ptr); + size = lstrlenW(convert); + ptr = convert; + } + else + size = lstrlenW(ptr); + size = lstrlenW(ptr); if (size >= *pcchDiskPrompt) r = ERROR_MORE_DATA; diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 148ea40..30b5be0 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -2864,13 +2864,10 @@ static void test_MsiSourceListEnumMediaDisks(void) prompt, &promptsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(id == 1, "Expected 1, got %d\n", id); - todo_wine - { - ok(!lstrcmpA(label, "#42"), "Expected \"#42\", got \"%s\"\n", label); - ok(labelsz == 3, "Expected 3, got %d\n", labelsz); - ok(!lstrcmpA(prompt, "#42"), "Expected \"#42\", got \"%s\"\n", prompt); - ok(promptsz == 3, "Expected 3, got %d\n", promptsz); - } + ok(!lstrcmpA(label, "#42"), "Expected \"#42\", got \"%s\"\n", label); + ok(labelsz == 3, "Expected 3, got %d\n", labelsz); + ok(!lstrcmpA(prompt, "#42"), "Expected \"#42\", got \"%s\"\n", prompt); + ok(promptsz == 3, "Expected 3, got %d\n", promptsz); RegDeleteValueA(media, "1"); RegDeleteValueA(media, "2");

1 0

James Hawkins : crypt32: Split the test for ret and last error up.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: a50fc2cc16ea6c48d5044f059c6d5d7a8e80567a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a50fc2cc16ea6c48d5044f059… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:20:09 2008 -0500 crypt32: Split the test for ret and last error up. --- dlls/crypt32/tests/encode.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 107ed3d..2b2119c 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -6387,8 +6387,9 @@ static void test_encodeCMSSignerInfo(DWORD dwEncoding) SetLastError(0xdeadbeef); ret = CryptEncodeObjectEx(dwEncoding, CMS_SIGNER_INFO, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - ok(!ret && GetLastError() == E_INVALIDARG, - "Expected E_INVALIDARG, got %08x\n", GetLastError()); + ok(!ret, "Expected failure, got %d\n", ret); + ok(GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); /* To be encoded, a signer must have a valid cert ID, where a valid ID may * be a key id or a issuer serial number with at least the issuer set, and * the encoding must include PKCS_7_ASN_ENCODING.

1 0

James Hawkins : comctl32: Fix a failing test in win2000.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 24bd8c0faf57e59871eb6f2c4bbbb1e5c3d7f8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24bd8c0faf57e59871eb6f2c4… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:19:30 2008 -0500 comctl32: Fix a failing test in win2000. --- dlls/comctl32/tests/updown.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 6f8e395..c24ff1e 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -70,6 +70,7 @@ static const struct message create_parent_wnd_seq[] = { { WM_CREATE, sent }, { WM_SHOWWINDOW, sent|wparam, 1 }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, + { WM_QUERYNEWPALETTE, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, 0 }, { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent|wparam, 1 },

1 0

James Hawkins : comctl32: Trace the message sequences.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: fd16a6112855538bafe1df2be268c51ec1479d38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd16a6112855538bafe1df2be… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:18:54 2008 -0500 comctl32: Trace the message sequences. --- dlls/comctl32/tests/trackbar.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 41f866e..7acecfe 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -401,6 +401,8 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP message != WM_GETICON && message != WM_DEVICECHANGE) { + trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; @@ -450,6 +452,8 @@ static LRESULT WINAPI trackbar_subclass_proc(HWND hwnd, UINT message, WPARAM wPa LRESULT ret; struct message msg; + trace("trackbar: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); + msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc;

1 0

James Hawkins : comctl32: Fix a test failure in win98.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 72f55763f696d0f84731e8af25f3ce6e159e3b0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72f55763f696d0f84731e8af2… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:18:17 2008 -0500 comctl32: Fix a test failure in win98. --- dlls/comctl32/tests/dpa.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 552387f..ae7fcb3 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -363,7 +363,9 @@ static void test_dpa(void) rc=CheckDPA(dpa, 0x123456, &dw); ok(rc, "dw=0x%x\n", dw); rc=CheckDPA(dpa2, 0x123456, &dw2); - ok(rc, "dw2=0x%x\n", dw2); + ok(rc || + broken(!rc), /* win98 */ + "dw2=0x%x\n", dw2); rc=CheckDPA(dpa3, 0x123456, &dw3); ok(rc, "dw3=0x%x\n", dw3); }

1 0

James Hawkins : comctl32: Fix several test failures in win98.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: eb86c5bb123a252c3ea269a750f8212896f5dac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb86c5bb123a252c3ea269a75… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:17:44 2008 -0500 comctl32: Fix several test failures in win98. --- dlls/comctl32/tests/comboex.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index 321b2a7..d0e0bb6 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -228,7 +228,8 @@ static void test_WM_LBUTTONDOWN(void) result = SendMessage(hCombo, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); ok(result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", GetLastError()); - ok(GetFocus() == hCombo, + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", GetFocus()); ok(SendMessage(hComboEx, CB_GETDROPPEDSTATE, 0, 0), @@ -239,7 +240,8 @@ static void test_WM_LBUTTONDOWN(void) result = SendMessage(hCombo, WM_LBUTTONUP, 0, MAKELPARAM(x, y)); ok(result, "WM_LBUTTONUP was not processed. LastError=%d\n", GetLastError()); - ok(GetFocus() == hCombo, + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", GetFocus()); @@ -251,14 +253,16 @@ static void test_WM_LBUTTONDOWN(void) result = SendMessage(hList, WM_MOUSEMOVE, 0, MAKELPARAM(x, y)); ok(!result, "WM_MOUSEMOVE was not processed. LastError=%d\n", GetLastError()); - ok(GetFocus() == hCombo, + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", GetFocus()); result = SendMessage(hList, WM_LBUTTONDOWN, 0, MAKELPARAM(x, y)); ok(!result, "WM_LBUTTONDOWN was not processed. LastError=%d\n", GetLastError()); - ok(GetFocus() == hCombo, + ok(GetFocus() == hCombo || + broken(GetFocus() != hCombo), /* win98 */ "Focus not on ComboBoxEx's ComboBox Control, instead on %p\n", GetFocus()); ok(SendMessage(hComboEx, CB_GETDROPPEDSTATE, 0, 0), @@ -270,10 +274,15 @@ static void test_WM_LBUTTONDOWN(void) todo_wine ok(GetFocus() == hEdit, "Focus not on ComboBoxEx's Edit Control, instead on %p\n", GetFocus()); - ok(!SendMessage(hCombo, CB_GETDROPPEDSTATE, 0, 0), + + result = SendMessage(hCombo, CB_GETDROPPEDSTATE, 0, 0); + ok(!result || + broken(result != 0), /* win98 */ "The dropdown list should have been rolled up.\n"); idx = SendMessage(hComboEx, CB_GETCURSEL, 0, 0); - ok(idx == 4, "Current Selection: expected %d, got %d\n", 4, idx); + ok(idx == 4 || + broken(idx == -1), /* win98 */ + "Current Selection: expected %d, got %d\n", 4, idx); DestroyWindow(hComboEx); }

1 0

James Hawkins : crypt32: Fix a failing test in Vista.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 56d5a7f16946975e72686807cda5363341536585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d5a7f16946975e72686807c… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:16:38 2008 -0500 crypt32: Fix a failing test in Vista. --- dlls/crypt32/tests/oid.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/oid.c b/dlls/crypt32/tests/oid.c index 0ec6c29..a583fc7 100644 --- a/dlls/crypt32/tests/oid.c +++ b/dlls/crypt32/tests/oid.c @@ -102,9 +102,10 @@ static void testOIDToAlgID(void) ok(!alg, "Expected failure, got %d\n", alg); ok(GetLastError() == 0xdeadbeef || GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND || + GetLastError() == ERROR_INVALID_PARAMETER || /* Vista */ GetLastError() == ERROR_SUCCESS, /* win2k */ - "Expected ERROR_RESOURCE_NAME_NOT_FOUND, ERROR_SUCCESS " - "or no error set, got %08x\n", GetLastError()); + "Expected ERROR_RESOURCE_NAME_NOT_FOUND, ERROR_INVALID_PARAMETER, " + "ERROR_SUCCESS or no error set, got %08x\n", GetLastError()); for (i = 0; i < sizeof(oidToAlgID) / sizeof(oidToAlgID[0]); i++) {

1 0

James Hawkins : rpcrt4: Fix several test failures in Vista.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 080d8e7261b995e6dd783b75a67ab4d830bdef10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=080d8e7261b995e6dd783b75a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:17:12 2008 -0500 rpcrt4: Fix several test failures in Vista. --- dlls/rpcrt4/tests/ndr_marshall.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 7c538c6..67dfae5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1185,6 +1185,9 @@ static void test_client_init(void) TEST_ZERO(fInDontFree, "%d"); TEST_ZERO(fDontCallFreeInst, "%d"); TEST_ZERO(fInOnlyParam, "%d"); + ok(stubMsg.fInOnlyParam == 0 || + stubMsg.fInOnlyParam == -1, /* Vista */ + "fInOnlyParam should have been set to 0 or -1 instead of %d\n", stubMsg.fInOnlyParam); TEST_ZERO(fHasReturn, "%d"); TEST_ZERO(fHasExtensions, "%d"); TEST_ZERO(fHasNewCorrDesc, "%d"); @@ -1195,7 +1198,9 @@ static void test_client_init(void) TEST_ZERO(fHasMemoryValidateCallback, "%d"); TEST_ZERO(fInFree, "%d"); TEST_ZERO(fNeedMCCP, "%d"); - TEST_ZERO(fUnused, "0x%x"); + ok(stubMsg.fUnused == 0 || + stubMsg.fUnused == -2, /* Vista */ + "fUnused should have been set to 0 or -2 instead of %d\n", stubMsg.fUnused); ok(stubMsg.fUnused2 == 0xffffcccc, "stubMsg.fUnused2 should have been 0xffffcccc instead of 0x%x\n", stubMsg.fUnused2); ok(stubMsg.dwDestContext == MSHCTX_DIFFERENTMACHINE, "stubMsg.dwDestContext should have been MSHCTX_DIFFERENTMACHINE instead of %d\n", stubMsg.dwDestContext); TEST_ZERO(pvDestContext, "%p"); @@ -1271,7 +1276,9 @@ todo_wine "stubMsg.pPointerQueueState should have been unset instead of %p\n", stubMsg.pPointerQueueState); TEST_ZERO(IgnoreEmbeddedPointers, "%d"); TEST_ZERO(PointerBufferMark, "%p"); - ok(stubMsg.CorrDespIncrement == 0xcc, "CorrDespIncrement should have been unset instead of 0x%x\n", stubMsg.CorrDespIncrement); + ok(stubMsg.CorrDespIncrement == 0xcc || + stubMsg.CorrDespIncrement == 0, + "CorrDespIncrement should have been unset instead of 0x%x\n", stubMsg.CorrDespIncrement); TEST_ZERO(uFlags, "%d"); /* FIXME: UniquePtrCount */ TEST_ULONG_PTR_UNSET(MaxCount); @@ -1289,7 +1296,9 @@ todo_wine TEST_ZERO(PointerLength, "%d"); TEST_ZERO(fInDontFree, "%d"); TEST_ZERO(fDontCallFreeInst, "%d"); - TEST_ZERO(fInOnlyParam, "%d"); + ok(stubMsg.fInOnlyParam == 0 || + stubMsg.fInOnlyParam == -1, /* Vista */ + "fInOnlyParam should have been set to 0 or -1 instead of %d\n", stubMsg.fInOnlyParam); TEST_ZERO(fHasReturn, "%d"); TEST_ZERO(fHasExtensions, "%d"); TEST_ZERO(fHasNewCorrDesc, "%d"); @@ -1300,7 +1309,9 @@ todo_wine TEST_ZERO(fHasMemoryValidateCallback, "%d"); TEST_ZERO(fInFree, "%d"); TEST_ZERO(fNeedMCCP, "%d"); - TEST_ZERO(fUnused, "0x%x"); + ok(stubMsg.fUnused == 0 || + stubMsg.fUnused == -2, /* Vista */ + "fUnused should have been set to 0 or -2 instead of %d\n", stubMsg.fUnused); ok(stubMsg.fUnused2 == 0xffffcccc, "stubMsg.fUnused2 should have been 0xffffcccc instead of 0x%x\n", stubMsg.fUnused2); ok(stubMsg.dwDestContext == MSHCTX_DIFFERENTMACHINE, "stubMsg.dwDestContext should have been MSHCTX_DIFFERENTMACHINE instead of %d\n", stubMsg.dwDestContext); TEST_ZERO(pvDestContext, "%p");

1 0

James Hawkins : lz32: Fix several failing tests in win95.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 77f61567243ca57188f4bfe44f13850c1b63f241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f61567243ca57188f4bfe44… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:16:02 2008 -0500 lz32: Fix several failing tests in win95. --- dlls/lz32/tests/lzexpand_main.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index a296b28..07cfe5f 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -230,7 +230,8 @@ static void test_LZOpenFileA_existing_compressed(void) /* d, using underscore-terminated file name. */ file = LZOpenFileA(_terminated, &test, OF_EXIST); ok(file >= 0, "LZOpenFileA failed on switching to a compressed file name\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == 0, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -388,7 +389,8 @@ static void test_LZOpenFileA(void) /* a, for reading. */ file = LZOpenFileA(filename_, &test, OF_READ); ok(file >= 0, "LZOpenFileA failed on read\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -403,7 +405,8 @@ static void test_LZOpenFileA(void) /* b, for writing. */ file = LZOpenFileA(filename_, &test, OF_WRITE); ok(file >= 0, "LZOpenFileA failed on write\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -418,7 +421,8 @@ static void test_LZOpenFileA(void) /* c, for reading and writing. */ file = LZOpenFileA(filename_, &test, OF_READWRITE); ok(file >= 0, "LZOpenFileA failed on read/write\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -433,7 +437,8 @@ static void test_LZOpenFileA(void) /* d, for checking file existence. */ file = LZOpenFileA(filename_, &test, OF_EXIST); ok(file >= 0, "LZOpenFileA failed on read/write\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); @@ -448,7 +453,8 @@ static void test_LZOpenFileA(void) /* Delete the file then make sure it doesn't exist anymore. */ file = LZOpenFileA(filename_, &test, OF_DELETE); ok(file >= 0, "LZOpenFileA failed on delete\n"); - ok(test.cBytes == sizeof(OFSTRUCT), + ok(test.cBytes == sizeof(OFSTRUCT) || + broken(test.cBytes == 40), /* win95 */ "LZOpenFileA set test.cBytes to %d\n", test.cBytes); ok(test.nErrCode == ERROR_SUCCESS, "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode);

1 0

James Hawkins : kernel32: Trace the last error on failure.
by Alexandre Julliard Aug. 29, 2008

Aug. 29, 2008

Module: wine Branch: master Commit: 7d7d7992846103582bb7147ed36e2a515089b562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d7d7992846103582bb7147ed… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Thu Aug 28 21:15:27 2008 -0500 kernel32: Trace the last error on failure. --- dlls/kernel32/tests/resource.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 79d17f1..9f8dcce 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -185,10 +185,10 @@ static void update_resources_version(void) MAKEINTRESOURCE(0x4567), 0xabcd, foo, sizeof foo ); - ok( r == TRUE, "UpdateResource failed\n"); + ok( r == TRUE, "UpdateResource failed: %d\n", GetLastError()); r = EndUpdateResource( res, FALSE ); - ok( r, "EndUpdateResource failed\n"); + ok( r, "EndUpdateResource failed: %d\n", GetLastError()); }

1 0