May 2020 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Don't call terminate_thread request if not necessary.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 42bd67b576027ea6e7c53bccbd9476a2a97472cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=42bd67b576027ea6e7c53bcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 29 12:25:16 2020 +0200 ntdll: Don't call terminate_thread request if not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 18 ++++++++++-------- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 - server/request.h | 1 - server/thread.c | 8 +------- server/trace.c | 1 - 6 files changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 3d370f7a98..52f8b6ec61 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -738,17 +738,19 @@ NTSTATUS WINAPI NtAlertThread( HANDLE handle ) NTSTATUS WINAPI NtTerminateThread( HANDLE handle, LONG exit_code ) { NTSTATUS ret; - BOOL self; + BOOL self = (handle == GetCurrentThread()); - SERVER_START_REQ( terminate_thread ) + if (!self || exit_code) { - req->handle = wine_server_obj_handle( handle ); - req->exit_code = exit_code; - ret = wine_server_call( req ); - self = !ret && reply->self; + SERVER_START_REQ( terminate_thread ) + { + req->handle = wine_server_obj_handle( handle ); + req->exit_code = exit_code; + ret = wine_server_call( req ); + self = !ret && reply->self; + } + SERVER_END_REQ; } - SERVER_END_REQ; - if (self) abort_thread( exit_code ); return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3e205d4165..1fb345bc5f 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -938,7 +938,7 @@ struct terminate_thread_reply { struct reply_header __header; int self; - int last; + char __pad_12[4]; }; @@ -6685,7 +6685,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 604 +#define SERVER_PROTOCOL_VERSION 605 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 86efb01cc3..600113ff02 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -896,7 +896,6 @@ struct rawinput_device int exit_code; /* thread exit code */ @REPLY int self; /* suicide? */ - int last; /* last thread in this process? */ @END diff --git a/server/request.h b/server/request.h index 7a7feb3cf9..4a65296eb5 100644 --- a/server/request.h +++ b/server/request.h @@ -814,7 +814,6 @@ C_ASSERT( FIELD_OFFSET(struct terminate_thread_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct terminate_thread_request, exit_code) == 16 ); C_ASSERT( sizeof(struct terminate_thread_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct terminate_thread_reply, self) == 8 ); -C_ASSERT( FIELD_OFFSET(struct terminate_thread_reply, last) == 12 ); C_ASSERT( sizeof(struct terminate_thread_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_request, handle) == 12 ); C_ASSERT( sizeof(struct get_process_info_request) == 16 ); diff --git a/server/thread.c b/server/thread.c index ea545d5c30..e2bfa50c7b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1489,17 +1489,11 @@ DECL_HANDLER(terminate_thread) { struct thread *thread; - reply->self = 0; - reply->last = 0; if ((thread = get_thread_from_handle( req->handle, THREAD_TERMINATE ))) { thread->exit_code = req->exit_code; if (thread != current) kill_thread( thread, 1 ); - else - { - reply->self = 1; - reply->last = (thread->process->running_threads == 1); - } + else reply->self = 1; release_object( thread ); } } diff --git a/server/trace.c b/server/trace.c index c5c006ce41..1f0e71f1b6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1368,7 +1368,6 @@ static void dump_terminate_thread_request( const struct terminate_thread_request static void dump_terminate_thread_reply( const struct terminate_thread_reply *req ) { fprintf( stderr, " self=%d", req->self ); - fprintf( stderr, ", last=%d", req->last ); } static void dump_get_process_info_request( const struct get_process_info_request *req )

1 0

Paul Gofman : ntoskrnl.exe: Implement image load notify routines registration.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 26fbff05a1e39a3c910ff778e2229c674a0569c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26fbff05a1e39a3c910ff778… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:10 2020 +0300 ntoskrnl.exe: Implement image load notify routines registration. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 28 ++++++++++++++++++++++++---- include/ddk/ntddk.h | 1 + 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e9c35cf7e3..94733ec60a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -85,6 +85,9 @@ static DWORD client_tid; static HANDLE ntoskrnl_heap; +static PLOAD_IMAGE_NOTIFY_ROUTINE load_image_notify_routines[8]; +static unsigned int load_image_notify_routine_count; + struct wine_driver { DRIVER_OBJECT driver_obj; @@ -3001,10 +3004,21 @@ NTSTATUS WINAPI PsRemoveCreateThreadNotifyRoutine( PCREATE_THREAD_NOTIFY_ROUTINE /*********************************************************************** * PsRemoveLoadImageNotifyRoutine (NTOSKRNL.EXE.@) */ - NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) +NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) { - FIXME( "stub: %p\n", NotifyRoutine ); - return STATUS_SUCCESS; + unsigned int i; + + TRACE("routine %p.\n", routine); + + for (i = 0; i < load_image_notify_routine_count; ++i) + if (load_image_notify_routines[i] == routine) + { + --load_image_notify_routine_count; + memmove(&load_image_notify_routines[i], &load_image_notify_routines[i + 1], + sizeof(*load_image_notify_routines) * (load_image_notify_routine_count - i)); + return STATUS_SUCCESS; + } + return STATUS_PROCEDURE_NOT_FOUND; } @@ -3160,7 +3174,13 @@ NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_b */ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) { - FIXME("(%p) stub\n", routine); + FIXME("routine %p, semi-stub.\n", routine); + + if (load_image_notify_routine_count == ARRAY_SIZE(load_image_notify_routines)) + return STATUS_INSUFFICIENT_RESOURCES; + + load_image_notify_routines[load_image_notify_routine_count++] = routine; + return STATUS_SUCCESS; } diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index e3c9124023..2b05fda711 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -231,6 +231,7 @@ BOOLEAN WINAPI MmIsAddressValid(void *); HANDLE WINAPI PsGetProcessId(PEPROCESS); HANDLE WINAPI PsGetThreadId(PETHREAD); HANDLE WINAPI PsGetThreadProcessId(PETHREAD); +NTSTATUS WINAPI PsRemoveLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutine(PCREATE_PROCESS_NOTIFY_ROUTINE,BOOLEAN); NTSTATUS WINAPI PsSetCreateProcessNotifyRoutineEx(PCREATE_PROCESS_NOTIFY_ROUTINE_EX,BOOLEAN); NTSTATUS WINAPI PsSetCreateThreadNotifyRoutine(PCREATE_THREAD_NOTIFY_ROUTINE);

