May 2015 - Wine-commits - list.winehq.org

Francois Gouget : gdi32/tests: Silence some font traces that generate too many lines.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 150d9203103c631c00db28c587e0be968af7704a URL: http://source.winehq.org/git/wine.git/?a=commit;h=150d9203103c631c00db28c58… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 8 17:45:33 2015 +0200 gdi32/tests: Silence some font traces that generate too many lines. --- dlls/gdi32/tests/font.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index eff1793..5388df1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3708,9 +3708,10 @@ static void test_text_metrics(const LOGFONTA *lf, const NEWTEXTMETRICA *ntm) default_char = GET_BE_WORD(tt_os2.usDefaultChar); break_char = GET_BE_WORD(tt_os2.usBreakChar); - trace("font %s charset %u: %x-%x (%x-%x) default %x break %x OS/2 version %u vendor %4.4s\n", - font_name, lf->lfCharSet, os2_first_char, os2_last_char, cmap_first, cmap_last, - default_char, break_char, version, (LPCSTR)&tt_os2.achVendID); + if (winetest_debug > 1) + trace("font %s charset %u: %x-%x (%x-%x) default %x break %x OS/2 version %u vendor %4.4s\n", + font_name, lf->lfCharSet, os2_first_char, os2_last_char, cmap_first, cmap_last, + default_char, break_char, version, (LPCSTR)&tt_os2.achVendID); if (cmap_type == cmap_ms_symbol || (cmap_first >= 0xf000 && cmap_first < 0xf100)) {

1 0

Francois Gouget : ddraw/tests: Silence some ddrawmodes traces that generate too many lines.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 0f3de20ba0cd26af02b911f79eb0b19ae79d3b40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f3de20ba0cd26af02b911f79… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 8 17:46:05 2015 +0200 ddraw/tests: Silence some ddrawmodes traces that generate too many lines. --- dlls/ddraw/tests/ddrawmodes.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 39b3555..a325f86 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -337,9 +337,10 @@ static void flushdisplaymodes(void) static HRESULT WINAPI enummodescallback(DDSURFACEDESC *lpddsd, void *lpContext) { - trace("Width = %i, Height = %i, bpp = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", - lpddsd->dwWidth, lpddsd->dwHeight, U1(lpddsd->ddpfPixelFormat).dwRGBBitCount, - U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags); + if (winetest_debug > 1) + trace("Width = %i, Height = %i, bpp = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", + lpddsd->dwWidth, lpddsd->dwHeight, U1(lpddsd->ddpfPixelFormat).dwRGBBitCount, + U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags); /* Check that the pitch is valid if applicable */ if(lpddsd->dwFlags & DDSD_PITCH) @@ -366,9 +367,10 @@ static HRESULT WINAPI enummodescallback(DDSURFACEDESC *lpddsd, void *lpContext) static HRESULT WINAPI enummodescallback_16bit(DDSURFACEDESC *lpddsd, void *lpContext) { - trace("Width = %i, Height = %i, bpp = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", - lpddsd->dwWidth, lpddsd->dwHeight, U1(lpddsd->ddpfPixelFormat).dwRGBBitCount, - U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags); + if (winetest_debug > 1) + trace("Width = %i, Height = %i, bpp = %i, Refresh Rate = %i, Pitch = %i, flags =%02X\n", + lpddsd->dwWidth, lpddsd->dwHeight, U1(lpddsd->ddpfPixelFormat).dwRGBBitCount, + U2(*lpddsd).dwRefreshRate, U1(*lpddsd).lPitch, lpddsd->dwFlags); ok(lpddsd->dwFlags == (DDSD_HEIGHT|DDSD_WIDTH|DDSD_PIXELFORMAT|DDSD_PITCH|DDSD_REFRESHRATE), "Wrong surface description flags %02X\n", lpddsd->dwFlags);

1 0

Francois Gouget : kernel32/tests: Silence some loader and locale traces that generate too many lines.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 5ea2bdda5dd43cc75b71e3512937a63be1b69de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea2bdda5dd43cc75b71e3512… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 8 17:46:30 2015 +0200 kernel32/tests: Silence some loader and locale traces that generate too many lines. --- dlls/kernel32/tests/loader.c | 3 ++- dlls/kernel32/tests/locale.c | 14 +++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4922035..0f9ac38 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1411,7 +1411,8 @@ static DWORD WINAPI semaphore_thread_proc(void *param) while (1) { - trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); + if (winetest_debug > 1) + trace("%04u: semaphore_thread_proc: still alive\n", GetCurrentThreadId()); if (WaitForSingleObject(stop_event, 50) != WAIT_TIMEOUT) break; } diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 95e0ac6..e2ec152 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3137,8 +3137,9 @@ static void test_ConvertDefaultLocale(void) static BOOL CALLBACK langgrp_procA(LGRPID lgrpid, LPSTR lpszNum, LPSTR lpszName, DWORD dwFlags, LONG_PTR lParam) { - trace("%08x, %s, %s, %08x, %08lx\n", - lgrpid, lpszNum, lpszName, dwFlags, lParam); + if (winetest_debug > 1) + trace("%08x, %s, %s, %08x, %08lx\n", + lgrpid, lpszNum, lpszName, dwFlags, lParam); ok(pIsValidLanguageGroup(lgrpid, dwFlags) == TRUE, "Enumerated grp %d not valid (flags %d)\n", lgrpid, dwFlags); @@ -3187,7 +3188,8 @@ static void test_EnumSystemLanguageGroupsA(void) static BOOL CALLBACK enum_func( LPWSTR name, DWORD flags, LPARAM lparam ) { - trace( "%s %x\n", wine_dbgstr_w(name), flags ); + if (winetest_debug > 1) + trace( "%s %x\n", wine_dbgstr_w(name), flags ); return TRUE; } @@ -3212,7 +3214,8 @@ static void test_EnumSystemLocalesEx(void) static BOOL CALLBACK lgrplocale_procA(LGRPID lgrpid, LCID lcid, LPSTR lpszNum, LONG_PTR lParam) { - trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam); + if (winetest_debug > 1) + trace("%08x, %08x, %s, %08lx\n", lgrpid, lcid, lpszNum, lParam); /* invalid locale enumerated on some platforms */ if (lcid == 0) @@ -3293,7 +3296,8 @@ static void test_SetLocaleInfoA(void) static BOOL CALLBACK luilocale_proc1A(LPSTR value, LONG_PTR lParam) { - trace("%s %08lx\n", value, lParam); + if (winetest_debug > 1) + trace("%s %08lx\n", value, lParam); return(TRUE); }

1 0

Piotr Caban : ws2_32: Fix ai_canonname buffer allocation in addrinfo_AtoW.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: 51e77324dd486484948cce4cb58039d8c93b51dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e77324dd486484948cce4cb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 8 18:01:58 2015 +0200 ws2_32: Fix ai_canonname buffer allocation in addrinfo_AtoW. --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 10bfd9d..ac81d24 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6120,7 +6120,7 @@ static struct WS_addrinfoW *addrinfo_AtoW(const struct WS_addrinfo *ai) if (ai->ai_canonname) { int len = MultiByteToWideChar(CP_ACP, 0, ai->ai_canonname, -1, NULL, 0); - if (!(ret->ai_canonname = HeapAlloc(GetProcessHeap(), 0, len))) + if (!(ret->ai_canonname = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)))) { HeapFree(GetProcessHeap(), 0, ret); return NULL;

1 0

Sebastian Lackner : server: Fix leak of async handle in pipe_server_flush.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: b3fb5992b668b51b998d8731564f87cacbf5647c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3fb5992b668b51b998d87315… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 8 18:02:20 2015 +0200 server: Fix leak of async handle in pipe_server_flush. --- server/named_pipe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/named_pipe.c b/server/named_pipe.c index c698a87..f5e536c 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -563,6 +563,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async_ if (!server->flush_poll) server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); if (blocking) handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); + release_object( async ); set_error( STATUS_PENDING ); } return handle;

1 0

Andrew Eikum : dsound: Don't set very low limits on HW buffers.
by Alexandre Julliard 11 May '15

11 May '15

Module: wine Branch: master Commit: ff25b25a494aef6d55679dfaefd63d63fe0cf5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff25b25a494aef6d55679dfae… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 8 11:18:12 2015 -0500 dsound: Don't set very low limits on HW buffers. --- dlls/dsound/dsound.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index f77d2ea..7b93455 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -375,8 +375,8 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; device->drvcaps.dwMaxHwMixingAllBuffers = 16; - device->drvcaps.dwMaxHwMixingStaticBuffers = 1; - device->drvcaps.dwMaxHwMixingStreamingBuffers = 1; + device->drvcaps.dwMaxHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; + device->drvcaps.dwMaxHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; device->drvcaps.dwFreeHwMixingAllBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; device->drvcaps.dwFreeHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingStaticBuffers; device->drvcaps.dwFreeHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingStreamingBuffers; @@ -814,14 +814,8 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds dscaps->dwMaxHwMixingStaticBuffers = This->device->drvcaps.dwMaxHwMixingStaticBuffers; dscaps->dwMaxHwMixingStreamingBuffers = This->device->drvcaps.dwMaxHwMixingStreamingBuffers; dscaps->dwFreeHwMixingAllBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; - - if (This->device->drvcaps.dwFreeHwMixingAllBuffers > 0) { - dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingStaticBuffers; - dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingStreamingBuffers; - } else { - dscaps->dwFreeHwMixingStaticBuffers = 0; - dscaps->dwFreeHwMixingStreamingBuffers = 0; - } + dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; + dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; dscaps->dwMaxHw3DAllBuffers = This->device->drvcaps.dwMaxHw3DAllBuffers; dscaps->dwMaxHw3DStaticBuffers = This->device->drvcaps.dwMaxHw3DStaticBuffers;

1 0

Martin Storsjo : api-ms-win-core-synch-l1-1-0: Add stub dll.
by Alexandre Julliard 08 May '15

08 May '15

Module: wine Branch: master Commit: e5e620a82c25bf7c13b704f27a5c21b7617f998b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e620a82c25bf7c13b704f27… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 7 23:03:02 2015 +0300 api-ms-win-core-synch-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-synch-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-synch-l1-1-0.spec | 42 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 47 insertions(+) diff --git a/configure b/configure index 297a9d8..d2d3530 100755 --- a/configure +++ b/configure @@ -899,6 +899,7 @@ enable_api_ms_win_core_rtlsupport_l1_1_0 enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_string_l1_1_0 +enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_1 @@ -17043,6 +17044,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-1-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtlsupport_l1_2_0 wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 diff --git a/configure.ac b/configure.ac index d8baa5f..31c8147 100644 --- a/configure.ac +++ b/configure.ac @@ -2735,6 +2735,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) diff --git a/dlls/api-ms-win-core-synch-l1-1-0/Makefile.in b/dlls/api-ms-win-core-synch-l1-1-0/Makefile.in new file mode 100644 index 0000000..09d35a0 --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-synch-l1-1-0.dll diff --git a/dlls/api-ms-win-core-synch-l1-1-0/api-ms-win-core-synch-l1-1-0.spec b/dlls/api-ms-win-core-synch-l1-1-0/api-ms-win-core-synch-l1-1-0.spec new file mode 100644 index 0000000..2968e40 --- /dev/null +++ b/dlls/api-ms-win-core-synch-l1-1-0/api-ms-win-core-synch-l1-1-0.spec @@ -0,0 +1,42 @@ +@ stdcall AcquireSRWLockExclusive(ptr) kernel32.AcquireSRWLockExclusive +@ stdcall AcquireSRWLockShared(ptr) kernel32.AcquireSRWLockShared +@ stdcall CancelWaitableTimer(long) kernel32.CancelWaitableTimer +@ stdcall CreateEventA(ptr long long str) kernel32.CreateEventA +@ stdcall CreateEventExA(ptr str long long) kernel32.CreateEventExA +@ stdcall CreateEventExW(ptr wstr long long) kernel32.CreateEventExW +@ stdcall CreateEventW(ptr long long wstr) kernel32.CreateEventW +@ stdcall CreateMutexA(ptr long str) kernel32.CreateMutexA +@ stdcall CreateMutexExA(ptr str long long) kernel32.CreateMutexExA +@ stdcall CreateMutexExW(ptr wstr long long) kernel32.CreateMutexExW +@ stdcall CreateMutexW(ptr long wstr) kernel32.CreateMutexW +@ stdcall CreateSemaphoreExW(ptr long long wstr long long) kernel32.CreateSemaphoreExW +@ stdcall CreateWaitableTimerExW(ptr wstr long long) kernel32.CreateWaitableTimerExW +@ stdcall DeleteCriticalSection(ptr) kernel32.DeleteCriticalSection +@ stdcall EnterCriticalSection(ptr) kernel32.EnterCriticalSection +@ stdcall InitializeCriticalSection(ptr) kernel32.InitializeCriticalSection +@ stdcall InitializeCriticalSectionAndSpinCount(ptr long) kernel32.InitializeCriticalSectionAndSpinCount +@ stdcall InitializeCriticalSectionEx(ptr long long) kernel32.InitializeCriticalSectionEx +@ stdcall InitializeSRWLock(ptr) kernel32.InitializeSRWLock +@ stdcall LeaveCriticalSection(ptr) kernel32.LeaveCriticalSection +@ stdcall OpenEventA(long long str) kernel32.OpenEventA +@ stdcall OpenEventW(long long wstr) kernel32.OpenEventW +@ stdcall OpenMutexW(long long wstr) kernel32.OpenMutexW +@ stdcall OpenProcess(long long long) kernel32.OpenProcess +@ stdcall OpenSemaphoreW(long long wstr) kernel32.OpenSemaphoreW +@ stdcall OpenWaitableTimerW(long long wstr) kernel32.OpenWaitableTimerW +@ stdcall ReleaseMutex(long) kernel32.ReleaseMutex +@ stdcall ReleaseSRWLockExclusive(ptr) kernel32.ReleaseSRWLockExclusive +@ stdcall ReleaseSRWLockShared(ptr) kernel32.ReleaseSRWLockShared +@ stdcall ReleaseSemaphore(long long ptr) kernel32.ReleaseSemaphore +@ stdcall ResetEvent(long) kernel32.ResetEvent +@ stdcall SetCriticalSectionSpinCount(ptr long) kernel32.SetCriticalSectionSpinCount +@ stdcall SetEvent(long) kernel32.SetEvent +@ stdcall SetWaitableTimer(long ptr long ptr ptr long) kernel32.SetWaitableTimer +@ stdcall SetWaitableTimerEx(long ptr long ptr ptr ptr long) kernel32.SetWaitableTimerEx +@ stdcall SleepEx(long long) kernel32.SleepEx +@ stdcall TryAcquireSRWLockExclusive(ptr) kernel32.TryAcquireSRWLockExclusive +@ stdcall TryAcquireSRWLockShared(ptr) kernel32.TryAcquireSRWLockShared +@ stdcall TryEnterCriticalSection(ptr) kernel32.TryEnterCriticalSection +@ stdcall WaitForMultipleObjectsEx(long ptr long long long) kernel32.WaitForMultipleObjectsEx +@ stdcall WaitForSingleObject(long long) kernel32.WaitForSingleObject +@ stdcall WaitForSingleObjectEx(long long long) kernel32.WaitForSingleObjectEx diff --git a/tools/make_specfiles b/tools/make_specfiles index e8c3b5d..ef78d11 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -150,6 +150,7 @@ my @dll_groups = "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", + "api-ms-win-core-synch-l1-1-0", "api-ms-win-core-synch-l1-2-0", "api-ms-win-core-console-l1-1-0", "api-ms-win-core-file-l1-1-0",

