November 2014 - Wine-commits

Stefan Dösinger : ddraw/tests: Test messages on focus loss.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: be01a7637dd823b99d113d1e80e51ecc60e086fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=be01a7637dd823b99d113d1e8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:52 2014 +0100 ddraw/tests: Test messages on focus loss. --- dlls/ddraw/tests/ddraw1.c | 100 +++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw4.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/ddraw/tests/ddraw7.c | 104 ++++++++++++++++++++++++++++++++-------------- 4 files changed, 290 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be01a7637dd823b99d113…

1 0

Stefan Dösinger : ddraw/tests: Test focus loss style changes.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: a0715873734bb4036caa300d64f3a2bd51e03474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0715873734bb4036caa300d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:53 2014 +0100 ddraw/tests: Test focus loss style changes. --- dlls/ddraw/tests/ddraw1.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 37 ++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 37 ++++++++++++++++++++++++++++++++++++- 4 files changed, 144 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0715873734bb4036caa3…

1 0

Stefan Dösinger : d3d9/tests: Test mode restoration on focus loss.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: 1851e2618bc9510de1ca184774d69e2c2231ecec URL: http://source.winehq.org/git/wine.git/?a=commit;h=1851e2618bc9510de1ca18477… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:54 2014 +0100 d3d9/tests: Test mode restoration on focus loss. --- dlls/d3d9/tests/d3d9ex.c | 118 +++++++++++++++++++++++++++++++++++++++++++---- dlls/d3d9/tests/device.c | 112 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 214 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1851e2618bc9510de1ca1…

1 0

