December 2019 - Wine-commits

Henri Verbeet : wined3d: Do not download textures to WINED3D_LOCATION_BUFFER in wined3d_texture_gl_unload().
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 153db6a7579b9256e73b7313426c0797b242671a URL: https://source.winehq.org/git/wine.git/?a=commit;h=153db6a7579b9256e73b7313… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 3 20:24:00 2019 +0330 wined3d: Do not download textures to WINED3D_LOCATION_BUFFER in wined3d_texture_gl_unload(). Since we remove any potential PBO a few lines later. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a3bbf2585d..1c315a1dd7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2942,6 +2942,7 @@ static void wined3d_texture_gl_unload(struct wined3d_resource *resource) UINT sub_count = texture_gl->t.level_count * texture_gl->t.layer_count; struct wined3d_renderbuffer_entry *entry, *entry2; struct wined3d_device *device = resource->device; + unsigned int location = resource->map_binding; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; UINT i; @@ -2951,14 +2952,17 @@ static void wined3d_texture_gl_unload(struct wined3d_resource *resource) context = context_acquire(device, NULL, 0); gl_info = wined3d_context_gl(context)->gl_info; + if (location == WINED3D_LOCATION_BUFFER) + location = WINED3D_LOCATION_SYSMEM; + for (i = 0; i < sub_count; ++i) { struct wined3d_texture_sub_resource *sub_resource = &texture_gl->t.sub_resources[i]; if (resource->access & WINED3D_RESOURCE_ACCESS_CPU - && wined3d_texture_load_location(&texture_gl->t, i, context, resource->map_binding)) + && wined3d_texture_load_location(&texture_gl->t, i, context, location)) { - wined3d_texture_invalidate_location(&texture_gl->t, i, ~resource->map_binding); + wined3d_texture_invalidate_location(&texture_gl->t, i, ~location); } else {

1 0

Chip Davis : winemac.drv: Also stop dragging if we receive a mouse up event.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 5cf64084fb6f277c3453099a65a78817d5c9f1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cf64084fb6f277c3453099a… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Sun Nov 24 20:14:51 2019 -0600 winemac.drv: Also stop dragging if we receive a mouse up event. We rely on AppKit-internal events to know when a window is being dragged. In Catalina, AppKit stopped sending the "drag ended" event when no drag actually took place, though it still sends "drag started" events when the title bar is clicked. Ironically, this caused us to think the window was still being dragged. In that case, waiting for the mouse button to come back up should allow us to determine when the drag should end. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_app.m | 58 ++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index efbd657384..b5658eab08 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1577,6 +1577,34 @@ static NSString* WineLocalizedString(unsigned int stringID) } } + - (void) handleWindowDrag:(NSEvent*)anEvent begin:(BOOL)begin + { + WineWindow* window = (WineWindow*)[anEvent window]; + if ([window isKindOfClass:[WineWindow class]]) + { + macdrv_event* event; + int eventType; + + if (begin) + { + [windowsBeingDragged addObject:window]; + eventType = WINDOW_DRAG_BEGIN; + } + else + { + [windowsBeingDragged removeObject:window]; + eventType = WINDOW_DRAG_END; + } + [self updateCursorClippingState]; + + event = macdrv_create_event(eventType, window); + if (eventType == WINDOW_DRAG_BEGIN) + event->window_drag_begin.no_activate = [NSEvent wine_commandKeyDown]; + [window.queue postEvent:event]; + macdrv_release_event(event); + } + } + - (void) handleMouseMove:(NSEvent*)anEvent { WineWindow* targetWindow; @@ -1731,6 +1759,9 @@ static NSString* WineLocalizedString(unsigned int stringID) WineWindow* windowBroughtForward = nil; BOOL process = FALSE; + if (type == NSLeftMouseUp && [windowsBeingDragged count]) + [self handleWindowDrag:theEvent begin:NO]; + if ([window isKindOfClass:[WineWindow class]] && type == NSLeftMouseDown && ![theEvent wine_commandKeyDown]) @@ -2083,32 +2114,7 @@ static NSString* WineLocalizedString(unsigned int stringID) // "a window is being dragged" and "a window is no longer being // dragged", respectively. if (subtype == 20 || subtype == 21) - { - WineWindow* window = (WineWindow*)[anEvent window]; - if ([window isKindOfClass:[WineWindow class]]) - { - macdrv_event* event; - int eventType; - - if (subtype == 20) - { - [windowsBeingDragged addObject:window]; - eventType = WINDOW_DRAG_BEGIN; - } - else - { - [windowsBeingDragged removeObject:window]; - eventType = WINDOW_DRAG_END; - } - [self updateCursorClippingState]; - - event = macdrv_create_event(eventType, window); - if (eventType == WINDOW_DRAG_BEGIN) - event->window_drag_begin.no_activate = [NSEvent wine_commandKeyDown]; - [window.queue postEvent:event]; - macdrv_release_event(event); - } - } + [self handleWindowDrag:anEvent begin:(subtype == 20)]; } return ret;

1 0

Alexandre Julliard : ntdll: Reimplement Unicode to multibyte conversion functions using the Win32-format tables.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: dd572e9a2d04a3d593ec3658760b8e18a5290aba URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd572e9a2d04a3d593ec3658… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 08:43:25 2019 +0100 ntdll: Reimplement Unicode to multibyte conversion functions using the Win32-format tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 67 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/rtlstr.c | 86 ----------------------------------------------------- 2 files changed, 67 insertions(+), 86 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index b1c1c5ef9a..d038375569 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -121,6 +121,21 @@ static DWORD mbtowc_size( const CPTABLEINFO *info, LPCSTR str, UINT len ) } +static DWORD wctomb_size( const CPTABLEINFO *info, LPCWSTR str, UINT len ) +{ + if (info->DBCSCodePage) + { + WCHAR *uni2cp = info->WideCharTable; + DWORD res; + + for (res = 0; len; len--, str++, res++) + if (uni2cp[*str] & 0xff00) res++; + return res; + } + else return len; +} + + static WCHAR casemap( USHORT *table, WCHAR ch ) { return ch + table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0x0f)]; @@ -934,6 +949,58 @@ DWORD WINAPI RtlOemStringToUnicodeSize( const STRING *str ) } +/************************************************************************** + * RtlUnicodeStringToOemSize (NTDLL.@) + * RtlxUnicodeStringToOemSize (NTDLL.@) + */ +DWORD WINAPI RtlUnicodeStringToOemSize( const UNICODE_STRING *str ) +{ + return wctomb_size( &nls_info.OemTableInfo, str->Buffer, str->Length / sizeof(WCHAR) ) + 1; +} + + +/************************************************************************** + * RtlUnicodeToMultiByteN (NTDLL.@) + */ +NTSTATUS WINAPI RtlUnicodeToMultiByteN( char *dst, DWORD dstlen, DWORD *reslen, + const WCHAR *src, DWORD srclen ) +{ + if (nls_info.AnsiTableInfo.WideCharTable) + return RtlUnicodeToCustomCPN( &nls_info.AnsiTableInfo, dst, dstlen, reslen, src, srclen ); + + /* locale not setup yet */ + dstlen = min( srclen / sizeof(WCHAR), dstlen ); + if (reslen) *reslen = dstlen; + while (dstlen--) + { + WCHAR ch = *src++; + if (ch > 0x7f) ch = '?'; + *dst++ = ch; + } + return STATUS_SUCCESS; +} + + +/************************************************************************** + * RtlUnicodeToMultiByteSize (NTDLL.@) + */ +NTSTATUS WINAPI RtlUnicodeToMultiByteSize( DWORD *size, const WCHAR *str, DWORD len ) +{ + *size = wctomb_size( &nls_info.AnsiTableInfo, str, len / sizeof(WCHAR) ); + return STATUS_SUCCESS; +} + + +/************************************************************************** + * RtlUnicodeToOemN (NTDLL.@) + */ +NTSTATUS WINAPI RtlUnicodeToOemN( char *dst, DWORD dstlen, DWORD *reslen, + const WCHAR *src, DWORD srclen ) +{ + return RtlUnicodeToCustomCPN( &nls_info.OemTableInfo, dst, dstlen, reslen, src, srclen ); +} + + /************************************************************************** * RtlUpcaseUnicodeToCustomCPN (NTDLL.@) */ diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index f30d33111c..14fc1350dc 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -40,11 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); #define GUID_STRING_LENGTH 38 -extern const union cptable cptable_20127; /* 7-bit ASCII */ - -static const union cptable *ansi_table = &cptable_20127; -static const union cptable *oem_table = &cptable_20127; - /************************************************************************** * __wine_init_codepages (NTDLL.@) @@ -53,8 +48,6 @@ static const union cptable *oem_table = &cptable_20127; */ void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable *oem ) { - ansi_table = ansi; - oem_table = oem; } /************************************************************************** @@ -773,44 +766,6 @@ NTSTATUS WINAPI RtlUnicodeStringToOemString( STRING *oem, } -/************************************************************************** - * RtlUnicodeToMultiByteN (NTDLL.@) - * - * Converts a Unicode string to a multi-byte string in the ANSI code page. - * - * RETURNS - * NTSTATUS code - */ -NTSTATUS WINAPI RtlUnicodeToMultiByteN( LPSTR dst, DWORD dstlen, LPDWORD reslen, - LPCWSTR src, DWORD srclen ) -{ - int ret = wine_cp_wcstombs( ansi_table, 0, src, srclen / sizeof(WCHAR), - dst, dstlen, NULL, NULL ); - if (reslen) - *reslen = (ret >= 0) ? ret : dstlen; /* overflow -> we filled up to dstlen */ - return STATUS_SUCCESS; -} - - -/************************************************************************** - * RtlUnicodeToOemN (NTDLL.@) - * - * Converts a Unicode string to a multi-byte string in the OEM code page. - * - * RETURNS - * NTSTATUS code - */ -NTSTATUS WINAPI RtlUnicodeToOemN( LPSTR dst, DWORD dstlen, LPDWORD reslen, - LPCWSTR src, DWORD srclen ) -{ - int ret = wine_cp_wcstombs( oem_table, 0, src, srclen / sizeof(WCHAR), - dst, dstlen, NULL, NULL ); - if (reslen) - *reslen = (ret >= 0) ? ret : dstlen; /* overflow -> we filled up to dstlen */ - return STATUS_SUCCESS; -} - - /************************************************************************** * RtlUnicodeToUTF8N (NTDLL.@) * @@ -1205,27 +1160,6 @@ DWORD WINAPI RtlAnsiStringToUnicodeSize( const STRING *str ) } -/************************************************************************** - * RtlUnicodeToMultiByteSize (NTDLL.@) - * - * Calculate the size in bytes necessary for the multibyte conversion of str, - * without the terminating '\0'. - * - * PARAMS - * size [O] Destination for size - * str [I] String to calculate the size of - * len [I] Length of str - * - * RETURNS - * STATUS_SUCCESS. - */ -NTSTATUS WINAPI RtlUnicodeToMultiByteSize( PULONG size, LPCWSTR str, ULONG len ) -{ - *size = wine_cp_wcstombs( ansi_table, 0, str, len / sizeof(WCHAR), NULL, 0, NULL, NULL ); - return STATUS_SUCCESS; -} - - /************************************************************************** * RtlUnicodeStringToAnsiSize (NTDLL.@) * RtlxUnicodeStringToAnsiSize (NTDLL.@) @@ -1247,26 +1181,6 @@ DWORD WINAPI RtlUnicodeStringToAnsiSize( const UNICODE_STRING *str ) } -/************************************************************************** - * RtlUnicodeStringToOemSize (NTDLL.@) - * RtlxUnicodeStringToOemSize (NTDLL.@) - * - * Calculate the size in bytes necessary for the OEM conversion of str, - * including the terminating '\0'. - * - * PARAMS - * str [I] String to calculate the size of - * - * RETURNS - * The calculated size. - */ -DWORD WINAPI RtlUnicodeStringToOemSize( const UNICODE_STRING *str ) -{ - return wine_cp_wcstombs( oem_table, 0, str->Buffer, str->Length / sizeof(WCHAR), - NULL, 0, NULL, NULL ) + 1; -} - - /************************************************************************** * RtlAppendAsciizToString (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Reimplement Unicode case mapping functions using the Win32-format tables.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 3ebe447507838d6a76b5d100ff41203f3b368a68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ebe447507838d6a76b5d100… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 08:45:21 2019 +0100 ntdll: Reimplement Unicode case mapping functions using the Win32-format tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 156 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/rtlstr.c | 211 ---------------------------------------------------- 2 files changed, 156 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ebe447507838d6a76b5…

1 0

Alexandre Julliard : ntdll: Get rid of __wine_init_codepages().
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: bba33e539164d63347a1e772e3acef807ba63889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bba33e539164d63347a1e772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 3 08:48:26 2019 +0100 ntdll: Get rid of __wine_init_codepages(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 -- dlls/ntdll/ntdll.spec | 1 - dlls/ntdll/rtlstr.c | 9 --------- 3 files changed, 12 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index b062d7ef73..4d4b99660a 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2314,7 +2314,6 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, */ void LOCALE_Init(void) { - extern void CDECL __wine_init_codepages( const union cptable *ansi_cp, const union cptable *oem_cp ); extern UINT CDECL __wine_get_unix_codepage(void); UINT ansi_cp = 1252, oem_cp = 437, mac_cp = 10000, unix_cp; @@ -2332,7 +2331,6 @@ void LOCALE_Init(void) if (!(mac_cptable = wine_cp_get_table( mac_cp ))) mac_cptable = wine_cp_get_table( 10000 ); - __wine_init_codepages( ansi_cptable, oem_cptable ); unix_cp = __wine_get_unix_codepage(); if (unix_cp != CP_UTF8) unix_cptable = wine_cp_get_table( unix_cp ); diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8dd2350c83..566f51c8d1 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1567,7 +1567,6 @@ @ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version # Codepages -@ cdecl __wine_init_codepages(ptr ptr) @ cdecl __wine_get_unix_codepage() # signal handling diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c index cd84856bc8..8196dd7178 100644 --- a/dlls/ntdll/rtlstr.c +++ b/dlls/ntdll/rtlstr.c @@ -41,15 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); #define GUID_STRING_LENGTH 38 -/************************************************************************** - * __wine_init_codepages (NTDLL.@) - * - * Set the code page once kernel32 is loaded. Should be done differently. - */ -void CDECL __wine_init_codepages( const union cptable *ansi, const union cptable *oem ) -{ -} - /************************************************************************** * RtlInitAnsiString (NTDLL.@) *

1 0

Michael Stefaniuc : dmime: Remove the 'enabled' field from the Tempo track.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 741ec8ca75528ac4fb5ee3d519f8e658b801a6b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=741ec8ca75528ac4fb5ee3d5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Dec 3 01:47:46 2019 +0100 dmime: Remove the 'enabled' field from the Tempo track. The track GetParam/SetParam methods are enabled in the segment and that information is stored in the segment state not in the track. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tempotrack.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index 7aff40dbfd..6038f7ce9f 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -33,7 +33,6 @@ typedef struct IDirectMusicTempoTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; - BOOL enabled; struct list Items; } IDirectMusicTempoTrack; @@ -174,9 +173,6 @@ static HRESULT WINAPI tempo_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rg if (FAILED(hr)) { return hr; } - if (FALSE == This->enabled) { - return DMUS_E_TYPE_DISABLED; - } if (NULL != pmtNext) *pmtNext = 0; prm->mtTime = 0; @@ -224,9 +220,6 @@ static HRESULT WINAPI tempo_track_IsParamSupported(IDirectMusicTrack8 *iface, RE TRACE("param supported\n"); return S_OK; } - if (FALSE == This->enabled) { - return DMUS_E_TYPE_DISABLED; - } TRACE("param unsupported\n"); return DMUS_E_TYPE_UNSUPPORTED; } @@ -405,7 +398,6 @@ HRESULT WINAPI create_dmtempotrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicTempoTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - track->enabled = TRUE; list_init(&track->Items); DMIME_LockModule();

