wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Matteo Bruni : wined3d: Handle blits to Vulkan swapchains not matching the D3D swapchain.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: b9eb1a932748048d7cc7f846edd34eaf379925b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9eb1a932748048d7cc7f846… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 17 13:35:19 2021 +0100 wined3d: Handle blits to Vulkan swapchains not matching the D3D swapchain. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50119 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cb45e91b24b923f589af00a551a58569f9cfb636) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/swapchain.c | 72 ++++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 180f724b5cb..6c353ec7210 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -998,6 +998,9 @@ static HRESULT wined3d_swapchain_vk_create_vulkan_swapchain(struct wined3d_swapc goto fail; } + swapchain_vk->width = width; + swapchain_vk->height = height; + return WINED3D_OK; fail: @@ -1031,7 +1034,7 @@ static void wined3d_swapchain_vk_set_swap_interval(struct wined3d_swapchain_vk * wined3d_swapchain_vk_recreate(swapchain_vk); } -static void wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain_vk, +static VkResult wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain_vk, struct wined3d_context_vk *context_vk, const RECT *src_rect, const RECT *dst_rect, unsigned int swap_interval) { struct wined3d_texture_vk *back_buffer_vk = wined3d_texture_vk(swapchain_vk->s.back_buffers[0]); @@ -1043,34 +1046,36 @@ static void wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain_vk, unsigned int present_idx; VkImageLayout vk_layout; uint32_t image_idx; + RECT dst_rect_tmp; VkImageBlit blit; + VkFilter filter; VkResult vr; - HRESULT hr; static const VkPipelineStageFlags wait_stage = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; + TRACE("swapchain_vk %p, context_vk %p, src_rect %s, dst_rect %s, swap_interval %u.\n", + swapchain_vk, context_vk, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), swap_interval); + wined3d_swapchain_vk_set_swap_interval(swapchain_vk, swap_interval); present_idx = swapchain_vk->current++ % swapchain_vk->image_count; wined3d_context_vk_wait_command_buffer(context_vk, swapchain_vk->vk_semaphores[present_idx].command_buffer_id); - vr = VK_CALL(vkAcquireNextImageKHR(device_vk->vk_device, swapchain_vk->vk_swapchain, UINT64_MAX, - swapchain_vk->vk_semaphores[present_idx].available, VK_NULL_HANDLE, &image_idx)); - if (vr == VK_ERROR_OUT_OF_DATE_KHR) - { - if (FAILED(hr = wined3d_swapchain_vk_recreate(swapchain_vk))) - { - ERR("Failed to recreate swapchain, hr %#x.\n", hr); - return; - } - vr = VK_CALL(vkAcquireNextImageKHR(device_vk->vk_device, swapchain_vk->vk_swapchain, UINT64_MAX, - swapchain_vk->vk_semaphores[present_idx].available, VK_NULL_HANDLE, &image_idx)); - } - if (vr < 0) - { - ERR("Failed to acquire next Vulkan image, vr %s.\n", wined3d_debug_vkresult(vr)); - return; - } - + if ((vr = VK_CALL(vkAcquireNextImageKHR(device_vk->vk_device, swapchain_vk->vk_swapchain, UINT64_MAX, + swapchain_vk->vk_semaphores[present_idx].available, VK_NULL_HANDLE, &image_idx))) < 0) + return vr; + + if (dst_rect->right > swapchain_vk->width || dst_rect->bottom > swapchain_vk->height) + { + dst_rect_tmp = *dst_rect; + if (dst_rect->right > swapchain_vk->width) + dst_rect_tmp.right = swapchain_vk->width; + if (dst_rect->bottom > swapchain_vk->height) + dst_rect_tmp.bottom = swapchain_vk->height; + dst_rect = &dst_rect_tmp; + } + filter = src_rect->right - src_rect->left != dst_rect->right - dst_rect->left + || src_rect->bottom - src_rect->top != dst_rect->bottom - dst_rect->top + ? VK_FILTER_LINEAR : VK_FILTER_NEAREST; vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk); wined3d_context_vk_end_current_render_pass(context_vk); @@ -1108,7 +1113,7 @@ static void wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain_vk, VK_CALL(vkCmdBlitImage(vk_command_buffer, back_buffer_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, swapchain_vk->vk_images[image_idx], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, &blit, VK_FILTER_NEAREST)); + 1, &blit, filter)); wined3d_context_vk_reference_texture(context_vk, back_buffer_vk); wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, @@ -1142,8 +1147,7 @@ static void wined3d_swapchain_vk_blit(struct wined3d_swapchain_vk *swapchain_vk, present_desc.pSwapchains = &swapchain_vk->vk_swapchain; present_desc.pImageIndices = &image_idx; present_desc.pResults = NULL; - if ((vr = VK_CALL(vkQueuePresentKHR(device_vk->vk_queue, &present_desc)))) - ERR("Present returned vr %s.\n", wined3d_debug_vkresult(vr)); + return VK_CALL(vkQueuePresentKHR(device_vk->vk_queue, &present_desc)); } static void wined3d_swapchain_vk_rotate(struct wined3d_swapchain *swapchain, struct wined3d_context_vk *context_vk) @@ -1215,15 +1219,35 @@ static void swapchain_vk_present(struct wined3d_swapchain *swapchain, const RECT struct wined3d_swapchain_vk *swapchain_vk = wined3d_swapchain_vk(swapchain); struct wined3d_texture *back_buffer = swapchain->back_buffers[0]; struct wined3d_context_vk *context_vk; + VkResult vr; + HRESULT hr; context_vk = wined3d_context_vk(context_acquire(swapchain->device, back_buffer, 0)); wined3d_texture_load_location(back_buffer, 0, &context_vk->c, back_buffer->resource.draw_binding); if (swapchain_vk->vk_swapchain) - wined3d_swapchain_vk_blit(swapchain_vk, context_vk, src_rect, dst_rect, swap_interval); + { + if ((vr = wined3d_swapchain_vk_blit(swapchain_vk, context_vk, src_rect, dst_rect, swap_interval))) + { + if (vr == VK_ERROR_OUT_OF_DATE_KHR || vr == VK_SUBOPTIMAL_KHR) + { + if (FAILED(hr = wined3d_swapchain_vk_recreate(swapchain_vk))) + ERR("Failed to recreate swapchain, hr %#x.\n", hr); + else if (vr == VK_ERROR_OUT_OF_DATE_KHR && (vr = wined3d_swapchain_vk_blit( + swapchain_vk, context_vk, src_rect, dst_rect, swap_interval))) + ERR("Failed to blit image, vr %s.\n", wined3d_debug_vkresult(vr)); + } + else + { + ERR("Failed to blit image, vr %s.\n", wined3d_debug_vkresult(vr)); + } + } + } else + { swapchain_blit_gdi(swapchain, &context_vk->c, src_rect, dst_rect); + } wined3d_swapchain_vk_rotate(swapchain, context_vk); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5269bdec531..fbc49a65a58 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5284,6 +5284,7 @@ struct wined3d_swapchain_vk uint64_t command_buffer_id; } *vk_semaphores; unsigned int current, image_count; + unsigned int width, height; }; static inline struct wined3d_swapchain_vk *wined3d_swapchain_vk(struct wined3d_swapchain *swapchain)

