December 2018 - Wine-Devel - list.winehq.org

[PATCH] winegcc: Pass -static-libstdc++ to the linker
by Andrew Eikum Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- tools/winegcc/winegcc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5136cf3365..b5fa881c30 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -71,8 +71,9 @@ * * Linker Options * object-file-name -llibrary -nostartfiles -nodefaultlibs - * -nostdlib -s -static -static-libgcc -shared -shared-libgcc - * -symbolic -Wl,option -Xlinker option -u symbol --image-base + * -nostdlib -s -static -static-libgcc -static-libstdc++ + * -shared -shared-libgcc -symbolic -Wl,option + * -Xlinker option -u symbol --image-base * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1288,8 +1289,9 @@ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", - "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" + "-nostdlib", "-s", "-static", "-static-libgcc", "-static-libstdc++", + "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", + "-fprofile-generate", "-fprofile-use" }; unsigned int j; -- 2.19.2

1 0

[PATCH] vbscript: Make constant 'html_delimiterW' static
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/vbscript/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index e8ecf4d1fd..020109998e 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -969,7 +969,7 @@ void *parser_alloc(parser_ctx_t *ctx, size_t size) HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter) { - const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; + static const WCHAR html_delimiterW[] = {'<','/','s','c','r','i','p','t','>',0}; ctx->code = ctx->ptr = code; ctx->end = ctx->code + strlenW(ctx->code); -- 2.19.2

2 1

[PATCH] shdocvw: Make constants 'wszCLSID' and 'wszInitPropertyBag' static
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shdocvw/shlinstobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shlinstobj.c b/dlls/shdocvw/shlinstobj.c index 9c3232c65e..6f6786bdb5 100644 --- a/dlls/shdocvw/shlinstobj.c +++ b/dlls/shdocvw/shlinstobj.c @@ -361,8 +361,8 @@ HRESULT SHDOCVW_GetShellInstanceObjectClassObject(REFCLSID rclsid, REFIID riid, WCHAR wszInstanceKey[] = { 'C','L','S','I','D','\\','{','0','0','0','0','0','0','0','0','-', '0','0','0','0','-','0','0','0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0', '0','0','0','0','}','\\','I','n','s','t','a','n','c','e', 0 }; - const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; - const WCHAR wszInitPropertyBag[] = + static const WCHAR wszCLSID[] = { 'C','L','S','I','D',0 }; + static const WCHAR wszInitPropertyBag[] = { 'I','n','i','t','P','r','o','p','e','r','t','y','B','a','g',0 }; WCHAR wszCLSIDInstance[CHARS_IN_GUID]; CLSID clsidInstance; -- 2.19.2

2 1

[PATCH 1/5] user32/listbox: Use a helper function to check the selection state of an item.
by Nikolay Sivov Dec. 3, 2018

Dec. 3, 2018

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 286a33b1c1..3eee691086 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -120,6 +120,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) +{ + return descr->items[index].selected; +} + /********************************************************************* * listbox class descriptor */ @@ -2866,7 +2871,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_GETSEL: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) return LB_ERR; - return descr->items[wParam].selected; + return is_item_selected(descr, wParam); case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE ); -- 2.19.2

2 7

[PATCH] rpcrt4: Fix 'Routeines' typos.
by Serge Gautherie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 0dc6789..79c9645 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -519,9 +519,9 @@ @ stub long_from_ndr @ stub long_from_ndr_temp @ stub pfnFreeRoutines # wxp -@ stub pfnMarshallRouteines # wxp +@ stub pfnMarshallRoutines # wxp @ stub pfnSizeRoutines # wxp -@ stub pfnUnmarshallRouteines # wxp +@ stub pfnUnmarshallRoutines # wxp @ stub short_array_from_ndr @ stub short_from_ndr @ stub short_from_ndr_temp -- 2.10.0.windows.1

2 1

