- Correct the ulAssemblyRosterIndex member of ACTCTX_SECTION_KEYED_DATA -- it is...

- Fix Lsa IDL's LUID/PLUID definition
- Silence winmm/midimap/wavemap warnings (these modules haven't been touched for a long time and are way out of sync)
- Silence a ole32 warning -- should be sent to Wine too

svn path=/trunk/; revision=38904

diff --git a/reactos/dll/win32/ole32/marshal.c b/reactos/dll/win32/ole32/marshal.c
index 42ea68d..014ae63 100644 (file)
--- a/reactos/dll/win32/ole32/marshal.c
+++ b/reactos/dll/win32/ole32/marshal.c
@@ -824,7 +824,7 @@ static inline void proxy_manager_set_context(struct proxy_manager *This, MSHCTX
     } while (new_dest_context != old_dest_context);
 
     if (dest_context_data)
-        InterlockedExchangePointer(&This->dest_context_data, dest_context_data);
+        (void)InterlockedExchangePointer(&This->dest_context_data, dest_context_data);
 }
 
 static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv)

diff --git a/reactos/dll/win32/ole32/warningfix.diff b/reactos/dll/win32/ole32/warningfix.diff
new file mode 100644 (file)
index 0000000..db19d34
--- /dev/null
+++ b/reactos/dll/win32/ole32/warningfix.diff
@@ -0,0 +1,13 @@
+Index: marshal.c\r
+===================================================================\r
+--- marshal.c  (revision 38899)\r
++++ marshal.c  (working copy)\r
+@@ -824,7 +824,7 @@\r
+     } while (new_dest_context != old_dest_context);
+ 
+     if (dest_context_data)
+-        InterlockedExchangePointer(&This->dest_context_data, dest_context_data);
++        (void)InterlockedExchangePointer(&This->dest_context_data, dest_context_data);
+ }
+ 
+ static HRESULT proxy_manager_query_local_interface(struct proxy_manager * This, REFIID riid, void ** ppv)

diff --git a/reactos/dll/win32/winmm/driver.c b/reactos/dll/win32/winmm/driver.c
index 7c86eb5..d38efca 100644 (file)
--- a/reactos/dll/win32/winmm/driver.c
+++ b/reactos/dll/win32/winmm/driver.c
@@ -586,7 +586,7 @@ BOOL WINAPI DriverCallback(DWORD dwCallBack, UINT uFlags, HDRVR hDev,
 
            TRACE("mmThread (%04x, %p) !\n", LOWORD(dwCallBack), lpMMThd);
            /* same as mmThreadSignal16 */
-           InterlockedIncrement(&lpMMThd->dwSignalCount);
+           InterlockedIncrement((PLONG)&lpMMThd->dwSignalCount);
            SetEvent(lpMMThd->hEvent);
            /* some other stuff on lpMMThd->hVxD */
        }

