May 2007 - Wine-commits - list.winehq.org

Stefan Dösinger : ddraw: Avoid fallout of failing tests.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 4295b18950baf7d0cd8690372db67e446ffec599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4295b18950baf7d0cd8690372… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 9 23:00:32 2007 +0200 ddraw: Avoid fallout of failing tests. --- dlls/ddraw/tests/dsurface.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 75a913b..24426c9 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1213,18 +1213,24 @@ static void AttachmentTest(void) hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &surface4, NULL); ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface4); + hr = IDirectDrawSurface7_AddAttachedSurface(surface1, surface4); /* Succeeds on refrast */ ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 128x128 texture root returned %08x\n", hr); - hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface1); + if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface4); + hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface1); /* Succeeds on refrast */ ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 128x128 texture root to a 16x16 offscreen plain surface returned %08x\n", hr); - hr = IDirectDrawSurface7_AddAttachedSurface(surface3, surface4); + if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface1, 0, surface1); + hr = IDirectDrawSurface7_AddAttachedSurface(surface3, surface4); /* Succeeds on refrast */ ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 32x32 texture mip level returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface3, 0, surface4); hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface3); ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 32x32 texture mip level to a 16x16 offscreen plain surface returned %08x\n", hr); - hr = IDirectDrawSurface7_AddAttachedSurface(surface2, surface4); + if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface4, 0, surface3); + hr = IDirectDrawSurface7_AddAttachedSurface(surface2, surface4); /* Succeeds on refrast */ ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 16x16 offscreen plain surface to a 64x64 texture sublevel returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface2, 0, surface4); hr = IDirectDrawSurface7_AddAttachedSurface(surface4, surface2); ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching a 64x64 texture sublevel to a 16x16 offscreen plain surface returned %08x\n", hr); + if(SUCCEEDED(hr)) IDirectDrawSurface7_DeleteAttachedSurface(surface4, 0, surface2); IDirectDrawSurface7_Release(surface4); IDirectDrawSurface7_Release(surface3); @@ -1301,10 +1307,13 @@ static void AttachmentTest(void) /* Now the proper detach */ hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface1); ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); - hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface3); + hr = IDirectDrawSurface_AddAttachedSurface(surface2, surface3); /* Fails on refrast */ ok(hr == DD_OK, "Attaching an offscreen plain surface to another offscreen plain surface returned %08x\n", hr); - hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface3); - ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDirectDrawSurface_DeleteAttachedSurface(surface2, 0, surface3); + ok(hr == DD_OK, "DeleteAttachedSurface failed with %08x\n", hr); + } hr = IDirectDrawSurface_AddAttachedSurface(surface1, surface4); ok(hr == DDERR_CANNOTATTACHSURFACE, "Attaching an offscreen plain surface to a front buffer of different size returned %08x\n", hr); hr = IDirectDrawSurface_AddAttachedSurface(surface4, surface1);

1 0

