mirror of
https://github.com/reactos/reactos.git
synced 2024-07-01 02:10:07 +00:00
[OLE32]
* Create a main header and move some inclusions to it. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716 svn path=/trunk/; revision=61427
This commit is contained in:
parent
665b30366a
commit
56f0833252
|
@ -59,6 +59,7 @@ list(APPEND SOURCE
|
||||||
storage32.c
|
storage32.c
|
||||||
stubmanager.c
|
stubmanager.c
|
||||||
usrmarshal.c
|
usrmarshal.c
|
||||||
|
guid.c
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
|
${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c
|
${CMAKE_CURRENT_BINARY_DIR}/dcom_p.c
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/irot_c.c
|
${CMAKE_CURRENT_BINARY_DIR}/irot_c.c
|
||||||
|
@ -69,11 +70,8 @@ list(APPEND SOURCE
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
|
${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/ole32.def)
|
${CMAKE_CURRENT_BINARY_DIR}/ole32.def)
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC AND (ARCH STREQUAL "i386"))
|
||||||
if(ARCH STREQUAL "i386")
|
list(APPEND SOURCE msvc-thiscall.c)
|
||||||
list(APPEND SOURCE msvc-thiscall.c)
|
|
||||||
endif()
|
|
||||||
set_source_files_properties(stg_prop.c PROPERTIES COMPILE_FLAGS "/FImsvc.h")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_library(ole32 SHARED ${SOURCE} ole32res.rc)
|
add_library(ole32 SHARED ${SOURCE} ole32res.rc)
|
||||||
|
|
|
@ -18,23 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <objbase.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include "moniker.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -18,21 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <winnls.h>
|
|
||||||
#include <objbase.h>
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -19,25 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <ole2.h>
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include "moniker.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -58,32 +58,9 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
//#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <wingdi.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <winnls.h>
|
|
||||||
#include <ole2.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
//#include "olestd.h"
|
|
||||||
|
|
||||||
#include "storage32.h"
|
#include "storage32.h"
|
||||||
|
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
#define HANDLE_ERROR(err) do { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } while (0)
|
#define HANDLE_ERROR(err) do { hr = err; TRACE("(HRESULT=%x)\n", (HRESULT)err); goto CLEANUP; } while (0)
|
||||||
|
|
|
@ -18,26 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
//#include <string.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winreg.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
|
|
||||||
#include <ole2.h>
|
|
||||||
#include <comcat.h>
|
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -36,39 +36,10 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
#include "precomp.h"
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <string.h>
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <ntstatus.h>
|
|
||||||
#define WIN32_NO_STATUS
|
|
||||||
#define _INC_WINDOWS
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "winreg.h"
|
|
||||||
//#include "winuser.h"
|
|
||||||
#define USE_COM_CONTEXT_DEF
|
|
||||||
//#include "objbase.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
#include <ole2ver.h>
|
|
||||||
#include <ctxtcall.h>
|
#include <ctxtcall.h>
|
||||||
#include <dde.h>
|
#include <dde.h>
|
||||||
#include <servprov.h>
|
|
||||||
|
|
||||||
#include <initguid.h>
|
|
||||||
#include "compobj_private.h"
|
|
||||||
#include "moniker.h"
|
|
||||||
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -27,17 +27,6 @@
|
||||||
|
|
||||||
/* All private prototype functions used by OLE will be added to this header file */
|
/* All private prototype functions used by OLE will be added to this header file */
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#include <wine/list.h>
|
|
||||||
|
|
||||||
#include "windef.h"
|
|
||||||
#include "winbase.h"
|
|
||||||
#include "wtypes.h"
|
|
||||||
#include <dcom.h>
|
|
||||||
#include "winreg.h"
|
|
||||||
#include <winternl.h>
|
|
||||||
|
|
||||||
struct apartment;
|
struct apartment;
|
||||||
typedef struct apartment APARTMENT;
|
typedef struct apartment APARTMENT;
|
||||||
typedef struct LocalServer LocalServer;
|
typedef struct LocalServer LocalServer;
|
||||||
|
|
|
@ -18,25 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <ole2.h>
|
|
||||||
#include "moniker.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -43,25 +43,8 @@
|
||||||
* header. I was able to figure-out where the extent of the object
|
* header. I was able to figure-out where the extent of the object
|
||||||
* was stored and the aspect, but that's about it.
|
* was stored and the aspect, but that's about it.
|
||||||
*/
|
*/
|
||||||
#define WIN32_NO_STATUS
|
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
#include "precomp.h"
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <wingdi.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <ole2.h>
|
|
||||||
#include <wine/list.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -45,27 +45,10 @@
|
||||||
* - All the methods related to notification and advise sinks are
|
* - All the methods related to notification and advise sinks are
|
||||||
* in place but no notifications are sent to the sinks yet.
|
* in place but no notifications are sent to the sinks yet.
|
||||||
*/
|
*/
|
||||||
#define WIN32_NO_STATUS
|
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
//#include <assert.h>
|
#include "precomp.h"
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
|
|
||||||
#include "compobj_private.h"
|
|
||||||
#include "storage32.h"
|
#include "storage32.h"
|
||||||
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
enum storage_state
|
enum storage_state
|
||||||
|
|
|
@ -17,14 +17,8 @@
|
||||||
* License along with this library; if not, write to the Free Software
|
* License along with this library; if not, write to the Free Software
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
#define WIN32_NO_STATUS
|
|
||||||
|
|
||||||
#include <assert.h>
|
#include "precomp.h"
|
||||||
//#include <stdarg.h>
|
|
||||||
//#include "windef.h"
|
|
||||||
//#include "winbase.h"
|
|
||||||
#include "dictionary.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
||||||
|
|
||||||
|
|
|
@ -22,10 +22,6 @@
|
||||||
#ifndef __DICTIONARY_H__
|
#ifndef __DICTIONARY_H__
|
||||||
#define __DICTIONARY_H__
|
#define __DICTIONARY_H__
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
|
|
||||||
struct dictionary;
|
struct dictionary;
|
||||||
|
|
||||||
/* Returns whether key a is less than, equal to, or greater than key b, in
|
/* Returns whether key a is less than, equal to, or greater than key b, in
|
||||||
|
|
|
@ -18,21 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <objbase.h>
|
|
||||||
|
|
||||||
#include "enumx.h"
|
|
||||||
|
|
||||||
#include <wine/list.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -23,24 +23,7 @@
|
||||||
* TEB at offset 0xf80.
|
* TEB at offset 0xf80.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <objbase.h>
|
|
||||||
#include <oleauto.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -20,29 +20,9 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//#include <assert.h>
|
#include "precomp.h"
|
||||||
//#include <stdlib.h>
|
|
||||||
//#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <string.h>
|
|
||||||
//#include <limits.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
//#include "windef.h"
|
|
||||||
//#include "winbase.h"
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "objbase.h"
|
|
||||||
//#include "ole2.h"
|
|
||||||
|
|
||||||
#include "storage32.h"
|
#include "storage32.h"
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
||||||
|
|
||||||
typedef struct FileLockBytesImpl
|
typedef struct FileLockBytesImpl
|
||||||
|
|
|
@ -19,27 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "winnls.h"
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <objbase.h>
|
|
||||||
#include "moniker.h"
|
|
||||||
|
|
||||||
//#include "compobj_private.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -18,26 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
//#include <stdlib.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <string.h>
|
|
||||||
//#include <assert.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <objbase.h>
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -24,26 +24,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "objbase.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
|
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
//#include "wine/list.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
14
reactos/dll/win32/ole32/guid.c
Normal file
14
reactos/dll/win32/ole32/guid.c
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
|
||||||
|
|
||||||
|
#include <initguid.h>
|
||||||
|
|
||||||
|
DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 );
|
||||||
|
|
||||||
|
DEFINE_OLEGUID( CLSID_FileMoniker, 0x303, 0, 0 );
|
||||||
|
DEFINE_OLEGUID( CLSID_ItemMoniker, 0x304, 0, 0 );
|
||||||
|
DEFINE_OLEGUID( CLSID_AntiMoniker, 0x305, 0, 0 );
|
||||||
|
DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 );
|
||||||
|
DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 );
|
||||||
|
DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 );
|
||||||
|
|
||||||
|
/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */
|
|
@ -21,30 +21,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
//#include <stdlib.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "objbase.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "winternl.h"
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
||||||
|
|
||||||
|
|
|
@ -18,26 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
//#include <ctype.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <stdlib.h>
|
|
||||||
//#include <string.h>
|
|
||||||
//#include <assert.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(olemalloc);
|
WINE_DEFAULT_DEBUG_CHANNEL(olemalloc);
|
||||||
|
|
||||||
|
|
|
@ -18,26 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winnls.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <ole2.h>
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include "moniker.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -20,26 +20,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "objbase.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "wine/unicode.h"
|
|
||||||
|
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -19,27 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <objbase.h>
|
|
||||||
//#include "ole2.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -21,31 +21,10 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
//#include "wine/port.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "wtypes.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
|
|
||||||
//#include "wine/list.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <wine/exception.h>
|
#include <wine/exception.h>
|
||||||
|
|
||||||
#include "compobj_private.h"
|
|
||||||
#include "moniker.h"
|
|
||||||
#include <irot.h>
|
#include <irot.h>
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
|
|
||||||
#define __ASM_STDCALL_FUNC(name,args,code)
|
|
|
@ -23,36 +23,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
//#include <assert.h>
|
|
||||||
//#include <stdlib.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <wingdi.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winnls.h"
|
|
||||||
//#include "winreg.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
#include <ole2ver.h>
|
|
||||||
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include "compobj_private.h"
|
|
||||||
//#include "wine/list.h"
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
WINE_DECLARE_DEBUG_CHANNEL(accel);
|
WINE_DECLARE_DEBUG_CHANNEL(accel);
|
||||||
|
|
|
@ -18,24 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <wingdi.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <ole2.h>
|
|
||||||
//#include "olestd.h"
|
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -19,19 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
//#include "objidl.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -18,23 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
//#include "wine/port.h"
|
|
||||||
|
|
||||||
//#include <stdarg.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <wingdi.h>
|
|
||||||
#include <winuser.h>
|
|
||||||
#include <winnls.h>
|
|
||||||
#include <objbase.h>
|
|
||||||
//#include "ole2.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -19,24 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include <ole2.h>
|
|
||||||
|
|
||||||
//#include "compobj_private.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -19,30 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
|
|
||||||
//#include <stdlib.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <objbase.h>
|
|
||||||
//#include "ole2.h"
|
|
||||||
//#include "rpc.h"
|
|
||||||
|
|
||||||
#include "compobj_private.h"
|
|
||||||
#include "moniker.h"
|
|
||||||
#include <comcat.h>
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
* DllGetClassObject [OLE32.@]
|
* DllGetClassObject [OLE32.@]
|
||||||
|
|
|
@ -19,24 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <objbase.h>
|
|
||||||
#include <oleidl.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include "moniker.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
39
reactos/dll/win32/ole32/precomp.h
Normal file
39
reactos/dll/win32/ole32/precomp.h
Normal file
|
@ -0,0 +1,39 @@
|
||||||
|
#ifndef _OLE32_PCH_
|
||||||
|
#define _OLE32_PCH_
|
||||||
|
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
|
||||||
|
#define _INC_WINDOWS
|
||||||
|
|
||||||
|
#define COBJMACROS
|
||||||
|
#define NONAMELESSUNION
|
||||||
|
#define NONAMELESSSTRUCT
|
||||||
|
|
||||||
|
#include <ntstatus.h>
|
||||||
|
#define WIN32_NO_STATUS
|
||||||
|
#include <windef.h>
|
||||||
|
#include <winbase.h>
|
||||||
|
#include <winreg.h>
|
||||||
|
#include <wingdi.h>
|
||||||
|
#define USE_COM_CONTEXT_DEF
|
||||||
|
#include <ole2.h>
|
||||||
|
#include <ole2ver.h>
|
||||||
|
#include <dcom.h>
|
||||||
|
#include <comcat.h>
|
||||||
|
#include <servprov.h>
|
||||||
|
#include <winternl.h>
|
||||||
|
|
||||||
|
#include <wine/debug.h>
|
||||||
|
#include <wine/list.h>
|
||||||
|
#include <wine/unicode.h>
|
||||||
|
|
||||||
|
#include "compobj_private.h"
|
||||||
|
#include "dictionary.h"
|
||||||
|
#include "enumx.h"
|
||||||
|
#include "moniker.h"
|
||||||
|
|
||||||
|
#endif /* _OLE32_PCH_ */
|
|
@ -20,34 +20,9 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <config.h>
|
|
||||||
//#include "wine/port.h"
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <winsvc.h>
|
#include <winsvc.h>
|
||||||
//#include "objbase.h"
|
|
||||||
#include <ole2.h>
|
|
||||||
//#include "rpc.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "winreg.h"
|
|
||||||
#include <servprov.h>
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
|
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
|
@ -36,32 +36,15 @@
|
||||||
* PropertyStorage_ReadFromStream
|
* PropertyStorage_ReadFromStream
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
#include "precomp.h"
|
||||||
//#include "wine/port.h"
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
//#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <stdlib.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
//#include "windef.h"
|
|
||||||
//#include "winbase.h"
|
|
||||||
//#include "winnls.h"
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include "dictionary.h"
|
|
||||||
#include "storage32.h"
|
#include "storage32.h"
|
||||||
#include "enumx.h"
|
|
||||||
#include <oleauto.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#define __ASM_STDCALL_FUNC(name,args,code)
|
||||||
|
#endif
|
||||||
|
|
||||||
static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface )
|
static inline StorageImpl *impl_from_IPropertySetStorage( IPropertySetStorage *iface )
|
||||||
{
|
{
|
||||||
return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface);
|
return CONTAINING_RECORD(iface, StorageImpl, base.IPropertySetStorage_iface);
|
||||||
|
|
|
@ -23,22 +23,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <assert.h>
|
#include "precomp.h"
|
||||||
//#include <stdlib.h>
|
|
||||||
//#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
//#include "windef.h"
|
|
||||||
//#include "winbase.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
//#include "winternl.h"
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
#include "storage32.h"
|
#include "storage32.h"
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
||||||
|
|
|
@ -30,29 +30,10 @@
|
||||||
* residing in a compound file object.
|
* residing in a compound file object.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <assert.h>
|
#include "precomp.h"
|
||||||
//#include <stdarg.h>
|
|
||||||
//#include <stdio.h>
|
|
||||||
//#include <stdlib.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
//#include "windef.h"
|
|
||||||
//#include "winbase.h"
|
|
||||||
//#include "winnls.h"
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
#include "storage32.h"
|
#include "storage32.h"
|
||||||
#include <ole2.h> /* For Write/ReadClassStm */
|
|
||||||
|
|
||||||
//#include "winreg.h"
|
|
||||||
#include <wine/wingdi16.h>
|
#include <wine/wingdi16.h>
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
WINE_DEFAULT_DEBUG_CHANNEL(storage);
|
||||||
|
|
||||||
|
|
|
@ -30,19 +30,6 @@
|
||||||
#ifndef __STORAGE32_H__
|
#ifndef __STORAGE32_H__
|
||||||
#define __STORAGE32_H__
|
#define __STORAGE32_H__
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winnt.h"
|
|
||||||
#include <objbase.h>
|
|
||||||
#include <winreg.h>
|
|
||||||
#include "winternl.h"
|
|
||||||
#include <wine/list.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Definitions for the file format offsets.
|
* Definitions for the file format offsets.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -23,29 +23,10 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <assert.h>
|
|
||||||
#include <stdarg.h>
|
|
||||||
//#include <limits.h>
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
#include <objbase.h>
|
|
||||||
//#include "rpc.h"
|
|
||||||
|
|
||||||
#include <wine/debug.h>
|
|
||||||
#include "compobj_private.h"
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
||||||
/* generates an ipid in the following format (similar to native version):
|
/* generates an ipid in the following format (similar to native version):
|
||||||
* Data1 = apartment-local ipid counter
|
* Data1 = apartment-local ipid counter
|
||||||
* Data2 = apartment creator thread ID
|
* Data2 = apartment creator thread ID
|
||||||
|
|
|
@ -18,29 +18,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define WIN32_NO_STATUS
|
#include "precomp.h"
|
||||||
#define _INC_WINDOWS
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
//#include <stdarg.h>
|
|
||||||
//#include <string.h>
|
|
||||||
|
|
||||||
#define COBJMACROS
|
|
||||||
#define NONAMELESSUNION
|
|
||||||
#define NONAMELESSSTRUCT
|
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <winbase.h>
|
|
||||||
#include <wingdi.h>
|
|
||||||
//#include "winuser.h"
|
|
||||||
//#include "winerror.h"
|
|
||||||
|
|
||||||
#include <ole2.h>
|
|
||||||
//#include "oleauto.h"
|
|
||||||
//#include "rpcproxy.h"
|
|
||||||
|
|
||||||
#include <wine/unicode.h>
|
|
||||||
#include <wine/debug.h>
|
|
||||||
|
|
||||||
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
WINE_DEFAULT_DEBUG_CHANNEL(ole);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue