July 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : sxs: Implement surrogate data lookup in SxsLookupClrGuid().
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: fe2c271ecca7620b6a8a693ff2ee8a7ad7469a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe2c271ecca7620b6a8a693f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 21 15:03:28 2020 +0300 sxs: Implement surrogate data lookup in SxsLookupClrGuid(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/sxs.c | 80 ++++++++++++++++++++++++++++--------- dlls/sxs/tests/comtest_dll.manifest | 5 +++ dlls/sxs/tests/interfaces.idl | 5 +++ dlls/sxs/tests/sxs.c | 33 +++++++++++++++ 4 files changed, 104 insertions(+), 19 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 0b59eb5d2e..92ba18ab0e 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -60,6 +60,7 @@ typedef struct _SXS_GUID_INFORMATION_CLR #define SXS_LOOKUP_CLR_GUID_USE_ACTCTX 0x00000001 #define SXS_LOOKUP_CLR_GUID_FIND_SURROGATE 0x00010000 #define SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS 0x00020000 +#define SXS_LOOKUP_CLR_GUID_FIND_ANY (SXS_LOOKUP_CLR_GUID_FIND_SURROGATE | SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) struct comclassredirect_data { @@ -96,27 +97,54 @@ struct clrclass_data DWORD res2[2]; }; +struct clrsurrogate_data +{ + ULONG size; + DWORD res; + GUID clsid; + ULONG version_offset; + ULONG version_len; + ULONG name_offset; + ULONG name_len; +}; + BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buffer, SIZE_T buffer_len, SIZE_T *buffer_len_required) { ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) }; ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info; SIZE_T bytes_assembly_info; - struct comclassredirect_data *redirect_data; - struct clrclass_data *class_data; - int len_version = 0, len_name, len_identity; + unsigned int len_version = 0, len_name, len_identity; const void *ptr_name, *ptr_version, *ptr_identity; SXS_GUID_INFORMATION_CLR *ret = buffer; + BOOL retval = FALSE; char *ret_strings; - TRACE("(%x, %s, %p, %p, %08lx, %p): stub\n", flags, wine_dbgstr_guid(clsid), actctx, + TRACE("%#x, %s, %p, %p, %lx, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required); - if (flags & ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) - FIXME("Ignored flags: %x\n", flags & ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS); + if (flags & ~SXS_LOOKUP_CLR_GUID_FIND_ANY) + FIXME("Ignored flags: %x\n", flags & ~SXS_LOOKUP_CLR_GUID_FIND_ANY); - if (!FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, - ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info)) + if (flags & SXS_LOOKUP_CLR_GUID_FIND_SURROGATE) + { + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, + ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) + { + flags &= ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS; + } + } + + if (!retval && (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)) + { + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, + ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) + { + flags &= ~SXS_LOOKUP_CLR_GUID_FIND_SURROGATE; + } + } + + if (!retval) { SetLastError(ERROR_NOT_FOUND); return FALSE; @@ -139,17 +167,30 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff return FALSE; } - redirect_data = guid_info.lpData; - class_data = (void *)((char*)redirect_data + redirect_data->clrdata_offset); + if (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) + { + const struct comclassredirect_data *redirect_data = guid_info.lpData; + const struct clrclass_data *class_data; + + class_data = (void *)((char *)redirect_data + redirect_data->clrdata_offset); + ptr_name = (char *)class_data + class_data->name_offset; + ptr_version = (char *)class_data + class_data->version_offset; + len_name = class_data->name_len + sizeof(WCHAR); + if (class_data->version_len) + len_version = class_data->version_len + sizeof(WCHAR); + } + else + { + const struct clrsurrogate_data *surrogate = guid_info.lpData; + ptr_name = (char *)surrogate + surrogate->name_offset; + ptr_version = (char *)surrogate + surrogate->version_offset; + len_name = surrogate->name_len + sizeof(WCHAR); + if (surrogate->version_len) + len_version = surrogate->version_len + sizeof(WCHAR); + } ptr_identity = assembly_info->lpAssemblyEncodedAssemblyIdentity; - ptr_name = (char *)class_data + class_data->name_offset; - ptr_version = (char *)class_data + class_data->version_offset; - len_identity = assembly_info->ulEncodedAssemblyIdentityLength + sizeof(WCHAR); - len_name = class_data->name_len + sizeof(WCHAR); - if (class_data->version_len > 0) - len_version = class_data->version_len + sizeof(WCHAR); *buffer_len_required = sizeof(SXS_GUID_INFORMATION_CLR) + len_identity + len_version + len_name; if (!buffer || buffer_len < *buffer_len_required) @@ -160,11 +201,12 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff return FALSE; } - ret->cbSize = sizeof(SXS_GUID_INFORMATION_CLR); - ret->dwFlags = SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS; + ret->cbSize = sizeof(*ret); + ret->dwFlags = flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS ? SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS : + SXS_GUID_INFORMATION_CLR_FLAG_IS_SURROGATE; /* Copy strings into buffer */ - ret_strings = (char *)ret + sizeof(SXS_GUID_INFORMATION_CLR); + ret_strings = (char *)ret + sizeof(*ret); memcpy(ret_strings, ptr_identity, len_identity); ret->pcwszAssemblyIdentity = (WCHAR *)ret_strings; diff --git a/dlls/sxs/tests/comtest_dll.manifest b/dlls/sxs/tests/comtest_dll.manifest index ef6924de9e..b3273457ed 100644 --- a/dlls/sxs/tests/comtest_dll.manifest +++ b/dlls/sxs/tests/comtest_dll.manifest @@ -11,6 +11,11 @@ name="DLL.Test" runtimeVersion="v4.0.0.0"> </clrClass> + <clrSurrogate + clsid="{2e106e50-e7a4-4489-8538-83643f100fdd}" + name="Surrogate.Test" + runtimeVersion="v4.0.0.1"> + </clrSurrogate> <file name="comtest.dll"> </file> </assembly> diff --git a/dlls/sxs/tests/interfaces.idl b/dlls/sxs/tests/interfaces.idl index 6f8ac615bf..f34660db75 100644 --- a/dlls/sxs/tests/interfaces.idl +++ b/dlls/sxs/tests/interfaces.idl @@ -33,3 +33,8 @@ interface ITest : IUnknown { uuid(2e106e50-e7a4-4489-8538-83643f100fdc), ] coclass Test { interface ITest; }; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdd), +] +coclass SurrogateTest { interface ITest; }; diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 4215c5045b..9887871422 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -86,6 +86,10 @@ static void run_test(void) BOOL ret; SXS_GUID_INFORMATION_CLR *info; + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(ret == FALSE, "Got %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); @@ -103,6 +107,29 @@ static void run_test(void) wine_dbgstr_w(info->pcwszRuntimeVersion)); heap_free(info); + + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); + + info = heap_alloc(buffer_size); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, info, + buffer_size, &buffer_size); + ok(ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == 0, "Got %d\n", GetLastError()); + + ok(info->dwFlags == SXS_GUID_INFORMATION_CLR_FLAG_IS_SURROGATE, "Unexpected flags %#x.\n", info->dwFlags); + ok(!lstrcmpW(info->pcwszTypeName, L"Surrogate.Test"), "Unexpected typename %s.\n", wine_dbgstr_w(info->pcwszTypeName)); + ok(!lstrcmpW(info->pcwszAssemblyIdentity, L"comtest,type=\"win32\",version=\"1.0.0.0\""), + "Unexpected assembly identity %s.\n", wine_dbgstr_w(info->pcwszAssemblyIdentity)); + ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.1"), "Unexpected runtime version %s.\n", + wine_dbgstr_w(info->pcwszRuntimeVersion)); + + heap_free(info); + + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); } static void prepare_and_run_test(void) @@ -199,10 +226,16 @@ static void test_SxsLookupClrGuid(void) SIZE_T buffer_size; BOOL ret; + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_Test, NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + run_child_process(); }

1 0

Nikolay Sivov : sxs: Add support for SXS_LOOKUP_CLR_GUID_USE_ACTCTX in SxsLookupClrGuid().
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 2cfc85dc55d403a7fcb885a62bb28f8d73498c2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cfc85dc55d403a7fcb885a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 21 15:03:29 2020 +0300 sxs: Add support for SXS_LOOKUP_CLR_GUID_USE_ACTCTX in SxsLookupClrGuid(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/sxs.c | 56 +++++++++++++++++++++++++++------------------------- dlls/sxs/tests/sxs.c | 24 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 92ba18ab0e..7150f55c33 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -112,59 +112,58 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff SIZE_T *buffer_len_required) { ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) }; - ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info; + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info = NULL; SIZE_T bytes_assembly_info; unsigned int len_version = 0, len_name, len_identity; const void *ptr_name, *ptr_version, *ptr_identity; SXS_GUID_INFORMATION_CLR *ret = buffer; BOOL retval = FALSE; char *ret_strings; + ULONG_PTR cookie; TRACE("%#x, %s, %p, %p, %lx, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required); - if (flags & ~SXS_LOOKUP_CLR_GUID_FIND_ANY) - FIXME("Ignored flags: %x\n", flags & ~SXS_LOOKUP_CLR_GUID_FIND_ANY); + if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) + { + if (!ActivateActCtx(actctx, &cookie)) + { + WARN("Failed to activate context.\n"); + return FALSE; + } + } if (flags & SXS_LOOKUP_CLR_GUID_FIND_SURROGATE) { - if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, - ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) - { + if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) flags &= ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS; - } } if (!retval && (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)) { - if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, - ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) - { + if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) flags &= ~SXS_LOOKUP_CLR_GUID_FIND_SURROGATE; - } } if (!retval) { SetLastError(ERROR_NOT_FOUND); - return FALSE; + goto out; } - QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + if (!retval && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - ReleaseActCtx(guid_info.hActCtx); - return FALSE; + goto out; } + assembly_info = heap_alloc(bytes_assembly_info); - if(!QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + if (!(retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, assembly_info, - bytes_assembly_info, &bytes_assembly_info)) + bytes_assembly_info, &bytes_assembly_info))) { - heap_free(assembly_info); - ReleaseActCtx(guid_info.hActCtx); - return FALSE; + goto out; } if (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) @@ -192,13 +191,12 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff ptr_identity = assembly_info->lpAssemblyEncodedAssemblyIdentity; len_identity = assembly_info->ulEncodedAssemblyIdentityLength + sizeof(WCHAR); - *buffer_len_required = sizeof(SXS_GUID_INFORMATION_CLR) + len_identity + len_version + len_name; + *buffer_len_required = sizeof(*ret) + len_identity + len_version + len_name; if (!buffer || buffer_len < *buffer_len_required) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - heap_free(assembly_info); - ReleaseActCtx(guid_info.hActCtx); - return FALSE; + retval = FALSE; + goto out; } ret->cbSize = sizeof(*ret); @@ -226,7 +224,11 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff SetLastError(0); - ReleaseActCtx(guid_info.hActCtx); +out: + + if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) + DeactivateActCtx(0, cookie); + heap_free(assembly_info); - return TRUE; + return retval; } diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 9887871422..2a7afcde25 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -86,15 +86,30 @@ static void run_test(void) BOOL ret; SXS_GUID_INFORMATION_CLR *info; + SetLastError(0xdeadbeef); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY | SXS_LOOKUP_CLR_GUID_USE_ACTCTX, (GUID *)&CLSID_Test, + NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Unexpected error %d.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY | SXS_LOOKUP_CLR_GUID_USE_ACTCTX, (GUID *)&CLSID_Test, + NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Unexpected error %d.\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(ret == FALSE, "Got %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); info = heap_alloc(buffer_size); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, info, buffer_size, &buffer_size); ok(ret == TRUE, "Got %d\n", ret); ok(GetLastError() == 0, "Got %d\n", GetLastError()); @@ -108,11 +123,13 @@ static void run_test(void) heap_free(info); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); info = heap_alloc(buffer_size); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, info, buffer_size, &buffer_size); ok(ret, "Unexpected return value %d.\n", ret); @@ -127,6 +144,7 @@ static void run_test(void) heap_free(info); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); @@ -231,6 +249,12 @@ static void test_SxsLookupClrGuid(void) ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS | SXS_LOOKUP_CLR_GUID_USE_ACTCTX, (GUID *)&CLSID_Test, + NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret);

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SET_TITLE ioctl.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: cb28c2dbb0d92bcddea768bd5d43c5caecba6a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb28c2dbb0d92bcddea768bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 21 14:56:42 2020 +0200 server: Introduce IOCTL_CONDRV_SET_TITLE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 + server/console.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index f6888443c9..42ca77d382 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -34,6 +34,7 @@ #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console output ioctls */ #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) diff --git a/server/console.c b/server/console.c index 3a3260645d..df84334448 100644 --- a/server/console.c +++ b/server/console.c @@ -1610,6 +1610,27 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * if (!console->title_len) return 1; return set_reply_data( console->title, min( console->title_len, get_reply_max_size() )) != NULL; + case IOCTL_CONDRV_SET_TITLE: + { + data_size_t len = get_req_data_size(); + struct condrv_renderer_event evt; + WCHAR *title = NULL; + + if (len % sizeof(WCHAR)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + if (len && !(title = memdup( get_req_data(), len ))) return 0; + free( console->title ); + console->title = title; + console->title_len = len; + evt.event = CONSOLE_RENDERER_TITLE_EVENT; + console_input_events_append( console, &evt ); + return 1; + } + default: set_error( STATUS_INVALID_HANDLE ); return 0;

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_TITLE ioctl.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: dc1483c179d8e6e8ac1efe1fb54d8f1f2395077d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc1483c179d8e6e8ac1efe1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 21 14:56:48 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_TITLE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index eaf67f8875..be6ddf2000 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -728,14 +728,8 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna NULL, 0, NULL, NULL); if (!ret) goto error; - SERVER_START_REQ( set_console_input_info ) - { - req->handle = wine_server_obj_handle( data->hConIn ); - req->mask = SET_CONSOLE_INPUT_INFO_TITLE; - wine_server_add_data( req, appname, lstrlenW(appname) * sizeof(WCHAR) ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; + ret = DeviceIoControl(data->hConIn, IOCTL_CONDRV_SET_TITLE, (void *)appname, + lstrlenW(appname) * sizeof(WCHAR), NULL, 0, NULL, NULL); if (!ret) goto error; return data;

1 0

Jacek Caban : server: Allow creating screen buffer using NtCreateFile.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 2e5b8ffcc9ab8ac750e6fb2ac32eadeb6698540d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e5b8ffcc9ab8ac750e6fb2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 21 14:56:57 2020 +0200 server: Allow creating screen buffer using NtCreateFile. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/server/console.c b/server/console.c index df84334448..9f102968a1 100644 --- a/server/console.c +++ b/server/console.c @@ -525,7 +525,7 @@ static void generate_sb_initial_events( struct console_input *console_input ) console_input_events_append( console_input, &evt ); } -static struct screen_buffer *create_console_output( struct console_input *console_input, int fd ) +static struct object *create_console_output( struct console_input *console_input, int fd ) { struct screen_buffer *screen_buffer; int i; @@ -592,7 +592,7 @@ static struct screen_buffer *create_console_output( struct console_input *consol console_input->active = (struct screen_buffer*)grab_object( screen_buffer ); generate_sb_initial_events( console_input ); } - return screen_buffer; + return &screen_buffer->obj; } /* free the console for this process */ @@ -1809,10 +1809,11 @@ static void console_device_dump( struct object *obj, int verbose ) static struct object *console_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { - static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; - static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; - static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; - static const WCHAR rendererW[] = {'R','e','n','d','e','r','e','r'}; + static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; + static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; + static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; + static const WCHAR rendererW[] = {'R','e','n','d','e','r','e','r'}; + static const WCHAR screen_bufferW[] = {'S','c','r','e','e','n','B','u','f','f','e','r'}; if (name->len == sizeof(current_inW) && !memcmp( name->str, current_inW, name->len )) { @@ -1848,6 +1849,17 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return create_console_input_events(); } + if (name->len == sizeof(screen_bufferW) && !memcmp( name->str, screen_bufferW, name->len )) + { + if (!current->process->console) + { + set_error( STATUS_INVALID_HANDLE ); + return NULL; + } + name->len = 0; + return create_console_output( current->process->console, -1 ); + } + return NULL; } @@ -2056,9 +2068,9 @@ DECL_HANDLER(get_console_input_history) /* creates a screen buffer */ DECL_HANDLER(create_console_output) { - struct console_input* console; - struct screen_buffer* screen_buffer; - int fd; + struct console_input *console; + struct object *screen_buffer; + int fd; if (req->fd != -1) {

1 0

Jacek Caban : kernelbase: Use NtCreateFile in CreateConsoleScreenBuffer.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: e613d81d815d96a04eca42eea5faec71bdd459d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e613d81d815d96a04eca42ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 21 14:57:06 2020 +0200 kernelbase: Use NtCreateFile in CreateConsoleScreenBuffer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 6 ++++++ dlls/kernelbase/console.c | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 49869948e9..dd8cc2c188 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3290,6 +3290,12 @@ static void test_FreeConsole(void) (GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == ERROR_FILE_NOT_FOUND /* winxp */)), "CreateFileA failed: %u\n", GetLastError()); + handle = CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + CONSOLE_TEXTMODE_BUFFER, NULL); + ok(handle == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_HANDLE, + "CreateConsoleScreenBuffer returned: %p (%u)\n", handle, GetLastError()); + if (!skip_nt) { SetStdHandle( STD_INPUT_HANDLE, (HANDLE)0xdeadbeef ); diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index d1fc8a4de1..262db40003 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -326,7 +326,11 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD s SECURITY_ATTRIBUTES *sa, DWORD flags, void *data ) { - HANDLE ret = INVALID_HANDLE_VALUE; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + IO_STATUS_BLOCK iosb; + UNICODE_STRING name; + HANDLE handle; + NTSTATUS status; TRACE( "(%x,%x,%p,%x,%p)\n", access, share, sa, flags, data ); @@ -336,18 +340,13 @@ HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD s return INVALID_HANDLE_VALUE; } - SERVER_START_REQ( create_console_output ) - { - req->handle_in = 0; - req->access = access; - req->attributes = (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0; - req->share = share; - req->fd = -1; - if (!wine_server_call_err( req )) - ret = console_handle_map( wine_server_ptr_handle( reply->handle_out )); - } - SERVER_END_REQ; - return ret; + RtlInitUnicodeString( &name, L"\\Device\\ConDrv\\ScreenBuffer" ); + attr.ObjectName = &name; + attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; + if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; + status = NtCreateFile( &handle, access, &attr, &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, + FILE_NON_DIRECTORY_FILE, NULL, 0 ); + return set_ntstatus( status ) ? handle : INVALID_HANDLE_VALUE; }

