January 2020 - Wine-Devel - list.winehq.org

[PATCH] dlls: Global variable compatibility update for gcc 10
by Michael Cronenworth Jan. 23, 2020

Jan. 23, 2020

https://gcc.gnu.org/gcc-10/porting_to.html#common Default to -fno-common A common mistake in C is omitting extern when declaring a global variable in a header file. If the header is included by several files it results in multiple definitions of the same variable. In previous GCC versions this error is ignored. GCC 10 defaults to -fno-common, which means a linker error will now be reported. To fix this, use extern in header files when declaring global variables, and ensure each global is defined in exactly one C file. As a workaround, legacy C code can be compiled with -fcommon. int x; // tentative definition - avoid in header files extern int y; // correct declaration in a header file Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> --- dlls/crypt32/crypt32_private.h | 2 +- dlls/dsound/dsound_private.h | 6 +++--- dlls/gphoto2.ds/gphoto2_i.h | 2 +- dlls/gphoto2.ds/gphoto2_main.c | 2 ++ dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/main.c | 7 +++++++ dlls/mshtml/mshtml_private.h | 12 ++++++------ dlls/msi/msi.c | 2 ++ dlls/msi/msipriv.h | 2 +- dlls/sane.ds/sane_i.h | 4 ++-- dlls/sane.ds/sane_main.c | 17 +++++++++++++++++ dlls/secur32/secur32_priv.h | 4 ++-- dlls/twain_32/twain32_main.c | 4 +++- dlls/twain_32/twain_i.h | 6 +++--- dlls/wbemprox/main.c | 2 ++ dlls/wbemprox/wbemprox_private.h | 4 ++-- dlls/webservices/webservices_private.h | 6 +++--- dlls/winebus.sys/bus.h | 4 ++-- dlls/xinput1_3/xinput_private.h | 4 ++-- 19 files changed, 62 insertions(+), 30 deletions(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 3d0129e7d4..d92eb1a157 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -152,7 +152,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, */ HCRYPTPROV WINAPI I_CryptGetDefaultCryptProv(ALG_ID); -HINSTANCE hInstance DECLSPEC_HIDDEN; +extern HINSTANCE hInstance DECLSPEC_HIDDEN; void crypt_oid_init(void) DECLSPEC_HIDDEN; void crypt_oid_free(void) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 69c4a2f390..930c3e92ec 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -188,9 +188,9 @@ HRESULT IDirectSoundBufferImpl_Duplicate( IDirectSoundBufferImpl **ppdsb, IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; -const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; -const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; -const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; +extern const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; +extern const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; +extern const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 9ab8bbbf33..6b504821e0 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -100,7 +100,7 @@ struct tagActiveDS struct jpeg_decompress_struct jd; struct jpeg_error_mgr jerr; #endif -} activeDS DECLSPEC_HIDDEN; +} extern activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 GPHOTO2_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index 28100414cc..4d71c89e2e 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +struct tagActiveDS activeDS; + DSMENTRYPROC GPHOTO2_dsmentry; #ifdef HAVE_GPHOTO2 diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 9dcf3d9eed..7a83897043 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -142,7 +142,7 @@ void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t, dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) DECLSPEC_HIDDEN; -const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl DECLSPEC_HIDDEN; +extern const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl DECLSPEC_HIDDEN; HRESULT get_style_property(CSSStyle*,styleid_t,BSTR*) DECLSPEC_HIDDEN; HRESULT get_style_property_var(CSSStyle*,styleid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 29396a5475..e2c927c5f9 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -51,6 +51,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); HINSTANCE hInst; DWORD mshtml_tls = TLS_OUT_OF_INDEXES; +void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*); +nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*); +nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*); +void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt); +void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*); +void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*); + static HINSTANCE shdoclc = NULL; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; static IMultiLanguage2 *mlang; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9612b32608..cc9eefc528 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -355,12 +355,12 @@ typedef struct { DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30, 0xcc,0xae,0xdd,0x10,0x4c,0xf9); -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; +extern nsrefcnt (__cdecl *ccref_incr)(nsCycleCollectingAutoRefCnt*,nsISupports*) DECLSPEC_HIDDEN; +extern nsrefcnt (__cdecl *ccref_decr)(nsCycleCollectingAutoRefCnt*,nsISupports*,ExternalCycleCollectionParticipant*) DECLSPEC_HIDDEN; +extern void (__cdecl *ccref_init)(nsCycleCollectingAutoRefCnt*,nsrefcnt) DECLSPEC_HIDDEN; +extern void (__cdecl *ccp_init)(ExternalCycleCollectionParticipant*,const CCObjCallback*) DECLSPEC_HIDDEN; +extern void (__cdecl *describe_cc_node)(nsCycleCollectingAutoRefCnt*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; +extern void (__cdecl *note_cc_edge)(nsISupports*,const char*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void init_dispex_with_compat_mode(DispatchEx*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; void release_dispex(DispatchEx*) DECLSPEC_HIDDEN; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7bf5004bed..6387b0a937 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -51,6 +51,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +BOOL is_wow64; + static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index fca2f9e7b4..6b87cfb3d8 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -42,7 +42,7 @@ #include "winemsi.h" static const BOOL is_64bit = sizeof(void *) > sizeof(int); -BOOL is_wow64 DECLSPEC_HIDDEN; +extern BOOL is_wow64 DECLSPEC_HIDDEN; #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100 diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index 941e8b9e1b..d22b1b1723 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -36,7 +36,7 @@ #include "twain.h" #ifdef SONAME_LIBSANE -#define MAKE_FUNCPTR(f) typeof(f) * p##f DECLSPEC_HIDDEN; +#define MAKE_FUNCPTR(f) extern typeof(f) * p##f DECLSPEC_HIDDEN; MAKE_FUNCPTR(sane_init) MAKE_FUNCPTR(sane_exit) MAKE_FUNCPTR(sane_get_devices) @@ -84,7 +84,7 @@ struct tagActiveDS TW_FIX32 defaultXResolution; BOOL YResolutionSet; TW_FIX32 defaultYResolution; -} activeDS DECLSPEC_HIDDEN; +} extern activeDS DECLSPEC_HIDDEN; /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 7af0a2321a..cb9da8e875 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -33,8 +33,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); DSMENTRYPROC SANE_dsmentry; #ifdef SONAME_LIBSANE +#define MAKE_FUNCPTR(f) typeof(f) * p##f; +MAKE_FUNCPTR(sane_init) +MAKE_FUNCPTR(sane_exit) +MAKE_FUNCPTR(sane_get_devices) +MAKE_FUNCPTR(sane_open) +MAKE_FUNCPTR(sane_close) +MAKE_FUNCPTR(sane_get_option_descriptor) +MAKE_FUNCPTR(sane_control_option) +MAKE_FUNCPTR(sane_get_parameters) +MAKE_FUNCPTR(sane_start) +MAKE_FUNCPTR(sane_read) +MAKE_FUNCPTR(sane_cancel) +MAKE_FUNCPTR(sane_set_io_mode) +MAKE_FUNCPTR(sane_get_select_fd) +MAKE_FUNCPTR(sane_strstatus) +#undef MAKE_FUNCPTR HINSTANCE SANE_instance; +struct tagActiveDS activeDS; static void *libsane_handle; diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 5ed26d67ef..1f77955cfd 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -190,8 +190,8 @@ void SECUR32_arc4Cleanup(arc4_info *a4i) DECLSPEC_HIDDEN; #define NTLMSSP_NEGOTIATE_56 0x80000000 -SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; -SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; +extern SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; +extern SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session; diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index b1beb96958..0f8ee14430 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -29,7 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); -extern HINSTANCE DSM_hinstance; +TW_UINT16 DSM_twCC; +activeDS *activeSources; +HINSTANCE DSM_hinstance; BOOL WINAPI DllMain (HINSTANCE hinstance, DWORD reason, LPVOID reserved) { diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index 7939d233bb..ad513458cd 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -45,11 +45,11 @@ typedef struct tagActiveDS HWND event_window; } activeDS; -TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ +extern TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ -activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ +extern activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */ -HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; +extern HINSTANCE DSM_hinstance DECLSPEC_HIDDEN; /* Implementation of operation triplets (From Application to Source Manager) */ extern TW_UINT16 TWAIN_CloseDS diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index d90f4f8cc6..0908441498 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -35,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static HINSTANCE instance; +struct list *table_list; + typedef HRESULT (*fnCreateInstance)( LPVOID *ppObj ); typedef struct diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 9d39a7c92b..9096b392e3 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -20,8 +20,8 @@ #include "wine/heap.h" #include "wine/list.h" -IClientSecurity client_security DECLSPEC_HIDDEN; -struct list *table_list DECLSPEC_HIDDEN; +extern IClientSecurity client_security DECLSPEC_HIDDEN; +extern struct list *table_list DECLSPEC_HIDDEN; enum param_direction { diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 6f2b90dad2..b352aa52d4 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -18,7 +18,7 @@ #include "winhttp.h" -_locale_t c_locale DECLSPEC_HIDDEN; +extern _locale_t c_locale DECLSPEC_HIDDEN; #define STREAM_BUFSIZE 4096 @@ -50,8 +50,8 @@ struct dictionary ULONG current_sequence; ULONG *sequence; }; -struct dictionary dict_builtin DECLSPEC_HIDDEN; -const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; +extern struct dictionary dict_builtin DECLSPEC_HIDDEN; +extern const struct dictionary dict_builtin_static DECLSPEC_HIDDEN; int find_string( const struct dictionary *, const unsigned char *, ULONG, ULONG * ) DECLSPEC_HIDDEN; HRESULT insert_string( struct dictionary *, unsigned char *, ULONG, int, ULONG * ) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 041a37ad04..22a4b46a51 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -54,5 +54,5 @@ DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func fu DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; -HANDLE driver_key DECLSPEC_HIDDEN; -DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; +extern HANDLE driver_key DECLSPEC_HIDDEN; +extern DEVICE_OBJECT *bus_pdo DECLSPEC_HIDDEN; diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index f3456cd8e7..9a0e03c1de 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -26,8 +26,8 @@ typedef struct _xinput_controller XINPUT_VIBRATION vibration; } xinput_controller; -CRITICAL_SECTION xinput_crit; -xinput_controller controllers[XUSER_MAX_COUNT]; +extern CRITICAL_SECTION xinput_crit; +extern xinput_controller controllers[XUSER_MAX_COUNT]; void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; -- 2.24.1

