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

Mikołaj Zalewski : shell32: RunFileDlg: use symbolic constants for control IDs and use correct hInstance when creating it .
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 13866e81f7e39f5219d6ffaee110305087ec849a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13866e81f7e39f5219d6ffaee… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Jun 27 17:28:57 2008 +0200 shell32: RunFileDlg: use symbolic constants for control IDs and use correct hInstance when creating it. --- dlls/shell32/dialogs.c | 11 +++++------ dlls/shell32/shell32_En.rc | 4 ++-- dlls/shell32/shresdef.h | 4 ++++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c index cb0e870..034768f 100644 --- a/dlls/shell32/dialogs.c +++ b/dlls/shell32/dialogs.c @@ -111,8 +111,7 @@ void WINAPI RunFileDlgW( return; } - DialogBoxIndirectParamW((HINSTANCE)GetWindowLongPtrW( hwndOwner, - GWLP_HINSTANCE ), + DialogBoxIndirectParamW(shell32_hInstance, template, hwndOwner, RunDlgProc, (LPARAM)&rfdp); } @@ -130,8 +129,8 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ; SendMessageW (GetDlgItem (hwnd, 12297), STM_SETICON, (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0); - FillList (GetDlgItem (hwnd, 12298), NULL) ; - SetFocus (GetDlgItem (hwnd, 12298)) ; + FillList (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH), NULL) ; + SetFocus (GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH)) ; return TRUE ; case WM_COMMAND : @@ -140,7 +139,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR case IDOK : { int ic ; - HWND htxt = GetDlgItem (hwnd, 12298); /* edit control */ + HWND htxt = GetDlgItem (hwnd, IDC_RUNDLG_EDITPATH); if ((ic = GetWindowTextLengthW (htxt))) { WCHAR *psz ; @@ -181,7 +180,7 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR EndDialog (hwnd, 0) ; return TRUE ; - case 12288 : + case IDC_RUNDLG_BROWSE : { HMODULE hComdlg = NULL ; LPFNOFN ofnProc = NULL ; diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 112d033..4fa268d 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -159,10 +159,10 @@ FONT 8, "MS Shell Dlg" ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE LTEXT "Type the name of a program, folder, document, or Internet resource, and Wine will open it for you.", 12289, 36, 11, 182, 18 LTEXT "&Open:", 12305, 7, 39, 24, 10 - CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 + CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "&Browse...", 12288, 170, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "&Browse...", IDC_RUNDLG_BROWSE, 170, 63, 50, 14, WS_TABSTOP } STRINGTABLE diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index cb11a80..be404e2 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -172,4 +172,8 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi #define IDC_ABOUT_STATIC_TEXT2 101 #define IDC_ABOUT_STATIC_TEXT3 102 +/* run dialog */ +#define IDC_RUNDLG_BROWSE 12288 +#define IDC_RUNDLG_EDITPATH 12298 + #endif

1 0

Alexandre Julliard : wpp: config.h and wine/port.h should be included first .
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 33017b0d936597d55025e006a6dc2bbf4ef733c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33017b0d936597d55025e006a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 12:52:00 2008 +0200 wpp: config.h and wine/port.h should be included first. --- libs/wpp/ppl.l | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 4bb928c..d500aef 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -121,6 +121,11 @@ * */ +%top{ +#include "config.h" +#include "wine/port.h" +} + /* * Special flex options and exclusive scanner start-conditions */ @@ -156,8 +161,6 @@ cident [a-zA-Z_][0-9a-zA-Z_]* ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] %{ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

Mikołaj Zalewski : shell32: RunFileDlg: the function should be Unicode on NT.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 032423760de36cee68359e680f5c25dda39be186 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032423760de36cee68359e680… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Jun 27 17:08:14 2008 +0200 shell32: RunFileDlg: the function should be Unicode on NT. --- dlls/shell32/dialogs.c | 128 +++++++++++++++++++++++++++++++++----------- dlls/shell32/shell32.spec | 2 +- 2 files changed, 97 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=032423760de36cee68359…

1 0

Alexandre Julliard : ntdll: Add some sanity checks for invalid relocation blocks.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 8e5f28127644344247056337a4eeca71f0e43322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e5f28127644344247056337a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 12:51:35 2008 +0200 ntdll: Add some sanity checks for invalid relocation blocks. --- dlls/ntdll/virtual.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index f14085d..ef97eb2 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1107,8 +1107,14 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz rel = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress); end = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress + relocs->Size); - while (rel < end && rel->SizeOfBlock) + while (rel <= end - 1 && rel->SizeOfBlock) { + if (rel->VirtualAddress >= total_size) + { + WARN_(module)( "invalid address %p in relocation %p\n", ptr + rel->VirtualAddress, rel ); + status = STATUS_ACCESS_VIOLATION; + goto error; + } rel = LdrProcessRelocationBlock( ptr + rel->VirtualAddress, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), (USHORT *)(rel + 1), delta );

1 0

Alexandre Julliard : Fix a few %ll printf formats.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: aa68258b7a8f422df058cbd6a8a0a6b0d10776c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa68258b7a8f422df058cbd6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 30 12:50:07 2008 +0200 Fix a few %ll printf formats. --- dlls/dmloader/loaderstream.c | 18 +++++++++--------- dlls/dmusic/instrument.c | 2 +- dlls/quartz/videorenderer.c | 4 +++- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index 97047cf..fb01cea 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -147,9 +147,9 @@ static HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Seek (LPSTREAM iface, ICOM_THIS_MULTI(IDirectMusicLoaderFileStream, StreamVtbl, iface); LARGE_INTEGER liNewPos; - TRACE_(dmfileraw)("(%p, 0x%08llX, %s, %p)\n", This, dlibMove.QuadPart, resolve_STREAM_SEEK(dwOrigin), plibNewPosition); + TRACE_(dmfileraw)("(%p, %s, %s, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), resolve_STREAM_SEEK(dwOrigin), plibNewPosition); - if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL; + if (This->hFile == INVALID_HANDLE_VALUE) return E_FAIL; liNewPos.u.HighPart = dlibMove.u.HighPart; liNewPos.u.LowPart = SetFilePointer (This->hFile, dlibMove.u.LowPart, &liNewPos.u.HighPart, dwOrigin); @@ -314,7 +314,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID* ppobj) { HRESULT WINAPI IDirectMusicLoaderResourceStream_Attach (LPSTREAM iface, LPBYTE pbMemData, LONGLONG llMemLength, LONGLONG llPos, LPDIRECTMUSICLOADER8 pLoader) { ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface); - TRACE("(%p, %p, 0x%08llX, 0x%08llx, %p)\n", This, pbMemData, llMemLength, llPos, pLoader); + TRACE("(%p, %p, %s, %s, %p)\n", This, pbMemData, wine_dbgstr_longlong(llMemLength), wine_dbgstr_longlong(llPos), pLoader); if (!pbMemData || !llMemLength) { WARN(": invalid pbMemData or llMemLength\n"); return E_FAIL; @@ -398,7 +398,7 @@ static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Read (LPSTREAM if static HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Seek (LPSTREAM iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { ICOM_THIS_MULTI(IDirectMusicLoaderResourceStream, StreamVtbl, iface); - TRACE_(dmfileraw)("(%p, 0x%08llX, %s, %p)\n", This, dlibMove.QuadPart, resolve_STREAM_SEEK(dwOrigin), plibNewPosition); + TRACE_(dmfileraw)("(%p, %s, %s, %p)\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), resolve_STREAM_SEEK(dwOrigin), plibNewPosition); switch (dwOrigin) { case STREAM_SEEK_CUR: { @@ -647,7 +647,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Read (LPSTREAM ifa static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Seek (LPSTREAM iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE_(dmfileraw)("(%p, 0x%08llX, %s, %p): redirecting to low-level stream\n", This, dlibMove.QuadPart, resolve_STREAM_SEEK(dwOrigin), plibNewPosition); + TRACE_(dmfileraw)("(%p, %s, %s, %p): redirecting to low-level stream\n", This, wine_dbgstr_longlong(dlibMove.QuadPart), resolve_STREAM_SEEK(dwOrigin), plibNewPosition); if (!This->pStream) return E_FAIL; @@ -685,7 +685,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Write (LPSTREAM if static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_SetSize (LPSTREAM iface, ULARGE_INTEGER libNewSize) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE("(%p, 0x%08llX): redirecting to low-level stream\n", This, libNewSize.QuadPart); + TRACE("(%p, %s): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libNewSize.QuadPart)); if (!This->pStream) return E_FAIL; @@ -694,7 +694,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_SetSize (LPSTREAM static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_CopyTo (LPSTREAM iface, IStream* pstm, ULARGE_INTEGER cb, ULARGE_INTEGER* pcbRead, ULARGE_INTEGER* pcbWritten) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE("(%p, %p, 0x%08llX, %p, %p): redirecting to low-level stream\n", This, pstm, cb.QuadPart, pcbRead, pcbWritten); + TRACE("(%p, %p, %s, %p, %p): redirecting to low-level stream\n", This, pstm, wine_dbgstr_longlong(cb.QuadPart), pcbRead, pcbWritten); if (!This->pStream) return E_FAIL; @@ -721,7 +721,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Revert (LPSTREAM i static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_LockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE("(%p, 0x%08llX, 0x%08llX, 0x%08X): redirecting to low-level stream\n", This, libOffset.QuadPart, cb.QuadPart, dwLockType); + TRACE("(%p, %s, %s, 0x%08X): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); if (!This->pStream) return E_FAIL; @@ -730,7 +730,7 @@ static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_LockRegion (LPSTRE static HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_UnlockRegion (LPSTREAM iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { ICOM_THIS_MULTI(IDirectMusicLoaderGenericStream, StreamVtbl, iface); - TRACE("(%p, 0x%08llX, 0x%08llX, 0x%08X): redirecting to low-level stream\n", This, libOffset.QuadPart, cb.QuadPart, dwLockType); + TRACE("(%p, %s, %s, 0x%08X): redirecting to low-level stream\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); if (!This->pStream) return E_FAIL; diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 3fd43f2..2312d51 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -150,7 +150,7 @@ HRESULT WINAPI IDirectMusicInstrumentImpl_Custom_Load (LPDIRECTMUSICINSTRUMENT i DWORD ListSize[4], ListCount[4]; LARGE_INTEGER liMove; /* used when skipping chunks */ - TRACE("(%p, %p, offset = 0x%04llx)\n", This, pStm, This->liInstrumentPosition.QuadPart); + TRACE("(%p, %p, offset = %s)\n", This, pStm, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart)); /* goto the beginning of chunk */ IStream_Seek (pStm, This->liInstrumentPosition, STREAM_SEEK_SET, NULL); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index bda9fdf..76b1a8a 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -444,7 +444,9 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) } else if (time > trefstop) { - TRACE("Dropping sample: Time: %lld ms trefstop: %lld ms!\n", time/10000, trefstop/10000); + TRACE("Dropping sample: Time: %u.%03u ms trefstop: %u.%03u ms!\n", + (DWORD)(time / 10000000), (DWORD)((time / 10000)%1000), + (DWORD)(trefstop / 10000000), (DWORD)((trefstop / 10000)%1000) ); This->rtLastStop = tStop; return S_OK; }

1 0

James Hawkins : ole32: Fix a test failure in win9x.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: e71e3efe77736d74dfc633dec4630001dee2397e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71e3efe77736d74dfc633dec… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:16:38 2008 -0500 ole32: Fix a test failure in win9x. --- dlls/ole32/tests/clipboard.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index e365ee8..26278b6 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -436,7 +436,10 @@ static void test_set_clipboard(void) CoInitialize(NULL); hr = OleSetClipboard(data1); todo_wine - ok(hr == CO_E_NOTINITIALIZED, "OleSetClipboard should have failed with CO_E_NOTINITIALIZED instead of 0x%08x\n", hr); + ok(hr == CO_E_NOTINITIALIZED || + hr == CLIPBRD_E_CANT_SET, /* win9x */ + "OleSetClipboard should have failed with " + "CO_E_NOTINITIALIZED or CLIPBRD_E_CANT_SET instead of 0x%08x\n", hr); CoUninitialize(); hr = OleInitialize(NULL);

1 0

James Hawkins : lz32: Fix a test failure in win9x.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 0cf9bd9c40d56ac5ed3e676838850796e1996d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf9bd9c40d56ac5ed3e67683… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:15:56 2008 -0500 lz32: Fix a test failure in win9x. --- dlls/lz32/tests/lzexpand_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/lz32/tests/lzexpand_main.c b/dlls/lz32/tests/lzexpand_main.c index c67883a..a296b28 100644 --- a/dlls/lz32/tests/lzexpand_main.c +++ b/dlls/lz32/tests/lzexpand_main.c @@ -369,7 +369,8 @@ static void test_LZOpenFileA(void) ok(file >= 0, "LZOpenFileA failed on creation\n"); ok(test.cBytes == sizeof(OFSTRUCT), "LZOpenFileA set test.cBytes to %d\n", test.cBytes); - ok(test.nErrCode == ERROR_SUCCESS, + ok(test.nErrCode == ERROR_SUCCESS || + test.nErrCode == ERROR_FILE_NOT_FOUND, /* win9x */ "LZOpenFileA set test.nErrCode to %d\n", test.nErrCode); ok(lstrcmpA(test.szPathName, expected) == 0, "LZOpenFileA returned '%s', but was expected to return '%s'\n",

1 0

James Hawkins : advapi32: Fix a test failure on a non-admin XP system.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: b9b25c73e0d2416519faf687b17e1e2b597b40db URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9b25c73e0d2416519faf687b… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:13:11 2008 -0500 advapi32: Fix a test failure on a non-admin XP system. --- dlls/advapi32/tests/registry.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 8602766..58c7202 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1161,7 +1161,9 @@ static void test_reg_query_value(void) SetLastError(0xdeadbeef); size = MAX_PATH; ret = RegQueryValueA((HKEY)0xcafebabe, "subkey", val, &size); - ok(ret == ERROR_INVALID_HANDLE || ret == ERROR_BADKEY, /* Windows 98 returns BADKEY */ + ok(ret == ERROR_INVALID_HANDLE || + ret == ERROR_BADKEY || /* Windows 98 returns BADKEY */ + ret == ERROR_ACCESS_DENIED, /* non-admin winxp */ "Expected ERROR_INVALID_HANDLE or ERROR_BADKEY, got %d\n", ret); ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %d\n", GetLastError());

1 0

James Hawkins : oleaut32: Trace the failing VarCmp result.
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: 192dbae55061a47392219511a6267b60b8a27be6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=192dbae55061a47392219511a… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:12:35 2008 -0500 oleaut32: Trace the failing VarCmp result. --- dlls/oleaut32/tests/vartest.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f2640cc..c3842bf 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -5411,8 +5411,8 @@ static void test_VarCat(void) V_BSTR(&expected) = SysAllocString(sz12_true); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_INT concat with VT_BOOL (TRUE) returned incorrect result\n"); + hres = VarCmp(&result,&expected,lcid,0); + ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08x\n", hres); VariantClear(&left); VariantClear(&right); @@ -5427,8 +5427,8 @@ static void test_VarCat(void) V_BSTR(&expected) = SysAllocString(sz12_false); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08x\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_INT concat with VT_BOOL (FALSE) returned inncorrect result\n"); + hres = VarCmp(&result,&expected,lcid,0); + ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08x\n", hres); VariantClear(&left); VariantClear(&right);

1 0

James Hawkins : comctl32: Remove an assumption that causes test failures if default icon spacing is not 43x43 .
by Alexandre Julliard June 30, 2008

June 30, 2008

Module: wine Branch: master Commit: e95bb17b4ae818731b07ddd599730e71176dbc21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95bb17b4ae818731b07ddd59… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Sun Jun 29 18:11:57 2008 -0500 comctl32: Remove an assumption that causes test failures if default icon spacing is not 43x43. --- dlls/comctl32/tests/listview.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6d66f22..23b5f90 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -848,9 +848,9 @@ static void test_icon_spacing(void) { /* LVM_SETICONSPACING */ /* note: LVM_SETICONSPACING returns the previous icon spacing if successful */ - /* note: the first test will fail if the default icon spacing is not (43,43) */ HWND hwnd; + WORD w, h; DWORD r; hwnd = create_custom_listview_control(LVS_ICON); @@ -859,17 +859,22 @@ static void test_icon_spacing(void) r = SendMessage(hwnd, WM_NOTIFYFORMAT, (WPARAM)hwndparent, (LPARAM)NF_REQUERY); expect(NFR_ANSI, r); + r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(-1, -1)); + w = LOWORD(r); + h = LOWORD(r); + flush_sequences(sequences, NUM_MSG_SEQUENCES); trace("test icon spacing\n"); - todo_wine { - r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(20, 30)); - expect(MAKELONG(43,43), r); - } - r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(25, 35)); - expect(MAKELONG(20,30), r); - r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(-1,-1)); - expect(MAKELONG(25,35), r); + + r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(20, 30)); + expect(MAKELONG(w,h), r); + + r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(25, 35)); + expect(MAKELONG(20,30), r); + + r = SendMessage(hwnd, LVM_SETICONSPACING, 0, (LPARAM) MAKELONG(-1,-1)); + expect(MAKELONG(25,35), r); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_icon_spacing_seq, "test icon spacing seq", FALSE);

1 0