March 2018 - Wine-Commits - list.winehq.org

Roderick Colenbrander : winevulkan: Implement VK_KHR_get_physical_device_properties2.
by Alexandre Julliard March 15, 2018

March 15, 2018

Module: wine Branch: master Commit: 79c2ee529b530fa49fae0d3ded4d4d3d6e09d7b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79c2ee529b530fa49fae0d3d… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 23:39:38 2018 -0700 winevulkan: Implement VK_KHR_get_physical_device_properties2. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> 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 | 133 ++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 49 +++++- include/wine/vulkan.h | 377 ++++++++++++++++++++++++---------------- 4 files changed, 414 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79c2ee529b530fa49fae…

1 0

Michael Müller : api-ms-win-shcore-thread-l1-1-0: Add dll.
by Alexandre Julliard March 15, 2018

March 15, 2018

Module: wine Branch: master Commit: 627b86d56651255c6156b73d15ce2453b457f3f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=627b86d56651255c6156b73d… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 15 01:33:58 2018 +0000 api-ms-win-shcore-thread-l1-1-0: Add dll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in | 1 + .../api-ms-win-shcore-thread-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 1 + 5 files changed, 13 insertions(+) diff --git a/configure b/configure index 856a0bb..672d576 100755 --- a/configure +++ b/configure @@ -1095,6 +1095,7 @@ enable_api_ms_win_service_winsvc_l1_1_0 enable_api_ms_win_service_winsvc_l1_2_0 enable_api_ms_win_shcore_obsolete_l1_1_0 enable_api_ms_win_shcore_scaling_l1_1_1 +enable_api_ms_win_shcore_thread_l1_1_0 enable_api_ms_win_shell_shellcom_l1_1_0 enable_api_ms_win_shell_shellfolders_l1_1_0 enable_apphelp @@ -18398,6 +18399,7 @@ wine_fn_config_makefile dlls/api-ms-win-service-winsvc-l1-1-0 enable_api_ms_win_ wine_fn_config_makefile dlls/api-ms-win-service-winsvc-l1-2-0 enable_api_ms_win_service_winsvc_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-shcore-obsolete-l1-1-0 enable_api_ms_win_shcore_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shcore-scaling-l1-1-1 enable_api_ms_win_shcore_scaling_l1_1_1 +wine_fn_config_makefile dlls/api-ms-win-shcore-thread-l1-1-0 enable_api_ms_win_shcore_thread_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shell-shellcom-l1-1-0 enable_api_ms_win_shell_shellcom_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-shell-shellfolders-l1-1-0 enable_api_ms_win_shell_shellfolders_l1_1_0 wine_fn_config_makefile dlls/apphelp enable_apphelp diff --git a/configure.ac b/configure.ac index 010e2db..dcb8672 100644 --- a/configure.ac +++ b/configure.ac @@ -3027,6 +3027,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-scaling-l1-1-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-thread-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellcom-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellfolders-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/apphelp) diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in new file mode 100644 index 0000000..0a20ccf --- /dev/null +++ b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-thread-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec new file mode 100644 index 0000000..1533005 --- /dev/null +++ b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stub GetProcessReference +@ stdcall SHCreateThread(ptr ptr long ptr) shcore.SHCreateThread +@ stdcall SHCreateThreadRef(ptr ptr) shcore.SHCreateThreadRef +@ stub SHCreateThreadWithHandle +@ stdcall SHGetThreadRef(ptr) shcore.SHGetThreadRef +@ stdcall SHReleaseThreadRef() shcore.SHReleaseThreadRef +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef +@ stub SetProcessReference diff --git a/tools/make_specfiles b/tools/make_specfiles index f8cc99d..e26d8e3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -354,6 +354,7 @@ my @dll_groups = [ "shcore", "api-ms-win-shcore-obsolete-l1-1-0", + "api-ms-win-shcore-thread-l1-1-0", ], [ "user32",

1 0

Michael Stefaniuc : dmime/tests: Add an invalid stream test.
by Alexandre Julliard March 15, 2018

March 15, 2018

Module: wine Branch: master Commit: a783d2a39768b3e62da0470c8280d65e413312d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a783d2a39768b3e62da0470c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Mar 15 00:09:33 2018 +0100 dmime/tests: Add an invalid stream test. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index b0db27a..9dd0052 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -723,6 +723,7 @@ static void test_parsedescriptor(void) }; FOURCC empty[] = {FOURCC_RIFF, ~0, 0}; FOURCC inam[] = {FOURCC_RIFF, ~0, FOURCC_LIST, ~0, mmioFOURCC('I','N','A','M'), 0, 0}; + FOURCC noriff[] = {mmioFOURCC('J','U','N','K'), 0}; #define X(class) &CLSID_ ## class, #class #define Y(form) form, #form const struct { @@ -808,6 +809,19 @@ static void test_parsedescriptor(void) ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); IStream_Release(stream); + /* Not a RIFF stream */ + stream = gen_riff_stream(noriff); + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + if (forms[i].needs_size) + ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + else + ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); + ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + IStream_Release(stream); + /* All desc chunks */ alldesc[1] = forms[i].form; stream = gen_riff_stream(alldesc);