3 2

[PATCH] vcruntime140_1: Add stub dll.
by Daniel Lehman Jan. 23, 2020

Jan. 23, 2020

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- configure.ac | 1 + dlls/vcruntime140_1/Makefile.in | 1 + dlls/vcruntime140_1/vcruntime140_1.spec | 3 +++ tools/make_specfiles | 1 + 4 files changed, 6 insertions(+) create mode 100644 dlls/vcruntime140_1/Makefile.in create mode 100644 dlls/vcruntime140_1/vcruntime140_1.spec diff --git a/configure.ac b/configure.ac index 681d315eed..36f65378a4 100644 --- a/configure.ac +++ b/configure.ac @@ -3717,6 +3717,7 @@ WINE_CONFIG_MAKEFILE(dlls/vcomp120) WINE_CONFIG_MAKEFILE(dlls/vcomp140) WINE_CONFIG_MAKEFILE(dlls/vcomp90) WINE_CONFIG_MAKEFILE(dlls/vcruntime140) +WINE_CONFIG_MAKEFILE(dlls/vcruntime140_1) WINE_CONFIG_MAKEFILE(dlls/vdhcp.vxd,enable_win16) WINE_CONFIG_MAKEFILE(dlls/vdmdbg) WINE_CONFIG_MAKEFILE(dlls/ver.dll16,enable_win16) diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in new file mode 100644 index 0000000000..b5e20fe92f --- /dev/null +++ b/dlls/vcruntime140_1/Makefile.in @@ -0,0 +1 @@ +MODULE = vcruntime140_1.dll diff --git a/dlls/vcruntime140_1/vcruntime140_1.spec b/dlls/vcruntime140_1/vcruntime140_1.spec new file mode 100644 index 0000000000..55f568ef13 --- /dev/null +++ b/dlls/vcruntime140_1/vcruntime140_1.spec @@ -0,0 +1,3 @@ +@ stub __CxxFrameHandler4 +@ stub __NLG_Dispatch2 +@ stub __NLG_Return2 diff --git a/tools/make_specfiles b/tools/make_specfiles index 7fef3a6821..7237e832bc 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -67,6 +67,7 @@ my @dll_groups = "api-ms-win-crt-time-l1-1-0", "api-ms-win-crt-utility-l1-1-0", "vcruntime140", + "vcruntime140_1", ], [ "msvcp120", -- 2.17.1

1 0

[PATCH 1/5] quartz: Simplify FilterMapper_RegisterPin().
by Zebediah Figura Jan. 22, 2020

Jan. 22, 2020

Avoid some unnecessary allocations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtermapper.c | 127 ++++++++++++------------------------- 1 file changed, 42 insertions(+), 85 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index bb718ed1ce..f7259a1650 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -87,10 +87,6 @@ static const WCHAR wszFilterDataName[] = {'F','i','l','t','e','r','D','a','t','a static const WCHAR wszFilter[] = {'F','i','l','t','e','r',0}; /* For pins registered with IFilterMapper */ static const WCHAR wszPins[] = {'P','i','n','s',0}; -static const WCHAR wszAllowedMany[] = {'A','l','l','o','w','e','d','M','a','n','y',0}; -static const WCHAR wszAllowedZero[] = {'A','l','l','o','w','e','d','Z','e','r','o',0}; -static const WCHAR wszDirection[] = {'D','i','r','e','c','t','i','o','n',0}; -static const WCHAR wszIsRendered[] = {'I','s','R','e','n','d','e','r','e','d',0}; /* For types registered with IFilterMapper */ static const WCHAR wszTypes[] = {'T','y','p','e','s',0}; @@ -1162,98 +1158,59 @@ static HRESULT WINAPI FilterMapper_RegisterFilterInstance(IFilterMapper * iface, return E_NOTIMPL; } -static HRESULT WINAPI FilterMapper_RegisterPin( - IFilterMapper * iface, - CLSID Filter, - LPCWSTR szName, - BOOL bRendered, - BOOL bOutput, - BOOL bZero, - BOOL bMany, - CLSID ConnectsToFilter, - LPCWSTR ConnectsToPin) +static HRESULT WINAPI FilterMapper_RegisterPin(IFilterMapper *iface, CLSID clsid, + const WCHAR *name, BOOL rendered, BOOL output, BOOL zero, BOOL many, + CLSID external_filter, const WCHAR *external_pin) { - HRESULT hr; - LONG lRet; - LPWSTR wszClsid = NULL; - HKEY hKey = NULL; - HKEY hPinsKey = NULL; - WCHAR * wszPinsKeyName; - WCHAR wszKeyName[ARRAY_SIZE(wszClsidSlash)-1 + (CHARS_IN_GUID-1) + 1]; - - TRACE("(%p)->(%s, %s, %d, %d, %d, %d, %s, %s)\n", iface, debugstr_guid(&Filter), debugstr_w(szName), bRendered, - bOutput, bZero, bMany, debugstr_guid(&ConnectsToFilter), debugstr_w(ConnectsToPin)); - - hr = StringFromCLSID(&Filter, &wszClsid); - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszKeyName, wszClsidSlash); - lstrcatW(wszKeyName, wszClsid); - - lRet = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszKeyName, 0, KEY_WRITE, &hKey); - hr = HRESULT_FROM_WIN32(lRet); - } - - if (SUCCEEDED(hr)) - { - wszPinsKeyName = CoTaskMemAlloc((lstrlenW(wszPins) + 1 + lstrlenW(szName) + 1) * 2); - if (!wszPinsKeyName) - hr = E_OUTOFMEMORY; - } - - if (SUCCEEDED(hr)) - { - lstrcpyW(wszPinsKeyName, wszPins); - lstrcatW(wszPinsKeyName, wszSlash); - lstrcatW(wszPinsKeyName, szName); - - lRet = RegCreateKeyExW(hKey, wszPinsKeyName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hPinsKey, NULL); - hr = HRESULT_FROM_WIN32(lRet); - CoTaskMemFree(wszPinsKeyName); - } - - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hPinsKey, wszAllowedMany, 0, REG_DWORD, (LPBYTE)&bMany, sizeof(bMany)); - hr = HRESULT_FROM_WIN32(lRet); - } + WCHAR keypath[6 + 38 + 1], *pin_keypath; + HKEY key, pin_key, type_key; + LONG ret; - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hPinsKey, wszAllowedZero, 0, REG_DWORD, (LPBYTE)&bZero, sizeof(bZero)); - hr = HRESULT_FROM_WIN32(lRet); - } + TRACE("iface %p, clsid %s, name %s, rendered %d, output %d, zero %d, " + "many %d, external_filter %s, external_pin %s.\n", + iface, debugstr_guid(&clsid), debugstr_w(name), rendered, output, + zero, many, debugstr_guid(&external_filter), debugstr_w(external_pin)); - if (SUCCEEDED(hr)) - { - lRet = RegSetValueExW(hPinsKey, wszDirection, 0, REG_DWORD, (LPBYTE)&bOutput, sizeof(bOutput)); - hr = HRESULT_FROM_WIN32(lRet); - } + wcscpy(keypath, L"CLSID\\"); + StringFromGUID2(&clsid, keypath + wcslen(keypath), ARRAY_SIZE(keypath) - wcslen(keypath)); + if ((ret = RegOpenKeyExW(HKEY_CLASSES_ROOT, keypath, 0, KEY_WRITE, &key))) + return HRESULT_FROM_WIN32(ret); - if (SUCCEEDED(hr)) + if (!(pin_keypath = malloc((5 + wcslen(name) + 1) * sizeof(WCHAR)))) { - lRet = RegSetValueExW(hPinsKey, wszIsRendered, 0, REG_DWORD, (LPBYTE)&bRendered, sizeof(bRendered)); - hr = HRESULT_FROM_WIN32(lRet); + RegCloseKey(key); + return E_OUTOFMEMORY; } + wcscpy(pin_keypath, L"Pins\\"); + wcscat(pin_keypath, name); - if (SUCCEEDED(hr)) + if ((ret = RegCreateKeyExW(key, pin_keypath, 0, NULL, 0, KEY_WRITE, NULL, &pin_key, NULL))) { - HKEY hkeyDummy = NULL; - - lRet = RegCreateKeyExW(hPinsKey, wszTypes, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &hkeyDummy, NULL); - hr = HRESULT_FROM_WIN32(lRet); - - if (hkeyDummy) RegCloseKey(hkeyDummy); + ERR("Failed to open pin key, error %u.\n", ret); + free(pin_keypath); + RegCloseKey(key); + return HRESULT_FROM_WIN32(ret); } + free(pin_keypath); + + if ((ret = RegSetValueExW(pin_key, L"AllowedMany", 0, REG_DWORD, (const BYTE *)&many, sizeof(DWORD)))) + ERR("Failed to set AllowedMany value, error %u.\n", ret); + if ((ret = RegSetValueExW(pin_key, L"AllowedZero", 0, REG_DWORD, (const BYTE *)&zero, sizeof(DWORD)))) + ERR("Failed to set AllowedZero value, error %u.\n", ret); + if ((ret = RegSetValueExW(pin_key, L"Direction", 0, REG_DWORD, (const BYTE *)&output, sizeof(DWORD)))) + ERR("Failed to set Direction value, error %u.\n", ret); + if ((ret = RegSetValueExW(pin_key, L"IsRendered", 0, REG_DWORD, (const BYTE *)&rendered, sizeof(DWORD)))) + ERR("Failed to set IsRendered value, error %u.\n", ret); + + if (!(ret = RegCreateKeyExW(pin_key, L"Types", 0, NULL, 0, 0, NULL, &type_key, NULL))) + RegCloseKey(type_key); + else + ERR("Failed to create Types subkey, error %u.\n", ret); - CoTaskMemFree(wszClsid); - if (hKey) - RegCloseKey(hKey); - if (hPinsKey) - RegCloseKey(hPinsKey); + RegCloseKey(pin_key); + RegCloseKey(key); - return hr; + return S_OK; } -- 2.25.0

2 6

[PATCH 1/5] ole32: Handle GetObject() failure in ParseDisplayName() for item moniker.
by Nikolay Sivov Jan. 22, 2020

Jan. 22, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/itemmoniker.c | 10 ++++++---- dlls/ole32/tests/moniker.c | 4 ---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 79fb293c38..73ed63fe6d 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -790,13 +790,15 @@ static HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker *iface, IBindCtx { hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, &IID_IParseDisplayName, (void **)&parser); + if (SUCCEEDED(hr)) + { + hr = IMoniker_GetDisplayName(iface,pbc,NULL,&displayName); - hr = IMoniker_GetDisplayName(iface,pbc,NULL,&displayName); - - hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayName, eaten, ppmkOut); + hr = IParseDisplayName_ParseDisplayName(parser, pbc, displayName, eaten, ppmkOut); + IParseDisplayName_Release(parser); + } IOleItemContainer_Release(container); - IParseDisplayName_Release(parser); } return hr; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index bbd964e723..7607468d01 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -2141,28 +2141,24 @@ todo_wine hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 1; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2499; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); bind_opts.dwTickCountDeadline = 2500; hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); -todo_wine ok(hr == (0x8bee0000 | BINDSPEED_MODERATE), "Unexpected hr %#x.\n", hr); IMoniker_Release(&container_moniker->IMoniker_iface); -- 2.24.1

