wine-commits March 2015

wine-commits@winehq.org

2 participants
775 discussions

Francois Gouget : opengl32: Mark internal symbols with hidden visibility.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 04b09dd68c1100ee0171b287dcb52bb1e85626f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b09dd68c1100ee0171b287d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:30:26 2015 +0100 opengl32: Mark internal symbols with hidden visibility. --- dlls/opengl32/opengl_ext.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index 5748e0c..2e49d4a 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -28,9 +28,9 @@ typedef struct { void *func; /* pointer to the Wine function for this extension */ } OpenGL_extension; -extern const OpenGL_extension extension_registry[]; -extern const int extension_registry_size; +extern const OpenGL_extension extension_registry[] DECLSPEC_HIDDEN; +extern const int extension_registry_size DECLSPEC_HIDDEN; -extern BOOL WINAPI wglSetPixelFormatWINE( HDC hdc, int format ); +extern BOOL WINAPI wglSetPixelFormatWINE( HDC hdc, int format ) DECLSPEC_HIDDEN; #endif /* __DLLS_OPENGL32_OPENGL_EXT_H */

1 0

Francois Gouget : oleaut32: Mark internal symbols with hidden visibility.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: deb988e52aad39e4c065a2fdfb47afd31a370d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=deb988e52aad39e4c065a2fdf… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:30:13 2015 +0100 oleaut32: Mark internal symbols with hidden visibility. --- dlls/oleaut32/variant.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index e5d9a56..9436cb3 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -114,7 +114,7 @@ typedef struct tagVARIANT_NUMBER_CHARS WCHAR cCurrencyDigitSeparator; } VARIANT_NUMBER_CHARS; -unsigned int get_type_size(ULONG*, VARTYPE); +unsigned int get_type_size(ULONG*, VARTYPE) DECLSPEC_HIDDEN; BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *) DECLSPEC_HIDDEN; HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN; BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *,

1 0

