Prepare for syncing to Wine-20040914

svn path=/trunk/; revision=10900

reactos/include/wine/mmddk.h

@@ -0,0 +1,18 @@
+/* $Id $
+ *
+ * Compatibility header
+ *
+ * This header is wrapper to allow compilation of Wine DLLs under ReactOS
+ * build system. It contains definitions commonly refered to as Wineisms
+ * and definitions that are missing in w32api.
+ */
+
+#include_next <mmddk.h>
+
+#ifndef __WINE_MMDDK_H
+#define __WINE_MMDDK_H
+
+#define DRV_QUERYDSOUNDIFACE		(DRV_RESERVED + 20)
+#define DRV_QUERYDSOUNDDESC		(DRV_RESERVED + 21)
+
+#endif /* __WINE_MMDDK_H */

reactos/include/wine/objbase.h

@@ -51,6 +51,5 @@
 #define STGM_NOSNAPSHOT		0x00200000
 
 HRESULT WINAPI CoGetPSClsid(REFIID riid,CLSID *pclsid);
-HRESULT WINAPI CLSIDFromProgID16(LPCOLESTR16 progid, LPCLSID riid);
 
 #endif /* _OBJBASE_H_ */

reactos/include/wine/wtypes.h

@@ -3,12 +3,6 @@
 #ifndef __WINE_WTYPES_H
 #define __WINE_WTYPES_H
 
-typedef CHAR OLECHAR16;
-
-typedef LPSTR LPOLESTR16;
-
-typedef LPCSTR LPCOLESTR16;
-
 /* Should be in MSHCTX enum but is not in w32api */
 #define MSHCTX_CROSSCTX 4
 

reactos/lib/ole32/compobj.c

@@ -52,7 +52,7 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
-
+typedef LPCSTR LPCOLESTR16;
 
 /****************************************************************************
  * This section defines variables internal to the COM module.

reactos/lib/ole32/ifs.h

@@ -25,7 +25,9 @@
 #include "winbase.h"
 #include "objbase.h"
 
-
+typedef CHAR OLECHAR16;
+typedef LPSTR LPOLESTR16;
+typedef LPCSTR LPCOLESTR16;
 
 /***********************************************************************
  * IMalloc16 interface

reactos/w32api/include/commctrl.h

@@ -757,6 +757,10 @@ extern "C" {
 #define TTN_NEEDTEXTW	TTN_GETDISPINFOW
 #define TTN_SHOW	(TTN_FIRST-1)
 #define TTN_POP	(TTN_FIRST-2)
+#define TTI_NONE	0
+#define TTI_INFO	1
+#define TTI_WARNING	2
+#define TTI_ERROR	3
 #define UD_MAXVAL	0x7fff
 #define UD_MINVAL	(-UD_MAXVAL)
 #define UDN_DELTAPOS (UDN_FIRST-1)
@@ -1471,6 +1475,9 @@ extern "C" {
 #define NM_SETCURSOR (NM_FIRST-17)
 #define NM_CHAR (NM_FIRST-18)
 #define NM_TOOLTIPSCREATED (NM_FIRST-19)
+#define NM_LDOWN (NM_FIRST-20)
+#define NM_RDOWN (NM_FIRST-21)
+#define NM_THEMECHANGED (NM_FIRST-22)
 #define SBARS_SIZEGRIP 256
 #define CCM_FIRST 0x2000
 #define CCM_LAST (CCM_FIRST+0x200)

reactos/w32api/include/objbase.h

@@ -11,7 +11,6 @@
 
 #include <stdlib.h>
 #pragma pack(push,8)
-#include <basetyps.h>
 
 #define WINOLEAPI STDAPI
 #define WINOLEAPI_(type) STDAPI_(type)
@@ -58,6 +57,7 @@ typedef enum tagREGCLS {
 #include <wtypes.h>
 #include <unknwn.h>
 #include <objidl.h>
+#include <propidl.h>
 
 #ifdef __cplusplus
 inline BOOL IsEqualGUID(REFGUID rguid1, REFGUID rguid2)

reactos/w32api/include/propidl.h

@@ -0,0 +1,14 @@
+#include <rpc.h>
+#include <rpcndr.h>
+
+#ifndef _PROPIDL_H
+#define _PROPIDL_H
+#if __GNUC__ >=3
+#pragma GCC system_header
+#endif
+
+#include <objidl.h>
+
+HRESULT WINAPI FreePropVariantArray(ULONG cVariants, PROPVARIANT *rgvars);
+
+#endif

reactos/w32api/include/rpcndr.h

@@ -150,6 +150,16 @@ void RPC_ENTRY tree_size_ndr(void*,PRPC_MESSAGE,char*,unsigned char);
 void RPC_ENTRY tree_peek_ndr(PRPC_MESSAGE,unsigned char**,char*,unsigned char);
 void *RPC_ENTRY midl_allocate(int);
 
+typedef struct
+{
+  unsigned long WireCodeset;
+  unsigned long DesiredReceivingCodeset;
+  void *CSArrayInfo;
+} CS_STUB_INFO;
+
+typedef struct _NDR_ASYNC_MESSAGE *PNDR_ASYNC_MESSAGE;
+typedef struct _NDR_CORRELATION_INFO *PNDR_CORRELATION_INFO;
+
 #pragma pack(push,4)
 typedef struct _MIDL_STUB_MESSAGE {
 	PRPC_MESSAGE RpcMsg;
@@ -167,7 +177,7 @@ typedef struct _MIDL_STUB_MESSAGE {
 	int IgnoreEmbeddedPointers;
 	unsigned char *PointerBufferMark;
 	unsigned char fBufferValid;
-	unsigned char Unused;
+	unsigned char uFlags;
 	unsigned long MaxCount;
 	unsigned long Offset;
 	unsigned long ActualCount;
@@ -196,7 +206,21 @@ typedef struct _MIDL_STUB_MESSAGE {
 	unsigned long *SizePtrLengthArray;
 	void*pArgQueue;
 	unsigned long dwStubPhase;
-	unsigned long w2kReserved[5];
+	void *LowStackMark;
+	PNDR_ASYNC_MESSAGE pAsyncMsg;
+	PNDR_CORRELATION_INFO pCorrInfo;
+	unsigned char *pCorrMemory;
+	void *pMemoryList;
+	CS_STUB_INFO *pCSInfo;
+	unsigned char *ConformanceMark;
+	unsigned char *VarianceMark;
+	INT_PTR Unused;
+	struct _NDR_PROC_CONTEXT *pContext;
+	INT_PTR Reserved51_1;
+	INT_PTR Reserved51_2;
+	INT_PTR Reserved51_3;
+	INT_PTR Reserved51_4;
+	INT_PTR Reserved51_5;
 } MIDL_STUB_MESSAGE,*PMIDL_STUB_MESSAGE;
 #pragma pack(pop)
 typedef void*(__RPC_API *GENERIC_BINDING_ROUTINE)(void*);