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

Daniel Lehman : msvcrt: Treat large exponent as overflow in strtod.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: ee65859b7f007f64104242dfebeefc61385aaf3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee65859b7f007f64104242df… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Jul 16 13:10:37 2020 +0200 msvcrt: Treat large exponent as overflow in strtod. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 2 +- dlls/msvcrt/tests/string.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 49cc8e40ae..a654bb1dde 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -423,7 +423,7 @@ static double make_double(int sign, int exp, ULONGLONG m, enum round round, int } } - if (exp >= 1<<EXP_BITS) + if (exp >= (1<<EXP_BITS)-1) { if (err) *err = MSVCRT_ERANGE; return sign * INFINITY; diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 8a2d678b63..ad41ad4d24 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1956,7 +1956,12 @@ static void test__strtod(void) { "0.1d238", 7, 0.1e238 }, { "0.1D-4736", 9, 0, ERANGE }, { "3.4028234663852887e38", 21, FLT_MAX }, + { "1.1754943508222875e-38", 22, FLT_MIN }, { "1.7976931348623158e+308", 23, DBL_MAX }, + { "1.7976931348623159e+308", 23, INFINITY, ERANGE }, + { "2.2250738585072014e-308", 23, DBL_MIN }, + { "-1.7976931348623158e+308", 24, -DBL_MAX }, + { "-1.7976931348623159e+308", 24, -INFINITY, ERANGE }, { "00", 2, 0 }, { "00.", 3, 0 }, { ".00", 3, 0 },

1 0

Piotr Caban : msvcrt: Add _ismbcgraph_l implementation.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 71cd3d5e8ce831abe5f601671b307ecff8692f01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71cd3d5e8ce831abe5f60167… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 16 15:33:03 2020 +0200 msvcrt: Add _ismbcgraph_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-multibyte-l1-1-0.spec | 2 +- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 11 +++++++++-- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 11 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec index 06467a76d2..0137c7e649 100644 --- a/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec +++ b/dlls/api-ms-win-crt-multibyte-l1-1-0/api-ms-win-crt-multibyte-l1-1-0.spec @@ -33,7 +33,7 @@ @ cdecl _ismbcdigit(long) ucrtbase._ismbcdigit @ cdecl _ismbcdigit_l(long ptr) ucrtbase._ismbcdigit_l @ cdecl _ismbcgraph(long) ucrtbase._ismbcgraph -@ stub _ismbcgraph_l +@ cdecl _ismbcgraph_l(long ptr) ucrtbase._ismbcgraph_l @ cdecl _ismbchira(long) ucrtbase._ismbchira @ stub _ismbchira_l @ cdecl _ismbckata(long) ucrtbase._ismbckata diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 90ae182635..6ddcbe2c7a 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -406,7 +406,7 @@ @ cdecl _o__ismbcdigit(long) ucrtbase._o__ismbcdigit @ cdecl _o__ismbcdigit_l(long ptr) ucrtbase._o__ismbcdigit_l @ cdecl _o__ismbcgraph(long) ucrtbase._o__ismbcgraph -@ stub _o__ismbcgraph_l +@ cdecl _o__ismbcgraph_l(long ptr) ucrtbase._o__ismbcgraph_l @ cdecl _o__ismbchira(long) ucrtbase._o__ismbchira @ stub _o__ismbchira_l @ cdecl _o__ismbckata(long) ucrtbase._o__ismbckata diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a0a54aee2..9d78aa042f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -981,7 +981,7 @@ @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) -@ stub _ismbcgraph_l +@ cdecl _ismbcgraph_l(long ptr) @ cdecl _ismbchira(long) @ stub _ismbchira_l @ cdecl _ismbckata(long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a2e63aab46..1512804543 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1327,7 +1327,7 @@ @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) -@ stub _ismbcgraph_l +@ cdecl _ismbcgraph_l(long ptr) @ cdecl _ismbchira(long) @ stub _ismbchira_l @ cdecl _ismbckata(long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 073741e76f..d8be0af00d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1332,7 +1332,7 @@ @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) -@ stub _ismbcgraph_l +@ cdecl _ismbcgraph_l(long ptr) @ cdecl _ismbchira(long) @ stub _ismbchira_l @ cdecl _ismbckata(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5280a38b87..513ed375e1 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -653,7 +653,7 @@ @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) -@ stub _ismbcgraph_l +@ cdecl _ismbcgraph_l(long ptr) @ cdecl _ismbchira(long) @ stub _ismbchira_l @ cdecl _ismbckata(long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index fefcfa76b0..e39ecb900d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -631,7 +631,7 @@ @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) -@ stub _ismbcgraph_l +@ cdecl _ismbcgraph_l(long ptr) @ cdecl _ismbchira(long) @ stub _ismbchira_l @ cdecl _ismbckata(long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index c6caab19f8..813092a12f 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1443,13 +1443,20 @@ int CDECL _ismbcdigit(unsigned int ch) return _ismbcdigit_l( ch, NULL ); } +/********************************************************************* + * _ismbcgraph_l(MSVCRT.@) + */ +int CDECL _ismbcgraph_l(unsigned int ch, MSVCRT__locale_t locale) +{ + return MSVCRT__iswgraph_l( msvcrt_mbc_to_wc_l(ch, locale), locale ); +} + /********************************************************************* * _ismbcgraph(MSVCRT.@) */ int CDECL _ismbcgraph(unsigned int ch) { - MSVCRT_wchar_t wch = msvcrt_mbc_to_wc( ch ); - return (get_char_typeW( wch ) & (C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT | C1_ALPHA)); + return _ismbcgraph_l( ch, NULL ); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 973b928888..ffd417be4e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1203,6 +1203,7 @@ int __cdecl MSVCRT_towlower(MSVCRT_wint_t); int __cdecl MSVCRT_towupper(MSVCRT_wint_t); int __cdecl MSVCRT__iswalnum_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswdigit_l(MSVCRT_wchar_t, MSVCRT__locale_t); +int __cdecl MSVCRT__iswgraph_l(MSVCRT_wchar_t, MSVCRT__locale_t); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 273ced9cd7..477afdd252 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -599,7 +599,7 @@ @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) -# stub _ismbcgraph_l(long ptr) +@ cdecl _ismbcgraph_l(long ptr) @ cdecl _ismbchira(long) # stub _ismbchira_l(long ptr) @ cdecl _ismbckata(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 9bd4832443..9d4f557c32 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -471,7 +471,7 @@ @ cdecl _ismbcdigit(long) @ cdecl _ismbcdigit_l(long ptr) @ cdecl _ismbcgraph(long) -@ stub _ismbcgraph_l +@ cdecl _ismbcgraph_l(long ptr) @ cdecl _ismbchira(long) @ stub _ismbchira_l @ cdecl _ismbckata(long) @@ -1070,7 +1070,7 @@ @ cdecl _o__ismbcdigit(long) _ismbcdigit @ cdecl _o__ismbcdigit_l(long ptr) _ismbcdigit_l @ cdecl _o__ismbcgraph(long) _ismbcgraph -@ stub _o__ismbcgraph_l +@ cdecl _o__ismbcgraph_l(long ptr) _ismbcgraph_l @ cdecl _o__ismbchira(long) _ismbchira @ stub _o__ismbchira_l @ cdecl _o__ismbckata(long) _ismbckata