1 0

Mathew Hodson : riched20/tests: Fix function names in two ok() messages.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 3808b61967b93f703d5493a479144a8957ac366d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3808b61967b93f703d5493a4… Author: Mathew Hodson <mathew.hodson(a)gmail.com> Date: Sun Dec 1 18:15:18 2019 -0500 riched20/tests: Fix function names in two ok() messages. Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index dd290e3fb2..487b9a02f0 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -992,10 +992,10 @@ static void test_TxGetScroll(void) return; ret = ITextServices_TxGetHScroll(txtserv, NULL, NULL, NULL, NULL, NULL); - ok(ret == S_OK, "ITextSerHices_GetVScroll failed: 0x%08x.\n", ret); + ok(ret == S_OK, "ITextServices_TxGetHScroll failed: 0x%08x.\n", ret); ret = ITextServices_TxGetVScroll(txtserv, NULL, NULL, NULL, NULL, NULL); - ok(ret == S_OK, "ITextServices_GetVScroll failed: 0x%08x.\n", ret); + ok(ret == S_OK, "ITextServices_TxGetVScroll failed: 0x%08x.\n", ret); ITextServices_Release(txtserv); ITextHost_Release(host);

1 0

Matteo Bruni : d3dcompiler/tests: Fix parameter desc test on d3d10.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 276d970e07d9be5e74af12ea8bed08301767a932 URL: https://source.winehq.org/git/wine.git/?a=commit;h=276d970e07d9be5e74af12ea… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 3 09:55:53 2019 +0100 d3dcompiler/tests: Fix parameter desc test on d3d10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 38 +++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index f8c97230d6..44e66044ec 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -433,8 +433,14 @@ static void test_reflection_desc_vs(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + /* The Stream field of D3D11_SIGNATURE_PARAMETER_DESC is in the + * trailing padding of the D3D10_SIGNATURE_PARAMETER_DESC struct on + * 64-bits and thus undefined. Don't test it. */ + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_vs_resultout); ++i) @@ -458,8 +464,11 @@ static void test_reflection_desc_vs(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } count = ref11->lpVtbl->Release(ref11); @@ -740,8 +749,11 @@ static void test_reflection_desc_ps(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetInputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetInputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_resultout); ++i) @@ -771,8 +783,11 @@ static void test_reflection_desc_ps(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "GetOutputParameterDesc(%u) ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "GetOutputParameterDesc(%u) Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); } count = ref11->lpVtbl->Release(ref11); @@ -1008,8 +1023,11 @@ static void test_reflection_desc_ps_output(void) i, desc.Mask, pdesc->Mask); ok(desc.ReadWriteMask == pdesc->ReadWriteMask, "(%u): GetOutputParameterDesc ReadWriteMask failed, got %x, expected %x\n", i, desc.ReadWriteMask, pdesc->ReadWriteMask); - ok(desc.Stream == pdesc->Stream, "(%u): GetOutputParameterDesc Stream failed, got %u, expected %u\n", - i, desc.Stream, pdesc->Stream); + if (D3D_COMPILER_VERSION) + ok(desc.Stream == pdesc->Stream, "(%u): got unexpected Stream %u, expected %u.\n", + i, desc.Stream, pdesc->Stream); + else if (sizeof(void *) == 4) + ok(!desc.Stream, "(%u): got unexpected Stream %u.\n", i, desc.Stream); count = ref11->lpVtbl->Release(ref11); ok(count == 0, "(%u): Release failed %u\n", i, count);

