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

Francois Gouget : dinput: IDirectInputDevice8WImpl_SetActionMap() is redundant so remove it.
by Alexandre Julliard 02 Mar '15

02 Mar '15

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 : ndis.sys: Convert ndis.sys to a native driver as it should be.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 119e20a822c69e7b3d5663b4bc16107baa99a6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=119e20a822c69e7b3d5663b4b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 18:30:59 2015 +0100 ndis.sys: Convert ndis.sys to a native driver as it should be. --- dlls/ndis.sys/Makefile.in | 1 + dlls/ndis.sys/main.c | 22 ++++++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index d469e4e..33b1843 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,4 +1,5 @@ MODULE = ndis.sys +EXTRADLLFLAGS = -Wb,--subsystem,native C_SRCS = \ main.c diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index 99a0498..820b4af 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -18,23 +18,21 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ndis); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } + TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); - return TRUE; + return STATUS_SUCCESS; }

1 0

Francois Gouget : advapi32/tests: Make cb_{running, stopped}() static.
by Alexandre Julliard 02 Mar '15

02 Mar '15

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 : advapi32: Avoid defining SECURITY_INFORMATION multiple times.
by Alexandre Julliard 02 Mar '15

02 Mar '15

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

Sebastian Lackner : msxml3: Fix incorrect size argument of FormatMessageW.
by Alexandre Julliard 02 Mar '15

02 Mar '15

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