January 2020 - Wine-Commits

Jacek Caban : jscript: Store source position in instr_t.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 78853e385355c9a3276d180e3e9b856f96cb9ec3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78853e385355c9a3276d180e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 19:54:41 2020 +0100 jscript: Store source position in instr_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 15 +++++++++++++++ dlls/jscript/engine.h | 1 + dlls/jscript/parser.h | 4 ++++ dlls/jscript/parser.y | 34 +++++++++++++++++++--------------- 4 files changed, 39 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78853e385355c9a3276d…

1 0

Jacek Caban : jscript: Introduce jsstr_to_bstr helper.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 7828df17e25616bad907e34a2c9095183014ec2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7828df17e25616bad907e34a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 19:54:35 2020 +0100 jscript: Introduce jsstr_to_bstr helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsstr.c | 13 +++++++++++-- dlls/jscript/jsstr.h | 2 +- dlls/jscript/jsutils.c | 27 +++------------------------ 3 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/jsstr.c b/dlls/jscript/jsstr.c index e1c4902762..abd960a8a0 100644 --- a/dlls/jscript/jsstr.c +++ b/dlls/jscript/jsstr.c @@ -299,9 +299,18 @@ jsstr_t *jsstr_null_bstr(void) return jsstr_addref(null_bstr_str); } -BOOL is_null_bstr(jsstr_t *str) +HRESULT jsstr_to_bstr(jsstr_t *str, BSTR *r) { - return str == null_bstr_str; + if(str == null_bstr_str) { + *r = NULL; + return S_OK; + } + + if(!(*r = SysAllocStringLen(NULL, jsstr_length(str)))) + return E_OUTOFMEMORY; + + jsstr_flush(str, *r); + return S_OK; } BOOL init_strings(void) diff --git a/dlls/jscript/jsstr.h b/dlls/jscript/jsstr.h index e47f0fe9b3..f42c95de5e 100644 --- a/dlls/jscript/jsstr.h +++ b/dlls/jscript/jsstr.h @@ -182,7 +182,7 @@ jsstr_t *jsstr_empty(void) DECLSPEC_HIDDEN; jsstr_t *jsstr_undefined(void) DECLSPEC_HIDDEN; jsstr_t *jsstr_null_bstr(void) DECLSPEC_HIDDEN; -BOOL is_null_bstr(jsstr_t*) DECLSPEC_HIDDEN; +HRESULT jsstr_to_bstr(jsstr_t *str, BSTR *r) DECLSPEC_HIDDEN; BOOL init_strings(void) DECLSPEC_HIDDEN; void free_strings(void) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 97d069aff7..89e58f64f3 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -355,21 +355,9 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) IDispatch_AddRef(get_object(val)); V_DISPATCH(retv) = get_object(val); return S_OK; - case JSV_STRING: { - jsstr_t *str = get_string(val); - + case JSV_STRING: V_VT(retv) = VT_BSTR; - if(is_null_bstr(str)) { - V_BSTR(retv) = NULL; - }else { - V_BSTR(retv) = SysAllocStringLen(NULL, jsstr_length(str)); - if(V_BSTR(retv)) - jsstr_flush(str, V_BSTR(retv)); - else - return E_OUTOFMEMORY; - } - return S_OK; - } + return jsstr_to_bstr(get_string(val), &V_BSTR(retv)); case JSV_NUMBER: { double n = get_number(val); @@ -945,16 +933,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY if(FAILED(hres)) break; - if(is_null_bstr(str)) { - V_BSTR(dst) = NULL; - break; - } - - V_BSTR(dst) = SysAllocStringLen(NULL, jsstr_length(str)); - if(V_BSTR(dst)) - jsstr_flush(str, V_BSTR(dst)); - else - hres = E_OUTOFMEMORY; + hres = jsstr_to_bstr(str, &V_BSTR(dst)); break; } case VT_EMPTY:

1 0

Alexandre Julliard : msvcrt: Fetch locale codepage directly as an integer.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 0c16953336287599bb764141846270291dbac0d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c16953336287599bb764141… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 24 18:28:53 2020 +0100 msvcrt: Fetch locale codepage directly as an integer. This avoids preloading all the codepage files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 11ad9ed5f5..ae9f7c9c21 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -186,7 +186,7 @@ typedef struct { char search_language[MAX_ELEM_LEN]; char search_country[MAX_ELEM_LEN]; char search_codepage[MAX_ELEM_LEN]; - char found_codepage[MAX_ELEM_LEN]; + DWORD found_codepage; unsigned int match_flags; LANGID found_lang_id; } locale_search_t; @@ -269,7 +269,7 @@ find_best_locale_proc(HMODULE hModule, LPCSTR type, LPCSTR name, WORD LangID, LO { TRACE("Found codepage:%s->%s\n", res->search_codepage, buff); flags |= FOUND_CODEPAGE; - memcpy(res->found_codepage,res->search_codepage,MAX_ELEM_LEN); + res->found_codepage = atoi(res->search_codepage); } else if (!flags && (res->match_flags & FOUND_CODEPAGE)) { @@ -357,40 +357,39 @@ LCID MSVCRT_locale_to_LCID(const char *locale, unsigned short *codepage, BOOL *s /* Even if a codepage is not enumerated for a locale * it can be set if valid */ if (search.search_codepage[0]) { - if (IsValidCodePage(atoi(search.search_codepage))) - memcpy(search.found_codepage,search.search_codepage,MAX_ELEM_LEN); - else { + search.found_codepage = atoi(search.search_codepage); + if (!IsValidCodePage(atoi(search.search_codepage))) + { /* Special codepage values: OEM & ANSI */ if (!MSVCRT__stricmp(search.search_codepage,"OCP")) { - GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, - search.found_codepage, MAX_ELEM_LEN); + GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&search.found_codepage, sizeof(DWORD)/sizeof(WCHAR)); } else if (!MSVCRT__stricmp(search.search_codepage,"ACP")) { - GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, - search.found_codepage, MAX_ELEM_LEN); + GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&search.found_codepage, sizeof(DWORD)/sizeof(WCHAR)); } else return -1; - - if (!atoi(search.found_codepage)) + if (!search.found_codepage) return -1; } } else { /* Prefer ANSI codepages if present */ - GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, - search.found_codepage, MAX_ELEM_LEN); - if (!search.found_codepage[0] || !atoi(search.found_codepage)) - GetLocaleInfoA(lcid, LOCALE_IDEFAULTCODEPAGE, - search.found_codepage, MAX_ELEM_LEN); + GetLocaleInfoW(lcid, LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&search.found_codepage, sizeof(DWORD)/sizeof(WCHAR)); + if (!search.found_codepage) + GetLocaleInfoW(lcid, LOCALE_IDEFAULTCODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&search.found_codepage, sizeof(DWORD)/sizeof(WCHAR)); } } if (codepage) - *codepage = atoi(search.found_codepage); + *codepage = search.found_codepage; if (sname) *sname = (search.match_flags & FOUND_SNAME) != 0; if (strlen(locale) < sizeof(data->cached_locale)) { strcpy(data->cached_locale, locale); data->cached_lcid = lcid; - data->cached_cp = codepage ? *codepage : atoi(search.found_codepage); + data->cached_cp = codepage ? *codepage : search.found_codepage; data->cached_sname = (search.match_flags & FOUND_SNAME) != 0; }

1 0

Michael Cronenworth : winebus: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 388348ddbf7d138fed3a6fe48bf6666a95ef3528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=388348ddbf7d138fed3a6fe4… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:29 2020 -0600 winebus: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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;

1 0

Michael Cronenworth : mshtml: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: e402fdf364fc76838ba4e11a11fef3c552110639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e402fdf364fc76838ba4e11a… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:22 2020 -0600 mshtml: Global variable compatibility update for gcc 10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/main.c | 7 +++++++ dlls/mshtml/mshtml_private.h | 12 ++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) 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;

1 0

Michael Cronenworth : xinput: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 44e69405adcdc98d6b0777e6c0acb2697d776ef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e69405adcdc98d6b0777e6… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:30 2020 -0600 xinput: Global variable compatibility update for gcc 10. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/xinput_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 7de9a2a2e4..0de4f3b0b0 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -27,8 +27,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;

1 0

Michael Cronenworth : twain_32: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 4a91eb362666b3af549c48b95e093051756628e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a91eb362666b3af549c48b9… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:26 2020 -0600 twain_32: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/twain32_main.c | 4 +++- dlls/twain_32/twain_i.h | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) 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

1 0