1 0

Paul Gofman : ntoskrnl.exe: Add stub for ExRegisterCallback() function.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 7bc99ae1254f467a23b46756dce40a15494f0758 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bc99ae1254f467a23b46756… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:06 2020 +0300 ntoskrnl.exe: Add stub for ExRegisterCallback() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 09d4796ad4..f0892141c2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2062,6 +2062,14 @@ NTSTATUS WINAPI ExCreateCallback(PCALLBACK_OBJECT *obj, POBJECT_ATTRIBUTES attr, return STATUS_SUCCESS; } +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT callback_object, + PCALLBACK_FUNCTION callback_function, void *callback_context) +{ + FIXME("callback_object %p, callback_function %p, callback_context %p stub.\n", + callback_object, callback_function, callback_context); + + return (void *)0xdeadbeef; +} /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) @@ -3046,6 +3054,7 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) if (!pFunc) { hMod = GetModuleHandleW( halW ); + if (hMod) pFunc = GetProcAddress( hMod, routineNameA.Buffer ); } RtlFreeAnsiString( &routineNameA ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dd7ff73bee..dcec2375df 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -183,7 +183,7 @@ @ stub ExRaiseException @ stub ExRaiseHardError @ stub ExRaiseStatus -@ stub ExRegisterCallback +@ stdcall ExRegisterCallback(ptr ptr ptr) @ stub ExReinitializeResourceLite @ stdcall ExReleaseResourceForThreadLite(ptr long) @ extern ExSemaphoreObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a67377352d..282ea14b77 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1356,6 +1356,7 @@ typedef void * (NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); typedef void * (NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PFREE_FUNCTION)(void *); typedef void (NTAPI *PFREE_FUNCTION_EX)(void *, PLOOKASIDE_LIST_EX); +typedef void (NTAPI *PCALLBACK_FUNCTION)(void *, void *, void *); #ifdef _WIN64 #define LOOKASIDE_ALIGN DECLSPEC_CACHEALIGN @@ -1627,6 +1628,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPI LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); BOOLEAN WINAPI ExIsResourceAcquiredExclusiveLite(ERESOURCE*); ULONG WINAPI ExIsResourceAcquiredSharedLite(ERESOURCE*); +void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT,PCALLBACK_FUNCTION,void*); void FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN);

1 0

Ziqing Hui : windowscodecs: Get DDS parameters when initialize.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: ab0d2b1434d8f81e1f291cc10115e5cef7f1d3b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab0d2b1434d8f81e1f291cc1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 28 13:08:39 2020 +0800 windowscodecs: Get DDS parameters when initialize. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 100 ++++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 36 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index de4cd1ea01..7341147245 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -93,6 +93,18 @@ typedef struct { DWORD miscFlags2; } DDS_HEADER_DXT10; +typedef struct dds_info { + UINT width; + UINT height; + UINT depth; + UINT mip_levels; + UINT array_size; + UINT frame_count; + DXGI_FORMAT format; + WICDdsDimension dimension; + WICDdsAlphaMode alpha_mode; +} dds_info; + typedef struct DdsDecoder { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICDdsDecoder IWICDdsDecoder_iface; @@ -102,6 +114,7 @@ typedef struct DdsDecoder { CRITICAL_SECTION lock; DDS_HEADER header; DDS_HEADER_DXT10 header_dxt10; + dds_info info; } DdsDecoder; typedef struct DdsFrameDecode { @@ -175,6 +188,45 @@ static WICDdsAlphaMode get_alpha_mode_from_fourcc(DWORD fourcc) } } +static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *header_dxt10) +{ + int i; + UINT depth; + + info->width = header->width; + info->height = header->height; + info->depth = 1; + info->mip_levels = 1; + info->array_size = 1; + if (header->depth) info->depth = header->depth; + if (header->mipMapCount) info->mip_levels = header->mipMapCount; + + if (has_extended_header(header)) { + if (header_dxt10->arraySize) info->array_size = header_dxt10->arraySize; + info->format = header_dxt10->dxgiFormat; + info->dimension = get_dimension(NULL, header_dxt10); + info->alpha_mode = header_dxt10->miscFlags2 & 0x00000008; + } else { + info->format = get_format_from_fourcc(header->ddspf.fourCC); + info->dimension = get_dimension(header, NULL); + info->alpha_mode = get_alpha_mode_from_fourcc(header->ddspf.fourCC); + } + + /* get frame count */ + if (info->depth == 1) { + info->frame_count = info->array_size * info->mip_levels; + } else { + info->frame_count = 0; + depth = info->depth; + for (i = 0; i < info->mip_levels; i++) + { + info->frame_count += depth; + if (depth > 1) depth /= 2; + } + info->frame_count *= info->array_size; + } +} + static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -497,6 +549,8 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p } } + get_dds_info(&This->info, &This->header, &This->header_dxt10); + This->initialized = TRUE; This->stream = pIStream; IStream_AddRef(pIStream); @@ -571,33 +625,17 @@ static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); - UINT arraySize = 1, mipMapCount = 1, depth = 1; - int i; if (!pCount) return E_INVALIDARG; if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; EnterCriticalSection(&This->lock); - if (This->header.mipMapCount) mipMapCount = This->header.mipMapCount; - if (This->header.depth) depth = This->header.depth; - if (has_extended_header(&This->header) && This->header_dxt10.arraySize) arraySize = This->header_dxt10.arraySize; - - if (depth == 1) { - *pCount = arraySize * mipMapCount; - } else { - *pCount = 0; - for (i = 0; i < mipMapCount; i++) - { - *pCount += depth; - if (depth > 1) depth /= 2; - } - *pCount *= arraySize; - } + *pCount = This->info.frame_count; LeaveCriticalSection(&This->lock); - TRACE("(%p) <-- %d\n", iface, *pCount); + TRACE("(%p) -> %d\n", iface, *pCount); return S_OK; } @@ -667,24 +705,14 @@ static HRESULT WINAPI DdsDecoder_Dds_GetParameters(IWICDdsDecoder *iface, goto end; } - parameters->Width = This->header.width; - parameters->Height = This->header.height; - parameters->Depth = 1; - parameters->MipLevels = 1; - parameters->ArraySize = 1; - if (This->header.depth) parameters->Depth = This->header.depth; - if (This->header.mipMapCount) parameters->MipLevels = This->header.mipMapCount; - - if (has_extended_header(&This->header)) { - if (This->header_dxt10.arraySize) parameters->ArraySize = This->header_dxt10.arraySize; - parameters->DxgiFormat = This->header_dxt10.dxgiFormat; - parameters->Dimension = get_dimension(NULL, &This->header_dxt10); - parameters->AlphaMode = This->header_dxt10.miscFlags2 & 0x00000008; - } else { - parameters->DxgiFormat = get_format_from_fourcc(This->header.ddspf.fourCC); - parameters->Dimension = get_dimension(&This->header, NULL); - parameters->AlphaMode = get_alpha_mode_from_fourcc(This->header.ddspf.fourCC); - } + parameters->Width = This->info.width; + parameters->Height = This->info.height; + parameters->Depth = This->info.depth; + parameters->MipLevels = This->info.mip_levels; + parameters->ArraySize = This->info.array_size; + parameters->DxgiFormat = This->info.format; + parameters->Dimension = This->info.dimension; + parameters->AlphaMode = This->info.alpha_mode; TRACE("(%p) -> (%dx%d depth=%d mipLevels=%d arraySize=%d dxgiFormat=0x%x dimension=0x%x alphaMode=0x%x)\n", iface, parameters->Width, parameters->Height, parameters->Depth, parameters->MipLevels,

1 0

Jacek Caban : gdiplus/tests: Introduce compare_uint helper.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 10257a9417323f87094eda18fb4122f02a36aad4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10257a9417323f87094eda18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:22 2020 +0200 gdiplus/tests: Introduce compare_uint helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index de6fad093d..b17323cb75 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -39,15 +39,21 @@ static GpStatus (WINGDIPAPI *pGdipInitializePalette)(ColorPalette*,PaletteType,I #define expect(expected, got) ok((got) == (expected), "Expected %d, got %d\n", (UINT)(expected), (UINT)(got)) #define expectf(expected, got) ok(fabs((expected) - (got)) < 0.0001, "Expected %f, got %f\n", (expected), (got)) +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + return diff <= max_diff; +} + static BOOL color_match(ARGB c1, ARGB c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if (!compare_uint(c1 & 0xff, c2 & 0xff, max_diff)) return FALSE; return TRUE; }

1 0

Serge Gautherie : mscoree: RegQueryValueExW() wants bytes, not chars.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: e4e5eda3d9afcb5360747ddd97e6bf4fdc0c1c0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e5eda3d9afcb5360747ddd… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Thu May 28 04:30:37 2020 +0200 mscoree: RegQueryValueExW() wants bytes, not chars. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 2 +- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 9a299662e3..7702994252 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -477,7 +477,7 @@ static BOOL get_install_root(LPWSTR install_dir) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) return FALSE; - len = MAX_PATH; + len = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) { RegCloseKey(key); diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 81fe5610b7..4679d79e66 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -80,7 +80,7 @@ static BOOL get_install_root(LPWSTR install_dir) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, dotnet_key, 0, KEY_READ, &key)) return FALSE; - len = MAX_PATH; + len = MAX_PATH * sizeof(WCHAR); if (RegQueryValueExW(key, install_root, 0, NULL, (LPBYTE)install_dir, &len)) { RegCloseKey(key);

1 0

Paul Gofman : ntoskrnl.exe: Fix ObRegisterCallbacks() function parameter definition.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 4ae92fdaf653c8746284ecc8840a24e8ee5cb8ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ae92fdaf653c8746284ecc8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:04 2020 +0300 ntoskrnl.exe: Fix ObRegisterCallbacks() function parameter definition. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 4 ++-- include/ddk/wdm.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d50eac6c82..3cb5591920 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2807,9 +2807,9 @@ void FASTCALL ObfDereferenceObject( void *obj ) /*********************************************************************** * ObRegisterCallbacks (NTOSKRNL.EXE.@) */ -NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION *callBack, void **handle) +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION callback, void **handle) { - FIXME( "stub: %p %p\n", callBack, handle ); + FIXME( "callback %p, handle %p.\n", callback, handle ); if(handle) *handle = UlongToHandle(0xdeadbeaf); diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 38a3098994..a67377352d 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1749,7 +1749,7 @@ static inline void *MmGetSystemAddressForMdlSafe(MDL *mdl, ULONG priority) void FASTCALL ObfReferenceObject(void*); void WINAPI ObDereferenceObject(void*); USHORT WINAPI ObGetFilterVersion(void); -NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION*, void**); +NTSTATUS WINAPI ObRegisterCallbacks(POB_CALLBACK_REGISTRATION, void**); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); NTSTATUS WINAPI ObReferenceObjectByName(UNICODE_STRING*,ULONG,ACCESS_STATE*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,void*,void**); NTSTATUS WINAPI ObReferenceObjectByPointer(void*,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE);

