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

André Hentschel : wine.inf: Add winemac. drv to RelayFromExclude.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 7c0c050aa10e76ba26a4da7e39f48662505579b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0c050aa10e76ba26a4da7e3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Apr 1 23:34:30 2013 +0200 wine.inf: Add winemac.drv to RelayFromExclude. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 84e40d2..89c6a75 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -492,7 +492,7 @@ HKLM,%CurrentVersion%,"CommonFilesDir (x86)",,"%16428%" HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" -HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;user32;gdi32;advapi32;kernel32" +HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;winemac.drv;user32;gdi32;advapi32;kernel32" [DirectX] HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0904"

1 0

André Hentschel : advapi32/tests: Remove bad key set on cleanup.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 9374c5bb56de0855e9a8dae64be6fdce2b2209c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9374c5bb56de0855e9a8dae64… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 2 00:09:29 2013 +0200 advapi32/tests: Remove bad key set on cleanup. --- dlls/advapi32/tests/crypt.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 5f4d4e2..768dd3b 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -146,6 +146,13 @@ static void clean_up_environment(void) pCryptReleaseContext(hProv, 0); pCryptAcquireContextA(&hProv, szKeySet, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); } + + /* Remove container "wine_test_bad_keyset" */ + if (pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, 0)) + { + pCryptReleaseContext(hProv, 0); + pCryptAcquireContextA(&hProv, szBadKeySet, szRsaBaseProv, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + } } static void test_acquire_context(void)

1 0

