Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MEDIA][NLS] Fix c_932.nls header (#2110)
by Katayama Hirofumi MZ 30 Nov '19

30 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00fb9053f943a77495a97… commit 00fb9053f943a77495a977234c28c737be95f741 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 30 12:57:29 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 30 12:57:29 2019 +0900 [MEDIA][NLS] Fix c_932.nls header (#2110) Modify and fix file c_932.nls that is codepage 932 information of NLS (National Language Support). CORE-16468 --- media/nls/c_932.nls | Bin 162850 -> 162850 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/nls/c_932.nls b/media/nls/c_932.nls index 79b4a431c57..67da2ab613f 100644 Binary files a/media/nls/c_932.nls and b/media/nls/c_932.nls differ

1 0

[reactos] 01/01: [WINSTA] Export WinStationRedirectErrorMessage (#2072)
by Oleg Dubinskiy 29 Nov '19

29 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=965e17dbc4d472e157471… commit 965e17dbc4d472e157471599edfb520c6364f8f1 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Nov 29 15:51:04 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 29 14:51:04 2019 +0100 [WINSTA] Export WinStationRedirectErrorMessage (#2072) Add export for WinStationRedirectErrorMessage() function in Winsta. We already have a stub for this function in dll/win32/winsta/logon.c, but for some reason it is not exported. Required by MS Winlogon with Win32SS and some other needed dlls replaced. Now it fails due to missing WinStationCanLogonProceed, for which we currently haven't a stub. This function has been introduced with Win2k3 SP1 (and exists in SP2 as well), see http://blog.airesoft.co.uk/apichanges/changes-Server2003%20SP0-To-Server200… JIRA issue: CORE-16458 --- dll/win32/winsta/winsta.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/winsta/winsta.spec b/dll/win32/winsta/winsta.spec index b41c693b980..df10cfee4b9 100644 --- a/dll/win32/winsta/winsta.spec +++ b/dll/win32/winsta/winsta.spec @@ -69,6 +69,7 @@ @ stdcall WinStationQueryLicense(ptr ptr ptr) @ stdcall WinStationQueryLogonCredentialsW(ptr) @ stdcall WinStationQueryUpdateRequired(ptr ptr) +@ stdcall WinStationRedirectErrorMessage(ptr ptr) @ stdcall WinStationRegisterConsoleNotification(ptr ptr ptr) @ stdcall WinStationRegisterConsoleNotificationEx(ptr ptr ptr ptr) @ stdcall WinStationRegisterNotificationEvent(ptr ptr ptr ptr)

1 0

[reactos] 01/01: [RPCRT4] Stub RpcGetAuthorizationContextForClient (#2042)
by Oleg Dubinskiy 29 Nov '19

29 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be460fe03f67e86e9abdd… commit be460fe03f67e86e9abddc22b7a3faeb21539243 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Nov 29 15:19:56 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 29 14:19:56 2019 +0100 [RPCRT4] Stub RpcGetAuthorizationContextForClient (#2042) ## Purpose Add a stub for RpcGetAuthorizationContextForClient function into rpcrt4, according to https://docs.microsoft.com/en-us/windows/win32/api/rpcasync/nf-rpcasync-rpc… (but with Wine-specific diffs in the syntax, according to the code guidelines: https://wiki.winehq.org/Submitting_Patches#Code_guidelines, since we're syncing rpcrt4 with Wine). Required by MS Winlogon with also Win32 subsystem and some other dlls replaced (aka ROS-Frankenstein), so after my ch [...] I think I also need to submit a patch in Wine, but it is a bit problematically to reproduce this error there, since Wine has no even winlogon.exe, and launching MS Winlogon in pair with profmap.dll, causes the crash due to unimplemented RtlSetProcessIsCritical function in ntdll (which is completely different than our). Ftr, our ntdll already has it implemented: https://git.reactos.org/?p=reactos.git;a=blob;f=sdk/lib/rtl/process.c;hb=67… But wi [...] JIRA issue: CORE-16458 Although this PR doesn't fix that shutdown issue, it at least improves the situation with replaced system files and allows to investigate it more. ## Proposed changes - Add a stub for the function in `dll/win32/rpcrt4/rpc_async.c`; - Properly call it in `dll/win32/rpcrt4/rpcrt4.spec`. --- dll/win32/rpcrt4/rpc_async.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ dll/win32/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dll/win32/rpcrt4/rpc_async.c b/dll/win32/rpcrt4/rpc_async.c index 00c2d6bede8..40628b4b4ef 100644 --- a/dll/win32/rpcrt4/rpc_async.c +++ b/dll/win32/rpcrt4/rpc_async.c @@ -166,3 +166,50 @@ RPC_STATUS WINAPI RpcAsyncCancelCall(PRPC_ASYNC_STATE pAsync, BOOL fAbortCall) FIXME("(%p, %s): stub\n", pAsync, fAbortCall ? "TRUE" : "FALSE"); return RPC_S_INVALID_ASYNC_HANDLE; } + +#ifdef __REACTOS__ +/*********************************************************************** + * RpcGetAuthorizationContextForClient [RPCRT4.@] + * + * Called by RpcFreeAuthorizationContext to return the Authz context. + * + * PARAMS + * ClientBinding [I] Binding handle, represents a binding to a client on the server. + * ImpersonateOnReturn [I] Directs this function to be represented the client on return. + * Reserved1 [I] Reserved, equal to null. + * expiration_time [I] Points to the exact date and time when the token expires. + * Reserved2 [I] Reserved, equal to a LUID structure which has a members, + * each of them is set to zero. + * Reserved3 [I] Reserved, equal to zero. + * Reserved4 [I] Reserved, equal to null. + * authz_client_context [I] Points to an AUTHZ_CLIENT_CONTEXT_HANDLE structure + * that has direct pass to Authz functions. + * + * RETURNS + * Success: RPC_S_OK. + * Failure: Any error code. + */ +RPC_STATUS +WINAPI +RpcGetAuthorizationContextForClient(RPC_BINDING_HANDLE ClientBinding, + BOOL ImpersonateOnReturn, + void * Reserved1, + PLARGE_INTEGER expiration_time, + LUID Reserved2, + DWORD Reserved3, + PVOID Reserved4, + PVOID *authz_client_context) +{ + FIXME("(%p, %d, %p, %p, (%d, %u), %u, %p, %p): stub\n", + ClientBinding, + ImpersonateOnReturn, + Reserved1, + expiration_time, + Reserved2.HighPart, + Reserved2.LowPart, + Reserved3, + Reserved4, + authz_client_context); + return RPC_S_NO_CONTEXT_AVAILABLE; +} +#endif diff --git a/dll/win32/rpcrt4/rpcrt4.spec b/dll/win32/rpcrt4/rpcrt4.spec index 7bc8f6f85f1..38bdfd310ee 100644 --- a/dll/win32/rpcrt4/rpcrt4.spec +++ b/dll/win32/rpcrt4/rpcrt4.spec @@ -378,7 +378,7 @@ 378 stdcall RpcErrorStartEnumeration(ptr) 379 stub RpcFreeAuthorizationContext 380 stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus -# RpcGetAuthorizationContextForClient +381 stdcall RpcGetAuthorizationContextForClient(ptr long ptr ptr int64 long ptr ptr) 382 stub RpcIfIdVectorFree 383 stub RpcIfInqId 384 stdcall RpcImpersonateClient(ptr)

1 0

[reactos] 01/01: [BOOTDATA] Restore "CMD here" 'Extended' key, but commented out (#2093)
by Serge Gautherie 29 Nov '19

29 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e1338eac2aecc8b09708… commit 7e1338eac2aecc8b09708443a2d1568883bce6ab Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Nov 29 14:13:59 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 29 14:13:59 2019 +0100 [BOOTDATA] Restore "CMD here" 'Extended' key, but commented out (#2093) Addendum to db5a2fff CORE-16519 --- boot/bootdata/hivecls.inf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/bootdata/hivecls.inf b/boot/bootdata/hivecls.inf index d81e9565f6d..0d8f8bd83ea 100644 --- a/boot/bootdata/hivecls.inf +++ b/boot/bootdata/hivecls.inf @@ -32,12 +32,16 @@ HKCR,"Directory","",0x00000000,"File Folder" HKCR,"Directory","AlwaysShowExt",0x00000000,"" HKCR,"Directory","NoRecentDocs",0x00000000,"" HKCR,"Directory\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" +; Uncomment 'Extended' key to restore default (Shift-Right-Click) display of 'Command Prompt here'. (See CORE-16519.) +; HKCR,"Directory\shell\cmd","Extended",0x00000000,"" HKCR,"Directory\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Drive HKCR,"Drive","",0x00000000,"Drive" ;HKCR,"Drive\DefaultIcon","",0x00000000,"%SystemRoot%\system32\shell32.dll,-4" HKCR,"Drive\shell\cmd","",0x00020000,"@%SystemRoot%\system32\shell32.dll,-306" +; Uncomment 'Extended' key to restore default (Shift-Right-Click) display of 'Command Prompt here'. (See CORE-16519.) +; HKCR,"Drive\shell\cmd","Extended",0x00000000,"" HKCR,"Drive\shell\cmd\command","",0x00000000,"cmd.exe /s /k pushd ""%V""" ; Clipboard Element

1 0

[reactos] 01/01: [DEVMGR] CClassNode::SetupNode(): Properly use Type (#2100)
by Serge Gautherie 29 Nov '19

29 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad6f1ac72b4c5d863bfc8… commit ad6f1ac72b4c5d863bfc83975174f24e130292ad Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Nov 29 14:13:13 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 29 14:13:13 2019 +0100 [DEVMGR] CClassNode::SetupNode(): Properly use Type (#2100) --- dll/win32/devmgr/devmgmt/ClassNode.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dll/win32/devmgr/devmgmt/ClassNode.cpp b/dll/win32/devmgr/devmgmt/ClassNode.cpp index bba78cf13e6..17cb7edaae0 100644 --- a/dll/win32/devmgr/devmgmt/ClassNode.cpp +++ b/dll/win32/devmgr/devmgmt/ClassNode.cpp @@ -42,8 +42,6 @@ CClassNode::SetupNode() 0); if (hKey != INVALID_HANDLE_VALUE) { - Type = REG_SZ; - // Lookup the class description (win7+) Size = sizeof(m_DisplayName); Success = RegQueryValueExW(hKey, @@ -54,8 +52,12 @@ CClassNode::SetupNode() &Size); if (Success == ERROR_SUCCESS) { + if (Type != REG_SZ) + { + Success = ERROR_INVALID_DATA; + } // Check if the string starts with an @ - if (m_DisplayName[0] == L'@') + else if (m_DisplayName[0] == L'@') { // The description is located in a module resource Success = ConvertResourceDescriptorToString(m_DisplayName, sizeof(m_DisplayName)); @@ -71,6 +73,10 @@ CClassNode::SetupNode() &Type, (LPBYTE)m_DisplayName, &Size); + if (Success == ERROR_SUCCESS && Type != REG_SZ) + { + Success = ERROR_INVALID_DATA; + } } // Close the registry key

1 0

[reactos] 01/01: [ATTRIB] Delete unused variable 'szText'
by Katayama Hirofumi MZ 29 Nov '19

29 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6bf099a662e9ee83b714b… commit 6bf099a662e9ee83b714bff5bc16c62ae375abd6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 29 20:08:46 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 29 20:08:46 2019 +0900 [ATTRIB] Delete unused variable 'szText' --- base/applications/cmdutils/attrib/attrib.c | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 3d35fa403c0..4691821c3c6 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -283,7 +283,6 @@ int wmain(int argc, WCHAR *argv[]) DWORD dwAttrib = 0; DWORD dwMask = 0; LPWSTR p; - WCHAR szText[MAX_PATH]; /* Initialize the Console Standard Streams */ ConInitStdStreams();

1 0

[reactos] 01/01: [CMDUTILS][ATTRIB] Support folder attributes (#2103)
by Katayama Hirofumi MZ 29 Nov '19

29 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=189f6485841eb6b600069… commit 189f6485841eb6b600069a7f938979cc44318743 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 29 20:03:19 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 29 20:03:19 2019 +0900 [CMDUTILS][ATTRIB] Support folder attributes (#2103) CORE-16538 --- base/applications/cmdutils/attrib/attrib.c | 165 ++++++++++++++---------- base/applications/cmdutils/attrib/lang/cs-CZ.rc | 1 + base/applications/cmdutils/attrib/lang/de-DE.rc | 1 + base/applications/cmdutils/attrib/lang/el-GR.rc | 1 + base/applications/cmdutils/attrib/lang/en-US.rc | 1 + base/applications/cmdutils/attrib/lang/es-ES.rc | 1 + base/applications/cmdutils/attrib/lang/fr-FR.rc | 1 + base/applications/cmdutils/attrib/lang/hu-HU.rc | 1 + base/applications/cmdutils/attrib/lang/id-ID.rc | 1 + base/applications/cmdutils/attrib/lang/it-IT.rc | 1 + base/applications/cmdutils/attrib/lang/ja-JP.rc | 1 + base/applications/cmdutils/attrib/lang/no-NO.rc | 1 + base/applications/cmdutils/attrib/lang/pl-PL.rc | 1 + base/applications/cmdutils/attrib/lang/ro-RO.rc | 1 + base/applications/cmdutils/attrib/lang/ru-RU.rc | 1 + base/applications/cmdutils/attrib/lang/sk-SK.rc | 1 + base/applications/cmdutils/attrib/lang/sq-AL.rc | 1 + base/applications/cmdutils/attrib/lang/sv-SE.rc | 1 + base/applications/cmdutils/attrib/lang/tr-TR.rc | 1 + base/applications/cmdutils/attrib/lang/uk-UA.rc | 1 + base/applications/cmdutils/attrib/lang/zh-CN.rc | 1 + base/applications/cmdutils/attrib/lang/zh-TW.rc | 1 + base/applications/cmdutils/attrib/resource.h | 1 + 23 files changed, 118 insertions(+), 69 deletions(-) diff --git a/base/applications/cmdutils/attrib/attrib.c b/base/applications/cmdutils/attrib/attrib.c index 141ad497285..3d35fa403c0 100644 --- a/base/applications/cmdutils/attrib/attrib.c +++ b/base/applications/cmdutils/attrib/attrib.c @@ -72,7 +72,7 @@ ErrorMessage( NULL, dwErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&szError, 0, NULL)) { - ConPrintf(StdErr, L"%s %s\n", szError, szMessage); + ConPrintf(StdOut, L"%s %s\n", szError, szMessage); if (szError) LocalFree(szError); return; @@ -81,9 +81,9 @@ ErrorMessage( /* Fall back just in case the error is not defined */ LoadStringW(GetModuleHandle(NULL), STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); if (szFormat) - ConPrintf(StdErr, L"%s -- %s\n", szMsg, szMessage); + ConPrintf(StdOut, L"%s -- %s\n", szMsg, szMessage); else - ConPrintf(StdErr, L"%s\n", szMsg); + ConPrintf(StdOut, L"%s\n", szMsg); } static @@ -145,9 +145,6 @@ PrintAttribute( do { - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; - wcscpy(pszFileName, findData.cFileName); ConPrintf(StdOut, @@ -166,7 +163,7 @@ PrintAttribute( static -INT +BOOL ChangeAttribute( LPWSTR pszPath, LPWSTR pszFile, @@ -180,75 +177,102 @@ ChangeAttribute( DWORD dwAttribute; WCHAR szFullName[MAX_PATH]; LPWSTR pszFileName; + BOOL bWildcard = (wcschr(pszFile, L'*') || wcschr(pszFile, L'?')); /* prepare full file name buffer */ wcscpy(szFullName, pszPath); pszFileName = szFullName + wcslen(szFullName); - /* change all subdirectories */ - if (bRecurse) - { - /* append file name */ - wcscpy(pszFileName, L"*.*"); + /* append file name */ + wcscpy(pszFileName, pszFile); - hFind = FindFirstFileW(szFullName, &findData); - if (hFind == INVALID_HANDLE_VALUE) + hFind = FindFirstFileW(szFullName, &findData); + if (hFind == INVALID_HANDLE_VALUE) + return FALSE; + + dwAttribute = findData.dwFileAttributes; + + if (!bWildcard) + { + FindClose(hFind); + if (dwAttribute & FILE_ATTRIBUTE_DIRECTORY) { - ErrorMessage(GetLastError(), pszFile); - return 1; + dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; + SetFileAttributes(szFullName, dwAttribute); + if (bRecurse) + { + if (bDirectories) + { + ChangeAttribute(szFullName, L"*", dwMask, dwAttrib, + bRecurse, bDirectories); + } + else + { + if (!ChangeAttribute(szFullName, L"*", dwMask, dwAttrib, + bRecurse, FALSE)) + { + return FALSE; + } + } + } + else + { + if (!bDirectories) + { + ChangeAttribute(szFullName, L"*", dwMask, dwAttrib, + bRecurse, FALSE); + } + } + return TRUE; + } + else + { + dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; + SetFileAttributes(szFullName, dwAttribute); + return TRUE; } + } + else + { + if ((dwAttribute & FILE_ATTRIBUTE_DIRECTORY) && (!bRecurse || !bDirectories)) + return FALSE; do { - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + dwAttribute = findData.dwFileAttributes; + if (dwAttribute & FILE_ATTRIBUTE_DIRECTORY) { + if (!bDirectories) + continue; + if (!wcscmp(findData.cFileName, L".") || !wcscmp(findData.cFileName, L"..")) continue; wcscpy(pszFileName, findData.cFileName); - wcscat(pszFileName, L"\\"); - - ChangeAttribute(szFullName, pszFile, dwMask, - dwAttrib, bRecurse, bDirectories); + dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; + SetFileAttributes(szFullName, dwAttribute); + + if (bRecurse) + { + ChangeAttribute(szFullName, findData.cFileName, dwMask, + dwAttrib, bRecurse, FALSE); + } } - } - while (FindNextFileW(hFind, &findData)); - FindClose(hFind); - } - - /* append file name */ - wcscpy(pszFileName, pszFile); - - hFind = FindFirstFileW(szFullName, &findData); - if (hFind == INVALID_HANDLE_VALUE) - { - ErrorMessage(GetLastError(), pszFile); - return 1; - } - - do - { - if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - continue; - - wcscpy(pszFileName, findData.cFileName); - - dwAttribute = GetFileAttributes (szFullName); + else + { + wcscpy(pszFileName, findData.cFileName); + dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; + SetFileAttributes(szFullName, dwAttribute); + } + } while (FindNextFileW(hFind, &findData)); - if (dwAttribute != 0xFFFFFFFF) - { - dwAttribute = (dwAttribute & ~dwMask) | dwAttrib; - SetFileAttributes(szFullName, dwAttribute); - } + FindClose(hFind); } - while (FindNextFileW(hFind, &findData)); - FindClose(hFind); - return 0; + return TRUE; } - int wmain(int argc, WCHAR *argv[]) { INT i; @@ -258,6 +282,8 @@ int wmain(int argc, WCHAR *argv[]) BOOL bDirectories = FALSE; DWORD dwAttrib = 0; DWORD dwMask = 0; + LPWSTR p; + WCHAR szText[MAX_PATH]; /* Initialize the Console Standard Streams */ ConInitStdStreams(); @@ -285,7 +311,7 @@ int wmain(int argc, WCHAR *argv[]) { if (wcslen(argv[i]) != 2) { - ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } @@ -312,7 +338,7 @@ int wmain(int argc, WCHAR *argv[]) break; default: - ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } } @@ -320,7 +346,7 @@ int wmain(int argc, WCHAR *argv[]) { if (wcslen(argv[i]) != 2) { - ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } @@ -347,7 +373,7 @@ int wmain(int argc, WCHAR *argv[]) break; default: - ConResPrintf(StdErr, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); + ConResPrintf(StdOut, STRING_ERROR_INVALID_PARAM_FORMAT, argv[i]); return -1; } } @@ -371,20 +397,21 @@ int wmain(int argc, WCHAR *argv[]) /* get full file name */ for (i = 1; i < argc; i++) { - if ((*argv[i] != L'+') && (*argv[i] != L'-') && (*argv[i] != L'/')) - { - LPWSTR p; + if (*argv[i] == L'+' || *argv[i] == L'-' || *argv[i] == L'/') + continue; - GetFullPathName(argv[i], MAX_PATH, szPath, NULL); - p = wcsrchr(szPath, L'\\') + 1; - wcscpy(szFileName, p); - *p = L'\0'; + GetFullPathNameW(argv[i], MAX_PATH, szPath, &p); + wcscpy(szFileName, p); + *p = 0; - if (dwMask == 0) - PrintAttribute(szPath, szFileName, bRecurse); - else - ChangeAttribute(szPath, szFileName, dwMask, - dwAttrib, bRecurse, bDirectories); + if (dwMask == 0) + { + PrintAttribute(szPath, szFileName, bRecurse); + } + else if (!ChangeAttribute(szPath, szFileName, dwMask, + dwAttrib, bRecurse, bDirectories)) + { + ConResPrintf(StdOut, STRING_FILE_NOT_FOUND, argv[i]); } } diff --git a/base/applications/cmdutils/attrib/lang/cs-CZ.rc b/base/applications/cmdutils/attrib/lang/cs-CZ.rc index d67fffd3dfb..5798313832c 100644 --- a/base/applications/cmdutils/attrib/lang/cs-CZ.rc +++ b/base/applications/cmdutils/attrib/lang/cs-CZ.rc @@ -7,6 +7,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/de-DE.rc b/base/applications/cmdutils/attrib/lang/de-DE.rc index 44791186be6..934496e3b75 100644 --- a/base/applications/cmdutils/attrib/lang/de-DE.rc +++ b/base/applications/cmdutils/attrib/lang/de-DE.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Zeigt Dateiattribute an oder ändert sie.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] Dateiname ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/el-GR.rc b/base/applications/cmdutils/attrib/lang/el-GR.rc index dcfc19fb746..61b9646ccf8 100644 --- a/base/applications/cmdutils/attrib/lang/el-GR.rc +++ b/base/applications/cmdutils/attrib/lang/el-GR.rc @@ -7,6 +7,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Προβολή ή αλλαγή των χαρακτηριστικών των αρχείων.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/en-US.rc b/base/applications/cmdutils/attrib/lang/en-US.rc index 692b04c013c..340a3db2b19 100644 --- a/base/applications/cmdutils/attrib/lang/en-US.rc +++ b/base/applications/cmdutils/attrib/lang/en-US.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/es-ES.rc b/base/applications/cmdutils/attrib/lang/es-ES.rc index 8271d4784cb..a84e1753e23 100644 --- a/base/applications/cmdutils/attrib/lang/es-ES.rc +++ b/base/applications/cmdutils/attrib/lang/es-ES.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Muestra o cambia los atributos de los archivos.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/fr-FR.rc b/base/applications/cmdutils/attrib/lang/fr-FR.rc index d330ba51f3b..99c22f35ae9 100644 --- a/base/applications/cmdutils/attrib/lang/fr-FR.rc +++ b/base/applications/cmdutils/attrib/lang/fr-FR.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Affiche ou change des attributs de fichiers.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/hu-HU.rc b/base/applications/cmdutils/attrib/lang/hu-HU.rc index 37d8d22ad96..8e5e3d0ff7b 100644 --- a/base/applications/cmdutils/attrib/lang/hu-HU.rc +++ b/base/applications/cmdutils/attrib/lang/hu-HU.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Állományok attribútumok megjelenítése vagy beállításai.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] állomány ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/id-ID.rc b/base/applications/cmdutils/attrib/lang/id-ID.rc index 74ac009a952..31ed914c8aa 100644 --- a/base/applications/cmdutils/attrib/lang/id-ID.rc +++ b/base/applications/cmdutils/attrib/lang/id-ID.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Menampilkan atau mengubah atribut file.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/it-IT.rc b/base/applications/cmdutils/attrib/lang/it-IT.rc index 70d47fc74c4..a4f6a2a1c21 100644 --- a/base/applications/cmdutils/attrib/lang/it-IT.rc +++ b/base/applications/cmdutils/attrib/lang/it-IT.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Visualizza o modifica gli attributi dei file.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/ja-JP.rc b/base/applications/cmdutils/attrib/lang/ja-JP.rc index 79e2c7652fd..9125d067cb7 100644 --- a/base/applications/cmdutils/attrib/lang/ja-JP.rc +++ b/base/applications/cmdutils/attrib/lang/ja-JP.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "ファイル属性を表示または変更します。\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] [ファイル] ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/no-NO.rc b/base/applications/cmdutils/attrib/lang/no-NO.rc index 095e18be0b2..fdc13654108 100644 --- a/base/applications/cmdutils/attrib/lang/no-NO.rc +++ b/base/applications/cmdutils/attrib/lang/no-NO.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Viser eller endrer filattributtene.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/pl-PL.rc b/base/applications/cmdutils/attrib/lang/pl-PL.rc index 42543e60b3a..3776b95160e 100644 --- a/base/applications/cmdutils/attrib/lang/pl-PL.rc +++ b/base/applications/cmdutils/attrib/lang/pl-PL.rc @@ -11,6 +11,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Wyświetla lub zmienia atrybuty plików.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] nazwa_pliku ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/ro-RO.rc b/base/applications/cmdutils/attrib/lang/ro-RO.rc index 73eed7eaf11..05f858aae75 100644 --- a/base/applications/cmdutils/attrib/lang/ro-RO.rc +++ b/base/applications/cmdutils/attrib/lang/ro-RO.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Afișează sau modifică atributele de fișiere.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fișier ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/ru-RU.rc b/base/applications/cmdutils/attrib/lang/ru-RU.rc index 8cea9affee4..c2390e95f35 100644 --- a/base/applications/cmdutils/attrib/lang/ru-RU.rc +++ b/base/applications/cmdutils/attrib/lang/ru-RU.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Вывод и изменение атрибутов файлов.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] файл ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/sk-SK.rc b/base/applications/cmdutils/attrib/lang/sk-SK.rc index 281a003325b..e883b13c2e3 100644 --- a/base/applications/cmdutils/attrib/lang/sk-SK.rc +++ b/base/applications/cmdutils/attrib/lang/sk-SK.rc @@ -8,6 +8,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Displays or changes file attributes.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/sq-AL.rc b/base/applications/cmdutils/attrib/lang/sq-AL.rc index ca39be06934..cddde01e7c5 100644 --- a/base/applications/cmdutils/attrib/lang/sq-AL.rc +++ b/base/applications/cmdutils/attrib/lang/sq-AL.rc @@ -6,6 +6,7 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Shfaq ose ndryshu atributet e dokumentave.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] file ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/sv-SE.rc b/base/applications/cmdutils/attrib/lang/sv-SE.rc index 236baf7c6a2..2406f5316b1 100644 --- a/base/applications/cmdutils/attrib/lang/sv-SE.rc +++ b/base/applications/cmdutils/attrib/lang/sv-SE.rc @@ -2,6 +2,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Visar eller ändrar filattributen.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] fil ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/tr-TR.rc b/base/applications/cmdutils/attrib/lang/tr-TR.rc index d96c764e2e6..7bfd8c3e1ae 100644 --- a/base/applications/cmdutils/attrib/lang/tr-TR.rc +++ b/base/applications/cmdutils/attrib/lang/tr-TR.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Kütük öz niteliklerini görüntüler ya da değiştirir.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] kütük ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/uk-UA.rc b/base/applications/cmdutils/attrib/lang/uk-UA.rc index 6591e433459..957e589f2d1 100644 --- a/base/applications/cmdutils/attrib/lang/uk-UA.rc +++ b/base/applications/cmdutils/attrib/lang/uk-UA.rc @@ -10,6 +10,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "Відображення або зміна атрибутів файлу.\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] файл ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/zh-CN.rc b/base/applications/cmdutils/attrib/lang/zh-CN.rc index a4d10f23bff..c3184d47eb8 100644 --- a/base/applications/cmdutils/attrib/lang/zh-CN.rc +++ b/base/applications/cmdutils/attrib/lang/zh-CN.rc @@ -4,6 +4,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "显示或更改文件属性。\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] 文件 ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/lang/zh-TW.rc b/base/applications/cmdutils/attrib/lang/zh-TW.rc index c1fb32005c0..8b61dd6c714 100644 --- a/base/applications/cmdutils/attrib/lang/zh-TW.rc +++ b/base/applications/cmdutils/attrib/lang/zh-TW.rc @@ -5,6 +5,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL STRINGTABLE BEGIN + STRING_FILE_NOT_FOUND "File not found - '%s'\n" STRING_ATTRIB_HELP "顯示或更改檔案屬性。\n\n\ ATTRIB [+R | -R] [+A | -A] [+S | -S] [+H | -H] 檔案 ...\n\ [/S [/D]]\n\n\ diff --git a/base/applications/cmdutils/attrib/resource.h b/base/applications/cmdutils/attrib/resource.h index 3b44432714c..e55a2ed845a 100644 --- a/base/applications/cmdutils/attrib/resource.h +++ b/base/applications/cmdutils/attrib/resource.h @@ -5,3 +5,4 @@ #define STRING_ERROR_INVALID_PARAM_FORMAT 107 #define STRING_CONSOLE_ERROR 316 #define STRING_ATTRIB_HELP 600 +#define STRING_FILE_NOT_FOUND 100

1 0

[reactos] 01/01: [KERNEL32] Stub GetSystemTimePreciseAsFileTime
by Oleg Dubinskiy 29 Nov '19

29 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c6b64448ce46d1f1ca808… commit c6b64448ce46d1f1ca80850f4a358f2bf74178f7 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Wed Oct 9 18:40:22 2019 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 29 09:03:09 2019 +0100 [KERNEL32] Stub GetSystemTimePreciseAsFileTime --- dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec | 2 +- dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec | 2 +- dll/win32/kernel32/client/time.c | 10 ++++++++++ dll/win32/kernel32/kernel32.spec | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec b/dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec index 0c48bdccdb7..591e4e7037c 100644 --- a/dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec +++ b/dll/apisets/api-ms-win-core-sysinfo-l1-2-0.spec @@ -17,7 +17,7 @@ @ stdcall GetSystemTime() kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment() kernel32.GetSystemTimeAdjustment @ stdcall GetSystemTimeAsFileTime() kernel32.GetSystemTimeAsFileTime -@ stub GetSystemTimePreciseAsFileTime +@ stdcall -version=0x602+ GetSystemTimePreciseAsFileTime() kernel32.GetSystemTimePreciseAsFileTime @ stdcall GetSystemWindowsDirectoryA() kernel32.GetSystemWindowsDirectoryA @ stdcall GetSystemWindowsDirectoryW() kernel32.GetSystemWindowsDirectoryW @ stdcall GetTickCount() kernel32.GetTickCount diff --git a/dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec b/dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec index 7baed33465a..ab5ce34982a 100644 --- a/dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec +++ b/dll/apisets/api-ms-win-core-sysinfo-l1-2-1.spec @@ -19,7 +19,7 @@ @ stdcall GetSystemTime() kernel32.GetSystemTime @ stdcall GetSystemTimeAdjustment() kernel32.GetSystemTimeAdjustment @ stdcall GetSystemTimeAsFileTime() kernel32.GetSystemTimeAsFileTime -@ stub GetSystemTimePreciseAsFileTime +@ stdcall -version=0x602+ GetSystemTimePreciseAsFileTime() kernel32.GetSystemTimePreciseAsFileTime @ stdcall GetSystemWindowsDirectoryA() kernel32.GetSystemWindowsDirectoryA @ stdcall GetSystemWindowsDirectoryW() kernel32.GetSystemWindowsDirectoryW @ stdcall -version=0x600+ GetTickCount64() kernel32.GetTickCount64 diff --git a/dll/win32/kernel32/client/time.c b/dll/win32/kernel32/client/time.c index 6ff8559956a..7c67e1165ce 100644 --- a/dll/win32/kernel32/client/time.c +++ b/dll/win32/kernel32/client/time.c @@ -140,6 +140,16 @@ GetSystemTimeAsFileTime(OUT PFILETIME lpFileTime) lpFileTime->dwHighDateTime = SystemTime.HighPart; } +/* + * @unimplemented + */ +VOID +WINAPI +GetSystemTimePreciseAsFileTime(OUT PFILETIME lpFileTime) +{ + STUB; +} + /* * @implemented */ diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index b7cf1e6a019..765d5f450bb 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -605,6 +605,7 @@ @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @ stdcall GetSystemTimeAsFileTime(ptr) +@ stdcall -version=0x602+ GetSystemTimePreciseAsFileTime(ptr) @ stdcall GetSystemTimes(ptr ptr ptr) @ stdcall GetSystemWindowsDirectoryA(ptr long) @ stdcall GetSystemWindowsDirectoryW(ptr long)

1 0

[reactos] 01/01: Stub GetCurrentPackageId() (#1942)
by William Kent 29 Nov '19

29 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=192926ee026ee04992e1f… commit 192926ee026ee04992e1f8d5c6b34916389fd9ca Author: William Kent <wjk011(a)gmail.com> AuthorDate: Fri Nov 29 02:56:02 2019 -0500 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Nov 29 08:56:02 2019 +0100 Stub GetCurrentPackageId() (#1942) * [KERNEL32] Add stub implementation for GetCurrentPackageId() function This Windows 8+ function is called by WiX bundles (EXE-based installers) upon exit, if the export is present. If it is a stub in the spec, they will crash, even if they are coded to be compatible with Windows XP/ReactOS. Also add GetCurrentPackageId() forwarder to apiset. --- dll/apisets/CMakeLists.txt | 2 +- dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dll/win32/kernel32/client/sysinfo.c | 12 ++++++++++++ dll/win32/kernel32/kernel32.spec | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt index 778af7f878f..4e658584755 100644 --- a/dll/apisets/CMakeLists.txt +++ b/dll/apisets/CMakeLists.txt @@ -40,7 +40,7 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/x86_reactos.apisets_6595b64144ccf1d # Apisets will be appended add_apiset(api-ms-win-appmodel-identity-l1-1-0 0x60000000 ) -add_apiset(api-ms-win-appmodel-runtime-l1-1-1 0x60020000 ) +add_apiset(api-ms-win-appmodel-runtime-l1-1-1 0x60020000 kernel32) add_apiset(api-ms-win-appmodel-runtime-l1-1-2 0x60040000 ) add_apiset(api-ms-win-core-apiquery-l1-1-0 0x60060000 ) add_apiset(api-ms-win-core-appcompat-l1-1-1 0x60070000 kernel32) diff --git a/dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec b/dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec index c814f9b98da..1c4887411eb 100644 --- a/dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dll/apisets/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -8,7 +8,7 @@ @ stub GetCurrentApplicationUserModelId @ stub GetCurrentPackageFamilyName @ stub GetCurrentPackageFullName -@ stub GetCurrentPackageId +@ stdcall -version=0x602+ GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo @ stub GetCurrentPackagePath @ stub GetPackageApplicationIds diff --git a/dll/win32/kernel32/client/sysinfo.c b/dll/win32/kernel32/client/sysinfo.c index ac0ad750efc..74151c19eea 100644 --- a/dll/win32/kernel32/client/sysinfo.c +++ b/dll/win32/kernel32/client/sysinfo.c @@ -582,3 +582,15 @@ SetSystemFileCacheSize(IN SIZE_T MinimumFileCacheSize, STUB; return FALSE; } + +/* + * @unimplemented + */ +LONG +WINAPI +GetCurrentPackageId(UINT32 *BufferLength, + BYTE *Buffer) +{ + STUB; + return APPMODEL_ERROR_NO_PACKAGE; +} diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec index 36122395322..b7cf1e6a019 100644 --- a/dll/win32/kernel32/kernel32.spec +++ b/dll/win32/kernel32/kernel32.spec @@ -430,6 +430,7 @@ @ stub -version=0x600+ GetCurrentConsoleFontEx @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) +@ stdcall -version=0x602+ GetCurrentPackageId(ptr ptr) @ stdcall -norelay GetCurrentProcess() @ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.RtlGetCurrentProcessorNumber

1 0

[reactos] 01/01: [CHARMAP] LoadSettings(): Properly use RegQueryValueEx()
by Serge Gautherie 29 Nov '19

29 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d84e25ac0ad53d837968… commit 3d84e25ac0ad53d837968bc056ef9cf2691075e7 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 28 17:11:27 2019 +0100 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Fri Nov 29 10:45:02 2019 +0300 [CHARMAP] LoadSettings(): Properly use RegQueryValueEx() --- base/applications/charmap/settings.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/base/applications/charmap/settings.c b/base/applications/charmap/settings.c index 6d44a259513..5a30f6d0943 100644 --- a/base/applications/charmap/settings.c +++ b/base/applications/charmap/settings.c @@ -59,7 +59,8 @@ extern void LoadSettings(void) { TCHAR szBuffer[MAX_PATH]; DWORD dwAdvancedChecked; - unsigned long type = REG_DWORD, size = 1024; + DWORD type, size = sizeof(dwAdvancedChecked); + LSTATUS lstatus; /* Restore last selected font */ if (QueryStringValue(HKEY_CURRENT_USER, g_szGeneralRegKey, _T("Font"), szBuffer, (sizeof(szBuffer)/sizeof(szBuffer[0]))) == ERROR_SUCCESS) @@ -89,10 +90,11 @@ extern void LoadSettings(void) } } - RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size); - - if(dwAdvancedChecked != FALSE) + lstatus = RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size); + if (lstatus == ERROR_SUCCESS && type == REG_DWORD && dwAdvancedChecked != FALSE) + { SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0); + } RegCloseKey(hKey); }

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