Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[sserapion] 38264: Fix compilation and some warnings.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 22:51:38 2008 New Revision: 38264 URL: http://svn.reactos.org/svn/reactos?rev=38264&view=rev Log: Fix compilation and some warnings. Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/joystick.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/playsound.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/time.c branches/ros-amd64-bringup/reactos/dll/win32/winmm/winmm.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/driver.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -110,8 +110,8 @@ * SendDriverMessage [WINMM.@] * DrvSendMessage [WINMM.@] */ -LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LPARAM lParam1, - LPARAM lParam2) +LRESULT WINAPI SendDriverMessage(HDRVR hDriver, UINT msg, LONG lParam1, + LONG lParam2) { LPWINE_DRIVER lpDrv; LRESULT retval = 0; @@ -170,7 +170,7 @@ /* first of this driver in list ? */ if (DRIVER_GetNumberOfModuleRefs(lpNewDrv->d.d32.hModule, NULL) == 0) { if (DRIVER_SendMessage(lpNewDrv, DRV_LOAD, 0L, 0L) != DRV_SUCCESS) { - TRACE("DRV_LOAD failed on driver 0x%08lx\n", (DWORD)lpNewDrv); + TRACE("DRV_LOAD failed on driver %p\n", lpNewDrv); return FALSE; } /* returned value is not checked */ @@ -196,7 +196,7 @@ lpNewDrv->d.d32.dwDriverID = DRIVER_SendMessage(lpNewDrv, DRV_OPEN, lParam1, lParam2); if (lpNewDrv->d.d32.dwDriverID == 0) { - TRACE("DRV_OPEN failed on driver 0x%08lx\n", (DWORD)lpNewDrv); + TRACE("DRV_OPEN failed on driver %p\n", lpNewDrv); DRIVER_RemoveFromList(lpNewDrv); return FALSE; } @@ -375,7 +375,7 @@ * OpenDriver [WINMM.@] * DrvOpen [WINMM.@] */ -HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LPARAM lParam) +HDRVR WINAPI OpenDriver(LPCWSTR lpDriverName, LPCWSTR lpSectionName, LONG lParam) { LPWINE_DRIVER lpDrv = NULL; WCHAR libName[128]; @@ -427,7 +427,7 @@ return 0; the_end: - if (lpDrv) TRACE("=> %08lx\n", (DWORD)lpDrv); + if (lpDrv) TRACE("=> %p\n", lpDrv); return (HDRVR)lpDrv; } @@ -435,7 +435,7 @@ * CloseDriver [WINMM.@] * DrvClose [WINMM.@] */ -LRESULT WINAPI CloseDriver(HDRVR hDrvr, LPARAM lParam1, LPARAM lParam2) +LRESULT WINAPI CloseDriver(HDRVR hDrvr, LONG lParam1, LONG lParam2) { LPWINE_DRIVER lpDrv; @@ -526,8 +526,8 @@ * DefDriverProc [WINMM.@] * DrvDefDriverProc [WINMM.@] */ -LRESULT WINAPI DefDriverProc(DWORD_PTR dwDriverIdentifier, HDRVR hDrv, - UINT Msg, LPARAM lParam1, LPARAM lParam2) +LONG WINAPI DefDriverProc(DWORD dwDriverIdentifier, HDRVR hDrv, + UINT Msg, LONG lParam1, LONG lParam2) { switch (Msg) { case DRV_LOAD: Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/joystick.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/joystick.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/joystick.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -81,7 +81,7 @@ /************************************************************************** * JOY_Timer [internal] */ -static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT wTimer, DWORD dwTime) +static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTime) { int i; WINE_JOYSTICK* joy; Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/mci.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -1298,14 +1298,14 @@ tmp = devType; devType = dev; dev = tmp; dwFlags |= MCI_OPEN_TYPE; - data[2] = (DWORD)devType; + data[2] = (DWORD_PTR)devType; devType = str_dup_upper(devType); dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } else if (strchrW(dev, '.') == NULL) { tmp = strchrW(dev,' '); if (tmp) *tmp = '\0'; - data[2] = (DWORD)dev; + data[2] = (DWORD_PTR)dev; devType = str_dup_upper(dev); if (tmp) *tmp = ' '; dwFlags |= MCI_OPEN_TYPE; @@ -1326,7 +1326,7 @@ devType = str_dup_upper(buf); } dwFlags |= MCI_OPEN_ELEMENT; - data[3] = (DWORD)dev; + data[3] = (DWORD_PTR)dev; } if ((devAlias = strstrW(args, wszSAliasS))) { WCHAR* tmp2; @@ -1336,7 +1336,7 @@ tmp2 = HeapAlloc(GetProcessHeap(), 0, (tmp - devAlias + 1) * sizeof(WCHAR) ); memcpy( tmp2, devAlias, (tmp - devAlias) * sizeof(WCHAR) ); tmp2[tmp - devAlias] = 0; - data[4] = (DWORD)tmp2; + data[4] = (DWORD_PTR)tmp2; /* should be done in regular options parsing */ /* dwFlags |= MCI_OPEN_ALIAS; */ } @@ -1390,14 +1390,14 @@ /* set up call back */ if (hwndCallback != 0) { dwFlags |= MCI_NOTIFY; - data[0] = (DWORD)hwndCallback; + data[0] = (DWORD_PTR)hwndCallback; } /* set return information */ switch (retType = MCI_GetReturnType(lpCmd)) { case 0: offset = 1; break; case MCI_INTEGER: offset = 2; break; - case MCI_STRING: data[1] = (DWORD)lpstrRet; data[2] = uRetLen; offset = 3; break; + case MCI_STRING: data[1] = (DWORD_PTR)lpstrRet; data[2] = uRetLen; offset = 3; break; case MCI_RECT: offset = 5; break; default: ERR("oops\n"); } @@ -1549,7 +1549,7 @@ /************************************************************************** * MCI_SendCommandFrom32 [internal] */ -DWORD MCI_SendCommandFrom32(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +DWORD MCI_SendCommandFrom32(MCIDEVICEID wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2) { DWORD dwRet = MCIERR_INVALID_DEVICE_ID; LPWINE_MCIDRIVER wmd = MCI_GetDriver(wDevID); @@ -1584,7 +1584,7 @@ /************************************************************************** * MCI_SendCommandFrom16 [internal] */ -DWORD MCI_SendCommandFrom16(MCIDEVICEID wDevID, UINT16 wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +DWORD MCI_SendCommandFrom16(MCIDEVICEID wDevID, UINT16 wMsg, DWORD dwParam1, DWORD dwParam2) { DWORD dwRet = MCIERR_INVALID_DEVICE_ID; LPWINE_MCIDRIVER wmd = MCI_GetDriver(wDevID); @@ -1643,7 +1643,7 @@ if (dwParam & MCI_OPEN_TYPE) { if (dwParam & MCI_OPEN_TYPE_ID) { - WORD uDevType = LOWORD((DWORD)lpParms->lpstrDeviceType); + WORD uDevType = LOWORD((DWORD_PTR)lpParms->lpstrDeviceType); if (uDevType < MCI_DEVTYPE_FIRST || uDevType > MCI_DEVTYPE_LAST || @@ -1825,7 +1825,7 @@ if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; TRACE("(%08x, %08lX, %08lX[num=%ld, wDevTyp=%u])\n", - uDevID, dwFlags, (DWORD)lpParms, lpParms->dwNumber, lpParms->wDeviceType); + uDevID, dwFlags, lpParms, lpParms->dwNumber, lpParms->wDeviceType); switch (dwFlags & ~MCI_SYSINFO_OPEN) { case MCI_SYSINFO_QUANTITY: @@ -2214,7 +2214,7 @@ * mciSendCommandW [WINMM.@] * */ -DWORD WINAPI mciSendCommandW(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +DWORD WINAPI mciSendCommandW(MCIDEVICEID wDevID, UINT wMsg, DWORD dwParam1, DWORD_PTR dwParam2) { DWORD dwRet; @@ -2230,7 +2230,7 @@ /************************************************************************** * mciSendCommandA [WINMM.@] */ -DWORD WINAPI mciSendCommandA(MCIDEVICEID wDevID, UINT wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2) +DWORD WINAPI mciSendCommandA(MCIDEVICEID wDevID, UINT wMsg, DWORD dwParam1, DWORD_PTR dwParam2) { DWORD ret; int mapped; @@ -2388,12 +2388,12 @@ /************************************************************************** * mciGetCreatorTask [WINMM.@] */ -HTASK WINAPI mciGetCreatorTask(MCIDEVICEID uDeviceID) +HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID uDeviceID) { LPWINE_MCIDRIVER wmd; - HTASK ret = 0; - - if ((wmd = MCI_GetDriver(uDeviceID))) ret = (HTASK)wmd->CreatorThread; + HANDLE ret = 0; + + if ((wmd = MCI_GetDriver(uDeviceID))) ret = wmd->CreatorThread; TRACE("(%u) => %p\n", uDeviceID, ret); return ret; Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/playsound.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/playsound.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/playsound.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -354,8 +354,8 @@ s.hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); - if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD)PlaySound_Callback, - (DWORD)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) + if (waveOutOpen(&hWave, WAVE_MAPPER, lpWaveFormat, (DWORD_PTR)PlaySound_Callback, + (DWORD_PTR)&s, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) goto errCleanUp; /* make it so that 3 buffers per second are needed */ Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/time.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/time.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/time.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -94,7 +94,7 @@ if (lpTimer->wFlags & WINE_TIMER_IS32) (lpTimer->lpFunc)(lpTimer->wTimerID, 0, lpTimer->dwUser, 0, 0); else if (pFnCallMMDrvFunc16) - pFnCallMMDrvFunc16((DWORD)lpTimer->lpFunc, lpTimer->wTimerID, 0, + pFnCallMMDrvFunc16((DWORD_PTR)lpTimer->lpFunc, lpTimer->wTimerID, 0, lpTimer->dwUser, 0, 0); break; case TIME_CALLBACK_EVENT_SET: Modified: branches/ros-amd64-bringup/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Sun Dec 21 22:51:38 2008 @@ -345,7 +345,7 @@ /************************************************************************** * mixerOpen [WINMM.@] */ -UINT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, +MMRESULT WINAPI mixerOpen(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD fdwOpen) { return MIXER_Open(lphMix, uDeviceID, dwCallback, dwInstance, fdwOpen, TRUE); @@ -687,7 +687,7 @@ /************************************************************************** * auxGetDevCapsW [WINMM.@] */ -UINT WINAPI auxGetDevCapsW(UINT_PTR uDeviceID, LPAUXCAPSW lpCaps, UINT uSize) +MMRESULT WINAPI auxGetDevCapsW(UINT_PTR uDeviceID, LPAUXCAPSW lpCaps, UINT uSize) { LPWINE_MLD wmld; @@ -703,7 +703,7 @@ /************************************************************************** * auxGetDevCapsA [WINMM.@] */ -UINT WINAPI auxGetDevCapsA(UINT_PTR uDeviceID, LPAUXCAPSA lpCaps, UINT uSize) +MMRESULT WINAPI auxGetDevCapsA(UINT_PTR uDeviceID, LPAUXCAPSA lpCaps, UINT uSize) { AUXCAPSW acW; UINT ret; @@ -729,7 +729,7 @@ /************************************************************************** * auxGetVolume [WINMM.@] */ -UINT WINAPI auxGetVolume(UINT uDeviceID, DWORD* lpdwVolume) +MMRESULT WINAPI auxGetVolume(UINT uDeviceID, DWORD* lpdwVolume) { LPWINE_MLD wmld; @@ -757,7 +757,7 @@ /************************************************************************** * auxOutMessage [WINMM.@] */ -UINT WINAPI auxOutMessage(UINT uDeviceID, UINT uMessage, DWORD_PTR dw1, DWORD_PTR dw2) +MMRESULT WINAPI auxOutMessage(UINT uDeviceID, UINT uMessage, DWORD_PTR dw1, DWORD_PTR dw2) { LPWINE_MLD wmld; @@ -938,7 +938,7 @@ /************************************************************************** * midiOutOpen [WINMM.@] */ -UINT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT uDeviceID, +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT lphMidiOut, UINT_PTR uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { return MIDI_OutOpen(lphMidiOut, uDeviceID, dwCallback, dwInstance, dwFlags, TRUE); @@ -1122,7 +1122,7 @@ /************************************************************************** * midiOutMessage [WINMM.@] */ -UINT WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT uMessage, +DWORD WINAPI midiOutMessage(HMIDIOUT hMidiOut, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { LPWINE_MLD wmld; @@ -1161,7 +1161,7 @@ /************************************************************************** * midiInGetDevCapsW [WINMM.@] */ -UINT WINAPI midiInGetDevCapsW(UINT_PTR uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSize) +MMRESULT WINAPI midiInGetDevCapsW(UINT_PTR uDeviceID, LPMIDIINCAPSW lpCaps, UINT uSize) { LPWINE_MLD wmld; @@ -1178,7 +1178,7 @@ /************************************************************************** * midiInGetDevCapsA [WINMM.@] */ -UINT WINAPI midiInGetDevCapsA(UINT_PTR uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSize) +MMRESULT WINAPI midiInGetDevCapsA(UINT_PTR uDeviceID, LPMIDIINCAPSA lpCaps, UINT uSize) { MIDIINCAPSW micW; UINT ret; @@ -1238,7 +1238,7 @@ /************************************************************************** * midiInOpen [WINMM.@] */ -UINT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT uDeviceID, +MMRESULT WINAPI midiInOpen(HMIDIIN* lphMidiIn, UINT_PTR uDeviceID, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { return MIDI_InOpen(lphMidiIn, uDeviceID, dwCallback, dwInstance, dwFlags, TRUE); @@ -1387,7 +1387,7 @@ /************************************************************************** * midiInMessage [WINMM.@] */ -UINT WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage, +DWORD WINAPI midiInMessage(HMIDIIN hMidiIn, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { LPWINE_MLD wmld; @@ -2090,7 +2090,7 @@ /************************************************************************** * waveOutGetDevCapsA [WINMM.@] */ -UINT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, +MMRESULT WINAPI waveOutGetDevCapsA(UINT_PTR uDeviceID, LPWAVEOUTCAPSA lpCaps, UINT uSize) { WAVEOUTCAPSW wocW; @@ -2473,7 +2473,7 @@ /************************************************************************** * waveOutMessage [WINMM.@] */ -UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, +DWORD WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { LPWINE_MLD wmld; @@ -2508,7 +2508,7 @@ /************************************************************************** * waveInGetDevCapsW [WINMM.@] */ -UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSize) +MMRESULT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSize) { LPWINE_MLD wmld; @@ -2741,7 +2741,7 @@ /************************************************************************** * waveInMessage [WINMM.@] */ -UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, +DWORD WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { LPWINE_MLD wmld;