1 0

Paul Gofman : ntoskrnl.exe: Add stub for ExUnregisterCallback() function.
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 9effc3f96333d809ffba43b975fa062cbf8912d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9effc3f96333d809ffba43b9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 29 10:53:07 2020 +0300 ntoskrnl.exe: Add stub for ExUnregisterCallback() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 5 +++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f0892141c2..3c8b207a4a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2071,6 +2071,11 @@ void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT callback_object, return (void *)0xdeadbeef; } +void WINAPI ExUnregisterCallback(void *callback_registration) +{ + FIXME("callback_registration %p stub.\n", callback_registration); +} + /*********************************************************************** * ExFreePool (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index dcec2375df..c442656694 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -191,7 +191,7 @@ @ stdcall ExSetTimerResolution(long long) @ stub ExSystemExceptionFilter @ stdcall ExSystemTimeToLocalTime(ptr ptr) RtlSystemTimeToLocalTime -@ stub ExUnregisterCallback +@ stdcall ExUnregisterCallback(ptr) @ stdcall ExUuidCreate(ptr) @ stub ExVerifySuite @ stub ExWindowStationObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 282ea14b77..0d98680cfa 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1632,6 +1632,7 @@ void * WINAPI ExRegisterCallback(PCALLBACK_OBJECT,PCALLBACK_FUNCTION,void*); void FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX); void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); +void WINAPI ExUnregisterCallback(void*); void WINAPI IoAcquireCancelSpinLock(KIRQL*); NTSTATUS WINAPI IoAcquireRemoveLockEx(IO_REMOVE_LOCK*,void*,const char*,ULONG, ULONG);

1 0

Ziqing Hui : windowscodecs: Implement DdsDecoder_Dds_GetFrame().
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 870b08b7fd59bd37dc66f7322019618e0e494595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=870b08b7fd59bd37dc66f732… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 28 13:08:55 2020 +0800 windowscodecs: Implement DdsDecoder_Dds_GetFrame(). DdsDecoder_GetFrame() is implemented on top of DdsDecoder_Dds_GetFrame(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 80 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 7341147245..333f015820 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -121,8 +121,12 @@ typedef struct DdsFrameDecode { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; IWICDdsFrameDecode IWICDdsFrameDecode_iface; LONG ref; + UINT width; + UINT height; } DdsFrameDecode; +static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); + static inline BOOL has_extended_header(DDS_HEADER *header) { return (header->ddspf.flags & DDPF_FOURCC) && @@ -643,15 +647,35 @@ static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, UINT index, IWICBitmapFrameDecode **ppIBitmapFrame) { - HRESULT hr; - DdsFrameDecode *frame_decode; + DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + UINT frame_per_texture, array_index, mip_level, slice_index, depth; - FIXME("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); + TRACE("(%p,%u,%p)\n", iface, index, ppIBitmapFrame); - hr = DdsFrameDecode_CreateInstance(&frame_decode); - if (hr == S_OK) *ppIBitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; + if (!ppIBitmapFrame) return E_INVALIDARG; - return hr; + EnterCriticalSection(&This->lock); + + if (!This->initialized) { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + frame_per_texture = This->info.frame_count / This->info.array_size; + array_index = index / frame_per_texture; + slice_index = index % frame_per_texture; + depth = This->info.depth; + mip_level = 0; + while (slice_index >= depth) + { + slice_index -= depth; + mip_level++; + if (depth > 1) depth /= 2; + } + + LeaveCriticalSection(&This->lock); + + return DdsDecoder_Dds_GetFrame(&This->IWICDdsDecoder_iface, array_index, mip_level, slice_index, ppIBitmapFrame); } static const IWICBitmapDecoderVtbl DdsDecoder_Vtbl = { @@ -730,9 +754,49 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, UINT arrayIndex, UINT mipLevel, UINT sliceIndex, IWICBitmapFrameDecode **bitmapFrame) { - TRACE("(%p,%u,%u,%u,%p): Stub.\n", iface, arrayIndex, mipLevel, sliceIndex, bitmapFrame); + DdsDecoder *This = impl_from_IWICDdsDecoder(iface); + HRESULT hr; + UINT width = 0, height = 0; + int j; + DdsFrameDecode *frame_decode; - return E_NOTIMPL; + TRACE("(%p,%u,%u,%u,%p)\n", iface, arrayIndex, mipLevel, sliceIndex, bitmapFrame); + + if (!bitmapFrame) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + if (!This->initialized) { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + if (arrayIndex >= This->info.array_size || mipLevel >= This->info.mip_levels || sliceIndex >= This->info.depth) { + hr = E_INVALIDARG; + goto end; + } + + width = This->info.width; + height = This->info.height; + for (j = 0; j < mipLevel; j++) + { + if (width > 1) width /= 2; + if (height > 1) height /= 2; + } + + hr = DdsFrameDecode_CreateInstance(&frame_decode); + if (hr != S_OK) goto end; + + frame_decode->width = width; + frame_decode->height = height; + *bitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; + + hr = S_OK; + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static const IWICDdsDecoderVtbl DdsDecoder_Dds_Vtbl = {

1 0

Ziqing Hui : windowscodecs: Implement DdsFrameDecode_GetSize().
by Alexandre Julliard May 29, 2020

May 29, 2020

Module: wine Branch: master Commit: 9a6108cf438808e93b1e5a66a56a2c72444fa6c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a6108cf438808e93b1e5a66… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 28 13:09:09 2020 +0800 windowscodecs: Implement DdsFrameDecode_GetSize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 9 +++++++-- dlls/windowscodecs/tests/ddsformat.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 333f015820..20017788a0 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -299,9 +299,14 @@ static ULONG WINAPI DdsFrameDecode_Release(IWICBitmapFrameDecode *iface) static HRESULT WINAPI DdsFrameDecode_GetSize(IWICBitmapFrameDecode *iface, UINT *puiWidth, UINT *puiHeight) { - FIXME("(%p,%p,%p): stub.\n", iface, puiWidth, puiHeight); + DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); - return E_NOTIMPL; + *puiWidth = This->width; + *puiHeight = This->height; + + TRACE("(%p) -> (%d,%d)\n", iface, *puiWidth, *puiHeight); + + return S_OK; } static HRESULT WINAPI DdsFrameDecode_GetPixelFormat(IWICBitmapFrameDecode *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index e31ca576fc..c7f56307d7 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -383,7 +383,7 @@ static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFr if (hr != S_OK) goto end; hr = IWICBitmapFrameDecode_GetSize(frame_decode, &width, &height); - todo_wine ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); + ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end; depth = params.Depth;

1 0