Francois Gouget : mshtml: Mark internal symbols with hidden visibility.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 45f5e5d74686364eb3cf6e9d0dd79102a6d95ed3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45f5e5d74686364eb3cf6e9d0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:30:04 2015 +0100 mshtml: Mark internal symbols with hidden visibility. --- dlls/mshtml/mshtml_private.h | 16 ++++++++-------- dlls/mshtml/pluginhost.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6d39a72..22b8397 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -268,12 +268,12 @@ typedef struct { DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9); -nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*); -nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*); -void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt); -void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*); -void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*); -void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*); +nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*) DECLSPEC_HIDDEN; +nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*) DECLSPEC_HIDDEN; +void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt) DECLSPEC_HIDDEN; +void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*) DECLSPEC_HIDDEN; +void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; +void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void init_dispex(DispatchEx*,IUnknown*,dispex_static_data_t*) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; @@ -699,9 +699,9 @@ typedef struct { IHTMLElement3_tid, \ IHTMLElement4_tid -extern cp_static_data_t HTMLElementEvents2_data; +extern cp_static_data_t HTMLElementEvents2_data DECLSPEC_HIDDEN; #define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data} -extern const cpc_entry_t HTMLElement_cpc[]; +extern const cpc_entry_t HTMLElement_cpc[] DECLSPEC_HIDDEN; typedef struct { HTMLElement element; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index 46a1535..0460c3c 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -72,5 +72,5 @@ HRESULT create_ip_frame(IOleInPlaceFrame**) DECLSPEC_HIDDEN; HRESULT get_plugin_disp(HTMLPluginContainer*,IDispatch**) DECLSPEC_HIDDEN; HRESULT get_plugin_dispid(HTMLPluginContainer*,WCHAR*,DISPID*) DECLSPEC_HIDDEN; HRESULT invoke_plugin_prop(HTMLPluginContainer*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*) DECLSPEC_HIDDEN; -void notif_container_change(HTMLPluginContainer*,DISPID); +void notif_container_change(HTMLPluginContainer*,DISPID) DECLSPEC_HIDDEN; void bind_activex_event(HTMLDocumentNode*,HTMLPluginContainer*,WCHAR*,IDispatch*) DECLSPEC_HIDDEN;

1 0

Francois Gouget : windowscodecs: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 0d80651e95b8f6a5a20adfe5aaec15f1167d9a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d80651e95b8f6a5a20adfe5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:53 2015 +0100 windowscodecs: Remove unneeded NONAMELESSXXX directives. --- dlls/windowscodecs/proxy.c | 1 - dlls/windowscodecs/regsvr.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 38f076f..10d34e3 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -23,7 +23,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 91df294..28469c7 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include <stdarg.h> #include <string.h>

1 0

Francois Gouget : user32: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 68264c2da700434f26d54ecdde5af2761111bb25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68264c2da700434f26d54ecdd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:46 2015 +0100 user32: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/user32/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 1f05f34..0ed4218 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -33,7 +33,7 @@ #include <assert.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

1 0

Francois Gouget : usbd.sys: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: de896a39538e934cdbb86891348f5b1d47edd830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de896a39538e934cdbb868913… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:38 2015 +0100 usbd.sys: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/usbd.sys/usbd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/usbd.sys/usbd.c b/dlls/usbd.sys/usbd.c index fbec22e..1cb2525 100644 --- a/dlls/usbd.sys/usbd.c +++ b/dlls/usbd.sys/usbd.c @@ -19,7 +19,6 @@ #include <stdarg.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS

1 0

Francois Gouget : wineoss.drv: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 0ca3c64e92fe72c7ac81dade2946b2dd30316b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca3c64e92fe72c7ac81dade2… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:30 2015 +0100 wineoss.drv: Remove an uneeded NONAMELESSUNION directive. --- dlls/wineoss.drv/mmdevdrv.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0688f9a..cbaf1b2 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define NONAMELESSUNION #define COBJMACROS #include "config.h"

1 0

Francois Gouget : urlmon: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: 16960a425f9a40e62a9e02477bbe77ede217b77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=16960a425f9a40e62a9e02477… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 26 15:29:22 2015 +0100 urlmon: Remove unneeded NONAMELESSXXX directives. Also put them in the files that need them. --- dlls/urlmon/binding.c | 2 ++ dlls/urlmon/http.c | 2 ++ dlls/urlmon/tests/sec_mgr.c | 1 - dlls/urlmon/urlmon_main.c | 2 ++ dlls/urlmon/urlmon_main.h | 2 -- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 306e9b3..9b78582 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "urlmon_main.h" #include "winreg.h" #include "shlwapi.h" diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 16e5fad..b0c7d2a 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "urlmon_main.h" #include "wininet.h" diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index e41f0b6..4092842 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -20,7 +20,6 @@ #define COBJMACROS #define CONST_VTABLE -#define NONAMELESSUNION /* needed for IInternetZoneManagerEx2 */ #define _WIN32_IE 0x0700 diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 1204a62..c4f1cec 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "urlmon_main.h" #include "winreg.h" diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 12be0ed..fd13279 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -23,8 +23,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Pierre Schweitzer : setupapi/tests: Add tests for the SetupOpenLog(), SetupLogErrorA(), SetupCloseLog() functions.
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: a1edebefdf47cab4effa0324c0d4ea2218b031c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1edebefdf47cab4effa0324c… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Mar 25 21:25:40 2015 +0100 setupapi/tests: Add tests for the SetupOpenLog(), SetupLogErrorA(), SetupCloseLog() functions. --- dlls/setupapi/tests/misc.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index cfe888b..7423738 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -776,6 +776,39 @@ static void test_defaultcallback(void) SetupTermDefaultQueueCallback(ctxt); } +static void test_SetupLogError(void) +{ + BOOL ret; + DWORD error; + + SetLastError(0xdeadbeef); + ret = SetupLogErrorA("Test without opening\r\n", LogSevInformation); + error = GetLastError(); + ok(!ret, "SetupLogError succeeded\n"); + ok(error == ERROR_FILE_INVALID, "got wrong error: %d\n", error); + + ret = SetupOpenLog(FALSE); + ok(ret, "SetupOpenLog failed\n"); + + SetLastError(0xdeadbeef); + ret = SetupLogErrorA("Test with wrong log severity\r\n", LogSevMaximum); + error = GetLastError(); + ok(!ret, "SetupLogError succeeded\n"); + ok(error == 0xdeadbeef, "got wrong error: %d\n", error); + ret = SetupLogErrorA("Test without EOL", LogSevInformation); + ok(ret, "SetupLogError failed\n"); + + SetLastError(0xdeadbeef); + ret = SetupLogErrorA(NULL, LogSevInformation); + ok(ret || broken(!ret && GetLastError() == ERROR_INVALID_PARAMETER /* Win Vista+ */), + "SetupLogError failed: %08x\n", GetLastError()); + + ret = SetupOpenLog(FALSE); + ok(ret, "SetupOpenLog failed\n"); + + SetupCloseLog(); +} + START_TEST(misc) { HMODULE hsetupapi = GetModuleHandleA("setupapi.dll"); @@ -807,4 +840,6 @@ START_TEST(misc) win_skip("SetupUninstallOEMInfA is not available\n"); test_defaultcallback(); + + test_SetupLogError(); }