Mounir IDRASSI : rsaenh: Add support for mandatory parameters to RSAENH_CPGetProvParam.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: f772fb9898e15a055cfcf4256abc4dd5bf724922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f772fb9898e15a055cfcf4256… Author: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Thu May 10 17:29:15 2007 +0200 rsaenh: Add support for mandatory parameters to RSAENH_CPGetProvParam. --- dlls/rsaenh/rsaenh.c | 17 +++++++++++++++++ dlls/rsaenh/tests/rsaenh.c | 33 +++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index cfa230c..3e7ac8e 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2907,6 +2907,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, switch (dwParam) { case PP_CONTAINER: + case PP_UNIQUE_CONTAINER:/* MSDN says we can return the same value as PP_CONTAINER */ return copy_param(pbData, pdwDataLen, (CONST BYTE*)pKeyContainer->szName, strlen(pKeyContainer->szName)+1); @@ -2914,6 +2915,22 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, return copy_param(pbData, pdwDataLen, (CONST BYTE*)pKeyContainer->szProvName, strlen(pKeyContainer->szProvName)+1); + case PP_PROVTYPE: + dwTemp = PROV_RSA_FULL; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + + case PP_KEYSPEC: + dwTemp = AT_SIGNATURE | AT_KEYEXCHANGE; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + + case PP_KEYSET_TYPE: + dwTemp = pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + + case PP_KEYSTORAGE: + dwTemp = CRYPT_SEC_DESCR; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + case PP_SIG_KEYSIZE_INC: case PP_KEYX_KEYSIZE_INC: dwTemp = 8; diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index b51a0a5..466a43c 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1480,7 +1480,8 @@ static void test_null_provider(void) HCRYPTPROV prov; HCRYPTKEY key; BOOL result; - DWORD keySpec, dataLen; + DWORD keySpec, dataLen,dwParam; + char szName[MAX_PATH]; result = CryptAcquireContext(NULL, szContainer, NULL, 0, 0); ok(!result && GetLastError() == NTE_BAD_PROV_TYPE, @@ -1556,11 +1557,35 @@ static void test_null_provider(void) CRYPT_NEWKEYSET); ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); if (!result) return; + /* Test provider parameters getter */ + dataLen = sizeof(dwParam); + result = CryptGetProvParam(prov, PP_PROVTYPE, (LPBYTE)&dwParam, &dataLen, 0); + ok(result && dataLen == sizeof(dwParam) && dwParam == PROV_RSA_FULL, + "Expected PROV_RSA_FULL, got 0x%08X\n",dwParam); + dataLen = sizeof(dwParam); + result = CryptGetProvParam(prov, PP_KEYSET_TYPE, (LPBYTE)&dwParam, &dataLen, 0); + ok(result && dataLen == sizeof(dwParam) && dwParam == 0, + "Expected 0, got 0x%08X\n",dwParam); + dataLen = sizeof(dwParam); + result = CryptGetProvParam(prov, PP_KEYSTORAGE, (LPBYTE)&dwParam, &dataLen, 0); + ok(result && dataLen == sizeof(dwParam) && (dwParam & CRYPT_SEC_DESCR), + "Expected CRYPT_SEC_DESCR to be set, got 0x%08X\n",dwParam); dataLen = sizeof(keySpec); result = CryptGetProvParam(prov, PP_KEYSPEC, (LPBYTE)&keySpec, &dataLen, 0); - if (result) - ok(keySpec == (AT_KEYEXCHANGE | AT_SIGNATURE), - "Expected AT_KEYEXCHANGE | AT_SIGNATURE, got %08x\n", keySpec); + ok(result && keySpec == (AT_KEYEXCHANGE | AT_SIGNATURE), + "Expected AT_KEYEXCHANGE | AT_SIGNATURE, got %08x\n", keySpec); + /* PP_CONTAINER parameter */ + dataLen = sizeof(szName); + result = CryptGetProvParam(prov, PP_CONTAINER, (LPBYTE)szName, &dataLen, 0); + ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, + "failed getting PP_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", + (result)? "TRUE":"FALSE",GetLastError(),dataLen); + /* PP_UNIQUE_CONTAINER parameter */ + dataLen = sizeof(szName); + result = CryptGetProvParam(prov, PP_UNIQUE_CONTAINER, (LPBYTE)szName, &dataLen, 0); + ok(result && dataLen == strlen(szContainer)+1 && strcmp(szContainer,szName) == 0, + "failed getting PP_CONTAINER. result = %s. Error 0x%08X. returned length = %d\n", + (result)? "TRUE":"FALSE",GetLastError(),dataLen); result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); ok(!result && GetLastError() == NTE_NO_KEY, "Expected NTE_NO_KEY, got %08x\n", GetLastError());

1 0

James Hawkins : msi: Only check the volume label for every media after the first disk.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 666cfd1c0346904dc5d3c27eee80ce871bec26ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=666cfd1c0346904dc5d3c27ee… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 10 10:57:41 2007 -0500 msi: Only check the volume label for every media after the first disk. --- dlls/msi/files.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 2aeefd3..9717537 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -606,7 +606,7 @@ static UINT ready_media(MSIPACKAGE *package, MSIFILE *file, struct media_info *m return ERROR_FUNCTION_FAILED; } - if (mi->volume_label) + if (mi->volume_label && mi->disk_id > 1) { source_dir = msi_dup_property(package, cszSourceDir); PathStripToRootW(source_dir);

1 0

Francois Gouget : msi/tests: Add missing '\n' to ok() calls.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 450ad214ecf4ddbb7fdc65df0740d37c1421ea76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=450ad214ecf4ddbb7fdc65df0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 10 18:46:49 2007 +0200 msi/tests: Add missing '\n' to ok() calls. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index e5c0940..b120666 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1361,7 +1361,7 @@ static void test_Installer(void) hr = Installer_ProductState(szPath, &iState); ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); if (SUCCEEDED(hr)) - ok(iState == INSTALLSTATE_DEFAULT || iState == INSTALLSTATE_ADVERTISED, "Installer_ProductState returned %d, expected %d or %d", iState, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED); + ok(iState == INSTALLSTATE_DEFAULT || iState == INSTALLSTATE_ADVERTISED, "Installer_ProductState returned %d, expected %d or %d\n", iState, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED); } } @@ -1377,7 +1377,7 @@ static void test_Installer(void) hr = Installer_ProductState(szProductCode, &iState); ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); if (SUCCEEDED(hr)) - ok(iState == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d", iState, INSTALLSTATE_UNKNOWN); + ok(iState == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iState, INSTALLSTATE_UNKNOWN); /* Installer::Version */ todo_wine {

1 0

Francois Gouget : crypt32: Add missing '\n' in FIXME() call.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 42fa19133a5062f5529d5389f5080f58e6bad8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42fa19133a5062f5529d5389f… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 10 18:46:55 2007 +0200 crypt32: Add missing '\n' in FIXME() call. --- dlls/crypt32/store.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index b3c5fcd..5f44be4 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -2632,7 +2632,7 @@ static LONG CRYPT_OpenParentStore(DWORD dwFlags, /* hklm\Software\Microsoft\Cryptography\Services\servicename\ * SystemCertificates */ - FIXME("CERT_SYSTEM_STORE_SERVICES"); + FIXME("CERT_SYSTEM_STORE_SERVICES\n"); return ERROR_FILE_NOT_FOUND; case CERT_SYSTEM_STORE_USERS: /* hku\user sid\Software\Microsoft\SystemCertificates */

1 0

Francois Gouget : wined3d: Add a missing '\n' to a trace.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: f999a9e433ae22193320192d7b0d8f2eda4661c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f999a9e433ae22193320192d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 10 18:51:00 2007 +0200 wined3d: Add a missing '\n' to a trace. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9829f22..b6b2ac1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2659,7 +2659,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * while(1) { RECT mySrcRect; - TRACE("Looking if a Present can be done... "); + TRACE("Looking if a Present can be done...\n"); /* Source Rectangle must be full surface */ if( SrcRect ) { if(SrcRect->left != 0 || SrcRect->top != 0 ||

1 0

Peter Oberndorfer : ntdll: Use correct prototype for thread function.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 849a0fcf97923a8ec0d65e72f91d4d54a1860ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=849a0fcf97923a8ec0d65e72f… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu May 10 20:54:16 2007 +0200 ntdll: Use correct prototype for thread function. --- dlls/ntdll/tests/atom.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/atom.c b/dlls/ntdll/tests/atom.c index 1b3f161..8dbc9b2 100644 --- a/dlls/ntdll/tests/atom.c +++ b/dlls/ntdll/tests/atom.c @@ -89,7 +89,7 @@ static void InitFunctionPtr(void) } } -static DWORD RtlAtomTestThread(LPVOID Table) +static DWORD WINAPI RtlAtomTestThread(LPVOID Table) { RTL_ATOM_TABLE AtomTable = *(PRTL_ATOM_TABLE)Table; RTL_ATOM Atom; @@ -175,7 +175,7 @@ static void test_NtAtom(void) res = pRtlPinAtomInAtomTable(AtomTable, Atom2); ok(!res, "Unable to pin atom in atom table, retval: %x\n", res); - testThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)RtlAtomTestThread, &AtomTable, 0, NULL); + testThread = CreateThread(NULL, 0, RtlAtomTestThread, &AtomTable, 0, NULL); WaitForSingleObject(testThread, INFINITE); Len = 64;

1 0

Peter Oberndorfer : rpcss: Use correct prototype for thread function.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 3a1a190fc3f8225a8028919e0667e2b673421e9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1a190fc3f8225a8028919e0… Author: Peter Oberndorfer <kumbayo84(a)arcor.de> Date: Thu May 10 20:55:31 2007 +0200 rpcss: Use correct prototype for thread function. --- programs/rpcss/np_server.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/rpcss/np_server.c b/programs/rpcss/np_server.c index bcb151e..3d62245 100644 --- a/programs/rpcss/np_server.c +++ b/programs/rpcss/np_server.c @@ -163,7 +163,7 @@ static void RPCSS_ServerProcessMessage(PRPCSS_NP_MESSAGE pMsg, PRPCSS_NP_REPLY p } /* each message gets its own thread. this is it. */ -static VOID HandlerThread(LPVOID lpvPipeHandle) +static DWORD WINAPI HandlerThread(LPVOID lpvPipeHandle) { RPCSS_NP_MESSAGE msg, vardata_payload_msg; char *c, *vardata = NULL; @@ -247,9 +247,10 @@ static VOID HandlerThread(LPVOID lpvPipeHandle) DisconnectNamedPipe(mypipe); CloseHandle(mypipe); InterlockedDecrement(&srv_thread_count); + return 0; } -static VOID NPMainWorkThread(LPVOID ignored) +static DWORD WINAPI NPMainWorkThread(LPVOID ignored) { BOOL connected; HANDLE hthread, master_mutex = RPCSS_GetMasterMutex(); @@ -272,7 +273,7 @@ static VOID NPMainWorkThread(LPVOID ignored) hthread = CreateThread( NULL, /* no security attribute */ 0, /* default stack size */ - (LPTHREAD_START_ROUTINE) HandlerThread, + HandlerThread, (LPVOID) np_server_end, /* thread parameter */ 0, /* not suspended */ &threadid /* returns thread ID (not used) */ @@ -330,6 +331,7 @@ static VOID NPMainWorkThread(LPVOID ignored) } } WINE_TRACE("Server thread shutdown.\n"); + return 0; } static HANDLE RPCSS_NPConnect(void) @@ -514,7 +516,7 @@ BOOL RPCSS_BecomePipeServer(void) hthread = CreateThread( NULL, /* no security attribute */ 0, /* default stack size */ - (LPTHREAD_START_ROUTINE) NPMainWorkThread, + NPMainWorkThread, NULL, /* thread parameter */ 0, /* not suspended */ &threadid /* returns thread ID (not used) */

1 0

Alexandre Julliard : kernel32: Fix typo in CreateActCtxA.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: b504d0502267625cfb14b8b6d0d524793e9a1978 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b504d0502267625cfb14b8b6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 11 11:19:38 2007 +0200 kernel32: Fix typo in CreateActCtxA. --- dlls/kernel32/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/actctx.c b/dlls/kernel32/actctx.c index 06bc8e5..1d5461f 100644 --- a/dlls/kernel32/actctx.c +++ b/dlls/kernel32/actctx.c @@ -100,7 +100,7 @@ HANDLE WINAPI CreateActCtxA(PCACTCTXA pActCtx) } if (actw.dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) { - if (!((ULONG_PTR)pActCtx->lpResourceName >> 16)) + if ((ULONG_PTR)pActCtx->lpResourceName >> 16) { len = MultiByteToWideChar(CP_ACP, 0, pActCtx->lpResourceName, -1, NULL, 0); resname = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));

1 0

Damjan Jovanovic : shlwapi: Fix UrlCanonicalizeW' s handling of filesystem paths.
by Alexandre Julliard 11 May '07

11 May '07

Module: wine Branch: master Commit: 3ceaaae3d77f55bab7919f5d62fe552fd33937e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ceaaae3d77f55bab7919f5d6… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu May 10 12:57:23 2007 +0200 shlwapi: Fix UrlCanonicalizeW's handling of filesystem paths. --- dlls/shlwapi/tests/path.c | 9 +++------ dlls/shlwapi/url.c | 7 +++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 6f52ac7..bde40b2 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -68,6 +68,7 @@ const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"http://www.winehq.org/tests/foo%20bar", URL_UNESCAPE , S_OK, "http://www.winehq.org/tests/foo bar"}, {"file:///c:/tests/foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar"}, {"file:///c:/tests\\foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar"}, + {"file:///c:/tests/foo%20bar", 0, S_OK, "file:///c:/tests/foo%20bar"}, {"file:///c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, {"file://c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, {"file://c:/tests\\../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, @@ -80,6 +81,8 @@ const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"c:\\dir\\file", 0, S_OK, "file:///c:/dir/file"}, {"file:///c:\\dir\\file", 0, S_OK, "file:///c:/dir/file"}, {"c:dir\\file", 0, S_OK, "file:///c:dir/file"}, + {"c:\\tests\\foo bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar"}, + {"c:\\tests\\foo bar", 0, S_OK, "file:///c:/tests/foo%20bar"}, {"A", 0, S_OK, "A"}, {"", 0, S_OK, ""} }; @@ -509,12 +512,6 @@ static void test_UrlCanonicalize(void) /* move to TEST_CANONICALIZE when fixed */ dwSize = sizeof szReturnUrl; - ok(UrlCanonicalizeA("c:\\tests\\foo bar", szReturnUrl, &dwSize, 0) == S_OK, "UrlCanonicalizeA didn't return 0x%08x\n", S_OK); - todo_wine { - ok(strcmp(szReturnUrl,"file:///c:/tests/foo%20bar")==0, "UrlCanonicalizeA got %s\n", szReturnUrl); - } - - dwSize = sizeof szReturnUrl; /*LimeWire online installer calls this*/ hr = UrlCanonicalizeA("/uri-res/N2R?urn:sha1:B3K", szReturnUrl, &dwSize,URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/); ok(hr==S_OK,"UrlCanonicalizeA returned 0x%08x instead of S_OK\n", hr); diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 20c0ba2..0991dad 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -358,6 +358,13 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix)); wk2 += sizeof(wszFilePrefix)/sizeof(WCHAR); + if (dwFlags & URL_FILE_USE_PATHURL) + { + slash = '\\'; + --wk2; + } + else + dwFlags |= URL_ESCAPE_UNSAFE; state = 5; }

1 0