November 2019 - Wine-Commits

Alexandre Julliard : ntdll: Implement NtGetNlsSectionPtr().
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: f5c4a89cf28c6e7d9a2f27968bc35e8cbc724e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5c4a89cf28c6e7d9a2f2796… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 26 17:25:42 2019 +0100 ntdll: Implement NtGetNlsSectionPtr(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 + include/winternl.h | 1 + 3 files changed, 170 insertions(+) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 94a945c17c..1c80bf80bb 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -40,6 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); +enum nls_section_type +{ + NLS_SECTION_CASEMAP = 10, + NLS_SECTION_CODEPAGE = 11, + NLS_SECTION_NORMALIZE = 12 +}; + LCID user_lcid = 0, system_lcid = 0; static LANGID user_ui_language, system_ui_language; @@ -67,6 +74,137 @@ static NTSTATUS load_string( ULONG id, LANGID lang, WCHAR *buffer, ULONG len ) } +static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) +{ + static const WCHAR pathfmtW[] = {'\\','?','?','\\','%','s','%','s',0}; + static const WCHAR keyfmtW[] = + {'\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e','\\','S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\','N','l','s','\\','%','s',0}; + static const WCHAR cpW[] = {'C','o','d','e','p','a','g','e',0}; + static const WCHAR normW[] = {'N','o','r','m','a','l','i','z','a','t','i','o','n',0}; + static const WCHAR langW[] = {'L','a','n','g','u','a','g','e',0}; + static const WCHAR cpfmtW[] = {'%','u',0}; + static const WCHAR normfmtW[] = {'%','x',0}; + static const WCHAR langfmtW[] = {'%','0','4','x',0}; + static const WCHAR winedatadirW[] = {'W','I','N','E','D','A','T','A','D','I','R',0}; + static const WCHAR winebuilddirW[] = {'W','I','N','E','B','U','I','L','D','D','I','R',0}; + static const WCHAR dataprefixW[] = {'\\',0}; + static const WCHAR buildprefixW[] = {'\\','l','o','a','d','e','r','\\',0}; + static const WCHAR cpdefaultW[] = {'c','_','%','0','3','d','.','n','l','s',0}; + static const WCHAR intlW[] = {'l','_','i','n','t','l','.','n','l','s',0}; + static const WCHAR normnfcW[] = {'n','o','r','m','n','f','c','.','n','l','s',0}; + static const WCHAR normnfdW[] = {'n','o','r','m','n','f','d','.','n','l','s',0}; + static const WCHAR normnfkcW[] = {'n','o','r','m','n','f','k','c','.','n','l','s',0}; + static const WCHAR normnfkdW[] = {'n','o','r','m','n','f','k','d','.','n','l','s',0}; + + DWORD size; + HANDLE handle; + NTSTATUS status; + IO_STATUS_BLOCK io; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW, valueW; + WCHAR buffer[MAX_PATH], value[10]; + const WCHAR *name = NULL, *prefix = buildprefixW; + KEY_VALUE_PARTIAL_INFORMATION *info; + + /* get filename from registry */ + + switch (type) + { + case NLS_SECTION_CASEMAP: + if (id) return STATUS_UNSUCCESSFUL; + sprintfW( buffer, keyfmtW, langW ); + sprintfW( value, langfmtW, LANGIDFROMLCID(system_lcid) ); + break; + case NLS_SECTION_CODEPAGE: + sprintfW( buffer, keyfmtW, cpW ); + sprintfW( value, cpfmtW, id ); + break; + case NLS_SECTION_NORMALIZE: + sprintfW( buffer, keyfmtW, normW ); + sprintfW( value, normfmtW, id ); + break; + default: + return STATUS_INVALID_PARAMETER_1; + } + RtlInitUnicodeString( &nameW, buffer ); + RtlInitUnicodeString( &valueW, value ); + InitializeObjectAttributes( &attr, &nameW, 0, 0, NULL ); + if ((status = NtOpenKey( &handle, KEY_READ, &attr ))) return status; + info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; + size = sizeof(buffer) - sizeof(WCHAR); + status = NtQueryValueKey( handle, &valueW, KeyValuePartialInformation, info, size, &size ); + NtClose( handle ); + if (!status) + { + ((WCHAR *)info->Data)[info->DataLength / sizeof(WCHAR)] = 0; + name = (WCHAR *)info->Data; + } + else /* otherwise some hardcoded defaults */ + { + switch (type) + { + case NLS_SECTION_CASEMAP: + name = intlW; + break; + case NLS_SECTION_CODEPAGE: + sprintfW( buffer, cpdefaultW, id ); + name = buffer; + break; + case NLS_SECTION_NORMALIZE: + switch (id) + { + case NormalizationC: name = normnfcW; break; + case NormalizationD: name = normnfdW; break; + case NormalizationKC: name = normnfkcW; break; + case NormalizationKD: name = normnfkdW; break; + } + break; + } + if (!name) return status; + } + + /* try to open file in system dir */ + + valueW.MaximumLength = (strlenW(name) + strlenW(system_dir) + 5) * sizeof(WCHAR); + if (!(valueW.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, valueW.MaximumLength ))) + return STATUS_NO_MEMORY; + valueW.Length = sprintfW( valueW.Buffer, pathfmtW, system_dir, name ) * sizeof(WCHAR); + InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); + status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + if (!status) TRACE( "found %s\n", debugstr_w( valueW.Buffer )); + RtlFreeUnicodeString( &valueW ); + if (status != STATUS_OBJECT_NAME_NOT_FOUND) return status; + + /* not found, try in build or data dir */ + + RtlInitUnicodeString( &nameW, winebuilddirW ); + valueW.MaximumLength = 0; + if (RtlQueryEnvironmentVariable_U( NULL, &nameW, &valueW ) != STATUS_BUFFER_TOO_SMALL) + { + RtlInitUnicodeString( &nameW, winedatadirW ); + prefix = dataprefixW; + if (RtlQueryEnvironmentVariable_U( NULL, &nameW, &valueW ) != STATUS_BUFFER_TOO_SMALL) + return status; + } + valueW.MaximumLength = valueW.Length + sizeof(buildprefixW) + strlenW(name) * sizeof(WCHAR); + if (!(valueW.Buffer = RtlAllocateHeap( GetProcessHeap(), 0, valueW.MaximumLength ))) + return STATUS_NO_MEMORY; + if (!RtlQueryEnvironmentVariable_U( NULL, &nameW, &valueW )) + { + strcatW( valueW.Buffer, prefix ); + strcatW( valueW.Buffer, name ); + valueW.Length = strlenW(valueW.Buffer) * sizeof(WCHAR); + InitializeObjectAttributes( &attr, &valueW, 0, 0, NULL ); + status = NtOpenFile( file, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); + if (!status) TRACE( "found %s\n", debugstr_w( valueW.Buffer )); + } + RtlFreeUnicodeString( &valueW ); + return status; +} + + #if !defined(__APPLE__) && !defined(__ANDROID__) /* these platforms always use UTF-8 */ /* charset to codepage map, sorted by name */ @@ -427,6 +565,35 @@ NTSTATUS WINAPI NtQueryInstallUILanguage( LANGID *lang ) } +/************************************************************************** + * NtGetNlsSectionPtr (NTDLL.@) + */ +NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void **ptr, SIZE_T *size ) +{ + FILE_END_OF_FILE_INFORMATION info; + IO_STATUS_BLOCK io; + HANDLE file; + NTSTATUS status; + + if ((status = open_nls_data_file( type, id, &file ))) return status; + if ((status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileEndOfFileInformation ))) + goto done; + /* FIXME: return a heap block instead of a file mapping for now */ + if (!(*ptr = RtlAllocateHeap( GetProcessHeap(), 0, info.EndOfFile.QuadPart ))) + { + status = STATUS_NO_MEMORY; + goto done; + } + status = NtReadFile( file, 0, NULL, NULL, &io, *ptr, info.EndOfFile.QuadPart, NULL, NULL ); + if (!status && io.Information != info.EndOfFile.QuadPart) status = STATUS_INVALID_FILE_FOR_SECTION; + if (!status) *size = io.Information; + else RtlFreeHeap( GetProcessHeap(), 0, *ptr ); +done: + NtClose( file ); + return status; +} + + /****************************************************************** * RtlLocaleNameToLcid (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fa2c7a32cd..3e1aa2fe49 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -220,6 +220,7 @@ @ stdcall -norelay NtGetContextThread(long ptr) @ stdcall NtGetCurrentProcessorNumber() # @ stub NtGetDevicePowerState +@ stdcall NtGetNlsSectionPtr(long long long ptr ptr) @ stub NtGetPlugPlayEvent @ stdcall NtGetTickCount() @ stdcall NtGetWriteWatch(long long ptr long ptr ptr ptr) @@ -1182,6 +1183,7 @@ @ stdcall -private -norelay ZwGetContextThread(long ptr) NtGetContextThread @ stdcall -private ZwGetCurrentProcessorNumber() NtGetCurrentProcessorNumber # @ stub ZwGetDevicePowerState +@ stdcall -private ZwGetNlsSectionPtr(long long long ptr ptr) NtGetNlsSectionPtr @ stub ZwGetPlugPlayEvent @ stdcall -private ZwGetTickCount() NtGetTickCount @ stdcall -private ZwGetWriteWatch(long long ptr long ptr ptr ptr) NtGetWriteWatch diff --git a/include/winternl.h b/include/winternl.h index d5c8d76ccf..635c230ded 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2407,6 +2407,7 @@ NTSYSAPI NTSTATUS WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI NtGetContextThread(HANDLE,CONTEXT*); NTSYSAPI ULONG WINAPI NtGetCurrentProcessorNumber(void); +NTSYSAPI NTSTATUS WINAPI NtGetNlsSectionPtr(ULONG,ULONG,void*,void**,SIZE_T*); NTSYSAPI NTSTATUS WINAPI NtGetPlugPlayEvent(ULONG,ULONG,PVOID,ULONG); NTSYSAPI ULONG WINAPI NtGetTickCount(VOID); NTSYSAPI NTSTATUS WINAPI NtGetWriteWatch(HANDLE,ULONG,PVOID,SIZE_T,PVOID*,ULONG_PTR*,ULONG*);

1 0

Nikolay Sivov : kernel32: Implement higher level API to access thread description.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: 179cd78f828c67a113e5f0ad85952cfb99c0a281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=179cd78f828c67a113e5f0ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 09:48:11 2019 +0300 kernel32: Implement higher level API to access thread description. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-3.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/thread.c | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/thread.c | 60 ++++++++++++++++++++-- 5 files changed, 61 insertions(+), 6 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec index 6f0c4fa752..9cc853d288 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-3/api-ms-win-core-processthreads-l1-1-3.spec @@ -1,7 +1,7 @@ @ stub GetProcessDefaultCpuSets @ stub GetProcessInformation @ stub GetSystemCpuSetInformation -@ stub GetThreadDescription +@ stdcall GetThreadDescription(long ptr) kernel32.GetThreadDescription @ stub GetThreadSelectedCpuSets @ stub SetProcessDefaultCpuSets @ stub SetProcessInformation diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 367f5d2373..984422d2b4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -847,6 +847,7 @@ @ stdcall -import GetTempPathA(long ptr) @ stdcall -import GetTempPathW(long ptr) @ stdcall -import GetThreadContext(long ptr) +@ stdcall -import GetThreadDescription(long ptr) @ stdcall -import GetThreadErrorMode() @ stdcall -import GetThreadGroupAffinity(long ptr) @ stdcall -import GetThreadIOPendingFlag(long ptr) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 180eed8241..8ff34ba5f3 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -2125,7 +2125,7 @@ static void test_thread_description(void) if (!pGetThreadDescription) { - skip("Thread description API is not supported.\n"); + win_skip("Thread description API is not supported.\n"); return; } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 7d20d3b112..6022d4ea37 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -711,7 +711,7 @@ @ stdcall GetTempPathA(long ptr) @ stdcall GetTempPathW(long ptr) @ stdcall GetThreadContext(long ptr) -# @ stub GetThreadDescription +@ stdcall GetThreadDescription(long ptr) @ stdcall GetThreadErrorMode() @ stdcall GetThreadGroupAffinity(long ptr) @ stdcall GetThreadIOPendingFlag(long ptr) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 345f44dff7..521d3be079 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <string.h> +#include <limits.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -33,6 +34,7 @@ #include "wine/exception.h" #include "wine/asm.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(thread); @@ -390,12 +392,64 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetThreadContext( HANDLE thread, const CONTEXT *co /*********************************************************************** * SetThreadDescription (kernelbase.@) */ -HRESULT WINAPI /* DECLSPEC_HOTPATCH */ SetThreadDescription( HANDLE thread, PCWSTR description ) +HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR description ) { - FIXME( "(%p %s): stub\n", thread, debugstr_w( description )); - return E_NOTIMPL; + THREAD_DESCRIPTION_INFORMATION info; + int length; + + TRACE( "(%p, %s)\n", thread, debugstr_w( description )); + + length = description ? lstrlenW( description ) * sizeof(WCHAR) : 0; + + if (length > USHRT_MAX) + return HRESULT_FROM_NT(STATUS_INVALID_PARAMETER); + + info.Length = length << 16 | length; + info.Description = (WCHAR *)description; + + return HRESULT_FROM_NT(NtSetInformationThread( thread, ThreadDescription, &info, sizeof(info) )); } +/*********************************************************************** + * GetThreadDescription (kernelbase.@) + */ +HRESULT WINAPI DECLSPEC_HOTPATCH GetThreadDescription( HANDLE thread, WCHAR **description ) +{ + THREAD_DESCRIPTION_INFORMATION *info; + NTSTATUS status; + ULONG length; + + TRACE( "(%p, %p)\n", thread, description ); + + *description = NULL; + + length = 0; + status = NtQueryInformationThread( thread, ThreadDescription, NULL, 0, &length ); + if (status != STATUS_BUFFER_TOO_SMALL) + return HRESULT_FROM_NT(status); + + if (!(info = heap_alloc( length ))) + return HRESULT_FROM_NT(STATUS_NO_MEMORY); + + status = NtQueryInformationThread( thread, ThreadDescription, info, length, &length ); + if (!status) + { + length = info->Length & 0xffff; + + if (!(*description = LocalAlloc( 0, length + sizeof(WCHAR)))) + status = STATUS_NO_MEMORY; + else + { + if (length) + memcpy(*description, info->Description, length); + (*description)[length / sizeof(WCHAR)] = 0; + } + } + + heap_free(info); + + return HRESULT_FROM_NT(status); +} /*********************************************************************** * SetThreadErrorMode (kernelbase.@)

1 0

Zebediah Figura : d3d8: Use wined3d_stateblock_* methods directly in BeginStateBlock() and EndStateBlock().
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: af5634fb6eee4cf3117c0e09a56cad3eb4924eb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af5634fb6eee4cf3117c0e09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 09:57:37 2019 -0600 d3d8: Use wined3d_stateblock_* methods directly in BeginStateBlock() and EndStateBlock(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 20 +++++++++++++------- dlls/d3d8/tests/device.c | 8 -------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e85fd72d02..564dc9d9d0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1902,7 +1902,14 @@ static HRESULT WINAPI d3d8_device_BeginStateBlock(IDirect3DDevice8 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + if (device->recording) + { + wined3d_mutex_unlock(); + WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); + return D3DERR_INVALIDCALL; + } + + if (SUCCEEDED(hr = wined3d_stateblock_create(device->wined3d_device, WINED3D_SBT_RECORDED, &stateblock))) device->update_state = device->recording = stateblock; wined3d_mutex_unlock(); @@ -1913,7 +1920,6 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_stateblock *stateblock; - HRESULT hr; TRACE("iface %p, token %p.\n", iface, token); @@ -1921,14 +1927,14 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * * of memory later and cause locking problems) */ wined3d_mutex_lock(); - hr = wined3d_device_end_stateblock(device->wined3d_device); - if (FAILED(hr)) + if (!device->recording) { - WARN("Failed to end the state block, %#x.\n", hr); wined3d_mutex_unlock(); - return hr; + WARN("Trying to end a stateblock, but no stateblock is being recorded.\n"); + return D3DERR_INVALIDCALL; } stateblock = device->recording; + wined3d_stateblock_init_contained_states(stateblock); device->recording = NULL; device->update_state = device->state; @@ -1947,7 +1953,7 @@ static HRESULT WINAPI d3d8_device_EndStateBlock(IDirect3DDevice8 *iface, DWORD * TRACE("Returning %#x (%p).\n", *token, stateblock); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_ApplyStateBlock(IDirect3DDevice8 *iface, DWORD token) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9fc06c3c9d..f598ad4f45 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9665,20 +9665,12 @@ static void test_draw_primitive(void) hr = IDirect3DDevice8_GetStreamSource(device, 0, &current_vb, &stride); ok(SUCCEEDED(hr), "GetStreamSource failed, hr %#x.\n", hr); -todo_wine { ok(!current_vb, "Unexpected vb %p.\n", current_vb); ok(!stride, "Unexpected stride %u.\n", stride); -} - if (current_vb) - IDirect3DVertexBuffer8_Release(current_vb); hr = IDirect3DDevice8_GetIndices(device, &current_ib, &base_vertex_index); ok(SUCCEEDED(hr), "GetIndices failed, hr %#x.\n", hr); -todo_wine { ok(!current_ib, "Unexpected index buffer %p.\n", current_ib); ok(!base_vertex_index, "Unexpected base vertex index %u.\n", base_vertex_index); -} - if (current_ib) - IDirect3DIndexBuffer8_Release(current_ib); hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); ok(SUCCEEDED(hr), "Capture failed, hr %#x.\n", hr);

1 0

Alexandre Julliard : ntdll Implement RtlInitNlsTables() and RtlResetRtlTranslations().
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: c0ff49061f0bfb200d18854309ad177c1f718b65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ff49061f0bfb200d188543… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 26 17:49:31 2019 +0100 ntdll Implement RtlInitNlsTables() and RtlResetRtlTranslations(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtlstr.c | 5 ----- include/winternl.h | 2 ++ 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 6da6f5ead3..c271cab732 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -71,9 +71,14 @@ enum nls_section_type NLS_SECTION_NORMALIZE = 12 }; +UINT NlsAnsiCodePage = 0; +BYTE NlsMbCodePageTag = 0; +BYTE NlsMbOemCodePageTag = 0; + LCID user_lcid = 0, system_lcid = 0; static LANGID user_ui_language, system_ui_language; +static NLSTABLEINFO nls_info; static HMODULE kernel32_handle; static const union cptable *unix_table; /* NULL if UTF8 */ @@ -652,6 +657,30 @@ void WINAPI RtlInitCodePageTable( USHORT *ptr, CPTABLEINFO *info ) } +/************************************************************************** + * RtlInitNlsTables (NTDLL.@) + */ +void WINAPI RtlInitNlsTables( USHORT *ansi, USHORT *oem, USHORT *casetable, NLSTABLEINFO *info ) +{ + RtlInitCodePageTable( ansi, &info->AnsiTableInfo ); + RtlInitCodePageTable( oem, &info->OemTableInfo ); + info->UpperCaseTable = casetable + 2; + info->LowerCaseTable = casetable + casetable[1] + 2; +} + + +/************************************************************************** + * RtlResetRtlTranslations (NTDLL.@) + */ +void WINAPI RtlResetRtlTranslations( const NLSTABLEINFO *info ) +{ + NlsAnsiCodePage = info->AnsiTableInfo.CodePage; + NlsMbCodePageTag = info->AnsiTableInfo.DBCSCodePage; + NlsMbOemCodePageTag = info->OemTableInfo.DBCSCodePage; + nls_info = *info; +} + + /****************************************************************** * RtlLocaleNameToLcid (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d713e80a16..899b044c74 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -731,7 +731,7 @@ @ stdcall RtlInitAnsiStringEx(ptr str) @ stdcall RtlInitCodePageTable(ptr ptr) # @ stub RtlInitMemoryStream -@ stub RtlInitNlsTables +@ stdcall RtlInitNlsTables(ptr ptr ptr ptr) # @ stub RtlInitOutOfProcessMemoryStream @ stdcall RtlInitString(ptr str) @ stdcall RtlInitUnicodeString(ptr wstr) @@ -901,7 +901,7 @@ @ stub RtlRemoteCall @ stdcall RtlRemoveVectoredContinueHandler(ptr) @ stdcall RtlRemoveVectoredExceptionHandler(ptr) -@ stub RtlResetRtlTranslations +@ stdcall RtlResetRtlTranslations(ptr) @ stdcall -arch=x86_64 RtlRestoreContext(ptr ptr) @ stdcall RtlRestoreLastWin32Error(long) RtlSetLastWin32Error @ stub RtlRevertMemoryStream diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index ee861ddea4..0eeb14ed65 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -40,10 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); #define GUID_STRING_LENGTH 38 -UINT NlsAnsiCodePage = 0; -BYTE NlsMbCodePageTag = 0; -BYTE NlsMbOemCodePageTag = 0; - extern const union cptable cptable_20127; /* 7-bit ASCII */ static const union cptable *ansi_table = &cptable_20127; @@ -59,7 +55,6 @@ void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable { ansi_table = ansi; oem_table = oem; - NlsAnsiCodePage = ansi->info.codepage; } /************************************************************************** diff --git a/include/winternl.h b/include/winternl.h index a2fb7e94e3..1477932d10 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2782,6 +2782,7 @@ NTSYSAPI void WINAPI RtlInitString(PSTRING,PCSZ); NTSYSAPI void WINAPI RtlInitAnsiString(PANSI_STRING,PCSZ); NTSYSAPI NTSTATUS WINAPI RtlInitAnsiStringEx(PANSI_STRING,PCSZ); NTSYSAPI void WINAPI RtlInitCodePageTable(USHORT*,CPTABLEINFO*); +NTSYSAPI void WINAPI RtlInitNlsTables(USHORT*,USHORT*,USHORT*,NLSTABLEINFO*); NTSYSAPI void WINAPI RtlInitUnicodeString(PUNICODE_STRING,PCWSTR); NTSYSAPI NTSTATUS WINAPI RtlInitUnicodeStringEx(PUNICODE_STRING,PCWSTR); NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG); @@ -2861,6 +2862,7 @@ NTSYSAPI void WINAPI RtlReleaseResource(LPRTL_RWLOCK); NTSYSAPI void WINAPI RtlReleaseSRWLockExclusive(RTL_SRWLOCK*); NTSYSAPI void WINAPI RtlReleaseSRWLockShared(RTL_SRWLOCK*); NTSYSAPI ULONG WINAPI RtlRemoveVectoredExceptionHandler(PVOID); +NTSYSAPI void WINAPI RtlResetRtlTranslations(const NLSTABLEINFO*); NTSYSAPI void WINAPI RtlRestoreLastWin32Error(DWORD); NTSYSAPI void WINAPI RtlSecondsSince1970ToTime(DWORD,LARGE_INTEGER *); NTSYSAPI void WINAPI RtlSecondsSince1980ToTime(DWORD,LARGE_INTEGER *);

1 0

Alexandre Julliard : ntdll: Implement RtlInitCodePageTable().
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: 9ae5717ba6d10126c4a274240ec1e72fa241a6db URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ae5717ba6d10126c4a27424… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 26 17:29:41 2019 +0100 ntdll: Implement RtlInitCodePageTable(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 58 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/winternl.h | 24 +++++++++++++++ 4 files changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 1c80bf80bb..6da6f5ead3 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -40,6 +40,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(nls); +/* NLS file format: + * + * header: + * WORD offset to cp2uni table in words + * WORD CodePage + * WORD MaximumCharacterSize + * BYTE[2] DefaultChar + * WORD UniDefaultChar + * WORD TransDefaultChar + * WORD TransUniDefaultChar + * BYTE[12] LeadByte + * cp2uni table: + * WORD offset to uni2cp table in words + * WORD[256] cp2uni table + * WORD glyph table size + * WORD[glyph_table_size] glyph table + * WORD number of lead byte ranges + * WORD[256] lead byte offsets in words + * WORD[leadbytes][256] cp2uni table for lead bytes + * uni2cp table: + * WORD 0 / 4 + * BYTE[65536] / WORD[65536] uni2cp table + */ + enum nls_section_type { NLS_SECTION_CASEMAP = 10, @@ -594,6 +618,40 @@ done: } +/****************************************************************** + * RtlInitCodePageTable (NTDLL.@) + */ +void WINAPI RtlInitCodePageTable( USHORT *ptr, CPTABLEINFO *info ) +{ + USHORT hdr_size = ptr[0]; + + info->CodePage = ptr[1]; + info->MaximumCharacterSize = ptr[2]; + info->DefaultChar = ptr[3]; + info->UniDefaultChar = ptr[4]; + info->TransDefaultChar = ptr[5]; + info->TransUniDefaultChar = ptr[6]; + memcpy( info->LeadByte, ptr + 7, sizeof(info->LeadByte) ); + ptr += hdr_size; + + info->WideCharTable = ptr + ptr[0] + 1; + info->MultiByteTable = ++ptr; + ptr += 256; + if (*ptr++) ptr += 256; /* glyph table */ + info->DBCSRanges = ptr; + if (*ptr) /* dbcs ranges */ + { + info->DBCSCodePage = 1; + info->DBCSOffsets = ptr + 1; + } + else + { + info->DBCSCodePage = 0; + info->DBCSOffsets = NULL; + } +} + + /****************************************************************** * RtlLocaleNameToLcid (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3e1aa2fe49..d713e80a16 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -729,7 +729,7 @@ @ stdcall RtlImpersonateSelf(long) @ stdcall RtlInitAnsiString(ptr str) @ stdcall RtlInitAnsiStringEx(ptr str) -@ stub RtlInitCodePageTable +@ stdcall RtlInitCodePageTable(ptr ptr) # @ stub RtlInitMemoryStream @ stub RtlInitNlsTables # @ stub RtlInitOutOfProcessMemoryStream diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 297487fa25..d59e500187 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1079,7 +1079,7 @@ @ stdcall RtlImageDirectoryEntryToData(long long long ptr) @ stdcall RtlImageNtHeader(long) @ stdcall RtlInitAnsiString(ptr str) -@ stub RtlInitCodePageTable +@ stdcall RtlInitCodePageTable(ptr ptr) ntdll.RtlInitCodePageTable @ stdcall RtlInitString(ptr str) @ stdcall RtlInitUnicodeString(ptr wstr) @ stdcall RtlInitializeBitMap(ptr ptr long) diff --git a/include/winternl.h b/include/winternl.h index 635c230ded..a2fb7e94e3 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2203,6 +2203,29 @@ typedef enum _SYSDBG_COMMAND { SysDbgWriteBusData } SYSDBG_COMMAND, *PSYSDBG_COMMAND; +typedef struct _CPTABLEINFO +{ + USHORT CodePage; + USHORT MaximumCharacterSize; + USHORT DefaultChar; + USHORT UniDefaultChar; + USHORT TransDefaultChar; + USHORT TransUniDefaultChar; + USHORT DBCSCodePage; + UCHAR LeadByte[12]; + USHORT *MultiByteTable; + void *WideCharTable; + USHORT *DBCSRanges; + USHORT *DBCSOffsets; +} CPTABLEINFO, *PCPTABLEINFO; + +typedef struct _NLSTABLEINFO +{ + CPTABLEINFO OemTableInfo; + CPTABLEINFO AnsiTableInfo; + USHORT *UpperCaseTable; + USHORT *LowerCaseTable; +} NLSTABLEINFO, *PNLSTABLEINFO; /************************************************************************* * Loader structures @@ -2758,6 +2781,7 @@ NTSYSAPI NTSTATUS WINAPI RtlImpersonateSelf(SECURITY_IMPERSONATION_LEVEL); NTSYSAPI void WINAPI RtlInitString(PSTRING,PCSZ); NTSYSAPI void WINAPI RtlInitAnsiString(PANSI_STRING,PCSZ); NTSYSAPI NTSTATUS WINAPI RtlInitAnsiStringEx(PANSI_STRING,PCSZ); +NTSYSAPI void WINAPI RtlInitCodePageTable(USHORT*,CPTABLEINFO*); NTSYSAPI void WINAPI RtlInitUnicodeString(PUNICODE_STRING,PCWSTR); NTSYSAPI NTSTATUS WINAPI RtlInitUnicodeStringEx(PUNICODE_STRING,PCWSTR); NTSYSAPI void WINAPI RtlInitializeBitMap(PRTL_BITMAP,PULONG,ULONG);

1 0

Damjan Jovanovic : start.exe: STARTUPINFOW needs the STARTF_USESHOWWINDOW flag.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: c5bceecb51efc52b315b3526d9a85f2373e229cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5bceecb51efc52b315b3526… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 26 04:28:54 2019 +0200 start.exe: STARTUPINFOW needs the STARTF_USESHOWWINDOW flag. Fixes a regression introduced by 42fa293d48be89ce06b1aab264c5c0d8cc1b4f53 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48170 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/start/start.c b/programs/start/start.c index 2a2c30022c..fd952083ac 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -581,6 +581,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) ZeroMemory(&startup_info, sizeof(startup_info)); startup_info.cb = sizeof(startup_info); startup_info.wShowWindow = sei.nShow; + startup_info.dwFlags |= STARTF_USESHOWWINDOW; startup_info.lpTitle = title; if (!CreateProcessW(

1 0

Mathew Hodson : kernel32: Remove dead code.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: 2fec865945ef5617037187b9d33af86d189dc81c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fec865945ef5617037187b9… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Tue Nov 26 00:09:37 2019 -0500 kernel32: Remove dead code. Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index c3be67cc3c..ef94741093 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -801,13 +801,7 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, } info->data_len = io.Information; - if (!has_wildcard) - { - if (has_wildcard) /* release unused buffer space */ - HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, - info, offsetof( FIND_FIRST_INFO, data[info->data_len] )); - info->data_size = 0; /* we read everything */ - } + if (!has_wildcard) info->data_size = 0; /* we read everything */ if (!FindNextFileW( info, data )) {

1 0

Jeff Smith : gdi32/tests: Reserve sufficient room for DIB data.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: 22a4b3fc7e6f48c99934a49643a87031250592ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=22a4b3fc7e6f48c99934a496… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 25 10:46:16 2019 -0600 gdi32/tests: Reserve sufficient room for DIB data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48054 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 8fe160546c..8f0f6601b3 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -913,7 +913,7 @@ static void test_dibsections(void) static void test_dib_formats(void) { BITMAPINFO *bi; - char data[256]; + char data[2048]; /* 2 x 2 pixels, max 64 bits-per-pixel, max 64 planes */ void *bits; int planes, bpp, compr, format; HBITMAP hdib, hbmp;

1 0

Vijay Kiran Kamuju : shcore: Add stub for GetScaleFactorForMonitor.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: bbdc670931e5473b8c11895489636ae1ab8b6ba9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbdc670931e5473b8c118954… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Nov 25 09:00:26 2019 +0100 shcore: Add stub for GetScaleFactorForMonitor. Based on a patch by Esdras Tarsis. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48016 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-shcore-scaling-l1-1-1.spec | 2 +- dlls/shcore/main.c | 8 ++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 3 +++ include/shtypes.idl | 21 +++++++++++++++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec index 6194c8ce9d..9ebda5164c 100644 --- a/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec +++ b/dlls/api-ms-win-shcore-scaling-l1-1-1/api-ms-win-shcore-scaling-l1-1-1.spec @@ -1,7 +1,7 @@ @ stdcall GetDpiForMonitor(long long ptr ptr) shcore.GetDpiForMonitor @ stdcall GetProcessDpiAwareness(long ptr) shcore.GetProcessDpiAwareness @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) shcore.GetScaleFactorForMonitor @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 6a6247930f..3f95c1ffd8 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -78,6 +78,14 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x return HRESULT_FROM_WIN32( GetLastError() ); } +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR monitor, DEVICE_SCALE_FACTOR *scale) +{ + FIXME("(%p %p): stub\n", monitor, scale); + + *scale = SCALE_100_PERCENT; + return S_OK; +} + HRESULT WINAPI _IStream_Read(IStream *stream, void *dest, ULONG size) { ULONG read; diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 6a634bdee5..d5b7a342e3 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -12,7 +12,7 @@ @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stub GetScaleFactorForDevice -@ stub GetScaleFactorForMonitor +@ stdcall GetScaleFactorForMonitor(long ptr) @ stub IStream_Copy @ stdcall IStream_Read(ptr ptr long) _IStream_Read @ stub IStream_ReadStr diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 1df85d5982..82a1daaa62 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -19,6 +19,8 @@ #ifndef __WINE_SHELLSCALINGAPI_H #define __WINE_SHELLSCALINGAPI_H +#include <shtypes.h> + typedef enum MONITOR_DPI_TYPE { MDT_EFFECTIVE_DPI = 0, @@ -36,6 +38,7 @@ typedef enum PROCESS_DPI_AWARENESS HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); +HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); #endif /* __WINE_SHELLSCALINGAPI_H */ diff --git a/include/shtypes.idl b/include/shtypes.idl index 3d54c80381..c83562a24b 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -161,3 +161,24 @@ cpp_quote("#define PERCEIVEDFLAG_NATIVESUPPORT 0x0004") cpp_quote("#define PERCEIVEDFLAG_GDIPLUS 0x0010") cpp_quote("#define PERCEIVEDFLAG_WMSDK 0x0020") cpp_quote("#define PERCEIVEDFLAG_ZIPFOLDER 0x0040") + +typedef [v1_enum] enum DEVICE_SCALE_FACTOR +{ + DEVICE_SCALE_FACTOR_INVALID = 0, + SCALE_100_PERCENT = 100, + SCALE_120_PERCENT = 120, + SCALE_125_PERCENT = 125, + SCALE_140_PERCENT = 140, + SCALE_150_PERCENT = 150, + SCALE_160_PERCENT = 160, + SCALE_175_PERCENT = 175, + SCALE_180_PERCENT = 180, + SCALE_200_PERCENT = 200, + SCALE_225_PERCENT = 225, + SCALE_250_PERCENT = 250, + SCALE_300_PERCENT = 300, + SCALE_350_PERCENT = 350, + SCALE_400_PERCENT = 400, + SCALE_450_PERCENT = 450, + SCALE_500_PERCENT = 500 +} DEVICE_SCALE_FACTOR;

1 0

Francois Gouget : comctl32/tests: Trace the iteration counter when a tooltips test fails.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: master Commit: 8b2d5c7c5a1a4476df39618d5b4c468bb2e056c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b2d5c7c5a1a4476df39618d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 21 16:19:56 2019 +0100 comctl32/tests: Trace the iteration counter when a tooltips test fails. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 0cb7afd688..6156bffa13 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -197,7 +197,7 @@ static void test_customdraw(void) { 50, 50, 300, 300, NULL, NULL, NULL, 0); - ok(parent != NULL, "Creation of main window failed\n"); + ok(parent != NULL, "%d: Creation of main window failed\n", iterationNumber); /* Make it show */ ShowWindow(parent, SW_SHOWNORMAL); @@ -209,7 +209,7 @@ static void test_customdraw(void) { CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, parent, NULL, GetModuleHandleA(NULL), 0); - ok(hwndTip != NULL, "Creation of tooltip window failed\n"); + ok(hwndTip != NULL, "%d: Creation of tooltip window failed\n", iterationNumber); /* Set up parms for the wndproc to handle */ CD_Stages = 0; @@ -230,7 +230,7 @@ static void test_customdraw(void) { toolInfo.lParam = 0xdeadbeef; GetClientRect (parent, &toolInfo.rect); ret = SendMessageA(hwndTip, TTM_ADDTOOLA, 0, (LPARAM)&toolInfo); - ok(ret, "Failed to add the tool.\n"); + ok(ret, "%d: Failed to add the tool.\n", iterationNumber); /* Make tooltip appear quickly */ SendMessageA(hwndTip, TTM_SETDELAYTIME, TTDT_INITIAL, MAKELPARAM(1,0)); @@ -245,23 +245,23 @@ static void test_customdraw(void) { /* Check CustomDraw results */ ok(CD_Stages == expectedResults[iterationNumber].ExpectedCalls || broken(CD_Stages == (expectedResults[iterationNumber].ExpectedCalls & ~TEST_CDDS_POSTPAINT)), /* nt4 */ - "CustomDraw run %d stages %x, expected %x\n", iterationNumber, CD_Stages, + "%d: CustomDraw stages %x, expected %x\n", iterationNumber, CD_Stages, expectedResults[iterationNumber].ExpectedCalls); } ret = SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, 0); - ok(ret, "Failed to get current tool %#lx.\n", ret); + ok(ret, "%d: Failed to get current tool %#lx.\n", iterationNumber, ret); memset(&toolInfo, 0xcc, sizeof(toolInfo)); toolInfo.cbSize = sizeof(toolInfo); toolInfo.lpszText = NULL; toolInfo.lpReserved = (void *)0xdeadbeef; SendMessageA(hwndTip, TTM_GETCURRENTTOOLA, 0, (LPARAM)&toolInfo); - ok(toolInfo.hwnd == parent, "Unexpected hwnd %p.\n", toolInfo.hwnd); - ok(toolInfo.hinst == GetModuleHandleA(NULL), "Unexpected hinst %p.\n", toolInfo.hinst); - ok(toolInfo.uId == 0x1234abcd, "Unexpected uId %lx.\n", toolInfo.uId); - ok(toolInfo.lParam == 0, "Unexpected lParam %lx.\n", toolInfo.lParam); - ok(toolInfo.lpReserved == (void *)0xdeadbeef, "Unexpected lpReserved %p.\n", toolInfo.lpReserved); + ok(toolInfo.hwnd == parent, "%d: Unexpected hwnd %p.\n", iterationNumber, toolInfo.hwnd); + ok(toolInfo.hinst == GetModuleHandleA(NULL), "%d: Unexpected hinst %p.\n", iterationNumber, toolInfo.hinst); + ok(toolInfo.uId == 0x1234abcd, "%d: Unexpected uId %lx.\n", iterationNumber, toolInfo.uId); + ok(toolInfo.lParam == 0, "%d: Unexpected lParam %lx.\n", iterationNumber, toolInfo.lParam); + ok(toolInfo.lpReserved == (void *)0xdeadbeef, "%d: Unexpected lpReserved %p.\n", iterationNumber, toolInfo.lpReserved); /* Clean up */ DestroyWindow(hwndTip);

1 0