wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Sebastian Lackner : kernel32/tests: Add test to demonstrate a bug related to alertable waits.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: d94a6c770ae3bca1fabf3a9e89e4346c35707831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94a6c770ae3bca1fabf3a9e8… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Oct 9 03:43:40 2015 +0200 kernel32/tests: Add test to demonstrate a bug related to alertable waits. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index a9d2377..e842bf3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2308,6 +2308,71 @@ static void test_srwlock_example(void) trace("number of total exclusive accesses is %d\n", srwlock_protected_value); } +static DWORD WINAPI alertable_wait_thread(void *param) +{ + HANDLE *semaphores = param; + LARGE_INTEGER timeout; + NTSTATUS status; + DWORD result; + + ReleaseSemaphore(semaphores[0], 1, NULL); + result = WaitForMultipleObjectsEx(1, &semaphores[1], TRUE, 1000, TRUE); + todo_wine + ok(result == WAIT_IO_COMPLETION, "expected WAIT_IO_COMPLETION, got %u\n", result); + result = WaitForMultipleObjectsEx(1, &semaphores[1], TRUE, 200, TRUE); + todo_wine + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + + ReleaseSemaphore(semaphores[0], 1, NULL); + timeout.QuadPart = -10000000; + status = pNtWaitForMultipleObjects(1, &semaphores[1], FALSE, TRUE, &timeout); + todo_wine + ok(status == STATUS_USER_APC, "expected STATUS_USER_APC, got %08x\n", status); + timeout.QuadPart = -2000000; + status = pNtWaitForMultipleObjects(1, &semaphores[1], FALSE, TRUE, &timeout); + todo_wine + ok(status == STATUS_WAIT_0, "expected STATUS_WAIT_0, got %08x\n", status); + + return 0; +} + +static void CALLBACK alertable_wait_apc(ULONG_PTR userdata) +{ + HANDLE *semaphores = (void *)userdata; + ReleaseSemaphore(semaphores[1], 1, NULL); +} + +static void test_alertable_wait(void) +{ + HANDLE thread, semaphores[2]; + DWORD result; + + semaphores[0] = CreateSemaphoreW(NULL, 0, 1, NULL); + ok(semaphores[0] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + semaphores[1] = CreateSemaphoreW(NULL, 0, 1, NULL); + ok(semaphores[1] != NULL, "CreateSemaphore failed with %u\n", GetLastError()); + thread = CreateThread(NULL, 0, alertable_wait_thread, semaphores, 0, NULL); + ok(thread != NULL, "CreateThread failed with %u\n", GetLastError()); + + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + Sleep(100); /* ensure the thread is blocking in WaitForMultipleObjectsEx */ + result = QueueUserAPC(alertable_wait_apc, thread, (ULONG_PTR)semaphores); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + + result = WaitForSingleObject(semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + Sleep(100); /* ensure the thread is blocking in NtWaitForMultipleObjects */ + result = QueueUserAPC(alertable_wait_apc, thread, (ULONG_PTR)semaphores); + ok(result != 0, "QueueUserAPC failed with %u\n", GetLastError()); + + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", result); + CloseHandle(thread); + CloseHandle(semaphores[0]); + CloseHandle(semaphores[1]); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandleA("kernel32.dll"); @@ -2355,4 +2420,5 @@ START_TEST(sync) test_condvars_consumer_producer(); test_srwlock_base(); test_srwlock_example(); + test_alertable_wait(); }

1 0

Daniel Lehman : vcomp120: Add vcomp120 stub dll.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 66808858aca1c385b157f1e182625a9153ee7de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66808858aca1c385b157f1e18… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Apr 28 11:08:47 2015 -0700 vcomp120: Add vcomp120 stub dll. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/vcomp120/Makefile.in | 4 ++ dlls/vcomp120/main.c | 47 ++++++++++++++++++ dlls/vcomp120/vcomp120.spec | 113 ++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 6 files changed, 168 insertions(+) diff --git a/configure b/configure index 2ba059a..872db31 100755 --- a/configure +++ b/configure @@ -1315,6 +1315,7 @@ enable_vbscript enable_vcomp enable_vcomp100 enable_vcomp110 +enable_vcomp120 enable_vcomp90 enable_vdmdbg enable_version @@ -17848,6 +17849,7 @@ wine_fn_config_dll vcomp enable_vcomp wine_fn_config_test dlls/vcomp/tests vcomp_test wine_fn_config_dll vcomp100 enable_vcomp100 wine_fn_config_dll vcomp110 enable_vcomp110 +wine_fn_config_dll vcomp120 enable_vcomp120 wine_fn_config_dll vcomp90 enable_vcomp90 wine_fn_config_dll vdhcp.vxd enable_win16 wine_fn_config_dll vdmdbg enable_vdmdbg implib diff --git a/configure.ac b/configure.ac index 1e9bd66..e22b0ef 100644 --- a/configure.ac +++ b/configure.ac @@ -3361,6 +3361,7 @@ WINE_CONFIG_DLL(vcomp) WINE_CONFIG_TEST(dlls/vcomp/tests) WINE_CONFIG_DLL(vcomp100) WINE_CONFIG_DLL(vcomp110) +WINE_CONFIG_DLL(vcomp120) WINE_CONFIG_DLL(vcomp90) WINE_CONFIG_DLL(vdhcp.vxd,enable_win16) WINE_CONFIG_DLL(vdmdbg,,[implib]) diff --git a/dlls/vcomp120/Makefile.in b/dlls/vcomp120/Makefile.in new file mode 100644 index 0000000..833cd67 --- /dev/null +++ b/dlls/vcomp120/Makefile.in @@ -0,0 +1,4 @@ +MODULE = vcomp120.dll + +C_SRCS = \ + main.c diff --git a/dlls/vcomp120/main.c b/dlls/vcomp120/main.c new file mode 100644 index 0000000..f2f8b31 --- /dev/null +++ b/dlls/vcomp120/main.c @@ -0,0 +1,47 @@ +/* + * + * vcomp120 implementation + * + * Copyright 2012 André Hentschel + * Copyright 2015 Daniel Lehman + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(vcomp120); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + TRACE("(0x%p, %d, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec new file mode 100644 index 0000000..87a7205 --- /dev/null +++ b/dlls/vcomp120/vcomp120.spec @@ -0,0 +1,113 @@ +@ stub C2VectParallel +@ stub _vcomp_atomic_add_i1 +@ stub _vcomp_atomic_add_i2 +@ cdecl _vcomp_atomic_add_i4(ptr long) vcomp._vcomp_atomic_add_i4 +@ stub _vcomp_atomic_add_i8 +@ cdecl _vcomp_atomic_add_r4(ptr float) vcomp._vcomp_atomic_add_r4 +@ cdecl _vcomp_atomic_add_r8(ptr double) vcomp._vcomp_atomic_add_r8 +@ stub _vcomp_atomic_and_i1 +@ stub _vcomp_atomic_and_i2 +@ cdecl _vcomp_atomic_and_i4(ptr long) vcomp._vcomp_atomic_and_i4 +@ stub _vcomp_atomic_and_i8 +@ stub _vcomp_atomic_div_i1 +@ stub _vcomp_atomic_div_i2 +@ cdecl _vcomp_atomic_div_i4(ptr long) vcomp._vcomp_atomic_div_i4 +@ stub _vcomp_atomic_div_i8 +@ cdecl _vcomp_atomic_div_r4(ptr float) vcomp._vcomp_atomic_div_r4 +@ cdecl _vcomp_atomic_div_r8(ptr double) vcomp._vcomp_atomic_div_r8 +@ stub _vcomp_atomic_div_ui1 +@ stub _vcomp_atomic_div_ui2 +@ cdecl _vcomp_atomic_div_ui4(ptr long) vcomp._vcomp_atomic_div_ui4 +@ stub _vcomp_atomic_div_ui8 +@ stub _vcomp_atomic_mul_i1 +@ stub _vcomp_atomic_mul_i2 +@ cdecl _vcomp_atomic_mul_i4(ptr long) vcomp._vcomp_atomic_mul_i4 +@ stub _vcomp_atomic_mul_i8 +@ cdecl _vcomp_atomic_mul_r4(ptr float) vcomp._vcomp_atomic_mul_r4 +@ cdecl _vcomp_atomic_mul_r8(ptr double) vcomp._vcomp_atomic_mul_r8 +@ stub _vcomp_atomic_or_i1 +@ stub _vcomp_atomic_or_i2 +@ cdecl _vcomp_atomic_or_i4(ptr long) vcomp._vcomp_atomic_or_i4 +@ stub _vcomp_atomic_or_i8 +@ stub _vcomp_atomic_shl_i1 +@ stub _vcomp_atomic_shl_i2 +@ cdecl _vcomp_atomic_shl_i4(ptr long) vcomp._vcomp_atomic_shl_i4 +@ stub _vcomp_atomic_shl_i8 +@ stub _vcomp_atomic_shr_i1 +@ stub _vcomp_atomic_shr_i2 +@ cdecl _vcomp_atomic_shr_i4(ptr long) vcomp._vcomp_atomic_shr_i4 +@ stub _vcomp_atomic_shr_i8 +@ stub _vcomp_atomic_shr_ui1 +@ stub _vcomp_atomic_shr_ui2 +@ cdecl _vcomp_atomic_shr_ui4(ptr long) vcomp._vcomp_atomic_shr_ui4 +@ stub _vcomp_atomic_shr_ui8 +@ stub _vcomp_atomic_sub_i1 +@ stub _vcomp_atomic_sub_i2 +@ cdecl _vcomp_atomic_sub_i4(ptr long) vcomp._vcomp_atomic_sub_i4 +@ stub _vcomp_atomic_sub_i8 +@ cdecl _vcomp_atomic_sub_r4(ptr float) vcomp._vcomp_atomic_sub_r4 +@ cdecl _vcomp_atomic_sub_r8(ptr double) vcomp._vcomp_atomic_sub_r8 +@ stub _vcomp_atomic_xor_i1 +@ stub _vcomp_atomic_xor_i2 +@ cdecl _vcomp_atomic_xor_i4(ptr long) vcomp._vcomp_atomic_xor_i4 +@ stub _vcomp_atomic_xor_i8 +@ cdecl _vcomp_barrier() vcomp._vcomp_barrier +@ stub _vcomp_copyprivate_broadcast +@ stub _vcomp_copyprivate_receive +@ cdecl _vcomp_enter_critsect(ptr) vcomp._vcomp_enter_critsect +@ cdecl _vcomp_flush() vcomp._vcomp_flush +@ cdecl _vcomp_for_dynamic_init(long long long long long) vcomp._vcomp_for_dynamic_init +@ stub _vcomp_for_dynamic_init_i8 +@ cdecl _vcomp_for_dynamic_next(ptr ptr) vcomp._vcomp_for_dynamic_next +@ stub _vcomp_for_dynamic_next_i8 +@ cdecl _vcomp_for_static_end() vcomp._vcomp_for_static_end +@ cdecl _vcomp_for_static_init(long long long long ptr ptr ptr ptr ptr) vcomp._vcomp_for_static_init +@ stub _vcomp_for_static_init_i8 +@ cdecl _vcomp_for_static_simple_init(long long long long ptr ptr) vcomp._vcomp_for_static_simple_init +@ stub _vcomp_for_static_simple_init_i8 +@ varargs _vcomp_fork(long long ptr) vcomp._vcomp_fork +@ cdecl _vcomp_get_thread_num() vcomp._vcomp_get_thread_num +@ cdecl _vcomp_leave_critsect(ptr) vcomp._vcomp_leave_critsect +@ stub _vcomp_master_barrier +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end +@ stub _vcomp_ordered_begin +@ stub _vcomp_ordered_end +@ stub _vcomp_ordered_loop_end +@ stub _vcomp_reduction_i1 +@ stub _vcomp_reduction_i2 +@ stub _vcomp_reduction_i4 +@ stub _vcomp_reduction_i8 +@ stub _vcomp_reduction_r4 +@ stub _vcomp_reduction_r8 +@ stub _vcomp_reduction_u1 +@ stub _vcomp_reduction_u2 +@ stub _vcomp_reduction_u4 +@ stub _vcomp_reduction_u8 +@ cdecl _vcomp_sections_init(long) vcomp._vcomp_sections_init +@ cdecl _vcomp_sections_next() vcomp._vcomp_sections_next +@ cdecl _vcomp_set_num_threads(long) vcomp._vcomp_set_num_threads +@ cdecl _vcomp_single_begin(long) vcomp._vcomp_single_begin +@ cdecl _vcomp_single_end() vcomp._vcomp_single_end +@ cdecl omp_destroy_lock(ptr) vcomp.omp_destroy_lock +@ cdecl omp_destroy_nest_lock(ptr) vcomp.omp_destroy_nest_lock +@ cdecl omp_get_dynamic() vcomp.omp_get_dynamic +@ cdecl omp_get_max_threads() vcomp.omp_get_max_threads +@ cdecl omp_get_nested() vcomp.omp_get_nested +@ cdecl omp_get_num_procs() vcomp.omp_get_num_procs +@ cdecl omp_get_num_threads() vcomp.omp_get_num_threads +@ cdecl omp_get_thread_num() vcomp.omp_get_thread_num +@ stub omp_get_wtick +@ cdecl omp_get_wtime() vcomp.omp_get_wtime +@ cdecl omp_in_parallel() vcomp.omp_in_parallel +@ cdecl omp_init_lock(ptr) vcomp.omp_init_lock +@ cdecl omp_init_nest_lock(ptr) vcomp.omp_init_nest_lock +@ cdecl omp_set_dynamic(long) vcomp.omp_set_dynamic +@ cdecl omp_set_lock(ptr) vcomp.omp_set_lock +@ cdecl omp_set_nest_lock(ptr) vcomp.omp_set_nest_lock +@ cdecl omp_set_nested(long) vcomp.omp_set_nested +@ cdecl omp_set_num_threads(long) vcomp.omp_set_num_threads +@ cdecl omp_test_lock(ptr) vcomp.omp_test_lock +@ cdecl omp_test_nest_lock(ptr) vcomp.omp_test_nest_lock +@ cdecl omp_unset_lock(ptr) vcomp.omp_unset_lock +@ cdecl omp_unset_nest_lock(ptr) vcomp.omp_unset_nest_lock diff --git a/tools/make_specfiles b/tools/make_specfiles index 5d31939..7511ab7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -138,6 +138,7 @@ my @dll_groups = ], [ "vcomp", + "vcomp120", "vcomp110", "vcomp100", "vcomp90",

1 0

Nikolay Sivov : gdi32: Improve structure layout of data returned by GetFontRealizationInfo().
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 819d36786e629f8e4189713dbb75d4eb94255e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=819d36786e629f8e4189713db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 21:13:57 2015 +0300 gdi32: Improve structure layout of data returned by GetFontRealizationInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 6 ++++-- dlls/gdi32/freetype.c | 5 +++++ dlls/gdi32/gdi_private.h | 3 ++- dlls/gdi32/tests/font.c | 7 +++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index cf81699..e178f33 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -783,7 +783,8 @@ struct font_realization_info { DWORD cache_num; DWORD instance_id; DWORD unk; - DWORD face_index; + WORD face_index; + WORD simulations; }; struct font_fileinfo { @@ -853,7 +854,8 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, return hr; } - hr = IDWriteFactory2_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, DWRITE_FONT_SIMULATIONS_NONE, + /* Simulations flags values match DWRITE_FONT_SIMULATIONS */ + hr = IDWriteFactory2_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, info.simulations, fontface); IDWriteFontFile_Release(file); return hr; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 33e196c..95df22a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8282,6 +8282,11 @@ static BOOL freetype_GetFontRealizationInfo( PHYSDEV dev, void *ptr ) { info->unk = 0; info->face_index = physdev->font->ft_face->face_index; + info->simulations = 0; + if (physdev->font->fake_bold) + info->simulations |= 0x1; + if (physdev->font->fake_italic) + info->simulations |= 0x2; } return TRUE; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2e52e08..337fe27 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -284,7 +284,8 @@ struct font_realization_info DWORD cache_num; /* keeps incrementing - num of fonts that have been created allowing for caching?? */ DWORD instance_id; /* identifies a realized font instance */ DWORD unk; /* unknown */ - DWORD face_index; /* face index in case of font collections */ + WORD face_index; /* face index in case of font collections */ + WORD simulations; /* 0 bit - bold simulation, 1 bit - oblique simulation */ }; extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index fd9bda3..6eefc3b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4136,7 +4136,8 @@ static void test_RealizationInfo(void) DWORD cache_num; DWORD instance_id; DWORD unk; - DWORD face_index; + WORD face_index; + WORD simulations; }; struct realization_info_t @@ -4186,7 +4187,8 @@ static void test_RealizationInfo(void) memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Tahoma"); lf.lfHeight = 20; - lf.lfWeight = FW_NORMAL; + lf.lfWeight = FW_BOLD; + lf.lfItalic = 1; hfont = CreateFontIndirectA(&lf); hfont_old = SelectObject(hdc, hfont); @@ -4234,6 +4236,7 @@ static void test_RealizationInfo(void) ok(fri->flags == ri->flags, "flags mismatch\n"); ok(fri->cache_num == ri->cache_num, "cache_num mismatch\n"); ok(fri->instance_id == ri->instance_id, "instance id mismatch\n"); + ok(fri->simulations == 0x2, "got simulations flags 0x%04x\n", fri->simulations); ok(fri->face_index == 0, "got wrong face index %u\n", fri->face_index); ok(info2[6] == 0xcccccccc, "structure longer than 6 dwords\n");

