wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Sebastian Lackner : d3dxof: Do not allow unloading while library is still in use.
by Alexandre Julliard 02 Mar '15

02 Mar '15

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 02 Mar '15

02 Mar '15

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

Sebastian Lackner : browseui: Always use interlocked functions when accessing variable BROWSEUI_refCount.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 890dc4d2600857cb691f65bd069d8a1d0e0f9b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=890dc4d2600857cb691f65bd0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Mar 1 03:46:06 2015 +0100 browseui: Always use interlocked functions when accessing variable BROWSEUI_refCount. --- dlls/browseui/browseui_main.c | 4 ++-- dlls/browseui/compcatcachedaemon.c | 4 ++-- dlls/browseui/progressdlg.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 78ce326..f509ee5 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -74,7 +74,7 @@ static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); heap_free(This); - BROWSEUI_refCount--; + InterlockedDecrement(&BROWSEUI_refCount); } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) @@ -154,7 +154,7 @@ static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) This->ctor = ctor; *ppvOut = This; TRACE("Created class factory %p\n", This); - BROWSEUI_refCount++; + InterlockedIncrement(&BROWSEUI_refCount); return S_OK; } diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 0acb4ec..a5addd2 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -60,7 +60,7 @@ static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); - BROWSEUI_refCount--; + InterlockedDecrement(&BROWSEUI_refCount); } static HRESULT WINAPI CompCatCacheDaemon_QueryInterface(IRunnableTask *iface, REFIID iid, LPVOID *ppvOut) @@ -159,6 +159,6 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; - BROWSEUI_refCount++; + InterlockedIncrement(&BROWSEUI_refCount); return S_OK; } diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 598197b..e61a4cc 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -268,7 +268,7 @@ static void ProgressDialog_Destructor(ProgressDialog *This) This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); heap_free(This); - BROWSEUI_refCount--; + InterlockedDecrement(&BROWSEUI_refCount); } static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFIID iid, LPVOID *ppvOut) @@ -574,6 +574,6 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) TRACE("returning %p\n", This); *ppOut = (IUnknown *)This; - BROWSEUI_refCount++; + InterlockedIncrement(&BROWSEUI_refCount); return S_OK; }

1 0

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

02 Mar '15

Module: wine Branch: master Commit: 7c48641100b6edc16116d68895f0b4bcf620a8bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c48641100b6edc16116d6889… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Feb 28 19:58:59 2015 +0100 shell32: Fix incorrect size argument of FormatMessageW. --- dlls/shell32/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 62d7880..e7e24e0 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -292,7 +292,7 @@ static BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir, FI args[0] = (DWORD_PTR)szDir; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - szText, 0, 0, szBuffer, sizeof(szBuffer), (__ms_va_list*)args); + szText, 0, 0, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0]), (__ms_va_list*)args); hIcon = LoadIconW(ids.hIconInstance, (LPWSTR)MAKEINTRESOURCE(ids.icon_resource_id)); ret = SHELL_ConfirmMsgBox(hWnd, szBuffer, szCaption, hIcon, op && op->bManyItems);

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

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

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 : 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 : 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 : mshtml: Make insert_adjacent_node() static.
by Alexandre Julliard 02 Mar '15

02 Mar '15

Module: wine Branch: master Commit: 5a36a48c15db1cea8d0d807df086813a9386722c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a36a48c15db1cea8d0d807df… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Feb 28 18:26:42 2015 +0100 mshtml: Make insert_adjacent_node() static. --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/mshtml_private.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8120761..dfb8be5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1508,7 +1508,7 @@ static HRESULT WINAPI HTMLElement_get_outerText(IHTMLElement *iface, BSTR *p) return E_NOTIMPL; } -HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode, HTMLDOMNode **ret_node) +static HRESULT insert_adjacent_node(HTMLElement *This, const WCHAR *where, nsIDOMNode *nsnode, HTMLDOMNode **ret_node) { nsIDOMNode *ret_nsnode; nsresult nsres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5c3c1ec..fac3c64 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -878,8 +878,6 @@ void detach_ranges(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT get_node_text(HTMLDOMNode*,BSTR*) DECLSPEC_HIDDEN; HRESULT replace_node_by_html(nsIDOMHTMLDocument*,nsIDOMNode*,const WCHAR*) DECLSPEC_HIDDEN; -HRESULT insert_adjacent_node(HTMLElement*,const WCHAR*,nsIDOMNode*,HTMLDOMNode**) DECLSPEC_HIDDEN; - HRESULT create_nselem(HTMLDocumentNode*,const WCHAR*,nsIDOMHTMLElement**) DECLSPEC_HIDDEN; HRESULT create_element(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2015