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

Sebastian Lackner : quartz: Remove unused variable.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 9057a693d75bdc4554a2fd83e135666d97f142ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9057a693d75bdc4554a2fd83e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 04:55:02 2015 +0100 quartz: Remove unused variable. --- dlls/quartz/main.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index b45c55b..32865f3 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -29,8 +29,6 @@ extern HRESULT WINAPI QUARTZ_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DECLS extern HRESULT WINAPI QUARTZ_DllCanUnloadNow(void) DECLSPEC_HIDDEN; extern BOOL WINAPI QUARTZ_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; -static DWORD dll_ref = 0; - /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { @@ -206,7 +204,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - if (dll_ref) return S_FALSE; return QUARTZ_DllCanUnloadNow(); }

1 0

Sebastian Lackner : d3dxof: Do not allow unloading while library is still in use.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: fc2d81464d9cdeaca06a362416858ab0c5da36a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2d81464d9cdeaca06a36241… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 04:45:08 2015 +0100 d3dxof: Do not allow unloading while library is still in use. --- dlls/d3dxof/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index ddd4661..572f388 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -41,7 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); static HINSTANCE instance; -static LONG dll_ref = 0; /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) @@ -225,7 +224,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return dll_ref != 0 ? S_FALSE : S_OK; + return S_FALSE; } /***********************************************************************

1 0

Sebastian Lackner : amstream: Do not allow unloading while library is still in use.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 2edc31d6c028b9532c8e4059f585d330f532a2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2edc31d6c028b9532c8e4059f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 04:25:48 2015 +0100 amstream: Do not allow unloading while library is still in use. --- dlls/amstream/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 9479053..e80c491 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -39,7 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); static HINSTANCE instance; -static DWORD dll_ref = 0; /* For the moment, do nothing here. */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) @@ -205,7 +204,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) */ HRESULT WINAPI DllCanUnloadNow(void) { - return dll_ref != 0 ? S_FALSE : S_OK; + return S_FALSE; } /***********************************************************************

1 0

Marcus Meissner : dsound: If 3d sound is disabled, just return (Coverity).
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: a83e8e88ea05822e21aace9e0b82060bfa1dc02f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83e8e88ea05822e21aace9e0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Mar 1 14:04:56 2015 +0100 dsound: If 3d sound is disabled, just return (Coverity). --- dlls/dsound/sound3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index c53783e..439cfac 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -177,7 +177,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) TRACE("3D processing disabled\n"); /* this one is here only to eliminate annoying warning message */ DSOUND_RecalcVolPan (&dsb->volpan); - break; + return; case DS3DMODE_NORMAL: TRACE("Normal 3D processing mode\n"); /* we need to calculate distance between buffer and listener*/

1 0

Sebastian Lackner : msxml3: Fix incorrect size argument of FormatMessageW.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 76a09f4e2983fa925757bdf3d9d6f5e8ea2a36c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a09f4e2983fa925757bdf3d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 28 19:58:06 2015 +0100 msxml3: Fix incorrect size argument of FormatMessageW. --- dlls/msxml3/saxreader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5061413..3b5bd7c 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -668,7 +668,7 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr) { WCHAR msg[1024]; if(!FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, - NULL, hr, 0, msg, sizeof(msg), NULL)) + NULL, hr, 0, msg, sizeof(msg)/sizeof(msg[0]), NULL)) { FIXME("MSXML errors not yet supported.\n"); msg[0] = '\0';

1 0

Francois Gouget : include/ddk: Make ntddk.h compatible with systems that don't support nameless unions.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: fa01fdc3219974f97a642a10889baf33fdba2ec6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa01fdc3219974f97a642a108… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 17:30:51 2015 +0100 include/ddk: Make ntddk.h compatible with systems that don't support nameless unions. --- include/ddk/ntddk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index e9c3fba..bccfd39 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -119,8 +119,8 @@ typedef struct _IMAGE_INFO ULONG ImageMappedToAllPids : 1; ULONG ExtendedInfoPresent : 1; ULONG Reserved : 21; - }; - }; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; PVOID ImageBase; ULONG ImageSelector; SIZE_T ImageSize;

1 0

