wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Andrey Gusev : setupapi: Add DECLSPEC_HOTPATCH to SetupDiEnumDeviceInfo().
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 5466df6957606718aaaee61debd85ab22fb85800 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5466df6957606718aaaee61d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Apr 23 14:28:49 2019 +0300 setupapi: Add DECLSPEC_HOTPATCH to SetupDiEnumDeviceInfo(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 45f4df7..7440465 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1707,7 +1707,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO devinfo, SP_DEVICE_INTERFA /*********************************************************************** * SetupDiEnumDeviceInfo (SETUPAPI.@) */ -BOOL WINAPI SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) +BOOL WINAPI DECLSPEC_HOTPATCH SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD index, SP_DEVINFO_DATA *device_data) { struct DeviceInfoSet *set; struct device *device;

1 0

Andrey Gusev : dxgi: Add DECLSPEC_HOTPATCH to d3d11_swapchain_Present().
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 29cd7dd0725e9f66bb080f4f5b76fd2e4328ba69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29cd7dd0725e9f66bb080f4f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Apr 23 14:28:27 2019 +0300 dxgi: Add DECLSPEC_HOTPATCH to d3d11_swapchain_Present(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46953 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46971 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 53da208..a859baf 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -317,7 +317,7 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); } -static HRESULT STDMETHODCALLTYPE d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) +static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface);

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.8.3.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 3e4c18a1be300209a064c60b727d1e1be043f5b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4c18a1be300209a064c60b… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 23 09:41:00 2019 -0500 mscoree: Update Wine Mono to 4.8.3. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 143931b..ed9ae3a 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.8.1" -#define MONO_SHA "4e073038c14c2496246ecb044ef8abfb8a1cfede58aa35168e04d484a003b032" +#define MONO_VERSION "4.8.3" +#define MONO_SHA "d6fa1f019bfa3c572438e4a2473ce25af1e937ed4cdcbe46554164ce25db0a76" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 3a3631e..8311db7 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "4.8.1" +#define WINE_MONO_VERSION "4.8.3" /* Mono embedding */ typedef struct _MonoDomain MonoDomain;

1 0

