Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTOS:CC] Fix locking of CcRosVacbIncRefCount in CcRosCreateVacb (#5527)
by Doug Lyons 12 Aug '23

12 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6ca3952e08f55ae2ff13… commit e6ca3952e08f55ae2ff137e58b1f6715dbf3b481 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Aug 12 12:10:34 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 12 19:10:34 2023 +0200 [NTOS:CC] Fix locking of CcRosVacbIncRefCount in CcRosCreateVacb (#5527) CORE-17624 --- ntoskrnl/cc/view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/view.c b/ntoskrnl/cc/view.c index 25d066abd03..0e6917ea18a 100644 --- a/ntoskrnl/cc/view.c +++ b/ntoskrnl/cc/view.c @@ -776,11 +776,12 @@ CcRosCreateVacb ( } KeReleaseSpinLockFromDpcLevel(&SharedCacheMap->CacheMapLock); InsertTailList(&VacbLruListHead, &current->VacbLruListEntry); - KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); /* Reference it to allow release */ CcRosVacbIncRefCount(current); + KeReleaseQueuedSpinLock(LockQueueMasterLock, oldIrql); + return Status; }

1 0

[reactos] 01/01: [SHELL32] Implement SHFindComputer (#5524)
by Katayama Hirofumi MZ 12 Aug '23

12 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c9c634a8e4910b730393… commit 2c9c634a8e4910b7303937dac2f281bf2cb0b0f3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 12 18:17:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 12 18:17:13 2023 +0900 [SHELL32] Implement SHFindComputer (#5524) CORE-9277 --- dll/win32/shell32/stubs.cpp | 11 ----------- dll/win32/shell32/utils.cpp | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dll/win32/shell32/stubs.cpp b/dll/win32/shell32/stubs.cpp index c25d4cb1fc1..4c019e9b031 100644 --- a/dll/win32/shell32/stubs.cpp +++ b/dll/win32/shell32/stubs.cpp @@ -25,17 +25,6 @@ ShortSizeFormatW(LONGLONG llNumber) return NULL; } -/* - * Unimplemented - */ -EXTERN_C BOOL -WINAPI -SHFindComputer(LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) -{ - FIXME("SHFindComputer() stub\n"); - return FALSE; -} - /* * Unimplemented */ diff --git a/dll/win32/shell32/utils.cpp b/dll/win32/shell32/utils.cpp index e59af7f7350..c21e679a07b 100644 --- a/dll/win32/shell32/utils.cpp +++ b/dll/win32/shell32/utils.cpp @@ -66,3 +66,36 @@ SheRemoveQuotesW(LPWSTR psz) return psz; } + +/************************************************************************* + * SHFindComputer [SHELL32.91] + * + * Invokes the shell search in My Computer. Used in SHFindFiles. + * Two parameters are ignored. + */ +EXTERN_C BOOL +WINAPI +SHFindComputer(LPCITEMIDLIST pidlRoot, LPCITEMIDLIST pidlSavedSearch) +{ + UNREFERENCED_PARAMETER(pidlRoot); + UNREFERENCED_PARAMETER(pidlSavedSearch); + + TRACE("%p %p\n", pidlRoot, pidlSavedSearch); + + IContextMenu *pCM; + HRESULT hr = CoCreateInstance(CLSID_ShellSearchExt, NULL, CLSCTX_INPROC_SERVER, + IID_IContextMenu, (void **)&pCM); + if (FAILED(hr)) + { + ERR("0x%08X\n", hr); + return hr; + } + + CMINVOKECOMMANDINFO InvokeInfo = { sizeof(InvokeInfo) }; + InvokeInfo.lpParameters = "{996E1EB1-B524-11D1-9120-00A0C98BA67D}"; + InvokeInfo.nShow = SW_SHOWNORMAL; + hr = pCM->InvokeCommand(&InvokeInfo); + pCM->Release(); + + return SUCCEEDED(hr); +}

1 0

[reactos] 10/10: [GITHUB] Add NT6 builders
by Timo Kreuzer 11 Aug '23

11 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=732f223ca0b8688e8cf45… commit 732f223ca0b8688e8cf45d4471b418b40ea43a96 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 16:18:19 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [GITHUB] Add NT6 builders --- .github/workflows/build.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 036475fe4ea..ac4aaae8bd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,6 +8,12 @@ jobs: compiler: [gcc, clang] arch: [i386, amd64] config: [Debug, Release] + dllver: ['0x502', '0x600'] + exclude: + - dllver: 0x600 + compiler: clang + - dllver: 0x600 + config: Release fail-fast: false runs-on: ubuntu-latest steps: @@ -82,6 +88,7 @@ jobs: toolset: ['14.2', '14.1', '14.0'] # VS 2019, 2017, and 2015 (see below) arch: [i386, amd64] config: [Debug, Release] + dllver: ['0x502', '0x600'] exclude: # VS 2019, 2017 only with windows-latest; VS 2015 only with windows-2019 - os: windows-2019 toolset: '14.2' @@ -89,6 +96,14 @@ jobs: toolset: '14.1' - os: windows-latest toolset: '14.0' + - dllver: 0x600 + os: windows-2019 + - dllver: 0x600 + toolset: '14.1' + - dllver: 0x600 + toolset: '14.0' + - dllver: 0x600 + config: Release fail-fast: false runs-on: ${{matrix.os}} steps: @@ -118,7 +133,7 @@ jobs: with: path: src - name: Configure - run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 + run: cmake -S src -B build -G Ninja -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-msvc.cmake -DARCH:STRING=${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.config}} -DENABLE_ROSTESTS=1 -DENABLE_ROSAPPS=1 -DDLL_EXPORT_VERSION=${{matrix.dllver}} - name: Build run: cmake --build build -- -k0 - name: Generate ISOs

1 0

[reactos] 09/10: [APISETS] Improve/fix up some exports
by Timo Kreuzer 11 Aug '23

11 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fed97ebf1a59b48ef629c… commit fed97ebf1a59b48ef629ceab9a07e5d8fee062a7 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 26 19:27:17 2020 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [APISETS] Improve/fix up some exports --- dll/apisets/api-ms-win-core-crt-l1-1-0.spec | 13 ++- dll/apisets/api-ms-win-crt-private-l1-1-0.spec | 121 +++++++++++++++---------- dll/apisets/api-ms-win-crt-process-l1-1-0.spec | 6 +- dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec | 11 ++- 4 files changed, 90 insertions(+), 61 deletions(-) diff --git a/dll/apisets/api-ms-win-core-crt-l1-1-0.spec b/dll/apisets/api-ms-win-core-crt-l1-1-0.spec index a7782f260ef..cc4fac52863 100644 --- a/dll/apisets/api-ms-win-core-crt-l1-1-0.spec +++ b/dll/apisets/api-ms-win-core-crt-l1-1-0.spec @@ -1,18 +1,22 @@ # This file is autogenerated by update.py +@ cdecl -arch=x86_64,arm __C_specific_handler() msvcrt.__C_specific_handler @ stdcall __isascii() msvcrt.__isascii @ stdcall _atoi64() msvcrt._atoi64 @ stdcall _errno() msvcrt._errno -@ stdcall -version=0x600+ _except_handler4_common() msvcrt._except_handler4_common +@ stdcall -version=0x600+ -arch=i386 _except_handler4_common() msvcrt._except_handler4_common @ stdcall -arch=i386,x86_64,arm _fltused() ntdll._fltused @ stdcall -arch=i386 _ftol() msvcrt._ftol -@ stub _ftol2 -@ stub _ftol2_sse +@ cdecl -version=0x600+ -arch=i386 _ftol2() msvcrt._ftol2 +@ cdecl -version=0x600+ -arch=i386 _ftol2_sse() msvcrt._ftol2_sse @ stub _i64tow_s @ stub _itow_s -@ stdcall -version=0x600+ _local_unwind4() msvcrt._local_unwind4 +@ cdecl -arch=x86_64 _local_unwind() msvcrt._local_unwind +@ stdcall -version=0x600+ -arch=i386 _local_unwind4() msvcrt._local_unwind4 @ stub _ltow_s +@ cdecl -arch=x86_64 _setjmp() msvcrt._setjmp +@ cdecl -arch=x86_64 _setjmpex() msvcrt._setjmpex @ stub _snprintf_s @ stub _snwprintf_s @ stub _splitpath_s @@ -51,6 +55,7 @@ @ stdcall iswgraph() msvcrt.iswgraph @ stdcall iswprint() msvcrt.iswprint @ stdcall iswspace() msvcrt.iswspace +@ cdecl -arch=x86_64 longjmp() msvcrt.longjmp @ stdcall memcmp() msvcrt.memcmp @ stdcall memcpy() msvcrt.memcpy @ stub memcpy_s diff --git a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec index 3c9758e58fd..e7fe8972ece 100644 --- a/dll/apisets/api-ms-win-crt-private-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-private-l1-1-0.spec @@ -8,23 +8,26 @@ @ stub _GetImageBase @ stub _GetThrowImageBase @ stub _IsExceptionObjectToBeDestroyed -@ stub _NLG_Dispatch2 -@ stub _NLG_Return -@ stub _NLG_Return2 +@ stub -arch=i386 _NLG_Dispatch2 +@ stub -arch=i386 _NLG_Return +@ stub -arch=i386 _NLG_Return2 @ stub _SetImageBase @ stub _SetThrowImageBase @ stub _SetWinRTOutOfMemoryExceptionCallback @ stub __AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper -@ stdcall -arch=x86_64,arm __C_specific_handler() msvcrt.__C_specific_handler +@ cdecl -arch=x86_64,arm __C_specific_handler() msvcrt.__C_specific_handler +@ stub -arch=x86_64,arm __C_specific_handler_noexcept @ stdcall -arch=i386 __CxxDetectRethrow() msvcrt.__CxxDetectRethrow @ stub __CxxExceptionFilter -@ stdcall -arch=i386,x86_64 __CxxFrameHandler() msvcrt.__CxxFrameHandler -@ stdcall -arch=i386 __CxxFrameHandler2() msvcrt.__CxxFrameHandler2 -@ stdcall -arch=arm __CxxFrameHandler3() msvcrt.__CxxFrameHandler3 +@ cdecl -arch=i386,x86_64 __CxxFrameHandler() msvcrt.__CxxFrameHandler +@ cdecl -arch=i386 __CxxFrameHandler2() msvcrt.__CxxFrameHandler2 +@ cdecl -version=0x600+ -arch=x86_64 __CxxFrameHandler2() msvcrt.__CxxFrameHandler2 +@ cdecl -arch=arm __CxxFrameHandler3() msvcrt.__CxxFrameHandler3 +#@ cdecl -version=0x600+ -arch=i386,x86_64 __CxxFrameHandler3() msvcrt.__CxxFrameHandler3 @ stdcall -arch=i386 __CxxLongjmpUnwind() msvcrt.__CxxLongjmpUnwind -@ stdcall -arch=i386 __CxxQueryExceptionSize() msvcrt.__CxxQueryExceptionSize +@ stdcall -arch=i386 __CxxQueryExceptionSize() msvcrt.__CxxQueryExceptionSize # should be x64, too @ stub __CxxRegisterExceptionObject @ stub __CxxUnregisterExceptionObject @ cdecl __DestructExceptionObject() msvcrt.__DestructExceptionObject @@ -40,13 +43,14 @@ @ stub __current_exception_context @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment -@ stub __intrinsic_abnormal_termination +@ stub -arch=i386 __intrinsic_abnormal_termination @ stub __intrinsic_setjmp @ stub __intrinsic_setjmpex @ stub __processing_throw @ stub __report_gsfailure @ stub __std_exception_copy @ stub __std_exception_destroy +@ stub -arch=x86_64 __std_terminate @ stub __std_type_info_compare @ stub __std_type_info_destroy_list @ stub __std_type_info_hash @@ -54,34 +58,35 @@ @ stdcall __unDName() msvcrt.__unDName @ stdcall __unDNameEx() msvcrt.__unDNameEx @ stdcall -arch=i386,x86_64,arm __uncaught_exception() msvcrt.__uncaught_exception +@ stub -arch=x86_64 __uncaught_exceptions @ stdcall -arch=i386 _chkesp() msvcrt._chkesp -@ stdcall -arch=i386 _except_handler2() msvcrt._except_handler2 -@ stdcall -arch=i386 _except_handler3() msvcrt._except_handler3 -@ stdcall -version=0x600+ _except_handler4_common() msvcrt._except_handler4_common +@ cdecl -arch=i386 _except_handler2() msvcrt._except_handler2 +@ cdecl -arch=i386 _except_handler3() msvcrt._except_handler3 +@ stdcall -version=0x600+ -arch=i386 _except_handler4_common() msvcrt._except_handler4_common @ stub _get_purecall_handler @ stub _get_unexpected @ stdcall -arch=i386 _global_unwind2() msvcrt._global_unwind2 @ stub _is_exception_typeof @ stdcall -arch=x86_64 _local_unwind() kernel32._local_unwind @ stdcall -arch=i386 _local_unwind2() msvcrt._local_unwind2 -@ stdcall -version=0x600+ _local_unwind4() msvcrt._local_unwind4 +@ stdcall -version=0x600+ -arch=i386 _local_unwind4() msvcrt._local_unwind4 @ stdcall -arch=i386 _longjmpex() msvcrt._longjmpex -@ stub _o__CIacos -@ stub _o__CIasin -@ stub _o__CIatan -@ stub _o__CIatan2 -@ stub _o__CIcos -@ stub _o__CIcosh -@ stub _o__CIexp -@ stub _o__CIfmod -@ stub _o__CIlog -@ stub _o__CIlog10 -@ stub _o__CIpow -@ stub _o__CIsin -@ stub _o__CIsinh -@ stub _o__CIsqrt -@ stub _o__CItan -@ stub _o__CItanh +@ stub -arch=i386 _o__CIacos +@ stub -arch=i386 _o__CIasin +@ stub -arch=i386 _o__CIatan +@ stub -arch=i386 _o__CIatan2 +@ stub -arch=i386 _o__CIcos +@ stub -arch=i386 _o__CIcosh +@ stub -arch=i386 _o__CIexp +@ stub -arch=i386 _o__CIfmod +@ stub -arch=i386 _o__CIlog +@ stub -arch=i386 _o__CIlog10 +@ stub -arch=i386 _o__CIpow +@ stub -arch=i386 _o__CIsin +@ stub -arch=i386 _o__CIsinh +@ stub -arch=i386 _o__CIsqrt +@ stub -arch=i386 _o__CItan +@ stub -arch=i386 _o__CItanh @ stub _o__Getdays @ stub _o__Getmonths @ stub _o__Gettnames @@ -90,6 +95,10 @@ @ stub _o__W_Getmonths @ stub _o__W_Gettnames @ stub _o__Wcsftime +@ stub -arch=x86_64 _o____lc_codepage_func +@ stub -arch=x86_64 _o____lc_collate_cp_func +@ stub -arch=x86_64 _o____lc_locale_name_func +@ stub -arch=x86_64 _o____mb_cur_max_func @ stub _o___acrt_iob_func @ stub _o___conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @@ -102,27 +111,27 @@ @ stub _o___daylight @ stub _o___dstbias @ stub _o___fpe_flt_rounds -@ stub _o___libm_sse2_acos -@ stub _o___libm_sse2_acosf -@ stub _o___libm_sse2_asin -@ stub _o___libm_sse2_asinf -@ stub _o___libm_sse2_atan -@ stub _o___libm_sse2_atan2 -@ stub _o___libm_sse2_atanf -@ stub _o___libm_sse2_cos -@ stub _o___libm_sse2_cosf -@ stub _o___libm_sse2_exp -@ stub _o___libm_sse2_expf -@ stub _o___libm_sse2_log -@ stub _o___libm_sse2_log10 -@ stub _o___libm_sse2_log10f -@ stub _o___libm_sse2_logf -@ stub _o___libm_sse2_pow -@ stub _o___libm_sse2_powf -@ stub _o___libm_sse2_sin -@ stub _o___libm_sse2_sinf -@ stub _o___libm_sse2_tan -@ stub _o___libm_sse2_tanf +@ stub -arch=i386 _o___libm_sse2_acos +@ stub -arch=i386 _o___libm_sse2_acosf +@ stub -arch=i386 _o___libm_sse2_asin +@ stub -arch=i386 _o___libm_sse2_asinf +@ stub -arch=i386 _o___libm_sse2_atan +@ stub -arch=i386 _o___libm_sse2_atan2 +@ stub -arch=i386 _o___libm_sse2_atanf +@ stub -arch=i386 _o___libm_sse2_cos +@ stub -arch=i386 _o___libm_sse2_cosf +@ stub -arch=i386 _o___libm_sse2_exp +@ stub -arch=i386 _o___libm_sse2_expf +@ stub -arch=i386 _o___libm_sse2_log +@ stub -arch=i386 _o___libm_sse2_log10 +@ stub -arch=i386 _o___libm_sse2_log10f +@ stub -arch=i386 _o___libm_sse2_logf +@ stub -arch=i386 _o___libm_sse2_pow +@ stub -arch=i386 _o___libm_sse2_powf +@ stub -arch=i386 _o___libm_sse2_sin +@ stub -arch=i386 _o___libm_sse2_sinf +@ stub -arch=i386 _o___libm_sse2_tan +@ stub -arch=i386 _o___libm_sse2_tanf @ stub _o___p___argc @ stub _o___p___argv @ stub _o___p___wargv @@ -138,6 +147,10 @@ @ stub _o___p__wpgmptr @ stub _o___pctype_func @ stub _o___pwctype_func +@ stub -arch=x86_64 _o___std_exception_copy +@ stub -arch=x86_64 _o___std_exception_destroy +@ stub -arch=x86_64 _o___std_type_info_destroy_list +@ stub -arch=x86_64 _o___std_type_info_name @ stub _o___stdio_common_vfprintf @ stub _o___stdio_common_vfprintf_p @ stub _o___stdio_common_vfprintf_s @@ -187,6 +200,7 @@ @ stub _o__cabs @ stub _o__callnewh @ stub _o__calloc_base +@ stub -arch=x86_64 _o__cexit @ stub _o__cgets @ stub _o__cgets_s @ stub _o__cgetws @@ -198,11 +212,15 @@ @ stub _o__chsize_s @ stub _o__close @ stub _o__commit +@ stub -arch=x86_64 _o__configthreadlocale +@ stub -arch=x86_64 _o__configure_narrow_argv @ stub _o__configure_wide_argv +@ stub -arch=x86_64 _o__controlfp_s @ stub _o__cputs @ stub _o__cputws @ stub _o__creat @ stub _o__create_locale +@ stub -arch=x86_64 _o__crt_atexit @ stub _o__ctime32_s @ stub _o__ctime64_s @ stub _o__cwait @@ -234,6 +252,7 @@ @ stub _o__execve @ stub _o__execvp @ stub _o__execvpe +@ stub -arch=x86_64 _o__exit @ stub _o__expand @ stub _o__fclose_nolock @ stub _o__fcloseall @@ -304,6 +323,8 @@ @ stub _o__get_errno @ stub _o__get_fmode @ stub _o__get_heap_handle +@ stub -arch=x86_64 _o__get_initial_narrow_environment +@ stub -arch=x86_64 _o__get_initial_wide_environment @ stub _o__get_invalid_parameter_handler @ stub _o__get_narrow_winmain_command_line @ stub _o__get_osfhandle diff --git a/dll/apisets/api-ms-win-crt-process-l1-1-0.spec b/dll/apisets/api-ms-win-crt-process-l1-1-0.spec index cd40d5575c1..49249584325 100644 --- a/dll/apisets/api-ms-win-crt-process-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-process-l1-1-0.spec @@ -11,7 +11,8 @@ @ stdcall _execve() msvcrt._execve @ stdcall _execvp() msvcrt._execvp @ stdcall _execvpe() msvcrt._execvpe -@ stdcall _loaddll() msvcrt._loaddll +@ cdecl -arch=i386 _loaddll() msvcrt._loaddll +@ cdecl -arch=x86_64 -version=0x502 _loaddll() msvcrt._loaddll @ stdcall _spawnl() msvcrt._spawnl @ stdcall _spawnle() msvcrt._spawnle @ stdcall _spawnlp() msvcrt._spawnlp @@ -20,7 +21,8 @@ @ stdcall _spawnve() msvcrt._spawnve @ stdcall _spawnvp() msvcrt._spawnvp @ stdcall _spawnvpe() msvcrt._spawnvpe -@ stdcall _unloaddll() msvcrt._unloaddll +@ cdecl -arch=i386 _unloaddll() msvcrt._unloaddll +@ cdecl -arch=x86_64 -version=0x502 _unloaddll() msvcrt._unloaddll @ stdcall _wexecl() msvcrt._wexecl @ stdcall _wexecle() msvcrt._wexecle @ stdcall _wexeclp() msvcrt._wexeclp diff --git a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec index 4f65bb65fd4..2f42c59b2c5 100644 --- a/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dll/apisets/api-ms-win-crt-runtime-l1-1-0.spec @@ -37,7 +37,7 @@ @ stdcall _endthread() msvcrt._endthread @ stdcall _endthreadex() msvcrt._endthreadex @ stdcall _errno() msvcrt._errno -@ stub -version=0xA00+ _execute_onexit_table +@ cdecl -stub -version=0xA00+ _execute_onexit_table(ptr) @ stdcall _exit() msvcrt._exit @ stdcall -arch=i386 _fpieee_flt() msvcrt._fpieee_flt @ stdcall -stub -arch=x86_64 _fpieee_flt() # ucrtbase._fpieee_flt (msvcrt x64 doesn't have this!) @@ -53,18 +53,19 @@ @ stub _get_thread_local_invalid_parameter_handler @ stub _get_wide_winmain_command_line @ stub _get_wpgmptr -@ stdcall _getdllprocaddr() msvcrt._getdllprocaddr +@ cdecl -arch=i386 _getdllprocaddr() msvcrt._getdllprocaddr +@ cdecl -arch=x86_64 -version=0x502 _getdllprocaddr() msvcrt._getdllprocaddr @ stdcall _getpid() msvcrt._getpid @ stub _initialize_narrow_environment -@ stub -version=0xA00+ _initialize_onexit_table +@ cdecl -stub -version=0xA00+ _initialize_onexit_table(ptr) @ stub _initialize_wide_environment @ stdcall _initterm() msvcrt._initterm -@ stub _initterm_e +@ cdecl -version=0x600+ _initterm_e(ptr ptr) msvcrt._initterm_e @ stub _invalid_parameter_noinfo @ stub _invalid_parameter_noinfo_noreturn @ stub _invoke_watson @ stub _query_app_type -@ stub -version=0xA00+ _register_onexit_function +@ cdecl -stub -version=0xA00+ _register_onexit_function(ptr ptr) @ stub _register_thread_local_exe_atexit_callback @ stdcall _resetstkoflw() msvcrt._resetstkoflw @ cdecl -version=0xA00+ _seh_filter_dll() msvcrt.__CppXcptFilter

1 0

[reactos] 08/10: [MSVCRT] Fix build with vista exports
by Timo Kreuzer 11 Aug '23

11 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0152722bc989f5bab5f00… commit 0152722bc989f5bab5f002400607f2b69addcaac Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 15:28:45 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [MSVCRT] Fix build with vista exports --- dll/win32/msvcrt/CMakeLists.txt | 2 +- dll/win32/msvcrt/msvcrt.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index f2f922ed85f..6754ea58f1e 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -33,7 +33,7 @@ list(APPEND SOURCE add_library(msvcrt MODULE ${SOURCE}) set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12) add_dependencies(msvcrt psdk) -target_link_libraries(msvcrt crt wine ${PSEH_LIB}) +target_link_libraries(msvcrt crt cpprt wine ${PSEH_LIB}) if(MSVC) # export of deleting destructor "name" diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index a300b5cb60e..edff9b16392 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -241,7 +241,7 @@ @ cdecl -arch=i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -version=0x600+ -arch=x86_64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) -@ cdecl -version=0x600+ -arch=i386,x86_64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) +#@ cdecl -version=0x600+ -arch=i386,x86_64 -norelay -private __CxxFrameHandler3(ptr ptr ptr ptr) # Commented out for now, as it causes linker errors @ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386 __CxxQueryExceptionSize() @ cdecl -arch=i386 __CxxRegisterExceptionObject() @@ -1411,7 +1411,7 @@ @ cdecl memchr(ptr long long) @ cdecl memcmp(ptr ptr long) @ cdecl memcpy(ptr ptr long) -@ stub -version=0x600+ memcpy_s +@ cdecl -version=0x600+ memcpy_s(ptr long) @ cdecl memmove(ptr ptr long) @ cdecl -version=0x600+ memmove_s(ptr long ptr long) @ cdecl memset(ptr long long)

1 0

[reactos] 07/10: [CRT] Make _controlfp_s portable
by Timo Kreuzer 11 Aug '23

11 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=994d5e0ad1a5b194e2c60… commit 994d5e0ad1a5b194e2c60ea395dfc2dcf19b95dc Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Aug 6 09:50:39 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [CRT] Make _controlfp_s portable --- sdk/lib/crt/float/_controlfp_s.c | 31 +++++++++++++++++++++++++++++++ sdk/lib/crt/float/arm/_controlfp.c | 13 ------------- sdk/lib/crt/float/float.cmake | 1 + sdk/lib/crt/float/i386/cntrlfp.c | 22 ---------------------- 4 files changed, 32 insertions(+), 35 deletions(-) diff --git a/sdk/lib/crt/float/_controlfp_s.c b/sdk/lib/crt/float/_controlfp_s.c new file mode 100644 index 00000000000..5f5363770ce --- /dev/null +++ b/sdk/lib/crt/float/_controlfp_s.c @@ -0,0 +1,31 @@ +/* + * PROJECT: ReactOS CRT library + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Implementation of _controlfp_s (adapted from wine msvcrt/math.c) + * COPYRIGHT: Copyright 2000 Jon Griffiths + * Copyright 2010 Piotr Caban + * Copyright 2021 Roman Masanin <36927roma(a)gmail.com> + */ + +#include <precomp.h> +#include <float.h> + +#ifdef _M_ARM +#define INVALID_MASK ~(_MCW_EM | _MCW_RC | _MCW_DN) +#else +#define INVALID_MASK ~(_MCW_EM | _MCW_IC | _MCW_RC | _MCW_PC | _MCW_DN) +#endif + +int CDECL _controlfp_s(unsigned int* cur, unsigned int newval, unsigned int mask) +{ + unsigned int val; + + if (!MSVCRT_CHECK_PMT((newval & mask & INVALID_MASK) == 0)) + { + if (cur) *cur = _controlfp(0, 0); /* retrieve it anyway */ + return EINVAL; + } + val = _controlfp(newval, mask); + if (cur) *cur = val; + return 0; +} diff --git a/sdk/lib/crt/float/arm/_controlfp.c b/sdk/lib/crt/float/arm/_controlfp.c index 2c697841ea2..1bce54126d9 100644 --- a/sdk/lib/crt/float/arm/_controlfp.c +++ b/sdk/lib/crt/float/arm/_controlfp.c @@ -68,16 +68,3 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) return flags; } -int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) -{ - unsigned int val; - - if (!MSVCRT_CHECK_PMT( !(newval & mask & ~(_MCW_EM | _MCW_RC | _MCW_DN)) )) - { - if (cur) *cur = _controlfp(0, 0); /* retrieve it anyway */ - return EINVAL; - } - val = _controlfp(newval, mask); - if (cur) *cur = val; - return 0; -} diff --git a/sdk/lib/crt/float/float.cmake b/sdk/lib/crt/float/float.cmake index d3ca0e6a9c6..86568dcb7d1 100644 --- a/sdk/lib/crt/float/float.cmake +++ b/sdk/lib/crt/float/float.cmake @@ -6,6 +6,7 @@ list(APPEND LIBCNTPR_FLOAT_SOURCE list(APPEND CRT_FLOAT_SOURCE ${LIBCNTPR_FLOAT_SOURCE} float/chgsign.c + float/_controlfp_s.c float/copysign.c float/fpclass.c float/fpecode.c diff --git a/sdk/lib/crt/float/i386/cntrlfp.c b/sdk/lib/crt/float/i386/cntrlfp.c index b78cbc7cd26..09fe41449e6 100644 --- a/sdk/lib/crt/float/i386/cntrlfp.c +++ b/sdk/lib/crt/float/i386/cntrlfp.c @@ -113,25 +113,3 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) return flags; } - -/********************************************************************* - * _controlfp_s (MSVCRT.@) - */ -int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask) -{ -#ifdef __i386__ - unsigned int val; - - if (!MSVCRT_CHECK_PMT( !(newval & mask & ~(_MCW_EM | _MCW_IC | _MCW_RC | _MCW_PC | _MCW_DN)))) - { - if (cur) *cur = _controlfp( 0, 0 ); /* retrieve it anyway */ - return EINVAL; - } - val = _controlfp( newval, mask ); - if (cur) *cur = val; - return 0; -#else - FIXME(":Not Implemented!\n"); - return 0; -#endif -}

1 0

[reactos] 06/10: [ADVAPI32] Fix some vista exports
by Timo Kreuzer 11 Aug '23

11 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a17dd3a7a92c2f9c0bc99… commit a17dd3a7a92c2f9c0bc994c79299b0e1df510bba Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 15:42:39 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [ADVAPI32] Fix some vista exports ETW trace exports only exist on NT 0x502 ntdll, so limit the forwarders accordingly. Exports do exist on advapi32 Vista+, so for now these are stubs. --- dll/win32/advapi32/advapi32.spec | 63 ++++++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/dll/win32/advapi32/advapi32.spec b/dll/win32/advapi32/advapi32.spec index 27adda4610d..7394948e011 100644 --- a/dll/win32/advapi32/advapi32.spec +++ b/dll/win32/advapi32/advapi32.spec @@ -66,8 +66,10 @@ @ stdcall CommandLineFromMsiDescriptor(wstr ptr ptr) @ stub ComputeAccessTokenFromCodeAuthzLevel @ stdcall ControlService(long long ptr) -@ stdcall ControlTraceA(double str ptr long) ntdll.EtwControlTraceA -@ stdcall ControlTraceW(double wstr ptr long) ntdll.EtwControlTraceW +@ stdcall -version=0x502 ControlTraceA(double str ptr long) ntdll.EtwControlTraceA +@ stdcall -stub -version=0x600+ ControlTraceA(double str ptr long) +@ stdcall -version=0x502 ControlTraceW(double wstr ptr long) ntdll.EtwControlTraceW +@ stdcall -stub -version=0x600+ ControlTraceW(double wstr ptr long) @ stub ConvertAccessToSecurityDescriptorA @ stub ConvertAccessToSecurityDescriptorW @ stub ConvertSDToStringSDRootDomainA @@ -201,7 +203,8 @@ @ stdcall ElfReportEventA(long long long long ptr long long ptr ptr long ptr ptr) @ stdcall ElfReportEventAndSourceW(long long ptr long long long ptr ptr long long ptr ptr long ptr ptr) @ stdcall ElfReportEventW(long long long long ptr long long ptr ptr long ptr ptr) -@ stdcall EnableTrace(long long long ptr double) ntdll.EtwEnableTrace +@ stdcall -version=0x502 EnableTrace(long long long ptr double) ntdll.EtwEnableTrace +@ stdcall -stub -version=0x600+ EnableTrace(long long long ptr double) @ stdcall EncryptFileA(str) @ stdcall EncryptFileW(wstr) @ stub EncryptedFileKeyInfo @@ -213,15 +216,18 @@ @ stdcall EnumServicesStatusExA(long long long long ptr long ptr ptr ptr str) @ stdcall EnumServicesStatusExW(long long long long ptr long ptr ptr ptr wstr) @ stdcall EnumServicesStatusW(long long long ptr long ptr ptr ptr) -@ stdcall EnumerateTraceGuids(ptr long ptr) ntdll.EtwEnumerateTraceGuids +@ stdcall -version=0x502 EnumerateTraceGuids(ptr long ptr) ntdll.EtwEnumerateTraceGuids +@ stdcall -stub -version=0x600+ EnumerateTraceGuids(ptr long ptr) @ stdcall EqualDomainSid(ptr ptr ptr) @ stdcall EqualPrefixSid(ptr ptr) @ stdcall EqualSid(ptr ptr) @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) -@ stdcall FlushTraceA(double str ptr) ntdll.EtwFlushTraceA -@ stdcall FlushTraceW(double wstr ptr) ntdll.EtwFlushTraceW +@ stdcall -version=0x502 FlushTraceA(double str ptr) ntdll.EtwFlushTraceA +@ stdcall -stub -version=0x600+ FlushTraceA(double str ptr) +@ stdcall -version=0x502 FlushTraceW(double wstr ptr) ntdll.EtwFlushTraceW +@ stdcall -stub -version=0x600+ FlushTraceW(double wstr ptr) @ stub FreeEncryptedFileKeyInfo @ stdcall FreeEncryptionCertificateHashList(ptr) @ stdcall FreeInheritedFromArray(ptr long ptr) @@ -439,8 +445,10 @@ @ stdcall PrivilegedServiceAuditAlarmW(wstr wstr long ptr long) @ stub ProcessIdleTasks @ stdcall ProcessTrace(ptr long ptr ptr) -@ stdcall QueryAllTracesA(ptr long ptr) ntdll.EtwQueryAllTracesA -@ stdcall QueryAllTracesW(ptr long ptr) ntdll.EtwQueryAllTracesW +@ stdcall -version=0x502 QueryAllTracesA(ptr long ptr) ntdll.EtwQueryAllTracesA +@ stdcall -stub -version=0x600+ QueryAllTracesA(ptr long ptr) +@ stdcall -version=0x502 QueryAllTracesW(ptr long ptr) ntdll.EtwQueryAllTracesW +@ stdcall -stub -version=0x600+ QueryAllTracesW(ptr long ptr) @ stdcall QueryRecoveryAgentsOnEncryptedFile(wstr ptr) @ stdcall QueryServiceConfig2A(long long ptr long ptr) @ stdcall QueryServiceConfig2W(long long ptr long ptr) @@ -451,8 +459,10 @@ @ stdcall QueryServiceObjectSecurity(long long ptr long ptr) @ stdcall QueryServiceStatus(long ptr) @ stdcall QueryServiceStatusEx(long long ptr long ptr) -@ stdcall QueryTraceA(double str ptr) ntdll.EtwQueryTraceA -@ stdcall QueryTraceW(double str ptr) ntdll.EtwQueryTraceA +@ stdcall -version=0x502 QueryTraceA(double str ptr) ntdll.EtwQueryTraceA +@ stdcall -stub -version=0x600+ QueryTraceA(double str ptr) +@ stdcall -version=0x502 QueryTraceW(double str ptr) ntdll.EtwQueryTraceW +@ stdcall -stub -version=0x600+ QueryTraceW(double str ptr) @ stdcall QueryUsersOnEncryptedFile(wstr ptr) @ stdcall ReadEncryptedFileRaw(ptr ptr ptr) @ stdcall ReadEventLogA(long long long ptr long ptr ptr) @@ -587,10 +597,14 @@ @ stdcall StartServiceCtrlDispatcherA(ptr) @ stdcall StartServiceCtrlDispatcherW(ptr) @ stdcall StartServiceW(long long ptr) -@ stdcall StartTraceA(ptr str ptr) ntdll.EtwStartTraceA -@ stdcall StartTraceW(ptr wstr ptr) ntdll.EtwStartTraceW -@ stdcall StopTraceA(double str ptr) ntdll.EtwStopTraceA -@ stdcall StopTraceW(double wstr ptr) ntdll.EtwStopTraceA +@ stdcall -version=0x502 StartTraceA(ptr str ptr) ntdll.EtwStartTraceA +@ stdcall -stub -version=0x600+ StartTraceA(ptr str ptr) +@ stdcall -version=0x502 StartTraceW(ptr wstr ptr) ntdll.EtwStartTraceW +@ stdcall -stub -version=0x600+ StartTraceW(ptr wstr ptr) +@ stdcall -version=0x502 StopTraceA(double str ptr) ntdll.EtwStopTraceA +@ stdcall -stub -version=0x600+ StopTraceA(double str ptr) +@ stdcall -version=0x502 StopTraceW(double wstr ptr) ntdll.EtwStopTraceW +@ stdcall -stub -version=0x600+ StopTraceW(double wstr ptr) @ stdcall SystemFunction001(ptr ptr ptr) @ stdcall SystemFunction002(ptr ptr ptr) @ stdcall SystemFunction003(ptr ptr) @@ -629,7 +643,8 @@ @ stdcall SystemFunction036(ptr long) # RtlGenRandom @ stdcall SystemFunction040(ptr long long) # RtlEncryptMemory @ stdcall SystemFunction041(ptr long long) # RtlDecryptMemory -@ stdcall TraceEvent(double ptr) ntdll.EtwTraceEvent +@ stdcall -version=0x502 TraceEvent(double ptr) ntdll.EtwTraceEvent +@ stdcall -stub -version=0x600+ TraceEvent(double ptr) @ stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance @ varargs TraceMessage() ntdll.EtwTraceMessage @ stdcall TraceMessageVa() ntdll.EtwTraceMessageVa @@ -641,8 +656,10 @@ @ stdcall UnlockServiceDatabase(ptr) @ stub UnregisterIdleTask @ stdcall UnregisterTraceGuids(double) ntdll.EtwUnregisterTraceGuids -@ stdcall UpdateTraceA(double str ptr) ntdll.EtwUpdateTraceA -@ stdcall UpdateTraceW(double wstr ptr) ntdll.EtwUpdateTraceW +@ stdcall -version=0x502 UpdateTraceA(double str ptr) ntdll.EtwUpdateTraceA +@ stdcall -stub -version=0x600+ UpdateTraceA(double str ptr) +@ stdcall -version=0x502 UpdateTraceW(double wstr ptr) ntdll.EtwUpdateTraceW +@ stdcall -stub -version=0x600+ UpdateTraceW(double wstr ptr) @ stub WdmWmiServiceMain @ stub WmiCloseBlock @ stub WmiCloseTraceWithCursor @@ -660,8 +677,10 @@ @ stub WmiGetTraceHeader @ stub WmiMofEnumerateResourcesA @ stub WmiMofEnumerateResourcesW -@ stdcall WmiNotificationRegistrationA(ptr long ptr long long) ntdll.EtwNotificationRegistrationA -@ stdcall WmiNotificationRegistrationW(ptr long ptr long long) ntdll.EtwNotificationRegistrationW +@ stdcall -version=0x502 WmiNotificationRegistrationA(ptr long ptr long long) ntdll.EtwNotificationRegistrationA +@ stdcall -stub -version=0x600+ WmiNotificationRegistrationA(ptr long ptr long long) +@ stdcall -version=0x502 WmiNotificationRegistrationW(ptr long ptr long long) ntdll.EtwNotificationRegistrationW +@ stdcall -stub -version=0x600+ WmiNotificationRegistrationW(ptr long ptr long long) @ stub WmiOpenBlock @ stub WmiOpenTraceWithCursor @ stub WmiParseTraceEvent @@ -674,8 +693,10 @@ @ stub WmiQuerySingleInstanceMultipleA @ stub WmiQuerySingleInstanceMultipleW @ stub WmiQuerySingleInstanceW -@ stdcall WmiReceiveNotificationsA(long long long long) ntdll.EtwReceiveNotificationsA -@ stdcall WmiReceiveNotificationsW(long long long long) ntdll.EtwReceiveNotificationsW +@ stdcall -version=0x502 WmiReceiveNotificationsA(long long long long) ntdll.EtwReceiveNotificationsA +@ stdcall -stub -version=0x600+ WmiReceiveNotificationsA(long long long long) +@ stdcall -version=0x502 WmiReceiveNotificationsW(long long long long) ntdll.EtwReceiveNotificationsW +@ stdcall -stub -version=0x600+ WmiReceiveNotificationsW(long long long long) @ stub WmiSetSingleInstanceA @ stub WmiSetSingleInstanceW @ stub WmiSetSingleItemA

1 0

[reactos] 05/10: [KERNEL32] Export more Vista APIs
by Timo Kreuzer 11 Aug '23

11 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2549e10c3808b2f4dcd66… commit 2549e10c3808b2f4dcd66a42e35bc7f0df56b4eb Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 15:19:15 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [KERNEL32] Export more Vista APIs Create kernel32_vista_static library and link both kernel32_vista and kernel32 to it. Export some vista functions from kernel32. Export BaseProcessInitPostImport for Vista+, too, because ntdll needs to dynamically link to it. --- dll/win32/kernel32/CMakeLists.txt | 2 +- dll/win32/kernel32/kernel32.spec | 81 ++++++++++++------------ dll/win32/kernel32/kernel32_vista/CMakeLists.txt | 10 +-- dll/win32/kernel32/winnls/string/lang.c | 6 ++ dll/win32/kernel32/winnls/string/lcformat.c | 14 ++++ 5 files changed, 67 insertions(+), 46 deletions(-) diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index 1cc82f9d42b..555aaab31dc 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -125,7 +125,7 @@ set_module_type(kernel32 win32dll ENTRYPOINT DllMain 12) set_subsystem(kernel32 console) ################# END HACK ################# -target_link_libraries(kernel32 kernel32_shared wine chkstk ${PSEH_LIB}) +target_link_libraries(kernel32 kernel32_vista_static kernel32_shared wine chkstk ${PSEH_LIB}) add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h SOURCE) add_dependencies(kernel32 psdk errcodes asm) diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index ebf7e91adcb..f1b6314052c 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -1,5 +1,5 @@ -@ stdcall -stub -version=0x600+ AcquireSRWLockExclusive(ptr) NTDLL.RtlAcquireSRWLockExclusive -@ stdcall -stub -version=0x600+ AcquireSRWLockShared(ptr) NTDLL.RtlAcquireSRWLockShared +@ stdcall -version=0x600+ AcquireSRWLockExclusive(ptr) NTDLL.RtlAcquireSRWLockExclusive +@ stdcall -version=0x600+ AcquireSRWLockShared(ptr) NTDLL.RtlAcquireSRWLockShared @ stdcall ActivateActCtx(ptr ptr) @ stdcall AddAtomA(str) @ stdcall AddAtomW(wstr) @@ -16,8 +16,8 @@ @ stdcall AllocConsole() @ stdcall AllocateUserPhysicalPages(long ptr ptr) @ stdcall -stub -version=0x600+ AllocateUserPhysicalPagesNuma(ptr ptr ptr long) -@ stdcall -stub -version=0x600+ ApplicationRecoveryFinished(long) -@ stdcall -stub -version=0x600+ ApplicationRecoveryInProgress(ptr) +@ stdcall -version=0x600+ ApplicationRecoveryFinished(long) +@ stdcall -version=0x600+ ApplicationRecoveryInProgress(ptr) @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @ stdcall AttachConsole(long) @@ -33,6 +33,7 @@ @ stdcall BaseInitAppcompatCacheSupport() @ stdcall BaseIsAppcompatInfrastructureDisabled() IsShimInfrastructureDisabled @ stdcall -version=0x501-0x502 BaseProcessInitPostImport() +@ stdcall -version=0x600+ BaseProcessInitPostImport() # HACK: This export is dynamicaly imported by ntdll ;@ stdcall -version=0x502 -arch=x86_64 BaseProcessStart() @ stdcall BaseQueryModuleData(str str ptr ptr ptr) ;check @ stub -version=0x600+ BaseThreadInitThunk @@ -344,7 +345,7 @@ @ stdcall FreeUserPhysicalPages(long long long) @ stdcall GenerateConsoleCtrlEvent(long long) @ stdcall GetACP() -@ stub -version=0x600+ GetApplicationRecoveryCallback +@ stdcall -version=0x600+ GetApplicationRecoveryCallback(ptr ptr ptr ptr ptr) @ stub -version=0x600+ GetApplicationRestartSettings @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @@ -423,7 +424,7 @@ @ stdcall GetConsoleTitleW(ptr long) @ stdcall GetConsoleWindow() @ stdcall GetCurrencyFormatA(long long str ptr str long) -@ stub -version=0x600+ GetCurrencyFormatEx +@ stdcall -version=0x600+ GetCurrencyFormatEx(wstr long wstr ptr wstr long) @ stdcall GetCurrencyFormatW(long long wstr ptr wstr long) @ stdcall GetCurrentActCtx(ptr) @ stdcall GetCurrentConsoleFont(long long ptr) @@ -459,7 +460,7 @@ @ stdcall GetEnvironmentStringsW() @ stdcall GetEnvironmentVariableA(str ptr long) @ stdcall GetEnvironmentVariableW(wstr ptr long) -@ stub -version=0x600+ GetErrorMode +@ stdcall -version=0x600+ GetErrorMode() @ stdcall GetExitCodeProcess(long ptr) @ stdcall GetExitCodeThread(long ptr) @ stdcall GetExpandedNameA(str ptr) @@ -470,17 +471,17 @@ @ stub -version=0x600+ GetFileAttributesTransactedA @ stub -version=0x600+ GetFileAttributesTransactedW @ stdcall GetFileAttributesW(wstr) -@ stub -version=0x600+ GetFileBandwidthReservation +@ stdcall -version=0x600+ GetFileBandwidthReservation(ptr ptr ptr ptr ptr ptr) @ stdcall GetFileInformationByHandle(long ptr) -@ stub -version=0x600+ GetFileInformationByHandleEx -@ stub -version=0x600+ GetFileMUIInfo -@ stub -version=0x600+ GetFileMUIPath +@ stdcall -version=0x600+ GetFileInformationByHandleEx(ptr long ptr long) +@ stdcall -version=0x600+ GetFileMUIInfo(long wstr ptr ptr) +@ stdcall -version=0x600+ GetFileMUIPath(long wstr wstr ptr wstr ptr ptr) @ stdcall GetFileSize(long ptr) @ stdcall GetFileSizeEx(long ptr) @ stdcall GetFileTime(long ptr ptr ptr) @ stdcall GetFileType(long) -@ stub -version=0x600+ GetFinalPathNameByHandleA -@ stub -version=0x600+ GetFinalPathNameByHandleW +@ stdcall -version=0x600+ GetFinalPathNameByHandleA(ptr str long long) +@ stdcall -version=0x600+ GetFinalPathNameByHandleW(ptr wstr long long) @ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) @ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFullPathNameA(str long ptr ptr) @@ -600,7 +601,7 @@ @ stdcall GetSystemFirmwareTable(long long ptr long) @ stdcall GetSystemInfo(ptr) @ stdcall GetSystemPowerStatus(ptr) -@ stub -version=0x600+ GetSystemPreferredUILanguages +@ stdcall -version=0x600+ GetSystemPreferredUILanguages(long ptr wstr ptr) @ stdcall GetSystemRegistryQuota(ptr ptr) @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @@ -623,26 +624,26 @@ @ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadId(ptr) @ stdcall GetThreadLocale() -@ stub -version=0x600+ GetThreadPreferredUILanguages +@ stdcall -version=0x600+ GetThreadPreferredUILanguages(long ptr wstr ptr) @ stdcall GetThreadPriority(long) @ stdcall GetThreadPriorityBoost(long ptr) @ stdcall GetThreadSelectorEntry(long long ptr) @ stdcall GetThreadTimes(long ptr ptr ptr ptr) -@ stub -version=0x600+ GetThreadUILanguage +@ stdcall -version=0x600+ GetThreadUILanguage() @ stdcall GetTickCount() -@ stub -version=0x600+ GetTickCount64 +@ stdcall -version=0x600+ -ret64 GetTickCount64() @ stdcall GetTimeFormatA(long long ptr str ptr long) @ stdcall -version=0x600+ GetTimeFormatEx(wstr long ptr wstr wstr long) @ stdcall GetTimeFormatW(long long ptr wstr ptr long) @ stdcall GetTimeZoneInformation(ptr) @ stub -version=0x600+ GetTimeZoneInformationForYear -@ stub -version=0x600+ GetUILanguageInfo +@ stdcall -version=0x600+ GetUILanguageInfo(long wstr wstr ptr ptr) @ stdcall GetUserDefaultLCID() @ stdcall GetUserDefaultLangID() @ stdcall -version=0x600+ GetUserDefaultLocaleName(wstr long) @ stdcall GetUserDefaultUILanguage() @ stdcall GetUserGeoID(long) -@ stub -version=0x600+ GetUserPreferredUILanguages +@ stdcall -version=0x600+ GetUserPreferredUILanguages(long ptr wstr ptr) @ stdcall GetVDMCurrentDirectories(long long) @ stdcall GetVersion() @ stdcall GetVersionExA(ptr) @@ -709,15 +710,15 @@ @ stdcall InitAtomTable(long) @ stub -version=0x600+ InitOnceBeginInitialize @ stub -version=0x600+ InitOnceComplete -@ stub -version=0x600+ InitOnceExecuteOnce +@ stdcall -version=0x600+ InitOnceExecuteOnce(ptr ptr ptr ptr) @ stub -version=0x600+ InitOnceInitialize -@ stub -version=0x600+ InitializeConditionVariable +@ stdcall -version=0x600+ InitializeConditionVariable(ptr) ntdll.RtlInitializeConditionVariable @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -@ stub -version=0x600+ InitializeCriticalSectionEx +@ stdcall -version=0x600+ InitializeCriticalSectionEx(ptr long long) @ stub -version=0x600+ InitializeProcThreadAttributeList @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead -@ stub -version=0x600+ InitializeSRWLock +@ stdcall -version=0x600+ InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 @ stdcall -arch=i386 InterlockedCompareExchange(ptr long long) @ stdcall -arch=i386 InterlockedDecrement(ptr) @@ -727,7 +728,7 @@ @ stdcall -arch=i386 InterlockedIncrement(ptr) @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -@ stub -version=0x600+ InterlockedPushListSList +@ fastcall -version=0x600+ InterlockedPushListSList(ptr ptr ptr long) ntdll.RtlInterlockedPushListSList @ stdcall InvalidateConsoleDIBits(long long) @ stdcall IsBadCodePtr(ptr) @ stdcall IsBadHugeReadPtr(ptr long) @@ -747,7 +748,7 @@ @ stdcall IsProcessInJob(long long ptr) @ stdcall IsProcessorFeaturePresent(long) @ stdcall IsSystemResumeAutomatic() -@ stub -version=0x600+ IsThreadAFiber +@ stdcall -version=0x600+ IsThreadAFiber() @ stub -version=0x600+ IsThreadpoolTimerSet @ stdcall IsTimeZoneRedirectionEnabled() @ stub -version=0x600+ IsValidCalDateTime @@ -756,7 +757,7 @@ @ stdcall IsValidLocale(long long) @ stdcall -version=0x501-0x502 IsValidUILanguage(long) @ stdcall IsWow64Process(ptr ptr) -@ stub -version=0x600+ LCIDToLocaleName +@ stdcall -version=0x600+ LCIDToLocaleName(long wstr long long) @ stdcall LCMapStringA(long long str long ptr long) @ stdcall -version=0x600+ LCMapStringEx(long long wstr long ptr long ptr ptr long) @ stdcall LCMapStringW(long long wstr long ptr long) @@ -792,7 +793,7 @@ @ stdcall LocalShrink(long long) @ stdcall LocalSize(long) @ stdcall LocalUnlock(long) -@ stub -version=0x600+ LocaleNameToLCID +@ stdcall -version=0x600+ LocaleNameToLCID(wstr long) @ stdcall LockFile(long long long long long) @ stdcall LockFileEx(long long long long long ptr) @ stdcall LockResource(long) @@ -832,7 +833,7 @@ @ stdcall OpenEventA(long long str) @ stdcall OpenEventW(long long wstr) @ stdcall OpenFile(str ptr long) -@ stub -version=0x600+ OpenFileById +@ stdcall -version=0x600+ OpenFileById(ptr ptr long long ptr long) @ stdcall OpenFileMappingA(long long str) @ stdcall OpenFileMappingW(long long wstr) @ stdcall OpenJobObjectA(long long str) @@ -869,8 +870,8 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stub -version=0x600+ QueryFullProcessImageNameA -@ stub -version=0x600+ QueryFullProcessImageNameW +@ stdcall -version=0x600+ QueryFullProcessImageNameA(ptr long str ptr) +@ stdcall -version=0x600+ QueryFullProcessImageNameW(ptr long wstr ptr) @ stub -version=0x600+ QueryIdleProcessorCycleTime @ stdcall QueryInformationJobObject(long long ptr long ptr) @ stdcall QueryMemoryResourceNotification(ptr ptr) @@ -899,8 +900,8 @@ @ stdcall ReadFileEx(long ptr long ptr ptr) @ stdcall ReadFileScatter(long ptr long ptr ptr) @ stdcall ReadProcessMemory(long ptr ptr long ptr) -@ stub -version=0x600+ RegisterApplicationRecoveryCallback -@ stub -version=0x600+ RegisterApplicationRestart +@ stdcall -version=0x600+ RegisterApplicationRecoveryCallback(ptr ptr long long) +@ stdcall -version=0x600+ RegisterApplicationRestart(wstr long) @ stdcall RegisterConsoleIME(ptr ptr) @ stdcall RegisterConsoleOS2(long) @ stdcall RegisterConsoleVDM(long long long long long long long long long long long) @@ -912,8 +913,8 @@ @ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) @ stub -version=0x600+ ReleaseMutexWhenCallbackReturns -@ stub -version=0x600+ ReleaseSRWLockExclusive -@ stub -version=0x600+ ReleaseSRWLockShared +@ stdcall -version=0x600+ ReleaseSRWLockExclusive(ptr) ntdll.RtlReleaseSRWLockExclusive +@ stdcall -version=0x600+ ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared @ stdcall ReleaseSemaphore(long long ptr) @ stub -version=0x600+ ReleaseSemaphoreWhenCallbackReturns @ stdcall RemoveDirectoryA(str) @@ -1025,7 +1026,7 @@ @ stub -version=0x600+ SetFileAttributesTransactedA @ stub -version=0x600+ SetFileAttributesTransactedW @ stdcall SetFileAttributesW(wstr long) -@ stub -version=0x600+ SetFileBandwidthReservation +@ stdcall -version=0x600+ SetFileBandwidthReservation(ptr long long long ptr ptr) @ stdcall SetFileCompletionNotificationModes(ptr long) @ stub -version=0x600+ SetFileInformationByHandle @ stub -version=0x600+ SetFileIoOverlappedRange @@ -1075,7 +1076,7 @@ @ stdcall SetThreadExecutionState(long) @ stdcall SetThreadIdealProcessor(long long) @ stdcall SetThreadLocale(long) -@ stub -version=0x600+ SetThreadPreferredUILanguages +@ stdcall -version=0x600+ SetThreadPreferredUILanguages(long wstr ptr) @ stdcall SetThreadPriority(long long) @ stdcall SetThreadPriorityBoost(long long) @ stdcall SetThreadStackGuarantee(ptr) @@ -1099,8 +1100,8 @@ @ stdcall SignalObjectAndWait(long long long long) @ stdcall SizeofResource(long long) @ stdcall Sleep(long) -@ stub -version=0x600+ SleepConditionVariableCS -@ stub -version=0x600+ SleepConditionVariableSRW +@ stdcall -version=0x600+ SleepConditionVariableCS(ptr ptr long) +@ stdcall -version=0x600+ SleepConditionVariableSRW(ptr ptr long long) @ stdcall SleepEx(long long) @ stub -version=0x600+ StartThreadpoolIo @ stub -version=0x600+ SubmitThreadpoolWork @@ -1175,8 +1176,8 @@ @ stub -version=0x600+ WaitForThreadpoolWorkCallbacks @ stdcall WaitNamedPipeA(str long) @ stdcall WaitNamedPipeW(wstr long) -@ stub -version=0x600+ WakeAllConditionVariable -@ stub -version=0x600+ WakeConditionVariable +@ stdcall -version=0x600+ WakeAllConditionVariable(ptr) ntdll.RtlWakeAllConditionVariable +@ stdcall -version=0x600+ WakeConditionVariable(ptr) ntdll.RtlWakeConditionVariable @ stub -version=0x600+ WerGetFlags @ stub -version=0x600+ WerRegisterFile @ stub -version=0x600+ WerRegisterMemoryBlock diff --git a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt index 51efae70f8b..acc53b9d80a 100644 --- a/dll/win32/kernel32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32/kernel32_vista/CMakeLists.txt @@ -7,17 +7,17 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) spec2def(kernel32_vista.dll kernel32_vista.spec ADD_IMPORTLIB) list(APPEND SOURCE - DllMain.c GetFileInformationByHandleEx.c GetTickCount64.c InitOnceExecuteOnce.c sync.c - vista.c - ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) + vista.c) -add_library(kernel32_vista MODULE ${SOURCE}) +add_library(kernel32_vista_static ${SOURCE}) +add_dependencies(kernel32_vista_static psdk) +add_library(kernel32_vista MODULE DllMain.c ${CMAKE_CURRENT_BINARY_DIR}/kernel32_vista.def) set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12) -target_link_libraries(kernel32_vista kernel32_shared) +target_link_libraries(kernel32_vista kernel32_vista_static kernel32_shared) add_importlibs(kernel32_vista kernel32 ntdll_vista ntdll) add_delay_importlibs(kernel32_vista ntdll_vista) add_dependencies(kernel32_vista psdk) diff --git a/dll/win32/kernel32/winnls/string/lang.c b/dll/win32/kernel32/winnls/string/lang.c index b75bd4972c2..51f1edf0175 100644 --- a/dll/win32/kernel32/winnls/string/lang.c +++ b/dll/win32/kernel32/winnls/string/lang.c @@ -32,6 +32,12 @@ DEBUG_CHANNEL(nls); #include "japanese.h" #endif +#undef WINVER +#define WINVER 0x600 + +/* From winnls.h */ +#define LOCALE_NAME_USER_DEFAULT NULL + #define REG_SZ 1 extern int wine_fold_string(int flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen); extern int wine_get_sortkey(int flags, const WCHAR *src, int srclen, char *dst, int dstlen); diff --git a/dll/win32/kernel32/winnls/string/lcformat.c b/dll/win32/kernel32/winnls/string/lcformat.c index 5e5b529df9e..5761035109f 100644 --- a/dll/win32/kernel32/winnls/string/lcformat.c +++ b/dll/win32/kernel32/winnls/string/lcformat.c @@ -31,6 +31,20 @@ #include <debug.h> DEBUG_CHANNEL(nls); +#undef _WIN32_WINNT +#undef WINVER +#define _WIN32_WINNT DLL_EXPORT_VERSION +#define WINVER DLL_EXPORT_VERSION + +LCID WINAPI LocaleNameToLCID(_In_ LPCWSTR, _In_ DWORD); +#define LOCALE_SSHORTESTDAYNAME1 96 +#define LOCALE_SSHORTESTDAYNAME2 97 +#define LOCALE_SSHORTESTDAYNAME3 98 +#define LOCALE_SSHORTESTDAYNAME4 99 +#define LOCALE_SSHORTESTDAYNAME5 100 +#define LOCALE_SSHORTESTDAYNAME6 101 +#define LOCALE_SSHORTESTDAYNAME7 102 + #define CRITICAL_SECTION RTL_CRITICAL_SECTION #define CRITICAL_SECTION_DEBUG RTL_CRITICAL_SECTION_DEBUG #define CALINFO_MAX_YEAR 2029

1 0

[reactos] 04/10: [NTDLL] Fix some vista exports
by Timo Kreuzer 11 Aug '23

11 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49da1cdbebf6293fa5c17… commit 49da1cdbebf6293fa5c17645d13ba9ad547425d2 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 15:05:20 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [NTDLL] Fix some vista exports Make sure RtlRemovePrivileges gets compiled, when DLL_EXPORT_VERSION is 0x600+ Enable all existing functions from rtl_vista. Hack CsrNewThread export to exist on later versions, too --- dll/ntdll/def/ntdll.spec | 30 +++++++++++++++--------------- sdk/lib/rtl/priv.c | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dll/ntdll/def/ntdll.spec b/dll/ntdll/def/ntdll.spec index 96200db55dc..801feeca335 100644 --- a/dll/ntdll/def/ntdll.spec +++ b/dll/ntdll/def/ntdll.spec @@ -38,7 +38,7 @@ @ stdcall CsrFreeCaptureBuffer(ptr) @ stdcall CsrGetProcessId() @ stdcall CsrIdentifyAlertableThread() -@ stdcall -version=0x502 CsrNewThread() +@ stdcall -version=0x502+ CsrNewThread() # Should be only 0x502, but we need it for now @ stdcall -version=0x502 CsrProbeForRead(ptr long long) @ stdcall -version=0x502 CsrProbeForWrite(ptr long long) @ stdcall CsrSetPriorityClass(ptr ptr) @@ -607,8 +607,8 @@ @ stdcall RtlAcquirePrivilege(ptr long long ptr) @ stdcall RtlAcquireResourceExclusive(ptr long) @ stdcall RtlAcquireResourceShared(ptr long) -@ stdcall -stub -version=0x600+ RtlAcquireSRWLockExclusive(ptr) -@ stdcall -stub -version=0x600+ RtlAcquireSRWLockShared(ptr) +@ stdcall -version=0x600+ RtlAcquireSRWLockExclusive(ptr) +@ stdcall -version=0x600+ RtlAcquireSRWLockShared(ptr) @ stdcall RtlActivateActivationContext(long ptr ptr) @ stdcall RtlActivateActivationContextEx(long ptr ptr ptr) @ stdcall -arch=x86_64,arm RtlActivateActivationContextUnsafeFast(ptr ptr) @@ -936,7 +936,7 @@ @ stdcall RtlInitUnicodeStringEx(ptr wstr) @ stdcall -stub RtlInitializeAtomPackage(ptr) @ stdcall RtlInitializeBitMap(ptr long long) -@ stdcall -stub -version=0x600+ RtlInitializeConditionVariable(ptr) +@ stdcall -version=0x600+ RtlInitializeConditionVariable(ptr) @ stdcall RtlInitializeContext(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeCriticalSection(ptr) @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) @@ -949,7 +949,7 @@ @ stdcall RtlInitializeRXact(ptr long ptr) @ stdcall RtlInitializeResource(ptr) @ stdcall RtlInitializeSListHead(ptr) -@ stdcall -stub -version=0x600+ RtlInitializeSRWLock(ptr) +@ stdcall -version=0x600+ RtlInitializeSRWLock(ptr) @ stdcall RtlInitializeSid(ptr ptr long) @ stdcall RtlInsertElementGenericTable(ptr ptr long ptr) @ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) @@ -1108,8 +1108,8 @@ @ stdcall RtlReleasePrivilege(ptr) @ stdcall RtlReleaseRelativeName(ptr) @ stdcall RtlReleaseResource(ptr) -@ stdcall -stub -version=0x600+ RtlReleaseSRWLockExclusive(ptr) -@ stdcall -stub -version=0x600+ RtlReleaseSRWLockShared(ptr) +@ stdcall -version=0x600+ RtlReleaseSRWLockExclusive(ptr) +@ stdcall -version=0x600+ RtlReleaseSRWLockShared(ptr) @ stdcall RtlRemoteCall(ptr ptr ptr long ptr long long) @ stdcall -version=0x600+ RtlRemovePrivileges(ptr ptr long) @ stdcall RtlRemoveVectoredContinueHandler(ptr) @@ -1124,10 +1124,10 @@ @ stdcall RtlRevertMemoryStream(ptr) @ stdcall RtlRunDecodeUnicodeString(long ptr) @ stdcall RtlRunEncodeUnicodeString(long ptr) -@ stdcall -stub -version=0x600+ RtlRunOnceBeginInitialize(ptr long ptr) -@ stdcall -stub -version=0x600+ RtlRunOnceComplete(ptr long ptr) -@ stdcall -stub -version=0x600+ RtlRunOnceExecuteOnce(ptr ptr ptr ptr) -@ stdcall -stub -version=0x600+ RtlRunOnceInitialize(ptr) +@ stdcall -version=0x600+ RtlRunOnceBeginInitialize(ptr long ptr) +@ stdcall -version=0x600+ RtlRunOnceComplete(ptr long ptr) +@ stdcall -version=0x600+ RtlRunOnceExecuteOnce(ptr ptr ptr ptr) +@ stdcall -version=0x600+ RtlRunOnceInitialize(ptr) @ stdcall RtlSecondsSince1970ToTime(long ptr) @ stdcall RtlSecondsSince1980ToTime(long ptr) @ stdcall RtlSeekMemoryStream(ptr int64 long ptr) @@ -1177,8 +1177,8 @@ @ stub -version=0x600+ RtlSidHashLookup @ stub -version=0x600+ RtlSidIsHigherLevel @ stdcall RtlSizeHeap(long long ptr) -@ stdcall -stub -version=0x600+ RtlSleepConditionVariableCS(ptr ptr ptr) -@ stdcall -stub -version=0x600+ RtlSleepConditionVariableSRW(ptr ptr ptr long) +@ stdcall -version=0x600+ RtlSleepConditionVariableCS(ptr ptr ptr) +@ stdcall -version=0x600+ RtlSleepConditionVariableSRW(ptr ptr ptr long) @ stdcall RtlSplay(ptr) @ stdcall RtlStartRXact(ptr) @ stdcall RtlStatMemoryStream(ptr ptr long) @@ -1250,8 +1250,8 @@ @ stdcall RtlValidateUnicodeString(long ptr) @ stdcall RtlVerifyVersionInfo(ptr long double) @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) -@ stdcall -stub -version=0x600+ RtlWakeAllConditionVariable(ptr) -@ stdcall -stub -version=0x600+ RtlWakeConditionVariable(ptr) +@ stdcall -version=0x600+ RtlWakeAllConditionVariable(ptr) +@ stdcall -version=0x600+ RtlWakeConditionVariable(ptr) @ stdcall RtlWalkFrameChain(ptr long long) @ stdcall RtlWalkHeap(long ptr) @ stub -version=0x600+ RtlWerpReportException diff --git a/sdk/lib/rtl/priv.c b/sdk/lib/rtl/priv.c index 0070140103f..d8240265359 100644 --- a/sdk/lib/rtl/priv.c +++ b/sdk/lib/rtl/priv.c @@ -487,7 +487,7 @@ RtlAdjustPrivilege(IN ULONG Privilege, return STATUS_SUCCESS; } -#if (NTDDI_VERSION >= NTDDI_VISTA) +#if (NTDDI_VERSION >= NTDDI_VISTA) || (DLL_EXPORT_VERSION >= _WIN32_WINNT_VISTA) /** * @brief

1 0

[reactos] 03/10: [SPEC2DEF] Add missing "--version" to help output
by Timo Kreuzer 11 Aug '23

11 Aug '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55e0cab5973de8fce067a… commit 55e0cab5973de8fce067ae46ebe734537204447f Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Aug 5 14:58:17 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Aug 11 19:00:42 2023 +0300 [SPEC2DEF] Add missing "--version" to help output --- sdk/tools/spec2def/spec2def.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index ee50fe01f35..2ec775cc390 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -1404,6 +1404,7 @@ void usage(void) " -s=<file> generate a stub file\n" " --ms MSVC compatibility\n" " -n=<name> name of the dll\n" + " --version=<version> Sets the version to create exports for\n" " --implib generate a def file for an import library\n" " --no-private-warnings suppress warnings about symbols that should be -private\n" " -a=<arch> set architecture to <arch> (i386, x86_64, arm, arm64)\n"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs