wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Sebastian Lackner : wbemprox/tests: Add tests for Win32_SystemEnclosure.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 856b03501a2ff896aad58a43dad272bd2aa7005e URL: http://source.winehq.org/git/wine.git/?a=commit;h=856b03501a2ff896aad58a43d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 22 07:55:14 2015 +0200 wbemprox/tests: Add tests for Win32_SystemEnclosure. --- dlls/wbemprox/tests/query.c | 115 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 56c97ff..bc85e62 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -412,6 +412,120 @@ out: SysFreeString( wql ); } +static void test_Win32_SystemEnclosure( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_', + 'S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; + static const WCHAR captionW[] = {'C','a','p','t','i','o','n',0}; + static const WCHAR chassistypesW[] = {'C','h','a','s','s','i','s','T','y','p','e','s',0}; + static const WCHAR descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; + static const WCHAR lockpresentW[] = {'L','o','c','k','P','r','e','s','e','n','t',0}; + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR tagW[] = {'T','a','g',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + CIMTYPE type; + ULONG count; + VARIANT val; + DWORD *data; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); + + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + todo_wine + ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); + if (hr != S_OK) + goto done; + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, captionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get caption %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "caption: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); + ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); + hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data ); + ok( hr == S_OK, "SafeArrayAccessData failed %x\n", hr ); + if (SUCCEEDED(hr)) + { + LONG i, lower, upper; + + hr = SafeArrayGetLBound( V_ARRAY( &val ), 1, &lower ); + ok( hr == S_OK, "SafeArrayGetLBound failed %x\n", hr ); + hr = SafeArrayGetUBound( V_ARRAY( &val ), 1, &upper ); + ok( hr == S_OK, "SafeArrayGetUBound failed %x\n", hr ); + for (i = 0; i < upper - lower + 1; i++) + trace( "chassis type: %u\n", data[i] ); + hr = SafeArrayUnaccessData( V_ARRAY( &val ) ); + ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); + } + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, descriptionW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get description %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "description: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, lockpresentW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get lockpresent %08x\n", hr ); + ok( V_VT( &val ) == VT_BOOL, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_BOOLEAN, "unexpected type 0x%x\n", type ); + trace( "lockpresent: %u\n", V_BOOL( &val ) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, manufacturerW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get manufacturer %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "manufacturer: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, nameW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get name %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "name: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, tagW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get tag %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + trace( "tag: %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); + + IWbemClassObject_Release( obj ); +done: + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_StdRegProv( IWbemServices *services ) { static const WCHAR enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -828,6 +942,7 @@ START_TEST(query) test_Win32_Process( services ); test_Win32_Service( services ); test_Win32_ComputerSystem( services ); + test_Win32_SystemEnclosure( services ); test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services );

1 0

Piotr Caban : msvcp120: Add _Do_call implementation.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: d20c5965f1a29a2469125beb36bda03e995d583d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20c5965f1a29a2469125beb3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 20 22:19:06 2015 +0200 msvcp120: Add _Do_call implementation. --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120/tests/msvcp120.c | 28 ++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 5 +++++ 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index c87eb66..f43ed92 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3742,7 +3742,7 @@ @ extern _Denorm @ stub _Dint @ stub _Dnorm -@ stub _Do_call +@ cdecl _Do_call(ptr) @ stub _Dscale @ stub _Dtento @ stub _Dtest diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index b84a380..f2330df 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3683,7 +3683,7 @@ @ extern _Denorm @ stub _Dint @ stub _Dnorm -@ stub _Do_call +@ cdecl _Do_call(ptr) @ stub _Dscale @ stub _Dtento @ stub _Dtest diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index f89543f..b5b4301 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -45,6 +45,7 @@ static int (__cdecl *p_xtime_get)(xtime*, int); static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); +static void (CDECL *p__Do_call)(void *this); static HMODULE msvcp; @@ -64,6 +65,7 @@ static BOOL init(void) p__Getcvt = (void*)GetProcAddress(msvcp, "_Getcvt"); p__Call_once = (void*)GetProcAddress(msvcp, "_Call_once"); p__Call_onceEx = (void*)GetProcAddress(msvcp, "_Call_onceEx"); + p__Do_call = (void*)GetProcAddress(msvcp, "_Do_call"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -244,6 +246,31 @@ static void test__Call_once(void) ok(once == 1, "once = %x\n", once); } +static void **vtbl_func0; +#ifdef __i386__ +/* TODO: this should be a __thiscall function */ +static void __stdcall thiscall_func(void) +{ + cnt = 1; +} +#else +static void __cdecl thiscall_func(void *this) +{ + ok(this == &vtbl_func0, "incorrect this value\n"); + cnt = 1; +} +#endif + +static void test__Do_call(void) +{ + void *pfunc = thiscall_func; + + cnt = 0; + vtbl_func0 = &pfunc; + p__Do_call(&vtbl_func0); + ok(cnt == 1, "func was not called\n"); +} + START_TEST(msvcp120) { if(!init()) return; @@ -251,6 +278,7 @@ START_TEST(msvcp120) test_xtime_get(); test__Getcvt(); test__Call_once(); + test__Do_call(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index bdfea8b..dd3f6df 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3683,7 +3683,7 @@ @ extern _Denorm msvcp120._Denorm @ stub _Dint @ stub _Dnorm -@ stub _Do_call +@ cdecl _Do_call(ptr) msvcp120._Do_call @ stub _Dscale @ stub _Dtento @ stub _Dtest diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 22f90c8..c8bb2bd 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -663,6 +663,11 @@ void __cdecl _Call_once(int *once, void (__cdecl *func)(void)) TRACE("%p %p\n", once, func); _Call_onceEx(once, call_once_func_wrapper, func); } + +void __cdecl _Do_call(void *this) +{ + CALL_VTBL_FUNC(this, 0, void, (void*), (this)); +} #endif void init_misc(void *base)

1 0

Piotr Caban : msvcp120: Added _Call_once implementation.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: a7a3cd84b5581ccb1ac06a7788b4982c0deecde6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7a3cd84b5581ccb1ac06a778… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 20 22:18:58 2015 +0200 msvcp120: Added _Call_once implementation. --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120/tests/msvcp120.c | 55 +++++++++++++++++++++++++++++++++++++ dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp90/misc.c | 35 +++++++++++++++++++++++ 5 files changed, 96 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 3be4944..c87eb66 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3727,8 +3727,8 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAA_JPB_W_J@Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAE_JPB_W_J@Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr ptr long) basic_streambuf_wchar_xsputn -@ stub _Call_once -@ stub _Call_onceEx +@ cdecl _Call_once(ptr ptr) +@ cdecl _Call_onceEx(ptr ptr ptr) @ stub _Cnd_broadcast @ stub _Cnd_destroy @ stub _Cnd_do_broadcast_at_thread_exit diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index d8187d5..b84a380 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3668,8 +3668,8 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAA_JPB_W_J@Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAE_JPB_W_J@Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr ptr long) basic_streambuf_wchar_xsputn -@ stub _Call_once -@ stub _Call_onceEx +@ cdecl _Call_once(ptr ptr) +@ cdecl _Call_onceEx(ptr ptr ptr) @ stub _Cnd_broadcast @ stub _Cnd_destroy @ stub _Cnd_do_broadcast_at_thread_exit diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 32ca437..f89543f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -43,6 +43,8 @@ static int (__cdecl *p_isleadbyte)(int); static MSVCRT_long (__cdecl *p__Xtime_diff_to_millis2)(const xtime*, const xtime*); static int (__cdecl *p_xtime_get)(xtime*, int); static _Cvtvec* (__cdecl *p__Getcvt)(_Cvtvec*); +static void (CDECL *p__Call_once)(int *once, void (CDECL *func)(void)); +static void (CDECL *p__Call_onceEx)(int *once, void (CDECL *func)(void*), void *argv); static HMODULE msvcp; @@ -60,6 +62,8 @@ static BOOL init(void) p__Xtime_diff_to_millis2 = (void*)GetProcAddress(msvcp, "_Xtime_diff_to_millis2"); p_xtime_get = (void*)GetProcAddress(msvcp, "xtime_get"); p__Getcvt = (void*)GetProcAddress(msvcp, "_Getcvt"); + p__Call_once = (void*)GetProcAddress(msvcp, "_Call_once"); + p__Call_onceEx = (void*)GetProcAddress(msvcp, "_Call_onceEx"); msvcr = GetModuleHandleA("msvcr120.dll"); p_setlocale = (void*)GetProcAddress(msvcr, "setlocale"); @@ -190,12 +194,63 @@ static void test__Getcvt(void) } } +static int cnt; +static int once; + +static void __cdecl call_once_func(void) +{ + ok(!once, "once != 0\n"); + cnt += 0x10000; +} + +static void __cdecl call_once_ex_func(void *arg) +{ + int *i = arg; + + ok(!once, "once != 0\n"); + (*i)++; +} + +DWORD WINAPI call_once_thread(void *arg) +{ + p__Call_once(&once, call_once_func); + return 0; +} + +DWORD WINAPI call_once_ex_thread(void *arg) +{ + p__Call_onceEx(&once, call_once_ex_func, &cnt); + return 0; +} + +static void test__Call_once(void) +{ + HANDLE h[4]; + int i; + + for(i=0; i<4; i++) + h[i] = CreateThread(NULL, 0, call_once_thread, &once, 0, NULL); + ok(WaitForMultipleObjects(4, h, TRUE, INFINITE) == WAIT_OBJECT_0, + "error waiting for all threads to finish\n"); + ok(cnt == 0x10000, "cnt = %x\n", cnt); + ok(once == 1, "once = %x\n", once); + + once = cnt = 0; + for(i=0; i<4; i++) + h[i] = CreateThread(NULL, 0, call_once_ex_thread, &once, 0, NULL); + ok(WaitForMultipleObjects(4, h, TRUE, INFINITE) == WAIT_OBJECT_0, + "error waiting for all threads to finish\n"); + ok(cnt == 1, "cnt = %x\n", cnt); + ok(once == 1, "once = %x\n", once); +} + START_TEST(msvcp120) { if(!init()) return; test__Xtime_diff_to_millis2(); test_xtime_get(); test__Getcvt(); + test__Call_once(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index bd949be..bdfea8b 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3668,8 +3668,8 @@ @ cdecl -ret64 -arch=arm ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAA_JPB_W_J@Z(ptr wstr int64) msvcp120.?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAA_JPB_W_J@Z @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAE_JPB_W_J@Z(ptr wstr int64) msvcp120.?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MAE_JPB_W_J@Z @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr ptr long) msvcp120.?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z -@ stub _Call_once -@ stub _Call_onceEx +@ cdecl _Call_once(ptr ptr) msvcp120._Call_once +@ cdecl _Call_onceEx(ptr ptr ptr) msvcp120._Call_onceEx @ stub _Cnd_broadcast @ stub _Cnd_destroy @ stub _Cnd_do_broadcast_at_thread_exit diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 51b2a67..22f90c8 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -630,6 +630,41 @@ void __asm_dummy_vtables(void) { #endif #endif +#if _MSVCP_VER >= 110 +static CRITICAL_SECTION call_once_cs; +static CRITICAL_SECTION_DEBUG call_once_cs_debug = +{ + 0, 0, &call_once_cs, + { &call_once_cs_debug.ProcessLocksList, &call_once_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": call_once_cs") } +}; +static CRITICAL_SECTION call_once_cs = { &call_once_cs_debug, -1, 0, 0, 0, 0 }; + +void __cdecl _Call_onceEx(int *once, void (__cdecl *func)(void*), void *argv) +{ + TRACE("%p %p %p\n", once, func, argv); + + EnterCriticalSection(&call_once_cs); + if(!*once) { + /* FIXME: handle exceptions */ + func(argv); + *once = 1; + } + LeaveCriticalSection(&call_once_cs); +} + +void __cdecl call_once_func_wrapper(void *func) +{ + ((void (__cdecl*)(void))func)(); +} + +void __cdecl _Call_once(int *once, void (__cdecl *func)(void)) +{ + TRACE("%p %p\n", once, func); + _Call_onceEx(once, call_once_func_wrapper, func); +} +#endif + void init_misc(void *base) { #ifdef __x86_64__

1 0

Austin English : api-ms-win-core-misc-l1-1-0: New dll.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 6bb558034cebb457d3cd5f80f1322104f87f933f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb558034cebb457d3cd5f80f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 21 13:37:07 2015 -0500 api-ms-win-core-misc-l1-1-0: New dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-misc-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-misc-l1-1-0.spec | 34 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 39 insertions(+) diff --git a/configure b/configure index de5f942..28e6c19 100755 --- a/configure +++ b/configure @@ -885,6 +885,7 @@ enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_memory_l1_1_0 enable_api_ms_win_core_memory_l1_1_1 +enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_processenvironment_l1_1_0 @@ -17033,6 +17034,7 @@ wine_fn_config_dll api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_wi wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_localregistry_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-0 enable_api_ms_win_core_memory_l1_1_0 wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l1_1_1 +wine_fn_config_dll api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-1-0 enable_api_ms_win_core_processenvironment_l1_1_0 diff --git a/configure.ac b/configure.ac index 7a48000..88eb77b 100644 --- a/configure.ac +++ b/configure.ac @@ -2722,6 +2722,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-1-0) diff --git a/dlls/api-ms-win-core-misc-l1-1-0/Makefile.in b/dlls/api-ms-win-core-misc-l1-1-0/Makefile.in new file mode 100644 index 0000000..2e97ef9 --- /dev/null +++ b/dlls/api-ms-win-core-misc-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-misc-l1-1-0.dll diff --git a/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec new file mode 100644 index 0000000..0d45e0d --- /dev/null +++ b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec @@ -0,0 +1,34 @@ +@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA +@ stdcall FatalAppExitA(long str) kernel32.FatalAppExitA +@ stdcall FatalAppExitW(long wstr) kernel32.FatalAppExitW +@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA +@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW +@ stdcall GlobalAlloc(long long) kernel32.GlobalAlloc +@ stdcall GlobalFree(long) kernel32.GlobalFree +@ stdcall IsProcessInJob(long long ptr) kernel32.IsProcessInJob +@ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process +@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA +@ stdcall LocalAlloc(long long) kernel32.LocalAlloc +@ stdcall LocalFree(long) kernel32.LocalFree +@ stdcall LocalLock(long) kernel32.LocalLock +@ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc +@ stdcall LocalUnlock(long) kernel32.LocalUnlock +@ stdcall lstrcmpA(str str) kernel32.lstrcmpA +@ stdcall lstrcmpiA(str str) kernel32.lstrcmpiA +@ stdcall lstrcmpi(str str) kernel32.lstrcmpi +@ stdcall lstrcmpiW(wstr wstr) kernel32.lstrcmpiW +@ stdcall lstrcmp(str str) kernel32.lstrcmp +@ stdcall lstrcmpW(wstr wstr) kernel32.lstrcmpW +@ stdcall lstrcpynA(ptr str long) kernel32.lstrcpynA +@ stdcall lstrcpyn(ptr str long) kernel32.lstrcpyn +@ stdcall lstrcpynW(ptr wstr long) kernel32.lstrcpynW +@ stdcall lstrlenA(str) kernel32.lstrlenA +@ stdcall lstrlen(str) kernel32.lstrlen +@ stdcall lstrlenW(wstr) kernel32.lstrlenW +@ stdcall NeedCurrentDirectoryForExePathA(str) kernel32.NeedCurrentDirectoryForExePathA +@ stdcall NeedCurrentDirectoryForExePathW(wstr) kernel32.NeedCurrentDirectoryForExePathW +@ stdcall PulseEvent(long) kernel32.PulseEvent +@ stdcall SetHandleCount(long) kernel32.SetHandleCount +@ stdcall Sleep(long) kernel32.Sleep +@ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection +@ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection diff --git a/tools/make_specfiles b/tools/make_specfiles index 164d4f0..0184a9e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -146,6 +146,7 @@ my @dll_groups = "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-1-0", "api-ms-win-core-interlocked-l1-2-0", + "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-1-0",

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: f2988416ab4459af8d36d7cfc568a37bc6bc189e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2988416ab4459af8d36d7cfc… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu May 21 20:25:50 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index c93e7fa..f18df3e 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-18 16:29+0300\n" +"PO-Revision-Date: 2015-05-21 20:22+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7453,10 +7453,8 @@ msgid "Add Control" msgstr "Pridėti valdiklį" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "Š&riftas..." +msgstr "&Konvertuoti..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9208,24 +9206,20 @@ msgstr "" "vietos diske, ar vis dar prisijungę prie tinklo." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "„Wine“ „Mono“ diegimo programa" +msgstr "„Wine“ garso susiejiklis" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "stulpelis" +msgstr "Garsumas" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Pagrindinis garsumas" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Nutildyti" #: winspool.rc:37 msgid "Print to File"

1 0

Ken Thomases : ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 5514df9d4e4c14cafcc4284e12d26ad6c74709fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5514df9d4e4c14cafcc4284e1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu May 21 11:13:35 2015 -0500 ntdll: Avoid one of the calls to getattrlist() when read_directory_getattrlist() checks the case sensitivity of the file system. Extract a new function, get_dir_case_sensitivity_attr_by_id(), from get_dir_case_sensitivity_attr(). Call that instead of get_dir_case_sensitivity() from read_directory_getattrlist(). We get the device and file system IDs from the same getattrlist() call we're already doing, so that avoids an extra call. --- dlls/ntdll/directory.c | 62 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 8e4db83..cd9fdb0 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -983,43 +983,35 @@ static void add_fs_cache( dev_t dev, fsid_t fsid, BOOLEAN case_sensitive ) } /*********************************************************************** - * get_dir_case_sensitivity_attr + * get_dir_case_sensitivity_attr_by_id * - * Checks if the volume containing the specified directory is case - * sensitive or not. Uses getattrlist(2). + * Checks if the volume with the specified device and file system IDs + * is case sensitive or not. Uses getattrlist(2). */ -static int get_dir_case_sensitivity_attr( const char *dir ) +static int get_dir_case_sensitivity_attr_by_id( dev_t dev, fsid_t fsid ) { char *mntpoint = NULL; struct attrlist attr; struct vol_caps caps; - struct get_fsid get_fsid; struct fs_cache *entry; - /* First get the FS ID of the volume */ - attr.bitmapcount = ATTR_BIT_MAP_COUNT; - attr.reserved = 0; - attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; - attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; - get_fsid.size = 0; - if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || - get_fsid.size != sizeof(get_fsid)) - return -1; /* Try to look it up in the cache */ - entry = look_up_fs_cache( get_fsid.dev ); - if (entry && !memcmp( &entry->fsid, &get_fsid.fsid, sizeof(fsid_t) )) + entry = look_up_fs_cache( dev ); + if (entry && !memcmp( &entry->fsid, &fsid, sizeof(fsid_t) )) /* Cache lookup succeeded */ return entry->case_sensitive; /* Cache is stale at this point, we have to update it */ - mntpoint = get_device_mount_point( get_fsid.dev ); + mntpoint = get_device_mount_point( dev ); /* Now look up the case-sensitivity */ - attr.commonattr = 0; + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.reserved = attr.commonattr = 0; attr.volattr = ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES; + attr.dirattr = attr.fileattr = attr.forkattr = 0; if (getattrlist( mntpoint, &attr, &caps, sizeof(caps), 0 ) < 0) { RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); - add_fs_cache( get_fsid.dev, get_fsid.fsid, TRUE ); + add_fs_cache( dev, fsid, TRUE ); return TRUE; } RtlFreeHeap( GetProcessHeap(), 0, mntpoint ); @@ -1036,11 +1028,34 @@ static int get_dir_case_sensitivity_attr( const char *dir ) else ret = TRUE; /* Update the cache */ - add_fs_cache( get_fsid.dev, get_fsid.fsid, ret ); + add_fs_cache( dev, fsid, ret ); return ret; } return FALSE; } + +/*********************************************************************** + * get_dir_case_sensitivity_attr + * + * Checks if the volume containing the specified directory is case + * sensitive or not. Uses getattrlist(2). + */ +static int get_dir_case_sensitivity_attr( const char *dir ) +{ + struct attrlist attr; + struct get_fsid get_fsid; + + /* First get the FS ID of the volume */ + attr.bitmapcount = ATTR_BIT_MAP_COUNT; + attr.reserved = 0; + attr.commonattr = ATTR_CMN_DEVID|ATTR_CMN_FSID; + attr.volattr = attr.dirattr = attr.fileattr = attr.forkattr = 0; + get_fsid.size = 0; + if (getattrlist( dir, &attr, &get_fsid, sizeof(get_fsid), 0 ) != 0 || + get_fsid.size != sizeof(get_fsid)) + return -1; + return get_dir_case_sensitivity_attr_by_id( get_fsid.dev, get_fsid.fsid ); +} #endif /*********************************************************************** @@ -2148,6 +2163,8 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer { u_int32_t length; struct attrreference name_reference; + dev_t devid; + fsid_t fsid; fsobj_type_t type; char name[NAME_MAX * 3 + 1]; } attrlist_buffer; @@ -2179,7 +2196,7 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer memset( &attrlist, 0, sizeof(attrlist) ); attrlist.bitmapcount = ATTR_BIT_MAP_COUNT; - attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_OBJTYPE; + attrlist.commonattr = ATTR_CMN_NAME | ATTR_CMN_DEVID | ATTR_CMN_FSID | ATTR_CMN_OBJTYPE; ret = getattrlist( unix_name, &attrlist, &attrlist_buffer, sizeof(attrlist_buffer), FSOPT_NOFOLLOW ); /* If unix_name named a symlink, the above may have succeeded even if the symlink is broken. Check that with another call without FSOPT_NOFOLLOW. We don't ask for any attributes. */ @@ -2199,7 +2216,8 @@ static int read_directory_getattrlist( int fd, IO_STATUS_BLOCK *io, void *buffer } else io->u.Status = STATUS_NO_MORE_FILES; } - else if ((errno == ENOENT || errno == ENOTDIR) && !get_dir_case_sensitivity(".")) + else if ((errno == ENOENT || errno == ENOTDIR) && + !get_dir_case_sensitivity_attr_by_id( attrlist_buffer.devid, attrlist_buffer.fsid )) { io->u.Status = STATUS_NO_MORE_FILES; ret = 0;

1 0

André Hentschel : ntdll: Add ARMv8 detection for ARM32.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: dec7b246f8afe516206f1a34a8d9be5963f14600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec7b246f8afe516206f1a34a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:16:52 2015 +0200 ntdll: Add ARMv8 detection for ARM32. --- dlls/ntdll/nt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8e6ce06..2acaa83 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1139,6 +1139,8 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) #else FIXME("CPU Feature detection not implemented.\n"); #endif + if (info->Level >= 8) + user_shared_data->ProcessorFeatures[PF_ARM_V8_INSTRUCTIONS_AVAILABLE] = TRUE; info->Architecture = PROCESSOR_ARCHITECTURE_ARM; }

