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

Lei Zhang : user32: Add more dialog with edit control tests.
by Alexandre Julliard March 28, 2008

March 28, 2008

Module: wine Branch: master Commit: 5d6bf737dbac8730b1ed229e88ec0a604239551e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6bf737dbac8730b1ed229e8… Author: Lei Zhang <thestig(a)google.com> Date: Thu Mar 27 12:17:23 2008 -0700 user32: Add more dialog with edit control tests. --- dlls/user32/tests/edit.c | 109 ++++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/resource.rc | 10 ++++ 2 files changed, 113 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index c8ae56c..0d15641 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -47,6 +47,7 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA SetFocus(hedit); switch (lparam) { + /* from bug 11841 */ case 0: PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); break; @@ -55,8 +56,40 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA break; case 2: PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); - PostMessage(hdlg, WM_USER, 0xdeadbeef, 0xdeadbeef); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); break; + + /* more test cases for WM_CHAR */ + case 3: + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 4: + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 5: + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + + /* more test cases for WM_KEYDOWN + WM_CHAR */ + case 6: + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); + PostMessage(hedit, WM_CHAR, VK_ESCAPE, 0x10001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 0); + break; + case 7: + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); + PostMessage(hedit, WM_CHAR, VK_RETURN, 0x1c0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + case 8: + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); + PostMessage(hedit, WM_CHAR, VK_TAB, 0xf0001); + PostMessage(hdlg, WM_USER, 0xdeadbeef, 1); + break; + default: break; } @@ -83,13 +116,37 @@ static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPA break; case WM_USER: - if (wparam != 0xdeadbeef || lparam != 0xdeadbeef) + { + int len; + HWND hok = GetDlgItem(hdlg, IDOK); + HWND hedit = GetDlgItem(hdlg, 1000); + + if (wparam != 0xdeadbeef) break; - if (GetFocus() == GetDlgItem(hdlg, IDOK)) - EndDialog(hdlg, 444); - else - EndDialog(hdlg, 555); + + switch (lparam) + { + case 0: + len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); + if (len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + case 1: + len = SendMessage(hedit, WM_GETTEXTLENGTH, 0, 0); + if ((GetFocus() == hok) && len == 0) + EndDialog(hdlg, 444); + else + EndDialog(hdlg, 555); + break; + + default: + EndDialog(hdlg, 555); + } break; + } case WM_CLOSE: EndDialog(hdlg, 333); @@ -1210,6 +1267,46 @@ static void test_edit_dialog(void) ok(111 == r, "Expected %d, got %d\n", 111, r); r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 2); ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* more tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 4); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 5); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* more tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests with an editable edit control */ + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 0); + ok(333 == r, "Expected %d, got %d\n", 333, r); + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 1); + ok(111 == r, "Expected %d, got %d\n", 111, r); + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 2); + ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 3); + ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 4); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 5); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + + /* tests for WM_KEYDOWN + WM_CHAR */ + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 6); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 7); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); + r = DialogBoxParam(hinst, "EDIT_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 8); + todo_wine ok(444 == r, "Expected %d, got %d\n", 444, r); } static BOOL RegisterWindowClasses (void) diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 2945466..b0c4967 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -98,6 +98,16 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 END +EDIT_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER +CAPTION "Edit Test" +FONT 8, "MS Shell Dlg" +{ + PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Cancel", IDCANCEL, 100, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + EDITTEXT 1000, 5, 5, 150, 50, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL +} + EDIT_READONLY_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER CAPTION "Edit Readonly Test"

1 0

Lei Zhang : user32: Make an edit test more readable.
by Alexandre Julliard March 28, 2008

March 28, 2008

