April 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt/tests: Use existing function pointers to call functions.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 2e01a48440d9a0a08ec40f02e148a10838cf7d46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e01a48440d9a0a08ec40f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:11:08 2019 +0200 msvcrt/tests: Use existing function pointers to call functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index a5a2df1..e9edb57 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -609,47 +609,47 @@ static void test_strftime(void) ok(gmt_tm != NULL, "gmtime failed\n"); errno = 0xdeadbeef; - retA = strftime(NULL, 0, "copy", gmt_tm); + retA = p_strftime(NULL, 0, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); - retA = strftime(bufA, 256, "copy", NULL); + retA = p_strftime(bufA, 256, "copy", NULL); ok(retA == 4, "expected 4, got %ld\n", retA); ok(!strcmp(bufA, "copy"), "got %s\n", bufA); - retA = strftime(bufA, 256, "copy it", gmt_tm); + retA = p_strftime(bufA, 256, "copy it", gmt_tm); ok(retA == 7, "expected 7, got %ld\n", retA); ok(!strcmp(bufA, "copy it"), "got %s\n", bufA); errno = 0xdeadbeef; - retA = strftime(bufA, 2, "copy", gmt_tm); + retA = p_strftime(bufA, 2, "copy", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "copy it")), "got %s\n", bufA); ok(errno==ERANGE || errno==0xdeadbeef, "errno = %d\n", errno); errno = 0xdeadbeef; - retA = strftime(bufA, 256, "a%e", gmt_tm); + retA = p_strftime(bufA, 256, "a%e", gmt_tm); ok(retA==0 || broken(retA==1), "expected 0, got %ld\n", retA); ok(!strcmp(bufA, "") || broken(!strcmp(bufA, "a")), "got %s\n", bufA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); if(0) { /* crashes on Win2k */ errno = 0xdeadbeef; - retA = strftime(bufA, 256, "%c", NULL); + retA = p_strftime(bufA, 256, "%c", NULL); ok(retA == 0, "expected 0, got %ld\n", retA); ok(!strcmp(bufA, ""), "got %s\n", bufA); ok(errno == EINVAL, "errno = %d\n", errno); } - retA = strftime(bufA, 256, "e%#%e", gmt_tm); + retA = p_strftime(bufA, 256, "e%#%e", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "e%e"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%c", gmt_tm); + retA = p_strftime(bufA, 256, "%c", gmt_tm); ok(retA == 17, "expected 17, got %ld\n", retA); ok(strcmp(bufA, expected) == 0, "expected %s, got %s\n", expected, bufA); - retW = wcsftime(bufW, 256, cW, gmt_tm); + retW = p_wcsftime(bufW, 256, cW, gmt_tm); ok(retW == 17, "expected 17, got %ld\n", retW); ok(retA == retW, "expected %ld, got %ld\n", retA, retW); buf[0] = 0; @@ -657,91 +657,91 @@ static void test_strftime(void) buf[retA] = 0; ok(strcmp(bufA, buf) == 0, "expected %s, got %s\n", bufA, buf); - retA = strftime(bufA, 256, "%x", gmt_tm); + retA = p_strftime(bufA, 256, "%x", gmt_tm); ok(retA == 8, "expected 8, got %ld\n", retA); ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%X", gmt_tm); + retA = p_strftime(bufA, 256, "%X", gmt_tm); ok(retA == 8, "expected 8, got %ld\n", retA); ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%a", gmt_tm); + retA = p_strftime(bufA, 256, "%a", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "Thu"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%A", gmt_tm); + retA = p_strftime(bufA, 256, "%A", gmt_tm); ok(retA == 8, "expected 8, got %ld\n", retA); ok(!strcmp(bufA, "Thursday"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%b", gmt_tm); + retA = p_strftime(bufA, 256, "%b", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "Jan"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%B", gmt_tm); + retA = p_strftime(bufA, 256, "%B", gmt_tm); ok(retA == 7, "expected 7, got %ld\n", retA); ok(!strcmp(bufA, "January"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%d", gmt_tm); + retA = p_strftime(bufA, 256, "%d", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "01"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%#d", gmt_tm); + retA = p_strftime(bufA, 256, "%#d", gmt_tm); ok(retA == 1, "expected 1, got %ld\n", retA); ok(!strcmp(bufA, "1"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%H", gmt_tm); + retA = p_strftime(bufA, 256, "%H", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%I", gmt_tm); + retA = p_strftime(bufA, 256, "%I", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "12"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%j", gmt_tm); + retA = p_strftime(bufA, 256, "%j", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "001"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%m", gmt_tm); + retA = p_strftime(bufA, 256, "%m", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "01"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%#M", gmt_tm); + retA = p_strftime(bufA, 256, "%#M", gmt_tm); ok(retA == 1, "expected 1, got %ld\n", retA); ok(!strcmp(bufA, "0"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%p", gmt_tm); + retA = p_strftime(bufA, 256, "%p", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "AM"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%U", gmt_tm); + retA = p_strftime(bufA, 256, "%U", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%W", gmt_tm); + retA = p_strftime(bufA, 256, "%W", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); gmt_tm->tm_wday = 0; - retA = strftime(bufA, 256, "%U", gmt_tm); + retA = p_strftime(bufA, 256, "%U", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "01"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%W", gmt_tm); + retA = p_strftime(bufA, 256, "%W", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "00"), "got %s\n", bufA); gmt_tm->tm_yday = 365; - retA = strftime(bufA, 256, "%U", gmt_tm); + retA = p_strftime(bufA, 256, "%U", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "53"), "got %s\n", bufA); - retA = strftime(bufA, 256, "%W", gmt_tm); + retA = p_strftime(bufA, 256, "%W", gmt_tm); ok(retA == 2, "expected 2, got %ld\n", retA); ok(!strcmp(bufA, "52"), "got %s\n", bufA); gmt_tm->tm_mon = 1; gmt_tm->tm_mday = 30; - retA = strftime(bufA, 256, "%c", gmt_tm); + retA = p_strftime(bufA, 256, "%c", gmt_tm); todo_wine { ok(retA == 17, "expected 17, got %ld\n", retA); ok(!strcmp(bufA, "02/30/70 00:00:00"), "got %s\n", bufA); @@ -753,7 +753,7 @@ static void test_strftime(void) } /* test with multibyte character */ - retA = strftime(bufA, 256, "\x82%c", gmt_tm); + retA = p_strftime(bufA, 256, "\x82%c", gmt_tm); ok(retA == 3, "expected 3, got %ld\n", retA); ok(!strcmp(bufA, "\x82%c"), "got %s\n", bufA); }

1 0

Józef Kucia : winevulkan: Enable VK_NV_cooperative_matrix.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: a69ed950203c4716f1ef8d371c25f3909a3c86e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a69ed950203c4716f1ef8d37… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:56 2019 +0200 winevulkan: Enable VK_NV_cooperative_matrix. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 25 +++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 2 ++ include/wine/vulkan.h | 61 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a69ed950203c4716f1ef…

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExIsResourceAcquiredSharedLite() .
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: ab22796ab05bd516186500640f961700cce7f3f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab22796ab05bd51618650064… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 9 23:41:10 2019 -0500 ntoskrnl.exe: Implement ExIsResourceAcquiredSharedLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 25 +++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d3e6070..ab952e5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -166,7 +166,7 @@ @ stdcall ExInterlockedRemoveHeadList(ptr ptr) @ stub ExIsProcessorFeaturePresent @ stdcall ExIsResourceAcquiredExclusiveLite(ptr) -@ stub ExIsResourceAcquiredSharedLite +@ stdcall ExIsResourceAcquiredSharedLite(ptr) @ stdcall ExLocalTimeToSystemTime(ptr ptr) RtlLocalTimeToSystemTime @ stub ExNotifyCallback @ stub ExQueryPoolBlockSize diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 94b9778..fbe9dbe 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1144,3 +1144,28 @@ BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite( ERESOURCE *resource ) return ret; } + +/*********************************************************************** + * ExIsResourceAcquiredSharedLite (NTOSKRNL.EXE.@) + */ +ULONG WINAPI ExIsResourceAcquiredSharedLite( ERESOURCE *resource ) +{ + ULONG ret; + KIRQL irql; + + TRACE("resource %p.\n", resource); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + ret = resource->ActiveEntries; + else + { + OWNER_ENTRY *entry = resource_get_shared_entry( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); + ret = entry->OwnerCount; + } + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return ret; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5a84602..dae83af 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1532,6 +1532,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); +ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);

1 0

Alexandre Julliard : msvcp: Remove some redundant clearing of buffers.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 612fce30140b315eeb37f80bc60a931cce81df92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=612fce30140b315eeb37f80b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:09:04 2019 +0200 msvcp: Remove some redundant clearing of buffers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 31 ++++++++----------------------- dlls/msvcp140/tests/msvcp140.c | 35 ++++++++++------------------------- 2 files changed, 18 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=612fce30140b315eeb37…

1 0

Józef Kucia : winevulkan: Generate conversion function for VkInstanceCreateInfo structure extensions.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: a4b9460ad68bad6675f9e50b390503db9ef94d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4b9460ad68bad6675f9e50b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:49 2019 +0200 winevulkan: Generate conversion function for VkInstanceCreateInfo structure extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 145 ++++++++++++++++++++++++++++++++++++---- dlls/winevulkan/vulkan.c | 31 ++------- dlls/winevulkan/vulkan_thunks.c | 37 ++++++++++ dlls/winevulkan/vulkan_thunks.h | 3 + 4 files changed, 177 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4b9460ad68bad6675f9…

1 0

Alexandre Julliard : msvcp: Rename clog variable to avoid conflict with builtin function.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 8b7b4e514035c40151b5704be37eb5555e768a65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7b4e514035c40151b5704b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 10 19:08:42 2019 +0200 msvcp: Rename clog variable to avoid conflict with builtin function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp70/msvcp70.spec | 2 +- dlls/msvcp71/msvcp71.spec | 2 +- dlls/msvcp80/msvcp80.spec | 2 +- dlls/msvcp90/ios.c | 12 ++++++------ dlls/msvcp90/msvcp90.spec | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 55217a6..2ae4e4c 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1309,7 +1309,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ cdecl -arch=win64 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt @ thiscall -arch=win32 ?copyfmt@?$basic_ios(a)GU?$char_traits(a)G@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_wchar_copyfmt diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 882dbbe..5f2b664 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1892,7 +1892,7 @@ @ cdecl -arch=arm ?clear(a)ios_base@std@@QAAXI(a)Z(ptr long) ios_base_clear_unsigned @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ cdecl -arch=arm ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ thiscall -arch=i386 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ cdecl -arch=win64 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 73024a0..c2a2d7e 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1852,7 +1852,7 @@ @ cdecl -arch=arm ?clear(a)ios_base@std@@QAAXI(a)Z(ptr long) ios_base_clear_unsigned @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ cdecl -arch=arm ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ thiscall -arch=i386 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ cdecl -arch=win64 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 96dff34..5bd627c 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1757,7 +1757,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH(a)Z(ptr long) ios_base_clear @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ cdecl -arch=arm ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAAAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ thiscall -arch=i386 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)ABV12@@Z(ptr ptr) basic_ios_char_copyfmt @ cdecl -arch=win64 ?copyfmt@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEBV12@@Z(ptr ptr) basic_ios_char_copyfmt diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index 4e75c20..b7c97a3 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -2433,7 +2433,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 6d3e931..ff6de62 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -2624,7 +2624,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close diff --git a/dlls/msvcp80/msvcp80.spec b/dlls/msvcp80/msvcp80.spec index 8cf9e54..8a2f695 100644 --- a/dlls/msvcp80/msvcp80.spec +++ b/dlls/msvcp80/msvcp80.spec @@ -3047,7 +3047,7 @@ @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7f792d6..6b94737 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15454,11 +15454,11 @@ struct { int vtordisp; #endif basic_ios_char vbase; -} clog = { { 0 } }; -C_ASSERT(sizeof(clog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); +} MSVCP_clog = { { 0 } }; +C_ASSERT(sizeof(MSVCP_clog) == VBTABLE_BASIC_IOS_ENTRY(basic_ostream_char, 0)+sizeof(basic_ios_char)); /* ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ -basic_ostream_char *_Ptr_clog = &clog.obj; +basic_ostream_char *_Ptr_clog = &MSVCP_clog.obj; static basic_filebuf_wchar filebuf_short_log; /* ?wclog(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ @@ -15529,7 +15529,7 @@ void __cdecl ios_base_Init__Init_dtor(void *this) if(!ios_base_Init__Init_cnt) { basic_ostream_char_flush(&cout.obj); basic_ostream_char_flush(&cerr.obj); - basic_ostream_char_flush(&clog.obj); + basic_ostream_char_flush(&MSVCP_clog.obj); } } @@ -15907,7 +15907,7 @@ void init_io(void *base) basic_ostream_wchar_ctor(&wcerr.obj, &filebuf_wchar_stderr.base, FALSE/*FIXME*/, TRUE); basic_filebuf_char_ctor_file(&filebuf_char_log, stderr); - basic_ostream_char_ctor(&clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE); + basic_ostream_char_ctor(&MSVCP_clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE); basic_filebuf_short_ctor_file(&filebuf_short_log, stderr); basic_ostream_short_ctor(&uclog.obj, &filebuf_short_log.base, FALSE/*FIXME*/, TRUE); @@ -15945,7 +15945,7 @@ void free_io(void) basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_vbase_dtor(&clog.obj); + basic_ostream_char_vbase_dtor(&MSVCP_clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); basic_ostream_wchar_vbase_dtor(&uclog.obj); diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 1df283a..2c1c0d7 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3411,7 +3411,7 @@ @ cdecl -arch=arm ?clear(a)ios_base@std@@QAAXI(a)Z(ptr long) ios_base_clear_unsigned @ thiscall -arch=i386 ?clear(a)ios_base@std@@QAEXI(a)Z(ptr long) ios_base_clear_unsigned @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXI(a)Z(ptr long) ios_base_clear_unsigned -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close

1 0

Alistair Leslie-Hughes : winex11: Implement PK_CHANGE for wintab.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 0652a2ccc967c6d1ca04c67f58112ff491ab9a62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0652a2ccc967c6d1ca04c67f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 10 03:42:53 2019 +0000 winex11: Implement PK_CHANGE for wintab. Based on a patch by Eriks Dobelis. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/wintab.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wintab32/context.c | 1 + 2 files changed, 40 insertions(+) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 48fcb22..486c356 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -267,6 +267,7 @@ static int proximity_out_type; static HWND hwndTabletDefault; static WTPACKET gMsgPacket; static DWORD gSerial; +static WTPACKET last_packet; /* Reference: http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html * @@ -839,6 +840,40 @@ static int cursor_from_device(DWORD deviceid, LPWTI_CURSORS_INFO *cursorp) return -1; } +static DWORD get_changed_state( WTPACKET *pkt) +{ + DWORD change = 0; + + if (pkt->pkX != last_packet.pkX) + change |= PK_X; + if (pkt->pkY != last_packet.pkY) + change |= PK_Y; + if (pkt->pkZ != last_packet.pkZ) + change |= PK_Z; + if (pkt->pkSerialNumber != last_packet.pkSerialNumber) + change |= PK_SERIAL_NUMBER; + if (pkt->pkTime != last_packet.pkTime) + change |= PK_TIME; + if (pkt->pkNormalPressure != last_packet.pkNormalPressure) + change |= PK_NORMAL_PRESSURE; + if (pkt->pkTangentPressure != last_packet.pkTangentPressure) + change |= PK_TANGENT_PRESSURE; + if (pkt->pkCursor != last_packet.pkCursor) + change |= PK_CURSOR; + if (pkt->pkButtons != last_packet.pkButtons) + change |= PK_BUTTONS; + if (pkt->pkOrientation.orAzimuth != last_packet.pkOrientation.orAzimuth || + pkt->pkOrientation.orAltitude != last_packet.pkOrientation.orAltitude || + pkt->pkOrientation.orTwist != last_packet.pkOrientation.orTwist) + change |= PK_ORIENTATION; + if (pkt->pkRotation.roPitch != last_packet.pkRotation.roPitch || + pkt->pkRotation.roRoll != last_packet.pkRotation.roRoll || + pkt->pkRotation.roYaw != last_packet.pkRotation.roYaw) + change |= PK_ROTATION; + + return change; +} + static BOOL motion_event( HWND hwnd, XEvent *event ) { XDeviceMotionEvent *motion = (XDeviceMotionEvent *)event; @@ -865,7 +900,9 @@ static BOOL motion_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = motion->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); + gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + last_packet = gMsgPacket; return TRUE; } @@ -895,7 +932,9 @@ static BOOL button_event( HWND hwnd, XEvent *event ) * (gMsgPacket.pkStatus & TPS_INVERT?-1:1)); gMsgPacket.pkNormalPressure = button->axis_data[2]; gMsgPacket.pkButtons = get_button_state(curnum); + gMsgPacket.pkChanged = get_changed_state(&gMsgPacket); SendMessageW(hwndTabletDefault,WT_PACKET,gMsgPacket.pkSerialNumber,(LPARAM)hwnd); + last_packet = gMsgPacket; return TRUE; } diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 2993c47..095e258 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -215,6 +215,7 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd) packet->pkContext = ptr->handle; /* translate packet data to the context */ + packet->pkChanged = packet->pkChanged & ptr->context.lcPktData; /* Scale as per documentation */ packet->pkY = ScaleForContext(packet->pkY, ptr->context.lcInOrgY,

1 0

Fabian Maurer : sxs: Implement SxsLookupClrGuid and add tests.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 4c7ffaecaf50cee91e74d509f64f4aecca6e237c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c7ffaecaf50cee91e74d509… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Tue Apr 9 19:27:44 2019 +0200 sxs: Implement SxsLookupClrGuid and add tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/sxs.c | 150 ++++++++++++++++++++++++ dlls/sxs/sxs.spec | 1 + dlls/sxs/tests/Makefile.in | 8 +- dlls/sxs/tests/comtest_dll.manifest | 16 +++ dlls/sxs/tests/comtest_exe.manifest | 11 ++ dlls/sxs/tests/interfaces.idl | 35 ++++++ dlls/sxs/tests/resource.rc | 27 +++++ dlls/sxs/tests/sxs.c | 224 ++++++++++++++++++++++++++++++++++++ 8 files changed, 470 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c7ffaecaf50cee91e74…

1 0

Isira Seneviratne : po: Update Sinhala translation.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: 368f35edd773647fe75073127f46d46d8ba8d896 URL: https://source.winehq.org/git/wine.git/?a=commit;h=368f35edd773647fe7507312… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Apr 9 05:02:10 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 99 +++++++++++++++++++++++++--------------------------------------- 1 file changed, 39 insertions(+), 60 deletions(-) diff --git a/po/si.po b/po/si.po index 5bf28e5..d4bb595 100644 --- a/po/si.po +++ b/po/si.po @@ -3803,7 +3803,7 @@ msgstr "අවලංගු ධාවකය.\n" #: winerror.mc:108 msgid "Can't delete current directory.\n" -msgstr "" +msgstr "වත්මන් ඩිරෙක්ටරිය මකන්න බැහැ.\n" #: winerror.mc:113 msgid "Not same device.\n" @@ -3903,7 +3903,7 @@ msgstr "" #: winerror.mc:233 msgid "Bad network path.\n" -msgstr "" +msgstr "හොඳ නැති ජාලය පෙත.\n" #: winerror.mc:238 msgid "Network busy.\n" @@ -4080,9 +4080,8 @@ msgid "Invalid IOCTL.\n" msgstr "අවලංගු IOCTL.\n" #: winerror.mc:458 -#, fuzzy msgid "Invalid verify switch.\n" -msgstr "අවලංගු" +msgstr "අවලංගු verify ස්විචය.\n" #: winerror.mc:463 msgid "Bad driver level.\n" @@ -4553,7 +4552,7 @@ msgstr "අවලංගු සලකුණු.\n" #: winerror.mc:1043 msgid "Unrecognized volume.\n" -msgstr "" +msgstr "හඳුනගත්තු නැති පංගුවක්.\n" #: winerror.mc:1048 msgid "File invalid.\n" @@ -4711,9 +4710,8 @@ msgid "Invalid service lock.\n" msgstr "අවලංගු සේවාව අගුල.\n" #: winerror.mc:1238 -#, fuzzy msgid "Service marked for delete.\n" -msgstr "සේවාව" +msgstr "සේවාව සලකුණු කරලා මැකීමට.\n" #: winerror.mc:1243 msgid "Service exists.\n" @@ -6151,11 +6149,11 @@ msgstr "" #: winerror.mc:3043 msgid "RPC server unavailable.\n" -msgstr "" +msgstr "RPC සේවාදායකය ලද නොහැකි.\n" #: winerror.mc:3048 msgid "RPC server too busy.\n" -msgstr "" +msgstr "RPC සේවාදායකය කාර්යබහුල වැඩි.\n" #: winerror.mc:3053 msgid "Invalid network options.\n" @@ -6211,7 +6209,7 @@ msgstr "" #: winerror.mc:3123 msgid "Unknown authentication type.\n" -msgstr "" +msgstr "දන්නේ නැති සත්‍යාපනය වර්ගයක්.\n" #: winerror.mc:3128 msgid "Maximum calls too low.\n" @@ -6247,7 +6245,7 @@ msgstr "අවලංගු සත්‍යාපන අනන්‍යතාව #: winerror.mc:3168 msgid "Unknown authorization service.\n" -msgstr "" +msgstr "දන්නේ නැති අනුමැතිය සේවාවක්.\n" #: winerror.mc:3173 msgid "Invalid entry.\n" @@ -6799,10 +6797,8 @@ msgid "Object is not initialized.\n" msgstr "වස්තුව ආරම්භනය කරල නැහැ.\n" #: mferror.mc:81 -#, fuzzy -#| msgid "Error: Process self-termination is not permitted.\n" msgid "Representation is not supported.\n" -msgstr "දෝෂය: ක්රියාවලියක් තමංම නතර කරන්න බැහැ.\n" +msgstr "ඉදිරිපත්කිරීම සහාය නොදක්වයි.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" @@ -6865,10 +6861,8 @@ msgid "Unsupported thinning.\n" msgstr "Thinning සහාය නොදක්වයි.\n" #: mferror.mc:207 -#, fuzzy -#| msgid "Another version is installed.\n" msgid "Reversing is not supported.\n" -msgstr "වෙන අනුවාදයක් ස්ථාපන කරලා තියෙනවා.\n" +msgstr "ප්‍රතිවර්තනය කිරීම සහාය නොදක්වයි.\n" #: mferror.mc:214 msgid "Unsupported rate transition.\n" @@ -6941,10 +6935,8 @@ msgid "Attribute is not found.\n" msgstr "උපලක්ෂණය හම්බු උනේ නැහැ.\n" #: mferror.mc:347 -#, fuzzy -#| msgid "Another version is installed.\n" msgid "Property type is not allowed.\n" -msgstr "වෙන අනුවාදයක් ස්ථාපන කරලා තියෙනවා.\n" +msgstr "ගුණාංග වර්ගය අවසර නැහැ.\n" #: mferror.mc:354 msgid "Property type is not supported.\n" @@ -7000,10 +6992,8 @@ msgid "No events available.\n" msgstr "සිද්ධීන් ලද හැකි නැහැ.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Invalid media source state transition\n" msgid "Invalid media source state transition.\n" -msgstr "අවලංගු මාධ්‍ය මූලයේ තත්වය සංක්‍රාන්තිය\n" +msgstr "අවලංගු මාධ්‍ය මූලයේ තත්වය සංක්‍රාන්තිය.\n" #: mferror.mc:452 msgid "End of media stream has been reached.\n" @@ -7020,28 +7010,20 @@ msgid "Media stream has no duration set.\n" msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ\n" #: mferror.mc:473 -#, fuzzy -#| msgid "Media format was recognized but is invalid\n" msgid "Media format was recognized but is invalid.\n" -msgstr "මාධ්‍ය ආකෘතිය හදුනාගන්නවා හැබැයි වලංගු නැහැ\n" +msgstr "මාධ්‍ය ආකෘතිය හදුනාගන්නවා හැබැයි වලංගු නැහැ.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property wasn't found\n" msgid "Property wasn't found.\n" -msgstr "ගුණාංගය හම්බු උනේ නැහැ\n" +msgstr "ගුණාංගය හම්බු උනේ නැහැ.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is read-only\n" msgid "Property is read-only.\n" -msgstr "ගුණාංගය කියවීම් පමණි\n" +msgstr "ගුණාංගය කියවීම් පමණි.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Another version is installed.\n" msgid "Property is not allowed.\n" -msgstr "වෙන අනුවාදයක් ස්ථාපන කරලා තියෙනවා.\n" +msgstr "ගුණාංගය අවසර නැහැ.\n" #: mferror.mc:501 #, fuzzy @@ -7050,26 +7032,20 @@ msgid "Media source is not started.\n" msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported media format\n" msgid "Unsupported media format.\n" -msgstr "මාධ්‍ය ආකෘතිය සහාය නොදක්වයි\n" +msgstr "මාධ්‍ය ආකෘතිය සහාය නොදක්වයි.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Media source is in wrong state\n" msgid "Media source is in wrong state.\n" -msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ\n" +msgstr "මාධ්‍ය මූලය වැරදි තත්වයක ඉන්නේ.\n" #: mferror.mc:522 msgid "No media streams were selected.\n" msgstr "" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported media source characteristics\n" msgid "Unsupported media source characteristics.\n" -msgstr "මාධ්‍ය මූලයේ ගුණාංග සහාය නොදක්වයි\n" +msgstr "මාධ්‍ය මූලයේ ගුණාංග සහාය නොදක්වයි.\n" #: mferror.mc:536 msgid "Optional node is invalid.\n" @@ -7763,7 +7739,7 @@ msgstr "" #: msvfw32.rc:53 msgid "&Data Rate" -msgstr "" +msgstr "දත්ත අනුපාතය (&D)" #: msvfw32.rc:55 msgid "kB/s" @@ -8917,7 +8893,7 @@ msgstr "හංගලා (&I)" #: shell32.rc:372 shell32.rc:409 winefile.rc:175 msgid "&Archive" -msgstr "" +msgstr "සංරක්ෂිතය (&A)" #: shell32.rc:386 msgid "Open with:" @@ -11872,7 +11848,7 @@ msgstr "අපේක්ෂා කරේ මෙහෙයුම්කාරකය #: cmd.rc:408 msgid "Mismatch in parentheses.\n" -msgstr "" +msgstr "වරහන් ගැලපෙන්නේ නැහැ.\n" #: cmd.rc:409 msgid "" @@ -12142,7 +12118,7 @@ msgstr "තත්වය" #: netstat.rc:35 msgid "Interface Statistics" -msgstr "" +msgstr "අතුරුමුහුණත සංඛ්‍යාලේඛන" #: netstat.rc:36 msgid "Sent" @@ -12573,11 +12549,11 @@ msgstr "පද්ධති සිටුවම්" #: oleview.rc:171 msgid "&Enable Distributed COM" -msgstr "" +msgstr "DCOM සබල කරන්න (&E)" #: oleview.rc:172 msgid "Enable &Remote Connections (Win95 only)" -msgstr "" +msgstr "දුරස්ථ සබැඳුම් සබල කරන්න (Win95 විතරක්)" #: oleview.rc:173 msgid "" @@ -12860,7 +12836,7 @@ msgstr "ක්‍රමලේඛ කළමනාකාරකය ගැන (&A)" #: progman.rc:103 msgid "Program &group" -msgstr "" +msgstr "ක්‍රමලේඛ සමූහය (&G)" #: progman.rc:105 msgid "&Program" @@ -12896,7 +12872,7 @@ msgstr "" #: progman.rc:156 msgid "&Group file:" -msgstr "" +msgstr "සමූහය ගොනුව (&G):" #: progman.rc:168 msgid "Program Attributes" @@ -13156,7 +13132,7 @@ msgstr "reg: රෙජිස්තරයේ යතුර '%1' අරින්න #: reg.rc:69 msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "reg: හඳුනගත්තු නැති escape sequence එකක් [\\%1!c!]\n" #: reg.rc:70 msgid "REG EXPORT key_name file.reg [/y]\n" @@ -13168,7 +13144,7 @@ msgstr "reg: අවලංගු පද්ධතිය යතුර [%1]\n" #: reg.rc:72 msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "" +msgstr "'%1' ගොනුව දැනටමත් තියෙනවා. ඔබට ඒක උඩින් ලියන්න ඕනෙද?" #: regedit.rc:34 msgid "&Registry" @@ -13488,7 +13464,7 @@ msgstr "" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" -msgstr "regedit: අවලංගු හෝ දන්නෙ නැති ස්විචයක් [%1]\n" +msgstr "regedit: අවලංගු හෝ හඳුනගත්තු නැති ස්විචයක් [%1]\n" #: regedit.rc:410 msgid "Type \"regedit /?\" for help.\n" @@ -13530,7 +13506,7 @@ msgstr "" #: regedit.rc:419 msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "" +msgstr "regedit: හඳුනගත්තු නැති escape sequence එකක් [\\%1!c!]\n" #: regedit.rc:420 msgid "regedit: Unsupported registry data type [0x%1!x!]\n" @@ -13772,7 +13748,7 @@ msgid "" "regsvr32: Invalid or unrecognized switch [%1]\n" "\n" msgstr "" -"regsvr32: අවලංගු හෝ දන්නේ නැති ස්විචය [%1]\n" +"regsvr32: අවලංගු හෝ හඳුනගත්තු නැති ස්විචය [%1]\n" "\n" #: regsvr32.rc:42 @@ -15518,7 +15494,7 @@ msgstr "wineconsole: අවලංගු බැකන්ඩ් එකක්\n" #: wineconsole.rc:46 msgid "wineconsole: Unrecognized command line option\n" -msgstr "wineconsole: දන්නෙ නැති විධාන රේඛා විකල්පය\n" +msgstr "wineconsole: හඳුනගත්තු නැති විධාන රේඛා විකල්පය\n" #: wineconsole.rc:47 msgid "Starts a program in a Wine console\n" @@ -16062,7 +16038,7 @@ msgstr "අනුලකුණ ආකෘතිය (&F)" #: wordpad.rc:64 msgid "&Def. char format" -msgstr "" +msgstr "පෙරනිමි අනුලකුණ ආකෘතිය (&D)" #: wordpad.rc:65 msgid "Paragrap&h format" @@ -16186,7 +16162,7 @@ msgstr "පෙළ ගැසුම" #: wordpad.rc:250 msgid "Tabs" -msgstr "" +msgstr "ටැබ" #: wordpad.rc:253 msgid "Tab stops" @@ -16434,6 +16410,9 @@ msgid "" "on the target?\n" "(F - File, D - Directory)\n" msgstr "" +"'%1' කියන්නේ ගොනුවක නමක් හෝ ඩිරෙක්ටරියක් ද\n" +"ඉලක්කය උඩ?\n" +"(F - ගොනුවක්, D - ඩිරෙක්ටරියක්)\n" #: xcopy.rc:38 msgid "%1? (Yes|No)\n"

1 0

Józef Kucia : winevulkan: Enable VK_AMD_memory_overallocation_behavior.
by Alexandre Julliard April 10, 2019

April 10, 2019

Module: wine Branch: master Commit: abc83d1b3447e731f01f144d88c5d919efcab8ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=abc83d1b3447e731f01f144d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 10 11:59:51 2019 +0200 winevulkan: Enable VK_AMD_memory_overallocation_behavior. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 1 - dlls/winevulkan/vulkan_thunks.c | 17 +++++++++++++++++ include/wine/vulkan.h | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index af37657..46294f7 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -101,7 +101,6 @@ BLACKLISTED_EXTENSIONS = [ # Device extensions "VK_AMD_display_native_hdr", "VK_EXT_calibrated_timestamps", - "VK_AMD_memory_overallocation_behavior", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter "VK_EXT_external_memory_host", "VK_EXT_full_screen_exclusive", diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fc41fb0..9919642 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1828,6 +1828,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD: + { + const VkDeviceMemoryOverallocationCreateInfoAMD *in = (const VkDeviceMemoryOverallocationCreateInfoAMD *)in_header; + VkDeviceMemoryOverallocationCreateInfoAMD *out; + + if (!(out = heap_alloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->overallocationBehavior = in->overallocationBehavior; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT: { const VkPhysicalDeviceFragmentDensityMapFeaturesEXT *in = (const VkPhysicalDeviceFragmentDensityMapFeaturesEXT *)in_header; @@ -4225,6 +4241,7 @@ static const char * const vk_device_extensions[] = "VK_AMD_gcn_shader", "VK_AMD_gpu_shader_half_float", "VK_AMD_gpu_shader_int16", + "VK_AMD_memory_overallocation_behavior", "VK_AMD_mixed_attachment_samples", "VK_AMD_negative_viewport_height", "VK_AMD_rasterization_order", diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 2a86277..5a48441 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -260,6 +260,8 @@ #define VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME "VK_KHR_shader_atomic_int64" #define VK_AMD_SHADER_CORE_PROPERTIES_SPEC_VERSION 1 #define VK_AMD_SHADER_CORE_PROPERTIES_EXTENSION_NAME "VK_AMD_shader_core_properties" +#define VK_AMD_MEMORY_OVERALLOCATION_BEHAVIOR_SPEC_VERSION 1 +#define VK_AMD_MEMORY_OVERALLOCATION_BEHAVIOR_EXTENSION_NAME "VK_AMD_memory_overallocation_behavior" #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_SPEC_VERSION 3 #define VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME "VK_EXT_vertex_attribute_divisor" #define VK_KHR_DRIVER_PROPERTIES_SPEC_VERSION 1 @@ -1445,6 +1447,14 @@ typedef enum VkMemoryHeapFlagBits VK_MEMORY_HEAP_FLAG_BITS_MAX_ENUM = 0x7fffffff, } VkMemoryHeapFlagBits; +typedef enum VkMemoryOverallocationBehaviorAMD +{ + VK_MEMORY_OVERALLOCATION_BEHAVIOR_DEFAULT_AMD = 0, + VK_MEMORY_OVERALLOCATION_BEHAVIOR_ALLOWED_AMD = 1, + VK_MEMORY_OVERALLOCATION_BEHAVIOR_DISALLOWED_AMD = 2, + VK_MEMORY_OVERALLOCATION_BEHAVIOR_AMD_MAX_ENUM = 0x7fffffff, +} VkMemoryOverallocationBehaviorAMD; + typedef enum VkMemoryPropertyFlagBits { VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT = 0x00000001, @@ -2067,6 +2077,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES_KHR = 1000177000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES_KHR = 1000180000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_PROPERTIES_AMD = 1000185000, + VK_STRUCTURE_TYPE_DEVICE_MEMORY_OVERALLOCATION_CREATE_INFO_AMD = 1000189000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_EXT = 1000190000, VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT = 1000190001, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT = 1000190002, @@ -2429,6 +2440,13 @@ typedef struct VkDeviceGroupPresentInfoKHR VkDeviceGroupPresentModeFlagBitsKHR mode; } VkDeviceGroupPresentInfoKHR; +typedef struct VkDeviceMemoryOverallocationCreateInfoAMD +{ + VkStructureType sType; + const void *pNext; + VkMemoryOverallocationBehaviorAMD overallocationBehavior; +} VkDeviceMemoryOverallocationCreateInfoAMD; + typedef struct VkDeviceQueueGlobalPriorityCreateInfoEXT { VkStructureType sType;

1 0