Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[mbosma] 17078: Actually call the DDRAW_DllRegisterServer() and DDRAW_DllUnregisterServer() functions from DllMain.
by mbosma＠svn.reactos.com 05 Aug '05

05 Aug '05

Actually call the DDRAW_DllRegisterServer() and DDRAW_DllUnregisterServer() functions from DllMain. Modified: trunk/reactos/lib/ddraw/regsvr.c _____ Modified: trunk/reactos/lib/ddraw/regsvr.c --- trunk/reactos/lib/ddraw/regsvr.c 2005-08-05 20:30:42 UTC (rev 17077) +++ trunk/reactos/lib/ddraw/regsvr.c 2005-08-05 20:46:20 UTC (rev 17078) @@ -495,3 +495,21 @@ hr = unregister_interfaces(interface_list); return hr; } + +BOOL WINAPI DllMain(HINSTANCE hInstance,DWORD fwdReason, LPVOID lpvReserved) +{ + switch(fwdReason) + { + case DLL_PROCESS_ATTACH: + DDRAW_DllRegisterServer(); + break; + case DLL_THREAD_ATTACH: + break; + case DLL_PROCESS_DETACH: + DDRAW_DllUnregisterServer(); + break; + case DLL_THREAD_DETACH: + break; + } + return(TRUE); +}

1 0

[gvg] 17077: Sync to Wine-20050628:
by gvg＠svn.reactos.com 05 Aug '05

05 Aug '05

