January 2020 - Wine-commits

Jacek Caban : jscript/tests: Add more script enter notification tests.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: 9a9a1821a34d10bb3e96ce1e42a8d046133f0958 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a9a1821a34d10bb3e96ce1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 19:54:57 2020 +0100 jscript/tests: Add more script enter notification tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/caller.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index ce74594df4..9fb59844c4 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -71,7 +71,12 @@ static const CLSID CLSID_JScript = expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + DEFINE_EXPECT(testArgConv); +DEFINE_EXPECT(OnEnterScript); +DEFINE_EXPECT(OnLeaveScript); static IVariantChangeType *script_change_type; static IDispatch *stored_obj; @@ -92,9 +97,19 @@ static void _call_change_type(unsigned line, IVariantChangeType *change_type, VA HRESULT hres; VariantInit(dst); + if(V_VT(src) == VT_DISPATCH && vt != VT_BOOL) { + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); + } hres = IVariantChangeType_ChangeType(change_type, dst, src, 0, vt); ok_(__FILE__,line)(hres == S_OK, "ChangeType(%d) failed: %08x\n", vt, hres); ok_(__FILE__,line)(V_VT(dst) == vt, "V_VT(dst) = %d\n", V_VT(dst)); + if(V_VT(src) == VT_DISPATCH && vt != VT_BOOL) { + todo_wine + CHECK_CALLED(OnEnterScript); + todo_wine + CHECK_CALLED(OnLeaveScript); + } } #define change_type_fail(a,b,c,d) _change_type_fail(__LINE__,a,b,c,d) @@ -341,7 +356,9 @@ static HRESULT WINAPI Test_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WO ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(rgvarg) = %d\n", V_VT(pdp->rgvarg)); + CHECK_CALLED(OnEnterScript); test_caller(pspCaller, V_DISPATCH(pdp->rgvarg)); + SET_EXPECT(OnLeaveScript); stored_obj = V_DISPATCH(pdp->rgvarg); IDispatch_AddRef(stored_obj); @@ -440,11 +457,13 @@ static HRESULT WINAPI ActiveScriptSite_OnScriptError(IActiveScriptSite *iface, I static HRESULT WINAPI ActiveScriptSite_OnEnterScript(IActiveScriptSite *iface) { + CHECK_EXPECT(OnEnterScript); return E_NOTIMPL; } static HRESULT WINAPI ActiveScriptSite_OnLeaveScript(IActiveScriptSite *iface) { + CHECK_EXPECT(OnLeaveScript); return E_NOTIMPL; } @@ -515,6 +534,7 @@ static void run_scripts(void) hres = IActiveScriptParse_QueryInterface(parser, &IID_IVariantChangeType, (void**)&script_change_type); ok(hres == S_OK, "Could not get IVariantChangeType iface: %08x\n", hres); + SET_EXPECT(OnEnterScript); /* checked in callback */ SET_EXPECT(testArgConv); parse_script(parser, L"var obj = {" @@ -523,6 +543,7 @@ static void run_scripts(void) L"};" L"testArgConv(obj);"); CHECK_CALLED(testArgConv); + CHECK_CALLED(OnLeaveScript); /* set in callback */ test_change_types(script_change_type, stored_obj); IDispatch_Release(stored_obj); @@ -541,9 +562,12 @@ static BOOL check_jscript(void) if(!parser) return FALSE; + SET_EXPECT(OnEnterScript); + SET_EXPECT(OnLeaveScript); hres = IActiveScriptParse_ParseScriptText(parser, L"if(!('localeCompare' in String.prototype)) throw 1;", NULL, NULL, NULL, 0, 0, 0, NULL, NULL); - + CLEAR_CALLED(OnEnterScript); + CLEAR_CALLED(OnLeaveScript); if(hres == S_OK) hres = IActiveScriptParse_QueryInterface(parser, &IID_IActiveScriptProperty, (void**)&script_prop); IActiveScriptParse_Release(parser);

1 0

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

24 Jan '20

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 : mshtml: Global variable compatibility update for gcc 10.
by Alexandre Julliard 24 Jan '20

24 Jan '20

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 : secur32: Global variable compatibility update for gcc 10.
by Alexandre Julliard 24 Jan '20

24 Jan '20

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

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

24 Jan '20

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 : wbemprox: Global variable compatibility update for gcc 10.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: da21c305164c3e585e29e20242afc5a31f91989f URL: https://source.winehq.org/git/wine.git/?a=commit;h=da21c305164c3e585e29e202… Author: Michael Cronenworth <mike(a)cchtml.com> Date: Thu Jan 23 17:05:27 2020 -0600 wbemprox: 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/wbemprox/main.c | 2 ++ dlls/wbemprox/wbemprox_private.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) 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 {

1 0

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

24 Jan '20

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 24 Jan '20

24 Jan '20

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

Jacek Caban : ddraw/tests: Don't use log2f to avoid mingwex dependency.
by Alexandre Julliard 24 Jan '20

24 Jan '20

Module: wine Branch: master Commit: e7a2e45c703123b143324cf88e690ce0865a5790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7a2e45c703123b143324cf8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 24 11:08:23 2020 +0100 ddraw/tests: Don't use log2f to avoid mingwex dependency. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d85d31343f..16c0cfb4e5 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -8205,7 +8205,7 @@ static void test_color_fill(void) float f, g; expected = tests[i].result & mask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 9ca6b44eb8..f0ae458d85 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8953,7 +8953,7 @@ static void test_color_fill(void) float f, g; expected = tests[i].result & mask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 39b4aca657..7ce33ab406 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -10601,7 +10601,7 @@ static void test_color_fill(void) float f, g; expected = tests[i].result & U3(z_fmt).dwZBitMask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c34d939486..cde5d2b5ba 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -10575,7 +10575,7 @@ static void test_color_fill(void) float f, g; expected = tests[i].result & U3(z_fmt).dwZBitMask; - f = ceilf(log2f(expected + 1.0f)); + f = ceilf(logf(expected + 1.0f) / logf(2.0f)); g = (f + 1.0f) / 2.0f; g -= (int)g; expected_broken = (expected / exp2f(f) - g) * 256;

1 0

Alexandre Julliard : msvcrt: Fetch locale codepage directly as an integer.
by Alexandre Julliard 24 Jan '20

24 Jan '20

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