2 5

[PATCH v2] setupapi: Handle arch-specific SourceDisks{Names, Files} .inf sections in get_source_info.
by Gijs Vermeulen Jan. 22, 2020

Jan. 22, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48455 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/setupapi/query.c | 57 +++++++++++++++----------------- dlls/setupapi/queue.c | 13 ++++---- dlls/setupapi/setupapi_private.h | 3 ++ 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 828d8a1145..e3637732d9 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -34,35 +34,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); #ifdef __i386__ -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','x','8','6',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','x','8','6',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.x86"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.x86"; #elif defined(__x86_64__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','m','d','6','4',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','m','d','6','4',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.amd64"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.amd64"; #elif defined(__arm__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.arm"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.arm"; #elif defined(__aarch64__) -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s','.','a','r','m','6','4',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s','.','a','r','m','6','4',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames.arm64"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles.arm64"; #else /* FIXME: other platforms */ -static const WCHAR source_disks_names_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; -static const WCHAR source_disks_files_platform[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; +static const WCHAR source_disks_names_platform[] = L"SourceDisksNames"; +static const WCHAR source_disks_files_platform[] = L"SourceDisksFiles"; #endif -static const WCHAR source_disks_names[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; -static const WCHAR source_disks_files[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; +static const WCHAR source_disks_names[] = L"SourceDisksNames"; +static const WCHAR source_disks_files[] = L"SourceDisksFiles"; /* fills the PSP_INF_INFORMATION struct fill_info is TRUE * always returns the required size of the information @@ -121,6 +109,18 @@ static HINF search_for_inf(LPCVOID InfSpec, DWORD SearchControl) return INVALID_HANDLE_VALUE; } +BOOL search_for_source_disks_files( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) +{ + return !SetupFindFirstLineW( hinf, source_disks_files_platform, filename, ctx ) && + !SetupFindFirstLineW( hinf, source_disks_files, filename, ctx ); +} + +BOOL search_for_source_disks_names( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) +{ + return !SetupFindFirstLineW( hinf, source_disks_names_platform, filename, ctx ) && + !SetupFindFirstLineW( hinf, source_disks_names, filename, ctx ); +} + /*********************************************************************** * SetupGetInfInformationA (SETUPAPI.@) * @@ -374,8 +374,7 @@ static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) DWORD size; LPWSTR source_id; - if (!SetupFindFirstLineW( hinf, source_disks_files_platform, filename, context ) && - !SetupFindFirstLineW( hinf, source_disks_files, filename, context )) + if (!search_for_source_disks_files( hinf, filename, context )) return NULL; if (!SetupGetStringFieldW( context, 1, NULL, 0, &size )) @@ -390,8 +389,7 @@ static LPWSTR get_source_id( HINF hinf, PINFCONTEXT context, PCWSTR filename ) return NULL; } - if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id, context ) && - !SetupFindFirstLineW( hinf, source_disks_names, source_id, context )) + if (!search_for_source_disks_names( hinf, source_id, context )) { HeapFree( GetProcessHeap(), 0, source_id ); return NULL; @@ -503,8 +501,7 @@ BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info, swprintf( source_id_str, ARRAY_SIZE(source_id_str), fmt, source_id ); - if (!SetupFindFirstLineW( hinf, source_disks_names_platform, source_id_str, &ctx ) && - !SetupFindFirstLineW( hinf, source_disks_names, source_id_str, &ctx )) + if (!search_for_source_disks_names( hinf, source_id_str, &ctx )) return FALSE; switch (info) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 2d2c833474..29a76f1b8c 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -289,21 +289,20 @@ UINT CALLBACK QUEUE_callback_WtoA( void *context, UINT notification, static void get_source_info( HINF hinf, const WCHAR *src_file, SP_FILE_COPY_PARAMS_W *params, WCHAR *src_root, WCHAR *src_path) { - static const WCHAR SourceDisksNames[] = - {'S','o','u','r','c','e','D','i','s','k','s','N','a','m','e','s',0}; - static const WCHAR SourceDisksFiles[] = - {'S','o','u','r','c','e','D','i','s','k','s','F','i','l','e','s',0}; - INFCONTEXT file_ctx, disk_ctx; INT id, diskid; DWORD len; /* find the SourceDisksFiles entry */ - if (!SetupFindFirstLineW( hinf, SourceDisksFiles, src_file, &file_ctx )) return; + if (!search_for_source_disks_files( hinf, src_file, &file_ctx )) + return; + if (!SetupGetIntField( &file_ctx, 1, &diskid )) return; /* now find the diskid in the SourceDisksNames section */ - if (!SetupFindFirstLineW( hinf, SourceDisksNames, NULL, &disk_ctx )) return; + if (!search_for_source_disks_names( hinf, NULL, &disk_ctx )) + return; + for (;;) { if (SetupGetIntField( &disk_ctx, 0, &id ) && (id == diskid)) break; diff --git a/dlls/setupapi/setupapi_private.h b/dlls/setupapi/setupapi_private.h index f4685ab2b4..99ca8aa0c9 100644 --- a/dlls/setupapi/setupapi_private.h +++ b/dlls/setupapi/setupapi_private.h @@ -111,4 +111,7 @@ extern OSVERSIONINFOW OsVersionInfo DECLSPEC_HIDDEN; extern BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DECLSPEC_HIDDEN; extern void cleanup_fake_dlls(void) DECLSPEC_HIDDEN; +extern BOOL search_for_source_disks_files( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) DECLSPEC_HIDDEN; +extern BOOL search_for_source_disks_names( HINF hinf, const WCHAR *filename, INFCONTEXT *ctx ) DECLSPEC_HIDDEN; + #endif /* __SETUPAPI_PRIVATE_H */ -- 2.25.0

