September 2020 - Wine-commits

Zebediah Figura : kernelbase: Pass the token to NtCreateUserProcess().
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 2379e3c18119ce258daad51c2d8212da7512013d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2379e3c18119ce258daad51c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 23 23:44:54 2020 -0500 kernelbase: Pass the token to NtCreateUserProcess(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 648174b2a7..e7998c00f2 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -263,14 +263,14 @@ struct _PROC_THREAD_ATTRIBUTE_LIST /*********************************************************************** * create_nt_process */ -static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, +static NTSTATUS create_nt_process( HANDLE token, SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params, RTL_USER_PROCESS_INFORMATION *info, HANDLE parent, const struct proc_thread_attr *handle_list ) { OBJECT_ATTRIBUTES process_attr, thread_attr; PS_CREATE_INFO create_info; - ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[5] ) / sizeof(ULONG_PTR)]; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[6] ) / sizeof(ULONG_PTR)]; PS_ATTRIBUTE_LIST *attr = (PS_ATTRIBUTE_LIST *)buffer; UNICODE_STRING nameW; NTSTATUS status; @@ -315,6 +315,14 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES attr->Attributes[pos].ReturnLength = NULL; pos++; } + if (token) + { + attr->Attributes[pos].Attribute = PS_ATTRIBUTE_TOKEN; + attr->Attributes[pos].Size = sizeof(token); + attr->Attributes[pos].ValuePtr = token; + attr->Attributes[pos].ReturnLength = NULL; + pos++; + } attr->TotalLength = offsetof( PS_ATTRIBUTE_LIST, Attributes[pos] ); InitializeObjectAttributes( &process_attr, NULL, 0, NULL, psa ? psa->lpSecurityDescriptor : NULL ); @@ -335,7 +343,7 @@ static NTSTATUS create_nt_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES /*********************************************************************** * create_vdm_process */ -static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, +static NTSTATUS create_vdm_process( HANDLE token, SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params, RTL_USER_PROCESS_INFORMATION *info ) { @@ -356,7 +364,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, winevdm ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL, NULL ); + status = create_nt_process( token, psa, tsa, inherit, flags, params, info, NULL, NULL ); HeapFree( GetProcessHeap(), 0, newcmdline ); return status; } @@ -365,7 +373,7 @@ static NTSTATUS create_vdm_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE /*********************************************************************** * create_cmd_process */ -static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, +static NTSTATUS create_cmd_process( HANDLE token, SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, BOOL inherit, DWORD flags, RTL_USER_PROCESS_PARAMETERS *params, RTL_USER_PROCESS_INFORMATION *info ) { @@ -384,7 +392,7 @@ static NTSTATUS create_cmd_process( SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTE swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, comspec ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( psa, tsa, inherit, flags, params, info, NULL, NULL ); + status = create_nt_process( token, psa, tsa, inherit, flags, params, info, NULL, NULL ); RtlFreeHeap( GetProcessHeap(), 0, newcmdline ); return status; } @@ -500,7 +508,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR TRACE( "app %s cmdline %s\n", debugstr_w(app_name), debugstr_w(cmd_line) ); - if (token) FIXME( "Creating a process with a token is not yet implemented\n" ); if (new_token) FIXME( "No support for returning created process token\n" ); if (app_name) @@ -585,7 +592,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR } } - status = create_nt_process( process_attr, thread_attr, inherit, flags, params, &rtl_info, parent, handle_list ); + status = create_nt_process( token, process_attr, thread_attr, inherit, + flags, params, &rtl_info, parent, handle_list ); switch (status) { case STATUS_SUCCESS: @@ -594,7 +602,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR case STATUS_INVALID_IMAGE_NE_FORMAT: case STATUS_INVALID_IMAGE_PROTECT: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(app_name) ); - status = create_vdm_process( process_attr, thread_attr, inherit, flags, params, &rtl_info ); + status = create_vdm_process( token, process_attr, thread_attr, inherit, flags, params, &rtl_info ); break; case STATUS_INVALID_IMAGE_NOT_MZ: /* check for .com or .bat extension */ @@ -602,12 +610,12 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR if (!wcsicmp( p, L".com" ) || !wcsicmp( p, L".pif" )) { TRACE( "starting %s as DOS binary\n", debugstr_w(app_name) ); - status = create_vdm_process( process_attr, thread_attr, inherit, flags, params, &rtl_info ); + status = create_vdm_process( token, process_attr, thread_attr, inherit, flags, params, &rtl_info ); } else if (!wcsicmp( p, L".bat" ) || !wcsicmp( p, L".cmd" )) { TRACE( "starting %s as batch binary\n", debugstr_w(app_name) ); - status = create_cmd_process( process_attr, thread_attr, inherit, flags, params, &rtl_info ); + status = create_cmd_process( token, process_attr, thread_attr, inherit, flags, params, &rtl_info ); } break; }