1 0

Louis Lenders : wtsapi32: Implement WTSQuerySessionInformation(WTSDomainName).
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: c3a9607a3b6956d9c72206c58190f2520c15fc43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3a9607a3b6956d9c72206c5… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Mar 21 22:50:47 2021 +0100 wtsapi32: Implement WTSQuerySessionInformation(WTSDomainName). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47310 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c6f133f6351b66b265748fc338385cd29a553a53) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wtsapi32/tests/wtsapi.c | 30 ++++++++++++++++++++++++++++-- dlls/wtsapi32/wtsapi32.c | 14 ++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 7cff02de526..8ce1dc8bf9c 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -93,8 +93,8 @@ static void test_WTSEnumerateProcessesW(void) static void test_WTSQuerySessionInformation(void) { - WCHAR *buf1, usernameW[UNLEN + 1]; - char *buf2, username[UNLEN + 1]; + WCHAR *buf1, usernameW[UNLEN + 1], computernameW[MAX_COMPUTERNAME_LENGTH + 1]; + char *buf2, username[UNLEN + 1], computername[MAX_COMPUTERNAME_LENGTH + 1]; DWORD count, tempsize; BOOL ret; @@ -130,6 +130,19 @@ static void test_WTSQuerySessionInformation(void) ok(count == tempsize * sizeof(WCHAR), "expected %u, got %u\n", tempsize * sizeof(WCHAR), count); WTSFreeMemory(buf1); + count = 0; + buf1 = NULL; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSDomainName, &buf1, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf1 != NULL, "buf not set\n"); + ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + tempsize = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameW(computernameW, &tempsize); + /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ + ok(!wcsicmp(buf1, computernameW), "expected %s, got %s\n", wine_dbgstr_w(computernameW), wine_dbgstr_w(buf1)); + ok(count == (tempsize + 1) * sizeof(WCHAR), "expected %u, got %u\n", (tempsize + 1) * sizeof(WCHAR), count); + WTSFreeMemory(buf1); + SetLastError(0xdeadbeef); count = 0; ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); @@ -161,6 +174,19 @@ static void test_WTSQuerySessionInformation(void) ok(!stricmp(buf2, username), "expected %s, got %s\n", username, buf2); ok(count == tempsize, "expected %u, got %u\n", tempsize, count); WTSFreeMemory(buf2); + + count = 0; + buf2 = NULL; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSDomainName, &buf2, &count); + ok(ret, "got %u\n", GetLastError()); + ok(buf2 != NULL, "buf not set\n"); + ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + tempsize = MAX_COMPUTERNAME_LENGTH + 1; + GetComputerNameA(computername, &tempsize); + /* Windows Vista, 7 and 8 return uppercase computername, while the rest return lowercase. */ + ok(!stricmp(buf2, computername), "expected %s, got %s\n", computername, buf2); + ok(count == tempsize + 1, "expected %u, got %u\n", tempsize + 1, count); + WTSFreeMemory(buf2); } static void test_WTSQueryUserToken(void) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index ae7a6c195f8..a5c9bf6519f 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -353,6 +353,20 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF return TRUE; } + if (class == WTSDomainName) + { + DWORD size = MAX_COMPUTERNAME_LENGTH + 1; + WCHAR *computername; + + if (!(computername = heap_alloc(size * sizeof(WCHAR)))) return FALSE; + GetComputerNameW(computername, &size); + *buffer = computername; + /* GetComputerNameW() return size doesn't include terminator */ + size++; + *count = size * sizeof(WCHAR); + return TRUE; + } + FIXME("Unimplemented class %d\n", class); *buffer = NULL;

