November 2019 - Wine-Commits

Nikolay Sivov : user32/combo: Simplify child controls position update helper.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: 13d7cad9dee194d750ec3829b167042cd3ff8d74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13d7cad9dee194d750ec3829… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 12:59:21 2019 +0300 user32/combo: Simplify child controls position update helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 67 +++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 07d53f7341..d0affc0618 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1408,45 +1408,36 @@ static LRESULT COMBO_GetTextA( LPHEADCOMBO lphc, INT count, LPSTR buf ) * This function sets window positions according to the updated * component placement struct. */ -static void CBResetPos( - LPHEADCOMBO lphc, - const RECT *rectEdit, - const RECT *rectLB, - BOOL bRedraw) +static void CBResetPos(HEADCOMBO *combo, BOOL redraw) { - BOOL bDrop = (CB_GETTYPE(lphc) != CBS_SIMPLE); - - /* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of - * sizing messages */ - - if( lphc->wState & CBF_EDIT ) - SetWindowPos( lphc->hWndEdit, 0, - rectEdit->left, rectEdit->top, - rectEdit->right - rectEdit->left, - rectEdit->bottom - rectEdit->top, - SWP_NOZORDER | SWP_NOACTIVATE | ((bDrop) ? SWP_NOREDRAW : 0) ); - - SetWindowPos( lphc->hWndLBox, 0, - rectLB->left, rectLB->top, - rectLB->right - rectLB->left, - rectLB->bottom - rectLB->top, - SWP_NOACTIVATE | SWP_NOZORDER | ((bDrop) ? SWP_NOREDRAW : 0) ); - - if( bDrop ) - { - if( lphc->wState & CBF_DROPPED ) - { - lphc->wState &= ~CBF_DROPPED; - ShowWindow( lphc->hWndLBox, SW_HIDE ); - } + BOOL drop = CB_GETTYPE(combo) != CBS_SIMPLE; + + /* NOTE: logs sometimes have WM_LBUTTONUP before a cascade of + * sizing messages */ + if (combo->wState & CBF_EDIT) + SetWindowPos(combo->hWndEdit, 0, combo->textRect.left, combo->textRect.top, + combo->textRect.right - combo->textRect.left, + combo->textRect.bottom - combo->textRect.top, + SWP_NOZORDER | SWP_NOACTIVATE | (drop ? SWP_NOREDRAW : 0)); + + SetWindowPos(combo->hWndLBox, 0, combo->droppedRect.left, combo->droppedRect.top, + combo->droppedRect.right - combo->droppedRect.left, + combo->droppedRect.bottom - combo->droppedRect.top, + SWP_NOACTIVATE | SWP_NOZORDER | (drop ? SWP_NOREDRAW : 0)); + + if (drop) + { + if (combo->wState & CBF_DROPPED) + { + combo->wState &= ~CBF_DROPPED; + ShowWindow(combo->hWndLBox, SW_HIDE); + } - if( bRedraw && !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, - RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); - } + if (redraw && !(combo->wState & CBF_NOREDRAW)) + RedrawWindow(combo->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW); + } } - /*********************************************************************** * COMBO_Size */ @@ -1491,7 +1482,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) CBCalcPlacement(lphc); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); + CBResetPos(lphc, FALSE); } @@ -1519,7 +1510,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) { CBCalcPlacement(lphc); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos(lphc, TRUE); } else { @@ -1548,7 +1539,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) { CBCalcPlacement(lphc); - CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); + CBResetPos(lphc, TRUE); } else {

1 0

Alexandre Julliard : kernel32/tests: Add tests for NtGetNlsSectionPtr() and RtlInitCodePageTable().
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: 4901386892449c0831194fe3aed1d6a572f04405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4901386892449c0831194fe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 26 17:56:04 2019 +0100 kernel32/tests: Add tests for NtGetNlsSectionPtr() and RtlInitCodePageTable(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 116 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0e2c3496a9..5ae7bd492b 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -87,6 +87,8 @@ static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pFindStringOrdinal)(DWORD, LPCWSTR lpStringSource, INT, LPCWSTR, INT, BOOL); static NTSTATUS (WINAPI *pRtlNormalizeString)(ULONG, LPCWSTR, INT, LPWSTR, INT*); static NTSTATUS (WINAPI *pRtlIsNormalizedString)(ULONG, LPCWSTR, INT, BOOLEAN*); +static NTSTATUS (WINAPI *pNtGetNlsSectionPtr)(ULONG,ULONG,void*,void**,SIZE_T*); +static void (WINAPI *pRtlInitCodePageTable)(USHORT*,CPTABLEINFO*); static void InitFunctionPointers(void) { @@ -130,6 +132,8 @@ static void InitFunctionPointers(void) X(RtlLocaleNameToLcid); X(RtlNormalizeString); X(RtlIsNormalizedString); + X(NtGetNlsSectionPtr); + X(RtlInitCodePageTable); #undef X } @@ -1572,7 +1576,7 @@ static void test_GetNumberFormatA(void) if (IsValidLocale(lcid, 0)) { STRINGSA("-12345","-12 345,00"); /* Try French formatting */ - Expected[3] = 160; /* Non breaking space */ + Expected[3] = (char)160; /* Non breaking space */ ret = GetNumberFormatA(lcid, NUO, input, NULL, buffer, ARRAY_SIZE(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENA; EXPECT_EQA; @@ -4092,6 +4096,7 @@ static void test_EnumTimeFormatsW(void) GetLastError()); } } + static void test_GetCPInfo(void) { BOOL ret; @@ -4135,6 +4140,115 @@ static void test_GetCPInfo(void) ok(cpinfo.MaxCharSize == 4 || broken(cpinfo.MaxCharSize == 3) /* win9x */, "expected 4, got %u\n", cpinfo.MaxCharSize); } + + if (pNtGetNlsSectionPtr) + { + CPTABLEINFO table; + NTSTATUS status; + void *ptr, *ptr2; + SIZE_T size; + int i; + + for (i = 0; i < 100; i++) + { + ptr = NULL; + size = 0; + status = pNtGetNlsSectionPtr( i, 9999, NULL, &ptr, &size ); + switch (i) + { + case 9: /* unknown */ + case 13: /* unknown */ + ok( status == STATUS_INVALID_PARAMETER_1 || status == STATUS_INVALID_PARAMETER_3, /* vista */ + "%u: failed %x\n", i, status ); + break; + case 10: /* casemap */ + ok( status == STATUS_INVALID_PARAMETER_1 || status == STATUS_UNSUCCESSFUL, + "%u: failed %x\n", i, status ); + break; + case 11: /* codepage */ + case 12: /* normalization */ + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "%u: failed %x\n", i, status ); + break; + default: + ok( status == STATUS_INVALID_PARAMETER_1, "%u: failed %x\n", i, status ); + break; + } + } + + /* casemap table */ + + status = pNtGetNlsSectionPtr( 10, 0, NULL, &ptr, &size ); + if (status != STATUS_INVALID_PARAMETER_1) + { + ok( !status, "failed %x\n", status ); + ok( size > 0x1000 && size <= 0x8000 , "wrong size %lx\n", size ); + status = pNtGetNlsSectionPtr( 10, 0, NULL, &ptr2, &size ); + ok( ptr != ptr2, "got same pointer\n" ); + ret = UnmapViewOfFile( ptr ); + todo_wine ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); + ret = UnmapViewOfFile( ptr2 ); + todo_wine ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); + } + + /* codepage tables */ + + ptr = (void *)0xdeadbeef; + size = 0xdeadbeef; + status = pNtGetNlsSectionPtr( 11, 437, NULL, &ptr, &size ); + ok( !status, "failed %x\n", status ); + ok( size > 0x10000 && size <= 0x20000, "wrong size %lx\n", size ); + memset( &table, 0xcc, sizeof(table) ); + if (pRtlInitCodePageTable) + { + pRtlInitCodePageTable( ptr, &table ); + ok( table.CodePage == 437, "wrong codepage %u\n", table.CodePage ); + ok( table.MaximumCharacterSize == 1, "wrong char size %u\n", table.MaximumCharacterSize ); + ok( table.DefaultChar == '?', "wrong default char %x\n", table.DefaultChar ); + ok( !table.DBCSCodePage, "wrong dbcs %u\n", table.DBCSCodePage ); + } + ret = UnmapViewOfFile( ptr ); + todo_wine ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); + + status = pNtGetNlsSectionPtr( 11, 932, NULL, &ptr, &size ); + ok( !status, "failed %x\n", status ); + ok( size > 0x20000 && size <= 0x30000, "wrong size %lx\n", size ); + memset( &table, 0xcc, sizeof(table) ); + if (pRtlInitCodePageTable) + { + pRtlInitCodePageTable( ptr, &table ); + ok( table.CodePage == 932, "wrong codepage %u\n", table.CodePage ); + ok( table.MaximumCharacterSize == 2, "wrong char size %u\n", table.MaximumCharacterSize ); + ok( table.DefaultChar == '?', "wrong default char %x\n", table.DefaultChar ); + ok( table.DBCSCodePage == TRUE, "wrong dbcs %u\n", table.DBCSCodePage ); + } + ret = UnmapViewOfFile( ptr ); + todo_wine ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); + + /* normalization tables */ + + for (i = 0; i < 100; i++) + { + status = pNtGetNlsSectionPtr( 12, i, NULL, &ptr, &size ); + switch (i) + { + case NormalizationC: + case NormalizationD: + case NormalizationKC: + case NormalizationKD: + case 13: /* IDN */ + todo_wine ok( !status, "%u: failed %x\n", i, status ); + if (status) break; + ok( size > 0x8000 && size <= 0x30000 , "wrong size %lx\n", size ); + ret = UnmapViewOfFile( ptr ); + ok( ret, "UnmapViewOfFile failed err %u\n", GetLastError() ); + break; + default: + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "%u: failed %x\n", i, status ); + break; + } + } + } + else win_skip( "NtGetNlsSectionPtr not supported\n" ); } /*

1 0

Alexandre Julliard : ntdll: Generate a Windows format codepage table using the libwine data.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: ea20035272cad30406a2e10cefb27d3d0ba5af48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea20035272cad30406a2e10c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 26 17:53:51 2019 +0100 ntdll: Generate a Windows format codepage table using the libwine data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index c271cab732..26b2f4203c 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -234,6 +234,88 @@ static NTSTATUS open_nls_data_file( ULONG type, ULONG id, HANDLE *file ) } +static USHORT *build_cptable( const union cptable *src, SIZE_T *size ) +{ + unsigned int i, leadbytes = 0; + USHORT *data, *ptr; + + *size = 13 + 1 + 256 + 1 + 1 + 1; + if (src->info.char_size == 2) + { + for (i = leadbytes = 0; i < 256; i++) if (src->dbcs.cp2uni_leadbytes[i]) leadbytes++; + *size += 256 + 256 * leadbytes; + *size += 65536; + *size *= sizeof(USHORT); + } + else + { + if (src->sbcs.cp2uni_glyphs != src->sbcs.cp2uni) *size += 256; + *size *= sizeof(USHORT); + *size += 65536; + } + if (!(data = RtlAllocateHeap( GetProcessHeap(), 0, *size ))) return NULL; + ptr = data; + ptr[0] = 0x0d; + ptr[1] = src->info.codepage; + ptr[2] = src->info.char_size; + ptr[3] = (src->info.def_char & 0xff00 ? + RtlUshortByteSwap( src->info.def_char ) : src->info.def_char); + ptr[4] = src->info.def_unicode_char; + + if (src->info.char_size == 2) + { + USHORT off = src->dbcs.cp2uni_leadbytes[src->info.def_char >> 8] * 256; + ptr[5] = src->dbcs.cp2uni[off + (src->info.def_char & 0xff)]; + + ptr[6] = src->dbcs.uni2cp_low[src->dbcs.uni2cp_high[src->info.def_unicode_char >> 8] + + (src->info.def_unicode_char & 0xff)]; + + ptr += 7; + memcpy( ptr, src->dbcs.lead_bytes, 12 ); + ptr += 6; + *ptr++ = 256 + 3 + (leadbytes + 1) * 256; + for (i = 0; i < 256; i++) *ptr++ = (src->dbcs.cp2uni_leadbytes[i] ? 0 : src->dbcs.cp2uni[i]); + *ptr++ = 0; + for (i = 0; i < 12; i++) if (!src->dbcs.lead_bytes[i]) break; + *ptr++ = i / 2; + for (i = 0; i < 256; i++) *ptr++ = 256 * src->dbcs.cp2uni_leadbytes[i]; + for (i = 0; i < leadbytes; i++, ptr += 256) + memcpy( ptr, src->dbcs.cp2uni + 256 * (i + 1), 256 * sizeof(USHORT) ); + *ptr++ = 4; + for (i = 0; i < 65536; i++) + ptr[i] = src->dbcs.uni2cp_low[src->dbcs.uni2cp_high[i >> 8] + (i & 0xff)]; + } + else + { + char *uni2cp; + + ptr[5] = src->sbcs.cp2uni[src->info.def_char]; + ptr[6] = src->sbcs.uni2cp_low[src->sbcs.uni2cp_high[src->info.def_unicode_char >> 8] + + (src->info.def_unicode_char & 0xff)]; + + ptr += 7; + memset( ptr, 0, 12 ); + ptr += 6; + *ptr++ = 256 + 3 + (src->sbcs.cp2uni_glyphs != src->sbcs.cp2uni ? 256 : 0); + memcpy( ptr, src->sbcs.cp2uni, 256 * sizeof(USHORT) ); + ptr += 256; + if (src->sbcs.cp2uni_glyphs != src->sbcs.cp2uni) + { + *ptr++ = 256; + memcpy( ptr + 1, src->sbcs.cp2uni_glyphs, 256 ); + ptr += 256; + } + else *ptr++ = 0; + *ptr++ = 0; + *ptr++ = 0; + uni2cp = (char *)ptr; + for (i = 0; i < 65536; i++) + uni2cp[i] = src->sbcs.uni2cp_low[src->sbcs.uni2cp_high[i >> 8] + (i & 0xff)]; + } + return data; +} + + #if !defined(__APPLE__) && !defined(__ANDROID__) /* these platforms always use UTF-8 */ /* charset to codepage map, sorted by name */ @@ -604,7 +686,17 @@ NTSTATUS WINAPI NtGetNlsSectionPtr( ULONG type, ULONG id, void *unknown, void ** HANDLE file; NTSTATUS status; - if ((status = open_nls_data_file( type, id, &file ))) return status; + if ((status = open_nls_data_file( type, id, &file ))) + { + /* FIXME: special case for codepage table, generate it from the libwine data */ + if (type == NLS_SECTION_CODEPAGE) + { + const union cptable *table = wine_cp_get_table( id ); + if (table && (*ptr = build_cptable( table, size ))) return STATUS_SUCCESS; + } + 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 */

1 0

Nikolay Sivov : ntdll: Implement thread description as information class.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: b934f6626ed7cb8a6cc18b261550d363a0068141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b934f6626ed7cb8a6cc18b26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 09:48:10 2019 +0300 ntdll: Implement thread description as information class. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 52 ++++++++++++++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 15 +++++++----- server/protocol.def | 12 ++++++---- server/request.h | 1 + server/thread.c | 36 +++++++++++++++++++++++++++++ server/thread.h | 2 ++ server/trace.c | 3 +++ 7 files changed, 111 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 621aaddfe3..6079a6c195 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1115,6 +1115,36 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, *(BOOL*)data = FALSE; if (ret_len) *ret_len = sizeof(BOOL); return STATUS_SUCCESS; + case ThreadDescription: + { + THREAD_DESCRIPTION_INFORMATION *info = data; + data_size_t len, desc_len = 0; + WCHAR *ptr; + + len = length >= sizeof(*info) ? length - sizeof(*info) : 0; + ptr = info ? (WCHAR *)(info + 1) : NULL; + + SERVER_START_REQ( get_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + if (ptr) wine_server_set_reply( req, ptr, len ); + status = wine_server_call( req ); + desc_len = reply->desc_len; + } + SERVER_END_REQ; + + if (!info) + status = STATUS_BUFFER_TOO_SMALL; + else if (status == STATUS_SUCCESS) + { + info->Length = desc_len << 16 | desc_len; + info->Description = ptr; + } + + if (ret_len && (status == STATUS_SUCCESS || status == STATUS_BUFFER_TOO_SMALL)) + *ret_len = sizeof(*info) + desc_len; + } + return status; case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: @@ -1270,6 +1300,28 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, SERVER_END_REQ; } return status; + case ThreadDescription: + { + const THREAD_DESCRIPTION_INFORMATION *info = data; + data_size_t desc_len; + + if (length != sizeof(*info)) return STATUS_INFO_LENGTH_MISMATCH; + if (!info) return STATUS_ACCESS_VIOLATION; + + desc_len = info->Length & 0xffff; + if (info->Length >> 16 != desc_len) return STATUS_INVALID_PARAMETER; + if (info->Length && !info->Description) return STATUS_ACCESS_VIOLATION; + + SERVER_START_REQ( set_thread_info ) + { + req->handle = wine_server_obj_handle( handle ); + req->mask = SET_THREAD_INFO_DESCRIPTION; + wine_server_add_data( req, info->Description, desc_len ); + status = wine_server_call( req ); + } + SERVER_END_REQ; + } + return status; case ThreadBasicInformation: case ThreadTimes: case ThreadPriority: diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0712170c80..108701b2bc 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1006,7 +1006,8 @@ struct get_thread_info_reply int exit_code; int priority; int last; - char __pad_52[4]; + data_size_t desc_len; + /* VARARG(desc,unicode_str); */ }; @@ -1034,16 +1035,18 @@ struct set_thread_info_request affinity_t affinity; client_ptr_t entry_point; obj_handle_t token; + /* VARARG(desc,unicode_str); */ char __pad_44[4]; }; struct set_thread_info_reply { struct reply_header __header; }; -#define SET_THREAD_INFO_PRIORITY 0x01 -#define SET_THREAD_INFO_AFFINITY 0x02 -#define SET_THREAD_INFO_TOKEN 0x04 -#define SET_THREAD_INFO_ENTRYPOINT 0x08 +#define SET_THREAD_INFO_PRIORITY 0x01 +#define SET_THREAD_INFO_AFFINITY 0x02 +#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_ENTRYPOINT 0x08 +#define SET_THREAD_INFO_DESCRIPTION 0x10 @@ -6697,6 +6700,6 @@ union generic_reply struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 591 +#define SERVER_PROTOCOL_VERSION 592 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index c5c15ea1d7..566bc83bb2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -944,6 +944,8 @@ struct rawinput_device int exit_code; /* thread exit code */ int priority; /* thread priority level */ int last; /* last thread in process */ + data_size_t desc_len; /* description length in bytes */ + VARARG(desc,unicode_str); /* description string */ @END @@ -964,11 +966,13 @@ struct rawinput_device affinity_t affinity; /* affinity mask */ client_ptr_t entry_point; /* thread entry point */ obj_handle_t token; /* impersonation token */ + VARARG(desc,unicode_str); /* description string */ @END -#define SET_THREAD_INFO_PRIORITY 0x01 -#define SET_THREAD_INFO_AFFINITY 0x02 -#define SET_THREAD_INFO_TOKEN 0x04 -#define SET_THREAD_INFO_ENTRYPOINT 0x08 +#define SET_THREAD_INFO_PRIORITY 0x01 +#define SET_THREAD_INFO_AFFINITY 0x02 +#define SET_THREAD_INFO_TOKEN 0x04 +#define SET_THREAD_INFO_ENTRYPOINT 0x08 +#define SET_THREAD_INFO_DESCRIPTION 0x10 /* Retrieve information about a module */ diff --git a/server/request.h b/server/request.h index f0d2003cd7..de7720ae68 100644 --- a/server/request.h +++ b/server/request.h @@ -849,6 +849,7 @@ C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, affinity) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, exit_code) == 40 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, priority) == 44 ); C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, last) == 48 ); +C_ASSERT( FIELD_OFFSET(struct get_thread_info_reply, desc_len) == 52 ); C_ASSERT( sizeof(struct get_thread_info_reply) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_thread_times_request, handle) == 12 ); C_ASSERT( sizeof(struct get_thread_times_request) == 16 ); diff --git a/server/thread.c b/server/thread.c index e753c8d0dd..4fc6abf0ef 100644 --- a/server/thread.c +++ b/server/thread.c @@ -201,6 +201,8 @@ static inline void init_thread_structure( struct thread *thread ) thread->suspend = 0; thread->desktop_users = 0; thread->token = NULL; + thread->desc = NULL; + thread->desc_len = 0; thread->creation_time = current_time; thread->exit_time = 0; @@ -336,6 +338,7 @@ static void cleanup_thread( struct thread *thread ) thread->inflight[i].client = thread->inflight[i].server = -1; } } + free( thread->desc ); thread->req_data = NULL; thread->reply_data = NULL; thread->request_fd = NULL; @@ -344,6 +347,8 @@ static void cleanup_thread( struct thread *thread ) thread->context = NULL; thread->suspend_context = NULL; thread->desktop = 0; + thread->desc = NULL; + thread->desc_len = 0; } /* destroy a thread when its refcount is 0 */ @@ -551,6 +556,28 @@ static void set_thread_info( struct thread *thread, security_set_thread_token( thread, req->token ); if (req->mask & SET_THREAD_INFO_ENTRYPOINT) thread->entry_point = req->entry_point; + if (req->mask & SET_THREAD_INFO_DESCRIPTION) + { + WCHAR *desc; + data_size_t desc_len = get_req_data_size(); + + if (desc_len) + { + if ((desc = mem_alloc( desc_len ))) + { + memcpy( desc, get_req_data(), desc_len ); + free( thread->desc ); + thread->desc = desc; + thread->desc_len = desc_len; + } + } + else + { + free( thread->desc ); + thread->desc = NULL; + thread->desc_len = 0; + } + } } /* stop a thread (at the Unix level) */ @@ -1436,6 +1463,15 @@ DECL_HANDLER(get_thread_info) reply->priority = thread->priority; reply->affinity = thread->affinity; reply->last = thread->process->running_threads == 1; + reply->desc_len = thread->desc_len; + + if (thread->desc && get_reply_max_size()) + { + if (thread->desc_len <= get_reply_max_size()) + set_reply_data( thread->desc, thread->desc_len ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); + } release_object( thread ); } diff --git a/server/thread.h b/server/thread.h index e10120dcf6..66e35603d3 100644 --- a/server/thread.h +++ b/server/thread.h @@ -88,6 +88,8 @@ struct thread timeout_t exit_time; /* Thread exit time */ struct token *token; /* security token associated with this thread */ struct list kernel_object; /* list of kernel object pointers */ + data_size_t desc_len; /* thread description length in bytes */ + WCHAR *desc; /* thread description string */ }; struct thread_snapshot diff --git a/server/trace.c b/server/trace.c index 11df768755..d44f67a021 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1423,6 +1423,8 @@ static void dump_get_thread_info_reply( const struct get_thread_info_reply *req fprintf( stderr, ", exit_code=%d", req->exit_code ); fprintf( stderr, ", priority=%d", req->priority ); fprintf( stderr, ", last=%d", req->last ); + fprintf( stderr, ", desc_len=%u", req->desc_len ); + dump_varargs_unicode_str( ", desc=", cur_size ); } static void dump_get_thread_times_request( const struct get_thread_times_request *req ) @@ -1444,6 +1446,7 @@ static void dump_set_thread_info_request( const struct set_thread_info_request * dump_uint64( ", affinity=", &req->affinity ); dump_uint64( ", entry_point=", &req->entry_point ); fprintf( stderr, ", token=%04x", req->token ); + dump_varargs_unicode_str( ", desc=", cur_size ); } static void dump_get_dll_info_request( const struct get_dll_info_request *req )