Daniel Lehman : ucrtbase: Use given context in wcstok.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 31c57484ab5927fa61489fb607aeb023e9fb1b1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=31c57484ab5927fa61489fb6… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Jan 23 21:51:22 2020 -0800 ucrtbase: Use given context in wcstok. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-string-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++ dlls/ucrtbase/tests/string.c | 30 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index ead56fbcb5..0dae2a8233 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -170,7 +170,7 @@ @ cdecl wcsnlen(wstr long) ucrtbase.wcsnlen @ cdecl wcspbrk(wstr wstr) ucrtbase.wcspbrk @ cdecl wcsspn(wstr wstr) ucrtbase.wcsspn -@ cdecl wcstok(wstr wstr) ucrtbase.wcstok +@ cdecl wcstok(wstr wstr ptr) ucrtbase.wcstok @ cdecl wcstok_s(ptr wstr ptr) ucrtbase.wcstok_s @ cdecl wcsxfrm(ptr wstr long) ucrtbase.wcsxfrm @ cdecl wctype(str) ucrtbase.wctype diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1abe28b7d9..8411048204 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1630,10 +1630,19 @@ MSVCRT_wchar_t * CDECL MSVCRT_wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_ /********************************************************************* * wcstok (MSVCRT.@) */ +#if _MSVCR_VER>=140 +MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim, MSVCRT_wchar_t **ctx ) +{ + if (!ctx) + ctx = &msvcrt_get_thread_data()->wcstok_next; + return MSVCRT_wcstok_s(str, delim, ctx); +} +#else MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim ) { return MSVCRT_wcstok_s(str, delim, &msvcrt_get_thread_data()->wcstok_next); } +#endif /********************************************************************* * _wctomb_s_l (MSVCRT.@) diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 7a2cf06a90..c0b2336322 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -89,6 +89,7 @@ static void (__cdecl *p__free_locale)(_locale_t); static int (__cdecl *p__getmbcp)(void); static int (__cdecl *p__setmbcp)(int); static size_t (__cdecl *p__mbsspn)(const unsigned char*, const unsigned char*); +static wchar_t* (__cdecl *p_wcstok)(wchar_t*, const wchar_t*, wchar_t**); static BOOL init(void) { @@ -122,6 +123,7 @@ static BOOL init(void) p__getmbcp = (void*)GetProcAddress(module, "_getmbcp"); p__setmbcp = (void*)GetProcAddress(module, "_setmbcp"); p__mbsspn = (void*)GetProcAddress(module, "_mbsspn"); + p_wcstok = (void*)GetProcAddress(module, "wcstok"); return TRUE; } @@ -456,6 +458,33 @@ static void test_mbsspn( void) p__setmbcp(cp); } +static void test_wcstok(void) +{ + static const wchar_t *input = L"two words"; + wchar_t buffer[16]; + wchar_t *token; + wchar_t *next; + + next = NULL; + wcscpy(buffer, input); + token = p_wcstok(buffer, L" ", &next); + ok(!wcscmp(L"two", token), "expected \"two\", got \"%ls\"\n", token); + ok(next == token + 4, "expected %p, got %p\n", token + 4, next); + token = p_wcstok(NULL, L" ", &next); + ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); + ok(next == token + 5, "expected %p, got %p\n", token + 5, next); + token = p_wcstok(NULL, L" ", &next); + ok(!token, "expected NULL, got %p\n", token); + + wcscpy(buffer, input); + token = p_wcstok(buffer, L" ", NULL); + ok(!wcscmp(L"two", token), "expected \"two\", got \"%ls\"\n", token); + token = p_wcstok(NULL, L" ", NULL); + ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); + token = p_wcstok(NULL, L" ", NULL); + ok(!token, "expected NULL, got %p\n", token); +} + START_TEST(string) { if (!init()) return; @@ -465,4 +494,5 @@ START_TEST(string) test___strncnt(); test_C_locale(); test_mbsspn(); + test_wcstok(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index dc95824a1f..93a75248bf 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2579,7 +2579,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstof(ptr ptr) MSVCRT_wcstof @ stub wcstoimax -@ cdecl wcstok(wstr wstr) MSVCRT_wcstok +@ cdecl wcstok(wstr wstr ptr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ stub wcstold

1 0

Michael Cronenworth : dsound: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: fba65a153759dd60f470fe9a787f074cbf0f7ea8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fba65a153759dd60f470fe9a… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:20 2020 -0600 dsound: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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;

1 0

Michael Cronenworth : secur32: Global variable compatibility update for gcc 10.
by Alexandre Julliard Jan. 24, 2020

Jan. 24, 2020

Module: wine Branch: master Commit: 93888fbb3e4d973f5878a0aab16a9d64fb73a764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93888fbb3e4d973f5878a0aa… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:25 2020 -0600 secur32: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 4 ++-- dlls/secur32/secur32_priv.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index b368a5f016..4e3fda3ea9 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1387,8 +1387,8 @@ static const SecPkgInfoA infoA = { ntlm_comment_A }; -SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA; -SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW; +static SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA; +static SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW; static SecPkgInfoW *build_package_infoW( const SecPkgInfoW *info ) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 5ed26d67ef..1bff1372b0 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -190,9 +190,6 @@ 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; - /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session;

1 0