1 0

Gijs Vermeulen : wtsapi32/tests: Test returned username for WTSQuerySessionInformation(WTSUserName).
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 5920a034b8a08b26ca245fca5a0b72745937922b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5920a034b8a08b26ca245fca… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 21 22:50:46 2021 +0100 wtsapi32/tests: Test returned username for WTSQuerySessionInformation(WTSUserName). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e07c658fafc39432694f96a762a4a2f6cef20bf7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wtsapi32/tests/Makefile.in | 2 +- dlls/wtsapi32/tests/wtsapi.c | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wtsapi32/tests/Makefile.in b/dlls/wtsapi32/tests/Makefile.in index a398a8085cd..be0fa8d6772 100644 --- a/dlls/wtsapi32/tests/Makefile.in +++ b/dlls/wtsapi32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wtsapi32.dll -IMPORTS = wtsapi32 +IMPORTS = wtsapi32 advapi32 C_SRCS = \ wtsapi.c diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index c9312cd97c5..7cff02de526 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -21,6 +21,7 @@ #include <windef.h> #include <winbase.h> #include <winternl.h> +#include <lmcons.h> #include <wtsapi32.h> #include "wine/test.h" @@ -92,10 +93,10 @@ static void test_WTSEnumerateProcessesW(void) static void test_WTSQuerySessionInformation(void) { + WCHAR *buf1, usernameW[UNLEN + 1]; + char *buf2, username[UNLEN + 1]; + DWORD count, tempsize; BOOL ret; - WCHAR *buf1; - char *buf2; - DWORD count; SetLastError(0xdeadbeef); count = 0; @@ -122,6 +123,11 @@ static void test_WTSQuerySessionInformation(void) ok(ret, "got %u\n", GetLastError()); ok(buf1 != NULL, "buf not set\n"); ok(count == (lstrlenW(buf1) + 1) * sizeof(WCHAR), "expected %u, got %u\n", (lstrlenW(buf1) + 1) * sizeof(WCHAR), count); + tempsize = UNLEN + 1; + GetUserNameW(usernameW, &tempsize); + /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ + ok(!wcsicmp(buf1, usernameW), "expected %s, got %s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(buf1)); + ok(count == tempsize * sizeof(WCHAR), "expected %u, got %u\n", tempsize * sizeof(WCHAR), count); WTSFreeMemory(buf1); SetLastError(0xdeadbeef); @@ -149,6 +155,11 @@ static void test_WTSQuerySessionInformation(void) ok(ret, "got %u\n", GetLastError()); ok(buf2 != NULL, "buf not set\n"); ok(count == lstrlenA(buf2) + 1, "expected %u, got %u\n", lstrlenA(buf2) + 1, count); + tempsize = UNLEN + 1; + GetUserNameA(username, &tempsize); + /* Windows Vista, 7 and 8 return uppercase username, while the rest return lowercase. */ + ok(!stricmp(buf2, username), "expected %s, got %s\n", username, buf2); + ok(count == tempsize, "expected %u, got %u\n", tempsize, count); WTSFreeMemory(buf2); }