1 0

Nikolay Sivov : wiaservc: Added a stub for IEnumWIA_DEV_INFO.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: 9cb1981e304bc54e9378ae52a5367d9db576872a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb1981e304bc54e9378ae52a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 8 21:09:11 2015 +0300 wiaservc: Added a stub for IEnumWIA_DEV_INFO. Based on original patch by Mikael Ståldal <mikael(a)staldal.nu>. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wiaservc/tests/wia.c | 4 +- dlls/wiaservc/wiadevmgr.c | 127 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 125 insertions(+), 6 deletions(-) diff --git a/dlls/wiaservc/tests/wia.c b/dlls/wiaservc/tests/wia.c index e3f4edb..c7c2fd9 100644 --- a/dlls/wiaservc/tests/wia.c +++ b/dlls/wiaservc/tests/wia.c @@ -40,21 +40,19 @@ static void test_EnumDeviceInfo(void) ok(FAILED(hr), "got 0x%08x\n", hr); hr = IWiaDevMgr_EnumDeviceInfo(devmanager, WIA_DEVINFO_ENUM_LOCAL, &devenum); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { hr = IEnumWIA_DEV_INFO_GetCount(devenum, NULL); ok(FAILED(hr), "got 0x%08x\n", hr); count = 1000; hr = IEnumWIA_DEV_INFO_GetCount(devenum, &count); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count != 1000, "got %u\n", count); IEnumWIA_DEV_INFO_Release(devenum); } -} START_TEST(wia) { diff --git a/dlls/wiaservc/wiadevmgr.c b/dlls/wiaservc/wiadevmgr.c index 6eb82aa..58720ef 100644 --- a/dlls/wiaservc/wiadevmgr.c +++ b/dlls/wiaservc/wiadevmgr.c @@ -29,11 +29,119 @@ WINE_DEFAULT_DEBUG_CHANNEL(wia); +typedef struct +{ + IEnumWIA_DEV_INFO IEnumWIA_DEV_INFO_iface; + LONG ref; +} enumwiadevinfo; + static inline wiadevmgr *impl_from_IWiaDevMgr(IWiaDevMgr *iface) { return CONTAINING_RECORD(iface, wiadevmgr, IWiaDevMgr_iface); } +static inline enumwiadevinfo *impl_from_IEnumWIA_DEV_INFO(IEnumWIA_DEV_INFO *iface) +{ + return CONTAINING_RECORD(iface, enumwiadevinfo, IEnumWIA_DEV_INFO_iface); +} + +static HRESULT WINAPI enumwiadevinfo_QueryInterface(IEnumWIA_DEV_INFO *iface, REFIID riid, void **obj) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumWIA_DEV_INFO)) + *obj = iface; + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; + } + IUnknown_AddRef((IUnknown*)*obj); + return S_OK; +} + +static ULONG WINAPI enumwiadevinfo_AddRef(IEnumWIA_DEV_INFO *iface) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI enumwiadevinfo_Release(IEnumWIA_DEV_INFO *iface) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + return ref; +} + +static HRESULT WINAPI enumwiadevinfo_Next(IEnumWIA_DEV_INFO *iface, ULONG count, IWiaPropertyStorage **elem, ULONG *fetched) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %d, %p, %p): stub\n", This, count, elem, fetched); + + *fetched = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_Skip(IEnumWIA_DEV_INFO *iface, ULONG count) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %u): stub\n", This, count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_Reset(IEnumWIA_DEV_INFO *iface) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p): stub\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_Clone(IEnumWIA_DEV_INFO *iface, IEnumWIA_DEV_INFO **ret) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %p): stub\n", This, ret); + + return E_NOTIMPL; +} + +static HRESULT WINAPI enumwiadevinfo_GetCount(IEnumWIA_DEV_INFO *iface, ULONG *count) +{ + enumwiadevinfo *This = impl_from_IEnumWIA_DEV_INFO(iface); + + FIXME("(%p, %p): stub\n", This, count); + + *count = 0; + return E_NOTIMPL; +} + +static const IEnumWIA_DEV_INFOVtbl EnumWIA_DEV_INFOVtbl = +{ + enumwiadevinfo_QueryInterface, + enumwiadevinfo_AddRef, + enumwiadevinfo_Release, + enumwiadevinfo_Next, + enumwiadevinfo_Skip, + enumwiadevinfo_Reset, + enumwiadevinfo_Clone, + enumwiadevinfo_GetCount +}; + static HRESULT WINAPI wiadevmgr_QueryInterface(IWiaDevMgr *iface, REFIID riid, void **ppvObject) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); @@ -69,11 +177,24 @@ static ULONG WINAPI wiadevmgr_Release(IWiaDevMgr *iface) return ref; } -static HRESULT WINAPI wiadevmgr_EnumDeviceInfo(IWiaDevMgr *iface, LONG lFlag, IEnumWIA_DEV_INFO **ppIEnum) +static HRESULT WINAPI wiadevmgr_EnumDeviceInfo(IWiaDevMgr *iface, LONG flag, IEnumWIA_DEV_INFO **ret) { wiadevmgr *This = impl_from_IWiaDevMgr(iface); - FIXME("(%p, %d, %p): stub\n", This, lFlag, ppIEnum); - return E_NOTIMPL; + enumwiadevinfo *enuminfo; + + TRACE("(%p)->(%x, %p)\n", This, flag, ret); + + *ret = NULL; + + enuminfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*enuminfo)); + if (!enuminfo) + return E_OUTOFMEMORY; + + enuminfo->IEnumWIA_DEV_INFO_iface.lpVtbl = &EnumWIA_DEV_INFOVtbl; + enuminfo->ref = 1; + + *ret = &enuminfo->IEnumWIA_DEV_INFO_iface; + return S_OK; } static HRESULT WINAPI wiadevmgr_CreateDevice(IWiaDevMgr *iface, BSTR bstrDeviceID, IWiaItem **ppWiaItemRoot)