1 0

Martin Storsjo : api-ms-win-core-sysinfo-l1-1-0: Add stub dll.
by Alexandre Julliard 08 May '15

08 May '15

Module: wine Branch: master Commit: fc1dc668650a2d74c84b634a86e1dc3c8368988d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1dc668650a2d74c84b634a8… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 7 23:03:03 2015 +0300 api-ms-win-core-sysinfo-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-sysinfo-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-sysinfo-l1-1-0.spec | 28 ++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 33 insertions(+) diff --git a/configure b/configure index d2d3530..d1ab751 100755 --- a/configure +++ b/configure @@ -901,6 +901,7 @@ enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 +enable_api_ms_win_core_sysinfo_l1_1_0 enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_sysinfo_l1_2_1 enable_api_ms_win_core_threadpool_legacy_l1_1_0 @@ -17046,6 +17047,7 @@ wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 +wine_fn_config_dll api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo_l1_2_1 wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 diff --git a/configure.ac b/configure.ac index 31c8147..cb024c5 100644 --- a/configure.ac +++ b/configure.ac @@ -2737,6 +2737,7 @@ WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) diff --git a/dlls/api-ms-win-core-sysinfo-l1-1-0/Makefile.in b/dlls/api-ms-win-core-sysinfo-l1-1-0/Makefile.in new file mode 100644 index 0000000..6345872 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-sysinfo-l1-1-0.dll diff --git a/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec b/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec new file mode 100644 index 0000000..5044394 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-1-0/api-ms-win-core-sysinfo-l1-1-0.spec @@ -0,0 +1,28 @@ +@ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA +@ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW +@ stdcall GetDynamicTimeZoneInformation(ptr) kernel32.GetDynamicTimeZoneInformation +@ stdcall GetLocalTime(ptr) kernel32.GetLocalTime +@ stdcall GetLogicalProcessorInformation(ptr ptr) kernel32.GetLogicalProcessorInformation +@ stdcall GetLogicalProcessorInformationEx(long ptr ptr) kernel32.GetLogicalProcessorInformationEx +@ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA +@ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW +@ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo +@ stdcall GetSystemTime(ptr) kernel32.GetSystemTime +@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment +@ stdcall GetSystemTimeAsFileTime(ptr) kernel32.GetSystemTimeAsFileTime +@ stdcall GetSystemWindowsDirectoryA(ptr long) kernel32.GetSystemWindowsDirectoryA +@ stdcall GetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW +@ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 +@ stdcall GetTickCount() kernel32.GetTickCount +@ stdcall GetTimeZoneInformation(ptr) kernel32.GetTimeZoneInformation +@ stub GetTimeZoneInformationForYear +@ stdcall GetVersion() kernel32.GetVersion +@ stdcall GetVersionExA(ptr) kernel32.GetVersionExA +@ stdcall GetVersionExW(ptr) kernel32.GetVersionExW +@ stdcall GetWindowsDirectoryA(ptr long) kernel32.GetWindowsDirectoryA +@ stdcall GetWindowsDirectoryW(ptr long) kernel32.GetWindowsDirectoryW +@ stdcall GlobalMemoryStatusEx(ptr) kernel32.GlobalMemoryStatusEx +@ stdcall SetLocalTime(ptr) kernel32.SetLocalTime +@ stdcall SystemTimeToFileTime(ptr ptr) kernel32.SystemTimeToFileTime +@ stdcall SystemTimeToTzSpecificLocalTime(ptr ptr ptr) kernel32.SystemTimeToTzSpecificLocalTime +@ stdcall TzSpecificLocalTimeToSystemTime(ptr ptr ptr) kernel32.TzSpecificLocalTimeToSystemTime diff --git a/tools/make_specfiles b/tools/make_specfiles index ef78d11..164d4f0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -148,6 +148,7 @@ my @dll_groups = "api-ms-win-core-interlocked-l1-2-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", "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0", "api-ms-win-core-synch-l1-1-0",