1 0

Gijs Vermeulen : wtsapi32: Avoid calling GetUserNameW() twice in WTSQuerySessionInformationW(WTSUserName).
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: d2d42b9cc591ee1fca857ffa7e9af147dbe135b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d42b9cc591ee1fca857ffa… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Sun Mar 21 22:50:45 2021 +0100 wtsapi32: Avoid calling GetUserNameW() twice in WTSQuerySessionInformationW(WTSUserName). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a822d4708ee229a1982bca8d8b01fc5abf74e2f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wtsapi32/wtsapi32.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index ef3e0d10a0f..ae7a6c195f8 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "lmcons.h" #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" @@ -330,41 +331,32 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF /************************************************************ * WTSQuerySessionInformationW (WTSAPI32.@) */ -BOOL WINAPI WTSQuerySessionInformationW( - HANDLE hServer, - DWORD SessionId, - WTS_INFO_CLASS WTSInfoClass, - LPWSTR* Buffer, - DWORD* BytesReturned) +BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INFO_CLASS class, WCHAR **buffer, DWORD *count) { - /* FIXME: Forward request to winsta.dll::WinStationQueryInformationW */ - FIXME("Stub %p 0x%08x %d %p %p\n", hServer, SessionId, WTSInfoClass, - Buffer, BytesReturned); + TRACE("%p 0x%08x %d %p %p\n", server, session_id, class, buffer, count); - if (!Buffer || !BytesReturned) + if (!buffer || !count) { SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - if (WTSInfoClass == WTSUserName) + if (class == WTSUserName) { + DWORD size = UNLEN + 1; WCHAR *username; - DWORD count = 0; - - GetUserNameW(NULL, &count); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return FALSE; - if (!(username = heap_alloc(count * sizeof(WCHAR)))) return FALSE; - GetUserNameW(username, &count); - *Buffer = username; - *BytesReturned = count * sizeof(WCHAR); + + if (!(username = heap_alloc(size * sizeof(WCHAR)))) return FALSE; + GetUserNameW(username, &size); + *buffer = username; + *count = size * sizeof(WCHAR); return TRUE; } - else - { - *Buffer = NULL; - *BytesReturned = 0; - } + + FIXME("Unimplemented class %d\n", class); + + *buffer = NULL; + *count = 0; return FALSE; }

1 0

Rémi Bernon : d3d11: Add initial implementation of CreateDeviceContextState.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: fa78f4a2da493721a80c0486fa9db93c15d8f44a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa78f4a2da493721a80c0486… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 26 12:14:25 2021 +0100 d3d11: Add initial implementation of CreateDeviceContextState. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 846276f3caf5325297eeeb722c592c5311b86bba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 12 ++++ dlls/d3d11/device.c | 142 ++++++++++++++++++++++++++++++++++++++++++++- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++------- 3 files changed, 206 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa78f4a2da493721a80c…

1 0

Alexandre Julliard : makefiles: Only allow includes and defines in pkg-config flags.
by Alexandre Julliard 26 Oct '21

26 Oct '21