1 0

Zebediah Figura : wined3d: Store the blend factor in the stateblock as a render state.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: b21ec9ffc2b2c6952a55e0183f908ae990dab187 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21ec9ffc2b2c6952a55e018… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Dec 2 10:13:19 2019 -0600 wined3d: Store the blend factor in the stateblock as a render state. 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/d3d9/device.c | 33 +++++++++------------------------ dlls/wined3d/stateblock.c | 42 ++++++++++-------------------------------- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 3 +-- include/wine/wined3d.h | 4 +--- 5 files changed, 21 insertions(+), 62 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 51b7f4d6f5..174cdc5bf4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2304,22 +2304,18 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_SetRenderState(IDirect3DDevi TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); - if (state == D3DRS_BLENDFACTOR) - { - wined3d_color_from_d3dcolor(&factor, value); - wined3d_mutex_lock(); - wined3d_stateblock_set_blend_factor(device->update_state, &factor); - if (!device->recording) - wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); - wined3d_mutex_unlock(); - - return D3D_OK; - } - wined3d_mutex_lock(); wined3d_stateblock_set_render_state(device->update_state, state, value); if (!device->recording) - wined3d_device_set_render_state(device->wined3d_device, state, value); + { + if (state == D3DRS_BLENDFACTOR) + { + wined3d_color_from_d3dcolor(&factor, value); + wined3d_device_set_blend_state(device->wined3d_device, NULL, &factor); + } + else + wined3d_device_set_render_state(device->wined3d_device, state, value); + } wined3d_mutex_unlock(); return D3D_OK; @@ -2330,20 +2326,9 @@ static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); const struct wined3d_stateblock_state *device_state; - struct wined3d_color factor; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); - if (state == D3DRS_BLENDFACTOR) - { - wined3d_mutex_lock(); - wined3d_device_get_blend_state(device->wined3d_device, &factor); - wined3d_mutex_unlock(); - *value = D3DCOLOR_COLORVALUE(factor.r, factor.g, factor.b, factor.a); - - return D3D_OK; - } - wined3d_mutex_lock(); device_state = wined3d_stateblock_get_state(device->state); *value = device_state->rs[state]; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 1a0ba0a3d5..24134b8f3e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -35,6 +35,7 @@ static const DWORD pixel_states_render[] = WINED3D_RS_ALPHAREF, WINED3D_RS_ALPHATESTENABLE, WINED3D_RS_ANTIALIASEDLINEENABLE, + WINED3D_RS_BLENDFACTOR, WINED3D_RS_BLENDOP, WINED3D_RS_BLENDOPALPHA, WINED3D_RS_BACK_STENCILFAIL, @@ -208,7 +209,6 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->pixelShader = 1; states->vertexShader = 1; states->scissorRect = 1; - states->blend_state = 1; /* Fixed size arrays */ states->streamSource = 0xffff; @@ -236,7 +236,6 @@ static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states unsigned int i; states->pixelShader = 1; - states->blend_state = 1; for (i = 0; i < ARRAY_SIZE(pixel_states_render); ++i) { @@ -903,15 +902,6 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock, stateblock->stateblock_state.scissor_rect = state->scissor_rect; } - if (stateblock->changed.blend_state - && memcmp(&state->blend_factor, &stateblock->stateblock_state.blend_factor, - sizeof(stateblock->stateblock_state.blend_factor))) - { - TRACE("Updating blend factor.\n"); - - stateblock->stateblock_state.blend_factor = state->blend_factor; - } - map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { @@ -1129,7 +1119,14 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, enum wined3d_render_state rs = stateblock->contained_render_states[i]; state->rs[rs] = stateblock->stateblock_state.rs[rs]; - wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); + if (rs == WINED3D_RS_BLENDFACTOR) + { + struct wined3d_color color; + wined3d_color_from_d3dcolor(&color, stateblock->stateblock_state.rs[rs]); + wined3d_device_set_blend_state(device, NULL, &color); + } + else + wined3d_device_set_render_state(device, rs, stateblock->stateblock_state.rs[rs]); } /* Texture states. */ @@ -1209,12 +1206,6 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock, wined3d_device_set_scissor_rects(device, 1, &stateblock->stateblock_state.scissor_rect); } - if (stateblock->changed.blend_state) - { - state->blend_factor = stateblock->stateblock_state.blend_factor; - wined3d_device_set_blend_state(device, NULL, &stateblock->stateblock_state.blend_factor); - } - map = stateblock->changed.streamSource; for (i = 0; map; map >>= 1, ++i) { @@ -1437,15 +1428,6 @@ void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateb stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); } -void CDECL wined3d_stateblock_set_blend_factor(struct wined3d_stateblock *stateblock, - const struct wined3d_color *blend_factor) -{ - TRACE("stateblock %p, blend_factor %p.\n", stateblock, blend_factor); - - stateblock->stateblock_state.blend_factor = *blend_factor; - stateblock->changed.blend_state = TRUE; -} - void CDECL wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *stateblock, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) { @@ -1827,6 +1809,7 @@ static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], c rs[WINED3D_RS_COLORWRITEENABLE1] = 0x0000000f; rs[WINED3D_RS_COLORWRITEENABLE2] = 0x0000000f; rs[WINED3D_RS_COLORWRITEENABLE3] = 0x0000000f; + rs[WINED3D_RS_BLENDFACTOR] = 0xffffffff; rs[WINED3D_RS_SRGBWRITEENABLE] = 0; rs[WINED3D_RS_DEPTHBIAS] = 0; rs[WINED3D_RS_WRAP8] = 0; @@ -1971,11 +1954,6 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state init_default_sampler_states(state->sampler_states); - state->blend_factor.r = 1.0f; - state->blend_factor.g = 1.0f; - state->blend_factor.b = 1.0f; - state->blend_factor.a = 1.0f; - for (i = 0; i < WINED3D_MAX_STREAMS; ++i) state->streams[i].frequency = 1; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index bec84b5979..716b902f31 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -264,7 +264,6 @@ @ 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) @ cdecl wined3d_stateblock_set_clip_plane(ptr long ptr) @ cdecl wined3d_stateblock_set_index_buffer(ptr ptr long) @ cdecl wined3d_stateblock_set_light(ptr long ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1ee22808c1..c48bddd00c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3875,9 +3875,8 @@ struct wined3d_saved_states DWORD pixelShader : 1; DWORD vertexShader : 1; DWORD scissorRect : 1; - DWORD blend_state : 1; DWORD store_stream_offset : 1; - DWORD padding : 3; + DWORD padding : 4; }; struct StageState { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8b64bf66c2..fd8c56bf78 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -384,6 +384,7 @@ enum wined3d_render_state WINED3D_RS_COLORWRITEENABLE1 = 190, WINED3D_RS_COLORWRITEENABLE2 = 191, WINED3D_RS_COLORWRITEENABLE3 = 192, + WINED3D_RS_BLENDFACTOR = 193, WINED3D_RS_SRGBWRITEENABLE = 194, WINED3D_RS_DEPTHBIAS = 195, WINED3D_RS_WRAP8 = 198, @@ -2151,7 +2152,6 @@ struct wined3d_stateblock_state BOOL ps_consts_b[WINED3D_MAX_CONSTS_B]; DWORD rs[WINEHIGHEST_RENDER_STATE + 1]; - struct wined3d_color blend_factor; struct wined3d_texture *textures[WINED3D_MAX_COMBINED_SAMPLERS]; DWORD sampler_states[WINED3D_MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; @@ -2726,8 +2726,6 @@ 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, - const struct wined3d_color *blend_factor); HRESULT __cdecl wined3d_stateblock_set_clip_plane(struct wined3d_stateblock *stateblock, UINT plane_idx, const struct wined3d_vec4 *plane); void __cdecl wined3d_stateblock_set_index_buffer(struct wined3d_stateblock *stateblock,

1 0

Nikolay Sivov : ntdll: Use better type for thread description info structure.
by Alexandre Julliard 03 Dec '19

03 Dec '19

Module: wine Branch: master Commit: 7082ebc6081e7b94b7489a11fff9f6d28338828d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7082ebc6081e7b94b7489a11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 3 12:05:21 2019 +0300 ntdll: Use better type for thread description info structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 28 ++++++++++++++-------------- dlls/kernelbase/thread.c | 14 ++++++-------- dlls/ntdll/thread.c | 12 +++++------- include/winternl.h | 3 +-- 4 files changed, 26 insertions(+), 31 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 8ff34ba5f3..9a8ad9151c 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -2145,14 +2145,15 @@ static void test_thread_description(void) ok(len == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); len2 = 0; - thread_desc->Length = 1; - thread_desc->Description = (WCHAR *)thread_desc; + thread_desc->Description.Length = 1; + thread_desc->Description.MaximumLength = 0; + thread_desc->Description.Buffer = (WCHAR *)thread_desc; status = pNtQueryInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, len, &len2); ok(!status, "Failed to get thread info, status %#x.\n", status); ok(len2 == sizeof(*thread_desc), "Unexpected structure length %u.\n", len); - ok(!thread_desc->Length, "Unexpected description length %#x.\n", thread_desc->Length); - ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", - thread_desc->Description, thread_desc); + ok(!thread_desc->Description.Length, "Unexpected description length %#x.\n", thread_desc->Description.Length); + ok(thread_desc->Description.Buffer == (WCHAR *)(thread_desc + 1), + "Unexpected description string pointer %p, %p.\n", thread_desc->Description.Buffer, thread_desc); hr = pSetThreadDescription(GetCurrentThread(), NULL); ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); @@ -2176,11 +2177,11 @@ static void test_thread_description(void) ok(!status, "Failed to get thread info.\n"); ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); - ok(thread_desc->Length == (desc_len << 16 | desc_len), "Unexpected description length %#x.\n", - thread_desc->Length); - ok(thread_desc->Description == (WCHAR *)(thread_desc + 1), "Unexpected description string pointer %p, %p.\n", - thread_desc->Description, thread_desc); - ok(!memcmp(thread_desc->Description, desc, desc_len), "Unexpected description string.\n"); + ok(thread_desc->Description.Length == desc_len && thread_desc->Description.MaximumLength == desc_len, + "Unexpected description length %u.\n", thread_desc->Description.Length); + ok(thread_desc->Description.Buffer == (WCHAR *)(thread_desc + 1), + "Unexpected description string pointer %p, %p.\n", thread_desc->Description.Buffer, thread_desc); + ok(!memcmp(thread_desc->Description.Buffer, desc, desc_len), "Unexpected description string.\n"); /* Partial results. */ len = 0; @@ -2193,7 +2194,7 @@ static void test_thread_description(void) ok(len == sizeof(*thread_desc) + desc_len, "Unexpected structure length %u.\n", len); /* Change description. */ - thread_desc->Length = 8 << 16 | 8; + thread_desc->Description.Length = thread_desc->Description.MaximumLength = 8; lstrcpyW((WCHAR *)(thread_desc + 1), L"desc"); status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); @@ -2211,7 +2212,7 @@ static void test_thread_description(void) status = NtSetInformationThread(GetCurrentThread(), ThreadDescription, NULL, sizeof(*thread_desc)); ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); - thread_desc->Description = NULL; + thread_desc->Description.Buffer = NULL; status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); ok(status == STATUS_ACCESS_VIOLATION, "Unexpected status %#x.\n", status); @@ -2228,8 +2229,7 @@ static void test_thread_description(void) hr = pSetThreadDescription(GetCurrentThread(), L"123"); ok(hr == HRESULT_FROM_NT(STATUS_SUCCESS), "Failed to set thread description, hr %#x.\n", hr); - thread_desc->Length = 0; - thread_desc->Description = NULL; + memset(thread_desc, 0, sizeof(*thread_desc)); status = pNtSetInformationThread(GetCurrentThread(), ThreadDescription, thread_desc, sizeof(*thread_desc)); ok(!status, "Failed to set thread description, status %#x.\n", status); diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index 521d3be079..2f0bcb7dde 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -404,8 +404,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH SetThreadDescription( HANDLE thread, PCWSTR des if (length > USHRT_MAX) return HRESULT_FROM_NT(STATUS_INVALID_PARAMETER); - info.Length = length << 16 | length; - info.Description = (WCHAR *)description; + info.Description.Length = info.Description.MaximumLength = length; + info.Description.Buffer = (WCHAR *)description; return HRESULT_FROM_NT(NtSetInformationThread( thread, ThreadDescription, &info, sizeof(info) )); } @@ -434,15 +434,13 @@ HRESULT WINAPI DECLSPEC_HOTPATCH GetThreadDescription( HANDLE thread, WCHAR **de status = NtQueryInformationThread( thread, ThreadDescription, info, length, &length ); if (!status) { - length = info->Length & 0xffff; - - if (!(*description = LocalAlloc( 0, length + sizeof(WCHAR)))) + if (!(*description = LocalAlloc( 0, info->Description.Length + sizeof(WCHAR)))) status = STATUS_NO_MEMORY; else { - if (length) - memcpy(*description, info->Description, length); - (*description)[length / sizeof(WCHAR)] = 0; + if (info->Description.Length) + memcpy(*description, info->Description.Buffer, info->Description.Length); + (*description)[info->Description.Length / sizeof(WCHAR)] = 0; } } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6079a6c195..fd8d388403 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1137,8 +1137,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, status = STATUS_BUFFER_TOO_SMALL; else if (status == STATUS_SUCCESS) { - info->Length = desc_len << 16 | desc_len; - info->Description = ptr; + info->Description.Length = info->Description.MaximumLength = desc_len; + info->Description.Buffer = ptr; } if (ret_len && (status == STATUS_SUCCESS || status == STATUS_BUFFER_TOO_SMALL)) @@ -1303,20 +1303,18 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, 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; + if (info->Description.Length != info->Description.MaximumLength) return STATUS_INVALID_PARAMETER; + if (info->Description.Length && !info->Description.Buffer) 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 ); + wine_server_add_data( req, info->Description.Buffer, info->Description.Length ); status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/winternl.h b/include/winternl.h index ccd4a7e10b..847e55e216 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1030,8 +1030,7 @@ typedef struct _THREAD_DESCRIPTOR_INFORMATION typedef struct _THREAD_DESCRIPTION_INFORMATION { - DWORD Length; - WCHAR *Description; + UNICODE_STRING Description; } THREAD_DESCRIPTION_INFORMATION, *PTHREAD_DESCRIPTION_INFORMATION; typedef struct _KERNEL_USER_TIMES {

1 0