1 0

André Hentschel : ntdll: Enable wow64 on ARM64.
by Alexandre Julliard 08 May '15

08 May '15

Module: wine Branch: master Commit: f78bd7f4d99b99567a0bda09d7c08ffefd5b1325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78bd7f4d99b99567a0bda09d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 7 23:37:44 2015 +0200 ntdll: Enable wow64 on ARM64. --- dlls/ntdll/process.c | 5 +++-- dlls/ntdll/server.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 3ac8d52..c69de5e 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -419,12 +419,13 @@ NTSTATUS WINAPI NtQueryInformationProcess( ULONG_PTR val = 0; if (ProcessHandle == GetCurrentProcess()) val = is_wow64; - else if (server_cpus & (1 << CPU_x86_64)) + else if (server_cpus & ((1 << CPU_x86_64) | (1 << CPU_ARM64))) { SERVER_START_REQ( get_process_info ) { req->handle = wine_server_obj_handle( ProcessHandle ); - if (!(ret = wine_server_call( req ))) val = (reply->cpu != CPU_x86_64); + if (!(ret = wine_server_call( req ))) + val = (reply->cpu != CPU_x86_64 && reply->cpu != CPU_ARM64); } SERVER_END_REQ; } diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 652a1aa..95111ad 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1503,7 +1503,7 @@ size_t server_init_thread( void *entry_point ) } SERVER_END_REQ; - is_wow64 = !is_win64 && (server_cpus & (1 << CPU_x86_64)) != 0; + is_wow64 = !is_win64 && (server_cpus & ((1 << CPU_x86_64) | (1 << CPU_ARM64))) != 0; ntdll_get_thread_data()->wow64_redir = is_wow64; switch (ret)

1 0

Qian Hong : ntdll/tests: Fixed typo.
by Alexandre Julliard 08 May '15

08 May '15

Module: wine Branch: master Commit: ac86cb9ebada03b859ec6040fb829edb6ca41c89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac86cb9ebada03b859ec6040f… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri May 8 10:46:25 2015 +0800 ntdll/tests: Fixed typo. --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 2cf59cf..96e1e6e 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -724,7 +724,7 @@ static void test_query_object(void) todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); str = (UNICODE_STRING *)buffer; todo_wine ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); - todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_event, sizeof(type_file) ), + todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_event, sizeof(type_event) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); len -= sizeof(WCHAR);

1 0