1 0

Alexandre Julliard : ntdll: Set a better exit status when the main image fails to load.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: f8d42a31c624f28f6c9bfd9678fb025bf15e9c12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8d42a31c624f28f6c9bfd96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:23:28 2020 +0200 ntdll: Set a better exit status when the main image fails to load. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49593 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index c21e9ec5b1..06e7c1bb37 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -513,7 +513,7 @@ done: failed: MESSAGE( "wine: cannot find %s\n", debugstr_w(name) ); - RtlExitUserProcess( GetLastError() ); + RtlExitUserProcess( STATUS_DLL_NOT_FOUND ); }

1 0

Alexandre Julliard : ntdll: Map errno to a status also in directory functions.
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 688799b1f7b2750b938f8da771480d2c16d1ae1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=688799b1f7b2750b938f8da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 18:18:17 2020 +0200 ntdll: Map errno to a status also in directory functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49523 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 25 +++++++++++++++++++++++++ dlls/ntdll/unix/file.c | 13 +++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 6164b0c4bd..2fa12410c9 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -401,6 +401,31 @@ static void open_file_test(void) CloseHandle( handle ); CloseHandle( dir ); + attr.RootDirectory = 0; + wcscat( path, L"\\cmd.exe" ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( handle ); + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( handle ); + pRtlFreeUnicodeString( &nameW ); + + wcscat( path, L"\\cmd.exe" ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + todo_wine + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE ); + todo_wine + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); + GetTempPathW( MAX_PATH, path ); lstrcatW( path, testdirW ); CreateDirectoryW( path, NULL ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 20eb6a0592..8356e08289 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2454,7 +2454,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTI } if (cwd == -1 || fchdir( cwd ) == -1) chdir( "/" ); } - else status = STATUS_ACCESS_DENIED; + else status = errno_to_status( errno ); pthread_mutex_unlock( &dir_mutex ); @@ -2557,11 +2557,8 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i } #endif /* VFAT_IOCTL_READDIR_BOTH */ - if (!(dir = opendir( unix_name ))) - { - if (errno == ENOENT) return STATUS_OBJECT_PATH_NOT_FOUND; - else return STATUS_ACCESS_DENIED; - } + if (!(dir = opendir( unix_name ))) return errno_to_status( errno ); + unix_name[pos - 1] = '/'; while ((de = readdir( dir ))) { @@ -3038,7 +3035,7 @@ static NTSTATUS file_id_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char * } if (fchdir( old_cwd ) == -1) chdir( "/" ); } - else status = STATUS_ACCESS_DENIED; + else status = errno_to_status( errno ); pthread_mutex_unlock( &dir_mutex ); if (old_cwd != -1) close( old_cwd ); @@ -3217,7 +3214,7 @@ static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char * disposition, FALSE ); if (fchdir( old_cwd ) == -1) chdir( "/" ); } - else status = STATUS_ACCESS_DENIED; + else status = errno_to_status( errno ); pthread_mutex_unlock( &dir_mutex ); if (old_cwd != -1) close( old_cwd ); if (needs_close) close( root_fd );

1 0

Alexandre Julliard : ntdll: Implement KiRaiseUserExceptionDispatcher().
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 5eefbc6db98985a5b63bec78fde7eef2f7fa02f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eefbc6db98985a5b63bec78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:50:03 2020 +0200 ntdll: Implement KiRaiseUserExceptionDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 2 ++ dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 1fc8710897..b32665611f 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -176,6 +176,16 @@ void WINAPI RtlRaiseStatus( NTSTATUS status ) } +/******************************************************************* + * KiRaiseUserExceptionDispatcher (NTDLL.@) + */ +void WINAPI KiRaiseUserExceptionDispatcher(void) +{ + EXCEPTION_RECORD rec = { NtCurrentTeb()->ExceptionCode }; + RtlRaiseException( &rec ); +} + + /******************************************************************* * RtlAddVectoredContinueHandler (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a3bc57716d..0bfe3d3545 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -66,7 +66,7 @@ # @ stub KiFastSystemCall # @ stub KiFastSystemCallRet # @ stub KiIntSystemCall -@ stub KiRaiseUserExceptionDispatcher +@ stdcall -norelay KiRaiseUserExceptionDispatcher() @ stub KiUserApcDispatcher @ stub KiUserCallbackDispatcher @ stdcall -norelay KiUserExceptionDispatcher(ptr ptr) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a343274087..fba785c2b6 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -95,6 +95,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); extern IMAGE_NT_HEADERS __wine_spec_nt_header; void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; +void (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; @@ -833,6 +834,7 @@ static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) ERR( "%s not found\n", #name ) GET_FUNC( DbgUiRemoteBreakin ); + GET_FUNC( KiRaiseUserExceptionDispatcher ); GET_FUNC( KiUserExceptionDispatcher ); GET_FUNC( LdrInitializeThunk ); GET_FUNC( RtlUserThreadStart ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 19f742c200..60883bfa39 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -72,6 +72,7 @@ static const UINT_PTR page_size = 0x1000; /* callbacks to PE ntdll from the Unix side */ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; +extern void (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Use a syscall thunk for NtClose().
by Alexandre Julliard 21 Jul '20

21 Jul '20

Module: wine Branch: master Commit: 4752e252ea6ee084b679a9b9551a1c55f8744451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4752e252ea6ee084b679a9b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:50:36 2020 +0200 ntdll: Use a syscall thunk for NtClose(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 - dlls/ntdll/ntdll.spec | 4 +-- dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/om.c | 90 ------------------------------------------------ dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/server.c | 9 +++++ dlls/ntdll/unixlib.h | 3 +- 7 files changed, 12 insertions(+), 98 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index eed8d10f0b..bc8215b6bf 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -24,7 +24,6 @@ C_SRCS = \ locale.c \ misc.c \ nt.c \ - om.c \ path.c \ printf.c \ process.c \ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0bfe3d3545..ff1433be40 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -150,7 +150,7 @@ @ stdcall -syscall NtCancelTimer(long ptr) @ stdcall -syscall NtClearEvent(long) @ stdcall -syscall NtClearPowerRequest(long long) -@ stdcall NtClose(long) +@ stdcall -syscall NtClose(long) @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys # @ stub NtCompareTokens @@ -1139,7 +1139,7 @@ @ stdcall -private -syscall ZwCancelTimer(long ptr) NtCancelTimer @ stdcall -private -syscall ZwClearEvent(long) NtClearEvent @ stdcall -private -syscall ZwClearPowerRequest(long long) NtClearPowerRequest -@ stdcall -private ZwClose(long) NtClose +@ stdcall -private -syscall ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm # @ stub ZwCompactKeys # @ stub ZwCompareTokens diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1f27cd100a..d845416e95 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -44,8 +44,6 @@ static const UINT_PTR page_size = 0x1000; extern UINT_PTR page_size DECLSPEC_HIDDEN; #endif -extern NTSTATUS close_handle( HANDLE ) DECLSPEC_HIDDEN; - /* exceptions */ extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c deleted file mode 100644 index 8c8f2a4297..0000000000 --- a/dlls/ntdll/om.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Object management functions - * - * Copyright 1999, 2000 Juergen Schmied - * Copyright 2005 Vitaliy Margolen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> -#include <stdlib.h> -#include <string.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "wine/debug.h" -#include "windef.h" -#include "winternl.h" -#include "ntdll_misc.h" -#include "wine/server.h" -#include "wine/exception.h" - - -/* - * Generic object functions - */ - -static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) -{ - EXCEPTION_RECORD *rec = eptr->ExceptionRecord; - return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; -} - -/* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ -NTSTATUS close_handle( HANDLE handle ) -{ - DWORD_PTR debug_port; - NTSTATUS ret = unix_funcs->NtClose( handle ); - - if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged && - !NtQueryInformationProcess( NtCurrentProcess(), ProcessDebugPort, &debug_port, - sizeof(debug_port), NULL) && debug_port) - { - __TRY - { - EXCEPTION_RECORD record; - record.ExceptionCode = EXCEPTION_INVALID_HANDLE; - record.ExceptionFlags = 0; - record.ExceptionRecord = NULL; - record.ExceptionAddress = NULL; - record.NumberParameters = 0; - RtlRaiseException( &record ); - } - __EXCEPT(invalid_handle_exception_handler) - { - } - __ENDTRY - } - - return ret; -} - -/************************************************************************** - * NtClose [NTDLL.@] - * - * Close a handle reference to an object. - * - * PARAMS - * Handle [I] handle to close - * - * RETURNS - * Success: ERROR_SUCCESS. - * Failure: An NTSTATUS error code. - */ -NTSTATUS WINAPI NtClose( HANDLE Handle ) -{ - return close_handle( Handle ); -} diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index fba785c2b6..99c70b400a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1360,7 +1360,6 @@ static double CDECL ntdll_tan( double d ) { return tan( d ); } */ static struct unix_funcs unix_funcs = { - NtClose, NtCurrentTeb, NtGetContextThread, NtQueryPerformanceCounter, diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 452094ff5d..21817ad159 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1629,6 +1629,7 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE */ NTSTATUS WINAPI NtClose( HANDLE handle ) { + HANDLE port; NTSTATUS ret; int fd = remove_fd_from_cache( handle ); @@ -1639,5 +1640,13 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) } SERVER_END_REQ; if (fd != -1) close( fd ); + + if (ret != STATUS_INVALID_HANDLE || !handle) return ret; + if (!NtCurrentTeb()->Peb->BeingDebugged) return ret; + if (!NtQueryInformationProcess( NtCurrentProcess(), ProcessDebugPort, &port, sizeof(port), NULL) && port) + { + NtCurrentTeb()->ExceptionCode = ret; + pKiRaiseUserExceptionDispatcher(); + } return ret; } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index e4206762b1..d7487feafc 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,12 +28,11 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 88 +#define NTDLL_UNIXLIB_VERSION 89 struct unix_funcs { /* Nt* functions */ - NTSTATUS (WINAPI *NtClose)( HANDLE handle ); TEB * (WINAPI *NtCurrentTeb)(void); NTSTATUS (WINAPI *NtGetContextThread)( HANDLE handle, CONTEXT *context ); NTSTATUS (WINAPI *NtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency );

1 0