Module: wine Branch: stable Commit: 1552a865a3a3288f1c02a254034324b6f753dcec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1552a865a3a3288f1c02a254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 11:43:13 2021 +0200 makefiles: Only allow includes and defines in pkg-config flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50811 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4f04994ef47b5077e13c1b770ed0f818f59adcd5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 11 +---------- configure.ac | 11 +---------- tools/makedep.c | 2 +- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/configure b/configure index fab02c3da62..6a56303c2a9 100755 --- a/configure +++ b/configure @@ -14491,16 +14491,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstream $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 libs: $GSTREAMER_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" -ac_gst_incl="" - for i in $GSTREAMER_CFLAGS - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - GSTREAMER_CFLAGS=$ac_gst_incl - CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" +ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" if test "x$ac_cv_header_gst_gst_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gint64 defined by gst/gst.h is indeed 64-bit" >&5 $as_echo_n "checking whether gint64 defined by gst/gst.h is indeed 64-bit... " >&6; } diff --git a/configure.ac b/configure.ac index 6eedc151e83..430dd8802e3 100644 --- a/configure.ac +++ b/configure.ac @@ -1588,16 +1588,7 @@ dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0],,,, - [ac_gst_incl="" - for i in $GSTREAMER_CFLAGS - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - GSTREAMER_CFLAGS=$ac_gst_incl - CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - AC_CHECK_HEADER([gst/gst.h], + [AC_CHECK_HEADER([gst/gst.h], [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], diff --git a/tools/makedep.c b/tools/makedep.c index 306a50eef5d..8e3323e8653 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4259,7 +4259,7 @@ static void load_sources( struct makefile *make ) for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) strarray_add_uniq( &make->include_paths, value.str[i] + 2 ); - else + else if (!strncmp( value.str[i], "-D", 2 ) || !strncmp( value.str[i], "-U", 2 )) strarray_add_uniq( &make->define_args, value.str[i] ); strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));

1 0

Dmitry Timoshkov : user32: DragDetect() should enter its message loop only if the left mouse button is pressed.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: ababea0fd7036ab13ec17d31afbd584c39f62696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ababea0fd7036ab13ec17d31… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 25 12:41:59 2021 +0300 user32: DragDetect() should enter its message loop only if the left mouse button is pressed. There's an application that calls DragDetect() on every WM_MOUSEMOVE message, and this breaks handling of mouse events. A simple test app shows that on Windows DragDetect() starts its message loop when left mouse button is pressed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 17 +++++++++++++++++ dlls/user32/win.c | 10 ++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6b13d93be14..88989f4064b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12293,6 +12293,22 @@ static void test_cancel_mode(void) DestroyWindow(hwnd2); } +static void test_DragDetect(void) +{ + POINT pt; + BOOL ret; + + ok(!GetCapture(), "got capture window %p\n", GetCapture()); + ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); + + GetCursorPos(&pt); + ret = DragDetect(hwndMain, pt); + ok(!ret, "got %d\n", ret); + + ok(!GetCapture(), "got capture window %p\n", GetCapture()); + ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); +} + START_TEST(win) { char **argv; @@ -12461,6 +12477,7 @@ START_TEST(win) test_other_process_window(argv[0]); test_SC_SIZE(); test_cancel_mode(); + test_DragDetect(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 4d0240f21a8..3c6810f4200 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3893,9 +3893,15 @@ BOOL WINAPI DragDetect( HWND hWnd, POINT pt ) { MSG msg; RECT rect; - WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); - WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); + WORD wDragWidth, wDragHeight; + TRACE( "%p,%s\n", hWnd, wine_dbgstr_point( &pt ) ); + + if (!(GetKeyState( VK_LBUTTON ) & 0x8000)) + return FALSE; + + wDragWidth = GetSystemMetrics(SM_CXDRAG); + wDragHeight= GetSystemMetrics(SM_CYDRAG); SetRect(&rect, pt.x - wDragWidth, pt.y - wDragHeight, pt.x + wDragWidth, pt.y + wDragHeight); SetCapture(hWnd);

1 0