1 0

Pierre Schweitzer : setupapi: Implement SetupLogErrorA(), SetupLogErrorW() .
by Alexandre Julliard 26 Mar '15

26 Mar '15

Module: wine Branch: master Commit: a851aaa4248b9f38c0c6e3b1c04e54f95de163b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a851aaa4248b9f38c0c6e3b1c… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Mar 25 21:18:48 2015 +0100 setupapi: Implement SetupLogErrorA(), SetupLogErrorW(). --- dlls/setupapi/misc.c | 72 +++++++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 ------ 3 files changed, 73 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index f294821..de73966 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -1679,3 +1679,75 @@ BOOL WINAPI SetupOpenLog(BOOL reserved) return TRUE; } + +/*********************************************************************** + * SetupLogErrorA(SETUPAPI.@) + */ +BOOL WINAPI SetupLogErrorA(LPCSTR message, LogSeverity severity) +{ + static const char null[] = "(null)"; + BOOL ret; + DWORD written; + DWORD len; + + EnterCriticalSection(&setupapi_cs); + + if (setupact == INVALID_HANDLE_VALUE || setuperr == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_FILE_INVALID); + ret = FALSE; + goto done; + } + + if (message == NULL) + message = null; + + len = lstrlenA(message); + + ret = WriteFile(setupact, message, len, &written, NULL); + if (!ret) + goto done; + + if (severity >= LogSevMaximum) + { + ret = FALSE; + goto done; + } + + if (severity > LogSevInformation) + ret = WriteFile(setuperr, message, len, &written, NULL); + +done: + LeaveCriticalSection(&setupapi_cs); + return ret; +} + +/*********************************************************************** + * SetupLogErrorW(SETUPAPI.@) + */ +BOOL WINAPI SetupLogErrorW(LPCWSTR message, LogSeverity severity) +{ + LPSTR msg = NULL; + DWORD len; + BOOL ret; + + if (message) + { + len = WideCharToMultiByte(CP_ACP, 0, message, -1, NULL, 0, NULL, NULL); + msg = HeapAlloc(GetProcessHeap(), 0, len); + if (msg == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + WideCharToMultiByte(CP_ACP, 0, message, -1, msg, len, NULL, NULL); + } + + /* This is the normal way to proceed. The log files are ASCII files + * and W is to be converted. + */ + ret = SetupLogErrorA(msg, severity); + + HeapFree(GetProcessHeap(), 0, msg); + return ret; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 4fcf298..c1dbed5 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -459,7 +459,7 @@ @ stdcall SetupInstallServicesFromInfSectionW(long wstr long) @ stdcall SetupIterateCabinetA(str long ptr ptr) @ stdcall SetupIterateCabinetW(wstr long ptr ptr) -@ stub SetupLogErrorA +@ stdcall SetupLogErrorA(str long) @ stdcall SetupLogErrorW(wstr long) @ stdcall SetupLogFileA(ptr str str str long str str str long) @ stdcall SetupLogFileW(ptr wstr wstr wstr long wstr wstr wstr long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 66bd5d4..a57f5fe 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -189,15 +189,6 @@ BOOL WINAPI RegistryDelnode(DWORD x, DWORD y) } /*********************************************************************** - * SetupLogErrorW(SETUPAPI.@) - */ -BOOL WINAPI SetupLogErrorW(LPCWSTR MessageString, LogSeverity Severity) -{ - FIXME("(%s, %d) stub\n", debugstr_w(MessageString), Severity); - return TRUE; -} - -/*********************************************************************** * SetupPromptReboot(SETUPAPI.@) */ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only )

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
78
Older →

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