1 0

Roderick Colenbrander : winevulkan: Support various device extensions.
by Alexandre Julliard March 15, 2018

March 15, 2018

Module: wine Branch: master Commit: 3fcec7cf7853bb60267bee324d0ef8a22eb5edf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fcec7cf7853bb60267bee32… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 23:39:40 2018 -0700 winevulkan: Support various device extensions. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 49 ++++++- dlls/winevulkan/vulkan_thunks.c | 313 ++++++++++++++++++++++++++++------------ dlls/winevulkan/vulkan_thunks.h | 98 +++++++++---- include/wine/vulkan.h | 81 +++++++++++ 4 files changed, 419 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3fcec7cf7853bb60267b…

1 0

Michael Müller : api-ms-win-rtcore-ntuser-draw-l1-1-0 : Add dll.
by Alexandre Julliard March 15, 2018

March 15, 2018

Module: wine Branch: master Commit: 88a96bbd57247b86e80538e0b7d7f40cde5ec5b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88a96bbd57247b86e80538e0… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 15 01:34:01 2018 +0000 api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in | 1 + .../api-ms-win-rtcore-ntuser-draw-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index ca56e97..297d5ab 100755 --- a/configure +++ b/configure @@ -1065,6 +1065,7 @@ enable_api_ms_win_ntuser_rectangle_l1_1_0 enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 +enable_api_ms_win_rtcore_ntuser_draw_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_4 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 @@ -18370,6 +18371,7 @@ wine_fn_config_makefile dlls/api-ms-win-ntuser-rectangle-l1-1-0 enable_api_ms_wi wine_fn_config_makefile dlls/api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_perf_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 +wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0 enable_api_ms_win_rtcore_ntuser_draw_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-private-l1-1-4 enable_api_ms_win_rtcore_ntuser_private_l1_1_4 wine_fn_config_makefile dlls/api-ms-win-rtcore-ntuser-window-l1-1-0 enable_api_ms_win_rtcore_ntuser_window_l1_1_0 diff --git a/configure.ac b/configure.ac index b320f3a..51a3a79 100644 --- a/configure.ac +++ b/configure.ac @@ -2997,6 +2997,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-rectangle-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-4) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in new file mode 100644 index 0000000..956f2f3 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-draw-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec new file mode 100644 index 0000000..59900a9 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall RedrawWindow(long ptr long long) user32.RedrawWindow diff --git a/tools/make_specfiles b/tools/make_specfiles index a6156c4..44023aa 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -363,6 +363,7 @@ my @dll_groups = "api-ms-win-core-string-l2-1-0", "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", + "api-ms-win-rtcore-ntuser-draw-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-4", "api-ms-win-rtcore-ntuser-window-l1-1-0",

1 0

Roderick Colenbrander : winevulkan: Implement vkQueueSubmit.
by Alexandre Julliard March 15, 2018

March 15, 2018

