[PSDK] Update mmreg.h and rpcndr.h. CORE-13762

diff --git a/sdk/include/psdk/mmreg.h b/sdk/include/psdk/mmreg.h
index e0f886f..c6f6b56 100644 (file)
--- a/sdk/include/psdk/mmreg.h
+++ b/sdk/include/psdk/mmreg.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 

+#ifndef __WIDL__
+

 #ifndef __WINE_MMREG_H
 #define __WINE_MMREG_H
 
 #ifndef __WINE_MMREG_H
 #define __WINE_MMREG_H
 


@@ -537,3 +539,37 @@ typedef struct tagEXBMINFOHEADER {
 #endif
 
 #endif /* __WINE_MMREG_H */
 #endif
 
 #endif /* __WINE_MMREG_H */

+
+#else /* __WIDL__ */
+
+cpp_quote("#if 0")
+#pragma pack(push, 1)
+
+typedef struct tWAVEFORMATEX {
+    WORD wFormatTag;
+    WORD nChannels;
+    DWORD nSamplesPerSec;
+    DWORD nAvgBytesPerSec;
+    WORD nBlockAlign;
+    WORD wBitsPerSample;
+    WORD cbSize;
+    [size_is(cbSize)] BYTE pExtraBytes[];
+} WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX;
+
+typedef struct {
+    WORD wFormatTag;
+    WORD nChannels;
+    DWORD nSamplesPerSec;
+    DWORD nAvgBytesPerSec;
+    WORD nBlockAlign;
+    WORD wBitsPerSample;
+    WORD cbSize;
+    WORD wValidBitsPerSample;
+    DWORD dwChannelMask;
+    GUID SubFormat;
+} WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE;
+
+#pragma pack(pop)
+cpp_quote("#endif")
+
+#endif /* __WIDL__ */

diff --git a/sdk/include/psdk/rpcndr.h b/sdk/include/psdk/rpcndr.h
index 52f419b..bc06335 100644 (file)
--- a/sdk/include/psdk/rpcndr.h
+++ b/sdk/include/psdk/rpcndr.h
@@ -42,6 +42,18 @@ extern "C" {
 # define CONST_VTBL
 #endif
 
 # define CONST_VTBL
 #endif
 

+#ifndef EXTERN_GUID
+#ifdef __cplusplus
+#define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+        EXTERN_C const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \
+        EXTERN_C const GUID DECLSPEC_SELECTANY name = \
+       { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }
+#else
+#define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
+        EXTERN_C const GUID name
+#endif
+#endif
+

 /* stupid #if can't handle casts... this __stupidity
    is just a workaround for that limitation */
 
 /* stupid #if can't handle casts... this __stupidity
    is just a workaround for that limitation */