1 0

André Hentschel : ntdll: Parse ARM64 CPU info.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: b5b34220cc8d0c232f7b47f63440696604706eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b34220cc8d0c232f7b47f63… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:13:35 2015 +0200 ntdll: Parse ARM64 CPU info. --- dlls/ntdll/nt.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 550a91a..8e6ce06 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1146,7 +1146,54 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) { - info->Level = 8; +#ifdef linux + char line[512]; + char *s, *value; + FILE *f = fopen("/proc/cpuinfo", "r"); + if (f) + { + while (fgets(line, sizeof(line), f) != NULL) + { + /* NOTE: the ':' is the only character we can rely on */ + if (!(value = strchr(line,':'))) + continue; + /* terminate the valuename */ + s = value - 1; + while ((s >= line) && isspace(*s)) s--; + *(s + 1) = '\0'; + /* and strip leading spaces from value */ + value += 1; + while (isspace(*value)) value++; + if ((s = strchr(value,'\n'))) + *s='\0'; + if (!strcasecmp(line, "CPU architecture")) + { + if (isdigit(value[0])) + info->Level = atoi(value); + continue; + } + if (!strcasecmp(line, "CPU revision")) + { + if (isdigit(value[0])) + info->Revision = atoi(value); + continue; + } + if (!strcasecmp(line, "Features")) + { + if (strstr(value, "crc32")) + user_shared_data->ProcessorFeatures[PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE] = TRUE; + if (strstr(value, "aes")) + user_shared_data->ProcessorFeatures[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = TRUE; + continue; + } + } + fclose(f); + } +#else + FIXME("CPU Feature detection not implemented.\n"); +#endif + info->Level = max(info->Level, 8); + user_shared_data->ProcessorFeatures[PF_ARM_V8_INSTRUCTIONS_AVAILABLE] = TRUE; info->Architecture = PROCESSOR_ARCHITECTURE_ARM64; }

1 0

André Hentschel : wineboot: Add hardware registry keys on ARM64.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 48d150dc317bb7edc0c3bbf83df22d7e060a834d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48d150dc317bb7edc0c3bbf83… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:12:44 2015 +0200 wineboot: Add hardware registry keys on ARM64. --- programs/wineboot/wineboot.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0792c2d..4d70ea9 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -185,7 +185,7 @@ static void create_hardware_registry_keys(void) static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR IntelCpuDescrW[] = {'x','8','6',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',0}; - static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','7',' ','M','o','d','e','l',' ','%','X', + static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; static const WCHAR IntelCpuStringW[] = {'I','n','t','e','l','(','R',')',' ','P','e','n','t','i','u','m','(','R',')',' ','4',' ', 'C','P','U',' ','2','.','4','0','G','H','z',0}; @@ -208,7 +208,8 @@ static void create_hardware_registry_keys(void) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_ARM: - sprintfW( idW, ARMCpuDescrW, sci.Level, sci.Revision ); + case PROCESSOR_ARCHITECTURE_ARM64: + sprintfW( idW, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; default: case PROCESSOR_ARCHITECTURE_INTEL: @@ -226,6 +227,7 @@ static void create_hardware_registry_keys(void) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_ARM: + case PROCESSOR_ARCHITECTURE_ARM64: set_reg_value( system_key, IdentifierW, ARMSysidW ); break; default: @@ -235,6 +237,7 @@ static void create_hardware_registry_keys(void) } if (sci.Architecture == PROCESSOR_ARCHITECTURE_ARM || + sci.Architecture == PROCESSOR_ARCHITECTURE_ARM64 || RegCreateKeyExW( system_key, fpuW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &fpu_key, NULL )) fpu_key = 0; @@ -259,6 +262,7 @@ static void create_hardware_registry_keys(void) RegCloseKey( hkey ); } if (sci.Architecture != PROCESSOR_ARCHITECTURE_ARM && + sci.Architecture != PROCESSOR_ARCHITECTURE_ARM64 && !RegCreateKeyExW( fpu_key, numW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, NULL )) {

1 0

André Hentschel : wineboot: Add environment registry keys on ARM64.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: b4a46dbcaa7c9405ecf6783c0abaa0fbcece9d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a46dbcaa7c9405ecf6783c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:12:25 2015 +0200 wineboot: Add environment registry keys on ARM64. --- programs/wineboot/wineboot.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index a20b4e1..0792c2d 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -300,6 +300,7 @@ static void create_environment_registry_keys( void ) static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR armW[] = {'A','R','M',0}; + static const WCHAR arm64W[] = {'A','R','M','6','4',0}; static const WCHAR AMD64W[] = {'A','M','D','6','4',0}; static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0}; @@ -308,7 +309,7 @@ static void create_environment_registry_keys( void ) static const WCHAR Percent04XW[] = {'%','0','4','x',0}; static const WCHAR IntelCpuDescrW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',',',' ','G','e','n','u','i','n','e','I','n','t','e','l',0}; - static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','7',' ','M','o','d','e','l',' ','%','X', + static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; HKEY env_key; @@ -327,6 +328,7 @@ static void create_environment_registry_keys( void ) { case PROCESSOR_ARCHITECTURE_AMD64: arch = AMD64W; break; case PROCESSOR_ARCHITECTURE_ARM: arch = armW; break; + case PROCESSOR_ARCHITECTURE_ARM64: arch = arm64W; break; default: case PROCESSOR_ARCHITECTURE_INTEL: arch = x86W; break; } @@ -335,7 +337,8 @@ static void create_environment_registry_keys( void ) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_ARM: - sprintfW( buffer, ARMCpuDescrW, sci.Level, sci.Revision ); + case PROCESSOR_ARCHITECTURE_ARM64: + sprintfW( buffer, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; default: case PROCESSOR_ARCHITECTURE_INTEL:

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015