1 0

Nikolay Sivov : user32/combo: Simplify rectangles sizing helper.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: b563ea018b196e4e7019beadaf5dfae4afed22a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b563ea018b196e4e7019bead… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 12:59:20 2019 +0300 user32/combo: Simplify rectangles sizing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 163 ++++++++++++++++++---------------------------------- 1 file changed, 55 insertions(+), 108 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 4ddccd6c95..07d53f7341 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -319,111 +319,70 @@ static void CBForceDummyResize( * * Set up component coordinates given valid lphc->RectCombo. */ -static void CBCalcPlacement( - HWND hwnd, - LPHEADCOMBO lphc, - LPRECT lprEdit, - LPRECT lprButton, - LPRECT lprLB) +static void CBCalcPlacement(HEADCOMBO *combo) { - /* - * Again, start with the client rectangle. - */ - GetClientRect(hwnd, lprEdit); + /* Start with the client rectangle. */ + GetClientRect(combo->self, &combo->textRect); - /* - * Remove the borders - */ - InflateRect(lprEdit, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); + /* Remove the borders */ + InflateRect(&combo->textRect, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); - /* - * Chop off the bottom part to fit with the height of the text area. - */ - lprEdit->bottom = lprEdit->top + CBGetTextAreaHeight(hwnd, lphc); - - /* - * The button starts the same vertical position as the text area. - */ - CopyRect(lprButton, lprEdit); + /* Chop off the bottom part to fit with the height of the text area. */ + combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo->self, combo); - /* - * If the combobox is "simple" there is no button. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - lprButton->left = lprButton->right = lprButton->bottom = 0; - else - { - /* - * Let's assume the combobox button is the same width as the - * scrollbar button. - * size the button horizontally and cut-off the text area. - */ - lprButton->left = lprButton->right - GetSystemMetrics(SM_CXVSCROLL); - lprEdit->right = lprButton->left; - } + /* The button starts the same vertical position as the text area. */ + combo->buttonRect = combo->textRect; - /* - * In the case of a dropdown, there is an additional spacing between the - * text area and the button. - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - { - lprEdit->right -= COMBO_EDITBUTTONSPACE(); - } + /* If the combobox is "simple" there is no button. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) + combo->buttonRect.left = combo->buttonRect.right = combo->buttonRect.bottom = 0; + else + { + /* + * Let's assume the combobox button is the same width as the + * scrollbar button. + * size the button horizontally and cut-off the text area. + */ + combo->buttonRect.left = combo->buttonRect.right - GetSystemMetrics(SM_CXVSCROLL); + combo->textRect.right = combo->buttonRect.left; + } - /* - * If we have an edit control, we space it away from the borders slightly. - */ - if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) - { - InflateRect(lprEdit, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - } + /* In the case of a dropdown, there is an additional spacing between the text area and the button. */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->textRect.right -= COMBO_EDITBUTTONSPACE(); - /* - * Adjust the size of the listbox popup. - */ - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - { - /* - * Use the client rectangle to initialize the listbox rectangle - */ - GetClientRect(hwnd, lprLB); + /* If we have an edit control, we space it away from the borders slightly. */ + if (CB_GETTYPE(combo) != CBS_DROPDOWNLIST) + InflateRect(&combo->textRect, -EDIT_CONTROL_PADDING(), -EDIT_CONTROL_PADDING()); - /* - * Then, chop-off the top part. - */ - lprLB->top = lprEdit->bottom + COMBO_YBORDERSIZE(); - } - else - { - /* - * Make sure the dropped width is as large as the combobox itself. - */ - if (lphc->droppedWidth < (lprButton->right + COMBO_XBORDERSIZE())) + /* Adjust the size of the listbox popup. */ + if (CB_GETTYPE(combo) == CBS_SIMPLE) { - lprLB->right = lprLB->left + (lprButton->right + COMBO_XBORDERSIZE()); - - /* - * In the case of a dropdown, the popup listbox is offset to the right. - * so, we want to make sure it's flush with the right side of the - * combobox - */ - if( CB_GETTYPE(lphc) == CBS_DROPDOWN ) - lprLB->right -= COMBO_EDITBUTTONSPACE(); + GetClientRect(combo->self, &combo->droppedRect); + combo->droppedRect.top = combo->textRect.bottom + COMBO_YBORDERSIZE(); } else - lprLB->right = lprLB->left + lphc->droppedWidth; - } - - /* don't allow negative window width */ - if (lprEdit->right < lprEdit->left) - lprEdit->right = lprEdit->left; + { + /* Make sure the dropped width is as large as the combobox itself. */ + if (combo->droppedWidth < (combo->buttonRect.right + COMBO_XBORDERSIZE())) + { + combo->droppedRect.right = combo->droppedRect.left + (combo->buttonRect.right + COMBO_XBORDERSIZE()); - TRACE("\ttext\t= (%s)\n", wine_dbgstr_rect(lprEdit)); + /* In the case of a dropdown, the popup listbox is offset to the right. We want to make sure it's flush + with the right side of the combobox. */ + if (CB_GETTYPE(combo) == CBS_DROPDOWN) + combo->droppedRect.right -= COMBO_EDITBUTTONSPACE(); + } + else + combo->droppedRect.right = combo->droppedRect.left + combo->droppedWidth; + } - TRACE("\tbutton\t= (%s)\n", wine_dbgstr_rect(lprButton)); + /* Disallow negative window width */ + if (combo->textRect.right < combo->textRect.left) + combo->textRect.right = combo->textRect.left; - TRACE("\tlbox\t= (%s)\n", wine_dbgstr_rect(lprLB)); + TRACE("text %s, button %s, lbox %s.\n", wine_dbgstr_rect(&combo->textRect), wine_dbgstr_rect(&combo->buttonRect), + wine_dbgstr_rect(&combo->droppedRect)); } /*********************************************************************** @@ -479,7 +438,7 @@ static LRESULT COMBO_Create( HWND hwnd, LPHEADCOMBO lphc, HWND hwndParent, LONG * recalculated. */ GetClientRect( hwnd, &lphc->droppedRect ); - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* * Adjust the position of the popup listbox if it's necessary @@ -1530,11 +1489,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) SWP_NOZORDER|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW); } - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, FALSE ); } @@ -1562,11 +1517,7 @@ static void COMBO_Font( LPHEADCOMBO lphc, HFONT hFont, BOOL bRedraw ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -1595,11 +1546,7 @@ static LRESULT COMBO_SetItemHeight( LPHEADCOMBO lphc, INT index, INT height ) */ if ( CB_GETTYPE(lphc) == CBS_SIMPLE) { - CBCalcPlacement(lphc->self, - lphc, - &lphc->textRect, - &lphc->buttonRect, - &lphc->droppedRect); + CBCalcPlacement(lphc); CBResetPos( lphc, &lphc->textRect, &lphc->droppedRect, TRUE ); } @@ -2100,7 +2047,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar lphc->droppedWidth = 0; /* recalculate the combobox area */ - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + CBCalcPlacement(lphc); /* fall through */ case CB_GETDROPPEDWIDTH:

1 0

Nikolay Sivov : user32/combo: Remove redundant argument from text height helper.
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: 14e074b2a428b0f6a4c2ba2f2f0a6ba9ed0dc837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14e074b2a428b0f6a4c2ba2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 12:59:22 2019 +0300 user32/combo: Remove redundant argument from text height helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index d0affc0618..40ff0ef521 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -193,9 +193,7 @@ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) * This height was determined through experimentation. * CBCalcPlacement will add 2*COMBO_YBORDERSIZE pixels for the border */ -static INT CBGetTextAreaHeight( - HWND hwnd, - LPHEADCOMBO lphc) +static INT CBGetTextAreaHeight(HEADCOMBO *lphc) { INT iTextItemHeight; @@ -206,7 +204,7 @@ static INT CBGetTextAreaHeight( else { TEXTMETRICW tm; - HDC hDC = GetDC(hwnd); + HDC hDC = GetDC(lphc->self); HFONT hPrevFont = 0; INT baseUnitY; @@ -220,7 +218,7 @@ static INT CBGetTextAreaHeight( if( hPrevFont ) SelectObject( hDC, hPrevFont ); - ReleaseDC(hwnd, hDC); + ReleaseDC(lphc->self, hDC); iTextItemHeight = baseUnitY + 4; } @@ -240,7 +238,7 @@ static INT CBGetTextAreaHeight( /* * We use the client rect for the width of the item. */ - GetClientRect(hwnd, &clientRect); + GetClientRect(lphc->self, &clientRect); lphc->wState &= ~CBF_MEASUREITEM; @@ -294,7 +292,7 @@ static void CBForceDummyResize( RECT windowRect; int newComboHeight; - newComboHeight = CBGetTextAreaHeight(lphc->self,lphc) + 2*COMBO_YBORDERSIZE(); + newComboHeight = CBGetTextAreaHeight(lphc) + 2*COMBO_YBORDERSIZE(); GetWindowRect(lphc->self, &windowRect); @@ -328,7 +326,7 @@ static void CBCalcPlacement(HEADCOMBO *combo) InflateRect(&combo->textRect, -COMBO_XBORDERSIZE(), -COMBO_YBORDERSIZE()); /* Chop off the bottom part to fit with the height of the text area. */ - combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo->self, combo); + combo->textRect.bottom = combo->textRect.top + CBGetTextAreaHeight(combo); /* The button starts the same vertical position as the text area. */ combo->buttonRect = combo->textRect; @@ -1455,7 +1453,7 @@ static void COMBO_Size( LPHEADCOMBO lphc ) GetWindowRect(lphc->self, &rc); curComboHeight = rc.bottom - rc.top; curComboWidth = rc.right - rc.left; - newComboHeight = CBGetTextAreaHeight(lphc->self, lphc) + 2*COMBO_YBORDERSIZE(); + newComboHeight = CBGetTextAreaHeight(lphc) + 2*COMBO_YBORDERSIZE(); /* * Resizing a combobox has another side effect, it resizes the dropped @@ -2004,7 +2002,7 @@ LRESULT ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar case CB_GETITEMHEIGHT: if( (INT)wParam >= 0 ) /* listbox item */ return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0); - return CBGetTextAreaHeight(hwnd, lphc); + return CBGetTextAreaHeight(lphc); case CB_RESETCONTENT: SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0); if( (lphc->wState & CBF_EDIT) && CB_HASSTRINGS(lphc) )

1 0

Zebediah Figura : wined3d: Export wined3d_stateblock_init_contained_states().
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: d1e3e6127984c3df796d2a9fdb96d0ac82c7c253 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e3e6127984c3df796d2a9f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 09:57:35 2019 -0600 wined3d: Export wined3d_stateblock_init_contained_states(). 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/wined3d/device.c | 2 +- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 2 -- include/wine/wined3d.h | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 87db701d15..5983281f93 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4131,7 +4131,7 @@ HRESULT CDECL wined3d_device_end_stateblock(struct wined3d_device *device) return WINED3DERR_INVALIDCALL; } - stateblock_init_contained_states(stateblock); + wined3d_stateblock_init_contained_states(stateblock); wined3d_stateblock_decref(device->recording); device->recording = NULL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 898a4bc93d..dc714914ec 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -283,7 +283,7 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state memset(states->vs_consts_f, TRUE, sizeof(BOOL) * num_constants); } -void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) +void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock) { const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; unsigned int i, j; @@ -2032,7 +2032,7 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, break; } - stateblock_init_contained_states(stateblock); + wined3d_stateblock_init_contained_states(stateblock); wined3d_stateblock_capture(stateblock); /* According to the tests, stream offset is not updated in the captured state if diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index ea04c85d38..29bcd75926 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -262,6 +262,7 @@ @ cdecl wined3d_stateblock_create(ptr long ptr) @ cdecl wined3d_stateblock_decref(ptr) @ cdecl wined3d_stateblock_incref(ptr) +@ cdecl wined3d_stateblock_init_contained_states(ptr) @ cdecl wined3d_stateblock_reset(ptr) @ cdecl wined3d_stateblock_set_base_vertex_index(ptr long) @ cdecl wined3d_stateblock_set_blend_factor(ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6d25aa6d8..8ebf377b11 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3974,8 +3974,6 @@ struct wined3d_stateblock unsigned int num_contained_sampler_states; }; -void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; - void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state, const struct wined3d_device *device, DWORD flags) DECLSPEC_HIDDEN; void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index fac9eef5be..37e012b979 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2667,6 +2667,7 @@ HRESULT __cdecl wined3d_stateblock_create(struct wined3d_device *device, enum wined3d_stateblock_type type, struct wined3d_stateblock **stateblock); ULONG __cdecl wined3d_stateblock_decref(struct wined3d_stateblock *stateblock); ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); +void __cdecl wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_reset(struct wined3d_stateblock *stateblock); void __cdecl wined3d_stateblock_set_base_vertex_index(struct wined3d_stateblock *stateblock, INT base_index); void __cdecl wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock,

1 0

Nikolay Sivov : mfplat: Do not make a copy when setting GUID attribute (Valgrind).
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: 3c32b3c16edd0fce9c0624c847ffbd0ee2f5334b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c32b3c16edd0fce9c0624c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 13:35:30 2019 +0300 mfplat: Do not make a copy when setting GUID attribute (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6336b1b347..e4ade7f202 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1651,7 +1651,8 @@ HRESULT attributes_SetGUID(struct attributes *attributes, REFGUID key, REFGUID v { PROPVARIANT attrval; - InitPropVariantFromCLSID(value, &attrval); + attrval.vt = VT_CLSID; + attrval.u.puuid = (CLSID *)value; return attributes_set_item(attributes, key, &attrval); }

1 0

Nikolay Sivov : mfplat: Do not make a copy when returning GUID attributes (Valgrind).
by Alexandre Julliard Nov. 26, 2019

Nov. 26, 2019

Module: wine Branch: master Commit: c091f9b7f6cbc776f0448c0879bf9dbe472de720 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c091f9b7f6cbc776f0448c08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 26 13:35:29 2019 +0300 mfplat: Do not make a copy when returning GUID attributes (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 48e64adeef..6336b1b347 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1349,14 +1349,23 @@ HRESULT attributes_GetDouble(struct attributes *attributes, REFGUID key, double HRESULT attributes_GetGUID(struct attributes *attributes, REFGUID key, GUID *value) { - PROPVARIANT attrval; - HRESULT hr; + struct attribute *attribute; + HRESULT hr = S_OK; - PropVariantInit(&attrval); - attrval.vt = VT_CLSID; - hr = attributes_get_item(attributes, key, &attrval); - if (SUCCEEDED(hr)) - *value = *attrval.u.puuid; + EnterCriticalSection(&attributes->cs); + + attribute = attributes_find_item(attributes, key, NULL); + if (attribute) + { + if (attribute->value.vt == MF_ATTRIBUTE_GUID) + *value = *attribute->value.u.puuid; + else + hr = MF_E_INVALIDTYPE; + } + else + hr = MF_E_ATTRIBUTENOTFOUND; + + LeaveCriticalSection(&attributes->cs); return hr; }

1 0

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

Nov. 26, 2019

Module: wine Branch: master Commit: 332fd135b5ff2336ef0ee1bcc973b3910b2e1957 URL: https://source.winehq.org/git/wine.git/?a=commit;h=332fd135b5ff2336ef0ee1bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 26 09:57:36 2019 -0600 ddraw: 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/ddraw/device.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ffa029321c..faeb7ba1ff 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5642,7 +5642,7 @@ static HRESULT d3d_device7_BeginStateBlock(IDirect3DDevice7 *iface) WARN("Trying to begin a stateblock while recording, returning D3DERR_INBEGINSTATEBLOCK.\n"); return D3DERR_INBEGINSTATEBLOCK; } - if (SUCCEEDED(hr = wined3d_device_begin_stateblock(device->wined3d_device, &stateblock))) + if (SUCCEEDED(hr = wined3d_stateblock_create(device->wined3d_device, WINED3D_SBT_RECORDED, &stateblock))) device->update_state = device->recording = stateblock; wined3d_mutex_unlock(); @@ -5686,7 +5686,6 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); struct wined3d_stateblock *wined3d_sb; - HRESULT hr; DWORD h; TRACE("iface %p, stateblock %p.\n", iface, stateblock); @@ -5701,15 +5700,8 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl WARN("Trying to end a stateblock, but no stateblock is being recorded.\n"); return D3DERR_NOTINBEGINSTATEBLOCK; } - hr = wined3d_device_end_stateblock(device->wined3d_device); - if (FAILED(hr)) - { - WARN("Failed to end stateblock, hr %#x.\n", hr); - wined3d_mutex_unlock(); - *stateblock = 0; - return hr_ddraw_from_wined3d(hr); - } wined3d_sb = device->recording; + wined3d_stateblock_init_contained_states(wined3d_sb); device->recording = NULL; device->update_state = device->state; @@ -5726,7 +5718,7 @@ static HRESULT d3d_device7_EndStateBlock(IDirect3DDevice7 *iface, DWORD *statebl wined3d_mutex_unlock(); *stateblock = h + 1; - return hr_ddraw_from_wined3d(hr); + return D3D_OK; } static HRESULT WINAPI d3d_device7_EndStateBlock_FPUSetup(IDirect3DDevice7 *iface, DWORD *stateblock)

1 0