Alistair Leslie-Hughes : msdasql/tests: Initial tests.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 35532015cba9c2bb08d1b50df2dc45b0d6a18d5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=35532015cba9c2bb08d1b50d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:34 2021 +1100 msdasql/tests: Initial tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msdasql/tests/Makefile.in | 5 + dlls/msdasql/tests/provider.c | 262 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 269 insertions(+) diff --git a/configure b/configure index 229aaa288ac..fcf8fbdcc62 100755 --- a/configure +++ b/configure @@ -19411,6 +19411,7 @@ wine_fn_config_makefile dlls/msctf/tests enable_tests wine_fn_config_makefile dlls/msctfp enable_msctfp wine_fn_config_makefile dlls/msdaps enable_msdaps wine_fn_config_makefile dlls/msdasql enable_msdasql +wine_fn_config_makefile dlls/msdasql/tests enable_tests wine_fn_config_makefile dlls/msdelta enable_msdelta wine_fn_config_makefile dlls/msdmo enable_msdmo wine_fn_config_makefile dlls/msdmo/tests enable_tests diff --git a/configure.ac b/configure.ac index 70e90c54558..b8356679e63 100644 --- a/configure.ac +++ b/configure.ac @@ -3120,6 +3120,7 @@ WINE_CONFIG_MAKEFILE(dlls/msctf/tests) WINE_CONFIG_MAKEFILE(dlls/msctfp) WINE_CONFIG_MAKEFILE(dlls/msdaps) WINE_CONFIG_MAKEFILE(dlls/msdasql) +WINE_CONFIG_MAKEFILE(dlls/msdasql/tests) WINE_CONFIG_MAKEFILE(dlls/msdelta) WINE_CONFIG_MAKEFILE(dlls/msdmo) WINE_CONFIG_MAKEFILE(dlls/msdmo/tests) diff --git a/dlls/msdasql/tests/Makefile.in b/dlls/msdasql/tests/Makefile.in new file mode 100644 index 00000000000..314238660e2 --- /dev/null +++ b/dlls/msdasql/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msdasql.dll +IMPORTS = uuid oleaut32 ole32 odbccp32 + +C_SRCS = \ + provider.c diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c new file mode 100644 index 00000000000..951ab2a7387 --- /dev/null +++ b/dlls/msdasql/tests/provider.c @@ -0,0 +1,262 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdio.h> +#define COBJMACROS + +#include "msdasc.h" +#include "oledb.h" +#include "odbcinst.h" + +#include "initguid.h" + +#include "msdasql.h" + +#include "wine/test.h" + +DEFINE_GUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); + +static BOOL db_created; +static char mdbpath[MAX_PATH]; + +static void test_Properties(void) +{ + HRESULT hr; + IDBProperties *props; + DBPROPIDSET propidset; + ULONG infocount; + DBPROPINFOSET *propinfoset; + WCHAR *desc; + + hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + + propidset.rgPropertyIDs = NULL; + propidset.cPropertyIDs = 0; + propidset.guidPropertySet = DBPROPSET_DBINITALL; + + infocount = 0; + hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + ULONG i; + + ok(propinfoset->cPropertyInfos == 14, "got %d\n", propinfoset->cPropertyInfos); + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + { + trace("%d: pwszDescription: %s\n", i, debugstr_w(propinfoset->rgPropertyInfos[i].pwszDescription) ); + } + + for (i = 0; i < propinfoset->cPropertyInfos; i++) + VariantClear(&propinfoset->rgPropertyInfos[i].vValues); + + CoTaskMemFree(propinfoset->rgPropertyInfos); + CoTaskMemFree(propinfoset); + } + + IDBProperties_Release(props); +} + +static void test_command_interfaces(IUnknown *cmd) +{ + HRESULT hr; + ICommandProperties *commandProp; + ICommandText *comand_text; + IConvertType *convertype; + ICommandPrepare *commandprepare; + ICommandStream *commandstream; + IColumnsInfo *colinfo; + IMultipleResults *multiple; + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandProperties, (void**)&commandProp); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandProperties_Release(commandProp); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandText_Release(comand_text); + + hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IConvertType_Release(convertype); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + ICommandPrepare_Release(commandprepare); + + hr = IUnknown_QueryInterface(cmd, &IID_IColumnsInfo, (void**)&colinfo); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + IColumnsInfo_Release(colinfo); + + hr = IUnknown_QueryInterface(cmd, &IID_ICommandStream, (void**)&commandstream); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(cmd, &IID_IMultipleResults, (void**)&multiple); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); +} + +static void test_sessions(void) +{ + IDBProperties *props; + IDBInitialize *dbinit = NULL; + IDataInitialize *datainit; + IDBCreateSession *dbsession = NULL; + IUnknown *session = NULL; + IOpenRowset *openrowset = NULL; + IDBCreateCommand *create_command = NULL; + IUnknown *cmd = NULL; + HRESULT hr; + BSTR connect_str; + + if (!db_created) + { + skip("ODBC source wine_test not available.\n"); + return; + } + + connect_str = SysAllocString(L"Provider=MSDASQL.1;Persist Security Info=False;Data Source=wine_test"); + + hr = CoCreateInstance( &CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize, + (void **)&datainit ); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + hr = IDataInitialize_GetDataSource( datainit, NULL, CLSCTX_INPROC_SERVER, connect_str, &IID_IDBInitialize, + (IUnknown **)&dbinit ); + SysFreeString(connect_str); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(FAILED(hr)) + { + IDataInitialize_Release( datainit ); + return; + } + + hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBProperties, (void **)&props ); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDBProperties_Release(props); + + hr = IDBInitialize_Initialize( dbinit ); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(FAILED(hr)) + { + IDBInitialize_Release( dbinit ); + IDataInitialize_Release( datainit ); + return; + } + + hr = IDBInitialize_QueryInterface( dbinit, &IID_IDBCreateSession, (void **)&dbsession ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDBCreateSession_CreateSession( dbsession, NULL, &IID_IUnknown, &session ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(session, &IID_IOpenRowset, (void**)&openrowset); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IOpenRowset_QueryInterface(openrowset, &IID_IDBCreateCommand, (void**)&create_command); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDBCreateCommand_CreateCommand(create_command, NULL, &IID_IUnknown, (IUnknown **)&cmd); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr == S_OK) + { + test_command_interfaces(cmd); + IUnknown_Release(cmd); + } + + IDBCreateCommand_Release(create_command); + IOpenRowset_Release(openrowset); + IUnknown_Release( session ); + IDBCreateSession_Release(dbsession); + IDBInitialize_Uninitialize( dbinit ); + IDBInitialize_Release( dbinit ); + IDataInitialize_Release( datainit ); +} + +static void setup_database(void) +{ + char *driver; + DWORD code; + char buffer[1024]; + WORD size; + + if (winetest_interactive) + { + trace("assuming odbc 'wine_test' is available\n"); + db_created = TRUE; + return; + } + + /* + * 32 bit Windows has a default driver for "Microsoft Access Driver" (Windows 7+) + * and has the ability to create files on the fly. + * + * 64 bit Windows ONLY has a driver for "SQL Server", which we cannot use since we don't have a + * server to connect to. + * + * The filename passed to CREATE_DB must end in mdb. + */ + GetTempPathA(sizeof(mdbpath), mdbpath); + strcat(mdbpath, "wine_test.mdb"); + + driver = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof("DSN=wine_test\0CREATE_DB=") + strlen(mdbpath) + 2); + memcpy(driver, "DSN=wine_test\0CREATE_DB=", sizeof("DSN=wine_test\0CREATE_DB=")); + strcat(driver+sizeof("DSN=wine_test\0CREATE_DB=")-1, mdbpath); + + db_created = SQLConfigDataSource(NULL, ODBC_ADD_DSN, "Microsoft Access Driver (*.mdb)", driver); + if (!db_created) + { + SQLInstallerError(1, &code, buffer, sizeof(buffer), &size); + trace("code %d, buffer %s, size %d\n", code, debugstr_a(buffer), size); + + HeapFree(GetProcessHeap(), 0, driver); + + return; + } + + memcpy(driver, "DSN=wine_test\0DBQ=", sizeof("DSN=wine_test\0DBQ=")); + strcat(driver+sizeof("DSN=wine_test\0DBQ=")-1, mdbpath); + db_created = SQLConfigDataSource(NULL, ODBC_ADD_DSN, "Microsoft Access Driver (*.mdb)", driver); + + HeapFree(GetProcessHeap(), 0, driver); +} + +static void cleanup_database(void) +{ + if (winetest_interactive) + return; + + DeleteFileA(mdbpath); +} + +START_TEST(provider) +{ + CoInitialize(0); + + setup_database(); + + test_Properties(); + test_sessions(); + + cleanup_database(); + + CoUninitialize(); +}