Ken Thomases : winemac: During live resize, force occasional redisplay due to spontaneous redrawing.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 94dc91a45dcbfcee93d7b60c253eb1885dc8ee6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=94dc91a45dcbfcee93d7b60c2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 2 03:17:48 2013 -0500 winemac: During live resize, force occasional redisplay due to spontaneous redrawing. --- dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index ea7988d..c76f735 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -52,6 +52,8 @@ NSInteger levelWhenActive; + NSTimer* liveResizeDisplayTimer; + BOOL causing_becomeKeyWindow; BOOL ignore_windowMiniaturize; BOOL ignore_windowDeminiaturize; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 1d5c551..68644fa 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -350,6 +350,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) dealloc { + [liveResizeDisplayTimer invalidate]; + [liveResizeDisplayTimer release]; [queue release]; [latentParentWindow release]; [shape release]; @@ -1115,6 +1117,13 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) [NSApp wineWindow:self ordered:NSWindowAbove relativeTo:nil]; } + - (void) windowDidEndLiveResize:(NSNotification *)notification + { + [liveResizeDisplayTimer invalidate]; + [liveResizeDisplayTimer release]; + liveResizeDisplayTimer = nil; + } + - (void)windowDidMove:(NSNotification *)notification { [self windowDidResize:notification]; @@ -1176,6 +1185,34 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) ignore_windowMiniaturize = FALSE; } + - (void) windowWillStartLiveResize:(NSNotification *)notification + { + // There's a strange restriction in window redrawing during Cocoa- + // managed window resizing. Only calls to -[NSView setNeedsDisplay...] + // that happen synchronously when Cocoa tells us that our window size + // has changed or asynchronously in a short interval thereafter provoke + // the window to redraw. Calls to those methods that happen asynchronously + // a half second or more after the last change of the window size aren't + // heeded until the next resize-related user event (e.g. mouse movement). + // + // Wine often has a significant delay between when it's been told that + // the window has changed size and when it can flush completed drawing. + // So, our windows would get stuck with incomplete drawing for as long + // as the user holds the mouse button down and doesn't move it. + // + // We address this by "manually" asking our windows to check if they need + // redrawing every so often (during live resize only). + [self windowDidEndLiveResize:nil]; + liveResizeDisplayTimer = [NSTimer scheduledTimerWithTimeInterval:1.0/30.0 + target:self + selector:@selector(displayIfNeeded) + userInfo:nil + repeats:YES]; + [liveResizeDisplayTimer retain]; + [[NSRunLoop currentRunLoop] addTimer:liveResizeDisplayTimer + forMode:NSRunLoopCommonModes]; + } + /* * ---------- NSPasteboardOwner methods ----------

1 0

Jacek Caban : wininet: Moved more compat logic to netcon_secure_connect_setup.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 083500caf216a100500e54379d12e494c72e04cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=083500caf216a100500e54379… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 11:13:48 2013 +0200 wininet: Moved more compat logic to netcon_secure_connect_setup. --- dlls/wininet/netconnection.c | 36 ++++++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index c33f45a..17518b9 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -808,13 +808,25 @@ int sock_get_error( int err ) return err; } -#ifdef SONAME_LIBSSL -static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) +static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode) { +#ifdef SONAME_LIBSSL + long tls_option; void *ssl_s; DWORD res; int bits; + tls_option = get_tls_option(); + + if(compat_mode) { +#ifdef SSL_OP_NO_TLSv1_2 + tls_option |= SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2; + pSSL_CTX_set_options(ctx,SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); +#else + return ERROR_INTERNET_SECURITY_CHANNEL_ERROR; +#endif + } + ssl_s = pSSL_new(ctx); if (!ssl_s) { @@ -850,6 +862,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) connection->ssl_s = ssl_s; connection->secure = TRUE; + connection->security_flags |= SECURITY_FLAG_SECURE; bits = NETCON_GetCipherStrength(connection); if (bits >= 128) @@ -858,7 +871,6 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, long tls_option) connection->security_flags |= SECURITY_FLAG_STRENGTH_MEDIUM; else connection->security_flags |= SECURITY_FLAG_STRENGTH_WEAK; - connection->security_flags |= SECURITY_FLAG_SECURE; if(connection->mask_errors) connection->server->security_flags = connection->security_flags; @@ -871,8 +883,11 @@ fail: pSSL_free(ssl_s); } return res; -} +#else + FIXME("Cannot connect, OpenSSL not available.\n"); + return ERROR_NOT_SUPPORTED; #endif +} /****************************************************************************** * NETCON_secure_connect @@ -880,7 +895,7 @@ fail: */ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) { - DWORD res = ERROR_NOT_SUPPORTED; + DWORD res; /* can't connect if we are already connected */ if(connection->secure) { @@ -894,28 +909,21 @@ DWORD NETCON_secure_connect(netconn_t *connection, server_t *server) connection->server = server; } -#ifdef SONAME_LIBSSL /* connect with given TLS options */ - res = netcon_secure_connect_setup(connection, get_tls_option()); + res = netcon_secure_connect_setup(connection, FALSE); if (res == ERROR_SUCCESS) return res; -#ifdef SSL_OP_NO_TLSv1_2 /* FIXME: when got version alert and FIN from server */ /* fallback to connect without TLSv1.1/TLSv1.2 */ if (res == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) { closesocket(connection->socket); - pSSL_CTX_set_options(ctx,SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); res = create_netconn_socket(connection->server, connection, 500); if (res != ERROR_SUCCESS) return res; - res = netcon_secure_connect_setup(connection, get_tls_option()|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2); + res = netcon_secure_connect_setup(connection, TRUE); } -#endif -#else - FIXME("Cannot connect, OpenSSL not available.\n"); -#endif return res; }

1 0

Jacek Caban : winhttp: Improved error handling in netconn_secure_connect.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 816f7ef595cf49abc6ef672aa2ae6c8f36d6d437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=816f7ef595cf49abc6ef672aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 11:16:34 2013 +0200 winhttp: Improved error handling in netconn_secure_connect. --- dlls/winhttp/net.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index bc83542..415511e 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -406,7 +406,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname ) size = send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); if(size != out_buf.cbBuffer) { ERR("send failed\n"); - status = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; + res = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; break; }

1 0