1 0

Michael Müller : server: Implement support for creating a process with a specified token.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: d0bea3d70207587f183bcad0e40cfeba8668c6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0bea3d70207587f183bcad0… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Sep 23 23:44:55 2020 -0500 server: Implement support for creating a process with a specified token. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 24 +++++++++++------------- dlls/ntdll/unix/process.c | 2 +- include/wine/server_protocol.h | 4 +++- server/process.c | 17 +++++++++++++---- server/process.h | 2 +- server/protocol.def | 1 + server/request.c | 2 +- server/request.h | 21 +++++++++++---------- server/security.h | 1 + server/token.c | 5 +++++ server/trace.c | 3 ++- 11 files changed, 50 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d0bea3d70207587f183b…

1 0

Zebediah Figura : server: Check duplicated handle access against the calling thread token and target process token.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: fa1b0fcf6cde6e1f7f5c9782457eb8d7f7b9eff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1b0fcf6cde6e1f7f5c9782… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 23 23:44:56 2020 -0500 server: Check duplicated handle access against the calling thread token and target process token. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 6 +++--- server/handle.c | 13 ++++++++++--- server/security.h | 2 +- server/token.c | 6 ++++-- server/winstation.c | 4 ++-- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index c9318bef92..eaaa29866b 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7704,8 +7704,8 @@ static void test_duplicate_handle_access(void) SetLastError(0xdeadbeef); ret = DuplicateHandle(GetCurrentProcess(), sync_event, pi.hProcess, &event2, EVENT_MODIFY_STATE, FALSE, 0); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); ret = WaitForSingleObject(pi.hProcess, 1000); ok(!ret, "wait failed\n"); @@ -7736,7 +7736,7 @@ static void test_duplicate_handle_access_child(void) ok(GetLastError() == ERROR_ACCESS_DENIED, "got error %u\n", GetLastError()); ret = DuplicateHandle(process, event, process, &event2, EVENT_MODIFY_STATE, FALSE, 0); - todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(ret, "got error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = DuplicateHandle(process, event, GetCurrentProcess(), &event2, EVENT_MODIFY_STATE, FALSE, 0); diff --git a/server/handle.c b/server/handle.c index 90f9ea63d6..d4df33f473 100644 --- a/server/handle.c +++ b/server/handle.c @@ -286,7 +286,7 @@ obj_handle_t alloc_handle( struct process *process, void *ptr, unsigned int acce { struct object *obj = ptr; access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; - if (access && !check_object_access( obj, &access )) return 0; + if (access && !check_object_access( NULL, obj, &access )) return 0; return alloc_handle_entry( process, ptr, access, attr ); } @@ -308,7 +308,7 @@ static obj_handle_t alloc_global_handle_no_access_check( void *obj, unsigned int /* return the handle, or 0 on error */ static obj_handle_t alloc_global_handle( void *obj, unsigned int access ) { - if (access && !check_object_access( obj, &access )) return 0; + if (access && !check_object_access( NULL, obj, &access )) return 0; return alloc_global_handle_no_access_check( obj, access ); } @@ -558,10 +558,17 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str /* asking for the more access rights than src_access? */ if (access & ~src_access) { + if ((current->token && !check_object_access( current->token, obj, &access )) || + !check_object_access( dst->token, obj, &access )) + { + release_object( obj ); + return 0; + } + if (options & DUP_HANDLE_MAKE_GLOBAL) res = alloc_global_handle( obj, access ); else - res = alloc_handle( dst, obj, access, attr ); + res = alloc_handle_no_access_check( dst, obj, access, attr ); } else { diff --git a/server/security.h b/server/security.h index bece7f5404..08bdb8de80 100644 --- a/server/security.h +++ b/server/security.h @@ -86,7 +86,7 @@ static inline int security_equal_sid( const SID *sid1, const SID *sid2 ) extern void security_set_thread_token( struct thread *thread, obj_handle_t handle ); extern const SID *security_unix_uid_to_sid( uid_t uid ); -extern int check_object_access( struct object *obj, unsigned int *access ); +extern int check_object_access( struct token *token, struct object *obj, unsigned int *access ); static inline int thread_single_check_privilege( struct thread *thread, const LUID *priv) { diff --git a/server/token.c b/server/token.c index 8a106b7d34..26d9708f2c 100644 --- a/server/token.c +++ b/server/token.c @@ -1208,13 +1208,15 @@ const SID *token_get_primary_group( struct token *token ) return token->primary_group; } -int check_object_access(struct object *obj, unsigned int *access) +int check_object_access(struct token *token, struct object *obj, unsigned int *access) { GENERIC_MAPPING mapping; - struct token *token = current->token ? current->token : current->process->token; unsigned int status; int res; + if (!token) + token = current->token ? current->token : current->process->token; + mapping.GenericAll = obj->ops->map_access( obj, GENERIC_ALL ); if (!obj->sd) diff --git a/server/winstation.c b/server/winstation.c index b014290854..c9c85e50ff 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -717,7 +717,7 @@ DECL_HANDLER(enum_winstation) { unsigned int access = WINSTA_ENUMERATE; if (req->index > index++) continue; - if (!check_object_access( &winsta->obj, &access )) continue; + if (!check_object_access( NULL, &winsta->obj, &access )) continue; clear_error(); reply->next = index; if ((name = get_object_name( &winsta->obj, &len ))) @@ -746,7 +746,7 @@ DECL_HANDLER(enum_desktop) unsigned int access = DESKTOP_ENUMERATE; if (req->index > index++) continue; if (!desktop->obj.name) continue; - if (!check_object_access( &desktop->obj, &access )) continue; + if (!check_object_access( NULL, &desktop->obj, &access )) continue; if ((name = get_object_name( &desktop->obj, &len ))) set_reply_data( name, min( len, get_reply_max_size() )); release_object( winstation );

1 0

Vijay Kiran Kamuju : include: Remove duplicated defines in winnt.h.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: e5d780272951426de174671d2e581a39946f2a6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5d780272951426de174671d… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Sep 24 09:29:03 2020 +0200 include: Remove duplicated defines in winnt.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 1eb82876f1..f59a63c041 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4288,15 +4288,9 @@ typedef enum _TOKEN_INFORMATION_CLASS { TOKEN_ADJUST_SESSIONID | \ TOKEN_ADJUST_DEFAULT ) -#define DISABLE_MAX_PRIVILEGE 0x1 -#define SANDBOX_INERT 0x2 -#define LUA_TOKEN 0x4 -#define WRITE_RESTRICTED 0x8 - #ifndef _SECURITY_DEFINED #define _SECURITY_DEFINED - typedef DWORD ACCESS_MASK, *PACCESS_MASK; typedef struct _GENERIC_MAPPING {

1 0

Piotr Caban : setupapi: Remove unused end parameter from next_xml_attr internal function.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 9fb0d9fe39d0d629c982f0f873aee627aa3f65e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb0d9fe39d0d629c982f0f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 22 16:12:15 2020 +0200 setupapi: Remove unused end parameter from next_xml_attr internal function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index e83bbb2512..7b4b14fa2c 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -554,8 +554,7 @@ static BOOL next_xml_elem( xmlbuf_t *xmlbuf, xmlstr_t *elem ) return xmlbuf->ptr != xmlbuf->end; } -static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, - BOOL* error, BOOL* end) +static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, BOOL* error) { const char *ptr; @@ -573,7 +572,6 @@ static BOOL next_xml_attr(xmlbuf_t* xmlbuf, xmlstr_t* name, xmlstr_t* value, return FALSE; xmlbuf->ptr++; - *end = TRUE; *error = FALSE; return FALSE; } @@ -727,7 +725,7 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR xmlbuf_t buffer; xmlstr_t elem, attr_name, attr_value; xmlstr_t name, version, arch, key, lang; - BOOL end = FALSE, error; + BOOL error; const char *manifest; SIZE_T len; HRSRC rsrc; @@ -746,7 +744,7 @@ static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR while (next_xml_elem( &buffer, &elem )) { if (!xmlstr_cmp( &elem, "assemblyIdentity" )) continue; - while (next_xml_attr( &buffer, &attr_name, &attr_value, &error, &end )) + while (next_xml_attr( &buffer, &attr_name, &attr_value, &error )) { if (xmlstr_cmp(&attr_name, "name")) name = attr_value; else if (xmlstr_cmp(&attr_name, "version")) version = attr_value;

1 0

Piotr Caban : setupapi: Copy all files specified in manifest on wine dll install.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: d851b2f84f6b1152e2707c0015609649fba304e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d851b2f84f6b1152e2707c00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 22 16:12:38 2020 +0200 setupapi: Copy all files specified in manifest on wine dll install. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 150 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 111 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d851b2f84f6b1152e270…

1 0

Jactry Zeng : comctl32: Implement WM_GETTEXTLENGTH for datetime picker.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: fd53a4b8e3082c8447d837d7681baf4fec2569ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd53a4b8e3082c8447d837d7… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Fri Sep 18 14:20:13 2020 +0800 comctl32: Implement WM_GETTEXTLENGTH for datetime picker. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 17 +++++++++++++++++ dlls/comctl32/tests/datetime.c | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 7b7ac8a86a..ace00c7550 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1565,6 +1565,20 @@ DATETIME_GetText (const DATETIME_INFO *infoPtr, INT count, LPWSTR dst) return lstrlenW(dst); } +static int DATETIME_GetTextLength(const DATETIME_INFO *info) +{ + int i, length = 0; + WCHAR buffer[80]; + + TRACE("%p.\n", info); + + for (i = 0; i < info->nrFields; i++) + { + DATETIME_ReturnTxt(info, i, buffer, ARRAY_SIZE(buffer)); + length += lstrlenW(buffer); + } + return length; +} static LRESULT WINAPI DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) @@ -1681,6 +1695,9 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_GETTEXT: return (LRESULT) DATETIME_GetText(infoPtr, wParam, (LPWSTR)lParam); + case WM_GETTEXTLENGTH: + return (LRESULT)DATETIME_GetTextLength(infoPtr); + case WM_SETTEXT: return CB_ERR; diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 88abce9ed6..111f0bee89 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -793,7 +793,12 @@ static void test_wm_set_get_text(void) if (ret == 0) skip("GetDateFormat failed, returned %ld, error %d\n", ret, GetLastError()); else + { ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); + + ret = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(ret == strlen(time), "Got wrong length: %ld, expected %d.\n", ret, strlen(time)); + } } DestroyWindow(hWnd);

