https://git.reactos.org/?p=reactos.git;a=commitdiff;h=601cdab402ead8a2f4a9b…
commit 601cdab402ead8a2f4a9b706008398e300d43d47
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Mon Feb 4 13:00:25 2019 +0100
Commit: Amine Khaldi <amine.khaldi(a)reactos.org>
CommitDate: Mon Feb 4 13:00:25 2019 +0100
[PSDK] Update shellapi.h and shlobj.h. CORE-15682
---
sdk/include/psdk/shellapi.h | 2 ++
sdk/include/psdk/shlobj.h | 17 ++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/sdk/include/psdk/shellapi.h b/sdk/include/psdk/shellapi.h
index 41623a08c8..34116c1792 100644
--- a/sdk/include/psdk/shellapi.h
+++ b/sdk/include/psdk/shellapi.h
@@ -160,6 +160,7 @@ extern "C" {
#define SHGFI_ADDOVERLAYS 32
#define SHGFI_OVERLAYINDEX 64
#define SHGFI_ICON 256
+#define SHGSI_ICON SHGFI_ICON
#define SHGFI_DISPLAYNAME 512
#define SHGFI_TYPENAME 1024
#define SHGFI_ATTRIBUTES 2048
@@ -171,6 +172,7 @@ extern "C" {
#define SHGFI_ATTR_SPECIFIED 131072
#define SHGFI_LARGEICON 0
#define SHGFI_SMALLICON 1
+#define SHGSI_SMALLICON SHGFI_SMALLICON
#define SHGFI_OPENICON 2
#define SHGFI_SHELLICONSIZE 4
#define SHGFI_PIDL 8
diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h
index 2a48e402ff..8f529cc0f7 100644
--- a/sdk/include/psdk/shlobj.h
+++ b/sdk/include/psdk/shlobj.h
@@ -41,6 +41,8 @@ extern "C" {
#include <shtypes.h>
#include <shobjidl.h>
+#include <pshpack8.h>
+
typedef struct
{
DWORD dwSize;
@@ -79,6 +81,13 @@ typedef struct
DWORD cchLogo;
} SHFOLDERCUSTOMSETTINGSW, *LPSHFOLDERCUSTOMSETTINGSW;
+#include <poppack.h>
+
+#define FCS_READ 0x00000001
+#define FCS_FORCEWRITE 0x00000002
+
+#define FCSM_ICONFILE 0x00000010
+
#ifndef HPSXA_DEFINED
#define HPSXA_DEFINED
DECLARE_HANDLE(HPSXA);
@@ -255,6 +264,7 @@ SHMapPIDLToSystemImageListIndex(
HRESULT WINAPI SHStartNetConnectionDialog(HWND,LPCSTR,DWORD);
VOID WINAPI SHUpdateImageA(_In_ LPCSTR, INT, UINT, INT);
VOID WINAPI SHUpdateImageW(_In_ LPCWSTR, INT, UINT, INT);
+#define SHUpdateImage WINELIB_NAME_AW(SHUpdateImage)
INT
WINAPI
@@ -264,7 +274,12 @@ PickIconDlg(
UINT cchIconPath,
_Inout_opt_ int *);
-#define SHUpdateImage WINELIB_NAME_AW(SHUpdateImage)
+HRESULT
+WINAPI
+SHLimitInputEdit(
+ _In_ HWND hwnd,
+ _In_ IShellFolder *folder);
+
int WINAPI RestartDialog(_In_opt_ HWND, _In_opt_ LPCWSTR, DWORD);
int WINAPI RestartDialogEx(_In_opt_ HWND, _In_opt_ LPCWSTR, DWORD, DWORD);
int WINAPI DriveType(int);