Francois Gouget : dinput: IDirectInputDevice8WImpl_SetActionMap() is redundant so remove it.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 128a86f0b0b3bd76eb887174cc1a748a33e0ed03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=128a86f0b0b3bd76eb887174c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 18:30:07 2015 +0100 dinput: IDirectInputDevice8WImpl_SetActionMap() is redundant so remove it. --- dlls/dinput/device.c | 12 +----------- dlls/dinput/device_private.h | 4 ---- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 08ebfd7..ab43029 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -866,7 +866,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L /* Save the settings to disk */ save_mapping_settings(iface, lpdiaf, username); - return IDirectInputDevice8WImpl_SetActionMap(iface, lpdiaf, lpszUserName, dwFlags); + return DI_OK; } /****************************************************************************** @@ -1719,16 +1719,6 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa return DI_OK; } -HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, - LPDIACTIONFORMATW lpdiaf, - LPCWSTR lpszUserName, - DWORD dwFlags) -{ - FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader) { diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 660ebd7..52bbec4 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -243,10 +243,6 @@ extern HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVIC LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; -extern HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, - LPDIACTIONFORMATW lpdiaf, - LPCWSTR lpszUserName, - DWORD dwFlags) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface, LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice8WImpl_GetImageInfo(LPDIRECTINPUTDEVICE8W iface,

1 0

Francois Gouget : advapi32: Avoid defining SECURITY_INFORMATION multiple times.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 8d52f0964616c68464f79d92500de46840884c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d52f0964616c68464f79d925… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 20:00:33 2015 +0100 advapi32: Avoid defining SECURITY_INFORMATION multiple times. --- include/wine/svcctl.idl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wine/svcctl.idl b/include/wine/svcctl.idl index e8463b5..4af6b9a 100644 --- a/include/wine/svcctl.idl +++ b/include/wine/svcctl.idl @@ -65,12 +65,13 @@ interface svcctl typedef [context_handle] void *SC_RPC_LOCK; typedef [context_handle] void *SC_NOTIFY_RPC_HANDLE; - typedef DWORD SECURITY_INFORMATION; - /* undocumented access rights */ cpp_quote("#define SERVICE_SET_STATUS 0x8000") -cpp_quote("#if 0 /* already defined in winsvc.h */") +cpp_quote("#if 0 /* already defined in winsvc.h / winnt.h */") + +typedef DWORD SECURITY_INFORMATION; + typedef struct _QUERY_SERVICE_CONFIGA { DWORD dwServiceType; DWORD dwStartType;

1 0

Francois Gouget : advapi32/tests: Make cb_{running, stopped}() static.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: de72e97f3705cea0d417be7f5d5909d3494ad425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de72e97f3705cea0d417be7f5… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 18:31:06 2015 +0100 advapi32/tests: Make cb_{running,stopped}() static. --- dlls/advapi32/tests/service.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index f87508b..81d2f74 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2202,7 +2202,7 @@ struct notify_data { SC_HANDLE svc; }; -void CALLBACK cb_stopped(void *user) +static void CALLBACK cb_stopped(void *user) { struct notify_data *data = user; BOOL br; @@ -2218,7 +2218,7 @@ void CALLBACK cb_stopped(void *user) ok(br, "StartService failed: %u\n", GetLastError()); } -void CALLBACK cb_running(void *user) +static void CALLBACK cb_running(void *user) { struct notify_data *data = user; BOOL br;

1 0

Francois Gouget : services: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard March 2, 2015

March 2, 2015

Module: wine Branch: master Commit: 123cfee93c5dcc5f286f73f6d4ebe162c93178e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123cfee93c5dcc5f286f73f6d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 17:30:54 2015 +0100 services: Fix compilation on systems that don't support nameless unions. --- programs/services/rpc.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 9ecc09c..a3d5a24 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -19,6 +19,7 @@ */ #define WIN32_LEAN_AND_MEAN +#define NONAMELESSUNION #include <stdarg.h> #include <windows.h> @@ -797,9 +798,9 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI { WCHAR *descr = NULL; - if (config.descr->lpDescription[0]) + if (config.u.descr->lpDescription[0]) { - if (!(descr = strdupW( config.descr->lpDescription ))) + if (!(descr = strdupW( config.u.descr->lpDescription ))) return ERROR_NOT_ENOUGH_MEMORY; } @@ -813,15 +814,15 @@ DWORD __cdecl svcctl_ChangeServiceConfig2W( SC_RPC_HANDLE hService, SC_RPC_CONFI break; case SERVICE_CONFIG_FAILURE_ACTIONS: WINE_FIXME( "SERVICE_CONFIG_FAILURE_ACTIONS not implemented: period %u msg %s cmd %s\n", - config.actions->dwResetPeriod, - wine_dbgstr_w(config.actions->lpRebootMsg), - wine_dbgstr_w(config.actions->lpCommand) ); + config.u.actions->dwResetPeriod, + wine_dbgstr_w(config.u.actions->lpRebootMsg), + wine_dbgstr_w(config.u.actions->lpCommand) ); break; case SERVICE_CONFIG_PRESHUTDOWN_INFO: WINE_TRACE( "changing service %p preshutdown timeout to %d\n", - service, config.preshutdown->dwPreshutdownTimeout ); + service, config.u.preshutdown->dwPreshutdownTimeout ); service_lock_exclusive( service->service_entry ); - service->service_entry->preshutdown_timeout = config.preshutdown->dwPreshutdownTimeout; + service->service_entry->preshutdown_timeout = config.u.preshutdown->dwPreshutdownTimeout; save_service_config( service->service_entry ); service_unlock( service->service_entry ); break;

1 0