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

Hans Leidekker : mountmgr: Fix buffer length check.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: ea9b507380b4415cf9edd3643d9bcea7ab934fbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea9b507380b4415cf9edd364… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 16:13:12 2020 +0200 mountmgr: Fix buffer length check. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49305 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c29ce9f924..d99a096c61 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1780,7 +1780,7 @@ static void query_property( struct disk_device *device, IRP *irp ) if (!irp->UserBuffer || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; - else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DEVICE_DESCRIPTOR)) + else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < len) { descriptor = irp->UserBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR);

1 0

Jacek Caban : jscript: Don't realloc interpreter stack.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 2c21d0344cae7ee0c3205393b518a75ab882d535 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c21d0344cae7ee0c3205393… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:28:56 2020 +0200 jscript: Don't realloc interpreter stack. We share the stack for all calls in script instance, so it no loner makes sense. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 27 ++++++++++----------------- dlls/jscript/jscript.h | 1 - 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c39c59e3ab..548bc2560c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -62,25 +62,12 @@ typedef struct { } u; } exprval_t; +static const size_t stack_size = 0x4000; + static HRESULT stack_push(script_ctx_t *ctx, jsval_t v) { - if(!ctx->stack_size) { - ctx->stack = heap_alloc(16*sizeof(*ctx->stack)); - if(!ctx->stack) - return E_OUTOFMEMORY; - ctx->stack_size = 16; - }else if(ctx->stack_size == ctx->stack_top) { - jsval_t *new_stack; - - new_stack = heap_realloc(ctx->stack, ctx->stack_size*2*sizeof(*new_stack)); - if(!new_stack) { - jsval_release(v); - return E_OUTOFMEMORY; - } - - ctx->stack = new_stack; - ctx->stack_size *= 2; - } + if(ctx->stack_top == stack_size) + return E_OUTOFMEMORY; ctx->stack[ctx->stack_top++] = v; return S_OK; @@ -3006,6 +2993,12 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi unsigned i; HRESULT hres; + if(!ctx->stack) { + ctx->stack = heap_alloc(stack_size * sizeof(*ctx->stack)); + if(!ctx->stack) + return E_OUTOFMEMORY; + } + if(bytecode->named_item) { if(!bytecode->named_item->script_obj) { hres = create_named_item_script_obj(ctx, bytecode->named_item); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 40b9f794ae..2a2250d3e9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -425,7 +425,6 @@ struct _script_ctx_t { heap_pool_t tmp_heap; jsval_t *stack; - unsigned stack_size; unsigned stack_top; jsval_t acc;

1 0

Louis Lenders : api-ms-win-core-localization-l1-2-2: Add new dll.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: d48fed09e530b8e5779412d083a71aeea5808644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d48fed09e530b8e5779412d0… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 4 09:43:02 2020 +0200 api-ms-win-core-localization-l1-2-2: Add new dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + .../Makefile.in | 1 + .../api-ms-win-core-localization-l1-2-2.spec | 42 ++++++++++++++++++++++ 4 files changed, 46 insertions(+) diff --git a/configure b/configure index 5ad79eaf27..d12afc2a4d 100755 --- a/configure +++ b/configure @@ -975,6 +975,7 @@ enable_api_ms_win_core_libraryloader_l2_1_0 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 +enable_api_ms_win_core_localization_l1_2_2 enable_api_ms_win_core_localization_l2_1_0 enable_api_ms_win_core_localization_obsolete_l1_1_0 enable_api_ms_win_core_localization_obsolete_l1_2_0 @@ -20302,6 +20303,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l2-1-0 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 +wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-2 enable_api_ms_win_core_localization_l1_2_2 wine_fn_config_makefile dlls/api-ms-win-core-localization-l2-1-0 enable_api_ms_win_core_localization_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-obsolete-l1-1-0 enable_api_ms_win_core_localization_obsolete_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-obsolete-l1-2-0 enable_api_ms_win_core_localization_obsolete_l1_2_0 diff --git a/configure.ac b/configure.ac index 87ba3bb780..e61a98455c 100644 --- a/configure.ac +++ b/configure.ac @@ -2891,6 +2891,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-1) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-2) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-obsolete-l1-2-0) diff --git a/dlls/api-ms-win-core-localization-l1-2-2/Makefile.in b/dlls/api-ms-win-core-localization-l1-2-2/Makefile.in new file mode 100644 index 0000000000..f4475691cc --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-2/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-localization-l1-2-2.dll diff --git a/dlls/api-ms-win-core-localization-l1-2-2/api-ms-win-core-localization-l1-2-2.spec b/dlls/api-ms-win-core-localization-l1-2-2/api-ms-win-core-localization-l1-2-2.spec new file mode 100644 index 0000000000..37f45c3303 --- /dev/null +++ b/dlls/api-ms-win-core-localization-l1-2-2/api-ms-win-core-localization-l1-2-2.spec @@ -0,0 +1,42 @@ +@ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID +@ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA +@ stdcall EnumSystemLocalesEx(ptr long long ptr) kernel32.EnumSystemLocalesEx +@ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW +@ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx +@ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA +@ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW +@ stdcall GetACP() kernel32.GetACP +@ stdcall GetCalendarInfoEx(wstr long ptr long ptr long ptr) kernel32.GetCalendarInfoEx +@ stdcall GetCPInfo(long ptr) kernel32.GetCPInfo +@ stdcall GetCPInfoExW(long long ptr) kernel32.GetCPInfoExW +@ stdcall GetGeoInfoW(long long ptr long long) kernel32.GetGeoInfoW +@ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA +@ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx +@ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW +@ stdcall GetNLSVersionEx(long wstr ptr) kernel32.GetNLSVersionEx +@ stdcall GetOEMCP() kernel32.GetOEMCP +@ stdcall GetSystemDefaultLangID() kernel32.GetSystemDefaultLangID +@ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID +@ stdcall GetSystemDefaultLocaleName(ptr long) kernel32.GetSystemDefaultLocaleName +@ stdcall GetThreadLocale() kernel32.GetThreadLocale +@ stdcall GetUserDefaultLangID() kernel32.GetUserDefaultLangID +@ stdcall GetUserDefaultLCID() kernel32.GetUserDefaultLCID +@ stdcall GetUserDefaultLocaleName(ptr long) kernel32.GetUserDefaultLocaleName +@ stdcall GetUserGeoID(long) kernel32.GetUserGeoID +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode +@ stdcall IsDBCSLeadByte(long) kernel32.IsDBCSLeadByte +@ stdcall IsDBCSLeadByteEx(long long) kernel32.IsDBCSLeadByteEx +@ stub IsNLSDefinedString +@ stdcall IsValidCodePage(long) kernel32.IsValidCodePage +@ stdcall IsValidLocale(long long) kernel32.IsValidLocale +@ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName +@ stdcall IsValidNLSVersion(long wstr ptr) kernel32.IsValidNLSVersion +@ stdcall LCIDToLocaleName(long ptr long long) kernel32.LCIDToLocaleName +@ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA +@ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx +@ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW +@ stdcall LocaleNameToLCID(wstr long) kernel32.LocaleNameToLCID +@ stdcall ResolveLocaleName(wstr ptr long) kernel32.ResolveLocaleName +@ stdcall VerLanguageNameA(long str long) kernel32.VerLanguageNameA +@ stdcall VerLanguageNameW(long wstr long) kernel32.VerLanguageNameW

1 0

Jacek Caban : jscript: Inline add_eval implementation.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 0841b60b8d7464724eb52d0fab8e2c0321a2489c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0841b60b8d7464724eb52d0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 4 17:28:03 2020 +0200 jscript: Inline add_eval implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 43 ++++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 27f03084fa..c39c59e3ab 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1734,21 +1734,27 @@ static HRESULT interp_in(script_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.6.1 */ -static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t *ret) +static HRESULT interp_add(script_ctx_t *ctx) { - jsval_t r, l; + jsval_t l, r, lval, rval, ret; HRESULT hres; + rval = stack_pop(ctx); + lval = stack_pop(ctx); + + TRACE("%s + %s\n", debugstr_jsval(lval), debugstr_jsval(rval)); + hres = to_primitive(ctx, lval, &l, NO_HINT); + if(SUCCEEDED(hres)) { + hres = to_primitive(ctx, rval, &r, NO_HINT); + if(FAILED(hres)) + jsval_release(l); + } + jsval_release(lval); + jsval_release(rval); if(FAILED(hres)) return hres; - hres = to_primitive(ctx, rval, &r, NO_HINT); - if(FAILED(hres)) { - jsval_release(l); - return hres; - } - if(is_string(l) || is_string(r)) { jsstr_t *lstr, *rstr = NULL; @@ -1761,7 +1767,7 @@ static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t * ret_str = jsstr_concat(lstr, rstr); if(ret_str) - *ret = jsval_string(ret_str); + ret = jsval_string(ret_str); else hres = E_OUTOFMEMORY; } @@ -1776,29 +1782,12 @@ static HRESULT add_eval(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsval_t * if(SUCCEEDED(hres)) { hres = to_number(ctx, r, &nr); if(SUCCEEDED(hres)) - *ret = jsval_number(nl+nr); + ret = jsval_number(nl+nr); } } jsval_release(r); jsval_release(l); - return hres; -} - -/* ECMA-262 3rd Edition 11.6.1 */ -static HRESULT interp_add(script_ctx_t *ctx) -{ - jsval_t l, r, ret; - HRESULT hres; - - r = stack_pop(ctx); - l = stack_pop(ctx); - - TRACE("%s + %s\n", debugstr_jsval(l), debugstr_jsval(r)); - - hres = add_eval(ctx, l, r, &ret); - jsval_release(l); - jsval_release(r); if(FAILED(hres)) return hres;

1 0

Louis Lenders : api-ms-win-core-libraryloader-l2-1-0: Add new dll.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: fcdaf2ca2f6eb1412b350ca1b0f99fde5b65170d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcdaf2ca2f6eb1412b350ca1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jun 4 09:43:00 2020 +0200 api-ms-win-core-libraryloader-l2-1-0: Add new dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49283 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in | 1 + .../api-ms-win-core-libraryloader-l2-1-0.spec | 2 ++ 4 files changed, 6 insertions(+) diff --git a/configure b/configure index bb98f99f9f..bd5d1166ee 100755 --- a/configure +++ b/configure @@ -971,6 +971,7 @@ enable_api_ms_win_core_libraryloader_l1_1_1 enable_api_ms_win_core_libraryloader_l1_2_0 enable_api_ms_win_core_libraryloader_l1_2_1 enable_api_ms_win_core_libraryloader_l1_2_2 +enable_api_ms_win_core_libraryloader_l2_1_0 enable_api_ms_win_core_localization_l1_1_0 enable_api_ms_win_core_localization_l1_2_0 enable_api_ms_win_core_localization_l1_2_1 @@ -20296,6 +20297,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-1-1 enable_api_ms_ wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-0 enable_api_ms_win_core_libraryloader_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-1 enable_api_ms_win_core_libraryloader_l1_2_1 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-2-2 enable_api_ms_win_core_libraryloader_l1_2_2 +wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l2-1-0 enable_api_ms_win_core_libraryloader_l2_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-1-0 enable_api_ms_win_core_localization_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-0 enable_api_ms_win_core_localization_l1_2_0 wine_fn_config_makefile dlls/api-ms-win-core-localization-l1-2-1 enable_api_ms_win_core_localization_l1_2_1 diff --git a/configure.ac b/configure.ac index e3d63ed750..22369882ce 100644 --- a/configure.ac +++ b/configure.ac @@ -2887,6 +2887,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-2-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-localization-l1-2-1) diff --git a/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in b/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in new file mode 100644 index 0000000000..c4c4c315b6 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-libraryloader-l2-1-0.dll diff --git a/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec b/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec new file mode 100644 index 0000000000..a9dc31df32 --- /dev/null +++ b/dlls/api-ms-win-core-libraryloader-l2-1-0/api-ms-win-core-libraryloader-l2-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall LoadPackagedLibrary(wstr long) kernel32.LoadPackagedLibrary +@ stub QueryOptionalDelayLoadedAPI

1 0

Alexandre Julliard : ntdll: Move the section object functions to the Unix library.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: cdfc45859c299aa629482ee06614c9819346b444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdfc45859c299aa629482ee0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 21:34:28 2020 +0200 ntdll: Move the section object functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 + dlls/ntdll/unix/sync.c | 77 +++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 7 ++- dlls/ntdll/virtual.c | 108 +---------------------------------------------- 4 files changed, 87 insertions(+), 107 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 0e93978993..767cae92b4 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -991,6 +991,7 @@ static struct unix_funcs unix_funcs = NtCreateEvent, NtCreateKeyedEvent, NtCreateMutant, + NtCreateSection, NtCreateSemaphore, NtCreateTimer, NtCurrentTeb, @@ -1005,6 +1006,7 @@ static struct unix_funcs unix_funcs = NtOpenEvent, NtOpenKeyedEvent, NtOpenMutant, + NtOpenSection, NtOpenSemaphore, NtOpenTimer, NtProtectVirtualMemory, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index cea005fefb..c67eb70697 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -871,3 +871,80 @@ NTSTATUS WINAPI NtReleaseKeyedEvent( HANDLE handle, const void *key, select_op.keyed_event.key = wine_server_client_ptr( key ); return server_wait( &select_op, sizeof(select_op.keyed_event), flags, timeout ); } + + +/*********************************************************************** + * NtCreateSection (NTDLL.@) + */ +NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, + const LARGE_INTEGER *size, ULONG protect, + ULONG sec_flags, HANDLE file ) +{ + NTSTATUS ret; + unsigned int file_access; + data_size_t len; + struct object_attributes *objattr; + + switch (protect & 0xff) + { + case PAGE_READONLY: + case PAGE_EXECUTE_READ: + case PAGE_WRITECOPY: + case PAGE_EXECUTE_WRITECOPY: + file_access = FILE_READ_DATA; + break; + case PAGE_READWRITE: + case PAGE_EXECUTE_READWRITE: + if (sec_flags & SEC_IMAGE) file_access = FILE_READ_DATA; + else file_access = FILE_READ_DATA | FILE_WRITE_DATA; + break; + case PAGE_EXECUTE: + case PAGE_NOACCESS: + file_access = 0; + break; + default: + return STATUS_INVALID_PAGE_PROTECTION; + } + + if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; + + SERVER_START_REQ( create_mapping ) + { + req->access = access; + req->flags = sec_flags; + req->file_handle = wine_server_obj_handle( file ); + req->file_access = file_access; + req->size = size ? size->QuadPart : 0; + wine_server_add_data( req, objattr, len ); + ret = wine_server_call( req ); + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + + RtlFreeHeap( GetProcessHeap(), 0, objattr ); + return ret; +} + + +/*********************************************************************** + * NtOpenSection (NTDLL.@) + */ +NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) +{ + NTSTATUS ret; + + if ((ret = validate_open_object_attributes( attr ))) return ret; + + SERVER_START_REQ( open_mapping ) + { + req->access = access; + req->attributes = attr->Attributes; + req->rootdir = wine_server_obj_handle( attr->RootDirectory ); + if (attr->ObjectName) + wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); + ret = wine_server_call( req ); + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return ret; +} diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index df8f271383..4e5cec6637 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct ldt_copy; struct msghdr; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 26 +#define NTDLL_UNIXLIB_VERSION 27 struct unix_funcs { @@ -45,6 +45,9 @@ struct unix_funcs const OBJECT_ATTRIBUTES *attr, ULONG flags ); NTSTATUS (WINAPI *NtCreateMutant)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, BOOLEAN owned ); + NTSTATUS (WINAPI *NtCreateSection)( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr, const LARGE_INTEGER *size, + ULONG protect, ULONG sec_flags, HANDLE file ); NTSTATUS (WINAPI *NtCreateSemaphore)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max ); NTSTATUS (WINAPI *NtCreateTimer)( HANDLE *handle, ACCESS_MASK access, @@ -72,6 +75,8 @@ struct unix_funcs const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenMutant)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ); + NTSTATUS (WINAPI *NtOpenSection)( HANDLE *handle, ACCESS_MASK access, + const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenSemaphore)( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ); NTSTATUS (WINAPI *NtOpenTimer)( HANDLE *handle, ACCESS_MASK access, diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index e277de16fe..6d5c98b58e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -63,17 +63,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(virtual); -/* per-page protection flags */ -#define VPROT_READ 0x01 -#define VPROT_WRITE 0x02 -#define VPROT_EXEC 0x04 -#define VPROT_WRITECOPY 0x08 -#define VPROT_GUARD 0x10 -#define VPROT_COMMITTED 0x20 -#define VPROT_WRITEWATCH 0x40 -/* per-mapping protection flags */ -#define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ - static const UINT page_shift = 12; static const UINT_PTR page_mask = 0xfff; @@ -84,59 +73,6 @@ static SIZE_T signal_stack_align; #define ROUND_SIZE(addr,size) \ (((SIZE_T)(size) + ((UINT_PTR)(addr) & page_mask) + page_mask) & ~page_mask) -/*********************************************************************** - * get_vprot_flags - * - * Build page protections from Win32 flags. - * - * PARAMS - * protect [I] Win32 protection flags - * - * RETURNS - * Value of page protection flags - */ -static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image ) -{ - switch(protect & 0xff) - { - case PAGE_READONLY: - *vprot = VPROT_READ; - break; - case PAGE_READWRITE: - if (image) - *vprot = VPROT_READ | VPROT_WRITECOPY; - else - *vprot = VPROT_READ | VPROT_WRITE; - break; - case PAGE_WRITECOPY: - *vprot = VPROT_READ | VPROT_WRITECOPY; - break; - case PAGE_EXECUTE: - *vprot = VPROT_EXEC; - break; - case PAGE_EXECUTE_READ: - *vprot = VPROT_EXEC | VPROT_READ; - break; - case PAGE_EXECUTE_READWRITE: - if (image) - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; - else - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITE; - break; - case PAGE_EXECUTE_WRITECOPY: - *vprot = VPROT_EXEC | VPROT_READ | VPROT_WRITECOPY; - break; - case PAGE_NOACCESS: - *vprot = 0; - break; - default: - return STATUS_INVALID_PAGE_PROTECTION; - } - if (protect & PAGE_GUARD) *vprot |= VPROT_GUARD; - return STATUS_SUCCESS; -} - - /********************************************************************** * RtlCreateUserStack (NTDLL.@) */ @@ -270,32 +206,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC const LARGE_INTEGER *size, ULONG protect, ULONG sec_flags, HANDLE file ) { - NTSTATUS ret; - unsigned int vprot, file_access = 0; - data_size_t len; - struct object_attributes *objattr; - - if ((ret = get_vprot_flags( protect, &vprot, sec_flags & SEC_IMAGE ))) return ret; - if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; - - if (vprot & VPROT_READ) file_access |= FILE_READ_DATA; - if (vprot & VPROT_WRITE) file_access |= FILE_WRITE_DATA; - - SERVER_START_REQ( create_mapping ) - { - req->access = access; - req->flags = sec_flags; - req->file_handle = wine_server_obj_handle( file ); - req->file_access = file_access; - req->size = size ? size->QuadPart : 0; - wine_server_add_data( req, objattr, len ); - ret = wine_server_call( req ); - *handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - - RtlFreeHeap( GetProcessHeap(), 0, objattr ); - return ret; + return unix_funcs->NtCreateSection( handle, access, attr, size, protect, sec_flags, file ); } @@ -305,22 +216,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC */ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr ) { - NTSTATUS ret; - - if ((ret = validate_open_object_attributes( attr ))) return ret; - - SERVER_START_REQ( open_mapping ) - { - req->access = access; - req->attributes = attr->Attributes; - req->rootdir = wine_server_obj_handle( attr->RootDirectory ); - if (attr->ObjectName) - wine_server_add_data( req, attr->ObjectName->Buffer, attr->ObjectName->Length ); - ret = wine_server_call( req ); - *handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return ret; + return unix_funcs->NtOpenSection( handle, access, attr ); }

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in query_internal_format().
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 6fd061ba1958f828b792ae5ee216e599f531ed45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fd061ba1958f828b792ae5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:50:01 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in query_internal_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index df948264f9..26dd9ef533 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3100,8 +3100,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, if ((format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write_supported) format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_WRITE); - if (!gl_info->supported[ARB_DEPTH_TEXTURE] - && texture_info->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (!gl_info->supported[ARB_DEPTH_TEXTURE] && (format->f.depth_size || format->f.stencil_size)) { format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE; format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE;

1 0

Alexandre Julliard : ntdll: Move the keyed event functions to the Unix library.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: f1276b25ae72e81cf044134bae92db6ef73be3a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1276b25ae72e81cf044134b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 21:27:22 2020 +0200 ntdll: Move the keyed event functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 57 ++------------------------ dlls/ntdll/unix/loader.c | 4 ++ dlls/ntdll/unix/sync.c | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 1 + dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unixlib.h | 10 ++++- 6 files changed, 109 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f1276b25ae72e81cf044…

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in the FBO cache.
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: 831701d3f4f14de1ae2e9713a8849f18103a9af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=831701d3f4f14de1ae2e9713… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:49:59 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in the FBO cache. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 08a90e3663..b7ca8ceca2 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -566,9 +566,9 @@ static struct fbo_entry *wined3d_context_gl_create_fbo_entry(const struct wined3 entry->flags = 0; if (depth_stencil->resource) { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) + if (depth_stencil->resource->format->depth_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) + if (depth_stencil->resource->format->stencil_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; } entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); @@ -594,9 +594,9 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex entry->flags = 0; if (depth_stencil->resource) { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) + if (depth_stencil->resource->format->depth_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) + if (depth_stencil->resource->format->stencil_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; } }

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in create_and_bind_fbo_attachment().
by Alexandre Julliard June 4, 2020

June 4, 2020

Module: wine Branch: master Commit: c73f4a81298d9a13a5a2ea21bcb03ed64d3a98db URL: https://source.winehq.org/git/wine.git/?a=commit;h=c73f4a81298d9a13a5a2ea21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:50:02 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in create_and_bind_fbo_attachment(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 52 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 26dd9ef533..21215ca7e7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2236,13 +2236,15 @@ static void delete_fbo_attachment(const struct wined3d_gl_info *gl_info, } } -/* Context activation is done by the caller. */ -static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info, unsigned int flags, - enum wined3d_gl_resource_type d3d_type, GLuint *object, GLenum internal, GLenum format, GLenum type) +static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info, + const struct wined3d_format_gl *format_gl, + enum wined3d_gl_resource_type d3d_type, GLuint *object, GLenum internal) { - GLenum attach_type = flags & WINED3DFMT_FLAG_DEPTH ? - GL_DEPTH_ATTACHMENT : GL_COLOR_ATTACHMENT0; + GLenum format = format_gl->format; + GLenum type = format_gl->type; + GLenum attach_type; + attach_type = format_gl->f.depth_size ? GL_DEPTH_ATTACHMENT : GL_COLOR_ATTACHMENT0; switch (d3d_type) { case WINED3D_GL_RES_TYPE_TEX_1D: @@ -2252,11 +2254,10 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_1D, - *object, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) - gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_1D, - *object, 0); + gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_1D, *object, 0); + if (format_gl->f.stencil_size) + gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, + GL_STENCIL_ATTACHMENT, GL_TEXTURE_1D, *object, 0); break; case WINED3D_GL_RES_TYPE_TEX_2D: @@ -2270,7 +2271,7 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, attach_type, wined3d_gl_type_to_enum(d3d_type), *object, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) + if (format_gl->f.stencil_size) gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, wined3d_gl_type_to_enum(d3d_type), *object, 0); break; @@ -2282,11 +2283,10 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, attach_type, - GL_TEXTURE_3D, *object, 0, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) - gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, - GL_TEXTURE_3D, *object, 0, 0); + gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_3D, *object, 0, 0); + if (format_gl->f.stencil_size) + gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, + GL_STENCIL_ATTACHMENT, GL_TEXTURE_3D, *object, 0, 0); break; case WINED3D_GL_RES_TYPE_TEX_CUBE: @@ -2309,7 +2309,7 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, *object, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) + if (format_gl->f.stencil_size) gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, *object, 0); break; @@ -2318,11 +2318,10 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->fbo_ops.glGenRenderbuffers(1, object); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, *object); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, internal, 16, 16); - gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, attach_type, GL_RENDERBUFFER, - *object); - if (flags & WINED3DFMT_FLAG_STENCIL) - gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, - *object); + gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, attach_type, GL_RENDERBUFFER, *object); + if (format_gl->f.stencil_size) + gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, + GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, *object); break; case WINED3D_GL_RES_TYPE_BUFFER: @@ -2484,8 +2483,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for if (type == WINED3D_GL_RES_TYPE_BUFFER) continue; - create_and_bind_fbo_attachment(gl_info, format->f.flags[type], type, - &object, format->internal, format->format, format->type); + create_and_bind_fbo_attachment(gl_info, format, type, &object, format->internal); if (format->f.flags[type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) { @@ -2539,8 +2537,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for while (gl_info->gl_ops.gl.p_glGetError()); delete_fbo_attachment(gl_info, type, object); - create_and_bind_fbo_attachment(gl_info, format->f.flags[type], type, - &object, format->rt_internal, format->format, format->type); + create_and_bind_fbo_attachment(gl_info, format, type, &object, format->rt_internal); status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER); checkGLcall("Framebuffer format check"); @@ -2691,8 +2688,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for if (format->internal != format->srgb_internal) { delete_fbo_attachment(gl_info, type, object); - create_and_bind_fbo_attachment(gl_info, format->f.flags[type], type, &object, format->srgb_internal, - format->format, format->type); + create_and_bind_fbo_attachment(gl_info, format, type, &object, format->srgb_internal); status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER); checkGLcall("Framebuffer format check");

1 0