1 0

Nikolay Sivov : comctl32/listview: Use case-insensitive compare in LVM_FINDITEM.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: ab81945d6568569ac23fad56b1bc895687feeb55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab81945d6568569ac23fad56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:38:21 2020 +0300 comctl32/listview: Use case-insensitive compare in LVM_FINDITEM. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/listview.c | 10 +++++++--- dlls/comctl32/tests/listview.c | 13 +++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index e548d3761a..4ea068ea73 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_COMCTL32_ MODULE = comctl32.dll IMPORTLIB = comctl32 -IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 +IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase DELAYIMPORTS = winmm uxtheme EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1092a6ce9b..6cee291dd6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -140,6 +140,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -6313,6 +6314,7 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, INT nItem = nStart + 1, nLast = infoPtr->nItemCount, nNearestItem = -1; ULONG xdist, ydist, dist, mindist = 0x7fffffff; POINT Position, Destination; + int search_len = 0; LVITEMW lvItem; /* Search in virtual listviews should be done by application, not by @@ -6378,6 +6380,9 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, nItem = bNearest ? -1 : nStart + 1; + if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) + search_len = lstrlenW(lpFindInfo->psz); + again: for (; nItem < nLast; nItem++) { @@ -6398,12 +6403,11 @@ again: { if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) { - WCHAR *p = wcsstr(lvItem.pszText, lpFindInfo->psz); - if (!p || p != lvItem.pszText) continue; + if (StrCmpNIW(lvItem.pszText, lpFindInfo->psz, search_len)) continue; } else { - if (lstrcmpW(lvItem.pszText, lpFindInfo->psz) != 0) continue; + if (StrCmpIW(lvItem.pszText, lpFindInfo->psz)) continue; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 20b9873d30..c19de7f03f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5366,6 +5366,19 @@ static void test_finditem(void) r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(0, r); + /* Case sensitivity. */ + strcpy(f, "Foo"); + fi.flags = LVFI_STRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + + strcpy(f, "F"); + fi.flags = LVFI_SUBSTRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + DestroyWindow(hwnd); }