1 0

Henri Verbeet : d2d1: Properly check if a face is real in d2d_path_geometry_add_face().
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: c575f04b6841fc107e8703a59516ad3da0463553 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c575f04b6841fc107e8703a59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 8 20:07:43 2015 +0200 d2d1: Properly check if a face is real in d2d_path_geometry_add_face(). In particular, the existing test may fail if the convex hull has only three vertices. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 3 +-- dlls/d2d1/tests/d2d1.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 80d004b..3919080 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1234,8 +1234,7 @@ static BOOL d2d_path_geometry_add_face(struct d2d_geometry *geometry, const stru probe.x += cdt->vertices[d2d_cdt_edge_origin(cdt, &tmp)].x * 0.50f; probe.y += cdt->vertices[d2d_cdt_edge_origin(cdt, &tmp)].y * 0.50f; - d2d_cdt_edge_next_left(cdt, &tmp, &tmp); - if (tmp.idx == base_edge->idx && d2d_path_geometry_point_inside(geometry, &probe)) + if (d2d_cdt_leftof(cdt, face->v[2], base_edge) && d2d_path_geometry_point_inside(geometry, &probe)) ++geometry->face_count; return TRUE; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index dfc560f..67901b6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1630,6 +1630,46 @@ static void test_path_geometry(void) ID2D1TransformedGeometry_Release(transformed_geometry); ID2D1PathGeometry_Release(geometry); + hr = ID2D1Factory_CreatePathGeometry(factory, &geometry); + ok(SUCCEEDED(hr), "Failed to create path geometry, hr %#x.\n", hr); + hr = ID2D1PathGeometry_Open(geometry, &sink); + ok(SUCCEEDED(hr), "Failed to open geometry sink, hr %#x.\n", hr); + + set_point(&point, 40.0f, 20.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + set_point(&point, 75.0f, 300.0f); + ID2D1GeometrySink_AddLine(sink, point); + set_point(&point, 5.0f, 300.0f); + ID2D1GeometrySink_AddLine(sink, point); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + set_point(&point, 40.0f, 290.0f); + ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED); + set_point(&point, 55.0f, 160.0f); + ID2D1GeometrySink_AddLine(sink, point); + set_point(&point, 25.0f, 160.0f); + ID2D1GeometrySink_AddLine(sink, point); + ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED); + + hr = ID2D1GeometrySink_Close(sink); + ok(SUCCEEDED(hr), "Failed to close geometry sink, hr %#x.\n", hr); + hr = ID2D1PathGeometry_GetFigureCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get figure count, hr %#x.\n", hr); + ok(count == 2, "Got unexpected figure count %u.\n", count); + hr = ID2D1PathGeometry_GetSegmentCount(geometry, &count); + ok(SUCCEEDED(hr), "Failed to get segment count, hr %#x.\n", hr); + ok(count == 6, "Got unexpected segment count %u.\n", count); + ID2D1GeometrySink_Release(sink); + + ID2D1RenderTarget_BeginDraw(rt); + ID2D1RenderTarget_Clear(rt, &color); + ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry, (ID2D1Brush *)brush, NULL); + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "a875e68e0cb9c055927b1b50b879f90b24e38470"); + ok(match, "Surface does not match.\n"); + ID2D1PathGeometry_Release(geometry); + ID2D1SolidColorBrush_Release(brush); ID2D1RenderTarget_Release(rt); refcount = ID2D1Factory_Release(factory);