1 0

Alistair Leslie-Hughes : msdasql: Add IDBInitialize support.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 6e351769f8acd74aa5c4d55636d908be4b463f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e351769f8acd74aa5c4d556… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:33 2021 +1100 msdasql: Add IDBInitialize support. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 31830e7025b..00dbcec6780 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -104,6 +104,7 @@ struct msdasql { IUnknown MSDASQL_iface; IDBProperties IDBProperties_iface; + IDBInitialize IDBInitialize_iface; LONG ref; }; @@ -118,6 +119,11 @@ static inline struct msdasql *impl_from_IDBProperties(IDBProperties *iface) return CONTAINING_RECORD(iface, struct msdasql, IDBProperties_iface); } +static inline struct msdasql *impl_from_IDBInitialize(IDBInitialize *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBInitialize_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -133,6 +139,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->IDBProperties_iface; } + else if ( IsEqualGUID(riid, &IID_IDBInitialize)) + { + *out = &provider->IDBInitialize_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -239,6 +249,55 @@ static const struct IDBPropertiesVtbl dbprops_vtbl = dbprops_SetProperties }; +static HRESULT WINAPI dbinit_QueryInterface(IDBInitialize *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbinit_AddRef(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbinit_Release(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + +static HRESULT WINAPI dbinit_Uninitialize(IDBInitialize *iface) +{ + struct msdasql *provider = impl_from_IDBInitialize(iface); + + FIXME("%p stub\n", provider); + + return S_OK; +} + + +static const struct IDBInitializeVtbl dbinit_vtbl = +{ + dbinit_QueryInterface, + dbinit_AddRef, + dbinit_Release, + dbinit_Initialize, + dbinit_Uninitialize +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -250,6 +309,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; + provider->IDBInitialize_iface.lpVtbl = &dbinit_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv);

1 0

Alistair Leslie-Hughes : msdasql: Support IDBProperties interface.
by Alexandre Julliard 25 Oct '21

25 Oct '21

Module: wine Branch: master Commit: 916690636890f8ffe474031c48d328e4f6d94a82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=916690636890f8ffe474031c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 25 20:34:32 2021 +1100 msdasql: Support IDBProperties interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 75 +++++++++++++++++++++++++++++++++++++++++++ dlls/oledb32/tests/database.c | 4 +-- 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 91978ad9c1a..31830e7025b 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" #include "objbase.h" +#include "oledb.h" #include "rpcproxy.h" #include "wine/debug.h" @@ -102,6 +103,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) struct msdasql { IUnknown MSDASQL_iface; + IDBProperties IDBProperties_iface; LONG ref; }; @@ -111,6 +113,11 @@ static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct msdasql, MSDASQL_iface); } +static inline struct msdasql *impl_from_IDBProperties(IDBProperties *iface) +{ + return CONTAINING_RECORD(iface, struct msdasql, IDBProperties_iface); +} + static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct msdasql *provider = impl_from_IUnknown(iface); @@ -122,6 +129,10 @@ static HRESULT WINAPI msdsql_QueryInterface(IUnknown *iface, REFIID riid, void * { *out = &provider->MSDASQL_iface; } + else if(IsEqualGUID(riid, &IID_IDBProperties)) + { + *out = &provider->IDBProperties_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -165,6 +176,69 @@ static const IUnknownVtbl msdsql_vtbl = msdsql_Release }; +static HRESULT WINAPI dbprops_QueryInterface(IDBProperties *iface, REFIID riid, void **ppvObject) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppvObject); +} + +static ULONG WINAPI dbprops_AddRef(IDBProperties *iface) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_AddRef(&provider->MSDASQL_iface); +} + +static ULONG WINAPI dbprops_Release(IDBProperties *iface) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + return IUnknown_Release(&provider->MSDASQL_iface); +} + +static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertySets, DBPROPSET **prgPropertySets) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPropertyIDSets, + const DBPROPIDSET rgPropertyIDSets[], ULONG *pcPropertyInfoSets, + DBPROPINFOSET **prgPropertyInfoSets, OLECHAR **ppDescBuffer) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", provider, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, ppDescBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropertySets, + DBPROPSET rgPropertySets[]) +{ + struct msdasql *provider = impl_from_IDBProperties(iface); + + FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + + return E_NOTIMPL; +} + +static const struct IDBPropertiesVtbl dbprops_vtbl = +{ + dbprops_QueryInterface, + dbprops_AddRef, + dbprops_Release, + dbprops_GetProperties, + dbprops_GetPropertyInfo, + dbprops_SetProperties +}; + static HRESULT create_msdasql_provider(REFIID riid, void **ppv) { struct msdasql *provider; @@ -175,6 +249,7 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) return E_OUTOFMEMORY; provider->MSDASQL_iface.lpVtbl = &msdsql_vtbl; + provider->IDBProperties_iface.lpVtbl = &dbprops_vtbl; provider->ref = 1; hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 1897d57623f..3baa91b87a4 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -994,7 +994,7 @@ static void test_odbc_provider(void) }; hr = CoCreateInstance( &CLSID_MSDASQL, NULL, CLSCTX_ALL, &IID_IDBProperties, (void **)&props); - todo_wine ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); + ok(hr == S_OK, "Failed to create object 0x%08x\n", hr); if (FAILED(hr)) { return; @@ -1006,7 +1006,7 @@ static void test_odbc_provider(void) infocount = 0; hr = IDBProperties_GetPropertyInfo(props, 1, &propidset, &infocount, &propinfoset, &desc); - ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (hr == S_OK) { ULONG i;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021