2 1

[PATCH 9/9] vbscript: Support reporting error location to script host.
by Jacek Caban Jan. 22, 2020

Jan. 22, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 17 ++++++++++------- dlls/vbscript/interp.c | 20 +++++++++++++++++--- dlls/vbscript/tests/run.c | 3 +-- dlls/vbscript/vbscript.c | 24 +++++++++++++++++++----- dlls/vbscript/vbscript.h | 4 +++- 5 files changed, 50 insertions(+), 18 deletions(-)

1 0

[PATCH 8/9] vbscript: Pass parser error location to compiler.
by Jacek Caban Jan. 22, 2020

Jan. 22, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 15 +++++++-------- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-)

1 0

[PATCH 7/9] vbscript: Simplify option explicit parsing.
by Jacek Caban Jan. 22, 2020

Jan. 22, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/parser.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)

1 0

[PATCH 6/9] vbscript: Use parser_error to set unhandled parser error.
by Jacek Caban Jan. 22, 2020

Jan. 22, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/lex.c | 2 +- dlls/vbscript/parse.h | 1 - dlls/vbscript/parser.y | 25 ++++++++++--------------- 3 files changed, 11 insertions(+), 17 deletions(-)

1 0

[PATCH 5/9] vbscript: Store source cookie and starting line in vbscode_t.
by Jacek Caban Jan. 22, 2020

Jan. 22, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/compile.c | 15 ++++++++++----- dlls/vbscript/vbscript.c | 5 +++-- dlls/vbscript/vbscript.h | 9 ++++++--- 3 files changed, 19 insertions(+), 10 deletions(-)

1 0