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

Maarten Lankhorst : include: Add definitions for VMR-9 interface.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: da92dcec66f34aa6d0d02812be855295f08938e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da92dcec66f34aa6d0d02812b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Jun 10 16:49:21 2008 +0200 include: Add definitions for VMR-9 interface. --- .gitignore | 1 + dlls/strmiids/strmiids.c | 3 + include/Makefile.in | 1 + include/uuids.h | 1 + include/vmr9.idl | 525 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 531 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da92dcec66f34aa6d0d02…

1 0

Andrew Talbot : wineps.drv: Use const-correct GetPrinterDataEx() instead of GetPrinterData().
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 901969f62483afaf249268a6f65f47b54d924279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901969f62483afaf249268a6f… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Jun 20 17:38:38 2008 +0100 wineps.drv: Use const-correct GetPrinterDataEx() instead of GetPrinterData(). --- dlls/wineps.drv/init.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 5b85c45..61e31d8 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -538,7 +538,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) char* ppdFileName = NULL; HKEY hkey; BOOL using_default_devmode = FALSE; - static CHAR paper_size[] = "Paper Size"; TRACE("'%s'\n", name); @@ -606,12 +605,11 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) } #endif if (!ppdFileName) { - static CHAR ppd_file[] = "PPD File"; - - res = GetPrinterDataA(hPrinter, ppd_file, NULL, NULL, 0, &needed); + res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "PPD File", NULL, NULL, 0, &needed); if ((res==ERROR_SUCCESS) || (res==ERROR_MORE_DATA)) { ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - res = GetPrinterDataA(hPrinter, ppd_file, &ppdType, (LPBYTE)ppdFileName, needed, &needed); + res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "PPD File", &ppdType, + (LPBYTE)ppdFileName, needed, &needed); } } /* Look for a ppd file for this printer in the config file. @@ -706,8 +704,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCSTR name) * the Devmode structure, but Wine doesn't currently provide a convenient * way to configure printers. */ - res = GetPrinterDataA (hPrinter, paper_size, NULL, (LPBYTE) &dwPaperSize, - sizeof (DWORD), &needed); + res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "Paper Size", NULL, + (LPBYTE)&dwPaperSize, sizeof(DWORD), &needed); if (res == ERROR_SUCCESS) pi->Devmode->dmPublic.u1.s1.dmPaperSize = (SHORT) dwPaperSize; else if (res == ERROR_FILE_NOT_FOUND)

1 0

Marcus Meissner : ws2_32/tests: Initialize memory to send.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: fb140649f4aa923e0aaa63107c2806dc7e78a645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb140649f4aa923e0aaa63107… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Jun 21 10:32:12 2008 +0200 ws2_32/tests: Initialize memory to send. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2e0ee28..79d2aeb 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2021,7 +2021,7 @@ static void test_send(void) goto end; } - buffer = HeapAlloc(GetProcessHeap(), 0, buflen); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buflen); if (buffer == NULL) { ok(0, "HeapAlloc failed, error %d\n", GetLastError());

1 0

Mikołaj Zalewski : comdlg32/tests: Make sure no ANSI strings are passed to Unicode functions.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 2879c39d4fbe50ebbab96345a6d32a4f098e6a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2879c39d4fbe50ebbab96345a… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Jun 20 23:03:20 2008 +0200 comdlg32/tests: Make sure no ANSI strings are passed to Unicode functions. --- dlls/comdlg32/tests/filedlg.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index abceb15..bd7689f 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -86,6 +86,24 @@ static void test_DialogCancel(void) ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", CDERR_INITIALIZATION, CommDlgExtendedError()); + result = GetSaveFileNameA(&ofn); + ok(0 == result, "expected %d, got %d\n", 0, result); + ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0, + CommDlgExtendedError()); + + PrintDlgA(NULL); + ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", + CDERR_INITIALIZATION, CommDlgExtendedError()); + + /* Before passing the ofn to Unicode functions, remove the ANSI strings */ + ofn.lpstrFilter = NULL; + ofn.lpstrInitialDir = NULL; + ofn.lpstrDefExt = NULL; + + PrintDlgA(NULL); + ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", + CDERR_INITIALIZATION, CommDlgExtendedError()); + SetLastError(0xdeadbeef); result = GetOpenFileNameW((LPOPENFILENAMEW) &ofn); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) @@ -97,19 +115,6 @@ static void test_DialogCancel(void) CommDlgExtendedError()); } - PrintDlgA(NULL); - ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", - CDERR_INITIALIZATION, CommDlgExtendedError()); - - result = GetSaveFileNameA(&ofn); - ok(0 == result, "expected %d, got %d\n", 0, result); - ok(0 == CommDlgExtendedError(), "expected %d, got %d\n", 0, - CommDlgExtendedError()); - - PrintDlgA(NULL); - ok(CDERR_INITIALIZATION == CommDlgExtendedError(), "expected %d, got %d\n", - CDERR_INITIALIZATION, CommDlgExtendedError()); - SetLastError(0xdeadbeef); result = GetSaveFileNameW((LPOPENFILENAMEW) &ofn); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)

1 0

Lei Zhang : comctl32: Support LVCF_SUBITEM in LVM_GETCOLUMN.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 4700b0bd876d4948a364dbd00ddda1def9febebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4700b0bd876d4948a364dbd00… Author: Lei Zhang <thestig(a)google.com> Date: Thu Jun 19 14:48:58 2008 -0700 comctl32: Support LVCF_SUBITEM in LVM_GETCOLUMN. --- dlls/comctl32/listview.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ce909fe..5501d1f 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5223,6 +5223,9 @@ static BOOL LISTVIEW_GetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, LPLVC if (lpColumn->mask & LVCF_ORDER) hdi.mask |= HDI_ORDER; + if (lpColumn->mask & LVCF_SUBITEM) + hdi.mask |= HDI_LPARAM; + if (!SendMessageW(infoPtr->hwndHeader, isW ? HDM_GETITEMW : HDM_GETITEMA, nColumn, (LPARAM)&hdi)) return FALSE; if (lpColumn->mask & LVCF_FMT) @@ -5237,6 +5240,9 @@ static BOOL LISTVIEW_GetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, LPLVC if (lpColumn->mask & LVCF_ORDER) lpColumn->iOrder = hdi.iOrder; + if (lpColumn->mask & LVCF_SUBITEM) + lpColumn->iSubItem = hdi.lParam; + return TRUE; }

1 0

