Changeset 175 for Include/objbase.sbp

Timestamp:

Mar 21, 2007, 7:06:34 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

Variant, VBObjectの追加

File:

• Include/objbase.sbp (modified) (13 diffs)

Include/objbase.sbp

@@ -60 +60 @@
 Const STGM_PRIORITY           = &h00040000
 Const STGM_DELETEONRELEASE    = &h04000000
-'#if (WINVER >= 400)
+'#if (WINVER >= &h400)
 Const STGM_NOSCRATCH          = &h00100000
 '#endif /* WINVER */
@@ -69 +69 @@
 
 Const STGM_NOSNAPSHOT         = &h00200000
-'#if (_WIN32_WINNT >= 0x0500)
+'#if (_WIN32_WINNT >= &h0500)
 Const STGM_DIRECT_SWMR        = &h00400000
 '#endif
@@ -136 +136 @@
     dwAuthnSvc As DWord
     dwAuthzSvc As DWord
-    pwszServerPrincName As PWSTR
+    pwszServerPrincName As LPWSTR
     dwAuthnLevel As DWord
     dwImpersonationLevel As DWord
@@ -144 +144 @@
 Type COSERVERINFO
     dwReserved1 As DWord
-    pwszName As PWSTR
+    pwszName As LPWSTR
     pAuthInfo As *COAUTHINFO
     dwReserved2 As DWord
@@ -157 +157 @@
 
 
-'#if (_WIN32_WINNT >= 0x0400 ) || defined(_WIN32_DCOM)
+'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM)
 #ifdef _WIN32_DCOM
 Const Enum COINIT
-    COINIT_MULTITHREADED     = = &h0
-    COINIT_APARTMENTTHREADED = = &h2
-    COINIT_DISABLE_OLE1DDE   = = &h4
-    COINIT_SPEED_OVER_MEMORY = = &h8
+    COINIT_MULTITHREADED     = &h0
+    COINIT_APARTMENTTHREADED = &h2
+    COINIT_DISABLE_OLE1DDE   = &h4
+    COINIT_SPEED_OVER_MEMORY = &h8
 End Enum
 Declare Function CoInitializeEx Lib "ole32" (pvReserved As VoidPtr, dwCoInit As DWord) As HRESULT
@@ -170 +170 @@
 
 #ifdef __UNDECLARED__
-'#if (_WIN32_WINNT >= 0x0501)
+'#if (_WIN32_WINNT >= &h0501)
 ' 注意：このcokkieは本来ULARGE_INTEGER型
 'Declare Function CoRegisterInitializeSpy Lib "ole32" (pSpy As *IInitializeSpy, ByRef uliCokkie As QWord) As HRESULT
@@ -191 +191 @@
 '#endif
 
-'#if (_WIN32_WINNT >= 0x0500)
+'#if (_WIN32_WINNT >= &h0500)
 
 Type SOleTlsDataPublic
@@ -258 +258 @@
 Declare Sub CoFreeAllLibraries Lib "ole32" ()
 Declare Sub CoFreeUnusedLibraries Lib "ole32" ()
-'#if  (_WIN32_WINNT >= 0x0501)
+'#if  (_WIN32_WINNT >= &h0501)
 Declare Sub CoFreeUnusedLibrariesEx Lib "ole32" (dwUnloadDelay As DWord, dwReserved As DWord)
 '#endif
 
-'#if (_WIN32_WINNT >= 0x0400 ) || defined(_WIN32_DCOM) 'DCOM
+'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
 #ifdef _WIN32_DCOM
 
@@ -329 +329 @@
 Declare Function CoCreateInstance Lib "ole32" (ByRef clsid As CLSID, pUnknown As *IUnknown, dwClsContext As DWord, ByRef refiid As IID, ByRef pObj As Any) As HRESULT
 
-'#if (_WIN32_WINNT >= 0x0400 ) || defined(_WIN32_DCOM) 'DCOM
+'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
 #ifdef _WIN32_DCOM
-/* objidl.hでのMULTI_QIの宣言が必要。
 Declare Function CoGetInstanceFromFile Lib "ole32" (
     ByVal pServerInfo As *COSERVERINFO,
@@ -356 +355 @@
     ByVal punkOuter As *IUnknown,
     ByVal dwClsCtx As DWord,
-    ByVal pServerInfo As *COSERVERINFO,
+    ByVal pServerInfo As COSERVERINFO,
     ByVal dwCount As DWord,
     ByVal pResults As *MULTI_QI) As HRESULT
-*/
 #endif ' DCOM
 
 /* Call related APIs */
-'#if (_WIN32_WINNT >= 0x0400 ) || defined(_WIN32_DCOM) 'DCOM
+'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
 #ifdef _WIN32_DCOM
 
@@ -397 +395 @@
 Declare Function CoRegisterMessageFilter Lib "ole32" (pMessageFilter As *IMessageFilter, ByRef pMessageFilter As *IMessageFilter) As HRESULT
 
-'#if (_WIN32_WINNT >= 0x0400 ) || defined(_WIN32_DCOM) 'DCOM
+'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
 #ifdef _WIN32_DCOM
 Declare Function CoRegisterChannelHook Lib "ole32" (ByRef ExtensionUuid As GUID, pChannelHook As *IChannelHook) As HRESULT
 #endif ' DCOM
 
-'#if (_WIN32_WINNT >= 0x0400 ) || defined(_WIN32_DCOM) 'DCOM
+'#if (_WIN32_WINNT >= &h0400) Or defined(_WIN32_DCOM) 'DCOM
 #ifdef _WIN32_DCOM
 
@@ -425 +423 @@
 
 #ifdef __UNDECLARED__
-'#if  (_WIN32_WINNT >= 0x0501)
+'#if  (_WIN32_WINNT >= &h0501)
 Declare Function CoInvalidateRemoteMachineBindings Lib "ole32" (pszMachineName As LPOLESTR) As HRESULT
 #endif
@@ -519 +517 @@
 /*
 // STG initialization options for StgCreateStorageEx and StgOpenStorageEx
-#if _WIN32_WINNT == 0x500
+#if _WIN32_WINNT == &h500
 #define STGOPTIONS_VERSION 1
-#elif _WIN32_WINNT > 0x500
+#elif _WIN32_WINNT > &h500
 #define STGOPTIONS_VERSION 2
 #else