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

Jacek Caban : mshtml: Use Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME in CreateUri calls.
by Alexandre Julliard 26 Mar '13

26 Mar '13

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

André Hentschel : ntdll: Improve stub for FileFsAttributeInformation in NtQueryVolumeInformationFile .
by Alexandre Julliard 26 Mar '13

26 Mar '13

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

Ken Thomases : explorer: Create desktop window hidden and only show it if it wins the race.
by Alexandre Julliard 26 Mar '13

26 Mar '13

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

Ken Thomases : winemac: Keep stable surface for layered windows using UpdateLayeredWindow().
by Alexandre Julliard 26 Mar '13

26 Mar '13

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

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

26 Mar '13

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

Alexandre Julliard : winex11: Don't use uninitialized variables (Coverity).
by Alexandre Julliard 26 Mar '13

26 Mar '13

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

Detlef Riekenberg : kernel32/tests: Avoid test failure on multicore machines.
by Alexandre Julliard 26 Mar '13

26 Mar '13

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

Francois Gouget : winhttp: netconn_get_next_line() is not used anymore so remove it.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: fbe7ab5c5af9b7ca3decc82ae986be2c78fa6165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe7ab5c5af9b7ca3decc82ae… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 26 16:27:51 2013 +0100 winhttp: netconn_get_next_line() is not used anymore so remove it. --- dlls/winhttp/net.c | 75 ---------------------------------------- dlls/winhttp/winhttp_private.h | 1 - 2 files changed, 0 insertions(+), 76 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 631939a..bc83542 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -734,81 +734,6 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available ) return TRUE; } -BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) -{ - struct pollfd pfd; - BOOL ret = FALSE; - DWORD recvd = 0; - - if (!netconn_connected( conn )) return FALSE; - - if (conn->secure) - { - while (recvd < *buflen) - { - int dummy; - if (!netconn_recv( conn, &buffer[recvd], 1, 0, &dummy )) - { - set_last_error( ERROR_CONNECTION_ABORTED ); - break; - } - if (buffer[recvd] == '\n') - { - ret = TRUE; - break; - } - if (buffer[recvd] != '\r') recvd++; - } - if (ret) - { - buffer[recvd++] = 0; - *buflen = recvd; - TRACE("received line %s\n", debugstr_a(buffer)); - } - return ret; - } - - pfd.fd = conn->socket; - pfd.events = POLLIN; - while (recvd < *buflen) - { - int timeout, res; - struct timeval tv; - socklen_t len = sizeof(tv); - - if ((res = getsockopt( conn->socket, SOL_SOCKET, SO_RCVTIMEO, (void*)&tv, &len ) != -1)) - timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000; - else - timeout = -1; - if (poll( &pfd, 1, timeout ) > 0) - { - if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0) - { - if (res == -1) set_last_error( sock_get_error( errno ) ); - break; - } - if (buffer[recvd] == '\n') - { - ret = TRUE; - break; - } - if (buffer[recvd] != '\r') recvd++; - } - else - { - set_last_error( ERROR_WINHTTP_TIMEOUT ); - break; - } - } - if (ret) - { - buffer[recvd++] = 0; - *buflen = recvd; - TRACE("received line %s\n", debugstr_a(buffer)); - } - return ret; -} - DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) { struct timeval tv; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index b19aadf..82b4582 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -235,7 +235,6 @@ BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_connect( netconn_t *, const struct sockaddr *, unsigned int, int ) DECLSPEC_HIDDEN; BOOL netconn_connected( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_create( netconn_t *, int, int, int ) DECLSPEC_HIDDEN; -BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ) DECLSPEC_HIDDEN; BOOL netconn_init( netconn_t * ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; BOOL netconn_query_data_available( netconn_t *, DWORD * ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : hlink: Implement IHlinkBrowseContext_GetHlink().
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: ba40bbfcbf41d1e7f96e96493334f7ba75a696c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba40bbfcbf41d1e7f96e96493… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 17:44:31 2013 +0400 hlink: Implement IHlinkBrowseContext_GetHlink(). --- dlls/hlink/browse_ctx.c | 41 ++++++++++++++++++++++++++++++++--------- dlls/hlink/tests/browse_ctx.c | 7 +++++++ 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 0bfc061..48a20cb 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -234,20 +234,43 @@ static HRESULT WINAPI IHlinkBC_QueryHlink( IHlinkBrowseContext* iface, return E_NOTIMPL; } -static HRESULT WINAPI IHlinkBC_GetHlink( IHlinkBrowseContext* iface, - ULONG uHLID, IHlink** ppihl) +static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, IHlink **ret) { - HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *link; + struct list *entry; - TRACE("(%p)->(%x %p)\n", This, uHLID, ppihl); + TRACE("(%p)->(0x%x %p)\n", This, hlid, ret); - if(uHLID != HLID_CURRENT) { - FIXME("Only HLID_CURRENT implemented, given: %x\n", uHLID); - return E_NOTIMPL; + switch (hlid) + { + case HLID_PREVIOUS: + entry = list_prev(&This->links, &This->current->entry); + break; + case HLID_NEXT: + entry = list_next(&This->links, &This->current->entry); + break; + case HLID_CURRENT: + entry = &This->current->entry; + break; + case HLID_STACKBOTTOM: + entry = list_tail(&This->links); + break; + case HLID_STACKTOP: + entry = list_head(&This->links); + break; + default: + WARN("unknown id 0x%x\n", hlid); + entry = NULL; } - *ppihl = This->current->link; - IHlink_AddRef(*ppihl); + if (!entry) + return E_FAIL; + + link = LIST_ENTRY(entry, struct link_entry, entry); + + *ret = link->link; + IHlink_AddRef(*ret); return S_OK; } diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index df801ab..40d132b 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -56,6 +56,13 @@ static void test_SetInitialHlink(void) hres = IHlinkBrowseContext_SetInitialHlink(bc, dummy, five, NULL); ok(hres == CO_E_ALREADYINITIALIZED, "got 0x%08x\n", hres); + /* there's only one */ + hres = IHlinkBrowseContext_GetHlink(bc, HLID_PREVIOUS, &found_hlink); + ok(hres == E_FAIL, "got 0x%08x\n", hres); + + hres = IHlinkBrowseContext_GetHlink(bc, HLID_NEXT, &found_hlink); + ok(hres == E_FAIL, "got 0x%08x\n", hres); + hres = IHlinkBrowseContext_GetHlink(bc, HLID_CURRENT, &found_hlink); ok(hres == S_OK, "GetHlink failed: 0x%08x\n", hres);

1 0

Nikolay Sivov : hlink: Implement IHlinkBrowseContext_UpdateHlink().
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 4521044758af1804e70430f96c88c90cbc5d1238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4521044758af1804e70430f96… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 25 17:50:32 2013 +0400 hlink: Implement IHlinkBrowseContext_UpdateHlink(). --- dlls/hlink/browse_ctx.c | 80 +++++++++++++++++++++++++++++----------------- 1 files changed, 50 insertions(+), 30 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 48a20cb..d09d59d 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -212,12 +212,56 @@ static HRESULT WINAPI IHlinkBC_OnNavigateHlink(IHlinkBrowseContext *iface, return S_OK; } +static struct link_entry *context_get_entry(HlinkBCImpl *ctxt, ULONG hlid) +{ + struct list *entry; + + switch (hlid) + { + case HLID_PREVIOUS: + entry = list_prev(&ctxt->links, &ctxt->current->entry); + break; + case HLID_NEXT: + entry = list_next(&ctxt->links, &ctxt->current->entry); + break; + case HLID_CURRENT: + entry = &ctxt->current->entry; + break; + case HLID_STACKBOTTOM: + entry = list_tail(&ctxt->links); + break; + case HLID_STACKTOP: + entry = list_head(&ctxt->links); + break; + default: + WARN("unknown id 0x%x\n", hlid); + entry = NULL; + } + + return entry ? LIST_ENTRY(entry, struct link_entry, entry) : NULL; +} + static HRESULT WINAPI IHlinkBC_UpdateHlink(IHlinkBrowseContext* iface, - ULONG uHLID, IMoniker* pimkTarget, LPCWSTR pwzLocation, - LPCWSTR pwzFriendlyName) + ULONG hlid, IMoniker *target, LPCWSTR location, LPCWSTR friendly_name) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *entry = context_get_entry(This, hlid); + IHlink *link; + HRESULT hr; + + TRACE("(%p)->(0x%x %p %s %s)\n", This, hlid, target, debugstr_w(location), debugstr_w(friendly_name)); + + if (!entry) + return E_INVALIDARG; + + hr = HlinkCreateFromMoniker(target, location, friendly_name, NULL, 0, NULL, &IID_IHlink, (void**)&link); + if (FAILED(hr)) + return hr; + + IHlink_Release(entry->link); + entry->link = link; + + return S_OK; } static HRESULT WINAPI IHlinkBC_EnumNavigationStack( IHlinkBrowseContext *iface, @@ -238,37 +282,13 @@ static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, { HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); struct link_entry *link; - struct list *entry; TRACE("(%p)->(0x%x %p)\n", This, hlid, ret); - switch (hlid) - { - case HLID_PREVIOUS: - entry = list_prev(&This->links, &This->current->entry); - break; - case HLID_NEXT: - entry = list_next(&This->links, &This->current->entry); - break; - case HLID_CURRENT: - entry = &This->current->entry; - break; - case HLID_STACKBOTTOM: - entry = list_tail(&This->links); - break; - case HLID_STACKTOP: - entry = list_head(&This->links); - break; - default: - WARN("unknown id 0x%x\n", hlid); - entry = NULL; - } - - if (!entry) + link = context_get_entry(This, hlid); + if (!link) return E_FAIL; - link = LIST_ENTRY(entry, struct link_entry, entry); - *ret = link->link; IHlink_AddRef(*ret);

1 0