Sync to Wine-20050628: Stefan Leichter <Stefan.Leichter(a)camLine.com> - Update version resource of msiexec.exe to current version shipped from Windows Update. Mike McCormack <mike(a)codeweavers.com> - Fix some declaration and write string warnings. Modified: trunk/reactos/subsys/system/msiexec/msiexec.c Modified: trunk/reactos/subsys/system/msiexec/version.rc _____ Modified: trunk/reactos/subsys/system/msiexec/msiexec.c --- trunk/reactos/subsys/system/msiexec/msiexec.c 2005-08-05 20:25:46 UTC (rev 17076) +++ trunk/reactos/subsys/system/msiexec/msiexec.c 2005-08-05 20:30:42 UTC (rev 17077) @@ -386,7 +386,7 @@ return count; } -void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) +static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv ) { WCHAR **argv, *p = msi_strdup(cmdline); int i, n; @@ -404,7 +404,7 @@ *pargv = argv; } -BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) +static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv ) { LONG r; HKEY hkey = 0, hkeyArgs = 0; _____ Modified: trunk/reactos/subsys/system/msiexec/version.rc --- trunk/reactos/subsys/system/msiexec/version.rc 2005-08-05 20:25:46 UTC (rev 17076) +++ trunk/reactos/subsys/system/msiexec/version.rc 2005-08-05 20:30:42 UTC (rev 17077) @@ -18,10 +18,11 @@ #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" -#define WINE_FILEVERSION 2,0,2600,1183 -#define WINE_FILEVERSION_STR "2.0.2600.1183" -#define WINE_PRODUCTVERSION 2,0,2600,1183 -#define WINE_PRODUCTVERSION_STR "2.0.2600.1183" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 3,1,4000,1823 +#define WINE_FILEVERSION_STR "3.1.4000.1823" +#define WINE_PRODUCTVERSION 3,1,4000,1823 +#define WINE_PRODUCTVERSION_STR "3.1.4000.1823" #define WINE_PRODUCTNAME_STR "Wine Installer" #include "wine/wine_common_ver.rc"

1 0

[gvg] 17076: Sync to Wine-20050628:
by gvg＠svn.reactos.com 05 Aug '05

05 Aug '05

Sync to Wine-20050628: Alexandre Julliard <julliard(a)winehq.org> - Get rid of the WaveMapper and MidiMapper options, the defaults should be good enough in all cases. - Moved the audio driver configuration to HKCU\Software\Wine\Drivers and changed it a bit to follow the model of the graphics driver. - Added magic comments to all Wine-specific registry accesses to make them easier to grep. Mike McCormack <mike(a)codeweavers.com> - Make a function static. Francois Gouget <fgouget(a)free.fr> - Fix winapi_check documentation warnings. Rein Klazes <wijn(a)wanadoo.nl> - In MCI_(Un)MapMsg16To32W with wMsg == MCI_OPEN(_DRIVER) only do strdupAtoW on those parameters that are flagged to be a string. Modified: trunk/reactos/lib/winmm/lolvldrv.c Modified: trunk/reactos/lib/winmm/mci.c Modified: trunk/reactos/lib/winmm/message16.c Modified: trunk/reactos/lib/winmm/mmsystem.c Modified: trunk/reactos/lib/winmm/mmsystem.spec Modified: trunk/reactos/lib/winmm/sound.spec Modified: trunk/reactos/lib/winmm/winemm.h Modified: trunk/reactos/lib/winmm/winmm.spec Modified: trunk/reactos/lib/winmm/winmm_Cs.rc Modified: trunk/reactos/lib/winmm/winmm_De.rc Modified: trunk/reactos/lib/winmm/winmm_En.rc Modified: trunk/reactos/lib/winmm/winmm_Es.rc Modified: trunk/reactos/lib/winmm/winmm_Fr.rc Modified: trunk/reactos/lib/winmm/winmm_It.rc Modified: trunk/reactos/lib/winmm/winmm_Ja.rc Modified: trunk/reactos/lib/winmm/winmm_Nl.rc Modified: trunk/reactos/lib/winmm/winmm_Pt.rc Modified: trunk/reactos/lib/winmm/winmm_Ru.rc Modified: trunk/reactos/lib/winmm/winmm_Si.rc Modified: trunk/reactos/lib/winmm/winmm_Sk.rc Modified: trunk/reactos/lib/winmm/winmm_res.rc _____ Modified: trunk/reactos/lib/winmm/lolvldrv.c --- trunk/reactos/lib/winmm/lolvldrv.c 2005-08-05 18:27:06 UTC (rev 17075) +++ trunk/reactos/lib/winmm/lolvldrv.c 2005-08-05 20:25:46 UTC (rev 17076) @@ -414,7 +414,7 @@ /*********************************************************************** *** * MMDRV_GetByID [internal] */ -LPWINE_MLD MMDRV_GetByID(UINT uDevID, UINT type) +static LPWINE_MLD MMDRV_GetByID(UINT uDevID, UINT type) { TRACE("(%04x, %04x)\n", uDevID, type); if (uDevID < llTypes[type].wMaxId) @@ -731,43 +731,19 @@ strcpy(mapper_buffer, WINE_DEFAULT_WINMM_MAPPER); strcpy(midi_buffer, WINE_DEFAULT_WINMM_MIDI); - if (! RegCreateKeyA(HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\WinMM", &hKey)) { + /* @@ Wine registry key: HKCU\Software\Wine\Drivers */ + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Drivers", &hKey)) + { size = sizeof(driver_buffer); - if (RegQueryValueExA(hKey, "Drivers", 0, &type, (LPVOID)driver_buffer, &size)) + if (RegQueryValueExA(hKey, "Audio", 0, &type, (LPVOID)driver_buffer, &size)) strcpy(driver_buffer, WINE_DEFAULT_WINMM_DRIVER); - - /* finish with mappers */ - size = sizeof(mapper_buffer); - if (RegQueryValueExA(hKey, "WaveMapper", 0, &type, (LPVOID)mapper_buffer, &size)) - strcpy(mapper_buffer, WINE_DEFAULT_WINMM_MAPPER); - - size = sizeof(midi_buffer); - if (RegQueryValueExA(hKey, "MidiMapper", 0, &type, (LPVOID)midi_buffer, &size)) - strcpy(midi_buffer, WINE_DEFAULT_WINMM_MIDI); - - RegCloseKey(hKey); } -#ifndef __REACTOS__ - char* p1; - char* p2; - - p1 = driver_buffer; - while (p1) { - p2 = strchr(p1, ';'); - if (p2) *p2++ = '\0'; - ret |= MMDRV_Install(p1, p1, FALSE); - p1 = p2; - } -#endif - -#ifdef __REACTOS__ // AG: TESTING: ret |= MMDRV_Install("mmdrv.dll", "mmdrv.dll", FALSE); -#endif - ret |= MMDRV_Install("wavemapper", mapper_buffer, TRUE); - ret |= MMDRV_Install("midimapper", midi_buffer, TRUE); + ret |= MMDRV_Install("wavemapper", WINE_DEFAULT_WINMM_MAPPER, TRUE); + ret |= MMDRV_Install("midimapper", WINE_DEFAULT_WINMM_MIDI, TRUE); return ret; } _____ Modified: trunk/reactos/lib/winmm/mci.c --- trunk/reactos/lib/winmm/mci.c 2005-08-05 18:27:06 UTC (rev 17075) +++ trunk/reactos/lib/winmm/mci.c 2005-08-05 20:25:46 UTC (rev 17076) @@ -68,8 +68,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mci); -WINMM_MapType (*pFnMciMapMsg16To32W) (WORD,WORD,DWORD*) /* = NULL */; -WINMM_MapType (*pFnMciUnMapMsg16To32W)(WORD,WORD,DWORD) /* = NULL */; +WINMM_MapType (*pFnMciMapMsg16To32W) (WORD,WORD,DWORD,DWORD*) /* = NULL */; +WINMM_MapType (*pFnMciUnMapMsg16To32W)(WORD,WORD,DWORD,DWORD) /* = NULL */; WINMM_MapType (*pFnMciMapMsg32WTo16) (WORD,WORD,DWORD,DWORD*) /* = NULL */; WINMM_MapType (*pFnMciUnMapMsg32WTo16)(WORD,WORD,DWORD,DWORD) /* = NULL */; @@ -1595,7 +1595,7 @@ if (wmd->bIs32 && pFnMciMapMsg16To32W) { WINMM_MapType res; - switch (res = pFnMciMapMsg16To32W(wmd->wType, wMsg, &dwParam2)) { + switch (res = pFnMciMapMsg16To32W(wmd->wType, wMsg, dwParam1, &dwParam2)) { case WINMM_MAP_MSGERROR: TRACE("Not handled yet (%s)\n", MCI_MessageToString(wMsg)); dwRet = MCIERR_DRIVER_INTERNAL; @@ -1608,7 +1608,7 @@ case WINMM_MAP_OKMEM: dwRet = SendDriverMessage(wmd->hDriver, wMsg, dwParam1, dwParam2); if (res == WINMM_MAP_OKMEM) - pFnMciUnMapMsg16To32W(wmd->wType, wMsg, dwParam2); + pFnMciUnMapMsg16To32W(wmd->wType, wMsg, dwParam1, dwParam2); break; } } else { @@ -1966,11 +1966,11 @@ if (bFrom32) { dwRet = MCI_Open(dwParam1, (LPMCI_OPEN_PARMSW)dwParam2); } else if (pFnMciMapMsg16To32W) { - switch (pFnMciMapMsg16To32W(0, wMsg, &dwParam2)) { + switch (pFnMciMapMsg16To32W(0, wMsg, dwParam1, &dwParam2)) { case WINMM_MAP_OK: case WINMM_MAP_OKMEM: dwRet = MCI_Open(dwParam1, (LPMCI_OPEN_PARMSW)dwParam2); - pFnMciUnMapMsg16To32W(0, wMsg, dwParam2); + pFnMciUnMapMsg16To32W(0, wMsg, dwParam1, dwParam2); break; default: break; /* so that gcc does not bark */ } @@ -1980,11 +1980,11 @@ if (bFrom32) { dwRet = MCI_Close(wDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); } else if (pFnMciMapMsg16To32W) { - switch (pFnMciMapMsg16To32W(0, wMsg, &dwParam2)) { + switch (pFnMciMapMsg16To32W(0, wMsg, dwParam1, &dwParam2)) { case WINMM_MAP_OK: case WINMM_MAP_OKMEM: dwRet = MCI_Close(wDevID, dwParam1, (LPMCI_GENERIC_PARMS)dwParam2); - pFnMciUnMapMsg16To32W(0, wMsg, dwParam2); + pFnMciUnMapMsg16To32W(0, wMsg, dwParam1, dwParam2); break; default: break; /* so that gcc does not bark */ } @@ -1994,11 +1994,11 @@ if (bFrom32) { dwRet = MCI_SysInfo(wDevID, dwParam1, (LPMCI_SYSINFO_PARMSW)dwParam2); } else if (pFnMciMapMsg16To32W) { - switch (pFnMciMapMsg16To32W(0, wMsg, &dwParam2)) { + switch (pFnMciMapMsg16To32W(0, wMsg, dwParam1, &dwParam2)) { case WINMM_MAP_OK: case WINMM_MAP_OKMEM: dwRet = MCI_SysInfo(wDevID, dwParam1, (LPMCI_SYSINFO_PARMSW)dwParam2); - pFnMciUnMapMsg16To32W(0, wMsg, dwParam2); + pFnMciUnMapMsg16To32W(0, wMsg, dwParam1, dwParam2); break; default: break; /* so that gcc does not bark */ } @@ -2008,11 +2008,11 @@ if (bFrom32) { dwRet = MCI_Break(wDevID, dwParam1, (LPMCI_BREAK_PARMS)dwParam2); } else if (pFnMciMapMsg16To32W) { - switch (pFnMciMapMsg16To32W(0, wMsg, &dwParam2)) { + switch (pFnMciMapMsg16To32W(0, wMsg, dwParam1, &dwParam2)) { case WINMM_MAP_OK: case WINMM_MAP_OKMEM: dwRet = MCI_Break(wDevID, dwParam1, (LPMCI_BREAK_PARMS)dwParam2); - pFnMciUnMapMsg16To32W(0, wMsg, dwParam2); + pFnMciUnMapMsg16To32W(0, wMsg, dwParam1, dwParam2); break; default: break; /* so that gcc does not bark */ } @@ -2022,11 +2022,11 @@ if (bFrom32) { dwRet = MCI_Sound(wDevID, dwParam1, (LPMCI_SOUND_PARMSW)dwParam2); } else if (pFnMciMapMsg16To32W) { - switch (pFnMciMapMsg16To32W(0, wMsg, &dwParam2)) { + switch (pFnMciMapMsg16To32W(0, wMsg, dwParam1, &dwParam2)) { case WINMM_MAP_OK: case WINMM_MAP_OKMEM: dwRet = MCI_Sound(wDevID, dwParam1, (LPMCI_SOUND_PARMSW)dwParam2); - pFnMciUnMapMsg16To32W(0, wMsg, dwParam2); + pFnMciUnMapMsg16To32W(0, wMsg, dwParam1, dwParam2); break; default: break; /* so that gcc does not bark */ } _____ Modified: trunk/reactos/lib/winmm/message16.c --- trunk/reactos/lib/winmm/message16.c 2005-08-05 18:27:06 UTC (rev 17075) +++ trunk/reactos/lib/winmm/message16.c 2005-08-05 20:25:46 UTC (rev 17076) @@ -2522,7 +2522,7 @@ /*********************************************************************** *** * MCI_MapMsg16To32W [internal] */ -static WINMM_MapType MCI_MapMsg16To32W(WORD uDevType, WORD wMsg, DWORD* lParam) +static WINMM_MapType MCI_MapMsg16To32W(WORD uDevType, WORD wMsg, DWORD dwFlags, DWORD* lParam) { if (*lParam == 0) return WINMM_MAP_OK; @@ -2632,9 +2632,18 @@ mop32w = (LPMCI_OPEN_PARMSW)((char*)mop32w + sizeof(LPMCI_OPEN_PARMS16)); mop32w->dwCallback = mop16->dwCallback; mop32w->wDeviceID = mop16->wDeviceID; - mop32w->lpstrDeviceType = MCI_strdupAtoW(MapSL(mop16->lpstrDeviceType)); - mop32w->lpstrElementName = MCI_strdupAtoW(MapSL(mop16->lpstrElementName)); - mop32w->lpstrAlias = MCI_strdupAtoW(MapSL(mop16->lpstrAlias)); + if( ( dwFlags & ( MCI_OPEN_TYPE | MCI_OPEN_TYPE_ID)) == MCI_OPEN_TYPE) + mop32w->lpstrDeviceType = MCI_strdupAtoW(MapSL(mop16->lpstrDeviceType)); + else + mop32w->lpstrDeviceType = (LPWSTR) mop16->lpstrDeviceType; + if( ( dwFlags & ( MCI_OPEN_ELEMENT | MCI_OPEN_ELEMENT_ID)) == MCI_OPEN_ELEMENT) + mop32w->lpstrElementName = MCI_strdupAtoW(MapSL(mop16->lpstrElementName)); + else + mop32w->lpstrElementName = (LPWSTR) mop16->lpstrElementName; + if( ( dwFlags & MCI_OPEN_ALIAS)) + mop32w->lpstrAlias = MCI_strdupAtoW(MapSL(mop16->lpstrAlias)); + else + mop32w->lpstrAlias = (LPWSTR) mop16->lpstrAlias; /* copy extended information if any... * FIXME: this may seg fault if initial structure does not contain them and * the reads after msip16 fail under LDT limits... @@ -2707,7 +2716,7 @@ /*********************************************************************** *** * MCI_UnMapMsg16To32W [internal] */ -static WINMM_MapType MCI_UnMapMsg16To32W(WORD uDevType, WORD wMsg, DWORD lParam) +static WINMM_MapType MCI_UnMapMsg16To32W(WORD uDevType, WORD wMsg, DWORD dwFlags, DWORD lParam) { switch (wMsg) { /* case MCI_CAPTURE */ @@ -2798,9 +2807,12 @@ LPMCI_OPEN_PARMS16 mop16 = *(LPMCI_OPEN_PARMS16*)((char*)mop32w - sizeof(LPMCI_OPEN_PARMS16)); mop16->wDeviceID = mop32w->wDeviceID; - HeapFree(GetProcessHeap(), 0, mop32w->lpstrDeviceType); - HeapFree(GetProcessHeap(), 0, mop32w->lpstrElementName); - HeapFree(GetProcessHeap(), 0, mop32w->lpstrAlias); + if( ( dwFlags & ( MCI_OPEN_TYPE | MCI_OPEN_TYPE_ID)) == MCI_OPEN_TYPE) + HeapFree(GetProcessHeap(), 0, mop32w->lpstrDeviceType); + if( ( dwFlags & ( MCI_OPEN_ELEMENT | MCI_OPEN_ELEMENT_ID)) == MCI_OPEN_ELEMENT) + HeapFree(GetProcessHeap(), 0, mop32w->lpstrElementName); + if( ( dwFlags & MCI_OPEN_ALIAS)) + HeapFree(GetProcessHeap(), 0, mop32w->lpstrAlias); if (!HeapFree(GetProcessHeap(), 0, (LPVOID)(lParam - sizeof(LPMCI_OPEN_PARMS16)))) FIXME("bad free line=%d\n", __LINE__); } _____ Modified: trunk/reactos/lib/winmm/mmsystem.c --- trunk/reactos/lib/winmm/mmsystem.c 2005-08-05 18:27:06 UTC (rev 17075) +++ trunk/reactos/lib/winmm/mmsystem.c 2005-08-05 20:25:46 UTC (rev 17076) @@ -109,7 +109,7 @@ } /*********************************************************************** *** - * MMSYSTEM_WEP [MMSYSTEM.1] + * WEP [MMSYSTEM.1] */ int WINAPI MMSYSTEM_WEP(HINSTANCE16 hInstance, WORD wDataSeg, WORD cbHeapSize, LPSTR lpCmdLine) _____ Modified: trunk/reactos/lib/winmm/mmsystem.spec --- trunk/reactos/lib/winmm/mmsystem.spec 2005-08-05 18:27:06 UTC (rev 17075) +++ trunk/reactos/lib/winmm/mmsystem.spec 2005-08-05 20:25:46 UTC (rev 17076) @@ -1,176 +1,176 @@ -1 pascal WEP(word word word ptr) MMSYSTEM_WEP -2 pascal sndPlaySound(ptr word) sndPlaySound16 -3 pascal PlaySound(ptr word long) PlaySound16 -4 pascal DllEntryPoint(long word word word long word) MMSYSTEM_LibMain -5 pascal mmsystemGetVersion() mmsystemGetVersion16 -6 pascal DriverProc(long word word long long) DriverProc16 -8 pascal WMMMidiRunOnce() WMMMidiRunOnce16 -30 pascal -ret16 OutputDebugStr(str) OutputDebugStr16 -31 pascal DriverCallback(long word word word long long long) DriverCallback16 -32 pascal StackEnter() StackEnter16 -33 pascal StackLeave() StackLeave16 -34 stub MMDRVINSTALL -101 pascal joyGetNumDevs() joyGetNumDevs16 -102 pascal joyGetDevCaps(word ptr word) joyGetDevCaps16 -103 pascal joyGetPos(word ptr) joyGetPos16 -104 pascal joyGetThreshold(word ptr) joyGetThreshold16 -105 pascal joyReleaseCapture(word) joyReleaseCapture16 -106 pascal joySetCapture(word word word word) joySetCapture16 -107 pascal joySetThreshold(word word) joySetThreshold16 -109 pascal joySetCalibration(word) joySetCalibration16 -110 pascal joyGetPosEx(word ptr) joyGetPosEx16 -111 stub JOYCONFIGCHANGED -201 pascal midiOutGetNumDevs() midiOutGetNumDevs16 -202 pascal midiOutGetDevCaps(word ptr word) midiOutGetDevCaps16 -203 pascal midiOutGetErrorText(word ptr word) midiOutGetErrorText16 -204 pascal midiOutOpen(ptr word long long long) midiOutOpen16 -205 pascal midiOutClose(word) midiOutClose16 -206 pascal midiOutPrepareHeader(word segptr word) midiOutPrepareHeader16 -207 pascal midiOutUnprepareHeader(word segptr word) midiOutUnprepareHeader16 -208 pascal midiOutShortMsg(word long) midiOutShortMsg16 -209 pascal midiOutLongMsg(word segptr word) midiOutLongMsg16 -210 pascal midiOutReset(word) midiOutReset16 -211 pascal midiOutGetVolume(word ptr) midiOutGetVolume16 -212 pascal midiOutSetVolume(word long) midiOutSetVolume16 -213 pascal midiOutCachePatches(word word ptr word) midiOutCachePatches16 -214 pascal midiOutCacheDrumPatches(word word ptr word) midiOutCacheDrumPatches16 -215 pascal midiOutGetID(word ptr) midiOutGetID16 -216 pascal midiOutMessage(word word long long) midiOutMessage16 -250 pascal midiStreamProperty(word ptr long) midiStreamProperty16 -251 pascal midiStreamOpen(ptr ptr long long long long) midiStreamOpen16 -252 pascal midiStreamClose(word) midiStreamClose16 -253 pascal midiStreamPosition(word ptr word) midiStreamPosition16 -254 pascal midiStreamOut(word ptr word) midiStreamOut16 -255 pascal midiStreamPause(word) midiStreamPause16 -256 pascal midiStreamRestart(word) midiStreamRestart16 -257 pascal midiStreamStop(word) midiStreamStop16 -301 pascal midiInGetNumDevs() midiInGetNumDevs16 -302 pascal midiInGetDevCaps(word ptr word) midiInGetDevCaps16 -303 pascal midiInGetErrorText(word ptr word) midiOutGetErrorText16 -304 pascal midiInOpen(ptr word long long long) midiInOpen16 -305 pascal midiInClose(word) midiInClose16 -306 pascal midiInPrepareHeader(word segptr word) midiInPrepareHeader16 -307 pascal midiInUnprepareHeader(word segptr word) midiInUnprepareHeader16 -308 pascal midiInAddBuffer(word segptr word) midiInAddBuffer16 -309 pascal midiInStart(word) midiInStart16 -310 pascal midiInStop(word) midiInStop16 -311 pascal midiInReset(word) midiInReset16 -312 pascal midiInGetID(word ptr) midiInGetID16 -313 pascal midiInMessage(word word long long) midiInMessage16 -350 pascal auxGetNumDevs() auxGetNumDevs16 -351 pascal auxGetDevCaps(word ptr word) auxGetDevCaps16 -352 pascal auxGetVolume(word ptr) auxGetVolume16 -353 pascal auxSetVolume(word long) auxSetVolume16 -354 pascal auxOutMessage(word word long long) auxOutMessage16 -401 pascal waveOutGetNumDevs() waveOutGetNumDevs16 -402 pascal waveOutGetDevCaps(word ptr word) waveOutGetDevCaps16 -403 pascal waveOutGetErrorText(word ptr word) waveOutGetErrorText16 -404 pascal waveOutOpen(ptr word ptr long long long) waveOutOpen16 -405 pascal waveOutClose(word) waveOutClose16 -406 pascal waveOutPrepareHeader(word segptr word) waveOutPrepareHeader16 -407 pascal waveOutUnprepareHeader(word segptr word) waveOutUnprepareHeader16 -408 pascal waveOutWrite(word segptr word) waveOutWrite16 -409 pascal waveOutPause(word) waveOutPause16 -410 pascal waveOutRestart(word) waveOutRestart16 -411 pascal waveOutReset(word) waveOutReset16 -412 pascal waveOutGetPosition(word ptr word) waveOutGetPosition16 -413 pascal waveOutGetPitch(word ptr) waveOutGetPitch16 -414 pascal waveOutSetPitch(word long) waveOutSetPitch16 -415 pascal waveOutGetVolume(word ptr) waveOutGetVolume16 -416 pascal waveOutSetVolume(word long) waveOutSetVolume16 -417 pascal waveOutGetPlaybackRate(word ptr) waveOutGetPlaybackRate16 -418 pascal waveOutSetPlaybackRate(word long) waveOutSetPlaybackRate16 -419 pascal waveOutBreakLoop(word) waveOutBreakLoop16 -420 pascal waveOutGetID(word ptr) waveOutGetID16 -421 pascal waveOutMessage(word word long long) waveOutMessage16 -501 pascal waveInGetNumDevs() waveInGetNumDevs16 -502 pascal waveInGetDevCaps(word ptr word) waveInGetDevCaps16 -503 pascal waveInGetErrorText(word ptr word) waveOutGetErrorText16 -504 pascal waveInOpen(ptr word ptr long long long) waveInOpen16 -505 pascal waveInClose(word) waveInClose16 -506 pascal waveInPrepareHeader(word segptr word) waveInPrepareHeader16 -507 pascal waveInUnprepareHeader(word segptr word) waveInUnprepareHeader16 -508 pascal waveInAddBuffer(word segptr word) waveInAddBuffer16 -509 pascal waveInStart(word) waveInStart16 -510 pascal waveInStop(word) waveInStop16 -511 pascal waveInReset(word) waveInReset16 -512 pascal waveInGetPosition(word ptr word) waveInGetPosition16 -513 pascal waveInGetID(word ptr) waveInGetID16 -514 pascal waveInMessage(word word long long) waveInMessage16 -601 pascal timeGetSystemTime(ptr word) timeGetSystemTime16 -602 pascal timeSetEvent(word word segptr long word) timeSetEvent16 -603 pascal timeKillEvent(word) timeKillEvent16 -604 pascal timeGetDevCaps(ptr word) timeGetDevCaps16 -605 pascal timeBeginPeriod(word) timeBeginPeriod16 -606 pascal timeEndPeriod(word) timeEndPeriod16 -607 pascal timeGetTime() timeGetTime -701 pascal mciSendCommand(word word long long) mciSendCommand16 -702 pascal mciSendString(str ptr word word) mciSendString16 -703 pascal mciGetDeviceID(ptr) mciGetDeviceID16 -705 pascal mciLoadCommandResource(word str word) mciLoadCommandResource16 -706 pascal mciGetErrorString(long ptr word) mciGetErrorString16 -707 pascal mciSetDriverData(word long) mciSetDriverData16 -708 pascal mciGetDriverData(word) mciGetDriverData16 -710 pascal mciDriverYield(word) mciDriverYield16 -711 pascal mciDriverNotify(word word word) mciDriverNotify16 -712 pascal mciExecute(ptr) mciExecute -713 pascal mciFreeCommandResource(word) mciFreeCommandResource16 -714 pascal mciSetYieldProc(word ptr long) mciSetYieldProc16 -715 pascal mciGetDeviceIDFromElementID(long ptr) mciGetDeviceIDFromElementID16 -716 pascal mciGetYieldProc(word ptr) mciGetYieldProc16 -717 pascal mciGetCreatorTask(word) mciGetCreatorTask16 -800 pascal mixerGetNumDevs() mixerGetNumDevs16 -801 pascal mixerGetDevCaps(word ptr word) mixerGetDevCaps16 -802 pascal mixerOpen(ptr word long long long) mixerOpen16 -803 pascal mixerClose(word) mixerClose16 -804 pascal mixerMessage(word word long long) mixerMessage16 -805 pascal mixerGetLineInfo(word ptr long) mixerGetLineInfo16 -806 pascal mixerGetID(word ptr long) mixerGetID16 -807 pascal mixerGetLineControls(word ptr long) mixerGetLineControls16 -808 pascal mixerGetControlDetails(word ptr long) mixerGetControlDetails16 -809 pascal mixerSetControlDetails(word ptr long) mixerSetControlDetails16 -900 pascal mmTaskCreate(long ptr long) mmTaskCreate16 -902 pascal mmTaskBlock(word) mmTaskBlock16 -903 pascal mmTaskSignal(word) mmTaskSignal16 -904 pascal -ret16 mmGetCurrentTask() mmGetCurrentTask16 -905 pascal mmTaskYield() mmTaskYield16 -1100 pascal DrvOpen(str str long) DrvOpen16 -1101 pascal DrvClose(word long long) DrvClose16 -1102 pascal DrvSendMessage(word word long long) DrvSendMessage16 -1103 pascal DrvGetModuleHandle(word) DrvGetModuleHandle16 -1104 pascal DrvDefDriverProc(long word word long long) DrvDefDriverProc16 -1120 pascal mmThreadCreate(segptr ptr long long) mmThreadCreate16 -1121 pascal mmThreadSignal(word) mmThreadSignal16 -1122 pascal mmThreadBlock(word) mmThreadBlock16 -1123 pascal mmThreadIsCurrent(word) mmThreadIsCurrent16 -1124 pascal mmThreadIsValid(word) mmThreadIsValid16 -1125 pascal mmThreadGetTask(word) mmThreadGetTask16 -1150 pascal mmShowMMCPLPropertySheet(word str str str) mmShowMMCPLPropertySheet16 - -1210 pascal mmioOpen(str ptr long) mmioOpen16 -1211 pascal mmioClose(word word) mmioClose16 -1212 pascal mmioRead(word ptr long) mmioRead16 -1213 pascal mmioWrite(word ptr long) mmioWrite16 -1214 pascal mmioSeek(word long word) mmioSeek16 -1215 pascal mmioGetInfo(word ptr word) mmioGetInfo16 -1216 pascal mmioSetInfo(word ptr word) mmioSetInfo16 -1217 pascal mmioSetBuffer(word segptr long word) mmioSetBuffer16 -1218 pascal mmioFlush(word word) mmioFlush16 -1219 pascal mmioAdvance(word ptr word) mmioAdvance16 -1220 pascal mmioStringToFOURCC(str word) mmioStringToFOURCC16 -1221 pascal mmioInstallIOProc(long ptr long) mmioInstallIOProc16 -1222 pascal mmioSendMessage(word word long long) mmioSendMessage16 -1223 pascal mmioDescend(word ptr ptr word) mmioDescend16 -1224 pascal mmioAscend(word ptr word) mmioAscend16 -1225 pascal mmioCreateChunk(word ptr word) mmioCreateChunk16 -1226 pascal mmioRename(ptr ptr ptr long) mmioRename16 - -#2000 stub WINMMF_THUNKDATA16 -#2001 stub RING3_DEVLOADER -#2002 stub WINMMTILEBUFFER -#2003 stub WINMMUNTILEBUFFER -#2005 stub MCIGETTHUNKTABLE -#2006 stub WINMMSL_THUNKDATA16 - -# these are Wine only exported functions. Is there another way to do it ? -2047 pascal __wine_mmThreadEntryPoint(long) WINE_mmThreadEntryPoint +1 pascal WEP(word word word ptr) MMSYSTEM_WEP +2 pascal sndPlaySound(ptr word) sndPlaySound16 +3 pascal PlaySound(ptr word long) PlaySound16 +4 pascal DllEntryPoint(long word word word long word) MMSYSTEM_LibMain +5 pascal mmsystemGetVersion() mmsystemGetVersion16 +6 pascal DriverProc(long word word long long) DriverProc16 +8 pascal WMMMidiRunOnce() WMMMidiRunOnce16 +30 pascal -ret16 OutputDebugStr(str) OutputDebugStr16 +31 pascal DriverCallback(long word word word long long long) DriverCallback16 +32 pascal StackEnter() StackEnter16 +33 pascal StackLeave() StackLeave16 +34 stub MMDRVINSTALL +101 pascal joyGetNumDevs() joyGetNumDevs16 +102 pascal joyGetDevCaps(word ptr word) joyGetDevCaps16 +103 pascal joyGetPos(word ptr) joyGetPos16 +104 pascal joyGetThreshold(word ptr) joyGetThreshold16 +105 pascal joyReleaseCapture(word) joyReleaseCapture16 +106 pascal joySetCapture(word word word word) joySetCapture16 +107 pascal joySetThreshold(word word) joySetThreshold16 +109 pascal joySetCalibration(word) joySetCalibration16 +110 pascal joyGetPosEx(word ptr) joyGetPosEx16 +111 stub JOYCONFIGCHANGED +201 pascal midiOutGetNumDevs() midiOutGetNumDevs16 +202 pascal midiOutGetDevCaps(word ptr word) midiOutGetDevCaps16 +203 pascal midiOutGetErrorText(word ptr word) midiOutGetErrorText16 +204 pascal midiOutOpen(ptr word long long long) midiOutOpen16 +205 pascal midiOutClose(word) midiOutClose16 +206 pascal midiOutPrepareHeader(word segptr word) midiOutPrepareHeader16 +207 pascal midiOutUnprepareHeader(word segptr word) midiOutUnprepareHeader16 +208 pascal midiOutShortMsg(word long) midiOutShortMsg16 +209 pascal midiOutLongMsg(word segptr word) midiOutLongMsg16 +210 pascal midiOutReset(word) midiOutReset16 +211 pascal midiOutGetVolume(word ptr) midiOutGetVolume16 +212 pascal midiOutSetVolume(word long) midiOutSetVolume16 +213 pascal midiOutCachePatches(word word ptr word) midiOutCachePatches16 +214 pascal midiOutCacheDrumPatches(word word ptr word) midiOutCacheDrumPatches16 +215 pascal midiOutGetID(word ptr) midiOutGetID16 +216 pascal midiOutMessage(word word long long) midiOutMessage16 +250 pascal midiStreamProperty(word ptr long) midiStreamProperty16 +251 pascal midiStreamOpen(ptr ptr long long long long) midiStreamOpen16 +252 pascal midiStreamClose(word) midiStreamClose16 +253 pascal midiStreamPosition(word ptr word) midiStreamPosition16 +254 pascal midiStreamOut(word ptr word) midiStreamOut16 +255 pascal midiStreamPause(word) midiStreamPause16 +256 pascal midiStreamRestart(word) midiStreamRestart16 +257 pascal midiStreamStop(word) midiStreamStop16 +301 pascal midiInGetNumDevs() midiInGetNumDevs16 +302 pascal midiInGetDevCaps(word ptr word) midiInGetDevCaps16 +303 pascal midiInGetErrorText(word ptr word) midiOutGetErrorText16 +304 pascal midiInOpen(ptr word long long long) midiInOpen16 +305 pascal midiInClose(word) midiInClose16 +306 pascal midiInPrepareHeader(word segptr word) midiInPrepareHeader16 +307 pascal midiInUnprepareHeader(word segptr word) midiInUnprepareHeader16 +308 pascal midiInAddBuffer(word segptr word) midiInAddBuffer16 +309 pascal midiInStart(word) midiInStart16 +310 pascal midiInStop(word) midiInStop16 +311 pascal midiInReset(word) midiInReset16 +312 pascal midiInGetID(word ptr) midiInGetID16 +313 pascal midiInMessage(word word long long) midiInMessage16 +350 pascal auxGetNumDevs() auxGetNumDevs16 +351 pascal auxGetDevCaps(word ptr word) auxGetDevCaps16 +352 pascal auxGetVolume(word ptr) auxGetVolume16 +353 pascal auxSetVolume(word long) auxSetVolume16 +354 pascal auxOutMessage(word word long long) auxOutMessage16 +401 pascal waveOutGetNumDevs() waveOutGetNumDevs16 +402 pascal waveOutGetDevCaps(word ptr word) waveOutGetDevCaps16 +403 pascal waveOutGetErrorText(word ptr word) waveOutGetErrorText16 +404 pascal waveOutOpen(ptr word ptr long long long) waveOutOpen16 +405 pascal waveOutClose(word) waveOutClose16 +406 pascal waveOutPrepareHeader(word segptr word) waveOutPrepareHeader16 +407 pascal waveOutUnprepareHeader(word segptr word) waveOutUnprepareHeader16 +408 pascal waveOutWrite(word segptr word) waveOutWrite16 +409 pascal waveOutPause(word) waveOutPause16 +410 pascal waveOutRestart(word) waveOutRestart16 +411 pascal waveOutReset(word) waveOutReset16 +412 pascal waveOutGetPosition(word ptr word) waveOutGetPosition16 +413 pascal waveOutGetPitch(word ptr) waveOutGetPitch16 +414 pascal waveOutSetPitch(word long) waveOutSetPitch16 +415 pascal waveOutGetVolume(word ptr) waveOutGetVolume16 +416 pascal waveOutSetVolume(word long) waveOutSetVolume16 +417 pascal waveOutGetPlaybackRate(word ptr) waveOutGetPlaybackRate16 +418 pascal waveOutSetPlaybackRate(word long) waveOutSetPlaybackRate16 +419 pascal waveOutBreakLoop(word) waveOutBreakLoop16 +420 pascal waveOutGetID(word ptr) waveOutGetID16 +421 pascal waveOutMessage(word word long long) waveOutMessage16 +501 pascal waveInGetNumDevs() waveInGetNumDevs16 +502 pascal waveInGetDevCaps(word ptr word) waveInGetDevCaps16 +503 pascal waveInGetErrorText(word ptr word) waveOutGetErrorText16 +504 pascal waveInOpen(ptr word ptr long long long) waveInOpen16 +505 pascal waveInClose(word) waveInClose16 +506 pascal waveInPrepareHeader(word segptr word) waveInPrepareHeader16 +507 pascal waveInUnprepareHeader(word segptr word) waveInUnprepareHeader16 +508 pascal waveInAddBuffer(word segptr word) waveInAddBuffer16 +509 pascal waveInStart(word) waveInStart16 +510 pascal waveInStop(word) waveInStop16 +511 pascal waveInReset(word) waveInReset16 +512 pascal waveInGetPosition(word ptr word) waveInGetPosition16 +513 pascal waveInGetID(word ptr) waveInGetID16 +514 pascal waveInMessage(word word long long) waveInMessage16 +601 pascal timeGetSystemTime(ptr word) timeGetSystemTime16 +602 pascal timeSetEvent(word word segptr long word) timeSetEvent16 +603 pascal timeKillEvent(word) timeKillEvent16 +604 pascal timeGetDevCaps(ptr word) timeGetDevCaps16 +605 pascal timeBeginPeriod(word) timeBeginPeriod16 +606 pascal timeEndPeriod(word) timeEndPeriod16 +607 pascal timeGetTime() timeGetTime +701 pascal mciSendCommand(word word long long) mciSendCommand16 +702 pascal mciSendString(str ptr word word) mciSendString16 +703 pascal mciGetDeviceID(ptr) mciGetDeviceID16 +705 pascal mciLoadCommandResource(word str word) mciLoadCommandResource16 +706 pascal mciGetErrorString(long ptr word) mciGetErrorString16 +707 pascal mciSetDriverData(word long) mciSetDriverData16 +708 pascal mciGetDriverData(word) mciGetDriverData16 +710 pascal mciDriverYield(word) mciDriverYield16 +711 pascal mciDriverNotify(word word word) mciDriverNotify16 +712 pascal mciExecute(ptr) mciExecute +713 pascal mciFreeCommandResource(word) mciFreeCommandResource16 +714 pascal mciSetYieldProc(word ptr long) mciSetYieldProc16 +715 pascal mciGetDeviceIDFromElementID(long ptr) mciGetDeviceIDFromElementID16 +716 pascal mciGetYieldProc(word ptr) mciGetYieldProc16 +717 pascal mciGetCreatorTask(word) mciGetCreatorTask16 +800 pascal mixerGetNumDevs() mixerGetNumDevs16 +801 pascal mixerGetDevCaps(word ptr word) mixerGetDevCaps16 +802 pascal mixerOpen(ptr word long long long) mixerOpen16 +803 pascal mixerClose(word) mixerClose16 +804 pascal mixerMessage(word word long long) mixerMessage16 +805 pascal mixerGetLineInfo(word ptr long) mixerGetLineInfo16 +806 pascal mixerGetID(word ptr long) mixerGetID16 +807 pascal mixerGetLineControls(word ptr long) mixerGetLineControls16 +808 pascal mixerGetControlDetails(word ptr long) mixerGetControlDetails16 +809 pascal mixerSetControlDetails(word ptr long) mixerSetControlDetails16 +900 pascal mmTaskCreate(long ptr long) mmTaskCreate16 +902 pascal mmTaskBlock(word) mmTaskBlock16 +903 pascal mmTaskSignal(word) mmTaskSignal16 +904 pascal -ret16 mmGetCurrentTask() mmGetCurrentTask16 +905 pascal mmTaskYield() mmTaskYield16 +1100 pascal DrvOpen(str str long) DrvOpen16 +1101 pascal DrvClose(word long long) DrvClose16 +1102 pascal DrvSendMessage(word word long long) DrvSendMessage16 +1103 pascal DrvGetModuleHandle(word) DrvGetModuleHandle16 +1104 pascal DrvDefDriverProc(long word word long long) DrvDefDriverProc16 +1120 pascal mmThreadCreate(segptr ptr long long) mmThreadCreate16 +1121 pascal mmThreadSignal(word) mmThreadSignal16 +1122 pascal mmThreadBlock(word) mmThreadBlock16 +1123 pascal mmThreadIsCurrent(word) mmThreadIsCurrent16 +1124 pascal mmThreadIsValid(word) mmThreadIsValid16 +1125 pascal mmThreadGetTask(word) mmThreadGetTask16 +1150 pascal mmShowMMCPLPropertySheet(word str str str) mmShowMMCPLPropertySheet16 + +1210 pascal mmioOpen(str ptr long) mmioOpen16 +1211 pascal mmioClose(word word) mmioClose16 +1212 pascal mmioRead(word ptr long) mmioRead16 +1213 pascal mmioWrite(word ptr long) mmioWrite16 +1214 pascal mmioSeek(word long word) mmioSeek16 +1215 pascal mmioGetInfo(word ptr word) mmioGetInfo16 +1216 pascal mmioSetInfo(word ptr word) mmioSetInfo16 +1217 pascal mmioSetBuffer(word segptr long word) mmioSetBuffer16 +1218 pascal mmioFlush(word word) mmioFlush16 +1219 pascal mmioAdvance(word ptr word) mmioAdvance16 +1220 pascal mmioStringToFOURCC(str word) mmioStringToFOURCC16 +1221 pascal mmioInstallIOProc(long ptr long) mmioInstallIOProc16 +1222 pascal mmioSendMessage(word word long long) mmioSendMessage16 +1223 pascal mmioDescend(word ptr ptr word) mmioDescend16 +1224 pascal mmioAscend(word ptr word) mmioAscend16 +1225 pascal mmioCreateChunk(word ptr word) mmioCreateChunk16 +1226 pascal mmioRename(ptr ptr ptr long) mmioRename16 + +#2000 stub WINMMF_THUNKDATA16 +#2001 stub RING3_DEVLOADER +#2002 stub WINMMTILEBUFFER +#2003 stub WINMMUNTILEBUFFER +#2005 stub MCIGETTHUNKTABLE +#2006 stub WINMMSL_THUNKDATA16 + +# these are Wine only exported functions. Is there another way to do it ? +2047 pascal __wine_mmThreadEntryPoint(long) WINE_mmThreadEntryPoint Property changes on: trunk/reactos/lib/winmm/mmsystem.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/winmm/sound.spec --- trunk/reactos/lib/winmm/sound.spec 2005-08-05 18:27:06 UTC (rev 17075) +++ trunk/reactos/lib/winmm/sound.spec 2005-08-05 20:25:46 UTC (rev 17076) @@ -1,18 +1,18 @@ -1 pascal -ret16 OpenSound() OpenSound16 -2 pascal -ret16 CloseSound() CloseSound16 -3 pascal -ret16 SetVoiceQueueSize(word word) SetVoiceQueueSize16 -4 pascal -ret16 SetVoiceNote(word word word word) SetVoiceNote16 -5 pascal -ret16 SetVoiceAccent(word word word word word) SetVoiceAccent16 -6 pascal -ret16 SetVoiceEnvelope(word word word) SetVoiceEnvelope16 -7 pascal -ret16 SetSoundNoise(word word) SetSoundNoise16 -8 pascal -ret16 SetVoiceSound(word long word) SetVoiceSound16 -9 pascal -ret16 StartSound() StartSound16 -10 pascal -ret16 StopSound() StopSound16 -11 pascal -ret16 WaitSoundState(word) WaitSoundState16 -12 pascal -ret16 SyncAllVoices() SyncAllVoices16 -13 pascal -ret16 CountVoiceNotes(word) CountVoiceNotes16 -14 pascal GetThresholdEvent() GetThresholdEvent16 -15 pascal -ret16 GetThresholdStatus() GetThresholdStatus16 -16 pascal -ret16 SetVoiceThreshold(word word) SetVoiceThreshold16 -17 pascal -ret16 DoBeep() DoBeep16 -18 stub MYOPENSOUND # W1.1, W2.0 +1 pascal -ret16 OpenSound() OpenSound16 +2 pascal -ret16 CloseSound() CloseSound16 +3 pascal -ret16 SetVoiceQueueSize(word word) SetVoiceQueueSize16 +4 pascal -ret16 SetVoiceNote(word word word word) SetVoiceNote16 +5 pascal -ret16 SetVoiceAccent(word word word word word) SetVoiceAccent16 +6 pascal -ret16 SetVoiceEnvelope(word word word) SetVoiceEnvelope16 +7 pascal -ret16 SetSoundNoise(word word) SetSoundNoise16 +8 pascal -ret16 SetVoiceSound(word long word) SetVoiceSound16 +9 pascal -ret16 StartSound() StartSound16 +10 pascal -ret16 StopSound() StopSound16 +11 pascal -ret16 WaitSoundState(word) WaitSoundState16 +12 pascal -ret16 SyncAllVoices() SyncAllVoices16 +13 pascal -ret16 CountVoiceNotes(word) CountVoiceNotes16 +14 pascal GetThresholdEvent() GetThresholdEvent16 +15 pascal -ret16 GetThresholdStatus() GetThresholdStatus16 +16 pascal -ret16 SetVoiceThreshold(word word) SetVoiceThreshold16 +17 pascal -ret16 DoBeep() DoBeep16 +18 stub MYOPENSOUND # W1.1, W2.0 Property changes on: trunk/reactos/lib/winmm/sound.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/winmm/winemm.h --- trunk/reactos/lib/winmm/winemm.h 2005-08-05 18:27:06 UTC (rev 17075) +++ trunk/reactos/lib/winmm/winemm.h 2005-08-05 20:25:46 UTC (rev 17076) @@ -28,7 +28,7 @@ #include "winbase.h" #include "mmddk.h" -#define WINE_DEFAULT_WINMM_DRIVER "wineoss.drv" +#define WINE_DEFAULT_WINMM_DRIVER "oss" #define WINE_DEFAULT_WINMM_MAPPER "msacm.drv" #define WINE_DEFAULT_WINMM_MIDI "midimap.drv" @@ -301,8 +301,8 @@ extern LPWINE_DRIVER (*pFnOpenDriver16)(LPCWSTR,LPCWSTR,LPARAM); extern LRESULT (*pFnCloseDriver16)(UINT16,LPARAM,LPARAM); extern LRESULT (*pFnSendMessage16)(UINT16,UINT,LPARAM,LPARAM); -extern WINMM_MapType (*pFnMciMapMsg16To32W)(WORD,WORD,DWORD*); -extern WINMM_MapType (*pFnMciUnMapMsg16To32W)(WORD,WORD,DWORD); +extern WINMM_MapType (*pFnMciMapMsg16To32W)(WORD,WORD,DWORD,DWORD*); +extern WINMM_MapType (*pFnMciUnMapMsg16To32W)(WORD,WORD,DWORD,DWORD); extern WINMM_MapType (*pFnMciMapMsg32WTo16)(WORD,WORD,DWORD,DWORD*); extern WINMM_MapType (*pFnMciUnMapMsg32WTo16)(WORD,WORD,DWORD,DWORD); extern LRESULT (*pFnCallMMDrvFunc16)(DWORD /* in fact FARPROC16 */,WORD,WORD,LONG,LONG,LONG); _____ Modified: trunk/reactos/lib/winmm/winmm.spec --- trunk/reactos/lib/winmm/winmm.spec 2005-08-05 18:27:06 UTC (rev 17075) +++ trunk/reactos/lib/winmm/winmm.spec 2005-08-05 20:25:46 UTC (rev 17076) @@ -1,211 +1,211 @@ -# ordinal exports -1 stdcall @(ptr long long) PlaySoundA -3 stub @ -4 stub @ - -@ stdcall PlaySoundA(ptr long long) -@ stdcall CloseDriver(long long long) -@ stdcall DefDriverProc(long long long long long) -@ stdcall DriverCallback(long long long long long long long) -@ stdcall DrvClose(long long long) CloseDriver -@ stdcall DrvDefDriverProc(long long long long long) DefDriverProc -@ stdcall DrvGetModuleHandle(long) GetDriverModuleHandle -@ stdcall DrvOpen(wstr wstr long) OpenDriver -@ stdcall DrvOpenA(str str long) OpenDriverA -@ stdcall DrvSendMessage(long long long long) SendDriverMessage -@ stdcall GetDriverFlags(long) -@ stdcall GetDriverModuleHandle(long) -@ stdcall OpenDriver(wstr wstr long) -@ stdcall OpenDriverA(str str long) -@ stdcall PlaySound(ptr long long) PlaySoundA -@ stdcall PlaySoundW(ptr long long) -@ stdcall SendDriverMessage(long long long long) -@ stdcall auxGetDevCapsA(long ptr long) -@ stdcall auxGetDevCapsW(long ptr long) -@ stdcall auxGetNumDevs() -@ stdcall auxGetVolume(long ptr) -@ stdcall auxOutMessage(long long long long) -@ stdcall auxSetVolume(long long) -@ stub joyConfigChanged -@ stdcall joyGetDevCapsA(long ptr long) -@ stdcall joyGetDevCapsW(long ptr long) -@ stdcall joyGetNumDevs() -@ stdcall joyGetPos(long ptr) -@ stdcall joyGetPosEx(long ptr) -@ stdcall joyGetThreshold(long ptr) -@ stdcall joyReleaseCapture(long) -@ stdcall joySetCapture(long long long long) -@ stdcall joySetThreshold(long long) -@ stdcall mciDriverNotify(long long long) -@ stdcall mciDriverYield(long) -@ stdcall mciExecute(str) -@ stdcall mciFreeCommandResource(long) -@ stdcall mciGetCreatorTask(long) -@ stdcall mciGetDeviceIDA(str) -@ stdcall mciGetDeviceIDW(wstr) -@ stdcall mciGetDeviceIDFromElementIDA(long str) -@ stdcall mciGetDeviceIDFromElementIDW(long wstr) -@ stdcall mciGetDriverData(long) -@ stdcall mciGetErrorStringA(long ptr long) -@ stdcall mciGetErrorStringW(long ptr long) -@ stdcall mciGetYieldProc(long ptr) -@ stdcall mciLoadCommandResource(long wstr long) -@ stdcall mciSendCommandA(long long long long) -@ stdcall mciSendCommandW(long long long long) -@ stdcall mciSendStringA(str ptr long long) -@ stdcall mciSendStringW(wstr ptr long long) -@ stdcall mciSetDriverData(long long) -@ stdcall mciSetYieldProc(long ptr long) -@ stub midiConnect -@ stub midiDisconnect -@ stdcall midiInAddBuffer(long ptr long) -@ stdcall midiInClose(long) -@ stdcall midiInGetDevCapsA(long ptr long) -@ stdcall midiInGetDevCapsW(long ptr long) -@ stdcall midiInGetErrorTextA(long ptr long) midiOutGetErrorTextA -@ stdcall midiInGetErrorTextW(long ptr long) midiOutGetErrorTextW -@ stdcall midiInGetID(long ptr) -@ stdcall midiInGetNumDevs() -@ stdcall midiInMessage(long long long long) -@ stdcall midiInOpen(ptr long long long long) -@ stdcall midiInPrepareHeader(long ptr long) -@ stdcall midiInReset(long) -@ stdcall midiInStart(long) -@ stdcall midiInStop(long) -@ stdcall midiInUnprepareHeader(long ptr long) -@ stdcall midiOutCacheDrumPatches(long long ptr long) -@ stdcall midiOutCachePatches(long long ptr long) -@ stdcall midiOutClose(long) -@ stdcall midiOutGetDevCapsA(long ptr long) -@ stdcall midiOutGetDevCapsW(long ptr long) -@ stdcall midiOutGetErrorTextA(long ptr long) -@ stdcall midiOutGetErrorTextW(long ptr long) -@ stdcall midiOutGetID(long ptr) -@ stdcall midiOutGetNumDevs() -@ stdcall midiOutGetVolume(long ptr) -@ stdcall midiOutLongMsg(long ptr long) -@ stdcall midiOutMessage(long long long long) -@ stdcall midiOutOpen(ptr long long long long) -@ stdcall midiOutPrepareHeader(long ptr long) -@ stdcall midiOutReset(long) -@ stdcall midiOutSetVolume(long ptr) -@ stdcall midiOutShortMsg(long long) -@ stdcall midiOutUnprepareHeader(long ptr long) -@ stdcall midiStreamClose(long) -@ stdcall midiStreamOpen(ptr ptr long long long long) -@ stdcall midiStreamOut(long ptr long) -@ stdcall midiStreamPause(long) -@ stdcall midiStreamPosition(long ptr long) -@ stdcall midiStreamProperty(long ptr long) -@ stdcall midiStreamRestart(long) -@ stdcall midiStreamStop(long) -@ stdcall mixerClose(long) -@ stdcall mixerGetControlDetailsA(long ptr long) -@ stdcall mixerGetControlDetailsW(long ptr long) -@ stdcall mixerGetDevCapsA(long ptr long) -@ stdcall mixerGetDevCapsW(long ptr long) -@ stdcall mixerGetID(long ptr long) -@ stdcall mixerGetLineControlsA(long ptr long) -@ stdcall mixerGetLineControlsW(long ptr long) -@ stdcall mixerGetLineInfoA(long ptr long) -@ stdcall mixerGetLineInfoW(long ptr long) -@ stdcall mixerGetNumDevs() -@ stdcall mixerMessage(long long long long) -@ stdcall mixerOpen(ptr long long long long) -@ stdcall mixerSetControlDetails(long ptr long) -@ stdcall mmGetCurrentTask() -@ stdcall mmioAdvance(long ptr long) -@ stdcall mmioAscend(long ptr long) -@ stdcall mmioClose(long long) -@ stdcall mmioCreateChunk(long ptr long) -@ stdcall mmioDescend(long ptr ptr long) -@ stdcall mmioFlush(long long) -@ stdcall mmioGetInfo(long ptr long) -@ stub mmioInstallIOProc16 -@ stdcall mmioInstallIOProcA(long ptr long) -@ stdcall mmioInstallIOProcW(long ptr long) -@ stdcall mmioOpenA(str ptr long) -@ stdcall mmioOpenW(wstr ptr long) -@ stdcall mmioRead(long ptr long) -@ stdcall mmioRenameA(str str ptr long) -@ stdcall mmioRenameW(wstr wstr ptr long) -@ stdcall mmioSeek(long long long) -@ stdcall mmioSendMessage(long long long long) -@ stdcall mmioSetBuffer(long ptr long long) -@ stdcall mmioSetInfo(long ptr long) -@ stdcall mmioStringToFOURCCA(str long) -@ stdcall mmioStringToFOURCCW(wstr long) -@ stdcall mmioWrite(long ptr long) -@ stdcall mmsystemGetVersion() -@ stdcall mmTaskBlock(long) -@ stdcall mmTaskCreate(ptr ptr long) -@ stdcall mmTaskSignal(long) -@ stdcall mmTaskYield() -@ stdcall sndPlaySoundA(ptr long) -@ stdcall sndPlaySoundW(ptr long) -@ stdcall timeBeginPeriod(long) -@ stdcall timeEndPeriod(long) -@ stdcall timeGetDevCaps(ptr long) -@ stdcall timeGetSystemTime(ptr long) -@ stdcall timeGetTime() -@ stdcall timeKillEvent(long) -@ stdcall timeSetEvent(long long ptr long long) -@ stdcall waveInAddBuffer(long ptr long) -@ stdcall waveInClose(long) -@ stdcall waveInGetDevCapsA(long ptr long) -@ stdcall waveInGetDevCapsW(long ptr long) -@ stdcall waveInGetErrorTextA(long ptr long) waveOutGetErrorTextA -@ stdcall waveInGetErrorTextW(long ptr long) waveOutGetErrorTextW -@ stdcall waveInGetID(long ptr) -@ stdcall waveInGetNumDevs() -@ stdcall waveInGetPosition(long ptr long) -@ stdcall waveInMessage(long long long long) -@ stdcall waveInOpen(ptr long ptr long long long) -@ stdcall waveInPrepareHeader(long ptr long) -@ stdcall waveInReset(long) -@ stdcall waveInStart(long) -@ stdcall waveInStop(long) -@ stdcall waveInUnprepareHeader(long ptr long) -@ stdcall waveOutBreakLoop(long) -@ stdcall waveOutClose(long) -@ stdcall waveOutGetDevCapsA(long ptr long) -@ stdcall waveOutGetDevCapsW(long ptr long) -@ stdcall waveOutGetErrorTextA(long ptr long) -@ stdcall waveOutGetErrorTextW(long ptr long) -@ stdcall waveOutGetID(long ptr) -@ stdcall waveOutGetNumDevs() -@ stdcall waveOutGetPitch(long ptr) -@ stdcall waveOutGetPlaybackRate(long ptr) -@ stdcall waveOutGetPosition(long ptr long) -@ stdcall waveOutGetVolume(long ptr) -@ stdcall waveOutMessage(long long long long) -@ stdcall waveOutOpen(ptr long ptr long long long) -@ stdcall waveOutPause(long) -@ stdcall waveOutPrepareHeader(long ptr long) -@ stdcall waveOutReset(long) -@ stdcall waveOutRestart(long) -@ stdcall waveOutSetPitch(long long) -@ stdcall waveOutSetPlaybackRate(long long) -@ stdcall waveOutSetVolume(long long) -@ stdcall waveOutUnprepareHeader(long ptr long) -@ stdcall waveOutWrite(long ptr long) -# MigrateAllDrivers -# MigrateSoundEvents -# NotifyCallbackData -# WOW32DriverCallback -# WOW32ResolveMultiMediaHandle -# WOWAppExit -# WinmmLogoff -# WinmmLogon -# mid32Message -# mmDrvInstall -# aux32Message -# joy32Message -# mci32Message -# mod32Message -# mxd32Message -# tid32Message -# wid32Message -# winmmDbgOut -# winmmSetDebugLevel -# wod32Message +# ordinal exports +1 stdcall @(ptr long long) PlaySoundA +3 stub @ +4 stub @ + +@ stdcall CloseDriver(long long long) +@ stdcall DefDriverProc(long long long long long) +@ stdcall DriverCallback(long long long long long long long) +@ stdcall DrvClose(long long long) CloseDriver +@ stdcall DrvDefDriverProc(long long long long long) DefDriverProc +@ stdcall DrvGetModuleHandle(long) GetDriverModuleHandle +@ stdcall DrvOpen(wstr wstr long) OpenDriver +@ stdcall DrvOpenA(str str long) OpenDriverA +@ stdcall DrvSendMessage(long long long long) SendDriverMessage +@ stdcall GetDriverFlags(long) +@ stdcall GetDriverModuleHandle(long) +@ stdcall OpenDriver(wstr wstr long) +@ stdcall OpenDriverA(str str long) +@ stdcall PlaySound(ptr long long) PlaySoundA +@ stdcall PlaySoundA(ptr long long) +@ stdcall PlaySoundW(ptr long long) +@ stdcall SendDriverMessage(long long long long) +@ stdcall auxGetDevCapsA(long ptr long) +@ stdcall auxGetDevCapsW(long ptr long) +@ stdcall auxGetNumDevs() +@ stdcall auxGetVolume(long ptr) +@ stdcall auxOutMessage(long long long long) +@ stdcall auxSetVolume(long long) +@ stub joyConfigChanged +@ stdcall joyGetDevCapsA(long ptr long) +@ stdcall joyGetDevCapsW(long ptr long) +@ stdcall joyGetNumDevs() +@ stdcall joyGetPos(long ptr) +@ stdcall joyGetPosEx(long ptr) +@ stdcall joyGetThreshold(long ptr) +@ stdcall joyReleaseCapture(long) +@ stdcall joySetCapture(long long long long) +@ stdcall joySetThreshold(long long) +@ stdcall mciDriverNotify(long long long) +@ stdcall mciDriverYield(long) +@ stdcall mciExecute(str) +@ stdcall mciFreeCommandResource(long) +@ stdcall mciGetCreatorTask(long) +@ stdcall mciGetDeviceIDA(str) +@ stdcall mciGetDeviceIDFromElementIDA(long str) +@ stdcall mciGetDeviceIDFromElementIDW(long wstr) +@ stdcall mciGetDeviceIDW(wstr) +@ stdcall mciGetDriverData(long) +@ stdcall mciGetErrorStringA(long ptr long) +@ stdcall mciGetErrorStringW(long ptr long) +@ stdcall mciGetYieldProc(long ptr) +@ stdcall mciLoadCommandResource(long wstr long) +@ stdcall mciSendCommandA(long long long long) +@ stdcall mciSendCommandW(long long long long) +@ stdcall mciSendStringA(str ptr long long) +@ stdcall mciSendStringW(wstr ptr long long) +@ stdcall mciSetDriverData(long long) +@ stdcall mciSetYieldProc(long ptr long) +@ stub midiConnect +@ stub midiDisconnect +@ stdcall midiInAddBuffer(long ptr long) +@ stdcall midiInClose(long) +@ stdcall midiInGetDevCapsA(long ptr long) +@ stdcall midiInGetDevCapsW(long ptr long) +@ stdcall midiInGetErrorTextA(long ptr long) midiOutGetErrorTextA +@ stdcall midiInGetErrorTextW(long ptr long) midiOutGetErrorTextW +@ stdcall midiInGetID(long ptr) +@ stdcall midiInGetNumDevs() +@ stdcall midiInMessage(long long long long) +@ stdcall midiInOpen(ptr long long long long) +@ stdcall midiInPrepareHeader(long ptr long) +@ stdcall midiInReset(long) +@ stdcall midiInStart(long) +@ stdcall midiInStop(long) +@ stdcall midiInUnprepareHeader(long ptr long) +@ stdcall midiOutCacheDrumPatches(long long ptr long) +@ stdcall midiOutCachePatches(long long ptr long) +@ stdcall midiOutClose(long) +@ stdcall midiOutGetDevCapsA(long ptr long) +@ stdcall midiOutGetDevCapsW(long ptr long) +@ stdcall midiOutGetErrorTextA(long ptr long) +@ stdcall midiOutGetErrorTextW(long ptr long) +@ stdcall midiOutGetID(long ptr) +@ stdcall midiOutGetNumDevs() +@ stdcall midiOutGetVolume(long ptr) +@ stdcall midiOutLongMsg(long ptr long) +@ stdcall midiOutMessage(long long long long) +@ stdcall midiOutOpen(ptr long long long long) +@ stdcall midiOutPrepareHeader(long ptr long) +@ stdcall midiOutReset(long) +@ stdcall midiOutSetVolume(long ptr) +@ stdcall midiOutShortMsg(long long) +@ stdcall midiOutUnprepareHeader(long ptr long) +@ stdcall midiStreamClose(long) +@ stdcall midiStreamOpen(ptr ptr long long long long) +@ stdcall midiStreamOut(long ptr long) +@ stdcall midiStreamPause(long) +@ stdcall midiStreamPosition(long ptr long) +@ stdcall midiStreamProperty(long ptr long) +@ stdcall midiStreamRestart(long) +@ stdcall midiStreamStop(long) +@ stdcall mixerClose(long) +@ stdcall mixerGetControlDetailsA(long ptr long) +@ stdcall mixerGetControlDetailsW(long ptr long) +@ stdcall mixerGetDevCapsA(long ptr long) +@ stdcall mixerGetDevCapsW(long ptr long) +@ stdcall mixerGetID(long ptr long) +@ stdcall mixerGetLineControlsA(long ptr long) +@ stdcall mixerGetLineControlsW(long ptr long) +@ stdcall mixerGetLineInfoA(long ptr long) +@ stdcall mixerGetLineInfoW(long ptr long) +@ stdcall mixerGetNumDevs() +@ stdcall mixerMessage(long long long long) +@ stdcall mixerOpen(ptr long long long long) +@ stdcall mixerSetControlDetails(long ptr long) [truncated at 1000 lines; 5027 more skipped]

1 0

[navaraf] 17075: Revert change to ExSystemExceptionFilter.
by navaraf＠svn.reactos.com 05 Aug '05

05 Aug '05

Revert change to ExSystemExceptionFilter. Modified: trunk/reactos/ntoskrnl/ex/error.c _____ Modified: trunk/reactos/ntoskrnl/ex/error.c --- trunk/reactos/ntoskrnl/ex/error.c 2005-08-05 18:26:43 UTC (rev 17074) +++ trunk/reactos/ntoskrnl/ex/error.c 2005-08-05 18:27:06 UTC (rev 17075) @@ -82,15 +82,7 @@ STDCALL ExSystemExceptionFilter(VOID) { - /* - * The PreviousMode always happens to be KernelMode since the exception - * happens in kenrel mode. FIXME: Is this correct behaviour? - */ -#if 0 return KeGetPreviousMode() != KernelMode ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; -#else - return EXCEPTION_EXECUTE_HANDLER; -#endif } /*

1 0

[navaraf] 17074: Don't save and restore previous mode in trap handlers. This allows us to call KeGetPreviousMode() from exception handlers and get the right value.
by navaraf＠svn.reactos.com 05 Aug '05

05 Aug '05

Don't save and restore previous mode in trap handlers. This allows us to call KeGetPreviousMode() from exception handlers and get the right value. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-08-05 17:28:17 UTC (rev 17073) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2005-08-05 18:26:43 UTC (rev 17074) @@ -45,13 +45,8 @@ popl %edx popl %ecx popl %eax - - /* Restore the old previous mode */ popl %ebx - cmpl $0, %esi - je .L7 - movb %bl, %ss:KTHREAD_PREVIOUS_MODE(%esi) -.L7: + /* Restore the old exception handler list */ popl %ebx movl %ebx, %fs:KPCR_EXCEPTION_LIST @@ -140,13 +135,6 @@ /* Set the new previous mode based on the saved CS selector */ movl KTRAP_FRAME_CS(%ebp), %eax andl $0x0000FFFF, %eax - cmpl $KERNEL_CS, %eax - jne .L1 - movb $KernelMode, KTHREAD_PREVIOUS_MODE(%edi) - jmp .L3 -.L1: - movb $UserMode, KTHREAD_PREVIOUS_MODE(%edi) -.L3: /* Save the old trap frame. */ movl KTHREAD_TRAP_FRAME(%edi), %edx

1 0

[navaraf] 17073: Remove mouse device detection for now, since it fails on some i8042 clones.
by navaraf＠svn.reactos.com 05 Aug '05

05 Aug '05

Remove mouse device detection for now, since it fails on some i8042 clones. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h Modified: trunk/reactos/drivers/input/i8042prt/mouse.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 15:45:14 UTC (rev 17072) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 17:28:17 UTC (rev 17073) @@ -576,11 +576,6 @@ DevExt->KeyboardExists = I8042DetectKeyboard(DevExt); } - if (DevExt->MouseExists) { - DPRINT("Mouse port detected\n"); - DevExt->MouseExists = I8042DetectMouse(DevExt); - } - if (DevExt->KeyboardExists) { DPRINT("Keyboard detected\n"); I8042KeyboardEnable(DevExt); _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h --- trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-08-05 15:45:14 UTC (rev 17072) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-08-05 17:28:17 UTC (rev 17073) @@ -387,8 +387,6 @@ BOOLEAN STDCALL I8042MouseEnable(PDEVICE_EXTENSION DevExt); BOOLEAN STDCALL I8042MouseDisable(PDEVICE_EXTENSION DevExt); -BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt); - /* ps2pp.c */ VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, BYTE Input); _____ Modified: trunk/reactos/drivers/input/i8042prt/mouse.c --- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-08-05 15:45:14 UTC (rev 17072) +++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-08-05 17:28:17 UTC (rev 17073) @@ -895,45 +895,3 @@ return TRUE; } - -BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt) -{ - NTSTATUS Status; - UCHAR Value; - UINT RetryCount = 10; - - DPRINT("Detecting mouse\n"); - - I8042MouseDisable(DevExt); - - do { - Status = I8042SynchWritePortMouse(DevExt, KBD_GET_ID, TRUE); - } while (STATUS_TIMEOUT == Status && RetryCount--); - - if (!NT_SUCCESS(Status)) { - DPRINT1("Can't write AUX_GET_ID (%x)\n", Status); - return FALSE; - } - - Status = I8042ReadDataWait(DevExt, &Value); - if (!NT_SUCCESS(Status)) { - DPRINT1("No response after AUX_GET_ID\n"); - return FALSE; - } - - if (Value != 0xFA) { - DPRINT("Bad ID: %x\n", Value); - return FALSE; - } - - Status = I8042ReadDataWait(DevExt, &Value); - if (!NT_SUCCESS(Status)) { - DPRINT("Partial ID\n"); - return FALSE; - } - - DPRINT ("%x\n", Value); - - return TRUE; -} -

