From d40d642f03cb928bd54422311086f2683570129a Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Tue, 1 Feb 2022 22:47:44 +0100 Subject: [PATCH] [PSDK] Add some parameter names --- sdk/include/psdk/shlobj.h | 10 ++++---- sdk/include/psdk/shlwapi.h | 44 +++++++++++++++++------------------ sdk/include/psdk/shobjidl.idl | 2 ++ sdk/include/psdk/winbase.h | 6 ++--- sdk/include/psdk/winuser.h | 12 +++++----- 5 files changed, 38 insertions(+), 36 deletions(-) diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 9423e15c4b0..2fe6cf1d047 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -222,11 +222,11 @@ HRESULT WINAPI SHLoadOLE(LPARAM); HRESULT WINAPI SHParseDisplayName( - _In_ PCWSTR, - _In_opt_ IBindCtx*, - _Outptr_ PIDLIST_ABSOLUTE*, - _In_ SFGAOF, - _Out_opt_ SFGAOF*); + _In_ PCWSTR pszName, + _In_opt_ IBindCtx* pbc, + _Outptr_ PIDLIST_ABSOLUTE* ppidl, + _In_ SFGAOF sfgaoIn, + _Out_opt_ SFGAOF* psfgaoOut); HRESULT WINAPI diff --git a/sdk/include/psdk/shlwapi.h b/sdk/include/psdk/shlwapi.h index 0532387388a..84241ba4a58 100644 --- a/sdk/include/psdk/shlwapi.h +++ b/sdk/include/psdk/shlwapi.h @@ -894,20 +894,20 @@ PathCreateFromUrlW( HRESULT WINAPI PathCreateFromUrlAlloc(_In_ LPCWSTR pszUrl, _Outptr_ LPWSTR* pszPath, DWORD dwReserved); -BOOL WINAPI PathFileExistsA(_In_ LPCSTR); -BOOL WINAPI PathFileExistsW(_In_ LPCWSTR); +BOOL WINAPI PathFileExistsA(_In_ LPCSTR pszPath); +BOOL WINAPI PathFileExistsW(_In_ LPCWSTR pszPath); #define PathFileExists WINELIB_NAME_AW(PathFileExists) -BOOL WINAPI PathFileExistsAndAttributesA(LPCSTR,DWORD*); -BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR,DWORD*); +BOOL WINAPI PathFileExistsAndAttributesA(LPCSTR lpszPath,DWORD* dwAttr); +BOOL WINAPI PathFileExistsAndAttributesW(LPCWSTR lpszPath,DWORD* dwAttr); #define PathFileExistsAndAttributes WINELIB_NAME_AW(PathFileExistsAndAttributes) -LPSTR WINAPI PathFindExtensionA(_In_ LPCSTR); -LPWSTR WINAPI PathFindExtensionW(_In_ LPCWSTR); +LPSTR WINAPI PathFindExtensionA(_In_ LPCSTR pszPath); +LPWSTR WINAPI PathFindExtensionW(_In_ LPCWSTR pszPath); #define PathFindExtension WINELIB_NAME_AW(PathFindExtension) -LPSTR WINAPI PathFindFileNameA(_In_ LPCSTR); -LPWSTR WINAPI PathFindFileNameW(_In_ LPCWSTR); +LPSTR WINAPI PathFindFileNameA(_In_ LPCSTR pszPath); +LPWSTR WINAPI PathFindFileNameW(_In_ LPCWSTR pszPath); #define PathFindFileName WINELIB_NAME_AW(PathFindFileName) LPSTR WINAPI PathFindNextComponentA(_In_ LPCSTR); @@ -918,12 +918,12 @@ BOOL WINAPI PathFindOnPathA(_Inout_updates_(MAX_PATH) LPSTR, _In_opt_ LPCSTR*); BOOL WINAPI PathFindOnPathW(_Inout_updates_(MAX_PATH) LPWSTR, _In_opt_ LPCWSTR*); #define PathFindOnPath WINELIB_NAME_AW(PathFindOnPath) -LPSTR WINAPI PathGetArgsA(_In_ LPCSTR); -LPWSTR WINAPI PathGetArgsW(_In_ LPCWSTR); +LPSTR WINAPI PathGetArgsA(_In_ LPCSTR pszPath); +LPWSTR WINAPI PathGetArgsW(_In_ LPCWSTR pszPath); #define PathGetArgs WINELIB_NAME_AW(PathGetArgs) -UINT WINAPI PathGetCharTypeA(_In_ UCHAR); -UINT WINAPI PathGetCharTypeW(_In_ WCHAR); +UINT WINAPI PathGetCharTypeA(_In_ UCHAR ch); +UINT WINAPI PathGetCharTypeW(_In_ WCHAR ch); #define PathGetCharType WINELIB_NAME_AW(PathGetCharType) int WINAPI PathGetDriveNumberA(_In_ LPCSTR); @@ -1632,16 +1632,16 @@ LPSTR WINAPI StrRStrIA(_In_ LPCSTR, _In_opt_ LPCSTR, _In_ LPCSTR); LPWSTR WINAPI StrRStrIW(_In_ LPCWSTR, _In_opt_ LPCWSTR, _In_ LPCWSTR); #define StrRStrI WINELIB_NAME_AW(StrRStrI) -int WINAPI StrSpnA(_In_ LPCSTR, _In_ LPCSTR); -int WINAPI StrSpnW(_In_ LPCWSTR, _In_ LPCWSTR); +int WINAPI StrSpnA(_In_ LPCSTR psz, _In_ LPCSTR pszSet); +int WINAPI StrSpnW(_In_ LPCWSTR psz, _In_ LPCWSTR pszSet); #define StrSpn WINELIB_NAME_AW(StrSpn) -LPSTR WINAPI StrStrA(_In_ LPCSTR, _In_ LPCSTR); -LPWSTR WINAPI StrStrW(_In_ LPCWSTR, _In_ LPCWSTR); +LPSTR WINAPI StrStrA(_In_ LPCSTR pszFirst, _In_ LPCSTR pszSrch); +LPWSTR WINAPI StrStrW(_In_ LPCWSTR pszFirst, _In_ LPCWSTR pszSrch); #define StrStr WINELIB_NAME_AW(StrStr) -LPSTR WINAPI StrStrIA(_In_ LPCSTR, _In_ LPCSTR); -LPWSTR WINAPI StrStrIW(_In_ LPCWSTR, _In_ LPCWSTR); +LPSTR WINAPI StrStrIA(_In_ LPCSTR pszFirst, _In_ LPCSTR pszSrch); +LPWSTR WINAPI StrStrIW(_In_ LPCWSTR pszFirst, _In_ LPCWSTR pszSrch); #define StrStrI WINELIB_NAME_AW(StrStrI) LPWSTR WINAPI StrStrNW(_In_ LPCWSTR, _In_ LPCWSTR, UINT); @@ -1941,10 +1941,10 @@ HRESULT WINAPI SHReleaseThreadRef(void); BOOL WINAPI SHCreateThread( - _In_ LPTHREAD_START_ROUTINE, - _In_opt_ void*, - _In_ DWORD, - _In_opt_ LPTHREAD_START_ROUTINE); + _In_ LPTHREAD_START_ROUTINE pfnThreadProc, + _In_opt_ void* pData, + _In_ DWORD flags, + _In_opt_ LPTHREAD_START_ROUTINE pfnCallback); BOOL WINAPI SHSkipJunction(_In_opt_ struct IBindCtx*, _In_ const CLSID*); diff --git a/sdk/include/psdk/shobjidl.idl b/sdk/include/psdk/shobjidl.idl index cbb9892655c..54bf45a34c2 100644 --- a/sdk/include/psdk/shobjidl.idl +++ b/sdk/include/psdk/shobjidl.idl @@ -216,6 +216,8 @@ interface IShellFolder : IUnknown cpp_quote("#define SFGAO_NEWCONTENT 0x00200000L") cpp_quote("#define SFGAO_STREAM 0x00400000L") cpp_quote("#define SFGAO_STORAGEANCESTOR 0x00800000L") + cpp_quote("#define SFGAO_STORAGECAPMASK 0x70C50008L") + cpp_quote("#define SFGAO_PKEYSFGAOMASK 0x81044000L") typedef ULONG SFGAOF; diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 9cf4147563a..2db990d47c2 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -2549,7 +2549,7 @@ BOOL WINAPI GetVolumePathNamesForVolumeNameW(LPCWSTR,LPWSTR,DWORD,PDWORD); UINT WINAPI GetWindowsDirectoryA(LPSTR,UINT); UINT WINAPI GetWindowsDirectoryW(LPWSTR,UINT); -DWORD WINAPI GetWindowThreadProcessId(HWND,PDWORD); +DWORD WINAPI GetWindowThreadProcessId(HWND hWnd,PDWORD lpdwProcessId); UINT WINAPI GetWriteWatch(DWORD,PVOID,SIZE_T,PVOID*,PULONG_PTR,PULONG); ATOM WINAPI GlobalAddAtomA(_In_opt_ LPCSTR); ATOM WINAPI GlobalAddAtomW(_In_opt_ LPCWSTR); @@ -3214,8 +3214,8 @@ void WINAPI SwitchToFiber(_In_ PVOID); BOOL WINAPI SwitchToThread(void); BOOL WINAPI SystemTimeToFileTime(const SYSTEMTIME*,LPFILETIME); BOOL WINAPI SystemTimeToTzSpecificLocalTime(CONST TIME_ZONE_INFORMATION*,CONST SYSTEMTIME*,LPSYSTEMTIME); -BOOL WINAPI TerminateProcess(HANDLE,UINT); -BOOL WINAPI TerminateThread(HANDLE,DWORD); +BOOL WINAPI TerminateProcess(HANDLE hProcess, UINT uExitCode); +BOOL WINAPI TerminateThread(HANDLE hThread,DWORD dwExitCode); DWORD WINAPI TlsAlloc(VOID); BOOL WINAPI TlsFree(DWORD); PVOID WINAPI TlsGetValue(DWORD); diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 0b5f2cd04cd..4af5369cca5 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -4505,13 +4505,13 @@ BOOL WINAPI EnumDisplayDevicesW(_In_opt_ LPCWSTR, _In_ DWORD, _Inout_ PDISPLAY_D #endif int WINAPI EnumPropsA(_In_ HWND, _In_ PROPENUMPROCA); int WINAPI EnumPropsW(_In_ HWND, _In_ PROPENUMPROCW); -int WINAPI EnumPropsExA(_In_ HWND, _In_ PROPENUMPROCEXA, _In_ LPARAM); -int WINAPI EnumPropsExW(_In_ HWND, _In_ PROPENUMPROCEXW, _In_ LPARAM); +int WINAPI EnumPropsExA(_In_ HWND, _In_ PROPENUMPROCEXA, _In_ LPARAM lParam); +int WINAPI EnumPropsExW(_In_ HWND, _In_ PROPENUMPROCEXW, _In_ LPARAM lParam); #define EnumTaskWindows(h,f,p) EnumThreadWindows((DWORD)h,f,p) BOOL WINAPI EnumThreadWindows(_In_ DWORD, _In_ WNDENUMPROC, _In_ LPARAM); -BOOL WINAPI EnumWindows(_In_ WNDENUMPROC, _In_ LPARAM); -BOOL WINAPI EnumWindowStationsA(_In_ WINSTAENUMPROCA, _In_ LPARAM); -BOOL WINAPI EnumWindowStationsW(_In_ WINSTAENUMPROCW, _In_ LPARAM); +BOOL WINAPI EnumWindows(_In_ WNDENUMPROC lpEnumFunc, _In_ LPARAM lParam); +BOOL WINAPI EnumWindowStationsA(_In_ WINSTAENUMPROCA, _In_ LPARAM lParam); +BOOL WINAPI EnumWindowStationsW(_In_ WINSTAENUMPROCW, _In_ LPARAM lParam); BOOL WINAPI EqualRect(_In_ LPCRECT, _In_ LPCRECT); #define ExitWindows(r,c) ExitWindowsEx(EWX_LOGOFF,0) BOOL WINAPI ExitWindowsEx(_In_ UINT, _In_ DWORD); @@ -4658,7 +4658,7 @@ HWND WINAPI GetLastActivePopup(_In_ HWND); HMENU WINAPI GetMenu(_In_ HWND); LONG WINAPI GetMenuCheckMarkDimensions(void); DWORD WINAPI GetMenuContextHelpId(_In_ HMENU); -UINT WINAPI GetMenuDefaultItem(_In_ HMENU, _In_ UINT, _In_ UINT); +UINT WINAPI GetMenuDefaultItem(_In_ HMENU hMenu, _In_ UINT fByPos, _In_ UINT gmdiFlags); int WINAPI GetMenuItemCount(_In_opt_ HMENU); UINT WINAPI GetMenuItemID(_In_ HMENU, _In_ int); BOOL WINAPI GetMenuItemInfoA(_In_ HMENU, _In_ UINT, _In_ BOOL, _Inout_ LPMENUITEMINFOA);