1 0

[sserapion] 38263: Fix definitions of WAVEOPENDESC, WAVEHDR structures. Fix prototypes for DefDriverProc, waveOutMessage, waveOutGetDevCapsA/W, waveInGetDevCapsA/W, waveInMessage, midiStreamOpen, midiOutGetDevCapsA/W, midiOutOpen, midiOutMessage, midiInGetDevCapsA/W, midiInOpen, midiInMessage, auxGetDevCapsA/W, auxOutMessage, mixerGetDevCapsA/W, mixerOpen, timeSetEvent, joyGetDevCapsA/W, mciSendCommandA/W, and mciGetCreatorTask.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 22:50:48 2008 New Revision: 38263 URL: http://svn.reactos.org/svn/reactos?rev=38263&view=rev Log: Fix definitions of WAVEOPENDESC, WAVEHDR structures. Fix prototypes for DefDriverProc, waveOutMessage, waveOutGetDevCapsA/W, waveInGetDevCapsA/W, waveInMessage, midiStreamOpen, midiOutGetDevCapsA/W, midiOutOpen, midiOutMessage, midiInGetDevCapsA/W, midiInOpen, midiInMessage, auxGetDevCapsA/W, auxOutMessage, mixerGetDevCapsA/W, mixerOpen, timeSetEvent, joyGetDevCapsA/W, mciSendCommandA/W, and mciGetCreatorTask. Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h branches/ros-amd64-bringup/reactos/include/psdk/msacm.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmddk.h [iso-8859-1] Sun Dec 21 22:50:48 2008 @@ -390,10 +390,10 @@ typedef struct { HWAVE hWave; LPWAVEFORMATEX lpFormat; - DWORD dwCallback; - DWORD dwInstance; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; UINT uMappedDeviceID; - DWORD dnDevNode; + DWORD dnDevNode; } WAVEOPENDESC, *LPWAVEOPENDESC; typedef struct { Modified: branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/mmsystem.h [iso-8859-1] Sun Dec 21 22:50:48 2008 @@ -951,7 +951,7 @@ DWORD dnDevNode; } DRVCONFIGINFOEX,*PDRVCONFIGINFOEX,*LPDRVCONFIGINFOEX; -typedef LRESULT(CALLBACK* DRIVERPROC)(DWORD,HDRVR,UINT,LPARAM,LPARAM); +typedef LONG(CALLBACK* DRIVERPROC)(DWORD,HDRVR,UINT,LONG,LONG); typedef void (CALLBACK DRVCALLBACK)(HDRVR,UINT,DWORD,DWORD,DWORD); typedef DRVCALLBACK *LPDRVCALLBACK; typedef DRVCALLBACK *PDRVCALLBACK; @@ -967,11 +967,11 @@ LPSTR lpData; DWORD dwBufferLength; DWORD dwBytesRecorded; - DWORD dwUser; + DWORD_PTR dwUser; DWORD dwFlags; DWORD dwLoops; struct wavehdr_tag *lpNext; - DWORD reserved; + DWORD_PTR reserved; } WAVEHDR,*PWAVEHDR,*LPWAVEHDR; typedef struct tagWAVEOUTCAPSA { @@ -1642,7 +1642,7 @@ LRESULT WINAPI SendDriverMessage(HDRVR,UINT,LONG,LONG); HMODULE WINAPI DrvGetModuleHandle(HDRVR); HMODULE WINAPI GetDriverModuleHandle(HDRVR); -LRESULT WINAPI DefDriverProc(DWORD,HDRVR,UINT,LPARAM,LPARAM); +LONG WINAPI DefDriverProc(DWORD,HDRVR,UINT,LONG,LONG); UINT WINAPI mmsystemGetVersion(void); #define OutputDebugStr OutputDebugString BOOL WINAPI sndPlaySoundA(LPCSTR,UINT); @@ -1650,8 +1650,8 @@ BOOL WINAPI PlaySoundA(LPCSTR,HMODULE,DWORD); BOOL WINAPI PlaySoundW(LPCWSTR,HMODULE,DWORD); UINT WINAPI waveOutGetNumDevs(void); -MMRESULT WINAPI waveOutGetDevCapsA(UINT,LPWAVEOUTCAPSA,UINT); -MMRESULT WINAPI waveOutGetDevCapsW(UINT,LPWAVEOUTCAPSW,UINT); +MMRESULT WINAPI waveOutGetDevCapsA(UINT_PTR,LPWAVEOUTCAPSA,UINT); +MMRESULT WINAPI waveOutGetDevCapsW(UINT_PTR,LPWAVEOUTCAPSW,UINT); MMRESULT WINAPI waveOutGetVolume(HWAVEOUT,PDWORD); MMRESULT WINAPI waveOutSetVolume(HWAVEOUT,DWORD); MMRESULT WINAPI waveOutGetErrorTextA(MMRESULT,LPSTR,UINT); @@ -1671,10 +1671,10 @@ MMRESULT WINAPI waveOutGetPlaybackRate(HWAVEOUT,PDWORD); MMRESULT WINAPI waveOutSetPlaybackRate(HWAVEOUT,DWORD); MMRESULT WINAPI waveOutGetID(HWAVEOUT,LPUINT); -MMRESULT WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD,DWORD); +DWORD WINAPI waveOutMessage(HWAVEOUT,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI waveInGetNumDevs(void); -MMRESULT WINAPI waveInGetDevCapsA(UINT,LPWAVEINCAPSA,UINT); -MMRESULT WINAPI waveInGetDevCapsW(UINT,LPWAVEINCAPSW,UINT); +MMRESULT WINAPI waveInGetDevCapsA(UINT_PTR,LPWAVEINCAPSA,UINT); +MMRESULT WINAPI waveInGetDevCapsW(UINT_PTR,LPWAVEINCAPSW,UINT); MMRESULT WINAPI waveInGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI waveInGetErrorTextW(MMRESULT,LPWSTR,UINT); MMRESULT WINAPI waveInOpen(LPHWAVEIN,UINT,LPCWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); @@ -1687,9 +1687,9 @@ MMRESULT WINAPI waveInReset(HWAVEIN); MMRESULT WINAPI waveInGetPosition(HWAVEIN,LPMMTIME,UINT); MMRESULT WINAPI waveInGetID(HWAVEIN,LPUINT); -MMRESULT WINAPI waveInMessage(HWAVEIN,UINT,DWORD,DWORD); +DWORD WINAPI waveInMessage(HWAVEIN,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI midiOutGetNumDevs(void); -MMRESULT WINAPI midiStreamOpen(LPHMIDISTRM,LPUINT,DWORD,DWORD,DWORD,DWORD); +MMRESULT WINAPI midiStreamOpen(LPHMIDISTRM,LPUINT,DWORD,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiStreamClose(HMIDISTRM); MMRESULT WINAPI midiStreamProperty(HMIDISTRM,LPBYTE,DWORD); MMRESULT WINAPI midiStreamPosition(HMIDISTRM,LPMMTIME,UINT); @@ -1699,13 +1699,13 @@ MMRESULT WINAPI midiStreamStop(HMIDISTRM); MMRESULT WINAPI midiConnect(HMIDI,HMIDIOUT,PVOID); MMRESULT WINAPI midiDisconnect(HMIDI,HMIDIOUT,PVOID); -MMRESULT WINAPI midiOutGetDevCapsA(UINT,LPMIDIOUTCAPSA,UINT); -MMRESULT WINAPI midiOutGetDevCapsW(UINT,LPMIDIOUTCAPSW,UINT); +MMRESULT WINAPI midiOutGetDevCapsA(UINT_PTR,LPMIDIOUTCAPSA,UINT); +MMRESULT WINAPI midiOutGetDevCapsW(UINT_PTR,LPMIDIOUTCAPSW,UINT); MMRESULT WINAPI midiOutGetVolume(HMIDIOUT,PDWORD); MMRESULT WINAPI midiOutSetVolume(HMIDIOUT,DWORD); MMRESULT WINAPI midiOutGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI midiOutGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT,DWORD,DWORD,DWORD); +MMRESULT WINAPI midiOutOpen(LPHMIDIOUT,UINT_PTR,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiOutClose(HMIDIOUT); MMRESULT WINAPI midiOutPrepareHeader(HMIDIOUT,LPMIDIHDR,UINT); MMRESULT WINAPI midiOutUnprepareHeader(HMIDIOUT,LPMIDIHDR,UINT); @@ -1715,13 +1715,13 @@ MMRESULT WINAPI midiOutCachePatches(HMIDIOUT,UINT,LPWORD,UINT); MMRESULT WINAPI midiOutCacheDrumPatches(HMIDIOUT,UINT,LPWORD,UINT); MMRESULT WINAPI midiOutGetID(HMIDIOUT,LPUINT); -MMRESULT WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD,DWORD); +DWORD WINAPI midiOutMessage(HMIDIOUT,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI midiInGetNumDevs(void); -MMRESULT WINAPI midiInGetDevCapsA(UINT,LPMIDIINCAPSA,UINT); -MMRESULT WINAPI midiInGetDevCapsW(UINT,LPMIDIINCAPSW,UINT); +MMRESULT WINAPI midiInGetDevCapsA(UINT_PTR,LPMIDIINCAPSA,UINT); +MMRESULT WINAPI midiInGetDevCapsW(UINT_PTR,LPMIDIINCAPSW,UINT); MMRESULT WINAPI midiInGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI midiInGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT,DWORD,DWORD,DWORD); +MMRESULT WINAPI midiInOpen(LPHMIDIIN,UINT_PTR,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI midiInClose(HMIDIIN); MMRESULT WINAPI midiInPrepareHeader(HMIDIIN,LPMIDIHDR,UINT); MMRESULT WINAPI midiInUnprepareHeader(HMIDIIN,LPMIDIHDR,UINT); @@ -1730,17 +1730,17 @@ MMRESULT WINAPI midiInStop(HMIDIIN); MMRESULT WINAPI midiInReset(HMIDIIN); MMRESULT WINAPI midiInGetID(HMIDIIN,LPUINT); -MMRESULT WINAPI midiInMessage(HMIDIIN,UINT,DWORD,DWORD); +DWORD WINAPI midiInMessage(HMIDIIN,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI auxGetNumDevs(void); -MMRESULT WINAPI auxGetDevCapsA(UINT,LPAUXCAPSA,UINT); -MMRESULT WINAPI auxGetDevCapsW(UINT,LPAUXCAPSW,UINT); +MMRESULT WINAPI auxGetDevCapsA(UINT_PTR,LPAUXCAPSA,UINT); +MMRESULT WINAPI auxGetDevCapsW(UINT_PTR,LPAUXCAPSW,UINT); MMRESULT WINAPI auxSetVolume(UINT,DWORD); MMRESULT WINAPI auxGetVolume(UINT,PDWORD); -MMRESULT WINAPI auxOutMessage(UINT,UINT,DWORD,DWORD); +MMRESULT WINAPI auxOutMessage(UINT,UINT,DWORD_PTR,DWORD_PTR); UINT WINAPI mixerGetNumDevs(void); -MMRESULT WINAPI mixerGetDevCapsA(UINT,LPMIXERCAPSA,UINT); -MMRESULT WINAPI mixerGetDevCapsW(UINT,LPMIXERCAPSW,UINT); -MMRESULT WINAPI mixerOpen(LPHMIXER,UINT,DWORD,DWORD,DWORD); +MMRESULT WINAPI mixerGetDevCapsA(UINT_PTR,LPMIXERCAPSA,UINT); +MMRESULT WINAPI mixerGetDevCapsW(UINT_PTR,LPMIXERCAPSW,UINT); +MMRESULT WINAPI mixerOpen(LPHMIXER,UINT,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI mixerClose(HMIXER); DWORD WINAPI mixerMessage(HMIXER,UINT,DWORD_PTR,DWORD_PTR); MMRESULT WINAPI mixerGetLineInfoA(HMIXEROBJ,LPMIXERLINEA,DWORD); @@ -1753,14 +1753,14 @@ MMRESULT WINAPI mixerSetControlDetails(HMIXEROBJ,LPMIXERCONTROLDETAILS,DWORD); MMRESULT WINAPI timeGetSystemTime(LPMMTIME,UINT); DWORD WINAPI timeGetTime(void); -MMRESULT WINAPI timeSetEvent(UINT,UINT,LPTIMECALLBACK,DWORD,UINT); +MMRESULT WINAPI timeSetEvent(UINT,UINT,LPTIMECALLBACK,DWORD_PTR,UINT); MMRESULT WINAPI timeKillEvent(UINT); MMRESULT WINAPI timeGetDevCaps(LPTIMECAPS,UINT); MMRESULT WINAPI timeBeginPeriod(UINT); MMRESULT WINAPI timeEndPeriod(UINT); UINT WINAPI joyGetNumDevs(void); -MMRESULT WINAPI joyGetDevCapsA(UINT,LPJOYCAPSA,UINT); -MMRESULT WINAPI joyGetDevCapsW(UINT,LPJOYCAPSW,UINT); +MMRESULT WINAPI joyGetDevCapsA(UINT_PTR,LPJOYCAPSA,UINT); +MMRESULT WINAPI joyGetDevCapsW(UINT_PTR,LPJOYCAPSW,UINT); MMRESULT WINAPI joyGetPos(UINT,LPJOYINFO); MMRESULT WINAPI joyGetPosEx(UINT,LPJOYINFOEX); MMRESULT WINAPI joyGetThreshold(UINT,LPUINT); @@ -1788,8 +1788,8 @@ MMRESULT WINAPI mmioDescend(HMMIO,LPMMCKINFO,const MMCKINFO*,UINT); MMRESULT WINAPI mmioAscend(HMMIO,LPMMCKINFO,UINT); MMRESULT WINAPI mmioCreateChunk(HMMIO,LPMMCKINFO,UINT); -MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD); -MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD); +MCIERROR WINAPI mciSendCommandA(MCIDEVICEID,UINT,DWORD,DWORD_PTR); +MCIERROR WINAPI mciSendCommandW(MCIDEVICEID,UINT,DWORD,DWORD_PTR); MCIERROR WINAPI mciSendStringA(LPCSTR,LPSTR,UINT,HWND); MCIERROR WINAPI mciSendStringW(LPCWSTR,LPWSTR,UINT,HWND); MCIDEVICEID WINAPI mciGetDeviceIDA(LPCSTR); @@ -1799,7 +1799,7 @@ BOOL WINAPI mciGetErrorStringA(MCIERROR,LPSTR,UINT); BOOL WINAPI mciGetErrorStringW(MCIERROR,LPWSTR,UINT); BOOL WINAPI mciSetYieldProc(MCIDEVICEID,YIELDPROC,DWORD); -HTASK WINAPI mciGetCreatorTask(MCIDEVICEID); +HANDLE WINAPI mciGetCreatorTask(MCIDEVICEID); YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID,PDWORD); typedef struct tagMCI_SEQ_SET_PARMS { Modified: branches/ros-amd64-bringup/reactos/include/psdk/msacm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/msacm.h [iso-8859-1] Sun Dec 21 22:50:48 2008 @@ -541,7 +541,7 @@ { DWORD cbStruct; DWORD fdwStatus; - DWORD dwUser; + DWORD_PTR dwUser; LPBYTE pbSrc; DWORD cbSrcLength; DWORD cbSrcLengthUsed;

1 0

[tkreuzer] 38262: If ETO_PDY is specified, Dx is a pair of INTs, make sure we access the correct index. based on aspotashev's patch. Should fix bug #3958 See issue #3958 for more details.
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Sun Dec 21 22:26:51 2008 New Revision: 38262 URL: http://svn.reactos.org/svn/reactos?rev=38262&view=rev Log: If ETO_PDY is specified, Dx is a pair of INTs, make sure we access the correct index. based on aspotashev's patch. Should fix bug #3958 See issue #3958 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Dec 21 22:26:51 2008 @@ -3132,6 +3132,7 @@ POINT Start; BOOL DoBreak = FALSE; HPALETTE hDestPalette; + USHORT DxShift; // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). @@ -3157,6 +3158,8 @@ SetLastWin32Error(ERROR_INVALID_PARAMETER); goto fail; } + + DxShift = fuOptions & ETO_PDY ? 1 : 0; if (PATH_IsPathOpen(dc->DcLevel)) { @@ -3364,7 +3367,7 @@ if (NULL != Dx) { Start = Count < 2 ? 0 : Count - 2; - TextWidth = Count < 2 ? 0 : (Dx[Count - 2] << 6); + TextWidth = Count < 2 ? 0 : (Dx[(Count-2)<<DxShift] << 6); } else { @@ -3597,7 +3600,7 @@ } else { - TextLeft += Dx[i] << 6; + TextLeft += Dx[i<<DxShift] << 6; // DbgPrint("new TextLeft2: %d\n", TextLeft); } previous = glyph_index;

1 0

[tkreuzer] 38261: Some people were thinking they could use NtGdiExtTextOut from within Win32k and get away with it. Since MmCopyFromCaller is broken, it was actually working. Implement NtGdiExtTextOutW as a wrapper around the real function, that is now called GreExtTextOutW, using the naming style that ms also uses to get some more stucture in here. Also get rid of 2 pool allocations and use only one if a local buffer is not sufficient. Should get us more TextOut performance.
by tkreuzer＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: tkreuzer Date: Sun Dec 21 21:58:04 2008 New Revision: 38261 URL: http://svn.reactos.org/svn/reactos?rev=38261&view=rev Log: Some people were thinking they could use NtGdiExtTextOut from within Win32k and get away with it. Since MmCopyFromCaller is broken, it was actually working. Implement NtGdiExtTextOutW as a wrapper around the real function, that is now called GreExtTextOutW, using the naming style that ms also uses to get some more stucture in here. Also get rid of 2 pool allocations and use only one if a local buffer is not sufficient. Should get us more TextOut performance. Modified: trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Sun Dec 21 21:58:04 2008 @@ -104,6 +104,8 @@ BOOL FASTCALL IntGdiGetFontResourceInfo(PUNICODE_STRING,PVOID,DWORD*,DWORD); BOOL FASTCALL ftGdiRealizationInfo(PFONTGDI,PREALIZATION_INFO); DWORD FASTCALL ftGdiGetKerningPairs(PFONTGDI,DWORD,LPKERNINGPAIR); +BOOL NTAPI GreExtTextOutW(IN HDC,IN INT,IN INT,IN UINT,IN OPTIONAL LPRECT, + IN LPWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); #define IntLockProcessPrivateFonts(W32Process) \ ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&W32Process->PrivateFontListLock) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Sun Dec 21 21:58:04 2008 @@ -1536,7 +1536,7 @@ align_old = IntGdiSetTextAlign(hDC, TA_RIGHT); mode_old = IntGdiSetBkMode(hDC, TRANSPARENT); - NtGdiExtTextOutW(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL, 0); + GreExtTextOutW(hDC, rect.right-16, rect.bottom-48, 0, NULL, s_wszVersion, len, NULL, 0); IntGdiSetBkMode(hDC, mode_old); IntGdiSetTextAlign(hDC, align_old); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Sun Dec 21 21:58:04 2008 @@ -1594,7 +1594,7 @@ //FIXME: If string doesn't fit to rc, truncate it and add ellipsis. - NtGdiExtTextOutW(hDc, lpRc->left, + GreExtTextOutW(hDc, lpRc->left, lpRc->top, 0, NULL, Text->Buffer, Text->Length/sizeof(WCHAR), NULL, 0); Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Dec 21 21:58:04 2008 @@ -3079,15 +3079,15 @@ BOOL APIENTRY -NtGdiExtTextOutW( +GreExtTextOutW( IN HDC hDC, IN INT XStart, IN INT YStart, IN UINT fuOptions, IN OPTIONAL LPRECT lprc, - IN LPWSTR UnsafeString, + IN LPWSTR String, IN INT Count, - IN OPTIONAL LPINT UnsafeDx, + IN OPTIONAL LPINT Dx, IN DWORD dwCodePage) { /* @@ -3108,7 +3108,7 @@ LONGLONG TextLeft, RealXStart; ULONG TextTop, previous, BackgroundLeft; FT_Bool use_kerning; - RECTL DestRect, MaskRect, SpecifiedDestRect; + RECTL DestRect, MaskRect; POINTL SourcePoint, BrushOrigin; HBRUSH hBrushFg = NULL; PGDIBRUSHOBJ BrushFg = NULL; @@ -3129,11 +3129,8 @@ ULONG Mode; FT_Render_Mode RenderMode; BOOLEAN Render; - NTSTATUS Status; - INT *Dx = NULL; POINT Start; BOOL DoBreak = FALSE; - LPCWSTR String, SafeString = NULL; HPALETTE hDestPalette; // TODO: Write test-cases to exactly match real Windows in different @@ -3155,48 +3152,10 @@ if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; /* Check if String is valid */ - if ((Count > 0xFFFF) || (Count > 0 && UnsafeString == NULL)) + if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); goto fail; - } - if (Count > 0) - { - SafeString = ExAllocatePoolWithTag(PagedPool, Count * sizeof(WCHAR), TAG_GDITEXT); - if (!SafeString) - { - goto fail; - } - Status = MmCopyFromCaller(SafeString, UnsafeString, Count * sizeof(WCHAR)); - if (! NT_SUCCESS(Status)) - { - goto fail; - } - } - String = SafeString; - - if (NULL != UnsafeDx && Count > 0) - { - Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT); - if (NULL == Dx) - { - goto fail; - } - Status = MmCopyFromCaller(Dx, UnsafeDx, Count * sizeof(INT)); - if (!NT_SUCCESS(Status)) - { - goto fail; - } - } - - if (lprc) - { - Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - goto fail; - } } if (PATH_IsPathOpen(dc->DcLevel)) @@ -3205,8 +3164,8 @@ XStart, YStart, fuOptions, - (const RECT *)&SpecifiedDestRect, - SafeString, + (const RECT *)lprc, + String, Count, (const INT *)Dx)) goto fail; goto good; @@ -3214,7 +3173,7 @@ if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) { - IntLPtoDP(dc, (POINT *) &SpecifiedDestRect, 2); + IntLPtoDP(dc, (POINT *)lprc, 2); } BitmapObj = BITMAPOBJ_LockBitmap(dc->w.hBitmap); @@ -3288,10 +3247,10 @@ if ((fuOptions & ETO_OPAQUE) && lprc) { - DestRect.left = SpecifiedDestRect.left + dc->ptlDCOrig.x; - DestRect.top = SpecifiedDestRect.top + dc->ptlDCOrig.y; - DestRect.right = SpecifiedDestRect.right + dc->ptlDCOrig.x; - DestRect.bottom = SpecifiedDestRect.bottom + dc->ptlDCOrig.y; + DestRect.left = lprc->left + dc->ptlDCOrig.x; + DestRect.top = lprc->top + dc->ptlDCOrig.y; + DestRect.right = lprc->right + dc->ptlDCOrig.x; + DestRect.bottom = lprc->bottom + dc->ptlDCOrig.y; IntLPtoDP(dc, (LPPOINT)&DestRect, 2); IntEngBitBlt( &BitmapObj->SurfObj, @@ -3602,12 +3561,12 @@ if (lprc && (fuOptions & ETO_CLIPPED) && - DestRect.right >= SpecifiedDestRect.right + dc->ptlDCOrig.x) + DestRect.right >= lprc->right + dc->ptlDCOrig.x) { // We do the check '>=' instead of '>' to possibly save an iteration // through this loop, since it's breaking after the drawing is done, // and x is always incremented. - DestRect.right = SpecifiedDestRect.right + dc->ptlDCOrig.x; + DestRect.right = lprc->right + dc->ptlDCOrig.x; DoBreak = TRUE; } @@ -3661,14 +3620,6 @@ BRUSHOBJ_UnlockBrush(BrushFg); NtGdiDeleteObject(hBrushFg); good: - if (NULL != SafeString) - { - ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); - } - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, TAG_GDITEXT); - } DC_UnlockDc( dc ); return TRUE; @@ -3692,18 +3643,131 @@ BRUSHOBJ_UnlockBrush(BrushFg); NtGdiDeleteObject(hBrushFg); } - if (NULL != SafeString) - { - ExFreePoolWithTag((void*)SafeString, TAG_GDITEXT); - } - if (NULL != Dx) - { - ExFreePoolWithTag(Dx, TAG_GDITEXT); - } DC_UnlockDc(dc); return FALSE; } + +#define STACK_TEXT_BUFFER_SIZE 50 +BOOL +APIENTRY +NtGdiExtTextOutW( + IN HDC hDC, + IN INT XStart, + IN INT YStart, + IN UINT fuOptions, + IN OPTIONAL LPRECT UnsafeRect, + IN LPWSTR UnsafeString, + IN INT Count, + IN OPTIONAL LPINT UnsafeDx, + IN DWORD dwCodePage) +{ + BOOL Result = FALSE; + NTSTATUS Status = STATUS_SUCCESS; + RECT SafeRect; + BYTE LocalBuffer[STACK_TEXT_BUFFER_SIZE]; + PVOID Buffer = LocalBuffer; + LPWSTR SafeString = NULL; + LPINT SafeDx = NULL; + ULONG BufSize, StringSize, DxSize = 0; + + /* Check if String is valid */ + if ((Count > 0xFFFF) || (Count > 0 && UnsafeString == NULL)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (Count > 0) + { + /* Calculate buffer size for string and Dx values */ + BufSize = StringSize = Count * sizeof(WCHAR); + if (UnsafeDx) + { + /* If ETO_PDY is specified, we have pairs of INTs */ + DxSize = (Count * sizeof(INT)) * (fuOptions & ETO_PDY ? 2 : 1); + BufSize += DxSize; + } + + /* Check if our local buffer is large enough */ + if (BufSize > STACK_TEXT_BUFFER_SIZE) + { + /* It's not, allocate a temp buffer */ + Buffer = ExAllocatePoolWithTag(PagedPool, BufSize, TAG_GDITEXT); + if (!Buffer) + { + return FALSE; + } + } + + /* Probe and copy user mode data to the buffer */ + _SEH2_TRY + { + /* Probe and copy the string */ + ProbeForRead(UnsafeString, StringSize, 1); + SafeString = Buffer; + memcpy((PVOID)SafeString, UnsafeString, StringSize); + + /* If we have Dx values... */ + if (UnsafeDx) + { + /* ... probe and copy them */ + ProbeForRead(UnsafeDx, DxSize, 1); + SafeDx = (LPINT)(((ULONG_PTR)Buffer) + StringSize); + memcpy(SafeDx, UnsafeDx, DxSize); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + goto cleanup; + } + } + + /* If we have a rect, copy it */ + if (UnsafeRect) + { + _SEH2_TRY + { + ProbeForRead(UnsafeRect, sizeof(RECT), 1); + SafeRect = *UnsafeRect; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + if (!NT_SUCCESS(Status)) + { + goto cleanup; + } + } + + /* Finally call the internal routine */ + Result = GreExtTextOutW(hDC, + XStart, + YStart, + fuOptions, + &SafeRect, + SafeString, + Count, + SafeDx, + dwCodePage); + +cleanup: + /* If we allocated a buffer, free it */ + if (Buffer != LocalBuffer) + { + ExFreePoolWithTag(Buffer, TAG_GDITEXT); + } + + return Result;; +} + /* * @implemented

1 0

[sserapion] 38260: Fix EDITSTREAM structure
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 21:22:05 2008 New Revision: 38260 URL: http://svn.reactos.org/svn/reactos?rev=38260&view=rev Log: Fix EDITSTREAM structure Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c branches/ros-amd64-bringup/reactos/include/psdk/richedit.h Modified: branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/riched20/editor.c [iso-8859-1] Sun Dec 21 21:22:05 2008 @@ -1616,7 +1616,7 @@ data.string = string; data.length = strlen(string); data.pos = 0; - es.dwCookie = (DWORD)&data; + es.dwCookie = (DWORD_PTR)&data; es.pfnCallback = ME_ReadFromRTFString; ME_StreamIn(editor, SF_RTF | (selection ? SFF_SELECTION : 0), &es, FALSE); } @@ -1998,7 +1998,7 @@ return FALSE; gds.hData = GetClipboardData(cf); gds.nLength = 0; - es.dwCookie = (DWORD)&gds; + es.dwCookie = (DWORD_PTR)&gds; es.pfnCallback = dwFormat == SF_RTF ? ME_ReadFromHGLOBALRTF : ME_ReadFromHGLOBALUnicode; ME_StreamIn(editor, dwFormat|SFF_SELECTION, &es, FALSE); Modified: branches/ros-amd64-bringup/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/richedit.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/richedit.h [iso-8859-1] Sun Dec 21 21:22:05 2008 @@ -517,7 +517,7 @@ typedef struct _editstream { DWORD dwCookie; - DWORD dwError; + DWORD_PTR dwError; EDITSTREAMCALLBACK pfnCallback; } EDITSTREAM;

1 0

[sserapion] 38259: Support IMAGE_REL_BASED_DIR64.
by sserapion＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: sserapion Date: Sun Dec 21 21:09:04 2008 New Revision: 38259 URL: http://svn.reactos.org/svn/reactos?rev=38259&view=rev Log: Support IMAGE_REL_BASED_DIR64. Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sun Dec 21 21:09:04 2008 @@ -3265,6 +3265,12 @@ LongPtr = (PULONG)((ULONG_PTR)Address + Offset); *LongPtr += Delta; break; +#ifdef _WIN64 + case IMAGE_REL_BASED_DIR64: + LongPtr = (PULONG)((ULONG_PTR)Address + Offset); + *LongPtr += Delta; + break; +#endif case IMAGE_REL_BASED_HIGHADJ: case IMAGE_REL_BASED_MIPS_JMPADDR:

1 0

[jimtabor] 38258: - Start populating server information structure. This fixes the icon issues with other languages.
by jimtabor＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: jimtabor Date: Sun Dec 21 20:52:47 2008 New Revision: 38258 URL: http://svn.reactos.org/svn/reactos?rev=38258&view=rev Log: - Start populating server information structure. This fixes the icon issues with other languages. Modified: trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c [iso-8859-1] Sun Dec 21 20:52:47 2008 @@ -670,13 +670,13 @@ { ColorBits = 1; } - else if (g_psi->SystemMetrics[SM_SAMEDISPLAYFORMAT] || (cFlag & LR_VGACOLOR) ) + else if (cFlag & LR_VGACOLOR) { ColorBits = 4; } else { - ColorBits = 0; + ColorBits = g_psi->BitsPixel; } if(bIcon) Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Dec 21 20:52:47 2008 @@ -277,6 +277,19 @@ COLORREF SysColors[COLOR_MENUBAR+1]; // GetSysColor HBRUSH SysColorBrushes[COLOR_MENUBAR+1]; // GetSysColorBrush HPEN SysColorPens[COLOR_MENUBAR+1]; // ReactOS exclusive + // + RECTL rcScreen; + WORD BitCount; + WORD dmLogPixels; + BYTE BitsPixel; + BYTE Planes; + WORD reserved; + DWORD PUSIFlags; + ULONG uCaretWidth; + LANGID UILangID; + UINT LastRITWasKeyboard : 1; + UINT bKeyboardPref : 1; + DWORD TimeTick; DWORD SrvEventActivity; } SERVERINFO, *PSERVERINFO; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Sun Dec 21 20:52:47 2008 @@ -314,6 +314,11 @@ NtGdiSelectFont( hSystemBM, NtGdiGetStockObject(SYSTEM_FONT)); IntGdiSetDCOwnerEx( hSystemBM, GDI_OBJ_HMGR_PUBLIC, FALSE); + + // FIXME! Move these to a update routine. + gpsi->Planes = NtGdiGetDeviceCaps(ScreenDeviceContext, PLANES); + gpsi->BitsPixel = NtGdiGetDeviceCaps(ScreenDeviceContext, BITSPIXEL); + gpsi->BitCount = gpsi->Planes * gpsi->BitsPixel; return TRUE; }

