} 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)
--- /dev/null
+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)
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 */
}
} 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;
-<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>
case WOM_CLOSE:
break;
case WOM_DONE:
- InterlockedIncrement(&s->dwEventCount);
+ InterlockedIncrement((PLONG)&s->dwEventCount);
TRACE("Returning waveHdr=%lx\n", dwParam1);
SetEvent(s->hEvent);
break;
{
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);
}
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
&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
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
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 ? */
}
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;
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 ? */
}
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;
-<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>
<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>
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 {
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_")