1 0

[navaraf] 17072: Protect NtQuerySystemInformation with SEH.
by navaraf＠svn.reactos.com 05 Aug '05

05 Aug '05

Protect NtQuerySystemInformation with SEH. Modified: trunk/reactos/ntoskrnl/ex/error.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c _____ Modified: trunk/reactos/ntoskrnl/ex/error.c --- trunk/reactos/ntoskrnl/ex/error.c 2005-08-05 15:41:20 UTC (rev 17071) +++ trunk/reactos/ntoskrnl/ex/error.c 2005-08-05 15:45:14 UTC (rev 17072) @@ -82,7 +82,15 @@ STDCALL ExSystemExceptionFilter(VOID) { + /* + * The PreviousMode always happens to be KernelMode since the exception + * happens in kenrel mode. FIXME: Is this correct behaviour? + */ +#if 0 return KeGetPreviousMode() != KernelMode ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; +#else + return EXCEPTION_EXECUTE_HANDLER; +#endif } /* _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-08-05 15:41:20 UTC (rev 17071) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-08-05 15:45:14 UTC (rev 17072) @@ -1510,45 +1510,39 @@ */ NTSTATUS STDCALL NtQuerySystemInformation (IN SYSTEM_INFORMATION_CLASS SystemInformationClass, - OUT PVOID UnsafeSystemInformation, + OUT PVOID SystemInformation, IN ULONG Length, OUT PULONG UnsafeResultLength) { KPROCESSOR_MODE PreviousMode; ULONG ResultLength; - PVOID SystemInformation; - NTSTATUS FStatus; + NTSTATUS FStatus = STATUS_NOT_IMPLEMENTED; PAGED_CODE(); PreviousMode = ExGetPreviousMode(); - -/* DPRINT("NtQuerySystemInformation Start. Class:%d\n", - SystemInformationClass ); -*/ - /*if (ExGetPreviousMode() == KernelMode) - {*/ - SystemInformation = UnsafeSystemInformation; - /*} - else + _SEH_TRY { - SystemInformation = ExAllocatePool(NonPagedPool, Length); - if (SystemInformation == NULL) - { - return(STATUS_NO_MEMORY); - } - }*/ + if (PreviousMode == UserMode) + { + /* SystemKernelDebuggerInformation needs only BOOLEAN alignment */ + ProbeForWrite(SystemInformation, Length, 1); + if (UnsafeResultLength != NULL) + ProbeForWrite(UnsafeResultLength, sizeof(ULONG), sizeof(ULONG)); + } - /* Clear user buffer. */ - RtlZeroMemory(SystemInformation, Length); + /* Clear user buffer. */ + RtlZeroMemory(SystemInformation, Length); - /* - * Check the request is valid. - */ - if ((SystemInformationClass >= SystemBasicInformation) && - (SystemInformationClass < SystemInformationClassMax)) - { + /* + * Check the request is valid. + */ + if (SystemInformationClass >= SystemInformationClassMax) + { + return (STATUS_INVALID_INFO_CLASS); + } + if (NULL != CallQS [SystemInformationClass].Query) { /* @@ -1557,17 +1551,6 @@ FStatus = CallQS [SystemInformationClass].Query(SystemInformation, Length, &ResultLength); - /*if (ExGetPreviousMode() != KernelMode) - { - Status = MmCopyToCaller(UnsafeSystemInformation, - SystemInformation, - Length); - ExFreePool(SystemInformation); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - }*/ if (NT_SUCCESS(FStatus) && UnsafeResultLength != NULL) { if (PreviousMode != KernelMode) @@ -1575,9 +1558,6 @@ FStatus = STATUS_SUCCESS; _SEH_TRY { - ProbeForWrite(UnsafeResultLength, - sizeof(ULONG), - sizeof(ULONG)); *UnsafeResultLength = ResultLength; } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) @@ -1591,10 +1571,15 @@ *UnsafeResultLength = ResultLength; } } - return(FStatus); } } - return (STATUS_INVALID_INFO_CLASS); + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + FStatus = _SEH_GetExceptionCode(); + } + _SEH_END; + + return (FStatus); }

1 0

[navaraf] 17071: Move a flush call few lines down.
by navaraf＠svn.reactos.com 05 Aug '05

05 Aug '05

Move a flush call few lines down. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 15:40:53 UTC (rev 17070) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 15:41:20 UTC (rev 17071) @@ -517,11 +517,11 @@ DevExt->MouseExists = FALSE; DevExt->KeyboardExists = FALSE; - I8042Flush(); - if (!I8042Write(DevExt, I8042_DATA_PORT, 0x74)) return STATUS_TIMEOUT; + I8042Flush(); + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST)) return STATUS_TIMEOUT;