1 0

Andrew Eikum : xaudio2_0: Fix registered XAudio20 CLSID.
by Alexandre Julliard 09 Oct '15

09 Oct '15

Module: wine Branch: master Commit: a3c340979664a2e8a27d37e8e5297efc980c50ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c340979664a2e8a27d37e8e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 8 10:35:20 2015 -0500 xaudio2_0: Fix registered XAudio20 CLSID. Thanks to Andrey Gusev for noticing during a bug retest. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_0/xaudio_classes.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_0/xaudio_classes.idl b/dlls/xaudio2_0/xaudio_classes.idl index 4a81eb1..08693fc 100644 --- a/dlls/xaudio2_0/xaudio_classes.idl +++ b/dlls/xaudio2_0/xaudio_classes.idl @@ -23,7 +23,7 @@ [ helpstring("XAudio2.0 Class"), threading(both), - uuid(e21a7345-eb21-468e-be50-804db97cf708) + uuid(fac23f48-31f5-45a8-b49b-5225d61401aa) ] coclass XAudio20 { interface IXAudio20; }

1 0

Jacek Caban : kernel32: Improved WTSGetActiveConsoleSessionId stub.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: ebb320fa37f2ad27649f571946af038e9d70ced2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb320fa37f2ad27649f57194… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 14:20:50 2015 +0200 kernel32: Improved WTSGetActiveConsoleSessionId stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index c03cdc7..5e6ab10 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3876,7 +3876,8 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void) { static int once; if (!once++) FIXME("stub\n"); - return 0; + /* Return current session id. */ + return NtCurrentTeb()->Peb->SessionId; } /**********************************************************************

1 0

Jacek Caban : kernel32: Added session id tests.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: e4e1b89732604c4be17c137e490d2e9710172f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e1b89732604c4be17c137e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 14:20:17 2015 +0200 kernel32: Added session id tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8447323..6dc1f5e 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -77,6 +77,8 @@ static BOOL (WINAPI *pSetInformationJobObject)(HANDLE job, JOBOBJECTINFOCLASS static HANDLE (WINAPI *pCreateIoCompletionPort)(HANDLE file, HANDLE existing_port, ULONG_PTR key, DWORD threads); static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); +static BOOL (WINAPI *pProcessIdToSessionId)(DWORD,DWORD*); +static DWORD (WINAPI *pWTSGetActiveConsoleSessionId)(void); /* ############################### */ static char base[MAX_PATH]; @@ -233,6 +235,8 @@ static BOOL init(void) pSetInformationJobObject = (void *)GetProcAddress(hkernel32, "SetInformationJobObject"); pCreateIoCompletionPort = (void *)GetProcAddress(hkernel32, "CreateIoCompletionPort"); pGetNumaProcessorNode = (void *)GetProcAddress(hkernel32, "GetNumaProcessorNode"); + pProcessIdToSessionId = (void *)GetProcAddress(hkernel32, "ProcessIdToSessionId"); + pWTSGetActiveConsoleSessionId = (void *)GetProcAddress(hkernel32, "WTSGetActiveConsoleSessionId"); return TRUE; } @@ -2788,6 +2792,25 @@ static void test_GetNumaProcessorNode(void) } } +static void test_session_info(void) +{ + DWORD session_id, active_session; + BOOL r; + + if (!pProcessIdToSessionId) + { + win_skip("ProcessIdToSessionId is missing\n"); + return; + } + + r = pProcessIdToSessionId(GetCurrentProcessId(), &session_id); + ok(r, "ProcessIdToSessionId failed: %u\n", GetLastError()); + trace("session_id = %x\n", session_id); + + active_session = pWTSGetActiveConsoleSessionId(); + trace("active_session = %x\n", active_session); +} + static void test_process_info(void) { char buf[4096]; @@ -2994,6 +3017,8 @@ START_TEST(process) test_DuplicateHandle(); test_StartupNoConsole(); test_GetNumaProcessorNode(); + test_session_info(); + /* things that can be tested: * lookup: check the way program to be executed is searched * handles: check the handle inheritance stuff (+sec options)

1 0

Jacek Caban : kernel32: Use session id stored in PEB in ProcessIdToSessionId.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 888d1c67bbd065422d1929e7cf9df23cb4aee93a URL: http://source.winehq.org/git/wine.git/?a=commit;h=888d1c67bbd065422d1929e7c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 14:20:05 2015 +0200 kernel32: Use session id stored in PEB in ProcessIdToSessionId. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index b0c06e3..c03cdc7 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3742,10 +3742,10 @@ BOOL WINAPI K32GetProcessMemoryInfo(HANDLE process, */ BOOL WINAPI ProcessIdToSessionId( DWORD procid, DWORD *sessionid_ptr ) { - /* According to MSDN, if the calling process is not in a terminal - * services environment, then the sessionid returned is zero. - */ - *sessionid_ptr = 0; + if (procid != GetCurrentProcessId()) + FIXME("Unsupported for other processes.\n"); + + *sessionid_ptr = NtCurrentTeb()->Peb->SessionId; return TRUE; }

1 0

Jacek Caban : ntdll: Initialize PEB SessionId to 1.
by Alexandre Julliard 08 Oct '15

08 Oct '15

Module: wine Branch: master Commit: 19e16319b85ba2a50ed187435da50c1ef75d6a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e16319b85ba2a50ed187435… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 8 14:19:43 2015 +0200 ntdll: Initialize PEB SessionId to 1. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 9f49cd4..aaf7a71 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -280,6 +280,12 @@ HANDLE thread_init(void) #endif #endif + /* + * Starting with Vista, the first user to log on has session id 1. + * Session id 0 is for processes that don't interact with the user (like services). + */ + peb->SessionId = 1; + /* allocate and initialize the initial TEB */ signal_alloc_thread( &teb );

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015