wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Gijs Vermeulen : msvcp110: Add more exports.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: e8f406921f0b9254276d212cdb0aec2eeca7dbaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8f406921f0b9254276d212c… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Tue Oct 1 14:23:11 2019 +0200 msvcp110: Add more exports. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 00c3707ea4..eebc430b1e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1572,8 +1572,8 @@ @ cdecl -arch=win64 ?_Launch@_Pad@std@@QEAAXPEAU_Thrd_imp_t@@@Z(ptr ptr) _Pad__Launch @ cdecl -arch=win32 ?_Link@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Link @ cdecl -arch=win64 ?_Link@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Link -@ stub -arch=win32 ?_Link@sys@tr2@std@@YAHPB_W0@Z -@ stub -arch=win64 ?_Link@sys@tr2@std@@YAHPEB_W0@Z +@ cdecl -arch=win32 ?_Link@sys@tr2@std@@YAHPB_W0@Z(wstr wstr) tr2_sys__Link_wchar +@ cdecl -arch=win64 ?_Link@sys@tr2@std@@YAHPEB_W0@Z(wstr wstr) tr2_sys__Link_wchar @ cdecl -arch=win32 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPAV123@PAVfacet@23@I@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win64 ?_Locimp_Addfac@_Locimp@locale@std@@CAXPEAV123@PEAVfacet@23@_K@Z(ptr ptr long) locale__Locimp__Locimp_Addfac @ cdecl -arch=win32 ?_Locimp_ctor@_Locimp@locale@std@@CAXPAV123@ABV123@@Z(ptr ptr) locale__Locimp__Locimp_ctor @@ -1773,8 +1773,8 @@ @ cdecl -arch=win64 ?_Swap_all@_Container_base12@std@@QEAAXAEAU12@@Z(ptr ptr) _Container_base12__Swap_all @ cdecl -arch=win32 ?_Symlink@sys@tr2@std@@YAHPBD0@Z(str str) tr2_sys__Symlink @ cdecl -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEBD0@Z(str str) tr2_sys__Symlink -@ stub -arch=win32 ?_Symlink@sys@tr2@std@@YAHPB_W0@Z -@ stub -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEB_W0@Z +@ cdecl -arch=win32 ?_Symlink@sys@tr2@std@@YAHPB_W0@Z(wstr wstr) tr2_sys__Symlink_wchar +@ cdecl -arch=win64 ?_Symlink@sys@tr2@std@@YAHPEB_W0@Z(wstr wstr) tr2_sys__Symlink_wchar @ extern ?_Sync@ios_base@std@@0_NA ios_base_Sync @ cdecl -arch=win32 ?_Syserror_map@std@@YAPBDH@Z(long) _Syserror_map @ cdecl -arch=win64 ?_Syserror_map@std@@YAPEBDH@Z(long) _Syserror_map @@ -1807,8 +1807,8 @@ @ cdecl -arch=win64 ?_Tidy@ios_base@std@@AEAAXXZ(ptr) ios_base_Tidy @ cdecl -arch=win32 ?_Unlink@sys@tr2@std@@YAHPBD@Z(str) tr2_sys__Unlink @ cdecl -arch=win64 ?_Unlink@sys@tr2@std@@YAHPEBD@Z(str) tr2_sys__Unlink -@ stub -arch=win32 ?_Unlink@sys@tr2@std@@YAHPB_W@Z -@ stub -arch=win64 ?_Unlink@sys@tr2@std@@YAHPEB_W@Z +@ cdecl -arch=win32 ?_Unlink@sys@tr2@std@@YAHPB_W@Z(wstr) tr2_sys__Unlink_wchar +@ cdecl -arch=win64 ?_Unlink@sys@tr2@std@@YAHPEB_W@Z(wstr) tr2_sys__Unlink_wchar @ cdecl -arch=arm ?_Unlock@?$basic_streambuf@DU?$char_traits@D@std@@@std@@UAAXXZ(ptr) basic_streambuf_char__Unlock @ thiscall -arch=i386 ?_Unlock@?$basic_streambuf@DU?$char_traits@D@std@@@std@@UAEXXZ(ptr) basic_streambuf_char__Unlock @ cdecl -arch=win64 ?_Unlock@?$basic_streambuf@DU?$char_traits@D@std@@@std@@UEAAXXZ(ptr) basic_streambuf_char__Unlock @@ -3732,7 +3732,7 @@ @ cdecl _Cnd_broadcast(ptr) @ cdecl _Cnd_destroy(ptr) @ cdecl _Cnd_do_broadcast_at_thread_exit() -@ cdecl _Cnd_init(ptr) +@ cdecl _Cnd_init(ptr) @ cdecl _Cnd_register_at_thread_exit(ptr ptr ptr) @ cdecl _Cnd_signal(ptr) @ cdecl _Cnd_timedwait(ptr ptr ptr) @@ -3891,9 +3891,9 @@ @ stub _Xp_setw @ stub _Xp_sqrtx @ stub _Xp_subx -@ stub _Xtime_diff_to_millis +@ cdecl _Xtime_diff_to_millis(ptr) @ cdecl _Xtime_diff_to_millis2(ptr ptr) -@ cdecl _Xtime_get_ticks() +@ cdecl -ret64 _Xtime_get_ticks() @ stub __Wcrtomb_lk # extern _Zero @ cdecl towctrans(long long)