diff --git a/reactos/dll/win32/winmm/mci.c b/reactos/dll/win32/winmm/mci.c
index 664601b..d853528 100644 (file)
--- a/reactos/dll/win32/winmm/mci.c
+++ b/reactos/dll/win32/winmm/mci.c
@@ -833,7 +833,7 @@ static      BOOL    MCI_OpenMciDriver(LPWINE_MCIDRIVER wmd, LPCWSTR drvTyp, LPARAM lp)
     } else if (WINMM_CheckForMMSystem() && pFnMciMapMsg32WTo16) {
        WINMM_MapType   res;
 
-       switch (res = pFnMciMapMsg32WTo16(0, DRV_OPEN, 0, &lp)) {
+       switch (res = pFnMciMapMsg32WTo16(0, DRV_OPEN, 0, (DWORD*)&lp)) {
        case WINMM_MAP_MSGERROR:
            TRACE("Not handled yet (DRV_OPEN)\n");
            break;

diff --git a/reactos/dll/win32/winmm/midimap/midimap.rbuild b/reactos/dll/win32/winmm/midimap/midimap.rbuild
index 5933999..c7178b5 100644 (file)
--- a/reactos/dll/win32/winmm/midimap/midimap.rbuild
+++ b/reactos/dll/win32/winmm/midimap/midimap.rbuild
@@ -1,4 +1,4 @@
-<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" allowwarnings="true" unicode="yes">
+<module name="midimap" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MIDIMAP}" installbase="system32" installname="midimap.dll" unicode="yes">
        <importlibrary definition="midimap.spec" />
        <include base="midimap">.</include>
        <include base="ReactOS">include/wine</include>

diff --git a/reactos/dll/win32/winmm/playsound.c b/reactos/dll/win32/winmm/playsound.c
index a97e996..417ebd2 100644 (file)
--- a/reactos/dll/win32/winmm/playsound.c
+++ b/reactos/dll/win32/winmm/playsound.c
@@ -154,7 +154,7 @@ static void CALLBACK PlaySound_Callback(HWAVEOUT hwo, UINT uMsg,
     case WOM_CLOSE:
        break;
     case WOM_DONE:
-       InterlockedIncrement(&s->dwEventCount);
+       InterlockedIncrement((PLONG)&s->dwEventCount);
        TRACE("Returning waveHdr=%lx\n", dwParam1);
        SetEvent(s->hEvent);
        break;
@@ -167,8 +167,8 @@ static void PlaySound_WaitDone(struct playsound_data* s)
 {
     for (;;) {
        ResetEvent(s->hEvent);
-       if (InterlockedDecrement(&s->dwEventCount) >= 0) break;
-       InterlockedIncrement(&s->dwEventCount);
+       if (InterlockedDecrement((PLONG)&s->dwEventCount) >= 0) break;
+       InterlockedIncrement((PLONG)&s->dwEventCount);
 
        WaitForSingleObject(s->hEvent, INFINITE);
     }

diff --git a/reactos/dll/win32/winmm/registry.c b/reactos/dll/win32/winmm/registry.c
index 4ffa613..80429b2 100644 (file)
--- a/reactos/dll/win32/winmm/registry.c
+++ b/reactos/dll/win32/winmm/registry.c
@@ -27,7 +27,6 @@ BOOL LoadRegistryMMEDrivers(char* key)
     INT driver_count = 0;\r
     INT driver_index = 0;\r
     HKEY drivers_key;\r
-    BOOL ret;\r
 \r
     DWORD value_name_length = 256;\r
     char value_name[value_name_length];\r
@@ -49,7 +48,7 @@ BOOL LoadRegistryMMEDrivers(char* key)
                          &value_name_length,\r
                          NULL,\r
                          &value_type,\r
-                         value_data,\r
+                         (LPBYTE)value_data,\r
                          &value_data_length) == ERROR_SUCCESS )\r
     {\r
         BOOL valid_driver = FALSE;\r
@@ -74,25 +73,25 @@ BOOL LoadRegistryMMEDrivers(char* key)
                 is_mapper = TRUE;\r
                 driver_count ++;\r
             }\r
-            else if ( ! strnicmp("wave", value_name, 4) )\r
+            else if ( ! _strnicmp("wave", value_name, 4) )\r
             {\r
                 TRACE("Found a Wave driver: %s\n", value_data);\r
                 valid_driver = TRUE;\r
                 driver_count ++;\r
             }\r
-            else if ( ! strnicmp("midi", value_name, 4) )\r
+            else if ( ! _strnicmp("midi", value_name, 4) )\r
             {\r
                 TRACE("Found a MIDI driver: %s\n", value_data);\r
                 valid_driver = TRUE;\r
                 driver_count ++;\r
             }\r
-            else if ( ! strnicmp("mixer", value_name, 5) )\r
+            else if ( ! _strnicmp("mixer", value_name, 5) )\r
             {\r
                 TRACE("Found a mixer driver: %s\n", value_data);\r
                 valid_driver = TRUE;\r
                 driver_count ++;\r
             }\r
-            else if ( ! strnicmp("aux", value_name, 4) )\r
+            else if ( ! _strnicmp("aux", value_name, 4) )\r
             {\r
                 TRACE("Found an aux driver: %s\n", value_data);\r
                 valid_driver = TRUE;\r

diff --git a/reactos/dll/win32/winmm/wavemap/wavemap.c b/reactos/dll/win32/winmm/wavemap/wavemap.c
index 9fb8a7e..f6c9599 100644 (file)
--- a/reactos/dll/win32/winmm/wavemap/wavemap.c
+++ b/reactos/dll/win32/winmm/wavemap/wavemap.c
@@ -358,11 +358,11 @@ static    DWORD   wodPrepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2
     ash->cbStruct = sizeof(*ash);
     ash->fdwStatus = 0L;
     ash->dwUser = (DWORD)lpWaveHdrSrc;
-    ash->pbSrc = lpWaveHdrSrc->lpData;
+    ash->pbSrc = (LPBYTE)lpWaveHdrSrc->lpData;
     ash->cbSrcLength = lpWaveHdrSrc->dwBufferLength;
     /* ash->cbSrcLengthUsed */
     ash->dwSrcUser = lpWaveHdrSrc->dwUser; /* FIXME ? */
-    ash->pbDst = (LPSTR)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR);
+    ash->pbDst = (LPBYTE)(LPSTR)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR);
     ash->cbDstLength = size;
     /* ash->cbDstLengthUsed */
     ash->dwDstUser = 0; /* FIXME ? */
@@ -373,7 +373,7 @@ static      DWORD   wodPrepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2
     }
 
     lpWaveHdrDst = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER));