Jacek Caban : server: Allow creating file kernel objects.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: dcaeddd4db127ebabc4f27627e1278b4c51facb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcaeddd4db127ebabc4f2762… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 16:23:33 2019 +0200 server: Allow creating file kernel objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 1 - server/file.c | 23 +++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 9b3a219..030c955 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -847,7 +847,6 @@ static void test_ob_reference(const WCHAR *test_path) status = ObReferenceObjectByHandle(file_handle2, SYNCHRONIZE, *pIoFileObjectType, KernelMode, &obj2, NULL); ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); - todo_wine ok(obj1 == obj2, "obj1 != obj2\n"); file = obj1; diff --git a/server/file.c b/server/file.c index aae811e..4f34857 100644 --- a/server/file.c +++ b/server/file.c @@ -54,11 +54,12 @@ struct file { - struct object obj; /* object header */ - struct fd *fd; /* file descriptor for this file */ - unsigned int access; /* file access (FILE_READ_DATA etc.) */ - mode_t mode; /* file stat.st_mode */ - uid_t uid; /* file stat.st_uid */ + struct object obj; /* object header */ + struct fd *fd; /* file descriptor for this file */ + unsigned int access; /* file access (FILE_READ_DATA etc.) */ + mode_t mode; /* file stat.st_mode */ + uid_t uid; /* file stat.st_uid */ + struct list kernel_object; /* list of kernel object pointers */ }; static unsigned int generic_file_map_access( unsigned int access ); @@ -70,6 +71,7 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd static struct object *file_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *file_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); +static struct list *file_get_kernel_obj_list( struct object *obj ); static void file_destroy( struct object *obj ); static int file_get_poll_events( struct fd *fd ); @@ -94,7 +96,7 @@ static const struct object_ops file_ops = no_link_name, /* link_name */ NULL, /* unlink_name */ file_open_file, /* open_file */ - no_kernel_obj_list, /* get_kernel_obj_list */ + file_get_kernel_obj_list, /* get_kernel_obj_list */ fd_close_handle, /* close_handle */ file_destroy /* destroy */ }; @@ -136,6 +138,7 @@ struct file *create_file_for_fd( int fd, unsigned int access, unsigned int shari file->mode = st.st_mode; file->access = default_fd_map_access( &file->obj, access ); + list_init( &file->kernel_object ); if (!(file->fd = create_anonymous_fd( &file_fd_ops, fd, &file->obj, FILE_SYNCHRONOUS_IO_NONALERT ))) { @@ -162,6 +165,7 @@ struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigne { file->mode = st.st_mode; file->access = default_fd_map_access( &file->obj, access ); + list_init( &file->kernel_object ); if (!(file->fd = dup_fd_object( fd, access, sharing, FILE_SYNCHRONOUS_IO_NONALERT ))) { release_object( file ); @@ -181,6 +185,7 @@ static struct object *create_file_obj( struct fd *fd, unsigned int access, mode_ file->mode = mode; file->uid = ~(uid_t)0; file->fd = fd; + list_init( &file->kernel_object ); grab_object( fd ); set_fd_user( fd, &file_fd_ops, &file->obj ); return &file->obj; @@ -631,6 +636,12 @@ static struct object *file_open_file( struct object *obj, unsigned int access, return new_file; } +static struct list *file_get_kernel_obj_list( struct object *obj ) +{ + struct file *file = (struct file *)obj; + return &file->kernel_object; +} + static void file_destroy( struct object *obj ) { struct file *file = (struct file *)obj;

1 0

Jacek Caban : ntoskrnl.exe: Add MmUnmapLockedPages stub.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 9784c3fd6f1cdc1360b2d6c29027f1bffe93223b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9784c3fd6f1cdc1360b2d6c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 16:23:25 2019 +0200 ntoskrnl.exe: Add MmUnmapLockedPages stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 2 +- include/ddk/wdm.h | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f266dce..c1e6a9c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2833,6 +2833,14 @@ PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSO } /*********************************************************************** + * MmUnmapLockedPages (NTOSKRNL.EXE.@) + */ +void WINAPI MmUnmapLockedPages( void *base, MDL *mdl ) +{ + FIXME( "(%p %p_\n", base, mdl ); +} + +/*********************************************************************** * MmUnlockPagableImageSection (NTOSKRNL.EXE.@) */ VOID WINAPI MmUnlockPagableImageSection(PVOID ImageSectionHandle) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index f965ff5..633a8c4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -733,7 +733,7 @@ @ stdcall MmUnlockPagableImageSection(ptr) @ stdcall MmUnlockPages(ptr) @ stdcall MmUnmapIoSpace(ptr long) -@ stub MmUnmapLockedPages +@ stdcall MmUnmapLockedPages(ptr ptr) @ stub MmUnmapReservedMapping @ stub MmUnmapVideoDisplay @ stub MmUnmapViewInSessionSpace diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5f65f66..9b3a219 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -249,7 +249,7 @@ static void test_mdl_map(void) todo_wine ok(addr != NULL, "MmMapLockedPagesSpecifyCache failed\n"); - /* MmUnmapLockedPages(addr, mdl); */ + MmUnmapLockedPages(addr, mdl); IoFreeMdl(mdl); } diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a66a582..57a5357 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1615,6 +1615,7 @@ void * WINAPI MmGetSystemRoutineAddress(UNICODE_STRING*); PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG); MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); void WINAPI MmProbeAndLockPages(PMDLX, KPROCESSOR_MODE, LOCK_OPERATION); +void WINAPI MmUnmapLockedPages(void*, PMDL); static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) {

1 0

Jacek Caban : ntoskrnl.exe: Return error codes compatible with recent Windows versions in PsLookupThreadByThreadId.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 95bd82eee5dd822e404c623ed08eb2d4156657b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95bd82eee5dd822e404c623e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 16:23:14 2019 +0200 ntoskrnl.exe: Return error codes compatible with recent Windows versions in PsLookupThreadByThreadId. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++-- dlls/ntoskrnl.exe/tests/driver.c | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 7f3ca05..f266dce 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2558,13 +2558,18 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) */ NTSTATUS WINAPI PsLookupThreadByThreadId( HANDLE threadid, PETHREAD *thread ) { + OBJECT_ATTRIBUTES attr; + CLIENT_ID cid; NTSTATUS status; HANDLE handle; TRACE( "(%p %p)\n", threadid, thread ); - if (!(handle = OpenThread( THREAD_QUERY_INFORMATION, FALSE, HandleToUlong(threadid) ))) - return STATUS_INVALID_PARAMETER; + cid.UniqueProcess = 0; + cid.UniqueThread = threadid; + InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); + status = NtOpenThread( &handle, THREAD_QUERY_INFORMATION, &attr, &cid ); + if (status) return status; status = ObReferenceObjectByHandle( handle, THREAD_ALL_ACCESS, PsThreadType, KernelMode, (void**)thread, NULL ); diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d7083f7..5f65f66 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -170,6 +170,11 @@ static void winetest_end_todo(void) todo_level >>= 1; } +static int broken(int condition) +{ + return !running_under_wine && condition; +} + #define ok(condition, ...) ok_(__FILE__, __LINE__, condition, __VA_ARGS__) #define todo_if(is_todo) for (winetest_start_todo(is_todo); \ winetest_loop_todo(); \ @@ -1179,7 +1184,8 @@ static void test_lookup_thread(void) if (thread) ObDereferenceObject(thread); status = PsLookupThreadByThreadId(NULL, &thread); - ok(status == STATUS_INVALID_PARAMETER, "PsLookupThreadByThreadId returned %#x\n", status); + ok(status == STATUS_INVALID_CID || broken(status == STATUS_INVALID_PARAMETER) /* winxp */, + "PsLookupThreadByThreadId returned %#x\n", status); } static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info)