1 0

[cgutman] 38257: - Fix compilation of tcpip with MEMTRACK defined
by cgutman＠svn.reactos.org 22 Dec '08

22 Dec '08

Author: cgutman Date: Sun Dec 21 20:52:45 2008 New Revision: 38257 URL: http://svn.reactos.org/svn/reactos?rev=38257&view=rev Log: - Fix compilation of tcpip with MEMTRACK defined Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/include/memtrack.h [iso-8859-1] Sun Dec 21 20:52:45 2008 @@ -19,9 +19,6 @@ #define exAllocatePool(x,y) ExAllocatePoolX(x,y,__FILE__,__LINE__) #define exAllocatePoolWithTag(x,y,z) ExAllocatePoolX(x,y,__FILE__,__LINE__) #define exFreePool(x) ExFreePoolX(x,__FILE__,__LINE__) - -extern LIST_ENTRY AllocatedObjectsHead; -extern KSPIN_LOCK AllocatedObjectsLock; typedef struct _ALLOCATION_TRACKER { LIST_ENTRY Entry;

1 0

[sginsberg] 38256: - More hack
by sginsberg＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: sginsberg Date: Sun Dec 21 17:42:08 2008 New Revision: 38256 URL: http://svn.reactos.org/svn/reactos?rev=38256&view=rev Log: - More hack Modified: trunk/rostests/winetests/shell32/roshack.diff trunk/rostests/winetests/shell32/systray.c Modified: trunk/rostests/winetests/shell32/roshack.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/roshack… ============================================================================== --- trunk/rostests/winetests/shell32/roshack.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/roshack.diff [iso-8859-1] Sun Dec 21 17:42:08 2008 @@ -11,3 +11,17 @@ myARGC = winetest_get_mainargs(&myARGV); if (myARGC >= 3) +Index: systray.c +=================================================================== +--- systray.c (revision 38229) ++++ systray.c (working copy) +@@ -138,6 +138,9 @@ + RECT rc; + HMODULE huser32, hshell32; + ++ skip("Skipping systray tests\n"); ++ return; ++ + hshell32 = GetModuleHandleA("shell32.dll"); + pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW"); + Modified: trunk/rostests/winetests/shell32/systray.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shell32/systray… ============================================================================== --- trunk/rostests/winetests/shell32/systray.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shell32/systray.c [iso-8859-1] Sun Dec 21 17:42:08 2008 @@ -138,6 +138,9 @@ RECT rc; HMODULE huser32, hshell32; + skip("Skipping systray tests\n"); + return; + hshell32 = GetModuleHandleA("shell32.dll"); pShell_NotifyIconW = (void*)GetProcAddress(hshell32, "Shell_NotifyIconW");

1 0

[tkreuzer] 38255: Include crtdefs.h instead of _mingw.h in the crt headers (like ms does), so only one header left (crtdefs.h) that includes a non-standard header
by tkreuzer＠svn.reactos.org 21 Dec '08

21 Dec '08