Stefan Dösinger : d3d8/tests: Test mode restoration on focus loss.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: b30901415aee1dcd2da8ebda8beffe3bd2d518de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30901415aee1dcd2da8ebda8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:55 2014 +0100 d3d8/tests: Test mode restoration on focus loss. --- dlls/d3d8/tests/device.c | 112 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3b2d4ac..8dcd163 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2237,7 +2237,13 @@ static void test_wndproc(void) ULONG ref; DWORD res, tid; HWND tmp; + UINT i, adapter_mode_count; HRESULT hr; + D3DDISPLAYMODE d3ddm; + DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; + DEVMODEW devmode; + LONG change_ret; + BOOL ret; static const struct message create_messages[] = { @@ -2258,6 +2264,9 @@ static void test_wndproc(void) * not reliable on X11 WMs. When the window focus follows the * mouse pointer the message is not sent. * {WM_ACTIVATE, FOCUS_WINDOW, TRUE, WA_INACTIVE}, */ + {WM_DISPLAYCHANGE, DEVICE_WINDOW, FALSE, 0}, + /* WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * not deterministic. */ {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, /* Windows sends WM_ACTIVATE to the device window, indicating that * SW_SHOWMINIMIZED is used instead of SW_MINIMIZE. Yet afterwards @@ -2277,6 +2286,57 @@ static void test_wndproc(void) d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); + adapter_mode_count = IDirect3D8_GetAdapterModeCount(d3d8, D3DADAPTER_DEFAULT); + for (i = 0; i < adapter_mode_count; ++i) + { + hr = IDirect3D8_EnumAdapterModes(d3d8, D3DADAPTER_DEFAULT, i, &d3ddm); + ok(SUCCEEDED(hr), "Failed to enumerate display mode, hr %#x.\n", hr); + + if (d3ddm.Format != D3DFMT_X8R8G8B8) + continue; + if (d3ddm.Width == registry_mode.dmPelsWidth && d3ddm.Height == registry_mode.dmPelsHeight) + continue; + /* The r200 driver on Windows XP enumerates modes like 320x200 and 320x240 but + * refuses to create a device at these sizes. */ + if (d3ddm.Width < 640 || d3ddm.Height < 480) + continue; + + if (!user32_width) + { + user32_width = d3ddm.Width; + user32_height = d3ddm.Height; + continue; + } + + /* Make sure the d3d mode is smaller in width or height and at most + * equal in the other dimension than the mode passed to + * ChangeDisplaySettings. Otherwise Windows shrinks the window to + * the ChangeDisplaySettings parameters + 12. */ + if (d3ddm.Width == user32_width && d3ddm.Height == user32_height) + continue; + if (d3ddm.Width <= user32_width && d3ddm.Height <= user32_height) + { + d3d_width = d3ddm.Width; + d3d_height = d3ddm.Height; + break; + } + if (user32_width <= d3ddm.Width && user32_height <= d3ddm.Height) + { + d3d_width = user32_width; + d3d_height = user32_height; + user32_width = d3ddm.Width; + user32_height = d3ddm.Height; + break; + } + } + + if (!d3d_width) + { + skip("Could not find adequate modes, skipping mode tests.\n"); + IDirect3D8_Release(d3d8); + return; + } + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d8_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -2286,12 +2346,18 @@ static void test_wndproc(void) thread_params.test_finished = CreateEventA(NULL, FALSE, FALSE, NULL); ok(!!thread_params.test_finished, "CreateEvent failed, last error %#x.\n", GetLastError()); + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = user32_width; + devmode.dmPelsHeight = user32_height; + change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); + focus_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, registry_mode.dmPelsWidth, - registry_mode.dmPelsHeight, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, user32_width, user32_height, 0, 0, 0, 0); device_window = CreateWindowA("d3d8_test_wndproc_wc", "d3d8_test", - WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, registry_mode.dmPelsWidth, - registry_mode.dmPelsHeight, 0, 0, 0, 0); + WS_MAXIMIZE | WS_VISIBLE | WS_CAPTION , 0, 0, user32_width, user32_height, 0, 0, 0, 0); thread = CreateThread(NULL, 0, wndproc_thread, &thread_params, 0, &tid); ok(!!thread, "Failed to create thread, last error %#x.\n", GetLastError()); @@ -2324,8 +2390,8 @@ static void test_wndproc(void) expect_messages = create_messages; device_desc.device_window = device_window; - device_desc.width = registry_mode.dmPelsWidth; - device_desc.height = registry_mode.dmPelsHeight; + device_desc.width = d3d_width; + device_desc.height = d3d_height; device_desc.flags = CREATE_DEVICE_FULLSCREEN; if (!(device = create_device(d3d8, focus_window, &device_desc))) { @@ -2354,6 +2420,22 @@ static void test_wndproc(void) proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc); + /* Change the mode while the device is in use and then drop focus. */ + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; + devmode.dmPelsWidth = user32_width; + devmode.dmPelsHeight = user32_height; + change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x, i=%u.\n", change_ret, i); + + /* Wine doesn't (yet) mark the device not reset when the mode is changed, thus the todo_wine. + * But sometimes focus-follows-mouse WMs also temporarily drop window focus, which makes + * mark the device lost, then not reset, causing the test to succeed for the wrong reason. */ + hr = IDirect3DDevice8_TestCooperativeLevel(device); + if (hr == D3DERR_DEVICENOTRESET) + ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + else + todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + expect_messages = focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or * manually changing the focus. It generates the same messages, but the task @@ -2361,7 +2443,7 @@ static void test_wndproc(void) * an inactive titlebar if reactivated with SetForegroundWindow. Reactivating * the device is difficult, see below. */ SetForegroundWindow(GetDesktopWindow()); - ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + todo_wine ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; tmp = GetFocus(); @@ -2378,6 +2460,12 @@ static void test_wndproc(void) else ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + todo_wine ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + devmode.dmPelsWidth, devmode.dmPelsHeight); + /* I have to minimize and restore the focus window, otherwise native d3d9 fails * device::reset with D3DERR_DEVICELOST. This does not happen when the window * restore is triggered by the user. */ @@ -2392,6 +2480,12 @@ static void test_wndproc(void) hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "Failed to get display mode.\n"); + todo_wine ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth + && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpect screen size %ux%u.\n", + devmode.dmPelsWidth, devmode.dmPelsHeight); + /* Releasing a device in lost state breaks follow-up tests on native. */ hr = reset_device(device, &device_desc); ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); @@ -2400,6 +2494,10 @@ static void test_wndproc(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + /* Fix up the mode until Wine's device release behavior is fixed. */ + change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); + proc = GetWindowLongPtrA(focus_window, GWLP_WNDPROC); ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc);