[PATCH] oleaut32: Accept DISP_E_PARAMNOTFOUND for missing optional parameters in ITypeInfo::Invoke implementation.
by Dmitry Timoshkov Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/tmarshal.c | 39 +++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 3 ++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 756cca844d..0b6776b40a 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -2861,7 +2861,7 @@ static void test_typelibmarshal(void) ok(!lstrcmpW(bstr, szCat), "IWidget_get_Name should have returned string \"Cat\" instead of %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); - /* call DoSomething */ + /* call DoSomething without optional arguments */ VariantInit(&vararg[0]); VariantInit(&vararg[1]); V_VT(&vararg[1]) = VT_R8; @@ -2876,6 +2876,43 @@ static void test_typelibmarshal(void) ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); VariantClear(&varresult); + /* call DoSomething with optional argument set to VT_EMPTY */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + V_VT(&vararg[2]) = VT_R8; + V_R8(&vararg[2]) = 3.141; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 3; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + + /* call DoSomething with optional arguments set to VT_ERROR/DISP_E_PARAMNOTFOUND */ + VariantInit(&vararg[0]); + VariantInit(&vararg[1]); + VariantInit(&vararg[2]); + VariantInit(&vararg[3]); + V_VT(&vararg[3]) = VT_R8; + V_R8(&vararg[3]) = 3.141; + V_VT(&vararg[1]) = VT_ERROR; + V_ERROR(&vararg[1]) = DISP_E_PARAMNOTFOUND; + V_VT(&vararg[0]) = VT_ERROR; + V_ERROR(&vararg[0]) = DISP_E_PARAMNOTFOUND; + dispparams.cNamedArgs = 0; + dispparams.cArgs = 4; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = vararg; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_DOSOMETHING, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok_ole_success(hr, IDispatch_Invoke); + ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n"); + VariantClear(&varresult); + /* call get_State */ dispparams.cNamedArgs = 0; dispparams.cArgs = 0; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f32bed35f4..f17a9267b7 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7217,7 +7217,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( break; } } - else if (src_arg) + else if (src_arg && !((wParamFlags & PARAMFLAG_FOPT) && + V_VT(src_arg) == VT_ERROR && V_ERROR(src_arg) == DISP_E_PARAMNOTFOUND)) { TRACE("%s\n", debugstr_variant(src_arg)); -- 2.17.1

2 1

[PATCH] advapi32: Turn several string variables into static constants
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/advapi32/security.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 16512d094c..70e2da40e7 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -440,10 +440,10 @@ static inline DWORD get_security_service( LPWSTR full_service_name, DWORD access /* helper function for SE_REGISTRY_KEY objects in [Get|Set]NamedSecurityInfo */ static inline DWORD get_security_regkey( LPWSTR full_key_name, DWORD access, HANDLE *key ) { - WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; - WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; - WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; - WCHAR usersW[] = {'U','S','E','R','S',0}; + static const WCHAR classes_rootW[] = {'C','L','A','S','S','E','S','_','R','O','O','T',0}; + static const WCHAR current_userW[] = {'C','U','R','R','E','N','T','_','U','S','E','R',0}; + static const WCHAR machineW[] = {'M','A','C','H','I','N','E',0}; + static const WCHAR usersW[] = {'U','S','E','R','S',0}; LPWSTR p = strchrW(full_key_name, '\\'); int len = p-full_key_name; HKEY hParent; @@ -4997,9 +4997,9 @@ static void DumpString(LPCWSTR string, int cch, WCHAR **pwptr, ULONG *plen) static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) { + static const WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; + static const WCHAR subauthfmt[] = { '-','%','u',0 }; DWORD i; - WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; - WCHAR subauthfmt[] = { '-','%','u',0 }; WCHAR buf[26]; SID *pisid = psid; -- 2.19.2

8 34

[PATCH] winspool.drv: Make constant 'fmtW' static
by Alex Henrie Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/winspool.drv/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index fb268a047f..e91138dbec 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8208,8 +8208,8 @@ end: */ static BOOL schedule_lpr(LPCWSTR printer_name, LPCWSTR filename) { + static const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; WCHAR *cmd; - const WCHAR fmtW[] = {'l','p','r',' ','-','P','\'','%','s','\'',0}; BOOL r; cmd = HeapAlloc(GetProcessHeap(), 0, strlenW(printer_name) * sizeof(WCHAR) + sizeof(fmtW)); -- 2.19.2

2 1

[PATCH] gdi32: Fix function prototype when building without freetype.
by Nikolay Sivov Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Change missing from 03ccce70b540379bf4de86232d375f3e64cf465c. dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f50c163f89..fb58a6a7e9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -9168,7 +9168,7 @@ BOOL WINAPI GetFontFileData( DWORD instance_id, DWORD unknown, UINT64 offset, vo /************************************************************************* * GetFontFileInfo (GDI32.@) */ -BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed) +BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_fileinfo *info, SIZE_T size, SIZE_T *needed) { *needed = 0; return FALSE; -- 2.19.2

2 1

[PATCH 1/5] shlwapi: Forward SHCreateMemStream() to shcore.
by Nikolay Sivov Dec. 3, 2018

Dec. 3, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/regstream.c | 40 --------------------------------------- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 63615d3d9c..47e9317208 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -632,46 +632,6 @@ IStream * WINAPI SHOpenRegStreamW(HKEY hkey, LPCWSTR pszSubkey, return iStream ? iStream : &rsDummyRegStream.IStream_iface; } -/************************************************************************* - * @ [SHLWAPI.12] - * - * Create an IStream object on a block of memory. - * - * PARAMS - * lpbData [I] Memory block to create the IStream object on - * dwDataLen [I] Length of data block - * - * RETURNS - * Success: A pointer to the IStream object. - * Failure: NULL, if any parameters are invalid or an error occurs. - * - * NOTES - * A copy of the memory pointed to by lpbData is made, and is freed - * when the stream is released. - */ -IStream * WINAPI SHCreateMemStream(const BYTE *lpbData, UINT dwDataLen) -{ - ISHRegStream *strm = NULL; - LPBYTE lpbDup; - - TRACE("(%p,%d)\n", lpbData, dwDataLen); - - if (!lpbData) - dwDataLen = 0; - - lpbDup = HeapAlloc(GetProcessHeap(), 0, dwDataLen); - - if (lpbDup) - { - memcpy(lpbDup, lpbData, dwDataLen); - strm = IStream_Create(NULL, lpbDup, dwDataLen); - - if (!strm) - HeapFree(GetProcessHeap(), 0, lpbDup); - } - return &strm->IStream_iface; -} - /************************************************************************* * SHCreateStreamWrapper [SHLWAPI.@] * diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 62ebb85f46..ddc76ec0ac 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -9,7 +9,7 @@ 9 stdcall -ordinal SHUnlockShared(ptr) 10 stdcall -ordinal SHFreeShared(long long) 11 stdcall -noname SHMapHandle(long long long long long) -12 stdcall -ordinal SHCreateMemStream(ptr long) +12 stdcall -ordinal SHCreateMemStream(ptr long) shcore.SHCreateMemStream 13 stdcall -noname RegisterDefaultAcceptHeaders(ptr ptr) 14 stdcall -ordinal GetAcceptLanguagesA(ptr ptr) 15 stdcall -ordinal GetAcceptLanguagesW(ptr ptr) -- 2.19.2

1 4