1 0

Zebediah Figura : server: Remove no longer used unlink_object request.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 3347ad003a1f86b6d1cd83b63a8e8dac1e8e784f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3347ad003a1f86b6d1cd83b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 20:27:58 2020 -0500 server: Remove no longer used unlink_object request. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 17 +---------------- server/directory.c | 12 ------------ server/protocol.def | 6 ------ server/request.h | 4 ---- server/trace.c | 8 -------- 5 files changed, 1 insertion(+), 46 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fc808774be..1176d9cbea 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4957,18 +4957,6 @@ struct get_object_type_reply -struct unlink_object_request -{ - struct request_header __header; - obj_handle_t handle; -}; -struct unlink_object_reply -{ - struct reply_header __header; -}; - - - struct get_token_impersonation_level_request { struct request_header __header; @@ -5834,7 +5822,6 @@ enum request REQ_query_symlink, REQ_get_object_info, REQ_get_object_type, - REQ_unlink_object, REQ_get_token_impersonation_level, REQ_allocate_locally_unique_id, REQ_create_device_manager, @@ -6129,7 +6116,6 @@ union generic_request struct query_symlink_request query_symlink_request; struct get_object_info_request get_object_info_request; struct get_object_type_request get_object_type_request; - struct unlink_object_request unlink_object_request; struct get_token_impersonation_level_request get_token_impersonation_level_request; struct allocate_locally_unique_id_request allocate_locally_unique_id_request; struct create_device_manager_request create_device_manager_request; @@ -6422,7 +6408,6 @@ union generic_reply struct query_symlink_reply query_symlink_reply; struct get_object_info_reply get_object_info_reply; struct get_object_type_reply get_object_type_reply; - struct unlink_object_reply unlink_object_reply; struct get_token_impersonation_level_reply get_token_impersonation_level_reply; struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; struct create_device_manager_reply create_device_manager_reply; @@ -6467,7 +6452,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 627 +#define SERVER_PROTOCOL_VERSION 628 /* ### protocol_version end ### */ diff --git a/server/directory.c b/server/directory.c index 4d38393a6c..198fc48ece 100644 --- a/server/directory.c +++ b/server/directory.c @@ -534,18 +534,6 @@ DECL_HANDLER(get_directory_entry) } } -/* unlink a named object */ -DECL_HANDLER(unlink_object) -{ - struct object *obj = get_handle_obj( current->process, req->handle, 0, NULL ); - - if (obj) - { - unlink_named_object( obj ); - release_object( obj ); - } -} - /* query object type name information */ DECL_HANDLER(get_object_type) { diff --git a/server/protocol.def b/server/protocol.def index 9c8aec6960..4a59c32728 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3442,12 +3442,6 @@ struct handle_info @END -/* Unlink a named object */ -(a)REQ(unlink_object) - obj_handle_t handle; /* handle to the object */ -(a)END - - /* Query the impersonation level of an impersonation token */ @REQ(get_token_impersonation_level) obj_handle_t handle; /* handle to the object */ diff --git a/server/request.h b/server/request.h index 2dfa76f939..31ca632669 100644 --- a/server/request.h +++ b/server/request.h @@ -366,7 +366,6 @@ DECL_HANDLER(open_symlink); DECL_HANDLER(query_symlink); DECL_HANDLER(get_object_info); DECL_HANDLER(get_object_type); -DECL_HANDLER(unlink_object); DECL_HANDLER(get_token_impersonation_level); DECL_HANDLER(allocate_locally_unique_id); DECL_HANDLER(create_device_manager); @@ -660,7 +659,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_query_symlink, (req_handler)req_get_object_info, (req_handler)req_get_object_type, - (req_handler)req_unlink_object, (req_handler)req_get_token_impersonation_level, (req_handler)req_allocate_locally_unique_id, (req_handler)req_create_device_manager, @@ -2162,8 +2160,6 @@ C_ASSERT( FIELD_OFFSET(struct get_object_type_request, handle) == 12 ); C_ASSERT( sizeof(struct get_object_type_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_object_type_reply, total) == 8 ); C_ASSERT( sizeof(struct get_object_type_reply) == 16 ); -C_ASSERT( FIELD_OFFSET(struct unlink_object_request, handle) == 12 ); -C_ASSERT( sizeof(struct unlink_object_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_impersonation_level_request, handle) == 12 ); C_ASSERT( sizeof(struct get_token_impersonation_level_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_token_impersonation_level_reply, impersonation_level) == 8 ); diff --git a/server/trace.c b/server/trace.c index 5fd6811195..585ac50a0f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4123,11 +4123,6 @@ static void dump_get_object_type_reply( const struct get_object_type_reply *req dump_varargs_unicode_str( ", type=", cur_size ); } -static void dump_unlink_object_request( const struct unlink_object_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - static void dump_get_token_impersonation_level_request( const struct get_token_impersonation_level_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4749,7 +4744,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_query_symlink_request, (dump_func)dump_get_object_info_request, (dump_func)dump_get_object_type_request, - (dump_func)dump_unlink_object_request, (dump_func)dump_get_token_impersonation_level_request, (dump_func)dump_allocate_locally_unique_id_request, (dump_func)dump_create_device_manager_request, @@ -5040,7 +5034,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_query_symlink_reply, (dump_func)dump_get_object_info_reply, (dump_func)dump_get_object_type_reply, - NULL, (dump_func)dump_get_token_impersonation_level_reply, (dump_func)dump_allocate_locally_unique_id_reply, (dump_func)dump_create_device_manager_reply, @@ -5331,7 +5324,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "query_symlink", "get_object_info", "get_object_type", - "unlink_object", "get_token_impersonation_level", "allocate_locally_unique_id", "create_device_manager",

1 0

Alexandre Julliard : ntdll: Use syscall thunks for virtual memory functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: e3e477e6a14fbcb153258b47d1905915dc4c1f22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e477e6a14fbcb153258b47… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:52:07 2020 +0200 ntdll: Use syscall thunks for virtual memory functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 68 +++++++++--------- dlls/ntdll/unix/loader.c | 17 ----- dlls/ntdll/unixlib.h | 36 +--------- dlls/ntdll/virtual.c | 184 ----------------------------------------------- 4 files changed, 35 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3e477e6a14fbcb15325…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for process functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 635e914bdeca3a148dab8aeabc8037a2e7ac8151 URL: https://source.winehq.org/git/wine.git/?a=commit;h=635e914bdeca3a148dab8aea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:36:17 2020 +0200 ntdll: Use syscall thunks for process functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 34 ++++++------ dlls/ntdll/process.c | 140 ----------------------------------------------- dlls/ntdll/unix/loader.c | 9 --- dlls/ntdll/unixlib.h | 19 +------ 4 files changed, 19 insertions(+), 183 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=635e914bdeca3a148dab…

1 0

Alexandre Julliard : ntdll: Use syscall thunks for thread functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 00e7d50f8bd3dccf2c34dac2501937b7d294ab76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00e7d50f8bd3dccf2c34dac2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:35:07 2020 +0200 ntdll: Use syscall thunks for thread functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 9 --- dlls/ntdll/ntdll.spec | 59 +++++++++---------- dlls/ntdll/thread.c | 146 ----------------------------------------------- dlls/ntdll/unix/loader.c | 15 ----- dlls/ntdll/unixlib.h | 23 +------- 5 files changed, 31 insertions(+), 221 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=00e7d50f8bd3dccf2c34…

1 0

Zebediah Figura : ntoskrnl.exe: Add tests for permanent objects.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 26c8fb8ce7a09698cdba73576cf924185dffd3a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c8fb8ce7a09698cdba7357… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 20:27:53 2020 -0500 ntoskrnl.exe: Add tests for permanent objects. These tests have to live in ntoskrnl, since only kernel drivers and processes running as LOCAL SYSTEM can create permanent objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 6 ++--- dlls/ntoskrnl.exe/tests/driver.c | 49 +++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6acdec5dc5..0f65490b48 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1378,7 +1378,7 @@ @ stdcall ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm @ stdcall -private ZwConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) NtConnectPort -@ stdcall -private ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject +@ stdcall ZwCreateDirectoryObject(ptr long ptr) NtCreateDirectoryObject @ stdcall ZwCreateEvent(ptr long ptr long long) NtCreateEvent @ stdcall ZwCreateFile(ptr long ptr ptr ptr long long long long ptr long) NtCreateFile @ stdcall -private ZwCreateIoCompletion(ptr long ptr long) NtCreateIoCompletion @@ -1412,11 +1412,11 @@ @ stdcall -private ZwLoadKey(ptr ptr) NtLoadKey @ stdcall -private ZwLockFile(long long ptr ptr ptr ptr ptr ptr long long) NtLockFile @ stdcall -private ZwLockVirtualMemory(long ptr ptr long) NtLockVirtualMemory -@ stdcall -private ZwMakeTemporaryObject(long) NtMakeTemporaryObject +@ stdcall ZwMakeTemporaryObject(long) NtMakeTemporaryObject @ stdcall -private ZwMapViewOfSection(long long ptr long long ptr ptr long long long) NtMapViewOfSection @ stdcall -private ZwNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) NtNotifyChangeDirectoryFile @ stdcall -private ZwNotifyChangeKey(long long ptr ptr ptr long long ptr long long) NtNotifyChangeKey -@ stdcall -private ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject +@ stdcall ZwOpenDirectoryObject(ptr long ptr) NtOpenDirectoryObject @ stdcall -private ZwOpenEvent(ptr long ptr) NtOpenEvent @ stdcall ZwOpenFile(ptr long ptr ptr long long) NtOpenFile @ stdcall -private ZwOpenJobObject(ptr long ptr) NtOpenJobObject diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index bb5bbeb4fa..0ae63ffafb 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2024,6 +2024,54 @@ static void test_process_memory(const struct test_input *test_input) ObDereferenceObject(process); } +static void test_permanence(void) +{ + OBJECT_ATTRIBUTES attr; + HANDLE handle, handle2; + UNICODE_STRING str; + NTSTATUS status; + + RtlInitUnicodeString(&str, L"\\BaseNamedObjects\\wine_test_dir"); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + attr.Attributes = OBJ_PERMANENT; + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwMakeTemporaryObject( handle ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + todo_wine ok(!status, "got %#x\n", status); + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); + + status = ZwCreateDirectoryObject( &handle, GENERIC_ALL, &attr ); + ok(!status, "got %#x\n", status); + attr.Attributes = OBJ_PERMANENT; + status = ZwOpenDirectoryObject( &handle2, 0, &attr ); + ok(status == STATUS_SUCCESS, "got %#x\n", status); + status = ZwClose( handle2 ); + ok(!status, "got %#x\n", status); + status = ZwClose( handle ); + ok(!status, "got %#x\n", status); + attr.Attributes = 0; + status = ZwOpenDirectoryObject( &handle, 0, &attr ); + ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -2080,6 +2128,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_affinity(); test_dpc(); test_process_memory(test_input); + test_permanence(); if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR;

1 0

Alexandre Julliard : ntdll: Use syscall thunks for object manager functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 0534beb331ff9f1444db47cfb3c03224c1837aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=0534beb331ff9f1444db47cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:44:54 2020 +0200 ntdll: Use syscall thunks for object manager functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 12 ++++++------ dlls/ntdll/om.c | 35 ----------------------------------- dlls/ntdll/unix/loader.c | 3 --- dlls/ntdll/unixlib.h | 9 +-------- 4 files changed, 7 insertions(+), 52 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 72bf4c25ca..4c8a1f6165 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -200,7 +200,7 @@ @ stdcall NtDeleteValueKey(long ptr) @ stdcall -syscall NtDeviceIoControlFile(long long ptr ptr ptr long ptr long ptr long) @ stdcall NtDisplayString(ptr) -@ stdcall NtDuplicateObject(long long long ptr long long long) +@ stdcall -syscall NtDuplicateObject(long long long ptr long long long) @ stdcall NtDuplicateToken(long long ptr long long ptr) # @ stub NtEnumerateBootEntries @ stub NtEnumerateBus @@ -305,7 +305,7 @@ @ stdcall NtQueryLicenseValue(ptr ptr ptr long ptr) @ stdcall NtQueryMultipleValueKey(long ptr long ptr long ptr) @ stdcall -syscall NtQueryMutant(long long ptr long ptr) -@ stdcall NtQueryObject(long long ptr long ptr) +@ stdcall -syscall NtQueryObject(long long ptr long ptr) @ stub NtQueryOpenSubKeys @ stdcall NtQueryPerformanceCounter(ptr ptr) # @ stub NtQueryPortInformationProcess @@ -376,7 +376,7 @@ @ stdcall -syscall NtSetInformationFile(long ptr ptr long long) @ stdcall -syscall NtSetInformationJobObject(long long ptr long) @ stdcall NtSetInformationKey(long long ptr long) -@ stdcall NtSetInformationObject(long long ptr long) +@ stdcall -syscall NtSetInformationObject(long long ptr long) @ stdcall -syscall NtSetInformationProcess(long long ptr long) @ stdcall -syscall NtSetInformationThread(long long ptr long) @ stdcall NtSetInformationToken(long long ptr long) @@ -1187,7 +1187,7 @@ @ stdcall -private ZwDeleteValueKey(long ptr) NtDeleteValueKey @ stdcall -private -syscall ZwDeviceIoControlFile(long long ptr ptr ptr long ptr long ptr long) NtDeviceIoControlFile @ stdcall -private ZwDisplayString(ptr) NtDisplayString -@ stdcall -private ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject +@ stdcall -private -syscall ZwDuplicateObject(long long long ptr long long long) NtDuplicateObject @ stdcall -private ZwDuplicateToken(long long ptr long long ptr) NtDuplicateToken # @ stub ZwEnumerateBootEntries @ stub ZwEnumerateBus @@ -1292,7 +1292,7 @@ @ stdcall -private ZwQueryLicenseValue(ptr ptr ptr long ptr) NtQueryLicenseValue @ stdcall -private ZwQueryMultipleValueKey(long ptr long ptr long ptr) NtQueryMultipleValueKey @ stdcall -private -syscall ZwQueryMutant(long long ptr long ptr) NtQueryMutant -@ stdcall -private ZwQueryObject(long long ptr long ptr) NtQueryObject +@ stdcall -private -syscall ZwQueryObject(long long ptr long ptr) NtQueryObject @ stub ZwQueryOpenSubKeys @ stdcall -private ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter # @ stub ZwQueryPortInformationProcess @@ -1363,7 +1363,7 @@ @ stdcall -private -syscall ZwSetInformationFile(long ptr ptr long long) NtSetInformationFile @ stdcall -private -syscall ZwSetInformationJobObject(long long ptr long) NtSetInformationJobObject @ stdcall -private ZwSetInformationKey(long long ptr long) NtSetInformationKey -@ stdcall -private ZwSetInformationObject(long long ptr long) NtSetInformationObject +@ stdcall -private -syscall ZwSetInformationObject(long long ptr long) NtSetInformationObject @ stdcall -private -syscall ZwSetInformationProcess(long long ptr long) NtSetInformationProcess @ stdcall -private -syscall ZwSetInformationThread(long long ptr long) NtSetInformationThread @ stdcall -private ZwSetInformationToken(long long ptr long) NtSetInformationToken diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 601e6ede12..2234f870d6 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -39,29 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); * Generic object functions */ -/****************************************************************************** - * NtQueryObject [NTDLL.@] - * ZwQueryObject [NTDLL.@] - */ -NTSTATUS WINAPI NtQueryObject(IN HANDLE handle, - IN OBJECT_INFORMATION_CLASS info_class, - OUT PVOID ptr, IN ULONG len, OUT PULONG used_len) -{ - return unix_funcs->NtQueryObject( handle, info_class, ptr, len, used_len ); -} - -/****************************************************************** - * NtSetInformationObject [NTDLL.@] - * ZwSetInformationObject [NTDLL.@] - * - */ -NTSTATUS WINAPI NtSetInformationObject(IN HANDLE handle, - IN OBJECT_INFORMATION_CLASS info_class, - IN PVOID ptr, IN ULONG len) -{ - return unix_funcs->NtSetInformationObject( handle, info_class, ptr, len ); -} - /****************************************************************************** * NtQuerySecurityObject [NTDLL.@] * @@ -150,18 +127,6 @@ NtQuerySecurityObject( } -/****************************************************************************** - * NtDuplicateObject [NTDLL.@] - * ZwDuplicateObject [NTDLL.@] - */ -NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, - HANDLE dest_process, PHANDLE dest, - ACCESS_MASK access, ULONG attributes, ULONG options ) -{ - return unix_funcs->NtDuplicateObject( source_process, source, dest_process, - dest, access, attributes, options ); -} - static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) { EXCEPTION_RECORD *rec = eptr->ExceptionRecord; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 6a7fe28515..a343274087 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1360,11 +1360,8 @@ static struct unix_funcs unix_funcs = { NtClose, NtCurrentTeb, - NtDuplicateObject, NtGetContextThread, - NtQueryObject, NtQueryPerformanceCounter, - NtSetInformationObject, DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 931a681e16..e4206762b1 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,22 +28,15 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 87 +#define NTDLL_UNIXLIB_VERSION 88 struct unix_funcs { /* Nt* functions */ NTSTATUS (WINAPI *NtClose)( HANDLE handle ); TEB * (WINAPI *NtCurrentTeb)(void); - NTSTATUS (WINAPI *NtDuplicateObject)( HANDLE source_process, HANDLE source, - HANDLE dest_process, HANDLE *dest, - ACCESS_MASK access, ULONG attributes, ULONG options ); NTSTATUS (WINAPI *NtGetContextThread)( HANDLE handle, CONTEXT *context ); - NTSTATUS (WINAPI *NtQueryObject)( HANDLE handle, OBJECT_INFORMATION_CLASS info_class, - void *ptr, ULONG len, ULONG *used_len ); NTSTATUS (WINAPI *NtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); - NTSTATUS (WINAPI *NtSetInformationObject)( HANDLE handle, OBJECT_INFORMATION_CLASS info_class, - void *ptr, ULONG len ); /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process );

1 0

Alexandre Julliard : ntdll: Use syscall thunks for system functions.
by Alexandre Julliard July 17, 2020

July 17, 2020

Module: wine Branch: master Commit: 40d403c926e8f96c77d067188c842c12f099f9a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d403c926e8f96c77d06718… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:43:13 2020 +0200 ntdll: Use syscall thunks for system functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 31 ------------------------------- dlls/ntdll/ntdll.spec | 20 ++++++++++---------- dlls/ntdll/time.c | 27 --------------------------- dlls/ntdll/unix/loader.c | 5 ----- dlls/ntdll/unixlib.h | 11 +---------- 5 files changed, 11 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40d403c926e8f96c77d0…

1 0