1 0

Jacek Caban : ntoskrnl.exe/tests: Add more NtOpenThread tests.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: c448550e7435946ac5501100ef06245fa9e5482e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c448550e7435946ac5501100… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 16:22:50 2019 +0200 ntoskrnl.exe/tests: Add more NtOpenThread tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 2 +- dlls/ntdll/tests/info.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index ac5d465..d167abe 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -142,7 +142,7 @@ HANDLE WINAPI OpenThread( DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwTh attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - cid.UniqueProcess = 0; /* FIXME */ + cid.UniqueProcess = 0; cid.UniqueThread = ULongToHandle(dwThreadId); status = NtOpenThread( &handle, dwDesiredAccess, &attr, &cid ); if (status) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c278c8d..262d2f4 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -39,6 +39,8 @@ static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); static DEP_SYSTEM_POLICY_TYPE (WINAPI * pGetSystemDEPPolicy)(void); +static NTSTATUS (WINAPI * pNtOpenThread)(HANDLE *, ACCESS_MASK, const OBJECT_ATTRIBUTES *, const CLIENT_ID *); +static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void *, ULONG, ULONG *); static BOOL is_wow64; @@ -84,6 +86,8 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtCreateSection); NTDLL_GET_PROC(NtMapViewOfSection); NTDLL_GET_PROC(NtUnmapViewOfSection); + NTDLL_GET_PROC(NtOpenThread); + NTDLL_GET_PROC(NtQueryObject); /* not present before XP */ pNtGetCurrentProcessorNumber = (void *) GetProcAddress(hntdll, "NtGetCurrentProcessorNumber"); @@ -2247,6 +2251,61 @@ static void test_query_data_alignment(void) ok(value == 64, "Expected 64, got %u\n", value); } +static void test_thread_lookup(void) +{ + OBJECT_BASIC_INFORMATION obj_info; + THREAD_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + CLIENT_ID cid; + HANDLE handle; + NTSTATUS status; + + InitializeObjectAttributes( &attr, NULL, 0, NULL, NULL ); + cid.UniqueProcess = ULongToHandle(GetCurrentProcessId()); + cid.UniqueThread = ULongToHandle(GetCurrentThreadId()); + status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); + ok(!status, "NtOpenThread returned %#x\n", status); + + status = pNtQueryObject(handle, ObjectBasicInformation, &obj_info, sizeof(obj_info), NULL); + ok(!status, "NtQueryObject returned: %#x\n", status); + ok(obj_info.GrantedAccess == (THREAD_QUERY_LIMITED_INFORMATION | THREAD_QUERY_INFORMATION) + || broken(obj_info.GrantedAccess == THREAD_QUERY_INFORMATION), /* winxp */ + "GrantedAccess = %x\n", obj_info.GrantedAccess); + + status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL); + ok(!status, "NtQueryInformationThread returned %#x\n", status); + ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()), + "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId()); + ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()), + "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId()); + pNtClose(handle); + + cid.UniqueProcess = 0; + cid.UniqueThread = ULongToHandle(GetCurrentThreadId()); + status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); + ok(!status, "NtOpenThread returned %#x\n", status); + status = pNtQueryInformationThread(handle, ThreadBasicInformation, &info, sizeof(info), NULL); + ok(!status, "NtQueryInformationThread returned %#x\n", status); + ok(info.ClientId.UniqueProcess == ULongToHandle(GetCurrentProcessId()), + "UniqueProcess = %p expected %x\n", info.ClientId.UniqueProcess, GetCurrentProcessId()); + ok(info.ClientId.UniqueThread == ULongToHandle(GetCurrentThreadId()), + "UniqueThread = %p expected %x\n", info.ClientId.UniqueThread, GetCurrentThreadId()); + pNtClose(handle); + + cid.UniqueProcess = ULongToHandle(0xdeadbeef); + cid.UniqueThread = ULongToHandle(GetCurrentThreadId()); + status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); + todo_wine + ok(status == STATUS_INVALID_CID, "NtOpenThread returned %#x\n", status); + if (!status) pNtClose(handle); + + cid.UniqueProcess = 0; + cid.UniqueThread = ULongToHandle(0xdeadbeef); + status = pNtOpenThread(&handle, THREAD_QUERY_INFORMATION, &attr, &cid); + ok(status == STATUS_INVALID_CID || broken(status == STATUS_INVALID_PARAMETER) /* winxp */, + "NtOpenThread returned %#x\n", status); +} + START_TEST(info) { char **argv; @@ -2390,4 +2449,6 @@ START_TEST(info) trace("Starting test_query_data_alignment()\n"); test_query_data_alignment(); + + test_thread_lookup(); }