1 0

Vijay Kiran Kamuju : msvcrt: Implement %F format for strftime.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 5da8af40dd70344440098350570dee025bce563c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da8af40dd70344440098350… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Oct 1 11:51:08 2019 +0200 msvcrt: Implement %F format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 13 +++++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 26 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 1bc9f3802b..016c9775de 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -613,6 +613,11 @@ static void test_strftime(void) ok(retA == 0, "expected 0, got %ld\n", retA); ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%F", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 7fe8529518..450663fd1f 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1170,6 +1170,19 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) return 0; break; + case 'F': + tmp = 1900+mstm->tm_year; + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999)) + return 0; + if(ret < max) + str[ret++] = '-'; + if(!strftime_int(str, &ret, max, mstm->tm_mon+1, alternate ? 0 : 2, 1, 12)) + return 0; + if(ret < max) + str[ret++] = '-'; + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + return 0; + break; #endif case 'H': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 77221566b5..c58b631565 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -903,6 +903,14 @@ static void test_strftime(void) ok(retA == 6, "expected 6, got %d\n", (int)retA); ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%F", &epoch); + ok(retA == 10, "expected 10, got %d\n", (int)retA); + ok(!strcmp(bufA, "1970-01-01"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#F", &epoch); + ok(retA == 8, "expected 8, got %d\n", (int)retA); + ok(!strcmp(bufA, "1970-1-1"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%R", &epoch); ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "00:00"), "got %s\n", bufA);

1 0

Vijay Kiran Kamuju : msvcrt: Implement %D format for strftime.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 1ed44b355425f048328e919ca6804fe46686c79b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ed44b355425f048328e919c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Oct 1 11:51:07 2019 +0200 msvcrt: Implement %D format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 14 ++++++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 27 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index faf1a6dcb4..1bc9f3802b 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%D", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%R", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index c72b3ed21e..7fe8529518 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1157,6 +1157,20 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; break; +#if _MSVCR_VER>=140 + case 'D': + if(!strftime_int(str, &ret, max, mstm->tm_mon+1, alternate ? 0 : 2, 1, 12)) + return 0; + if(ret < max) + str[ret++] = '/'; + if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) + return 0; + if(ret < max) + str[ret++] = '/'; + if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99)) + return 0; + break; +#endif case 'H': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 02ea1297bb..77221566b5 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -895,6 +895,14 @@ static void test_strftime(void) char bufA[256]; size_t retA; + retA = p_strftime(bufA, sizeof(bufA), "%D", &epoch); + ok(retA == 8, "expected 8, got %d\n", (int)retA); + ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#D", &epoch); + ok(retA == 6, "expected 6, got %d\n", (int)retA); + ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%R", &epoch); ok(retA == 5, "expected 5, got %d\n", (int)retA); ok(!strcmp(bufA, "00:00"), "got %s\n", bufA);

1 0

Nikolay Sivov : include: Add Media Session capabilities flags definition.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: f359c39b2c19c4918ec7dec0f2efd31a713fcf80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f359c39b2c19c4918ec7dec0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 1 12:56:10 2019 +0300 include: Add Media Session capabilities flags definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 346bd38d92..43f5cd6087 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -380,6 +380,14 @@ typedef enum MF_TOPOSTATUS_ENDED = 400, } MF_TOPOSTATUS; +/* Media Session capabilities. */ +#define MFSESSIONCAP_START 0x00000001 +#define MFSESSIONCAP_SEEK 0x00000002 +#define MFSESSIONCAP_PAUSE 0x00000004 +#define MFSESSIONCAP_RATE_FORWARD 0x00000010 +#define MFSESSIONCAP_RATE_REVERSE 0x00000020 +#define MFSESSIONCAP_DOES_NOT_USE_NETWORK 0x00000040 + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue);

1 0

Alexandre Julliard : kernel32: Move Get/SetDllDirectory() implementation to ntdll.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: a0a2b25a444110d742433c5f10e2e02092749e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a2b25a444110d742433c5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 13:59:51 2019 +0200 kernel32: Move Get/SetDllDirectory() implementation to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 99 ++++++++++++++++++++++++-------------------- dlls/kernel32/tests/module.c | 54 ++++++++++++++++++++---- dlls/ntdll/loader.c | 49 ++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 + include/winternl.h | 6 ++- 5 files changed, 154 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a0a2b25a444110d74243…

1 0

Alexandre Julliard : kernel32: Use RtlGetSearchPath() in SearchPathW() implementation.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 6113c468568e20c9e1c66f93791560c7e85193b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6113c468568e20c9e1c66f93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 09:35:59 2019 +0200 kernel32: Use RtlGetSearchPath() in SearchPathW() implementation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 93 ++++------------------------------------------------ 1 file changed, 6 insertions(+), 87 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index d5736a2d81..b580e36756 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 -static int path_safe_mode = -1; /* path mode set by SetSearchPathMode */ - /* check if a file name is for an executable file (.exe or .com) */ static inline BOOL is_executable( const WCHAR *name ) { @@ -256,51 +254,6 @@ DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath, DWORD shortlen return copy_filename_WtoA( shortpathW, shortpath, shortlen ); } -/*********************************************************************** - * get_path_safe_mode - */ -static BOOL get_path_safe_mode(void) -{ - static const WCHAR keyW[] = {'\\','R','e','g','i','s','t','r','y','\\', - 'M','a','c','h','i','n','e','\\', - 'S','y','s','t','e','m','\\', - 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', - 'C','o','n','t','r','o','l','\\', - 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; - static const WCHAR valueW[] = {'S','a','f','e','P','r','o','c','e','s','s','S','e','a','r','c','h','M','o','d','e',0}; - - if (path_safe_mode == -1) - { - char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; - KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buffer; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING nameW; - HANDLE hkey; - DWORD size = sizeof(buffer); - BOOL mode = FALSE; - - attr.Length = sizeof(attr); - attr.RootDirectory = 0; - attr.ObjectName = &nameW; - attr.Attributes = 0; - attr.SecurityDescriptor = NULL; - attr.SecurityQualityOfService = NULL; - - RtlInitUnicodeString( &nameW, keyW ); - if (!NtOpenKey( &hkey, KEY_READ, &attr )) - { - RtlInitUnicodeString( &nameW, valueW ); - if (!NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, buffer, size, &size ) && - info->Type == REG_DWORD && info->DataLength == sizeof(DWORD)) - mode = !!*(DWORD *)info->Data; - NtClose( hkey ); - } - InterlockedCompareExchange( &path_safe_mode, mode, -1 ); - } - return path_safe_mode != 0; -} - - /*********************************************************************** * contains_pathW * @@ -536,23 +489,14 @@ DWORD WINAPI SearchPathW( LPCWSTR path, LPCWSTR name, LPCWSTR ext, DWORD buflen, ret = req_len + 1; HeapFree( GetProcessHeap(), 0, dll_path ); - HeapFree( GetProcessHeap(), 0, search ); } - else + else if (!RtlGetSearchPath( &dll_path )) { - if ((dll_path = MODULE_get_dll_load_path( NULL, get_path_safe_mode() ))) - { - ret = RtlDosSearchPath_U( dll_path, name, NULL, buflen * sizeof(WCHAR), - buffer, lastpart ) / sizeof(WCHAR); - HeapFree( GetProcessHeap(), 0, dll_path ); - HeapFree( GetProcessHeap(), 0, search ); - } - else - { - SetLastError( ERROR_OUTOFMEMORY ); - return 0; - } + ret = RtlDosSearchPath_U( dll_path, name, NULL, buflen * sizeof(WCHAR), + buffer, lastpart ) / sizeof(WCHAR); + RtlReleasePath( dll_path ); } + HeapFree( GetProcessHeap(), 0, search ); } if (!ret) SetLastError( ERROR_FILE_NOT_FOUND ); @@ -1393,30 +1337,5 @@ BOOL WINAPI CheckNameLegalDOS8Dot3W(const WCHAR *name, char *oemname, DWORD oemn */ BOOL WINAPI SetSearchPathMode( DWORD flags ) { - int val; - - switch (flags) - { - case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE: - val = 1; - break; - case BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE: - val = 0; - break; - case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT: - InterlockedExchange( &path_safe_mode, 2 ); - return TRUE; - default: - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } - - for (;;) - { - int prev = path_safe_mode; - if (prev == 2) break; /* permanently set */ - if (InterlockedCompareExchange( &path_safe_mode, val, prev ) == prev) return TRUE; - } - SetLastError( ERROR_ACCESS_DENIED ); - return FALSE; + return set_ntstatus( RtlSetSearchPathMode( flags )); }

1 0

Alexandre Julliard : ntdll: Implement RtlGetSearchPath().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 5f938bb51b63674a6a7333f89bd90fe7b2e4c539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f938bb51b63674a6a7333f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 09:33:52 2019 +0200 ntdll: Implement RtlGetSearchPath(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 98 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/loader.c | 89 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 + include/winternl.h | 4 +- 4 files changed, 189 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5f938bb51b63674a6a73…

1 0

Alexandre Julliard : ntdll: Implement RtlSetSearchPathMode().
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 444933ae0499bbaf5d57f2b4f76846cc53db4d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444933ae0499bbaf5d57f2b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 09:32:46 2019 +0200 ntdll: Implement RtlSetSearchPathMode(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 55 +++++++++++++++++++++++++++++++++++++++++---------- dlls/ntdll/ntdll.spec | 1 + include/winternl.h | 1 + 3 files changed, 47 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0ab25dcc51..4e6c51a702 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -71,6 +71,7 @@ const WCHAR system_dir[] = {'C',':','\\','w','i','n','d','o','w','s','\\', static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ +static ULONG path_safe_mode; /* path mode set by RtlSetSearchPathMode */ struct ldr_notification { @@ -3619,6 +3620,7 @@ static void load_global_options(void) 'C','o','n','t','r','o','l','\\', 'S','e','s','s','i','o','n',' ','M','a','n','a','g','e','r',0}; static const WCHAR globalflagW[] = {'G','l','o','b','a','l','F','l','a','g',0}; + static const WCHAR safesearchW[] = {'S','a','f','e','P','r','o','c','e','s','s','S','e','a','r','c','h','M','o','d','e',0}; static const WCHAR critsectW[] = {'C','r','i','t','i','c','a','l','S','e','c','t','i','o','n','T','i','m','e','o','u','t',0}; static const WCHAR heapresW[] = {'H','e','a','p','S','e','g','m','e','n','t','R','e','s','e','r','v','e',0}; static const WCHAR heapcommitW[] = {'H','e','a','p','S','e','g','m','e','n','t','C','o','m','m','i','t',0}; @@ -3641,21 +3643,22 @@ static void load_global_options(void) if (NtOpenKey( &hkey, KEY_QUERY_VALUE, &attr )) return; query_dword_option( hkey, globalflagW, &NtCurrentTeb()->Peb->NtGlobalFlag ); + query_dword_option( hkey, safesearchW, &path_safe_mode ); - query_dword_option( hkey, critsectW, &value ); - NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; + if (!query_dword_option( hkey, critsectW, &value )) + NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart = (ULONGLONG)value * -10000000; - query_dword_option( hkey, heapresW, &value ); - NtCurrentTeb()->Peb->HeapSegmentReserve = value; + if (!query_dword_option( hkey, heapresW, &value )) + NtCurrentTeb()->Peb->HeapSegmentReserve = value; - query_dword_option( hkey, heapcommitW, &value ); - NtCurrentTeb()->Peb->HeapSegmentCommit = value; + if (!query_dword_option( hkey, heapcommitW, &value )) + NtCurrentTeb()->Peb->HeapSegmentCommit = value; - query_dword_option( hkey, decommittotalW, &value ); - NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; + if (!query_dword_option( hkey, decommittotalW, &value )) + NtCurrentTeb()->Peb->HeapDeCommitTotalFreeThreshold = value; - query_dword_option( hkey, decommitfreeW, &value ); - NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; + if (!query_dword_option( hkey, decommitfreeW, &value )) + NtCurrentTeb()->Peb->HeapDeCommitFreeBlockThreshold = value; NtClose( hkey ); } @@ -3754,6 +3757,38 @@ PVOID WINAPI RtlPcToFileHeader( PVOID pc, PVOID *address ) } +/************************************************************************* + * RtlSetSearchPathMode (NTDLL.@) + */ +NTSTATUS WINAPI RtlSetSearchPathMode( ULONG flags ) +{ + int val; + + switch (flags) + { + case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE: + val = 1; + break; + case BASE_SEARCH_PATH_DISABLE_SAFE_SEARCHMODE: + val = 0; + break; + case BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE | BASE_SEARCH_PATH_PERMANENT: + interlocked_xchg( (int *)&path_safe_mode, 2 ); + return STATUS_SUCCESS; + default: + return STATUS_INVALID_PARAMETER; + } + + for (;;) + { + int prev = path_safe_mode; + if (prev == 2) break; /* permanently set */ + if (interlocked_cmpxchg( (int *)&path_safe_mode, val, prev ) == prev) return STATUS_SUCCESS; + } + return STATUS_ACCESS_DENIED; +} + + /*********************************************************************** * NtLoadDriver (NTDLL.@) * ZwLoadDriver (NTDLL.@) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 5a6f4e4ed4..de2a632b17 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -926,6 +926,7 @@ @ stub RtlSetPropertyNames @ stub RtlSetPropertySetClassId @ stdcall RtlSetSaclSecurityDescriptor(ptr long ptr long) +@ stdcall RtlSetSearchPathMode(long) # @ stub RtlSetSecurityDescriptorRMControl @ stub RtlSetSecurityObject # @ stub RtlSetSecurityObjectEx diff --git a/include/winternl.h b/include/winternl.h index 4d58aebe21..fde8a64630 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2836,6 +2836,7 @@ NTSYSAPI NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE,PRTL_OVERLAPPED_COMP NTSYSAPI void WINAPI RtlSetLastWin32Error(DWORD); NTSYSAPI void WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS); NTSYSAPI NTSTATUS WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlSetSearchPathMode(ULONG); NTSYSAPI NTSTATUS WINAPI RtlSetThreadErrorMode(DWORD,LPDWORD); NTSYSAPI NTSTATUS WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*); NTSYSAPI void WINAPI RtlSetUnhandledExceptionFilter(PRTL_EXCEPTION_FILTER);

1 0

Alexandre Julliard : kernel32: Add set_ntstatus() helper.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: 14fbecee65c74a175c64d81ee76611f46c671dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=14fbecee65c74a175c64d81e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 1 09:36:16 2019 +0200 kernel32: Add set_ntstatus() helper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/atom.c | 119 +++++++++------------------------------- dlls/kernel32/cpu.c | 7 +-- dlls/kernel32/format_msg.c | 7 +-- dlls/kernel32/kernel_private.h | 6 ++ dlls/kernel32/locale.c | 4 +- dlls/kernel32/module.c | 32 +++-------- dlls/kernel32/path.c | 23 ++------ dlls/kernel32/process.c | 121 +++++++++++------------------------------ dlls/kernel32/time.c | 52 +++--------------- dlls/kernel32/volume.c | 45 ++++----------- 10 files changed, 102 insertions(+), 314 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14fbecee65c74a175c64…

1 0

Matteo Bruni : user32: Don't go past the end of the animated cursor data.
by Alexandre Julliard 01 Oct '19

01 Oct '19

Module: wine Branch: master Commit: aaecc404642877074550ff1c156c32bc9888da74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaecc404642877074550ff1c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 30 23:11:14 2019 +0200 user32: Don't go past the end of the animated cursor data. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 3214746664..9c61d7ff30 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1451,6 +1451,8 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ } ptr += sizeof(DWORD); + if (ptr >= end) + break; ptr += (*(const DWORD *)ptr + 1) & ~1; ptr += sizeof(DWORD); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019