1 0

Stefan Dösinger : ddraw/tests: Test mode changes on focus loss and restore.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: a9e0ece68a5f0fe65910c80d30ab55e928d1a6f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e0ece68a5f0fe65910c80d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:56 2014 +0100 ddraw/tests: Test mode changes on focus loss and restore. --- dlls/ddraw/tests/ddraw1.c | 18 ++++++++++++++++-- dlls/ddraw/tests/ddraw2.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 20 ++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 20 ++++++++++++++++++-- 4 files changed, 70 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9e0ece68a5f0fe65910c…

1 0

Stefan Dösinger : wined3d: Restore the display mode on focus change.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: f6dde7062413a1dfdd71acc92c5178ac66f3ade0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6dde7062413a1dfdd71acc92… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Nov 18 21:26:57 2014 +0100 wined3d: Restore the display mode on focus change. --- dlls/d3d8/tests/device.c | 6 +-- dlls/d3d9/directx.c | 3 ++ dlls/d3d9/tests/d3d9ex.c | 6 +-- dlls/d3d9/tests/device.c | 6 +-- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/ddraw1.c | 8 ++-- dlls/ddraw/tests/ddraw2.c | 8 ++-- dlls/ddraw/tests/ddraw4.c | 8 ++-- dlls/ddraw/tests/ddraw7.c | 8 ++-- dlls/wined3d/device.c | 4 +- dlls/wined3d/directx.c | 92 +++++++++++++++++++++++++----------------- dlls/wined3d/swapchain.c | 36 ++++++++++++----- dlls/wined3d/wined3d_private.h | 4 +- include/wine/wined3d.h | 1 + 14 files changed, 115 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6dde7062413a1dfdd71a…

1 0

Nikolay Sivov : ole32/tests: Release() doesn't return HRESULT code.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: f7fdaf1c9fbced30b5145d43f036fccb5329c1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7fdaf1c9fbced30b5145d43f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 19 09:40:37 2014 +0300 ole32/tests: Release() doesn't return HRESULT code. --- dlls/ole32/tests/moniker.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 1ff7159..695f67a 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2022,9 +2022,7 @@ static void test_save_load_filemoniker(void) hr = IMoniker_Save(pMk, pStm, TRUE); ok_ole_success(hr, "IMoniker_Save"); - - hr = IMoniker_Release(pMk); - ok_ole_success(hr, "IMoniker_Release"); + IMoniker_Release(pMk); /* overwrite the constants with various values */ hr = IStream_Seek(pStm, zero_pos, STREAM_SEEK_SET, NULL); @@ -2055,11 +2053,8 @@ static void test_save_load_filemoniker(void) hr = IMoniker_Load(pMk, pStm); ok_ole_success(hr, "IMoniker_Load"); - hr = IMoniker_Release(pMk); - ok_ole_success(hr, "IMoniker_Release"); - - hr = IStream_Release(pStm); - ok_ole_success(hr, "IStream_Release"); + IMoniker_Release(pMk); + IStream_Release(pStm); } START_TEST(moniker)

1 0