Lei Zhang : gdi32: Check for regular fonts by style instead of style name.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 71ed7573aaa532eecae32a90136a4e0cb67a599a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ed7573aaa532eecae32a901… Author: Lei Zhang <thestig(a)google.com> Date: Thu Jun 19 14:57:46 2008 -0700 gdi32: Check for regular fonts by style instead of style name. --- dlls/gdi32/freetype.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8bcb487..359eb6d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -360,8 +360,6 @@ static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o' static const WCHAR defSans[] = {'A','r','i','a','l','\0'}; static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; -static const WCHAR RegularW[] = {'R','e','g','u','l','a','r','\0'}; - static const WCHAR fontsW[] = {'\\','f','o','n','t','s','\0'}; static const WCHAR win9x_font_reg_key[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', 'W','i','n','d','o','w','s','\\', @@ -1945,7 +1943,7 @@ static void update_reg_entries(void) face = LIST_ENTRY(face_elem_ptr, Face, entry); if(!face->external) continue; len = len_fam; - if(strcmpiW(face->StyleName, RegularW)) + if (!(face->ntmFlags & NTM_REGULAR)) len = len_fam + strlenW(face->StyleName) + 1; valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); strcpyW(valueW, family->FamilyName); @@ -4849,7 +4847,7 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, needed += lenfam; /* length of otmpFaceName */ - if(!strcasecmp(ft_face->style_name, "regular")) { + if ((ft_face->style_flags & (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD)) == 0) { needed += lenfam; /* just the family name */ } else { needed += lenfam + lensty; /* family + " " + style */ @@ -5047,7 +5045,7 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, cp += lensty; font->potm->otmpFaceName = (LPSTR)(cp - (char*)font->potm); strcpyW((WCHAR*)cp, family_nameW); - if(strcasecmp(ft_face->style_name, "regular")) { + if (ft_face->style_flags & (FT_STYLE_FLAG_ITALIC | FT_STYLE_FLAG_BOLD)) { strcatW((WCHAR*)cp, spaceW); strcatW((WCHAR*)cp, style_nameW); cp += lenfam + lensty;

1 0

Louis Lenders : advapi32: Add stub for GetAuditedPermissionsFromAcl{A/W}.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 44afc4488c47e5f406acdc88732c88cb6aac0205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44afc4488c47e5f406acdc887… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Jun 19 13:50:02 2008 +0000 advapi32: Add stub for GetAuditedPermissionsFromAcl{A/W}. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/security.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index e9a3ccc..4189458 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -230,8 +230,8 @@ # @ stub GetAccessPermissionsForObjectW @ stdcall GetAce(ptr long ptr) @ stdcall GetAclInformation(ptr ptr long long) -# @ stub GetAuditedPermissionsFromAclA -# @ stub GetAuditedPermissionsFromAclW +@ stdcall GetAuditedPermissionsFromAclA(ptr ptr ptr ptr) +@ stdcall GetAuditedPermissionsFromAclW(ptr ptr ptr ptr) @ stdcall GetCurrentHwProfileA(ptr) @ stdcall GetCurrentHwProfileW(ptr) @ stdcall GetEffectiveRightsFromAclA(ptr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 333ad86..2f91329 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -3442,6 +3442,27 @@ DWORD WINAPI GetExplicitEntriesFromAclW( PACL pacl, PULONG pcCountOfExplicitEntr return ERROR_CALL_NOT_IMPLEMENTED; } +/****************************************************************************** + * GetAuditedPermissionsFromAclA [ADVAPI32.@] + */ +DWORD WINAPI GetAuditedPermissionsFromAclA( PACL pacl, PTRUSTEEA pTrustee, PACCESS_MASK pSuccessfulAuditedRights, + PACCESS_MASK pFailedAuditRights) +{ + FIXME("%p %p %p %p\n",pacl, pTrustee, pSuccessfulAuditedRights, pFailedAuditRights); + return ERROR_CALL_NOT_IMPLEMENTED; + +} + +/****************************************************************************** + * GetAuditedPermissionsFromAclW [ADVAPI32.@] + */ +DWORD WINAPI GetAuditedPermissionsFromAclW( PACL pacl, PTRUSTEEW pTrustee, PACCESS_MASK pSuccessfulAuditedRights, + PACCESS_MASK pFailedAuditRights) +{ + FIXME("%p %p %p %p\n",pacl, pTrustee, pSuccessfulAuditedRights, pFailedAuditRights); + return ERROR_CALL_NOT_IMPLEMENTED; + +} /****************************************************************************** * ParseAclStringFlags

1 0

Anatoly Lyutin : user32: Return at the end of processing (cmd == SW_HIDE).
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 8fb730543dd5c2a3a44145e8d1df4b08e8e519e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb730543dd5c2a3a44145e8d… Author: Anatoly Lyutin <vostok(a)etersoft.ru> Date: Thu Jun 19 16:15:58 2008 +0400 user32: Return at the end of processing (cmd == SW_HIDE). --- dlls/user32/tests/msg.c | 2 +- dlls/user32/winpos.c | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a47cfc5..a45ff8d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4112,7 +4112,7 @@ static void test_messages(void) ok(GetActiveWindow() == hwnd, "window should be active\n"); ok(GetFocus() == hwnd, "window should have input focus\n"); ShowWindow(hwnd, SW_HIDE); - ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", TRUE); + ok_sequence(WmHideOverlappedSeq, "ShowWindow(SW_HIDE):overlapped", FALSE); ShowWindow(hwnd, SW_SHOW); ok_sequence(WmShowOverlappedSeq, "ShowWindow(SW_SHOW):overlapped", TRUE); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 621f89a..aeea354 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1073,6 +1073,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (parent == GetDesktopWindow()) parent = 0; SetFocus(parent); } + return wasVisible; } if (IsIconic(hwnd)) WINPOS_ShowIconTitle( hwnd, TRUE );

1 0

Petr Dlouhý : gdiplus: Stub implementation of GdipImageGetFrameDimensionsCount + test.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 4513fb3818c6a01e169998e039cebc6edea6669a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4513fb3818c6a01e169998e03… Author: Petr Dlouhý <pdlo(a)seznam.cz> Date: Thu Jun 19 10:38:09 2008 +0200 gdiplus: Stub implementation of GdipImageGetFrameDimensionsCount + test. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 13 +++++++++++++ dlls/gdiplus/tests/image.c | 27 +++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 4 files changed, 42 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 23346fc..8d7c892 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -407,7 +407,7 @@ @ stub GdipGraphicsSetAbort @ stub GdipImageForceValidation @ stdcall GdipImageGetFrameCount(ptr ptr ptr) -@ stub GdipImageGetFrameDimensionsCount +@ stdcall GdipImageGetFrameDimensionsCount(ptr ptr) @ stdcall GdipImageGetFrameDimensionsList(ptr ptr long) @ stub GdipImageRotateFlip @ stdcall GdipImageSelectActiveFrame(ptr ptr long) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f6dffcf..330e54b 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -688,6 +688,19 @@ GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, return NotImplemented; } +GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage *image, + UINT* count) +{ + if(!image || !count) + return InvalidParameter; + + *count = 1; + + FIXME("stub\n"); + + return Ok; +} + GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage* image, GUID* dimensionIDs, UINT count) { diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index a3e7676..686fe54 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -106,6 +106,32 @@ static void test_GetImageDimension(void) GdipDisposeImage((GpImage*)bm); } +static void test_GdipImageGetFrameDimensionsCount(void) +{ + GpBitmap *bm; + GpStatus stat; + const REAL WIDTH = 10.0, HEIGHT = 20.0; + UINT w; + + bm = (GpBitmap*)0xdeadbeef; + stat = GdipCreateBitmapFromScan0(WIDTH, HEIGHT, 0, PixelFormat24bppRGB,NULL, &bm); + expect(Ok,stat); + ok((GpBitmap*)0xdeadbeef != bm, "Expected bitmap to not be 0xdeadbeef\n"); + ok(NULL != bm, "Expected bitmap to not be NULL\n"); + + stat = GdipImageGetFrameDimensionsCount(NULL,&w); + expect(InvalidParameter, stat); + + stat = GdipImageGetFrameDimensionsCount((GpImage*)bm,NULL); + expect(InvalidParameter, stat); + + w = -1; + stat = GdipImageGetFrameDimensionsCount((GpImage*)bm,&w); + expect(Ok, stat); + expect(1, w); + GdipDisposeImage((GpImage*)bm); +} + static void test_LoadingImages(void) { GpStatus stat; @@ -466,6 +492,7 @@ START_TEST(image) test_Scan0(); test_GetImageDimension(); + test_GdipImageGetFrameDimensionsCount(); test_LoadingImages(); test_SavingImages(); test_encoders(); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 58659fe..07c60f1 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -318,6 +318,7 @@ GpStatus WINGDIPAPI GdipGetMetafileHeaderFromStream(IStream*,MetafileHeader*); GpStatus WINGDIPAPI GdipGetMetafileHeaderFromWmf(HMETAFILE,GDIPCONST WmfPlaceableFileHeader*,MetafileHeader*); GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage*,PROPID,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); +GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT); GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT); GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**);