-    lpWaveHdrDst->lpData = ash->pbDst;
+    lpWaveHdrDst->lpData = (LPSTR)ash->pbDst;
     lpWaveHdrDst->dwBufferLength = size; /* conversion is not done yet */
     lpWaveHdrDst->dwFlags = 0;
     lpWaveHdrDst->dwLoops = 0;
@@ -912,11 +912,11 @@ static    DWORD   widPrepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwParam2
     ash->cbStruct = sizeof(*ash);
     ash->fdwStatus = 0L;
     ash->dwUser = (DWORD)lpWaveHdrDst;
-    ash->pbSrc = (LPSTR)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR);
+    ash->pbSrc = (LPBYTE)(LPSTR)ash + sizeof(ACMSTREAMHEADER) + sizeof(WAVEHDR);
     ash->cbSrcLength = size;
     /* ash->cbSrcLengthUsed */
     ash->dwSrcUser = 0L; /* FIXME ? */
-    ash->pbDst = lpWaveHdrDst->lpData;
+    ash->pbDst = (LPBYTE)lpWaveHdrDst->lpData;
     ash->cbDstLength = lpWaveHdrDst->dwBufferLength;
     /* ash->cbDstLengthUsed */
     ash->dwDstUser = lpWaveHdrDst->dwUser; /* FIXME ? */
@@ -927,7 +927,7 @@ static      DWORD   widPrepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwParam2
     }
 
     lpWaveHdrSrc = (LPWAVEHDR)((LPSTR)ash + sizeof(ACMSTREAMHEADER));
-    lpWaveHdrSrc->lpData = ash->pbSrc;
+    lpWaveHdrSrc->lpData = (LPSTR)ash->pbSrc;
     lpWaveHdrSrc->dwBufferLength = size; /* conversion is not done yet */
     lpWaveHdrSrc->dwFlags = 0;
     lpWaveHdrSrc->dwLoops = 0;

diff --git a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
index ef27502..dfaece3 100644 (file)
--- a/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
+++ b/reactos/dll/win32/winmm/wavemap/wavemap.rbuild
@@ -1,4 +1,4 @@
-<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" allowwarnings="true" unicode="yes">
+<module name="wavemap" type="win32dll" entrypoint="0" extension=".drv" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="msacm32.drv" unicode="yes">
        <importlibrary definition="msacm.spec" />
        <include base="wavemap">.</include>
        <include base="ReactOS">include/reactos/wine</include>

diff --git a/reactos/dll/win32/winmm/winmm.rbuild b/reactos/dll/win32/winmm/winmm.rbuild
index 58185cd..6070434 100644 (file)
--- a/reactos/dll/win32/winmm/winmm.rbuild
+++ b/reactos/dll/win32/winmm/winmm.rbuild
@@ -7,7 +7,7 @@
 <directory name="wavemap">
        <xi:include href="wavemap/wavemap.rbuild" />
 </directory>
-<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true" crt="msvcrt">
+<module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" crt="msvcrt">
        <importlibrary definition="winmm.spec" />
        <include base="winmm">.</include>
        <include base="ReactOS">include/reactos/wine</include>

diff --git a/reactos/include/psdk/winbase.h b/reactos/include/psdk/winbase.h
index eb3ba27..f706ef9 100644 (file)
--- a/reactos/include/psdk/winbase.h
+++ b/reactos/include/psdk/winbase.h
@@ -1043,7 +1043,7 @@ typedef struct tagACTCTX_SECTION_KEYED_DATA {
        PVOID lpSectionBase;
        ULONG ulSectionTotalLength;
        HANDLE hActCtx;
-       HANDLE ulAssemblyRosterIndex;
+       ULONG ulAssemblyRosterIndex;
 } ACTCTX_SECTION_KEYED_DATA,*PACTCTX_SECTION_KEYED_DATA;
 typedef const ACTCTX_SECTION_KEYED_DATA *PCACTCTX_SECTION_KEYED_DATA;
 typedef struct _ACTIVATION_CONTEXT_BASIC_INFORMATION {

diff --git a/reactos/include/reactos/idl/lsa.idl b/reactos/include/reactos/idl/lsa.idl
index 7c8b30b..08b214a 100644 (file)
--- a/reactos/include/reactos/idl/lsa.idl
+++ b/reactos/include/reactos/idl/lsa.idl
@@ -10,7 +10,10 @@ typedef [context_handle] PVOID LSAPR_HANDLE;
 typedef LSAPR_HANDLE *PLSAPR_HANDLE;
 
 cpp_quote("#ifndef _WINNT_H")
-typedef LARGE_INTEGER LUID, *PLUID;
+typedef struct _LUID {
+    ULONG LowPart;
+    LONG HighPart;
+} LUID, *PLUID;
 cpp_quote("#endif")
 
 cpp_quote("#ifndef _NTDEF_")