Alexandre Julliard : gdi32: Use the Mac driver by default.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 2f48b12c575c4e1afc6115a39d60722acda73d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f48b12c575c4e1afc6115a39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 12:22:17 2013 +0200 gdi32: Use the Mac driver by default. --- dlls/gdi32/driver.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 70208fb..f625f32 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -61,6 +61,12 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION driver_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +#ifdef __APPLE__ +static const char default_driver[] = "mac,x11"; +#else +static const char default_driver[] = "x11"; +#endif + /********************************************************************** * create_driver * @@ -102,7 +108,7 @@ static const struct gdi_dc_funcs *get_display_driver( HMODULE *module_ret ) if (display_driver) goto done; - strcpy( buffer, "x11" ); /* default value */ + strcpy( buffer, default_driver ); /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ if (!RegOpenKeyA( HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hkey )) {

1 0

Alexandre Julliard : user32: Don' t print a warning when creating the HWND_MESSAGE parent window.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 59c0c5fb2d53c1bf84f86e0d08a5664a5aaf9612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c0c5fb2d53c1bf84f86e0d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 12:46:39 2013 +0200 user32: Don't print a warning when creating the HWND_MESSAGE parent window. --- dlls/user32/driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 1c12134..8f02e71 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -299,9 +299,10 @@ static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) { static int warned; + HWND parent = GetAncestor( hwnd, GA_PARENT ); /* HWND_MESSAGE windows don't need a graphics driver */ - if (GetAncestor( hwnd, GA_PARENT ) == get_user_thread_info()->msg_window) return TRUE; + if (!parent || parent == get_user_thread_info()->msg_window) return TRUE; if (warned++) return FALSE; MESSAGE( "Application tried to create a window, but no driver could be loaded.\n");

1 0

Alexander Morozov : advapi32: Do not terminate a regular program if it calls StartServiceCtrlDispatcher.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: a792a5b4867c7cdefb1de7da3ef87bea06b1b3de URL: http://source.winehq.org/git/wine.git/?a=commit;h=a792a5b4867c7cdefb1de7da3… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Apr 1 22:43:33 2013 +0400 advapi32: Do not terminate a regular program if it calls StartServiceCtrlDispatcher. --- dlls/advapi32/service.c | 70 +++++++++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index b591449..5f3f15f 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -75,6 +75,12 @@ typedef struct service_data_t WCHAR name[1]; } service_data; +typedef struct dispatcher_data_t +{ + SC_HANDLE manager; + HANDLE pipe; +} dispatcher_data; + static CRITICAL_SECTION service_cs; static CRITICAL_SECTION_DEBUG service_cs_debug = { @@ -358,22 +364,7 @@ static DWORD service_handle_control(const service_data *service, DWORD dwControl */ static DWORD WINAPI service_control_dispatcher(LPVOID arg) { - SC_HANDLE manager; - HANDLE pipe; - - if (!(manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ))) - { - ERR("failed to open service manager error %u\n", GetLastError()); - return 0; - } - - pipe = service_open_pipe(); - - if (pipe==INVALID_HANDLE_VALUE) - { - WARN("failed to create control pipe error = %d\n", GetLastError()); - return 0; - } + dispatcher_data *disp = arg; /* dispatcher loop */ while (1) @@ -384,7 +375,7 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) BOOL r; DWORD data_size = 0, count, result; - r = ReadFile( pipe, &info, FIELD_OFFSET(service_start_info,data), &count, NULL ); + r = ReadFile( disp->pipe, &info, FIELD_OFFSET(service_start_info,data), &count, NULL ); if (!r) { if (GetLastError() != ERROR_BROKEN_PIPE) @@ -400,7 +391,7 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) { data_size = info.total_size - FIELD_OFFSET(service_start_info,data); data = HeapAlloc( GetProcessHeap(), 0, data_size ); - r = ReadFile( pipe, data, data_size, &count, NULL ); + r = ReadFile( disp->pipe, data, data_size, &count, NULL ); if (!r) { if (GetLastError() != ERROR_BROKEN_PIPE) @@ -433,8 +424,9 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) case WINESERV_STARTINFO: if (!service->handle) { - if (!(service->handle = OpenServiceW( manager, data, SERVICE_SET_STATUS )) || - !(service->full_access_handle = OpenServiceW( manager, data, GENERIC_READ|GENERIC_WRITE ))) + if (!(service->handle = OpenServiceW( disp->manager, data, SERVICE_SET_STATUS )) || + !(service->full_access_handle = OpenServiceW( disp->manager, data, + GENERIC_READ|GENERIC_WRITE ))) FIXME( "failed to open service %s\n", debugstr_w(data) ); } result = service_handle_start(service, data, data_size / sizeof(WCHAR)); @@ -449,12 +441,13 @@ static DWORD WINAPI service_control_dispatcher(LPVOID arg) } done: - WriteFile(pipe, &result, sizeof(result), &count, NULL); + WriteFile( disp->pipe, &result, sizeof(result), &count, NULL ); HeapFree( GetProcessHeap(), 0, data ); } - CloseHandle(pipe); - CloseServiceHandle( manager ); + CloseHandle( disp->pipe ); + CloseServiceHandle( disp->manager ); + HeapFree( GetProcessHeap(), 0, disp ); return 1; } @@ -466,13 +459,32 @@ static BOOL service_run_main_thread(void) DWORD i, n, ret; HANDLE wait_handles[MAXIMUM_WAIT_OBJECTS]; UINT wait_services[MAXIMUM_WAIT_OBJECTS]; + dispatcher_data *disp = HeapAlloc( GetProcessHeap(), 0, sizeof(*disp) ); + + disp->manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); + if (!disp->manager) + { + ERR("failed to open service manager error %u\n", GetLastError()); + HeapFree( GetProcessHeap(), 0, disp ); + return FALSE; + } + + disp->pipe = service_open_pipe(); + if (disp->pipe == INVALID_HANDLE_VALUE) + { + WARN("failed to create control pipe error %u\n", GetLastError()); + CloseServiceHandle( disp->manager ); + HeapFree( GetProcessHeap(), 0, disp ); + SetLastError( ERROR_FAILED_SERVICE_CONTROLLER_CONNECT ); + return FALSE; + } service_event = CreateEventW( NULL, FALSE, FALSE, NULL ); stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); /* FIXME: service_control_dispatcher should be merged into the main thread */ wait_handles[0] = __wine_make_process_system(); - wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, NULL, 0, NULL ); + wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, disp, 0, NULL ); wait_handles[2] = service_event; wait_handles[3] = stop_event; @@ -563,7 +575,6 @@ BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) { service_data *info; unsigned int i; - BOOL ret = TRUE; TRACE("%p\n", servent); @@ -592,9 +603,7 @@ BOOL WINAPI StartServiceCtrlDispatcherA( const SERVICE_TABLE_ENTRYA *servent ) services[i] = info; } - service_run_main_thread(); - - return ret; + return service_run_main_thread(); } /****************************************************************************** @@ -614,7 +623,6 @@ BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) { service_data *info; unsigned int i; - BOOL ret = TRUE; TRACE("%p\n", servent); @@ -643,9 +651,7 @@ BOOL WINAPI StartServiceCtrlDispatcherW( const SERVICE_TABLE_ENTRYW *servent ) services[i] = info; } - service_run_main_thread(); - - return ret; + return service_run_main_thread(); } /******************************************************************************

1 0

Jacek Caban : ieframe: Moved travellog to its own struct.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 15937c99eb85aaafe764898aaa5a0896ac7f0f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15937c99eb85aaafe764898aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 2 17:39:07 2013 +0200 ieframe: Moved travellog to its own struct. --- dlls/ieframe/dochost.c | 30 +++++++++++++++--------------- dlls/ieframe/ieframe.h | 10 ++++++---- dlls/ieframe/navigate.c | 4 ++-- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 1b10fb4..c910c74 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -331,33 +331,33 @@ static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; - if(!This->travellog) { - This->travellog = heap_alloc(4 * sizeof(*This->travellog)); - if(!This->travellog) + if(!This->travellog.log) { + This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + if(!This->travellog.log) return; - This->travellog_size = 4; - }else if(This->travellog_size < This->travellog_position+1) { + This->travellog.size = 4; + }else if(This->travellog.size < This->travellog.position+1) { travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog, This->travellog_size*2*sizeof(*This->travellog)); + new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); if(!new_travellog) return; - This->travellog = new_travellog; - This->travellog_size *= 2; + This->travellog.log = new_travellog; + This->travellog.size *= 2; } - while(This->travellog_length > This->travellog_position) - heap_free(This->travellog[--This->travellog_length].url); + while(This->travellog.length > This->travellog.position) + heap_free(This->travellog.log[--This->travellog.length].url); - new_entry = This->travellog + This->travellog_position; + new_entry = This->travellog.log + This->travellog.position; new_entry->url = heap_strdupW(This->url); if(!new_entry->url) return; - This->travellog_position++; + This->travellog.position++; } void create_doc_view_hwnd(DocHost *This) @@ -994,9 +994,9 @@ void DocHost_Release(DocHost *This) ConnectionPointContainer_Destroy(&This->cps); - while(This->travellog_length) - heap_free(This->travellog[--This->travellog_length].url); - heap_free(This->travellog); + while(This->travellog.length) + heap_free(This->travellog.log[--This->travellog.length].url); + heap_free(This->travellog.log); heap_free(This->url); } diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 0c13c82..a20afbc5 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -153,10 +153,12 @@ struct DocHost { ShellBrowser *browser_service; IShellUIHelper2 *shell_ui_helper; - travellog_entry_t *travellog; - unsigned travellog_size; - unsigned travellog_length; - unsigned travellog_position; + struct { + travellog_entry_t *log; + unsigned size; + unsigned length; + unsigned position; + } travellog; ConnectionPointContainer cps; IEHTMLWindow html_window; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 3a35acf..42d0c85 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1063,12 +1063,12 @@ HRESULT go_back(DocHost *This) WCHAR *url; HRESULT hres; - if(!This->travellog_position) { + if(!This->travellog.position) { WARN("No history available\n"); return E_FAIL; } - url = This->travellog[--This->travellog_position].url; + url = This->travellog.log[--This->travellog.position].url; if(This->doc_navigate) { hres = async_doc_navigate(This, url, NULL, NULL, 0, FALSE);

1 0

Michael Stefaniuc : dplayx: Move the lock into the DirectPlay object.
by Alexandre Julliard 02 Apr '13

02 Apr '13

Module: wine Branch: master Commit: 526851f5df095fb02b594f8a6a26c70bac50a132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=526851f5df095fb02b594f8a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 16:48:24 2013 +0100 dplayx: Move the lock into the DirectPlay object. --- dlls/dplayx/dplay.c | 36 +++++------------------------------- dlls/dplayx/dplay_global.h | 7 +------ dlls/dplayx/dplayx_messages.c | 8 ++++---- 3 files changed, 10 insertions(+), 41 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 8220421..9f766de 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -227,33 +227,6 @@ static inline IDirectPlayImpl *impl_from_IDirectPlay4( IDirectPlay4 *iface ) return CONTAINING_RECORD( iface, IDirectPlayImpl, IDirectPlay4_iface ); } -static BOOL DP_CreateIUnknown( LPVOID lpDP ) -{ - IDirectPlay2AImpl *This = lpDP; - - This->unk = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->unk) ) ); - if ( This->unk == NULL ) - { - return FALSE; - } - - InitializeCriticalSection( &This->unk->DP_lock ); - This->unk->DP_lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlay2AImpl*->DirectPlayIUnknownData*->DP_lock"); - - return TRUE; -} - -static BOOL DP_DestroyIUnknown( LPVOID lpDP ) -{ - IDirectPlay2AImpl *This = lpDP; - - This->unk->DP_lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection( &This->unk->DP_lock ); - HeapFree( GetProcessHeap(), 0, This->unk ); - - return TRUE; -} - static BOOL DP_CreateDirectPlay2( LPVOID lpDP ) { IDirectPlay2AImpl *This = lpDP; @@ -418,8 +391,10 @@ HRESULT DP_CreateInterface } /* Initialize it */ - if ( DP_CreateIUnknown( This ) && DP_CreateDirectPlay2( This ) ) + if ( DP_CreateDirectPlay2( This ) ) { + InitializeCriticalSection( &This->lock ); + This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayImpl.lock"); IDirectPlayX_AddRef( (LPDIRECTPLAY2A)*ppvObj ); return S_OK; @@ -427,8 +402,6 @@ HRESULT DP_CreateInterface /* Initialize failed, destroy it */ DP_DestroyDirectPlay2( This ); - DP_DestroyIUnknown( This ); - HeapFree( GetProcessHeap(), 0, This ); *ppvObj = NULL; @@ -483,7 +456,8 @@ static ULONG WINAPI DP_Release( IDirectPlayImpl *This ) /* If we're destroying the object, this must be the last ref of the last interface */ DP_DestroyDirectPlay2( This ); - DP_DestroyIUnknown( This ); + This->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &This->lock ); HeapFree( GetProcessHeap(), 0, This ); } diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index e86c083..4684f53 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -31,11 +31,6 @@ extern HRESULT DPL_EnumAddress( LPDPENUMADDRESSCALLBACK lpEnumAddressCallback, LPCVOID lpAddress, DWORD dwAddressSize, LPVOID lpContext ) DECLSPEC_HIDDEN; -typedef struct tagDirectPlayIUnknownData -{ - CRITICAL_SECTION DP_lock; -} DirectPlayIUnknownData; - typedef struct tagEnumSessionAsyncCallbackData { LPSPINITDATA lpSpData; @@ -190,7 +185,7 @@ typedef struct IDirectPlayImpl IDirectPlay4A IDirectPlay4A_iface; IDirectPlay4 IDirectPlay4_iface; LONG ulInterfaceRef; - DirectPlayIUnknownData *unk; + CRITICAL_SECTION lock; DirectPlay2Data *dp2; } IDirectPlayImpl; diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index bc888f6..7756c9f 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -171,9 +171,9 @@ HANDLE DP_MSG_BuildAndLinkReplyStruct( IDirectPlay2Impl* This, lpReplyStructList->replyExpected.dwMsgBodySize = 0; /* Insert into the message queue while locked */ - EnterCriticalSection( &This->unk->DP_lock ); + EnterCriticalSection( &This->lock ); DPQ_INSERT( This->dp2->repliesExpected, lpReplyStructList, repliesExpected ); - LeaveCriticalSection( &This->unk->DP_lock ); + LeaveCriticalSection( &This->lock ); return lpReplyStructList->replyExpected.hReceipt; } @@ -432,10 +432,10 @@ void DP_MSG_ReplyReceived( IDirectPlay2AImpl* This, WORD wCommandId, /* Find, and immediately remove (to avoid double triggering), the appropriate entry. Call locked to * avoid problems. */ - EnterCriticalSection( &This->unk->DP_lock ); + EnterCriticalSection( &This->lock ); DPQ_REMOVE_ENTRY( This->dp2->repliesExpected, repliesExpected, replyExpected.wExpectedReply, ==, wCommandId, lpReplyList ); - LeaveCriticalSection( &This->unk->DP_lock ); + LeaveCriticalSection( &This->lock ); if( lpReplyList != NULL ) {

1 0