Nikolay Sivov : ole32/tests: Use proper wrappers for IObjContext methods.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: 2487afa5d30532c2faa05b95bd80ce8c81e6afbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2487afa5d30532c2faa05b95b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 19 09:44:45 2014 +0300 ole32/tests: Use proper wrappers for IObjContext methods. --- dlls/ole32/tests/compobj.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1dfa9fb..0d9c624 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1910,10 +1910,10 @@ static void test_CoGetContextToken(void) ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); - refs = IUnknown_AddRef((IUnknown *)ctx); + refs = IObjContext_AddRef(ctx); todo_wine ok(refs == 3, "Expected 3, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)ctx); + refs = IObjContext_Release(ctx); todo_wine ok(refs == 2, "Expected 2, got %u\n", refs); refs = IUnknown_Release((IUnknown *)token); @@ -1926,13 +1926,13 @@ static void test_CoGetContextToken(void) ok(token, "Expected token != 0\n"); todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); - refs = IUnknown_AddRef((IUnknown *)ctx); + refs = IObjContext_AddRef(ctx); ok(refs == 2, "Expected 1, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)ctx); + refs = IObjContext_Release(ctx); ok(refs == 1, "Expected 0, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)ctx); + refs = IObjContext_Release(ctx); ok(refs == 0, "Expected 0, got %u\n", refs); CoUninitialize();

1 0

Sebastian Lackner : shlwapi: Fix incorrect usage of CompareString in StrRStrIA.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: 80d98683d02977f93def88254414b3210af558c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d98683d02977f93def88254… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:17:58 2014 +0100 shlwapi: Fix incorrect usage of CompareString in StrRStrIA. --- dlls/shlwapi/string.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index eaaaf3b..316dd3f 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -585,6 +585,7 @@ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, LPCWSTR lpszSearch) */ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) { + LPSTR lpszRet = NULL; WORD ch1, ch2; INT iLen; @@ -593,28 +594,28 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; - if (!lpszEnd) - lpszEnd = lpszStr + lstrlenA(lpszStr); - if (lpszEnd == lpszStr) - return NULL; - if (IsDBCSLeadByte(*lpszSearch)) ch1 = *lpszSearch << 8 | (UCHAR)lpszSearch[1]; else ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); - do + if (!lpszEnd) + lpszEnd = lpszStr + lstrlenA(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenA(lpszEnd)); + + while (lpszStr + iLen <= lpszEnd && *lpszStr) { - lpszEnd = CharPrevA(lpszStr, lpszEnd); - ch2 = IsDBCSLeadByte(*lpszEnd)? *lpszEnd << 8 | (UCHAR)lpszEnd[1] : *lpszEnd; + ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | (UCHAR)lpszStr[1] : *lpszStr; if (!ChrCmpIA(ch1, ch2)) { - if (!StrCmpNIA(lpszEnd, lpszSearch, iLen)) - return (LPSTR)lpszEnd; + if (!StrCmpNIA(lpszStr, lpszSearch, iLen)) + lpszRet = (LPSTR)lpszStr; } - } while (lpszEnd > lpszStr); - return NULL; + lpszStr = CharNextA(lpszStr); + } + return lpszRet; } /*************************************************************************

1 0

Sebastian Lackner : shlwapi: Fix incorrect usage of CompareString in StrRStrIW.
by Alexandre Julliard 19 Nov '14

19 Nov '14

Module: wine Branch: master Commit: 1b672e55ce738c5e02bd8c77df5dbf4668b7e30f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b672e55ce738c5e02bd8c77d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Nov 19 08:31:40 2014 +0100 shlwapi: Fix incorrect usage of CompareString in StrRStrIW. --- dlls/shlwapi/string.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 316dd3f..9ba6038 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -625,6 +625,7 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) */ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) { + LPWSTR lpszRet = NULL; INT iLen; TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); @@ -632,18 +633,23 @@ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) if (!lpszStr || !lpszSearch || !*lpszSearch) return NULL; + iLen = strlenW(lpszSearch); + if (!lpszEnd) lpszEnd = lpszStr + strlenW(lpszStr); + else /* reproduce the broken behaviour on Windows */ + lpszEnd += min(iLen - 1, lstrlenW(lpszEnd)); - iLen = strlenW(lpszSearch); - - while (lpszEnd > lpszStr) + while (lpszStr + iLen <= lpszEnd && *lpszStr) { - lpszEnd--; - if (!StrCmpNIW(lpszEnd, lpszSearch, iLen)) - return (LPWSTR)lpszEnd; + if (!ChrCmpIW(*lpszSearch, *lpszStr)) + { + if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) + lpszRet = (LPWSTR)lpszStr; + } + lpszStr++; } - return NULL; + return lpszRet; } /*************************************************************************

1 0