1 0

[greatlrd] 17070: Fixes a bug which disallows tab complete on empty input and a sorting bug which didnt account for locale by Brandon Turner
by greatlrd＠svn.reactos.com 05 Aug '05

05 Aug '05

Fixes a bug which disallows tab complete on empty input and a sorting bug which didnt account for locale by Brandon Turner Modified: trunk/reactos/subsys/system/cmd/filecomp.c _____ Modified: trunk/reactos/subsys/system/cmd/filecomp.c --- trunk/reactos/subsys/system/cmd/filecomp.c 2005-08-05 10:35:32 UTC (rev 17069) +++ trunk/reactos/subsys/system/cmd/filecomp.c 2005-08-05 15:40:53 UTC (rev 17070) @@ -413,7 +413,7 @@ szSearch = szSearch1; /* Move one char past */ szSearch++; - szSearch[0] = _T('\0'); + szSearch[0] = _T('\0'); _tcscpy(szPrefix,str); return; @@ -501,7 +501,8 @@ memcpy(File1,arg1,sizeof(FileName)); memcpy(File2,arg2,sizeof(FileName)); - ret = _tcsicmp(File1->Name, File2->Name); + /* ret = _tcsicmp(File1->Name, File2->Name); */ + ret = lstrcmpi(File1->Name, File2->Name); free(File1); free(File2); @@ -552,17 +553,19 @@ str[cusor] = _T('\0'); /* Look to see if they hit tab again, if so cut off the diff length */ - if(_tcscmp(str,LastReturned)) + if(_tcscmp(str,LastReturned) || !_tcslen(str)) { /* We need to know how many chars we added from the start */ StartLength = _tcslen(str); /* no string, we need all files in that directory */ if(!StartLength) + { _tcscat(str,_T("*")); + } /* Zero it out first */ - szBaseWord[0] = _T('\0'); + szBaseWord[0] = _T('\0'); szPrefix[0] = _T('\0'); /*What comes out of this needs to be:

1 0

[navaraf] 17069: Fix keyboard and mouse detection. We must disable the controller features before beginning the port check and we shouldn't fail if some port isn't found. Also detect the mouse on port before trying to use it.
by navaraf＠svn.reactos.com 05 Aug '05

05 Aug '05

Fix keyboard and mouse detection. We must disable the controller features before beginning the port check and we shouldn't fail if some port isn't found. Also detect the mouse on port before trying to use it. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/registry.c _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c --- trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 10:31:28 UTC (rev 17068) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c 2005-08-05 10:35:32 UTC (rev 17069) @@ -153,7 +153,7 @@ if (WaitForAck) { Status = I8042ReadDataWait(DevExt, &Ack); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) return Status; if (Ack == KBD_ACK) return STATUS_SUCCESS; @@ -426,7 +426,7 @@ I8042SynchReadPort, I8042SynchWritePortKbd, FALSE); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { WorkItemData->Irp->IoStatus.Status = Status; goto hookworkitemdone; } @@ -514,8 +514,14 @@ UCHAR Value = 0; UINT Counter; + DevExt->MouseExists = FALSE; + DevExt->KeyboardExists = FALSE; + I8042Flush(); + if (!I8042Write(DevExt, I8042_DATA_PORT, 0x74)) + return STATUS_TIMEOUT; + if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_SELF_TEST)) return STATUS_TIMEOUT; @@ -525,37 +531,26 @@ Status = I8042ReadDataWait(DevExt, &Value); } while ((Counter--) && (STATUS_TIMEOUT == Status)); - if (Status != STATUS_SUCCESS) + if (!NT_SUCCESS(Status)) return Status; if (Value != 0x55) { DPRINT1("Got %x instead of 55\n", Value); return STATUS_IO_DEVICE_ERROR; } - if (!I8042Write(DevExt, I8042_CTRL_PORT, KBD_LINE_TEST)) - return STATUS_TIMEOUT; - Status = I8042ReadDataWait(DevExt, &Value); - if (Status != STATUS_SUCCESS) - return Status; - - if (Value == 0) { - DevExt->KeyboardExists = TRUE; - } else { - DevExt->KeyboardExists = FALSE; + if (I8042Write(DevExt, I8042_CTRL_PORT, KBD_LINE_TEST)) + { + Status = I8042ReadDataWait(DevExt, &Value); + if (NT_SUCCESS(Status) && Value == 0) + DevExt->KeyboardExists = TRUE; } - if (!I8042Write(DevExt, I8042_CTRL_PORT, MOUSE_LINE_TEST)) - return STATUS_TIMEOUT; - - Status = I8042ReadDataWait(DevExt, &Value); - if (Status != STATUS_SUCCESS) - return Status; - - if (Value == 0) { - DevExt->MouseExists = TRUE; - } else { - DevExt->MouseExists = FALSE; + if (I8042Write(DevExt, I8042_CTRL_PORT, MOUSE_LINE_TEST)) + { + Status = I8042ReadDataWait(DevExt, &Value); + if (NT_SUCCESS(Status) && Value == 0) + DevExt->MouseExists = TRUE; } return STATUS_SUCCESS; @@ -566,28 +561,36 @@ NTSTATUS Status; Status = I8042BasicDetect(DevExt); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT1("Basic keyboard detection failed: %x\n", Status); return Status; } if (!DevExt->KeyboardExists) { - DPRINT("Keyboard not detected\n"); + DPRINT("Keyboard port not detected\n"); if (DevExt->Settings.Headless) /* Act as if it exists regardless */ DevExt->KeyboardExists = TRUE; } else { - DPRINT("Keyboard detected\n"); + DPRINT("Keyboard port detected\n"); DevExt->KeyboardExists = I8042DetectKeyboard(DevExt); } + if (DevExt->MouseExists) { + DPRINT("Mouse port detected\n"); + DevExt->MouseExists = I8042DetectMouse(DevExt); + } + if (DevExt->KeyboardExists) { + DPRINT("Keyboard detected\n"); I8042KeyboardEnable(DevExt); I8042KeyboardEnableInterrupt(DevExt); } - if (DevExt->MouseExists) + if (DevExt->MouseExists) { + DPRINT("Mouse detected\n"); I8042MouseEnable(DevExt); + } return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h --- trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-08-05 10:31:28 UTC (rev 17068) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h 2005-08-05 10:35:32 UTC (rev 17069) @@ -387,6 +387,8 @@ BOOLEAN STDCALL I8042MouseEnable(PDEVICE_EXTENSION DevExt); BOOLEAN STDCALL I8042MouseDisable(PDEVICE_EXTENSION DevExt); +BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt); + /* ps2pp.c */ VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, BYTE Input); _____ Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c --- trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-08-05 10:31:28 UTC (rev 17068) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-08-05 10:35:32 UTC (rev 17069) @@ -605,7 +605,7 @@ } Status = I8042ReadDataWait(DevExt, &Value); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT1("No response after read i8042 mode\n"); return FALSE; } @@ -640,13 +640,13 @@ Status = I8042SynchWritePort(DevExt, 0, KBD_GET_ID, TRUE); } while (STATUS_TIMEOUT == Status && RetryCount--); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT1("Can't write GET_ID (%x)\n", Status); return FALSE; } Status = I8042ReadDataWait(DevExt, &Value); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT1("No response after GET_ID\n"); /* Could be an AT keyboard */ DevExt->KeyboardIsAT = TRUE; @@ -663,7 +663,7 @@ DPRINT("Keyboard ID: %x", Value); Status = I8042ReadDataWait(DevExt, &Value); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT("Partial ID\n"); return FALSE; } @@ -672,12 +672,12 @@ detectsetleds: Status = I8042SynchWritePort(DevExt, 0, KBD_SET_LEDS, TRUE); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT("Can't write SET_LEDS (%x)\n", Status); return FALSE; } Status = I8042SynchWritePort(DevExt, 0, 0, TRUE); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT("Can't finish SET_LEDS (%x)\n", Status); return FALSE; } @@ -690,7 +690,7 @@ } Status = I8042ReadDataWait(DevExt, &Value); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT1("No response after read i8042 mode\n"); return FALSE; } _____ Modified: trunk/reactos/drivers/input/i8042prt/mouse.c --- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-08-05 10:31:28 UTC (rev 17068) +++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-08-05 10:35:32 UTC (rev 17069) @@ -833,7 +833,7 @@ } Status = I8042ReadDataWait(DevExt, &Value); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT1("No response after read i8042 mode\n"); return FALSE; } @@ -869,7 +869,7 @@ } Status = I8042ReadDataWait(DevExt, &Value); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT1("No response after read i8042 mode\n"); return FALSE; } @@ -895,3 +895,45 @@ return TRUE; } + +BOOLEAN STDCALL I8042DetectMouse(PDEVICE_EXTENSION DevExt) +{ + NTSTATUS Status; + UCHAR Value; + UINT RetryCount = 10; + + DPRINT("Detecting mouse\n"); + + I8042MouseDisable(DevExt); + + do { + Status = I8042SynchWritePortMouse(DevExt, KBD_GET_ID, TRUE); + } while (STATUS_TIMEOUT == Status && RetryCount--); + + if (!NT_SUCCESS(Status)) { + DPRINT1("Can't write AUX_GET_ID (%x)\n", Status); + return FALSE; + } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT1("No response after AUX_GET_ID\n"); + return FALSE; + } + + if (Value != 0xFA) { + DPRINT("Bad ID: %x\n", Value); + return FALSE; + } + + Status = I8042ReadDataWait(DevExt, &Value); + if (!NT_SUCCESS(Status)) { + DPRINT("Partial ID\n"); + return FALSE; + } + + DPRINT ("%x\n", Value); + + return TRUE; +} + _____ Modified: trunk/reactos/drivers/input/i8042prt/registry.c --- trunk/reactos/drivers/input/i8042prt/registry.c 2005-08-05 10:31:28 UTC (rev 17068) +++ trunk/reactos/drivers/input/i8042prt/registry.c 2005-08-05 10:35:32 UTC (rev 17069) @@ -211,7 +211,7 @@ NULL, NULL); - if (Status != STATUS_SUCCESS) { + if (!NT_SUCCESS(Status)) { DPRINT1 ("Can't read registry: %x\n", Status); /* Actually, the defaults are not set when the function * fails, as would happen during setup, so you have to

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
67
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2005