1 0

Petr Dlouhý : shlwapi: UrlCanonicalize will canonize address in format "file://localhost/c:/" correctly.
by Alexandre Julliard 21 Jun '08

21 Jun '08

Module: wine Branch: master Commit: 283012cc95110f3700394aaa6cdfef9e9bf92ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=283012cc95110f3700394aaa6… Author: Petr Dlouhý <pdlo(a)seznam.cz> Date: Thu Jun 19 11:35:20 2008 +0200 shlwapi: UrlCanonicalize will canonize address in format "file://localhost/c:/" correctly. --- dlls/shlwapi/tests/url.c | 4 ++++ dlls/shlwapi/url.c | 7 +++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index cd7a5f2..37c0111 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -74,6 +74,10 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = { {"file:///c:/tests\\foo%20bar", URL_UNESCAPE , S_OK, "file:///c:/tests/foo bar", FALSE}, {"file:///c:/tests/foo%20bar", 0, S_OK, "file:///c:/tests/foo%20bar", FALSE}, {"file:///c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, + {"file://localhost/c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, + {"file://localhost\\c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, + {"file://localhost\\\\c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, + {"file://localhost\\c:\\tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, {"file://c:/tests/../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, {"file://c:/tests\\../tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, {"file://c:/tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\tests\\foo bar", FALSE}, diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 2593f96..16031e8 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -319,6 +319,7 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, WCHAR slash = '/'; static const WCHAR wszFile[] = {'f','i','l','e',':'}; + static const WCHAR wszLocalhost[] = {'l','o','c','a','l','h','o','s','t'}; TRACE("(%s, %p, %p, 0x%08x) *pcchCanonicalized: %d\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags, pcchCanonicalized ? *pcchCanonicalized : -1); @@ -387,6 +388,12 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized, *wk2++ = *wk1++; if (*wk1 != '/') {state = 6; break;} *wk2++ = *wk1++; + if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszLocalhost) + && !memcmp(wszLocalhost, wk1, sizeof(wszLocalhost))){ + wk1 += sizeof(wszLocalhost)/sizeof(WCHAR); + while(*wk1 == '\\' && (dwFlags & URL_FILE_USE_PATHURL)) + wk1++; + } if(*wk1 == '/' && (dwFlags & URL_FILE_USE_PATHURL)) wk1++; state = 4;

1 0