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

Ken Thomases : winemac: Keep stable surface for layered windows using UpdateLayeredWindow().
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 4ec2809e7309b71eb7d07885649d7d2cc522929c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec2809e7309b71eb7d078856… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Mar 26 08:54:51 2013 -0500 winemac: Keep stable surface for layered windows using UpdateLayeredWindow(). --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/window.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index aeeee2d..970a228 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -127,6 +127,7 @@ struct macdrv_win_data BOOL on_screen : 1; /* is window ordered in? (minimized or not) */ BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ + BOOL ulw_layered : 1; /* has UpdateLayeredWindow() been called for window? */ BOOL per_pixel_alpha : 1; /* is window using per-pixel alpha? */ BOOL minimized : 1; /* is window minimized? */ struct window_surface *surface; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index eba8d86..07c4643 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -971,6 +971,7 @@ void CDECL macdrv_SetWindowStyle(HWND hwnd, INT offset, STYLESTRUCT *style) if (offset == GWL_EXSTYLE && (changed & WS_EX_LAYERED)) /* changing WS_EX_LAYERED resets attributes */ { data->layered = FALSE; + data->ulw_layered = FALSE; sync_window_opacity(data, 0, 0, FALSE, 0); if (data->surface) set_surface_use_alpha(data->surface, FALSE); } @@ -1092,6 +1093,7 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * if (!(data = get_win_data(hwnd))) return FALSE; data->layered = TRUE; + data->ulw_layered = TRUE; rect = *window_rect; OffsetRect(&rect, -window_rect->left, -window_rect->top); @@ -1271,6 +1273,7 @@ void CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags /* create the window surface if necessary */ if (!data->cocoa_window) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; + if (data->ulw_layered) goto done; if (*surface) window_surface_release(*surface); *surface = NULL; @@ -1318,11 +1321,13 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, data->window_rect = *window_rect; data->whole_rect = *visible_rect; data->client_rect = *client_rect; - if (surface) - window_surface_add_ref(surface); - set_window_surface(data->cocoa_window, surface); - if (data->surface) window_surface_release(data->surface); - data->surface = surface; + if (!data->ulw_layered) + { + if (surface) window_surface_add_ref(surface); + set_window_surface(data->cocoa_window, surface); + if (data->surface) window_surface_release(data->surface); + data->surface = surface; + } TRACE("win %p/%p window %s whole %s client %s style %08x flags %08x surface %p\n", hwnd, data->cocoa_window, wine_dbgstr_rect(window_rect),

1 0

Ken Thomases : explorer: Create desktop window hidden and only show it if it wins the race.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 7eec5ad781bd909259c4ffbb2245c8d3b9f97beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eec5ad781bd909259c4ffbb2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Mar 26 04:55:04 2013 -0500 explorer: Create desktop window hidden and only show it if it wins the race. --- programs/explorer/desktop.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 3e01f9f..4c8e599 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -302,7 +302,7 @@ void manage_desktop( WCHAR *arg ) /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN), 0, 0, 0, NULL ); @@ -321,6 +321,7 @@ void manage_desktop( WCHAR *arg ) SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); + ShowWindow( hwnd, SW_SHOW ); SystemParametersInfoW( SPI_SETDESKWALLPAPER, 0, NULL, FALSE ); ClipCursor( NULL ); initialize_display_settings( hwnd );

1 0

Detlef Riekenberg : kernel32/tests: Avoid test failure on multicore machines.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: ece3fafcdabb7dc4ecfaa22e5ed1a76596dad588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ece3fafcdabb7dc4ecfaa22e5… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Mar 16 18:23:59 2013 +0100 kernel32/tests: Avoid test failure on multicore machines. --- dlls/kernel32/tests/thread.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 76a7a33..55014f8 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -829,8 +829,6 @@ static VOID test_thread_processor(void) ok(retMask == processMask, "SetThreadAffinityMask failed\n"); retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)0 >> 3); ok(retMask == processMask, "SetThreadAffinityMask failed\n"); - retMask = SetThreadAffinityMask(curthread,~(ULONG_PTR)1); - ok(retMask == 0, "SetThreadAffinityMask succeeded\n"); } /* NOTE: This only works on WinNT/2000/XP) */ if (pSetThreadIdealProcessor) {

1 0

Alexandre Julliard : winex11: Don't use uninitialized variables (Coverity).
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: c2d53af33b2e6ba2b46a4bab327b89ed63d570ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2d53af33b2e6ba2b46a4bab3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 26 17:14:42 2013 +0100 winex11: Don't use uninitialized variables (Coverity). --- dlls/winex11.drv/opengl.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index ee62402..b11e8e3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1349,8 +1349,7 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r if (changes.width != gl->rect.right - gl->rect.left) mask |= CWWidth; if (changes.height != gl->rect.bottom - gl->rect.top) mask |= CWHeight; - TRACE( "setting drawable %lx pos %d,%d,%dx%d\n", - gl->drawable, changes.x, changes.y, changes.width, changes.height ); + TRACE( "setting drawable %lx size %dx%d\n", gl->drawable, changes.width, changes.height ); switch (gl->type) { @@ -1380,7 +1379,7 @@ void sync_gl_drawable( HWND hwnd, const RECT *visible_rect, const RECT *client_r default: break; } - SetRect( &gl->rect, changes.x, changes.y, changes.x + changes.width, changes.y + changes.height ); + SetRect( &gl->rect, 0, 0, changes.width, changes.height ); done: release_gl_drawable( gl ); }

1 0

Huw Davies : gdi32: Printer drivers don' t use the character extra spacing if lpdx is supplied.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 5713311657f68d7d19108c5b87f4f356da65497b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5713311657f68d7d19108c5b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 26 11:14:26 2013 +0000 gdi32: Printer drivers don't use the character extra spacing if lpdx is supplied. --- dlls/gdi32/font.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 65e09d3..8fb101f 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2266,6 +2266,9 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, y = pt.y; char_extra = GetTextCharacterExtra(hdc); + if (char_extra && lpDx && GetDeviceCaps( hdc, TECHNOLOGY ) == DT_RASPRINTER) + char_extra = 0; /* Printer drivers don't add char_extra if lpDx is supplied */ + if(char_extra || dc->breakExtra || breakRem || lpDx || lf.lfEscapement != 0) { UINT i;

1 0

André Hentschel : ntdll: Improve stub for FileFsAttributeInformation in NtQueryVolumeInformationFile .
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: d53a55ea88c01647575b1388e22b1bbdf43b8a0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53a55ea88c01647575b1388e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 25 16:07:33 2013 +0100 ntdll: Improve stub for FileFsAttributeInformation in NtQueryVolumeInformationFile. --- dlls/ntdll/file.c | 19 ++++++++++++++++++- dlls/ntdll/tests/file.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 791570e..5147ef5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -92,6 +92,7 @@ mode_t FILE_umask = 0; #define SECSPERDAY 86400 #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) +static const WCHAR ntfsW[] = {'N','T','F','S'}; /************************************************************************** * FILE_CreateFile (internal) @@ -2639,7 +2640,23 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io } break; case FileFsAttributeInformation: - FIXME( "%p: attribute info not supported\n", handle ); + if (length < offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName[sizeof(ntfsW)/sizeof(WCHAR)] )) + io->u.Status = STATUS_BUFFER_TOO_SMALL; + else + { + FILE_FS_ATTRIBUTE_INFORMATION *info = buffer; + + FIXME( "%p: faking attribute info\n", handle ); + info->FileSystemAttribute = FILE_SUPPORTS_ENCRYPTION | FILE_FILE_COMPRESSION | + FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK | + FILE_CASE_PRESERVED_NAMES | FILE_CASE_SENSITIVE_SEARCH; + info->MaximumComponentNameLength = MAXIMUM_FILENAME_LENGTH - 1; + info->FileSystemNameLength = sizeof(ntfsW); + memcpy(info->FileSystemName, ntfsW, sizeof(ntfsW)); + + io->Information = sizeof(*info); + io->u.Status = STATUS_SUCCESS; + } break; case FileFsControlInformation: FIXME( "%p: control info not supported\n", handle ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index f6a9e7c..c077b71 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1634,6 +1634,52 @@ todo_wine CloseHandle( dir ); } +static void test_query_attribute_information_file(void) +{ + NTSTATUS status; + HANDLE dir; + WCHAR path[MAX_PATH]; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + UNICODE_STRING nameW; + FILE_FS_ATTRIBUTE_INFORMATION *ffai; + BYTE buf[sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; + + GetWindowsDirectoryW( path, MAX_PATH ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); + + ZeroMemory( buf, sizeof(buf) ); + U(io).Status = 0xdadadada; + io.Information = 0xcacacaca; + + status = pNtQueryVolumeInformationFile( dir, &io, buf, sizeof(buf), FileFsAttributeInformation ); + + ffai = (FILE_FS_ATTRIBUTE_INFORMATION *)buf; + + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", status); + ok(U(io).Status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %d\n", U(io).Status); + ok(ffai->FileSystemAttribute != 0, "Missing FileSystemAttribute\n"); + ok(ffai->MaximumComponentNameLength != 0, "Missing MaximumComponentNameLength\n"); + ok(ffai->FileSystemNameLength != 0, "Missing FileSystemNameLength\n"); + + trace("FileSystemAttribute: %x MaximumComponentNameLength: %x FileSystemName: %s\n", + ffai->FileSystemAttribute, ffai->MaximumComponentNameLength, + wine_dbgstr_wn(ffai->FileSystemName, ffai->FileSystemNameLength / sizeof(WCHAR))); + + CloseHandle( dir ); +} + static void test_NtCreateFile(void) { static const struct test_data @@ -1770,4 +1816,5 @@ START_TEST(file) test_file_name_information(); test_file_all_name_information(); test_query_volume_information_file(); + test_query_attribute_information_file(); }

1 0

Jacek Caban : mshtml: Use Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME in CreateUri calls.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 7b9fc3bb7d588321858bbefe5b0a09f8701229c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b9fc3bb7d588321858bbefe5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 11:37:47 2013 +0100 mshtml: Use Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME in CreateUri calls. --- dlls/mshtml/binding.h | 3 ++- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsio.c | 12 ++++++------ dlls/mshtml/persist.c | 11 ++++++++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 1366d98..4e86b76 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -121,8 +121,9 @@ HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,BOOL,nsChannelBSC** HRESULT channelbsc_load_stream(HTMLInnerWindow*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN; -HRESULT create_relative_uri(HTMLOuterWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDEN; +HRESULT create_relative_uri(HTMLOuterWindow*,const WCHAR*,IUri**) DECLSPEC_HIDDEN; +HRESULT create_uri(const WCHAR*,DWORD,IUri**) DECLSPEC_HIDDEN; IUri *get_uri_nofrag(IUri*) DECLSPEC_HIDDEN; void set_current_mon(HTMLOuterWindow*,IMoniker*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2a2b5ca..6cfa76b 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2083,7 +2083,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, translated_url = NULL; } - hres = CreateUri(translated_url ? translated_url : url, 0, 0, &uri); + hres = create_uri(translated_url ? translated_url : url, 0, &uri); CoTaskMemFree(translated_url); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f0edca0..012d7ac 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2327,7 +2327,7 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u hres = CoInternetCombineUrlEx(base_uri, new_url, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, &uri, 0); else - hres = CreateUri(new_url, 0, 0, &uri); + hres = create_uri(new_url, 0, &uri); if(FAILED(hres)) return hres; @@ -2346,7 +2346,7 @@ HRESULT navigate_url(HTMLOuterWindow *window, const WCHAR *new_url, IUri *base_u TRACE("%08x %s -> %s\n", hres, debugstr_w(display_uri), debugstr_w(translated_url)); SysFreeString(display_uri); IUri_Release(uri); - hres = CreateUri(translated_url, 0, 0, &uri); + hres = create_uri(translated_url, 0, &uri); CoTaskMemFree(translated_url); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 1e8f1bb..d313676 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1904,10 +1904,10 @@ static nsresult NSAPI nsURI_SetSpec(nsIFileURL *iface, const nsACString *aSpec) if(!spec) return NS_ERROR_OUT_OF_MEMORY; - hres = CreateUri(spec, 0, 0, &uri); + hres = create_uri(spec, 0, &uri); heap_free(spec); if(FAILED(hres)) { - WARN("CreateUri failed: %08x\n", hres); + WARN("create_uri failed: %08x\n", hres); return NS_ERROR_FAILURE; } @@ -2924,7 +2924,7 @@ HRESULT create_doc_uri(HTMLOuterWindow *window, const WCHAR *url, nsWineURI **re nsresult nsres; HRESULT hres; - hres = CreateUri(url, 0, 0, &iuri); + hres = create_uri(url, 0, &iuri); if(FAILED(hres)) return hres; @@ -2974,7 +2974,7 @@ HRESULT create_redirect_nschannel(const WCHAR *url, nsChannel *orig_channel, nsC nsresult nsres; HRESULT hres; - hres = CreateUri(url, 0, 0, &iuri); + hres = create_uri(url, 0, &iuri); if(FAILED(hres)) return hres; @@ -3287,9 +3287,9 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString * if(FAILED(hres)) WARN("CoInternetCombineUrlEx failed: %08x\n", hres); }else { - hres = CreateUri(new_spec, 0, 0, &urlmon_uri); + hres = create_uri(new_spec, 0, &urlmon_uri); if(FAILED(hres)) - WARN("CreateUri failed: %08x\n", hres); + WARN("create_uri failed: %08x\n", hres); } if(FAILED(hres)) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index df9bafd..a0bb208 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -158,7 +158,7 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); if(SUCCEEDED(hres)) { - hres = CreateUri(url, 0, 0, &uri); + hres = create_uri(url, 0, &uri); if(FAILED(hres)) { WARN("CrateUri failed: %08x\n", hres); set_current_uri(This, NULL); @@ -178,11 +178,16 @@ void set_current_mon(HTMLOuterWindow *This, IMoniker *mon, DWORD flags) set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); } +HRESULT create_uri(const WCHAR *uri_str, DWORD flags, IUri **uri) +{ + return CreateUri(uri_str, flags | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); +} + HRESULT create_relative_uri(HTMLOuterWindow *window, const WCHAR *rel_uri, IUri **uri) { return window->uri ? CoInternetCombineUrlEx(window->uri, rel_uri, URL_ESCAPE_SPACES_ONLY|URL_DONT_ESCAPE_EXTRA_INFO, uri, 0) - : CreateUri(rel_uri, 0, 0, uri); + : create_uri(rel_uri, 0, uri); } void set_download_state(HTMLDocumentObj *doc, int state) @@ -967,7 +972,7 @@ static HRESULT WINAPI PersistHistory_LoadHistory(IPersistHistory *iface, IStream hres = E_FAIL; if(SUCCEEDED(hres)) { uri_str[str_len] = 0; - hres = CreateUri(uri_str, 0, 0, &uri); + hres = create_uri(uri_str, 0, &uri); } heap_free(uri_str); if(FAILED(hres))

1 0

Jacek Caban : urlmon: Fixed handling URIs with implicit file scheme in CoInternetCombineUrlEx.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: 79b7c1108e3a0c8626799a20492e6c1daecfd928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b7c1108e3a0c8626799a204… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 11:34:12 2013 +0100 urlmon: Fixed handling URIs with implicit file scheme in CoInternetCombineUrlEx. --- dlls/urlmon/tests/uri.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 4 +- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index bc6d1be..e5faa81 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -360,6 +360,31 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "file:///z:/test dir/README.txt", 0, S_OK, FALSE, + { + {"file:///z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {"file:///z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/z:/test%20dir/README.txt",S_OK}, + {"/z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {"file:///z:/test dir/README.txt",S_OK}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "urn:nothing:should:happen here", 0, S_OK, FALSE, { {"urn:nothing:should:happen here",S_OK,FALSE}, @@ -6926,7 +6951,62 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/test",0, + "c:\\test\\", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + 0,S_OK,FALSE, + { + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK}, + {"/c:/test/",S_OK}, + {"",S_FALSE}, + {"c:\\test\\",S_OK,FALSE,"file:///c:/test/"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://google.com/test",0, + "c:\\test\\", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + 0,S_OK,FALSE, + { + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK}, + {"/c:/test/",S_OK}, + {"",S_FALSE}, + {"c:\\test\\",S_OK,FALSE,"file:///c:/test/"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } + }; typedef struct _uri_parse_test { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 42cfe71..0f6ee31 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6461,7 +6461,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, return E_OUTOFMEMORY; } - parse_uri(&data, 0); + parse_uri(&data, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME); hr = Uri_Construct(NULL, (void**)&ret); if(FAILED(hr)) { @@ -6800,7 +6800,7 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW } } - hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE, 0, &relative); + hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &relative); if(FAILED(hr)) { *ppCombinedUri = NULL; return hr;

1 0

Jacek Caban : jscript: Use jsstr_flatten to access string buffer in dispex. c.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: b11d47fc9097e63e12b76260a58dbb52ffd0934e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11d47fc9097e63e12b76260a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 10:37:31 2013 +0100 jscript: Use jsstr_flatten to access string buffer in dispex.c. --- dlls/jscript/dispex.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6a0153b..347e7e1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1524,8 +1524,15 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL jsdisp = iface_to_jsdisp((IUnknown*)disp); if(jsdisp) { dispex_prop_t *prop; + const WCHAR *ptr; + + ptr = jsstr_flatten(name); + if(!ptr) { + jsdisp_release(jsdisp); + return E_OUTOFMEMORY; + } - hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); + hres = find_prop_name(jsdisp, string_hash(ptr), ptr, &prop); if(prop) { hres = delete_prop(prop, ret); }else {

1 0

Jacek Caban : jscript: Added jsstr_flatten helper and use it to access string buffer in date.c.
by Alexandre Julliard March 26, 2013

March 26, 2013

Module: wine Branch: master Commit: e3d940334f24a15b967b88fa0cbbfe095dccc1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3d940334f24a15b967b88fa0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 10:36:58 2013 +0100 jscript: Added jsstr_flatten helper and use it to access string buffer in date.c. --- dlls/jscript/date.c | 4 +++- dlls/jscript/jsstr.h | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 3d67248..d40d80f 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2054,7 +2054,9 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { DWORD lcid_en; input_len = jsstr_length(input_str); - input = input_str->str; + input = jsstr_flatten(input_str); + if(!input) + return E_OUTOFMEMORY; for(i=0; i<input_len; i++) { if(input[i] == '(') nest_level++; diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index 709d1c6..09893fa 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -53,6 +53,12 @@ static inline jsstr_t *jsstr_addref(jsstr_t *str) return str; } +/* This will be failable in the future. */ +static inline const WCHAR *jsstr_flatten(jsstr_t *str) +{ + return str->str; +} + static inline BOOL jsstr_eq(jsstr_t *str1, jsstr_t *str2) { unsigned len = jsstr_length(str1);

1 0