[tfaber] 59475: [PSDK] - Move some stuff around in shdeprecated.idl to reduce the difference with Wine - Move TLENUMF to tlogstg.idl
14 Jul
2013
14 Jul
'13
6:29 a.m.
Author: tfaber
Date: Sun Jul 14 06:29:16 2013
New Revision: 59475
URL: http://svn.reactos.org/svn/reactos?rev=59475&view=rev
Log:
[PSDK]
- Move some stuff around in shdeprecated.idl to reduce the difference with Wine
- Move TLENUMF to tlogstg.idl
Modified:
trunk/reactos/include/psdk/shdeprecated.idl
trunk/reactos/include/psdk/tlogstg.idl
Modified: trunk/reactos/include/psdk/shdeprecated.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shdeprecated.…
==============================================================================
--- trunk/reactos/include/psdk/shdeprecated.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/shdeprecated.idl [iso-8859-1] Sun Jul 14 06:29:16 2013
@@ -35,10 +35,10 @@
cpp_quote("#define TLMENUF_BACKANDFORTH (TLMENUF_BACK | TLMENUF_FORE |
TLMENUF_INCLUDECURRENT)")
[
- uuid(F46EDB3B-BC2F-11d0-9412-00AA00A3EBD3),
- object,
pointer_default(unique),
- local
+ local,
+ object,
+ uuid(F46EDB3B-BC2F-11d0-9412-00AA00A3EBD3)
]
interface ITravelEntry : IUnknown
{
@@ -54,23 +54,13 @@
};
[
- uuid(66A9CB08-4802-11d2-A561-00A0C92DBFE8),
- object,
pointer_default(unique),
- local
+ local,
+ object,
+ uuid(66A9CB08-4802-11d2-A561-00A0C92DBFE8)
]
interface ITravelLog : IUnknown
{
- enum tagTLENUMF
- {
- TLEF_RELATIVE_INCLUDE_CURRENT = 0x00000001,
- TLEF_RELATIVE_BACK = 0x00000010,
- TLEF_RELATIVE_FORE = 0x00000020,
- TLEF_INCLUDE_UNINVOKEABLE = 0x00000040,
- TLEF_ABSOLUTE = 0x00000031,
- };
- typedef DWORD TLENUMF;
-
HRESULT AddEntry(
[in] IUnknown *punk,
BOOL fIsLocalAnchor);
@@ -149,6 +139,12 @@
UINT *puArgErr);
};
+typedef enum tagBNSTATE
+{
+ BNS_NORMAL = 0,
+ BNS_BEGIN_NAVIGATE = 1,
+ BNS_NAVIGATE = 2
+} BNSTATE;
enum {
SBSC_HIDE = 0,
@@ -183,118 +179,13 @@
cpp_quote("#define HLNF_NEWWINDOWSMANAGED 0x80000000")
[
- object,
- uuid(5836FB00-8187-11CF-A12B-00AA004AE837),
pointer_default(unique),
- local
-]
-interface IShellService : IUnknown
-{
- HRESULT SetOwner(
- [in] IUnknown *owner);
-};
-
-[
- object,
- uuid(02BA3B52-0547-11D1-B833-00C04FC9B31F),
- pointer_default(unique),
- local
+ local,
+ object,
+ uuid(02BA3B52-0547-11D1-B833-00C04FC9B31F)
]
interface IBrowserService : IUnknown
{
- typedef enum tagBNSTATE
- {
- BNS_NORMAL = 0,
- BNS_BEGIN_NAVIGATE = 1,
- BNS_NAVIGATE = 2
- } BNSTATE;
-
- cpp_quote("#include <pshpack8.h>")
- typedef struct basebrowserdataxp
- {
- HWND _hwnd;
- ITravelLog *_ptl;
- IUnknown *_phlf;
- IUnknown *_pautoWB2;
- IUnknown *_pautoEDS;
- IShellService *_pautoSS;
- int _eSecureLockIcon;
- DWORD _fCreatingViewWindow;
- UINT _uActivateState;
- LPITEMIDLIST _pidlViewState;
- IOleCommandTarget *_pctView;
- LPITEMIDLIST _pidlCur;
- IShellView *_psv;
- IShellFolder *_psf;
- HWND _hwndView;
- LPWSTR _pszTitleCur;
- LPITEMIDLIST _pidlPending;
- IShellView *_psvPending;
- IShellFolder *_psfPending;
- HWND _hwndViewPending;
- LPWSTR _pszTitlePending;
- BOOL _fIsViewMSHTML;
- BOOL _fPrivacyImpacted;
- CLSID _clsidView;
- CLSID _clsidViewPending;
- HWND _hwndFrame;
- } BASEBROWSERDATAXP;
- typedef struct basebrowserdataxp *LPBASEBROWSERDATAXP;
-
- typedef struct basebrowserdatalh
- {
- HWND _hwnd;
- ITravelLog *_ptl;
- IUnknown *_phlf;
- IUnknown *_pautoWB2;
- IUnknown *_pautoEDS;
- IShellService *_pautoSS;
- int _eSecureLockIcon;
- DWORD _fCreatingViewWindow;
- UINT _uActivateState;
- LPITEMIDLIST _pidlViewState;
- IOleCommandTarget *_pctView;
- LPITEMIDLIST _pidlCur;
- IShellView *_psv;
- IShellFolder *_psf;
- HWND _hwndView;
- LPWSTR _pszTitleCur;
- LPITEMIDLIST _pidlPending;
- IShellView *_psvPending;
- IShellFolder *_psfPending;
- HWND _hwndViewPending;
- LPWSTR _pszTitlePending;
- BOOL _fIsViewMSHTML;
- BOOL _fPrivacyImpacted;
- CLSID _clsidView;
- CLSID _clsidViewPending;
- HWND _hwndFrame;
- LONG _lPhishingFilterStatus;
- } BASEBROWSERDATALH;
- cpp_quote("#include <poppack.h>")
- typedef struct basebrowserdatalh *LPBASEBROWSERDATALH;
-
- typedef BASEBROWSERDATAXP BASEBROWSERDATA;
-
- typedef const BASEBROWSERDATA *LPCBASEBROWSERDATA;
-
- typedef BASEBROWSERDATA *LPBASEBROWSERDATA;
-
-cpp_quote("#if 0")
-typedef HANDLE HMONITOR;
-cpp_quote("#endif /* 0 */")
-
- typedef struct SToolbarItem
- {
- IDockingWindow *ptbar;
- BORDERWIDTHS rcBorderTool;
- LPWSTR pwszItem;
- BOOL fShow;
- HMONITOR hMon;
- } TOOLBARITEM;
-
- typedef struct SToolbarItem *LPTOOLBARITEM;
-
HRESULT GetParentSite(
[out] IOleInPlaceSite **ppipsite);
@@ -404,6 +295,22 @@
BOOL fForceRegister,
int swc);
}
+
+[
+ pointer_default(unique),
+ local,
+ object,
+ uuid(5836FB00-8187-11CF-A12B-00AA004AE837)
+]
+interface IShellService : IUnknown
+{
+ HRESULT SetOwner(
+ [in] IUnknown *owner);
+};
+
+cpp_quote("#if 0")
+typedef HANDLE HMONITOR;
+cpp_quote("#endif /* 0 */")
enum {
SECURELOCK_NOCHANGE = -1,
@@ -424,7 +331,76 @@
SECURELOCK_SUGGEST_SECURE128BIT = 13,
};
-
+cpp_quote("#include <pshpack8.h>")
+typedef struct basebrowserdataxp
+{
+ HWND _hwnd;
+ ITravelLog *_ptl;
+ IUnknown *_phlf;
+ IUnknown *_pautoWB2;
+ IUnknown *_pautoEDS;
+ IShellService *_pautoSS;
+ int _eSecureLockIcon;
+ DWORD _fCreatingViewWindow;
+ UINT _uActivateState;
+ LPITEMIDLIST _pidlViewState;
+ IOleCommandTarget *_pctView;
+ LPITEMIDLIST _pidlCur;
+ IShellView *_psv;
+ IShellFolder *_psf;
+ HWND _hwndView;
+ LPWSTR _pszTitleCur;
+ LPITEMIDLIST _pidlPending;
+ IShellView *_psvPending;
+ IShellFolder *_psfPending;
+ HWND _hwndViewPending;
+ LPWSTR _pszTitlePending;
+ BOOL _fIsViewMSHTML;
+ BOOL _fPrivacyImpacted;
+ CLSID _clsidView;
+ CLSID _clsidViewPending;
+ HWND _hwndFrame;
+} BASEBROWSERDATAXP;
+typedef struct basebrowserdataxp *LPBASEBROWSERDATAXP;
+
+typedef struct basebrowserdatalh
+{
+ HWND _hwnd;
+ ITravelLog *_ptl;
+ IUnknown *_phlf;
+ IUnknown *_pautoWB2;
+ IUnknown *_pautoEDS;
+ IShellService *_pautoSS;
+ int _eSecureLockIcon;
+ DWORD _fCreatingViewWindow;
+ UINT _uActivateState;
+ LPITEMIDLIST _pidlViewState;
+ IOleCommandTarget *_pctView;
+ LPITEMIDLIST _pidlCur;
+ IShellView *_psv;
+ IShellFolder *_psf;
+ HWND _hwndView;
+ LPWSTR _pszTitleCur;
+ LPITEMIDLIST _pidlPending;
+ IShellView *_psvPending;
+ IShellFolder *_psfPending;
+ HWND _hwndViewPending;
+ LPWSTR _pszTitlePending;
+ BOOL _fIsViewMSHTML;
+ BOOL _fPrivacyImpacted;
+ CLSID _clsidView;
+ CLSID _clsidViewPending;
+ HWND _hwndFrame;
+ LONG _lPhishingFilterStatus;
+} BASEBROWSERDATALH;
+cpp_quote("#include <poppack.h>")
+typedef struct basebrowserdatalh *LPBASEBROWSERDATALH;
+
+typedef BASEBROWSERDATAXP BASEBROWSERDATA;
+
+typedef const BASEBROWSERDATA *LPCBASEBROWSERDATA;
+
+typedef BASEBROWSERDATA *LPBASEBROWSERDATA;
cpp_quote("#define VIEW_PRIORITY_RESTRICTED 0x00000070")
cpp_quote("#define VIEW_PRIORITY_CACHEHIT 0x00000050")
@@ -437,26 +413,36 @@
cpp_quote("#define VIEW_PRIORITY_DESPERATE 0x00000010")
cpp_quote("#define VIEW_PRIORITY_NONE 0x00000000")
+typedef struct tagFolderSetData
+{
+ FOLDERSETTINGS _fs;
+ SHELLVIEWID _vidRestore;
+ DWORD _dwViewPriority;
+} FOLDERSETDATA;
+
+typedef struct tagFolderSetData *LPFOLDERSETDATA;
+
+typedef struct SToolbarItem
+{
+ IDockingWindow *ptbar;
+ BORDERWIDTHS rcBorderTool;
+ LPWSTR pwszItem;
+ BOOL fShow;
+ HMONITOR hMon;
+} TOOLBARITEM;
+
+typedef struct SToolbarItem *LPTOOLBARITEM;
cpp_quote("#define ITB_VIEW ((UINT)-1)")
[
- uuid(68BD21CC-438B-11D2-A560-00A0C92DBFE8),
- object,
pointer_default(unique),
- local
+ local,
+ object,
+ uuid(68BD21CC-438B-11D2-A560-00A0C92DBFE8)
]
interface IBrowserService2 : IBrowserService
{
- typedef struct tagFolderSetData
- {
- FOLDERSETTINGS _fs;
- SHELLVIEWID _vidRestore;
- DWORD _dwViewPriority;
- } FOLDERSETDATA;
-
- typedef struct tagFolderSetData *LPFOLDERSETDATA;
-
LRESULT WndProcBS(
[in] HWND hwnd,
UINT uMsg,
@@ -664,10 +650,10 @@
}
[
- uuid(27D7CE21-762D-48F3-86F3-40E2FD3749C4),
- object,
pointer_default(unique),
- local
+ local,
+ object,
+ uuid(27D7CE21-762D-48F3-86F3-40E2FD3749C4)
]
interface IBrowserService3 : IBrowserService2
{
@@ -683,10 +669,10 @@
}
[
- uuid(639f1bff-e135-4096-abd8-e0f504d649a4),
- object,
pointer_default(unique),
- local
+ local,
+ object,
+ uuid(639f1bff-e135-4096-abd8-e0f504d649a4)
]
interface IBrowserService4 : IBrowserService3
{
Modified: trunk/reactos/include/psdk/tlogstg.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tlogstg.idl?r…
==============================================================================
--- trunk/reactos/include/psdk/tlogstg.idl [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/tlogstg.idl [iso-8859-1] Sun Jul 14 06:29:16 2013
@@ -50,3 +50,13 @@
[in] LPWSTR pszUrlLocation,
[in] DWORD dwPosition);
}
+
+enum tagTLENUMF
+{
+ TLEF_RELATIVE_INCLUDE_CURRENT = 0x00000001,
+ TLEF_RELATIVE_BACK = 0x00000010,
+ TLEF_RELATIVE_FORE = 0x00000020,
+ TLEF_INCLUDE_UNINVOKEABLE = 0x00000040,
+ TLEF_ABSOLUTE = 0x00000031,
+};
+typedef DWORD TLENUMF;
4137
days inactive
4137
days old
0 comments
1 participants
participants (1)
-
tfaber＠svn.reactos.org