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

Kai Blin : dplayx: Remove unneeded test, fix compilation on msvc++.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: cc549b27df055e3007e3d7e9236abc1c2e4dadba URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc549b27df055e3007e3d7e92… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 3 12:44:17 2007 +0100 dplayx: Remove unneeded test, fix compilation on msvc++. --- dlls/dplayx/tests/dplayx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 836171e..92f9865 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -18,6 +18,7 @@ */ #include "wine/test.h" +#define INITGUID #include <dplay.h> static BOOL validSP = FALSE; /*This global variable is needed until wine has a working service provider @@ -32,7 +33,6 @@ static BOOL CALLBACK EnumConnectionsCallback(LPCGUID lpguidSP, LPVOID lpConnecti { /*I'm forcing TCP/IP Sevice provider*/ hr = IDirectPlayX_InitializeConnection((LPDIRECTPLAY4) lpContext, lpConnection, 0); - todo_wine ok( SUCCEEDED( hr ), "It's not possible to initialize TCP/IP service provider\n"); if( SUCCEEDED( hr )) validSP = TRUE; return FALSE;

1 0

Kai Blin : dplayx: Use skip and fix indentation.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 2a13eb0677957ebb2f36cc048f67956cf715d236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a13eb0677957ebb2f36cc048… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 3 12:43:51 2007 +0100 dplayx: Use skip and fix indentation. --- dlls/dplayx/tests/dplayx.c | 45 ++++++++++++++++++++++++------------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 6568f13..836171e 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -51,29 +51,34 @@ static void test_session_guid(LPDIRECTPLAY4 pDP) CoCreateGuid( &appGuid ); IDirectPlayX_EnumConnections(pDP, &appGuid, EnumConnectionsCallback, pDP, 0); - if( validSP ) - { - memset(&sessionDesc, 0, sizeof( DPSESSIONDESC2 )); - memset(&zeroGuid, 0, 16); - sessionDesc.dwSize = sizeof( DPSESSIONDESC2 ); - memcpy(&sessionDesc.guidApplication, &appGuid, 16); - sessionDesc.dwFlags = DPSESSION_CLIENTSERVER; - sessionDesc.lpszSessionNameA = name; - sessionDesc.dwMaxPlayers = 10; - sessionDesc.dwCurrentPlayers = 0; - IDirectPlayX_Open(pDP, &sessionDesc, DPOPEN_CREATE); - /* I read the sessiondesc from directplay in a fresh memory location, - because directplay does not touch the original struct, but saves - internally a version with the session guid set*/ - IDirectPlayX_GetSessionDesc(pDP, NULL, &sessionSize); - newSession=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sessionSize); - IDirectPlayX_GetSessionDesc(pDP, newSession, &sessionSize); - todo_wine ok( !IsEqualGUID(&newSession->guidInstance, &zeroGuid), "Session guid not initialized"); - HeapFree(GetProcessHeap(), 0, newSession); + if( !validSP ) + { + skip("Tests will not work without a valid service provider, skipping.\n"); + return; } -} + memset(&sessionDesc, 0, sizeof( DPSESSIONDESC2 )); + memset(&zeroGuid, 0, 16); + + sessionDesc.dwSize = sizeof( DPSESSIONDESC2 ); + memcpy(&sessionDesc.guidApplication, &appGuid, 16); + sessionDesc.dwFlags = DPSESSION_CLIENTSERVER; + sessionDesc.lpszSessionNameA = name; + sessionDesc.dwMaxPlayers = 10; + sessionDesc.dwCurrentPlayers = 0; + IDirectPlayX_Open(pDP, &sessionDesc, DPOPEN_CREATE); + + /* I read the sessiondesc from directplay in a fresh memory location, + because directplay does not touch the original struct, but saves + internally a version with the session guid set*/ + + IDirectPlayX_GetSessionDesc(pDP, NULL, &sessionSize); + newSession = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sessionSize); + IDirectPlayX_GetSessionDesc(pDP, newSession, &sessionSize); + todo_wine ok( !IsEqualGUID(&newSession->guidInstance, &zeroGuid), "Session guid not initialized"); + HeapFree(GetProcessHeap(), 0, newSession); +} START_TEST(dplayx) {

1 0

Kai Blin : secur32: Use skip for skipped tests, reduce indentation.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 0210f5eb1d6be9c3acf3edd9b0a1ae6e7e26ef3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0210f5eb1d6be9c3acf3edd9b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 3 10:57:21 2007 +0100 secur32: Use skip for skipped tests, reduce indentation. --- dlls/secur32/tests/ntlm.c | 511 ++++++++++++++++++++++----------------------- 1 files changed, 254 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0210f5eb1d6be9c3acf3e…

1 0

Chris Robinson : quartz: Use the proper CLSID when creating the IFilterMapper2 interface.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 3f089b4424f6af05e997b21b8eca43a7a3f07cf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f089b4424f6af05e997b21b8… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Mar 3 00:22:59 2007 -0800 quartz: Use the proper CLSID when creating the IFilterMapper2 interface. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 36767a0..db8f5c3 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -4517,7 +4517,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) InitializeCriticalSection(&fimpl->cs); fimpl->nItfCacheEntries = 0; - hr = CoCreateInstance(&CLSID_FilterMapper, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (LPVOID*)&fimpl->pFilterMapper2); if (FAILED(hr)) { ERR("Unable to create filter mapper (%x)\n", hr); return hr;

1 0

Chris Robinson : quartz: Return the proper interface for IFilterMapper.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 92aaba0d6f29a0e78990075f765082b812268488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92aaba0d6f29a0e78990075f7… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Mar 3 00:21:08 2007 -0800 quartz: Return the proper interface for IFilterMapper. --- dlls/quartz/filtermapper.c | 16 ++++++++++++++++ dlls/quartz/main.c | 2 +- dlls/quartz/quartz_private.h | 1 + 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 362de85..c7ac20a 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -180,6 +180,22 @@ HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) return S_OK; } +HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + FilterMapper2Impl *pFM2impl; + HRESULT hr; + + TRACE("(%p, %p)\n", pUnkOuter, ppObj); + + hr = FilterMapper2_create(pUnkOuter, (LPVOID*)&pFM2impl); + if (FAILED(hr)) + return hr; + + *ppObj = &pFM2impl->lpVtblFilterMapper; + + return hr; +} + /*** IUnknown methods ***/ static HRESULT WINAPI FilterMapper2_QueryInterface(IFilterMapper2 * iface, REFIID riid, LPVOID *ppv) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index b5e4032..559b791 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -62,7 +62,7 @@ static const struct object_creation_info object_creation[] = { { &CLSID_FilterGraph, FilterGraph_create }, { &CLSID_FilterGraphNoThread, FilterGraphNoThread_create }, - { &CLSID_FilterMapper, FilterMapper2_create }, + { &CLSID_FilterMapper, FilterMapper_create }, { &CLSID_FilterMapper2, FilterMapper2_create }, { &CLSID_AsyncReader, AsyncReader_create }, { &CLSID_MemoryAllocator, StdMemAllocator_create }, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 7c67053..5b5094d 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -44,6 +44,7 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj); HRESULT FilterGraphNoThread_create(IUnknown *pUnkOuter, LPVOID *ppObj); HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj); +HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj); HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT StdMemAllocator_create(IUnknown * pUnkOuter, LPVOID * ppv); HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv);

1 0

Dmitry Timoshkov : user32: win2k and XP return broken border info in GetWindowInfo most of the time, so there is no point in testing it.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 6f7a212ce3c0197136b59b09b2cc00d7ea1a993c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f7a212ce3c0197136b59b09b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Mar 3 12:49:33 2007 +0800 user32: win2k and XP return broken border info in GetWindowInfo most of the time, so there is no point in testing it. --- dlls/user32/tests/win.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index b0f7bf9..c15e62f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -707,10 +707,9 @@ static BOOL RegisterWindowClasses(void) return TRUE; } -static void verify_window_info(HWND hwnd, const WINDOWINFO *info, BOOL test_borders) +static void verify_window_info(HWND hwnd, const WINDOWINFO *info) { RECT rcWindow, rcClient; - UINT border; DWORD status; ok(IsWindow(hwnd), "bad window handle\n"); @@ -734,20 +733,24 @@ static void verify_window_info(HWND hwnd, const WINDOWINFO *info, BOOL test_bord ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04x != %04x\n", info->dwWindowStatus, status); - if (test_borders && !IsRectEmpty(&rcWindow)) - { - trace("rcWindow: %d,%d - %d,%d\n", rcWindow.left, rcWindow.top, rcWindow.right, rcWindow.bottom); - trace("rcClient: %d,%d - %d,%d\n", rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); - - ok(info->cxWindowBorders == (unsigned)(rcClient.left - rcWindow.left), - "wrong cxWindowBorders %d != %d\n", info->cxWindowBorders, rcClient.left - rcWindow.left); - border = min(rcWindow.bottom - rcClient.bottom, rcClient.top - rcWindow.top); - ok(info->cyWindowBorders == border, - "wrong cyWindowBorders %d != %d\n", info->cyWindowBorders, border); - } + trace("rcWindow: %d,%d - %d,%d\n", rcWindow.left, rcWindow.top, rcWindow.right, rcWindow.bottom); + trace("rcClient: %d,%d - %d,%d\n", rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); + /* win2k and XP return broken border info in GetWindowInfo most of + * the time, so there is no point in testing it. + */ +#if 0 + UINT border; + ok(info->cxWindowBorders == (unsigned)(rcClient.left - rcWindow.left), + "wrong cxWindowBorders %d != %d\n", info->cxWindowBorders, rcClient.left - rcWindow.left); + border = min(rcWindow.bottom - rcClient.bottom, rcClient.top - rcWindow.top); + ok(info->cyWindowBorders == border, + "wrong cyWindowBorders %d != %d\n", info->cyWindowBorders, border); +#endif ok(info->atomWindowType == GetClassLongA(hwnd, GCW_ATOM), "wrong atomWindowType\n"); - ok(info->wCreatorVersion == 0x0400, "wrong wCreatorVersion %04x\n", info->wCreatorVersion); + ok(info->wCreatorVersion == 0x0400 /* NT4, Win2000, XP, Win2003 */ || + info->wCreatorVersion == 0x0500 /* Vista */, + "wrong wCreatorVersion %04x\n", info->wCreatorVersion); } static void FixedAdjustWindowRectEx(RECT* rc, LONG style, BOOL menu, LONG exstyle) @@ -848,10 +851,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) */ info.cbSize = sizeof(WINDOWINFO); ok(pGetWindowInfo((HWND)wParam, &info), "GetWindowInfo should not fail\n"); - /* win2k SP4 returns broken border info if GetWindowInfo - * is being called from HCBT_DESTROYWND or HCBT_MINMAX hook proc. - */ - verify_window_info((HWND)wParam, &info, nCode != HCBT_MINMAX); + verify_window_info((HWND)wParam, &info); } }

1 0

Dmitry Timoshkov : user32: Fix most of test failures when running message test under win2k and XP.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 47661ce0886f59720d8a79f2022a54f6b82b3182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47661ce0886f59720d8a79f20… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Mar 3 12:48:46 2007 +0800 user32: Fix most of test failures when running message test under win2k and XP. --- dlls/user32/tests/msg.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 53c076f..a380883 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4232,7 +4232,7 @@ static const struct message WmSetFontButtonSeq[] = { { WM_SETFONT, sent }, { WM_PAINT, sent }, - { WM_ERASEBKGND, sent|defwinproc }, + { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_CTLCOLORBTN, sent|defwinproc }, { 0 } }; @@ -4372,7 +4372,7 @@ static const struct message WmSetFontStaticSeq[] = { { WM_SETFONT, sent }, { WM_PAINT, sent|defwinproc }, - { WM_ERASEBKGND, sent|defwinproc }, + { WM_ERASEBKGND, sent|defwinproc|optional }, { WM_CTLCOLORSTATIC, sent|defwinproc }, { 0 } }; @@ -8010,7 +8010,10 @@ static void test_PeekMessage(void) "wrong qstatus %08x\n", qstatus); msg.message = 0; - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_RAWINPUT << 16)); + if (qs_all_input & QS_RAWINPUT) /* use QS_RAWINPUT only if supported */ + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_RAWINPUT << 16)); + else /* workaround for a missing QS_RAWINPUT support */ + ret = PeekMessageA(&msg, 0, WM_KEYDOWN, WM_KEYDOWN, PM_REMOVE); ok(ret && msg.message == WM_KEYDOWN && msg.wParam == 'N', "got %d and %04x wParam %08x instead of TRUE and WM_KEYDOWN wParam 'N'\n", ret, msg.message, msg.wParam); @@ -8021,7 +8024,10 @@ static void test_PeekMessage(void) "wrong qstatus %08x\n", qstatus); msg.message = 0; - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_RAWINPUT << 16)); + if (qs_all_input & QS_RAWINPUT) /* use QS_RAWINPUT only if supported */ + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE | (QS_RAWINPUT << 16)); + else /* workaround for a missing QS_RAWINPUT support */ + ret = PeekMessageA(&msg, 0, WM_KEYUP, WM_KEYUP, PM_REMOVE); ok(ret && msg.message == WM_KEYUP && msg.wParam == 'N', "got %d and %04x wParam %08x instead of TRUE and WM_KEYUP wParam 'N'\n", ret, msg.message, msg.wParam);