Module: wine Branch: master Commit: 1560203215f19a969c91564e99161876a52858a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1560203215f19a969c91564e9… Author: Lei Zhang <thestig(a)google.com> Date: Thu Mar 27 11:48:44 2008 -0700 user32: Make an edit test more readable. --- dlls/user32/tests/edit.c | 23 +++++++++++++---------- dlls/user32/tests/resource.rc | 4 ++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 05e6741..c8ae56c 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -37,23 +37,24 @@ struct edit_notify { static struct edit_notify notifications; -static INT_PTR CALLBACK bug_11841_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +static INT_PTR CALLBACK edit_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) { case WM_INITDIALOG: { - SetFocus(GetDlgItem(hdlg, 1000)); + HWND hedit = GetDlgItem(hdlg, 1000); + SetFocus(hedit); switch (lparam) { case 0: - PostMessage(GetDlgItem(hdlg, 1000), WM_KEYDOWN, 0x1b, 0x10001); + PostMessage(hedit, WM_KEYDOWN, VK_ESCAPE, 0x10001); break; case 1: - PostMessage(GetDlgItem(hdlg, 1000), WM_KEYDOWN, 0xd, 0x1c0001); + PostMessage(hedit, WM_KEYDOWN, VK_RETURN, 0x1c0001); break; case 2: - PostMessage(GetDlgItem(hdlg, 1000), WM_KEYDOWN, 0x9, 0xf0001); + PostMessage(hedit, WM_KEYDOWN, VK_TAB, 0xf0001); PostMessage(hdlg, WM_USER, 0xdeadbeef, 0xdeadbeef); break; default: @@ -1198,14 +1199,16 @@ static void test_undo(void) DestroyWindow (hwEdit); } -static void test_bug_11841(void) +static void test_edit_dialog(void) { int r; - r = DialogBoxParam(hinst, "BUG_11841_DIALOG", NULL, (DLGPROC)bug_11841_proc, 0); + + /* from bug 11841 */ + r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 0); ok(333 == r, "Expected %d, got %d\n", 333, r); - r = DialogBoxParam(hinst, "BUG_11841_DIALOG", NULL, (DLGPROC)bug_11841_proc, 1); + r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 1); ok(111 == r, "Expected %d, got %d\n", 111, r); - r = DialogBoxParam(hinst, "BUG_11841_DIALOG", NULL, (DLGPROC)bug_11841_proc, 2); + r = DialogBoxParam(hinst, "EDIT_READONLY_DIALOG", NULL, (DLGPROC)edit_dialog_proc, 2); ok(444 == r, "Expected %d, got %d\n", 444, r); } @@ -1277,7 +1280,7 @@ START_TEST(edit) test_text_position(); test_espassword(); test_undo(); - test_bug_11841(); + test_edit_dialog(); UnregisterWindowClasses(); } diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index a68857f..2945466 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -98,9 +98,9 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 END -BUG_11841_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 +EDIT_READONLY_DIALOG DIALOG DISCARDABLE 0, 0, 160, 80 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | DS_CENTER -CAPTION "Bug 11841 Test" +CAPTION "Edit Readonly Test" FONT 8, "MS Shell Dlg" { PUSHBUTTON "Ok", IDOK, 20, 60, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP

1 0

Austin English : Spelling fixes.
by Alexandre Julliard March 27, 2008

March 27, 2008

Module: wine Branch: master Commit: 06d429d6b6b6d63beaeda130a3bb261ef3b9fb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d429d6b6b6d63beaeda130a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 27 12:57:17 2008 -0500 Spelling fixes. --- dlls/advapi32/service.c | 2 +- dlls/comctl32/rebar.c | 2 +- dlls/d3d8/directx.c | 2 +- dlls/dbghelp/stabs.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- dlls/dmime/performance.c | 6 +++--- dlls/dmime/segment.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 007d2b0..82b5d12 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -2056,7 +2056,7 @@ QueryServiceConfigW( SC_HANDLE hService, * QueryServiceConfig2A [ADVAPI32.@] * * Note - * observed unter win2k: + * observed under win2k: * The functions QueryServiceConfig2A and QueryServiceConfig2W return the same * required buffer size (in byte) at least for dwLevel SERVICE_CONFIG_DESCRIPTION */ diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 7b1f008..033b474 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1153,7 +1153,7 @@ static int get_row_end_for_band(const REBAR_INFO *infoPtr, INT iBand) return iBand; } -/* Compute the rcBand.{left,right} from the cxEffective bands widths computed earier. +/* Compute the rcBand.{left,right} from the cxEffective bands widths computed earlier. * iBeginBand must be visible */ static void REBAR_SetRowRectsX(const REBAR_INFO *infoPtr, INT iBeginBand, INT iEndBand) { diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index c61824d..6bffcb1 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -295,7 +295,7 @@ ULONG WINAPI D3D8CB_DestroyRenderTarget(IWineD3DSurface *pSurface) { return IDirect3DSurface8_Release((IDirect3DSurface8*) surfaceParent); } -/* Callback for creating the implicite swapchain when the device is created */ +/* Callback for creating the implicit swapchain when the device is created */ static HRESULT WINAPI D3D8CB_CreateAdditionalSwapChain(IUnknown *device, WINED3DPRESENT_PARAMETERS* pPresentationParameters, IWineD3DSwapChain ** ppSwapChain){ diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index cc750c6..d597848 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -1147,7 +1147,7 @@ static void pending_flush(struct pending_block* pending, struct module* module, * Ends function creation: mainly: * - cleans up line number information * - tries to set up a debug-start tag (FIXME: heuristic to be enhanced) - * - for stabs which have abolute address in them, initializes the size of the + * - for stabs which have absolute address in them, initializes the size of the * function (assuming that current function ends where next function starts) */ static void stabs_finalize_function(struct module* module, struct symt_function* func, diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index 82e50c3..87837ff 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -288,7 +288,7 @@ static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState( } /****************************************************************************** - * GetCapabilities : get the device capablitites + * GetCapabilities : get the device capabilities */ static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities( LPDIRECTINPUTDEVICE8A iface, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 3c3b3c3..1dc6a03 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -590,7 +590,7 @@ static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, } /****************************************************************************** - * GetCapabilities : get the device capablitites + * GetCapabilities : get the device capabilities */ static HRESULT WINAPI SysMouseAImpl_GetCapabilities( LPDIRECTINPUTDEVICE8A iface, diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 9c518ef..9730104 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -239,7 +239,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_Init (LPDIRECTMUSICPERFORMANC This->pDirectMusic = (IDirectMusic8*) *ppDirectMusic; IDirectMusic8_AddRef(This->pDirectMusic); } else { - /* app allows the performance to initialise itfself and needs a pointer to object*/ + /* app allows the performance to initialise itself and needs a pointer to object*/ CoCreateInstance (&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, (void**)&This->pDirectMusic); if (ppDirectMusic) { *ppDirectMusic = (LPDIRECTMUSIC) This->pDirectMusic; @@ -758,7 +758,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_InitAudio (LPDIRECTMUSICPERFO IDirectMusicPerformance8Impl_Init(iface, ppDirectMusic, dsound, hWnd); - /* Init increases the ref count of the dsound object. Decremente it if the app don't want a pointer to the object. */ + /* Init increases the ref count of the dsound object. Decrement it if the app doesn't want a pointer to the object. */ if (NULL == ppDirectSound) { IDirectSound_Release(This->pDirectSound); } @@ -872,7 +872,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath (LPDI desc.dwFlags |= DSBCAPS_CTRLFREQUENCY; break; case DMUS_APATH_SHARED_STEREOPLUSREVERB: - /* normally we havet to create 2 buffers (one for music other for reverb) + /* normally we have to create 2 buffers (one for music other for reverb) * in this case. See msdn */ case DMUS_APATH_DYNAMIC_STEREO: diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 1daee42..a90bd4c 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -175,7 +175,7 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicSegment8_GetTrack (LP if (FALSE == IsEqualGUID(&GUID_NULL, rguidType)) { /** * it rguidType is not null we must check if CLSID are equals - * and the unqiue way to get it its using IPersistStream Interface + * and the unique way to get it is using IPersistStream Interface */ hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); if (FAILED(hr)) {

1 0

Michael Stefaniuc : wordpad: Remove bogus '; ' after the if statement.
by Alexandre Julliard March 27, 2008

March 27, 2008

Module: wine Branch: master Commit: 1bdd2ab628bfca001fda5e6756a8a9eea982d4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bdd2ab628bfca001fda5e675… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Mar 27 16:32:35 2008 +0100 wordpad: Remove bogus ';' after the if statement. --- programs/wordpad/print.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index 187a9ec..2a44132 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -629,7 +629,7 @@ void draw_preview_page(HDC hdc, HDC* hdcSized, FORMATRANGE* lpFr, float ratio, i int LeftMargin = (int)((float)twips_to_pixels(lpFr->rc.left, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); int RightMargin = (int)((float)twips_to_pixels(lpFr->rc.right, GetDeviceCaps(hdc, LOGPIXELSY)) * ratio); - if(*hdcSized); + if(*hdcSized) DeleteDC(*hdcSized); *hdcSized = CreateCompatibleDC(hdc); SelectObject(*hdcSized, hBitmapScaled);

1 0

Christopher Berner : setupapi: Fix buffer size in SetupDiGetDeviceInterfaceDetailW.
by Alexandre Julliard March 27, 2008

March 27, 2008

Module: wine Branch: master Commit: 6bc8e9a11693f52d1f75dab0ac8df53a0d212adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bc8e9a11693f52d1f75dab0a… Author: Christopher Berner <raccoonone(a)procyongames.com> Date: Wed Mar 26 21:38:53 2008 -0700 setupapi: Fix buffer size in SetupDiGetDeviceInterfaceDetailW. --- dlls/setupapi/devinst.c | 2 +- dlls/setupapi/tests/devinst.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f7c3839..936f6a7 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2971,7 +2971,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( } info = (struct InterfaceInfo *)DeviceInterfaceData->Reserved; if (info->symbolicLink) - bytesNeeded += lstrlenW(info->symbolicLink); + bytesNeeded += sizeof(WCHAR)*lstrlenW(info->symbolicLink); if (DeviceInterfaceDetailDataSize >= bytesNeeded) { if (info->symbolicLink) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index ef0d8d6..eb72408 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -627,6 +627,7 @@ static void testGetDeviceInterfaceDetail(void) LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, size); SP_DEVICE_INTERFACE_DETAIL_DATA_A *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_A *)buf; + DWORD expectedsize = offsetof(SP_DEVICE_INTERFACE_DETAIL_DATA_W, DevicePath) + sizeof(WCHAR)*(1 + strlen(path)); detail->cbSize = 0; SetLastError(0xdeadbeef); @@ -656,6 +657,10 @@ static void testGetDeviceInterfaceDetail(void) GetLastError()); ok(!lstrcmpiA(path, detail->DevicePath), "Unexpected path %s\n", detail->DevicePath); + /* Check SetupDiGetDeviceInterfaceDetailW */ + ret = SetupDiGetDeviceInterfaceDetailW(set, &interfaceData, NULL, 0, &size, NULL); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got error code: %d\n", GetLastError()); + ok(expectedsize == size, "SetupDiGetDeviceInterfaceDetailW returned wrong reqsize: expected %d, got %d\n", expectedsize, size); HeapFree(GetProcessHeap(), 0, buf); } pSetupDiDestroyDeviceInfoList(set);

1 0

Jacek Caban : mshtml: Don't access released object in release_script_hosts.
by Alexandre Julliard March 27, 2008

March 27, 2008

Module: wine Branch: master Commit: 7b48298e2755a18a7782aac87f06ce880e9c1e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b48298e2755a18a7782aac87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 27 19:08:07 2008 +0100 mshtml: Don't access released object in release_script_hosts. --- dlls/mshtml/script.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 6433ac0..40509f3 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -304,8 +304,11 @@ void release_script_hosts(HTMLDocument *doc) { ScriptHost *iter; - LIST_FOR_EACH_ENTRY(iter, &doc->script_hosts, ScriptHost, entry) { + while(!list_empty(&doc->script_hosts)) { + iter = LIST_ENTRY(list_head(&doc->script_hosts), ScriptHost, entry); + + list_remove(&iter->entry); iter->doc = NULL; - IActiveScriptSite_Release(ACTSCPSITE(iter)); + IActiveScript_Release(ACTSCPSITE(iter)); } }

1 0

Kusanagi Kouichi : regedit: Fix Japanese resource.
by Alexandre Julliard March 27, 2008

March 27, 2008

Module: wine Branch: master Commit: 819d16729de2cd2ce9dd569280db03f66ca31b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=819d16729de2cd2ce9dd56928… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Mar 28 00:43:24 2008 +0900 regedit: Fix Japanese resource. --- programs/regedit/Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/Ja.rc b/programs/regedit/Ja.rc index 129bebf..823f80e 100644 --- a/programs/regedit/Ja.rc +++ b/programs/regedit/Ja.rc @@ -59,7 +59,7 @@ BEGIN MENUITEM "��(&F)\tCtrl+F", ID_EDIT_FIND, GRAYED MENUITEM "��̌��(&x)\tF3", ID_EDIT_FINDNEXT, GRAYED END - POPUP "�\��(&V)" + POPUP "�\\��(&V)" BEGIN MENUITEM "�X�e�[�^�X�o�[(&B)", ID_VIEW_STATUSBAR MENUITEM SEPARATOR

1 0

Dmitry Timoshkov : user32: Add a defwinproc flag when appropriate.
by Alexandre Julliard March 27, 2008

March 27, 2008

Module: wine Branch: master Commit: 854413e5cfc05a351bd522037839139d8fcd00c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=854413e5cfc05a351bd522037… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 27 22:40:57 2008 +0800 user32: Add a defwinproc flag when appropriate. --- dlls/user32/tests/msg.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ca166d8..6f37f48 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4924,7 +4924,7 @@ static void test_static_messages(void) static const struct message WmKeyDownComboSeq[] = { { WM_KEYDOWN, sent|wparam|lparam, VK_DOWN, 0 }, - { WM_COMMAND, sent|wparam, MAKEWPARAM(1000, LBN_SELCHANGE) }, + { WM_COMMAND, sent|wparam|defwinproc, MAKEWPARAM(1000, LBN_SELCHANGE) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_COMBOBOX, CBN_SELENDOK) }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_COMBOBOX, CBN_SELCHANGE) }, { WM_CTLCOLOREDIT, sent|parent }, @@ -4954,6 +4954,7 @@ static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wPara msg.message = message; msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; add_message(&msg); @@ -6838,6 +6839,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) !lstrcmpiA(buf, "my_edit_class") || !lstrcmpiA(buf, "static") || !lstrcmpiA(buf, "ListBox") || + !lstrcmpiA(buf, "ComboBox") || !lstrcmpiA(buf, "MyDialogClass") || !lstrcmpiA(buf, "#32770")) { @@ -6886,6 +6888,7 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, !lstrcmpiA(buf, "my_edit_class") || !lstrcmpiA(buf, "static") || !lstrcmpiA(buf, "ListBox") || + !lstrcmpiA(buf, "ComboBox") || !lstrcmpiA(buf, "MyDialogClass") || !lstrcmpiA(buf, "#32770")) { @@ -10112,7 +10115,7 @@ static const struct message wm_lb_click_0[] = { WM_IME_SETCONTEXT, sent|wparam|optional|parent, 0 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_SETFOCUS, sent }, + { WM_SETFOCUS, sent|defwinproc }, { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x001142f2 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_LISTBOX, LBN_SETFOCUS) }, @@ -10132,7 +10135,7 @@ static const struct message wm_lb_click_0[] = { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, - { WM_CAPTURECHANGED, sent|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_LISTBOX, LBN_SELCHANGE) }, { 0 } }; @@ -10161,6 +10164,7 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR msg.message = message; msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wp; msg.lParam = lp; add_message(&msg);

1 0

Reece Dunn : shlwapi: Added basic tests for the SHCreateStreamOnFile IStream implementation.
by Alexandre Julliard March 27, 2008

March 27, 2008

Module: wine Branch: master Commit: de3c19c2f09f0fa250fb9c5bf5062da23ef5ccac URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3c19c2f09f0fa250fb9c5bf… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Thu Mar 27 09:34:15 2008 +0000 shlwapi: Added basic tests for the SHCreateStreamOnFile IStream implementation. --- dlls/shlwapi/tests/istream.c | 173 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 173 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de3c19c2f09f0fa250fb9…

1 0

Reece Dunn : shlwapi: Added STGM_TRANSACTED tests for SHCreateStreamOnFileA /W/Ex.
by Alexandre Julliard March 27, 2008

March 27, 2008

Module: wine Branch: master Commit: 2679453f045ea924b845f9c80c73ff05d0faaba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2679453f045ea924b845f9c80… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Wed Mar 26 21:03:07 2008 +0000 shlwapi: Added STGM_TRANSACTED tests for SHCreateStreamOnFileA/W/Ex. --- dlls/shlwapi/tests/istream.c | 54 +++++++++++++++++++++++++++++------------ 1 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 59384fc..a639985 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -68,6 +68,11 @@ static void test_SHCreateStreamOnFileA(DWORD mode) ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); + stream = NULL; + ret = (*pSHCreateStreamOnFileA)(test_file, mode | STGM_TRANSACTED, &stream); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileA: expected E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); + /* file does not exist */ stream = NULL; @@ -153,6 +158,11 @@ static void test_SHCreateStreamOnFileW(DWORD mode) ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); + stream = NULL; + ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_TRANSACTED, &stream); + ok(ret == E_INVALIDARG, "SHCreateStreamOnFileW: expected E_INVALIDARG, got 0x%08x\n", ret); + ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream); + /* file does not exist */ stream = NULL; @@ -239,8 +249,18 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) stream = NULL; ret = (*pSHCreateStreamOnFileEx)(test_file, mode | STGM_FAILIFTHERE | stgm, 0, FALSE, NULL, &stream); - todo_wine - ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); + if ((stgm & STGM_TRANSACTED) == STGM_TRANSACTED && mode == STGM_READ) { + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* XP */ || ret == E_INVALIDARG /* Vista */, + "SHCreateStreamOnFileEx: expected E_INVALIDARG or HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); + + if (ret == E_INVALIDARG) { + printf("SHCreateStreamOnFileEx: STGM_TRANSACTED not supported in this configuration... skipping.\n"); + return; + } + } else { + todo_wine + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileEx: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); + } ok(stream == NULL, "SHCreateStreamOnFileEx: expected a NULL IStream object, got %p\n", stream); stream = NULL; @@ -336,6 +356,16 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) START_TEST(istream) { + static const DWORD stgm_flags[] = { + 0, + STGM_CONVERT, + STGM_DELETEONRELEASE, + STGM_CONVERT | STGM_DELETEONRELEASE, + STGM_TRANSACTED | STGM_CONVERT, + STGM_TRANSACTED | STGM_DELETEONRELEASE, + STGM_TRANSACTED | STGM_CONVERT | STGM_DELETEONRELEASE + }; + hShlwapi = GetModuleHandleA("shlwapi.dll"); pSHCreateStreamOnFileA = (void*)GetProcAddress(hShlwapi, "SHCreateStreamOnFileA"); @@ -361,20 +391,12 @@ START_TEST(istream) if (!pSHCreateStreamOnFileEx) printf("SHCreateStreamOnFileEx not found... skipping tests.\n"); else { - test_SHCreateStreamOnFileEx(STGM_READ, 0); - test_SHCreateStreamOnFileEx(STGM_WRITE, 0); - test_SHCreateStreamOnFileEx(STGM_READWRITE, 0); - - test_SHCreateStreamOnFileEx(STGM_READ, STGM_CONVERT); - test_SHCreateStreamOnFileEx(STGM_WRITE, STGM_CONVERT); - test_SHCreateStreamOnFileEx(STGM_READWRITE, STGM_CONVERT); - - test_SHCreateStreamOnFileEx(STGM_READ, STGM_DELETEONRELEASE); - test_SHCreateStreamOnFileEx(STGM_WRITE, STGM_DELETEONRELEASE); - test_SHCreateStreamOnFileEx(STGM_READWRITE, STGM_DELETEONRELEASE); + int i; - test_SHCreateStreamOnFileEx(STGM_READ, STGM_CONVERT | STGM_DELETEONRELEASE); - test_SHCreateStreamOnFileEx(STGM_WRITE, STGM_CONVERT | STGM_DELETEONRELEASE); - test_SHCreateStreamOnFileEx(STGM_READWRITE, STGM_CONVERT | STGM_DELETEONRELEASE); + for (i = 0; i != sizeof(stgm_flags)/sizeof(stgm_flags[0]); i++) { + test_SHCreateStreamOnFileEx(STGM_READ, stgm_flags[i]); + test_SHCreateStreamOnFileEx(STGM_WRITE, stgm_flags[i]); + test_SHCreateStreamOnFileEx(STGM_READWRITE, stgm_flags[i]); + } } }

1 0