1 0

Akihiro Sagawa : comctl32/edit: Fix minimum control size conditions when using EC_USEFONTINFO.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 05864617bbe9d4278b06d3a312c804b6410808cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=05864617bbe9d4278b06d3a3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:37 2019 +0900 comctl32/edit: Fix minimum control size conditions when using EC_USEFONTINFO. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 47 +++++++++++++--------------------------------- dlls/comctl32/tests/edit.c | 16 +--------------- 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 1f17276..38a0d97 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -2694,26 +2694,10 @@ static void EDIT_EM_SetLimitText(EDITSTATE *es, UINT limit) * action wParam despite what the docs say. EC_USEFONTINFO calculates the * margin according to the textmetrics of the current font. * - * When EC_USEFONTINFO is used in the non_cjk case the margins only - * change if the edit control is equal to or larger than a certain - * size. Though there is an exception for the empty client rect case - * with small font sizes. + * When EC_USEFONTINFO is used, the margins only change if the edit control is + * equal to or larger than a certain size. The empty client rect is treated as + * 80 pixels width. */ -static BOOL is_cjk(UINT charset) -{ - switch(charset) - { - case SHIFTJIS_CHARSET: - case HANGUL_CHARSET: - case GB2312_CHARSET: - case CHINESEBIG5_CHARSET: - return TRUE; - } - /* HANGUL_CHARSET is strange, though treated as CJK by Win 8, it is - * not by other versions including Win 10. */ - return FALSE; -} - static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, WORD left, WORD right, BOOL repaint) { @@ -2725,25 +2709,20 @@ static void EDIT_EM_SetMargins(EDITSTATE *es, INT action, if (es->font && (left == EC_USEFONTINFO || right == EC_USEFONTINFO)) { HDC dc = GetDC(es->hwndSelf); HFONT old_font = SelectObject(dc, es->font); - LONG width = GdiGetCharDimensions(dc, &tm, NULL); + LONG width = GdiGetCharDimensions(dc, &tm, NULL), rc_width; RECT rc; /* The default margins are only non zero for TrueType or Vector fonts */ if (tm.tmPitchAndFamily & ( TMPF_VECTOR | TMPF_TRUETYPE )) { - if (!is_cjk(tm.tmCharSet)) { - default_left_margin = width / 2; - default_right_margin = width / 2; - - GetClientRect(es->hwndSelf, &rc); - if (rc.right - rc.left < (width / 2 + width) * 2 && - (width >= 28 || !IsRectEmpty(&rc)) ) { - default_left_margin = es->left_margin; - default_right_margin = es->right_margin; - } - } else { - /* FIXME: figure out the CJK values. They are not affected by the client rect. */ - default_left_margin = width / 2; - default_right_margin = width / 2; + /* FIXME: figure out the CJK values. */ + default_left_margin = width / 2; + default_right_margin = width / 2; + + GetClientRect(es->hwndSelf, &rc); + rc_width = !IsRectEmpty(&rc) ? rc.right - rc.left : 80; + if (rc_width < default_left_margin + default_right_margin + width * 2) { + default_left_margin = es->left_margin; + default_right_margin = es->right_margin; } } SelectObject(dc, old_font); diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 521daff..70cb94e 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1501,7 +1501,7 @@ static void test_margins_usefontinfo(UINT charset) HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk, cjk_charset; + BOOL cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1536,19 +1536,6 @@ static void test_margins_usefontinfo(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - - charset = GetTextCharset(hdc); - switch (charset) - { - case SHIFTJIS_CHARSET: - case HANGUL_CHARSET: - case GB2312_CHARSET: - case CHINESEBIG5_CHARSET: - cjk = TRUE; - break; - default: - cjk = FALSE; - } cjk_charset = is_cjk_charset(hdc); hfont = SelectObject(hdc, hfont); @@ -1590,7 +1577,6 @@ static void test_margins_usefontinfo(UINT charset) SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - todo_wine_if(cjk) ok(margins == small_margins, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Akihiro Sagawa : comctl32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: 81c30446d9b13c6e68d4b6b84523d801c7db3cbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=81c30446d9b13c6e68d4b6b8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:35 2019 +0900 comctl32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins. Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true when font's charset is CJK. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 47 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 3e0239c..521daff 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1485,17 +1485,28 @@ static void test_edit_control_scroll(void) DestroyWindow (hwEdit); } +static BOOL is_cjk_charset(HDC dc) +{ + switch (GdiGetCodePage(dc)) { + case 932: case 936: case 949: case 950: case 1361: + return TRUE; + default: + return FALSE; + } +} + static void test_margins_usefontinfo(UINT charset) { - INT margins, threshold, expect, empty_expect, small_expect; HWND hwnd; HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk; + BOOL cjk, cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; + INT margins, threshold, expect, empty_expect; + const UINT small_margins = MAKELONG(1, 5); memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1525,8 +1536,6 @@ static void test_margins_usefontinfo(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - small_expect = 0; - empty_expect = size.cx >= 28 ? small_expect : expect; charset = GetTextCharset(hdc); switch (charset) @@ -1540,26 +1549,35 @@ static void test_margins_usefontinfo(UINT charset) default: cjk = FALSE; } + cjk_charset = is_cjk_charset(hdc); hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk) + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); else { - ok(HIWORD(margins) > 0 && LOWORD(margins) > 0, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); - expect = empty_expect = small_expect = margins; + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + expect = margins; } DestroyWindow(hwnd); - threshold = (size.cx / 2 + size.cx) * 2; + threshold = HIWORD(expect) + LOWORD(expect) + size.cx * 2; + empty_expect = threshold > 80 ? small_margins : expect; - /* Size below which non-cjk margins are zero */ + /* Size below the threshold, margins remain unchanged */ hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold - 1, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); @@ -1569,11 +1587,14 @@ static void test_margins_usefontinfo(UINT charset) ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - ok(margins == small_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + todo_wine_if(cjk) + ok(margins == small_margins, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); - /* Size at which non-cjk margins become non-zero */ + /* Size at the threshold, margins become non-zero */ hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, threshold, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); @@ -1583,6 +1604,8 @@ static void test_margins_usefontinfo(UINT charset) ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd); @@ -1597,6 +1620,8 @@ static void test_margins_usefontinfo(UINT charset) ok(margins == 0, "got %x\n", margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == empty_expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); DestroyWindow(hwnd);

1 0

Akihiro Sagawa : comctl32/tests: Skip margin tests if a font for the target charset isn't available.
by Alexandre Julliard 23 Apr '19

23 Apr '19

Module: wine Branch: master Commit: a0e6d45519ff440a060311a865f32c7bfb3ad2a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0e6d45519ff440a060311a8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 23 22:01:33 2019 +0900 comctl32/tests: Skip margin tests if a font for the target charset isn't available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 64d2fe8..3e0239c 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1490,6 +1490,7 @@ static void test_margins_usefontinfo(UINT charset) INT margins, threshold, expect, empty_expect, small_expect; HWND hwnd; HDC hdc; + TEXTMETRICW tm; SIZE size; BOOL cjk; LOGFONTA lf; @@ -1513,7 +1514,16 @@ static void test_margins_usefontinfo(UINT charset) hdc = GetDC(hwnd); hfont = SelectObject(hdc, hfont); - size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); + size.cx = GdiGetCharDimensions( hdc, &tm, &size.cy ); + if ((charset != tm.tmCharSet && charset != DEFAULT_CHARSET) || + !(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) { + skip("%s for charset %d isn't available\n", lf.lfFaceName, charset); + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); + return; + } expect = MAKELONG(size.cx / 2, size.cx / 2); small_expect = 0; empty_expect = size.cx >= 28 ? small_expect : expect;

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
81
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 April 2019