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

Sergey Guralnik : extrac32: Merge identical case statements.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: a5ac00aaf422398a0bb6f47f815dd24eea10fc9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ac00aaf422398a0bb6f47f8… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:04:42 2013 +0200 extrac32: Merge identical case statements. --- programs/extrac32/extrac32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index fc1ae1c..11dd755 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -130,9 +130,6 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho return 0; break; case 'C': - if (cmd) return 0; - cmd = check; - break; case 'E': case 'D': if (cmd) return 0;

1 0

Alexander Morozov : advapi32: Do not terminate a regular program if it calls StartServiceCtrlDispatcher.
by Alexandre Julliard April 2, 2013

April 2, 2013

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

Alexandre Julliard : gdi32: Use the Mac driver by default.
by Alexandre Julliard April 2, 2013

April 2, 2013

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

Jacek Caban : winhttp: Improved error handling in netconn_secure_connect.
by Alexandre Julliard April 2, 2013

April 2, 2013

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

Ken Thomases : winemac: During live resize, force occasional redisplay due to spontaneous redrawing.
by Alexandre Julliard April 2, 2013

April 2, 2013

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

Sergey Guralnik : extrac32: Get default path only when it is really necessary.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: da46ce10deeb8a327ad445ed86086dec33d16eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=da46ce10deeb8a327ad445ed8… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Sat Mar 30 07:27:44 2013 +0200 extrac32: Get default path only when it is really necessary. --- programs/extrac32/extrac32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 5216627..addd732 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -153,7 +153,7 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho /* Use extraction by default if names of required files presents */ cmd = i < argc ? 'E' : 'D'; - if (!path[0]) + if (cmd == 'E' && !path[0]) GetCurrentDirectoryW(MAX_PATH, path); lstrcatW(path, backslash);

1 0

Stefan Leichter : msvcp110: Add VS2012 C/C++ runtime.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 56538fdf8983d999a91517b5ef4c0b7fe932f1e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56538fdf8983d999a91517b5e… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Mar 30 13:48:49 2013 +0100 msvcp110: Add VS2012 C/C++ runtime. --- configure | 1 + configure.ac | 1 + dlls/msvcp110/Makefile.in | 5 + dlls/msvcp110/msvcp110.c | 37 + dlls/msvcp110/msvcp110.spec | 3900 +++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 3945 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56538fdf8983d999a9151…

1 0

Stefan Leichter : msvcp: Match architecture with function we' re forwarding to.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: c19275302faf43e683c6f2918bd66e42a9d6e567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19275302faf43e683c6f2918… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sat Mar 30 13:48:33 2013 +0100 msvcp: Match architecture with function we're forwarding to. --- dlls/msvcp100/msvcp100.spec | 138 ++-- dlls/msvcp70/msvcp70.spec | 1408 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 1438 +++++++++++++++++++++--------------------- dlls/msvcp90/msvcp90.spec | 1438 +++++++++++++++++++++--------------------- 4 files changed, 2211 insertions(+), 2211 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19275302faf43e683c6f…

1 0

André Hentschel : wine.inf: Add winemac. drv to RelayFromExclude.
by Alexandre Julliard April 2, 2013

April 2, 2013

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

Michael Stefaniuc : dplayx: Assimilate the rest of the inherited methods into IDirectPlay4.
by Alexandre Julliard April 2, 2013

April 2, 2013

Module: wine Branch: master Commit: 52d1aec827ad7aba6637d14b94e4fc75d005eb6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=52d1aec827ad7aba6637d14b9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:08:00 2013 +0100 dplayx: Assimilate the rest of the inherited methods into IDirectPlay4. --- dlls/dplayx/dplay.c | 150 +++++++++++++++++++++++---------------------------- 1 files changed, 68 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52d1aec827ad7aba6637d…

1 0