Module: wine Branch: master Commit: 6536dec397ff37e424772af876211c3555049e91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6536dec397ff37e424772af8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 23:39:34 2018 -0700 winevulkan: Implement vkQueueSubmit. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> 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.c | 56 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 6 ----- dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 58 insertions(+), 6 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5c5f38f..af2b369 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -117,6 +117,7 @@ FUNCTION_OVERRIDES = { "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetDeviceProcAddr" : {"dispatch" : True, "driver" : True, "thunk" : False}, "vkGetDeviceQueue" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkQueueSubmit" : {"dispatch": True, "driver" : False, "thunk" : False}, # VK_KHR_surface "vkDestroySurfaceKHR" : {"dispatch" : True, "driver" : True, "thunk" : False}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 0a5a77d..08a957b 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -968,6 +968,62 @@ VkResult WINAPI wine_vk_icdNegotiateLoaderICDInterfaceVersion(uint32_t *supporte return VK_SUCCESS; } +VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, + const VkSubmitInfo *submits, VkFence fence) +{ + VkSubmitInfo *submits_host; + VkResult res; + VkCommandBuffer *command_buffers; + unsigned int i, j, num_command_buffers; + + TRACE("%p %u %p 0x%s\n", queue, count, submits, wine_dbgstr_longlong(fence)); + + if (count == 0) + { + return queue->device->funcs.p_vkQueueSubmit(queue->queue, 0, NULL, fence); + } + + submits_host = heap_calloc(count, sizeof(*submits_host)); + if (!submits_host) + { + ERR("Unable to allocate memory for submit buffers!\n"); + return VK_ERROR_OUT_OF_HOST_MEMORY; + } + + for (i = 0; i < count; i++) + { + memcpy(&submits_host[i], &submits[i], sizeof(*submits_host)); + + num_command_buffers = submits[i].commandBufferCount; + command_buffers = heap_calloc(num_command_buffers, sizeof(*submits_host)); + if (!command_buffers) + { + ERR("Unable to allocate memory for comman buffers!\n"); + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + for (j = 0; j < num_command_buffers; j++) + { + command_buffers[j] = submits[i].pCommandBuffers[j]->command_buffer; + } + submits_host[i].pCommandBuffers = command_buffers; + } + + res = queue->device->funcs.p_vkQueueSubmit(queue->queue, count, submits_host, fence); + +err: + for (i = 0; i < count; i++) + { + heap_free((void *)submits_host[i].pCommandBuffers); + } + heap_free(submits_host); + + TRACE("Returning %d\n", res); + return res; +} + + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { switch (reason) diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index f1be25e..285c7cb 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1641,12 +1641,6 @@ static VkResult WINAPI wine_vkQueueBindSparse(VkQueue queue, uint32_t bindInfoCo return VK_ERROR_OUT_OF_HOST_MEMORY; } -static VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence) -{ - FIXME("stub: %p, %u, %p, 0x%s\n", queue, submitCount, pSubmits, wine_dbgstr_longlong(fence)); - return VK_ERROR_OUT_OF_HOST_MEMORY; -} - static VkResult WINAPI wine_vkQueueWaitIdle(VkQueue queue) { FIXME("stub: %p\n", queue); diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 951945d..ae95e93 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -37,6 +37,7 @@ VkResult WINAPI wine_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice physi VkBool32 WINAPI wine_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice physicalDevice, uint32_t queueFamilyIndex) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swapchain, uint32_t *pSwapchainImageCount, VkImage *pSwapchainImages) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *pPresentInfo) DECLSPEC_HIDDEN; +VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence) DECLSPEC_HIDDEN; typedef struct VkCommandBufferAllocateInfo_host {

1 0

Roderick Colenbrander : winevulkan: Implement vkQueuePresentInfoKHR.
by Alexandre Julliard March 15, 2018

March 15, 2018

Module: wine Branch: master Commit: fc0af22d9aad6de53f06b37568b985616da4207f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc0af22d9aad6de53f06b375… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 14 23:39:35 2018 -0700 winevulkan: Implement vkQueuePresentInfoKHR. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 08a957b..8547531 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -933,8 +933,8 @@ VkResult WINAPI wine_vkGetSwapchainImagesKHR(VkDevice device, VkSwapchainKHR swa VkResult WINAPI wine_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *present_info) { - FIXME("stub: %p, %p\n", queue, present_info); - return VK_ERROR_OUT_OF_HOST_MEMORY; + TRACE("%p, %p\n", queue, present_info); + return vk_funcs->p_vkQueuePresentKHR(queue->queue, present_info); } void * WINAPI wine_vk_icdGetInstanceProcAddr(VkInstance instance, const char *name)

1 0

Francois Gouget : testbot: Tweak the placement of the package POD documentation.
by Alexandre Julliard March 15, 2018

March 15, 2018

Module: tools Branch: master Commit: 8fa90163af7a8dd7f6e7fcdbf3299c3ec7e84a9f URL: https://source.winehq.org/git/tools.git/?a=commit;h=8fa90163af7a8dd7f6e7fcd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 15 01:18:25 2018 +0100 testbot: Tweak the placement of the package POD documentation. Alway put it right after the package statement. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 4 ++-- testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/FormPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/FreeFormPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/ItemPage.pm | 4 ++-- testbot/lib/ObjectModel/CGI/Page.pm | 4 ++-- testbot/lib/WineTestBot/CGI/PageBase.pm | 4 ++-- testbot/lib/WineTestBot/CGI/Sessions.pm | 15 +++++++++++---- testbot/lib/WineTestBot/Engine/Events.pm | 4 ++-- testbot/lib/WineTestBot/Engine/Notify.pm | 4 ++-- 11 files changed, 31 insertions(+), 24 deletions(-) diff --git a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm index fd19794..4c3382c 100644 --- a/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm +++ b/testbot/lib/ObjectModel/BasicPropertyDescriptor.pm @@ -18,6 +18,8 @@ use strict; +package ObjectModel::BasicPropertyDescriptor; + =head1 NAME ObjectModel::BasicPropertyDescriptor - Defines a basic property @@ -28,8 +30,6 @@ This handles the boolean, a number and string columns. =cut -package ObjectModel::BasicPropertyDescriptor; - use ObjectModel::PropertyDescriptor; use vars qw(@ISA @EXPORT); diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm index f890315..3dd8154 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm @@ -19,14 +19,14 @@ use strict; +package ObjectModel::CGI::CollectionBlockForPage; + =head1 NAME ObjectModel::CGI::CollectionBlockForPage - Collection block for list pages =cut -package ObjectModel::CGI::CollectionBlockForPage; - use ObjectModel::CGI::CollectionBlock; use vars qw(@ISA @EXPORT); diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 11f0300..e45b2a4 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -19,14 +19,14 @@ use strict; +package ObjectModel::CGI::CollectionPage; + =head1 NAME ObjectModel::CGI::CollectionPage - Base class for list pages =cut -package ObjectModel::CGI::CollectionPage; - use ObjectModel::CGI::CollectionBlockForPage; use ObjectModel::CGI::Page; diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 7489f83..7669067 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -20,14 +20,14 @@ use strict; +package ObjectModel::CGI::FormPage; + =head1 NAME ObjectModel::CGI::FormPage - Base class for web forms =cut -package ObjectModel::CGI::FormPage; - use ObjectModel::CGI::Page; use vars qw(@ISA @EXPORT); diff --git a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm index 607fd7b..7af04c4 100644 --- a/testbot/lib/ObjectModel/CGI/FreeFormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FreeFormPage.pm @@ -19,14 +19,14 @@ use strict; +package ObjectModel::CGI::FreeFormPage; + =head1 NAME ObjectModel::CGI::FreeFormPage - Base class for unbound web forms =cut -package ObjectModel::CGI::FreeFormPage; - use ObjectModel::CGI::FormPage; use vars qw(@ISA @EXPORT); diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index a07f02b..74ce14e 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -20,14 +20,14 @@ use strict; +package ObjectModel::CGI::ItemPage; + =head1 NAME ObjectModel::CGI::ItemPage - Base class for bound web forms =cut -package ObjectModel::CGI::ItemPage; - use URI::Escape; use ObjectModel::CGI::FormPage; diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index 50598bf..ff7e848 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -19,14 +19,14 @@ use strict; +package ObjectModel::CGI::Page; + =head1 NAME ObjectModel::CGI::Page - Base class for web pages =cut -package ObjectModel::CGI::Page; - use CGI; use vars qw(@ISA @EXPORT $PageBaseCreator); diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 1490090..fa383c5 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -20,14 +20,14 @@ use strict; +package WineTestBot::CGI::PageBase; + =head1 NAME WineTestBot::CGI::PageBase - Base class for web pages =cut -package WineTestBot::CGI::PageBase; - use Apache2::Const -compile => qw(REDIRECT); use Apache2::ServerRec; use CGI::Cookie; diff --git a/testbot/lib/WineTestBot/CGI/Sessions.pm b/testbot/lib/WineTestBot/CGI/Sessions.pm index f9f791d..4b1f6b3 100644 --- a/testbot/lib/WineTestBot/CGI/Sessions.pm +++ b/testbot/lib/WineTestBot/CGI/Sessions.pm @@ -19,14 +19,14 @@ use strict; -=head1 NAME -WineTestBot::CGI::Sessions - Session collection +package WineTestBot::CGI::Session; -=cut +=head1 NAME +WineTestBot::CGI::Session - A web user's session -package WineTestBot::CGI::Session; +=cut use WineTestBot::Utils; use WineTestBot::WineTestBotObjects; @@ -44,8 +44,15 @@ sub InitializeNew($$) $self->Permanent(!1); } + package WineTestBot::CGI::Sessions; +=head1 NAME + +WineTestBot::CGI::Sessions - A Session collection + +=cut + use CGI::Cookie; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Engine/Events.pm b/testbot/lib/WineTestBot/Engine/Events.pm index 36895f4..c3ebe9b 100644 --- a/testbot/lib/WineTestBot/Engine/Events.pm +++ b/testbot/lib/WineTestBot/Engine/Events.pm @@ -19,14 +19,14 @@ use strict; +package WineTestBot::Engine::Events; + =head1 NAME WineTestBot::Engine::Events - Engine events =cut -package WineTestBot::Engine::Events; - use vars qw (@ISA @EXPORT); require Exporter; diff --git a/testbot/lib/WineTestBot/Engine/Notify.pm b/testbot/lib/WineTestBot/Engine/Notify.pm index 5ae6634..c277f7a 100644 --- a/testbot/lib/WineTestBot/Engine/Notify.pm +++ b/testbot/lib/WineTestBot/Engine/Notify.pm @@ -19,14 +19,14 @@ use strict; +package WineTestBot::Engine::Notify; + =head1 NAME WineTestBot::Engine::Notify - Engine notification =cut -package WineTestBot::Engine::Notify; - use Socket; use WineTestBot::Config;

1 0

David Adam : d3dx9: Improve vertices computation in D3DXCreatePolygon().
by Alexandre Julliard March 14, 2018

March 14, 2018

Module: wine Branch: master Commit: 32ffef33339206195919023bcff112465478ad74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32ffef33339206195919023b… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Mar 14 19:53:17 2018 +0100 d3dx9: Improve vertices computation in D3DXCreatePolygon(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 10 ++++++---- dlls/d3dx9_36/tests/mesh.c | 11 +++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index fc23745..62acd21 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -4565,7 +4565,7 @@ HRESULT WINAPI D3DXCreatePolygon(struct IDirect3DDevice9 *device, float length, struct vertex *vertices; WORD (*faces)[3]; DWORD (*adjacency_buf)[3]; - float scale; + float angle, scale; unsigned int i; TRACE("device %p, length %f, sides %u, mesh %p, adjacency %p.\n", @@ -4593,7 +4593,9 @@ HRESULT WINAPI D3DXCreatePolygon(struct IDirect3DDevice9 *device, float length, return hr; } - scale = 0.5f * length / sinf(D3DX_PI / sides); + angle = D3DX_PI / sides; + scale = 0.5f * length / sinf(angle); + angle *= 2.0f; vertices[0].position.x = 0.0f; vertices[0].position.y = 0.0f; @@ -4604,8 +4606,8 @@ HRESULT WINAPI D3DXCreatePolygon(struct IDirect3DDevice9 *device, float length, for (i = 0; i < sides; ++i) { - vertices[i + 1].position.x = cosf(2.0f * D3DX_PI * i / sides) * scale; - vertices[i + 1].position.y = sinf(2.0f * D3DX_PI * i / sides) * scale; + vertices[i + 1].position.x = cosf(angle * i) * scale; + vertices[i + 1].position.y = sinf(angle * i) * scale; vertices[i + 1].position.z = 0.0f; vertices[i + 1].normal.x = 0.0f; vertices[i + 1].normal.y = 0.0f; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 82ae90e..8fd5938 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2683,12 +2683,14 @@ static void D3DXCreateBoxTest(void) static BOOL compute_polygon(struct mesh *mesh, float length, unsigned int sides) { unsigned int i; - float scale; + float angle, scale; if (!new_mesh(mesh, sides + 1, sides)) return FALSE; - scale = 0.5f * length / sinf(D3DX_PI / sides); + angle = D3DX_PI / sides; + scale = 0.5f * length / sinf(angle); + angle *= 2.0f; mesh->vertices[0].position.x = 0.0f; mesh->vertices[0].position.y = 0.0f; @@ -2699,8 +2701,8 @@ static BOOL compute_polygon(struct mesh *mesh, float length, unsigned int sides) for (i = 0; i < sides; ++i) { - mesh->vertices[i + 1].position.x = cosf(2.0f * D3DX_PI * i / sides) * scale; - mesh->vertices[i + 1].position.y = sinf(2.0f * D3DX_PI * i / sides) * scale; + mesh->vertices[i + 1].position.x = cosf(angle * i) * scale; + mesh->vertices[i + 1].position.y = sinf(angle * i) * scale; mesh->vertices[i + 1].position.z = 0.0f; mesh->vertices[i + 1].normal.x = 0.0f; mesh->vertices[i + 1].normal.y = 0.0f; @@ -2807,6 +2809,7 @@ static void D3DXCreatePolygonTest(void) test_polygon(device, 10.0f, 5); test_polygon(device, 10.0f, 10); test_polygon(device, 20.0f, 10); + test_polygon(device, 20.0f, 32000); free_test_context(test_context); }

1 0

Piotr Caban : ntdll: Change module load order so it matches InLoadOrderModuleList.
by Alexandre Julliard March 14, 2018

March 14, 2018

Module: wine Branch: master Commit: 47da086af9d41ed96aa917c90f5cde5d7a3a2e36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47da086af9d41ed96aa917c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 14 14:47:25 2018 +0100 ntdll: Change module load order so it matches InLoadOrderModuleList. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7140645..fe5ce9d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -89,6 +89,7 @@ typedef struct _wine_modref LDR_MODULE ldr; dev_t dev; ino_t ino; + int alloc_deps; int nDeps; struct _wine_modref **deps; } WINE_MODREF; @@ -483,15 +484,16 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!imports_fixup_done && current_modref) { WINE_MODREF **deps; - if (current_modref->nDeps) + if (current_modref->alloc_deps) deps = RtlReAllocateHeap( GetProcessHeap(), 0, current_modref->deps, - (current_modref->nDeps + 1) * sizeof(*deps) ); + (current_modref->alloc_deps + 1) * sizeof(*deps) ); else deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*deps) ); if (deps) { deps[current_modref->nDeps++] = wm; current_modref->deps = deps; + current_modref->alloc_deps++; } } else if (process_attach( wm, NULL ) != STATUS_SUCCESS) @@ -936,6 +938,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * wm->ldr.Flags &= ~LDR_DONT_RESOLVE_REFS; wm->nDeps = 1; + wm->alloc_deps = 1; wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(WINE_MODREF *) ); prev = current_modref; @@ -968,7 +971,7 @@ static NTSTATUS fixup_imports_ilonly( WINE_MODREF *wm, LPCWSTR load_path, void * */ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) { - int i, nb_imports; + int i, dep, nb_imports; const IMAGE_IMPORT_DESCRIPTOR *imports; WINE_MODREF *prev, *imp; DWORD size; @@ -993,7 +996,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); /* Allocate module dependency list */ - wm->nDeps = nb_imports; + wm->alloc_deps = nb_imports; wm->deps = RtlAllocateHeap( GetProcessHeap(), 0, nb_imports*sizeof(WINE_MODREF *) ); /* load the imported modules. They are automatically @@ -1004,12 +1007,14 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) status = STATUS_SUCCESS; for (i = 0; i < nb_imports; i++) { + dep = wm->nDeps++; + if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &imp )) { imp = NULL; status = STATUS_DLL_NOT_FOUND; } - wm->deps[i] = imp; + wm->deps[dep] = imp; } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0