1 0

Biswapriyo Nath : include/ddraw.h: Add missing dwFlags of DD_BLTDATA struct.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 94db5c87195943957086f03b8a2f7fb3c5b3dff8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94db5c87195943957086f03b… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Wed Sep 23 21:10:11 2020 +0530 include/ddraw.h: Add missing dwFlags of DD_BLTDATA struct. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ddraw.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ddraw.h b/include/ddraw.h index a3fd90dd37..0c14c46812 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -227,6 +227,10 @@ typedef struct IDirectDrawGammaControl *LPDIRECTDRAWGAMMACONTROL; #define DDBLT_WAIT 0x01000000 #define DDBLT_DEPTHFILL 0x02000000 #define DDBLT_DONOTWAIT 0x08000000 +#define DDBLT_PRESENTATION 0x10000000 +#define DDBLT_LAST_PRESENTATION 0x20000000 +#define DDBLT_EXTENDED_FLAGS 0x40000000 +#define DDBLT_EXTENDED_LINEAR_CONTENT 0x00000004 /* dwTrans for BltFast */ #define DDBLTFAST_NOCOLORKEY 0x00000000

1 0

Piotr Caban : gdi32: Share font_gamma_ramp structure between all DCs.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 2370e7b9a14f461cb4cedd29114b8268158e450d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2370e7b9a14f461cb4cedd29… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 23 17:44:57 2020 +0200 gdi32: Share font_gamma_ramp structure between all DCs. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 1 - dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/font.c | 18 ++++++++++++------ dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c24b96e275..230f1949e8 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -168,7 +168,6 @@ static void free_dc_state( DC *dc ) if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); - HeapFree( GetProcessHeap(), 0, dc->font_gamma_ramp ); HeapFree( GetProcessHeap(), 0, dc ); } diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 98e1b0fba9..5369776484 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -88,7 +88,7 @@ struct intensity_range struct font_intensities { struct intensity_range ranges[17]; - struct font_gamma_ramp *gamma_ramp; + const struct font_gamma_ramp *gamma_ramp; }; typedef struct dibdrv_physdev diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e099bec5e8..a71b24423a 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -730,20 +730,17 @@ static void update_font_code_page( DC *dc, HANDLE font ) TRACE("charset %d => cp %d\n", charset, dc->font_code_page); } -static struct font_gamma_ramp *get_font_gamma_ramp( void ) +static BOOL WINAPI fill_font_gamma_ramp( INIT_ONCE *once, void *param, void **context ) { static const WCHAR desktopW[] = { 'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\', 'D','e','s','k','t','o','p',0 }; static const WCHAR smoothing_gamma[] = { 'F','o','n','t','S','m','o','o','t','h','i','n','g', 'G','a','m','m','a',0 }; + struct font_gamma_ramp *ramp = param; const DWORD gamma_default = 1400; - struct font_gamma_ramp *ramp; DWORD i, gamma; HKEY key; - ramp = HeapAlloc( GetProcessHeap(), 0, sizeof(*ramp) ); - if ( ramp == NULL) return NULL; - gamma = gamma_default; if (RegOpenKeyW( HKEY_CURRENT_USER, desktopW, &key ) == ERROR_SUCCESS) { @@ -768,7 +765,16 @@ static struct font_gamma_ramp *get_font_gamma_ramp( void ) ramp->gamma = gamma; TRACE("gamma %d\n", ramp->gamma); - return ramp; + return TRUE; +} + +static struct font_gamma_ramp *get_font_gamma_ramp( void ) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + static struct font_gamma_ramp ramp; + + InitOnceExecuteOnce( &init_once, fill_font_gamma_ramp, &ramp, NULL ); + return &ramp; } /*********************************************************************** diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4bb4661966..7f83732372 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -99,7 +99,7 @@ typedef struct tagDC struct gdi_path *path; - struct font_gamma_ramp *font_gamma_ramp; + const struct font_gamma_ramp *font_gamma_ramp; UINT font_code_page; WORD ROPmode;

1 0

Zebediah Figura : wined3d: Factor out wined3d_state_uses_depth_buffer().
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 8b4e07d5f3ab3c02061530600a81323151892172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b4e07d5f3ab3c0206153060… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 23 23:51:57 2020 -0500 wined3d: Factor out wined3d_state_uses_depth_buffer(). 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/context_gl.c | 2 +- dlls/wined3d/context_vk.c | 8 +++----- dlls/wined3d/device.c | 3 +-- dlls/wined3d/wined3d_private.h | 5 +++++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index b7ca8ceca2..e3eae3aab5 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4491,7 +4491,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s * that we never copy the stencil data.*/ DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; - if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) + if (wined3d_state_uses_depth_buffer(state)) wined3d_rendertarget_view_load_location(dsv, context, location); else wined3d_rendertarget_view_prepare_location(dsv, context, location); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index a7c77dd5a6..aef2430208 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2138,8 +2138,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont ++attachment_count; } - if ((state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) - && (view = state->fb.depth_stencil)) + if (wined3d_state_uses_depth_buffer(state) && (view = state->fb.depth_stencil)) { rtv_vk = wined3d_rendertarget_view_vk(view); vk_views[attachment_count] = wined3d_rendertarget_view_vk_get_image_view(rtv_vk, context_vk); @@ -2155,8 +2154,7 @@ static bool wined3d_context_vk_begin_render_pass(struct wined3d_context_vk *cont } if (!(context_vk->vk_render_pass = wined3d_context_vk_get_render_pass(context_vk, &state->fb, - ARRAY_SIZE(state->fb.render_targets), state->render_states[WINED3D_RS_ZWRITEENABLE] - || state->render_states[WINED3D_RS_ZENABLE], 0))) + ARRAY_SIZE(state->fb.render_targets), wined3d_state_uses_depth_buffer(state), 0))) { ERR("Failed to get render pass.\n"); return false; @@ -2845,7 +2843,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if ((dsv = state->fb.depth_stencil)) { - if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) + if (wined3d_state_uses_depth_buffer(state)) wined3d_rendertarget_view_load_location(dsv, &context_vk->c, dsv->resource->draw_binding); else wined3d_rendertarget_view_prepare_location(dsv, &context_vk->c, dsv->resource->draw_binding); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 13d8bce1ac..3fce04673a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4264,8 +4264,7 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device } } - if (state->render_states[WINED3D_RS_ZENABLE] || state->render_states[WINED3D_RS_ZWRITEENABLE] - || state->render_states[WINED3D_RS_STENCILENABLE]) + if (wined3d_state_uses_depth_buffer(state) || state->render_states[WINED3D_RS_STENCILENABLE]) { struct wined3d_rendertarget_view *rt = device->state.fb.render_targets[0]; struct wined3d_rendertarget_view *ds = device->state.fb.depth_stencil; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2be81ee2a0..0ed1f13381 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3624,6 +3624,11 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; +static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *state) +{ + return state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]; +} + struct wined3d_dummy_textures { GLuint tex_1d;

1 0