1 0

Kanit Therdsteerasukdi : comctl32: datetime: Tests for events for date and time picker added.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: 3cdf24394fb4fbab7862fcfaf34953a42b974028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cdf24394fb4fbab7862fcfaf… Author: Kanit Therdsteerasukdi <therdste(a)ucla.edu> Date: Fri Mar 2 09:05:40 2007 -0800 comctl32: datetime: Tests for events for date and time picker added. --- dlls/comctl32/tests/datetime.c | 168 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 167 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3cdf24394fb4fbab7862f…

1 0

Jacek Caban : hhctrl.ocx: Try to build URL with full path if navigation to URL fails.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: aa1b38c51dd9fd924f62873f5fc3e40a4ce428eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1b38c51dd9fd924f62873f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 2 18:21:02 2007 +0100 hhctrl.ocx: Try to build URL with full path if navigation to URL fails. --- dlls/hhctrl.ocx/help.c | 34 ++++++++++++++++++++++++++++++---- 1 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 5d98181..f43cc0b 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -62,11 +62,13 @@ static LPWSTR HH_LoadString(DWORD dwID) return string; } -BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl) +static HRESULT navigate_url(HHInfo *info, LPCWSTR surl) { VARIANT url; HRESULT hres; + TRACE("%s\n", debugstr_w(surl)); + V_VT(&url) = VT_BSTR; V_BSTR(&url) = SysAllocString(surl); @@ -74,7 +76,29 @@ BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl) VariantClear(&url); - return SUCCEEDED(hres); + if(FAILED(hres)) + TRACE("Navigation failed: %08lx\n", hres); + + return hres; +} + +BOOL NavigateToUrl(HHInfo *info, LPCWSTR surl) +{ + ChmPath chm_path; + BOOL ret; + HRESULT hres; + + hres = navigate_url(info, surl); + if(SUCCEEDED(hres)) + return TRUE; + + SetChmPath(&chm_path, info->pCHMInfo->szFile, surl); + ret = NavigateToChm(info, chm_path.chm_file, chm_path.chm_index); + + hhctrl_free(chm_path.chm_file); + hhctrl_free(chm_path.chm_index); + + return ret; } BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) @@ -84,7 +108,7 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) LPWSTR ptr; static const WCHAR url_format[] = - {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','/','%','s',0}; + {'m','k',':','@','M','S','I','T','S','t','o','r','e',':','%','s',':',':','%','s',0}; TRACE("%p %s %s\n", info, debugstr_w(file), debugstr_w(index)); @@ -102,7 +126,7 @@ BOOL NavigateToChm(HHInfo *info, LPCWSTR file, LPCWSTR index) if((ptr = strchrW(buf, '#'))) *ptr = 0; - return NavigateToUrl(info, buf); + return SUCCEEDED(navigate_url(info, buf)); } /* Size Bar */ @@ -892,6 +916,8 @@ static BOOL CreateViewer(HHInfo *pHHInfo) void ReleaseHelpViewer(HHInfo *info) { + TRACE("(%p)\n", info); + if (!info) return;

1 0

Jacek Caban : hhctrl.ocx: Correctly handle URLs in SetChmPath.
by Alexandre Julliard March 5, 2007

March 5, 2007

Module: wine Branch: master Commit: e18ddbc0cd0ff1ab74d7ce2fb975d4bc506f4a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e18ddbc0cd0ff1ab74d7ce2fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 2 18:19:48 2007 +0100 hhctrl.ocx: Correctly handle URLs in SetChmPath. --- dlls/hhctrl.ocx/chm.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 493ed5b..d65d766 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -249,11 +249,29 @@ done: return SUCCEEDED(hr); } +static LPCWSTR skip_schema(LPCWSTR url) +{ + static const WCHAR its_schema[] = {'i','t','s',':'}; + static const WCHAR msits_schema[] = {'m','s','-','i','t','s',':'}; + static const WCHAR mk_schema[] = {'m','k',':','@','M','S','I','T','S','t','o','r','e',':'}; + + if(!strncmpiW(its_schema, url, sizeof(its_schema)/sizeof(WCHAR))) + return url+sizeof(its_schema)/sizeof(WCHAR); + if(!strncmpiW(msits_schema, url, sizeof(msits_schema)/sizeof(WCHAR))) + return url+sizeof(msits_schema)/sizeof(WCHAR); + if(!strncmpiW(mk_schema, url, sizeof(mk_schema)/sizeof(WCHAR))) + return url+sizeof(mk_schema)/sizeof(WCHAR); + + return url; +} + void SetChmPath(ChmPath *file, LPCWSTR base_file, LPCWSTR path) { LPCWSTR ptr; static const WCHAR separatorW[] = {':',':',0}; + path = skip_schema(path); + ptr = strstrW(path, separatorW); if(ptr) { WCHAR chm_file[MAX_PATH];

1 0