Author: tkreuzer Date: Sun Dec 21 17:33:19 2008 New Revision: 38255 URL: http://svn.reactos.org/svn/reactos?rev=38255&view=rev Log: Include crtdefs.h instead of _mingw.h in the crt headers (like ms does), so only one header left (crtdefs.h) that includes a non-standard header Modified: trunk/reactos/include/crt/assert.h trunk/reactos/include/crt/complex.h trunk/reactos/include/crt/conio.h trunk/reactos/include/crt/crtdbg.h trunk/reactos/include/crt/ctype.h trunk/reactos/include/crt/direct.h trunk/reactos/include/crt/dirent.h trunk/reactos/include/crt/dos.h trunk/reactos/include/crt/dvec.h trunk/reactos/include/crt/eh.h trunk/reactos/include/crt/errno.h trunk/reactos/include/crt/fcntl.h trunk/reactos/include/crt/float.h trunk/reactos/include/crt/fpieee.h trunk/reactos/include/crt/fvec.h trunk/reactos/include/crt/inttypes.h trunk/reactos/include/crt/io.h trunk/reactos/include/crt/libgen.h trunk/reactos/include/crt/limits.h trunk/reactos/include/crt/locale.h trunk/reactos/include/crt/malloc.h trunk/reactos/include/crt/math.h trunk/reactos/include/crt/mbctype.h trunk/reactos/include/crt/mbstring.h trunk/reactos/include/crt/memory.h trunk/reactos/include/crt/new.h trunk/reactos/include/crt/process.h trunk/reactos/include/crt/rtcapi.h trunk/reactos/include/crt/search.h trunk/reactos/include/crt/setjmp.h trunk/reactos/include/crt/signal.h trunk/reactos/include/crt/stddef.h trunk/reactos/include/crt/stdexcpt.h trunk/reactos/include/crt/stdint.h trunk/reactos/include/crt/stdio.h trunk/reactos/include/crt/stdlib.h trunk/reactos/include/crt/string.h trunk/reactos/include/crt/sys/locking.h trunk/reactos/include/crt/sys/stat.h trunk/reactos/include/crt/sys/timeb.h trunk/reactos/include/crt/sys/types.h trunk/reactos/include/crt/sys/utime.h trunk/reactos/include/crt/tchar.h trunk/reactos/include/crt/time.h trunk/reactos/include/crt/typeinfo.h trunk/reactos/include/crt/vadefs.h trunk/reactos/include/crt/wchar.h trunk/reactos/include/crt/wctype.h trunk/reactos/include/crt/yvals.h Modified: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/assert.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/assert.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef __ASSERT_H_ #define __ASSERT_H_ -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus #include <stdlib.h> #endif Modified: trunk/reactos/include/crt/complex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/complex.h?rev=… ============================================================================== --- trunk/reactos/include/crt/complex.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/complex.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -26,8 +26,7 @@ #ifndef _COMPLEX_H_ #define _COMPLEX_H_ -/* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> #if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \ || !defined __STRICT_ANSI__ Modified: trunk/reactos/include/crt/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/conio.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/conio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/conio.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_CONIO #define _INC_CONIO -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/crtdbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdbg.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/crtdbg.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdbg.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_CRTDBG #define _INC_CRTDBG Modified: trunk/reactos/include/crt/ctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/ctype.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/ctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/ctype.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_CTYPE #define _INC_CTYPE -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/direct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/direct.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/direct.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/direct.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_DIRECT #define _INC_DIRECT -#include <_mingw.h> +#include <crtdefs.h> #include <io.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/dirent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dirent.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/dirent.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dirent.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,8 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -/* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef __STRICT_ANSI__ Modified: trunk/reactos/include/crt/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dos.h?rev=3825… ============================================================================== --- trunk/reactos/include/crt/dos.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dos.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_DOS #define _INC_DOS -#include <_mingw.h> +#include <crtdefs.h> #include <io.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/dvec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/dvec.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/dvec.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/dvec.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -14,7 +14,7 @@ #include <emmintrin.h> #include <assert.h> #include <fvec.h> -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/eh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/eh.h?rev=38255… ============================================================================== --- trunk/reactos/include/crt/eh.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/eh.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _EH_H_ #define _EH_H_ Modified: trunk/reactos/include/crt/errno.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/errno.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/errno.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/errno.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_ERRNO #define _INC_ERRNO -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/fcntl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fcntl.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/fcntl.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/fcntl.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #include <io.h> Modified: trunk/reactos/include/crt/float.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/float.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/float.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/float.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -21,8 +21,7 @@ #ifndef _MINGW_FLOAT_H_ #define _MINGW_FLOAT_H_ -/* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> /* * Functions and definitions for controlling the FPU. Modified: trunk/reactos/include/crt/fpieee.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fpieee.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/fpieee.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/fpieee.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_FPIEEE #define _INC_FPIEEE -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/fvec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/fvec.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/fvec.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/fvec.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -14,7 +14,7 @@ #include <xmmintrin.h> #include <assert.h> #include <ivec.h> -#include <_mingw.h> +#include <crtdefs.h> #if defined(_ENABLE_VEC_DEBUG) #include <iostream> Modified: trunk/reactos/include/crt/inttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/inttypes.h?rev… ============================================================================== --- trunk/reactos/include/crt/inttypes.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/inttypes.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -8,7 +8,7 @@ #ifndef _INTTYPES_H_ #define _INTTYPES_H_ -#include <_mingw.h> +#include <crtdefs.h> #include <stdint.h> #define __need_wchar_t #include <stddef.h> Modified: trunk/reactos/include/crt/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/io.h?rev=38255… ============================================================================== --- trunk/reactos/include/crt/io.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/io.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _IO_H_ #define _IO_H_ -#include <_mingw.h> +#include <crtdefs.h> #include <string.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/libgen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/libgen.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/libgen.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/libgen.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -14,7 +14,7 @@ #define _LIBGEN_H_ /* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/limits.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/limits.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/limits.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/limits.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_LIMITS #define _INC_LIMITS Modified: trunk/reactos/include/crt/locale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/locale.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/locale.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/locale.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_LOCALE #define _INC_LOCALE -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/malloc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/malloc.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/malloc.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/malloc.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _MALLOC_H_ #define _MALLOC_H_ -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #pragma GCC system_header #endif -#include <_mingw.h> +#include <crtdefs.h> struct exception; Modified: trunk/reactos/include/crt/mbctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbctype.h?rev=… ============================================================================== --- trunk/reactos/include/crt/mbctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mbctype.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_MBCTYPE #define _INC_MBCTYPE -#include <_mingw.h> +#include <crtdefs.h> #include <ctype.h> #ifdef __cplusplus Modified: trunk/reactos/include/crt/mbstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mbstring.h?rev… ============================================================================== --- trunk/reactos/include/crt/mbstring.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mbstring.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_MBSTRING #define _INC_MBSTRING -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/memory.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/memory.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/memory.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_MEMORY #define _INC_MEMORY -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/new.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/new.h?rev=3825… ============================================================================== --- trunk/reactos/include/crt/new.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/new.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #include <new> -#include <_mingw.h> +#include <crtdefs.h> #pragma push_macro("new") #undef new Modified: trunk/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/process.h?rev=… ============================================================================== --- trunk/reactos/include/crt/process.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/process.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_PROCESS #define _INC_PROCESS -#include <_mingw.h> +#include <crtdefs.h> /* Includes a definition of _pid_t and pid_t */ #include <sys/types.h> Modified: trunk/reactos/include/crt/rtcapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/rtcapi.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/rtcapi.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/rtcapi.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_RTCAPI #define _INC_RTCAPI -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/search.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/search.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/search.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/search.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_SEARCH #define _INC_SEARCH -#include <_mingw.h> +#include <crtdefs.h> #include <stddef.h> #ifdef __cplusplus Modified: trunk/reactos/include/crt/setjmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/setjmp.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/setjmp.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/setjmp.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_SETJMP #define _INC_SETJMP -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/signal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/signal.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/signal.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/signal.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_SIGNAL #define _INC_SIGNAL -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stddef.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/stddef.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stddef.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -4,7 +4,7 @@ * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_STDDEF #define _INC_STDDEF Modified: trunk/reactos/include/crt/stdexcpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdexcpt.h?rev… ============================================================================== --- trunk/reactos/include/crt/stdexcpt.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdexcpt.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_STDEXCPT #define _INC_STDEXCPT Modified: trunk/reactos/include/crt/stdint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdint.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/stdint.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdint.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -25,7 +25,7 @@ #ifndef _STDINT_H #define _STDINT_H -#include <_mingw.h> +#include <crtdefs.h> #define __need_wint_t #define __need_wchar_t Modified: trunk/reactos/include/crt/stdio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdio.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/stdio.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdio.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_STDIO #define _INC_STDIO -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_STDLIB #define _INC_STDLIB -#include <_mingw.h> +#include <crtdefs.h> #include <limits.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/string.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/string.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/string.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_STRING #define _INC_STRING -#include <_mingw.h> +#include <crtdefs.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/crt/sys/locking.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/locking.h?… ============================================================================== --- trunk/reactos/include/crt/sys/locking.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/locking.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,8 +10,7 @@ #error Only Win32 target is supported! #endif -/* All the headers include this file. */ -#include <_mingw.h> +#include <crtdefs.h> #define _LK_UNLCK 0 #define _LK_LOCK 1 Modified: trunk/reactos/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/stat.h?rev… ============================================================================== --- trunk/reactos/include/crt/sys/stat.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/stat.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #include <io.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/sys/timeb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/timeb.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/timeb.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/timeb.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _TIMEB_H_ #define _TIMEB_H_ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _WIN32 #error Only Win32 target is supported! Modified: trunk/reactos/include/crt/sys/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/types.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/types.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/types.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #ifdef _USE_32BIT_TIME_T #ifdef _WIN64 Modified: trunk/reactos/include/crt/sys/utime.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sys/utime.h?re… ============================================================================== --- trunk/reactos/include/crt/sys/utime.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sys/utime.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/tchar.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/tchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/tchar.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_TCHAR #define _INC_TCHAR Modified: trunk/reactos/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/time.h?rev=382… ============================================================================== --- trunk/reactos/include/crt/time.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/time.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _TIME_H_ #define _TIME_H_ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _WIN32 #error Only Win32 target is supported! Modified: trunk/reactos/include/crt/typeinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/typeinfo.h?rev… ============================================================================== --- trunk/reactos/include/crt/typeinfo.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/typeinfo.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -3,7 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ -#include <_mingw.h> +#include <crtdefs.h> #ifndef _INC_TYPEINFO #define _INC_TYPEINFO Modified: trunk/reactos/include/crt/vadefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/vadefs.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/vadefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/vadefs.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #undef _CRT_PACKING #define _CRT_PACKING 8 Modified: trunk/reactos/include/crt/wchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wchar.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/wchar.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wchar.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _INC_WCHAR #define _INC_WCHAR -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/wctype.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/wctype.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -10,7 +10,7 @@ #error Only Win32 target is supported! #endif -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING) Modified: trunk/reactos/include/crt/yvals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/yvals.h?rev=38… ============================================================================== --- trunk/reactos/include/crt/yvals.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/yvals.h [iso-8859-1] Sun Dec 21 17:33:19 2008 @@ -6,7 +6,7 @@ #ifndef _YVALS #define _YVALS -#include <_mingw.h> +#include <crtdefs.h> #pragma pack(push,_CRT_PACKING)

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008