[sginsberg] 38904: - Correct the ulAssemblyRosterIndex member of ACTCTX_SECTION_KEYED_DATA -- it is ULONG (MSDN is wrong here) - 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
Author: sginsberg Date: Sun Jan 18 11:58:35 2009 New Revision: 38904
URL: http://svn.reactos.org/svn/reactos?rev=38904&view=rev Log: - Correct the ulAssemblyRosterIndex member of ACTCTX_SECTION_KEYED_DATA -- it is ULONG (MSDN is wrong here) - 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
Added: trunk/reactos/dll/win32/ole32/warningfix.diff Modified: trunk/reactos/dll/win32/ole32/marshal.c trunk/reactos/dll/win32/winmm/driver.c trunk/reactos/dll/win32/winmm/mci.c trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild trunk/reactos/dll/win32/winmm/playsound.c trunk/reactos/dll/win32/winmm/registry.c trunk/reactos/dll/win32/winmm/wavemap/wavemap.c trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild trunk/reactos/dll/win32/winmm/winmm.rbuild trunk/reactos/include/psdk/winbase.h trunk/reactos/include/reactos/idl/lsa.idl
Modified: trunk/reactos/dll/win32/ole32/marshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/marshal.c?r... ============================================================================== --- trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/marshal.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -824,7 +824,7 @@ } 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)
Added: trunk/reactos/dll/win32/ole32/warningfix.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/warningfix.... ============================================================================== --- trunk/reactos/dll/win32/ole32/warningfix.diff (added) +++ trunk/reactos/dll/win32/ole32/warningfix.diff [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -1,0 +1,13 @@ +Index: marshal.c +=================================================================== +--- marshal.c (revision 38899) ++++ marshal.c (working copy) +@@ -824,7 +824,7 @@ + } 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)
Modified: trunk/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/driver.c?re... ============================================================================== --- trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/driver.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -586,7 +586,7 @@
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 */ }
Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=3... ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -833,7 +833,7 @@ } 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;
Modified: trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/midimap/mid... ============================================================================== --- trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/midimap/midimap.rbuild [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -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>
Modified: trunk/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/playsound.c... ============================================================================== --- trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/playsound.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -154,7 +154,7 @@ 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 @@ { 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); }
Modified: trunk/reactos/dll/win32/winmm/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/registry.c?... ============================================================================== --- trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/registry.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -27,7 +27,6 @@ INT driver_count = 0; INT driver_index = 0; HKEY drivers_key; - BOOL ret;
DWORD value_name_length = 256; char value_name[value_name_length]; @@ -49,7 +48,7 @@ &value_name_length, NULL, &value_type, - value_data, + (LPBYTE)value_data, &value_data_length) == ERROR_SUCCESS ) { BOOL valid_driver = FALSE; @@ -74,25 +73,25 @@ is_mapper = TRUE; driver_count ++; } - else if ( ! strnicmp("wave", value_name, 4) ) + else if ( ! _strnicmp("wave", value_name, 4) ) { TRACE("Found a Wave driver: %s\n", value_data); valid_driver = TRUE; driver_count ++; } - else if ( ! strnicmp("midi", value_name, 4) ) + else if ( ! _strnicmp("midi", value_name, 4) ) { TRACE("Found a MIDI driver: %s\n", value_data); valid_driver = TRUE; driver_count ++; } - else if ( ! strnicmp("mixer", value_name, 5) ) + else if ( ! _strnicmp("mixer", value_name, 5) ) { TRACE("Found a mixer driver: %s\n", value_data); valid_driver = TRUE; driver_count ++; } - else if ( ! strnicmp("aux", value_name, 4) ) + else if ( ! _strnicmp("aux", value_name, 4) ) { TRACE("Found an aux driver: %s\n", value_data); valid_driver = TRUE;
Modified: trunk/reactos/dll/win32/winmm/wavemap/wavemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/wavemap/wav... ============================================================================== --- trunk/reactos/dll/win32/winmm/wavemap/wavemap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/wavemap/wavemap.c [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -358,11 +358,11 @@ 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 @@ }
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 @@ 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 @@ }
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;
Modified: trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/wavemap/wav... ============================================================================== --- trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/wavemap/wavemap.rbuild [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -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>
Modified: trunk/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.rbuil... ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.rbuild [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -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>
Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -1043,7 +1043,7 @@ 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 {
Modified: trunk/reactos/include/reactos/idl/lsa.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/lsa.idl... ============================================================================== --- trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/lsa.idl [iso-8859-1] Sun Jan 18 11:58:35 2009 @@ -10,7 +10,10 @@ 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_")
-
sginsberg＠svn.reactos.org