Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[janderwald] 22543: restore old targets
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 23:36:23 2006 New Revision: 22543 URL: http://svn.reactos.org/svn/reactos?rev=22543&view=rev Log: restore old targets Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=22543&r1=2254… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Fri Jun 23 23:36:23 2006 @@ -414,27 +414,101 @@ .PHONY: msvc6 msvc6: $(RBUILD_TARGET) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs6.00 -voversionconfiguration msvc .PHONY: msvc7 msvc7: $(RBUILD_TARGET) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -voversionconfiguration msvc .PHONY: msvc71 msvc71: $(RBUILD_TARGET) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -voversionconfiguration msvc .PHONY: msvc8 msvc8: $(RBUILD_TARGET) $(ECHO_RBUILD) - $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc + +.PHONY: msvc6_clean +msvc6_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc + +.PHONY: msvc7_clean +msvc7_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc + +.PHONY: msvc71_clean +msvc71_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc + +.PHONY: msvc8_clean +msvc8_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc .PHONY: msvc_clean msvc_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c msvc + +.PHONY: msvc_clean_all +msvc_clean_all: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs6.00 -voversionconfiguration msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.00 -voversionconfiguration msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs7.10 -voversionconfiguration msvc + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c -vs8.10 -voversionconfiguration msvc + +.PHONY: msvc7_install_debug +msvc7_install_debug: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcdebug -voversionconfiguration msvc + +.PHONY: msvc7_install_release +msvc7_install_release: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcrelease -voversionconfiguration msvc + +.PHONY: msvc7_install_speed +msvc7_install_speed: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.00 -vcspeed -voversionconfiguration msvc + +.PHONY: msvc71_install_debug +msvc71_install_debug: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcdebug -voversionconfiguration msvc + +.PHONY: msvc71_install_release +msvc71_install_release: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcrelease -voversionconfiguration msvc + + +.PHONY: msvc71_install_speed +msvc71_install_speed: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs7.10 -vcspeed -voversionconfiguration msvc + +.PHONY: msvc8_install_debug +msvc8_install_debug: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcdebug -voversionconfiguration msvc + +.PHONY: msvc8_install_release +msvc8_install_release: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcrelease -voversionconfiguration msvc + +.PHONY: msvc8_install_speed +msvc8_install_speed: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -vs8.00 -vcspeed -voversionconfiguration msvc .PHONY: makefile_auto_clean makefile_auto_clean:

1 0

[janderwald] 22542: parse -vo option
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 23:36:01 2006 New Revision: 22542 URL: http://svn.reactos.org/svn/reactos?rev=22542&view=rev Log: parse -vo option Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.cpp (original) +++ trunk/reactos/tools/rbuild/rbuild.cpp Fri Jun 23 23:36:01 2006 @@ -175,7 +175,7 @@ switch ( switchChar ) { case 'v': - if (switchChar2 == 's' || switchChar2 == 'c' ) + if (switchChar2 == 's' || switchChar2 == 'c' || switchChar2 == 'o') { return ParseVCProjectSwitch ( switchChar2,

1 0

[greatlrd] 22541: rewrite janderwald patch for NULL, I see it as pointless using static const WCHAR szNullString[] = { '\0' }; to return a null termentate string when u can simple replace it with L'\0'
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 22:54:53 2006 New Revision: 22541 URL: http://svn.reactos.org/svn/reactos?rev=22541&view=rev Log: rewrite janderwald patch for NULL, I see it as pointless using static const WCHAR szNullString[] = { '\0' }; to return a null termentate string when u can simple replace it with L'\0' Modified: trunk/reactos/dll/win32/crypt32/protectdata.c Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c Fri Jun 23 22:54:53 2006 @@ -56,9 +56,6 @@ 'I','\'','m',' ','h','u','n','t','i','n','g',' ', 'w','a','b','b','i','t','s',0 }; - -static const WCHAR szNullString[] = -{ '\0' }; /* * The data format returned by the real Windows CryptProtectData seems @@ -866,7 +863,7 @@ /* Windows appears to create an empty szDataDescr instead of maintaining * a NULL */ if (!szDataDescr) - szDataDescr = szNullString; + szDataDescr = L'\0'; /* get crypt context */ if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT))

1 0

[janderwald] 22540: oops thnx Greatlord
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 22:48:57 2006 New Revision: 22540 URL: http://svn.reactos.org/svn/reactos?rev=22540&view=rev Log: oops thnx Greatlord Modified: trunk/reactos/include/winternl.h Modified: trunk/reactos/include/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/winternl.h?rev=225… ============================================================================== --- trunk/reactos/include/winternl.h (original) +++ trunk/reactos/include/winternl.h Fri Jun 23 22:48:57 2006 @@ -1985,7 +1985,7 @@ BOOL WINAPI RtlEqualSid(PSID,PSID); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); -//void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; +void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT);

1 0

[cwittich] 22539: -fixed some warnings (msvc)
by cwittich＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: cwittich Date: Fri Jun 23 22:44:57 2006 New Revision: 22539 URL: http://svn.reactos.org/svn/reactos?rev=22539&view=rev Log: -fixed some warnings (msvc) Modified: trunk/reactos/dll/cpl/powercfg/advanced.c trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/powercfg.c trunk/reactos/dll/cpl/powercfg/powershemes.c Modified: trunk/reactos/dll/cpl/powercfg/advanced.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/advanced.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/advanced.c (original) +++ trunk/reactos/dll/cpl/powercfg/advanced.c Fri Jun 23 22:44:57 2006 @@ -96,7 +96,7 @@ { int Index; - for (Index = 0; Index < dwActionSize; Index++) + for (Index = 0; Index < (int) dwActionSize; Index++) { if (lpAction[Index] == poAction) return Index; Modified: trunk/reactos/dll/cpl/powercfg/alarms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/alarms.c?… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/alarms.c (original) +++ trunk/reactos/dll/cpl/powercfg/alarms.c Fri Jun 23 22:44:57 2006 @@ -31,6 +31,8 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch(uMsg) { case WM_INITDIALOG: Modified: trunk/reactos/dll/cpl/powercfg/powercfg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.c (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.c Fri Jun 23 22:44:57 2006 @@ -55,6 +55,7 @@ LPARAM lParam ) { + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -88,7 +89,12 @@ TCHAR Caption[1024]; SYSTEM_POWER_CAPABILITIES spc; INT i=0; - + + UNREFERENCED_PARAMETER(hwnd) + UNREFERENCED_PARAMETER(uMsg) + UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam) + memset(Caption, 0x0, sizeof(Caption)); LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -104,17 +110,17 @@ psh.ppsp = psp; psh.pfnCallback = PropSheetProc; - InitPropSheetPage(&psp[i++], IDD_PROPPAGEPOWERSHEMES, powershemesProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEPOWERSHEMES, (DLGPROC) powershemesProc); if (GetPwrCapabilities(&spc)) { if (spc.SystemBatteriesPresent) { - InitPropSheetPage(&psp[i++], IDD_PROPPAGEALARMS, alarmsProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEALARMS, (DLGPROC) alarmsProc); psh.nPages += 1; } } - InitPropSheetPage(&psp[i++], IDD_PROPPAGEADVANCED, advancedProc); - InitPropSheetPage(&psp[i++], IDD_PROPPAGEHIBERNATE, hibernateProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEADVANCED, (DLGPROC) advancedProc); + InitPropSheetPage(&psp[i++], IDD_PROPPAGEHIBERNATE, (DLGPROC) hibernateProc); return (LONG)(PropertySheet(&psh) != -1); } @@ -165,6 +171,7 @@ DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/cpl/powercfg/powershemes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powershem… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powershemes.c (original) +++ trunk/reactos/dll/cpl/powercfg/powershemes.c Fri Jun 23 22:44:57 2006 @@ -224,6 +224,12 @@ LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam ) { int index; + + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(sDesc) + UNREFERENCED_PARAMETER(dwDesc) + UNREFERENCED_PARAMETER(dwName) + if (ValidatePowerPolicies(0,pp)) { if (guiIndex >= MAX_POWER_POLICY) @@ -237,7 +243,7 @@ memcpy(&gPP[guiIndex], pp, sizeof(POWER_POLICY)); guiIndex++; - index = SendMessage(hList, + index = (int) SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)sName); @@ -393,7 +399,7 @@ TCHAR szConfig[MAX_PATH]; POWER_POLICY pp; - iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); @@ -402,7 +408,7 @@ memcpy(&pp, &gPP[iCurSel], sizeof(POWER_POLICY)); - uiIndex = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); + uiIndex = (UINT) SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); if(uiIndex != CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); @@ -479,14 +485,14 @@ { INT iCurSel=0,tmp=0; - iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); if (iCurSel == CB_ERR) return; - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -494,7 +500,7 @@ { gPP[iCurSel].user.VideoTimeoutAc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_MONITORDCLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -502,7 +508,7 @@ { gPP[iCurSel].user.VideoTimeoutDc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_DISKACLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_DISKACLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -510,7 +516,7 @@ { gPP[iCurSel].user.SpindownTimeoutAc = Sec[tmp+2]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_DISKDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_DISKDCLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -518,7 +524,7 @@ { gPP[iCurSel].user.SpindownTimeoutDc = Sec[tmp+2]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYACLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYACLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -526,7 +532,7 @@ { gPP[iCurSel].user.IdleTimeoutAc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_STANDBYDCLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -534,7 +540,7 @@ { gPP[iCurSel].user.IdleTimeoutDc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEACLIST), CB_GETCURSEL, 0, (LPARAM)0); @@ -542,7 +548,7 @@ { gPP[iCurSel].mach.DozeS4TimeoutAc = Sec[tmp]; } - tmp = SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), + tmp = (INT) SendMessage(GetDlgItem(hwndDlg, IDC_HYBERNATEDCLIST), CB_GETCURSEL, 0, (LPARAM)0);

1 0

[janderwald] 22538: fix duplicate control id spotted by msvc :-)
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 22:35:15 2006 New Revision: 22538 URL: http://svn.reactos.org/svn/reactos?rev=22538&view=rev Log: fix duplicate control id spotted by msvc :-) Modified: trunk/reactos/dll/win32/devmgr/resource.h Modified: trunk/reactos/dll/win32/devmgr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/resource.… ============================================================================== --- trunk/reactos/dll/win32/devmgr/resource.h (original) +++ trunk/reactos/dll/win32/devmgr/resource.h Fri Jun 23 22:35:15 2006 @@ -35,7 +35,7 @@ #define IDC_DRIVERFILES 0x592 #define IDC_FILEPROVIDER 0x593 #define IDC_FILEVERSION 0x594 -#define IDC_FILECOPYRIGHT 0x594 +#define IDC_FILECOPYRIGHT 0x595 #define IDS_NAME 0x100 #define IDS_TYPE 0x101

1 0

[janderwald] 22537: include wingdi before winuser.h replace nice construct with static const WCHAR :)
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 22:27:08 2006 New Revision: 22537 URL: http://svn.reactos.org/svn/reactos?rev=22537&view=rev Log: include wingdi before winuser.h replace nice construct with static const WCHAR :) Modified: trunk/reactos/dll/win32/crypt32/oid.c trunk/reactos/dll/win32/crypt32/protectdata.c trunk/reactos/dll/win32/crypt32/store.c Modified: trunk/reactos/dll/win32/crypt32/oid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/oid.c?re… ============================================================================== --- trunk/reactos/dll/win32/crypt32/oid.c (original) +++ trunk/reactos/dll/win32/crypt32/oid.c Fri Jun 23 22:27:08 2006 @@ -23,6 +23,7 @@ #include "winbase.h" #include "wincrypt.h" #include "winreg.h" +#include "wingdi.h" #include "winuser.h" #include "wine/debug.h" #include "wine/list.h" Modified: trunk/reactos/dll/win32/crypt32/protectdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/protectd… ============================================================================== --- trunk/reactos/dll/win32/crypt32/protectdata.c (original) +++ trunk/reactos/dll/win32/crypt32/protectdata.c Fri Jun 23 22:27:08 2006 @@ -56,6 +56,9 @@ 'I','\'','m',' ','h','u','n','t','i','n','g',' ', 'w','a','b','b','i','t','s',0 }; + +static const WCHAR szNullString[] = +{ '\0' }; /* * The data format returned by the real Windows CryptProtectData seems @@ -843,6 +846,8 @@ HCRYPTKEY hKey; DWORD dwLength; + + TRACE("called\n"); SetLastError(ERROR_SUCCESS); @@ -861,7 +866,7 @@ /* Windows appears to create an empty szDataDescr instead of maintaining * a NULL */ if (!szDataDescr) - szDataDescr=(WCHAR[]){'\0'}; + szDataDescr = szNullString; /* get crypt context */ if (!CryptAcquireContextW(&hProv,NULL,NULL,CRYPT32_PROTECTDATA_PROV,CRYPT_VERIFYCONTEXT)) Modified: trunk/reactos/dll/win32/crypt32/store.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/store.c?… ============================================================================== --- trunk/reactos/dll/win32/crypt32/store.c (original) +++ trunk/reactos/dll/win32/crypt32/store.c Fri Jun 23 22:27:08 2006 @@ -32,6 +32,7 @@ #include "winbase.h" #include "winnls.h" #include "winreg.h" +#include "wingdi.h" #include "winuser.h" #include "wincrypt.h" #include "wine/debug.h"

1 0

[janderwald] 22536: yet another msvc fix inline -> __inline
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 22:07:10 2006 New Revision: 22536 URL: http://svn.reactos.org/svn/reactos?rev=22536&view=rev Log: yet another msvc fix inline -> __inline Modified: trunk/reactos/include/winternl.h Modified: trunk/reactos/include/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/winternl.h?rev=225… ============================================================================== --- trunk/reactos/include/winternl.h (original) +++ trunk/reactos/include/winternl.h Fri Jun 23 22:07:10 2006 @@ -1985,7 +1985,7 @@ BOOL WINAPI RtlEqualSid(PSID,PSID); BOOLEAN WINAPI RtlEqualString(const STRING*,const STRING*,BOOLEAN); BOOLEAN WINAPI RtlEqualUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); -void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; +//void WINAPI RtlExitUserThread(ULONG) DECLSPEC_NORETURN; NTSTATUS WINAPI RtlExpandEnvironmentStrings_U(PWSTR, const UNICODE_STRING*, UNICODE_STRING*, ULONG*); LONGLONG WINAPI RtlExtendedMagicDivide(LONGLONG,LONGLONG,INT); LONGLONG WINAPI RtlExtendedIntegerMultiply(LONGLONG,INT); @@ -2227,7 +2227,7 @@ #define RtlZeroMemory(Destination,Length) memset((Destination),0,(Length)) #endif -inline static BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) +static __inline BOOLEAN RtlCheckBit(PCRTL_BITMAP lpBits, ULONG ulBit) { if (lpBits && ulBit < lpBits->SizeOfBitMap && lpBits->Buffer[ulBit >> 5] & (1 << (ulBit & 31))) @@ -2236,11 +2236,11 @@ } /* These are implemented as __fastcall, so we can't let Winelib apps link with them */ -inline static USHORT RtlUshortByteSwap(USHORT s) +static __inline USHORT RtlUshortByteSwap(USHORT s) { return (s >> 8) | (s << 8); } -inline static ULONG RtlUlongByteSwap(ULONG i) +static __inline ULONG RtlUlongByteSwap(ULONG i) { #if defined(__i386__) && defined(__GNUC__) ULONG ret; @@ -2322,7 +2322,7 @@ #define InsertTailList(le,e) do { PLIST_ENTRY b = (le)->Blink; (e)->Flink = (le); (e)->Blink = b; b->Flink = (e); (le)->Blink = (e); } while (0) #define IsListEmpty(le) ((le)->Flink == (le)) #define RemoveEntryList(e) do { PLIST_ENTRY f = (e)->Flink, b = (e)->Blink; f->Blink = b; b->Flink = f; (e)->Flink = (e)->Blink = NULL; } while (0) -static inline PLIST_ENTRY RemoveHeadList(PLIST_ENTRY le) +static __inline PLIST_ENTRY RemoveHeadList(PLIST_ENTRY le) { PLIST_ENTRY f, b, e; @@ -2335,7 +2335,7 @@ if (e != le) e->Flink = e->Blink = NULL; return e; } -static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) +static __inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) { PLIST_ENTRY f, b, e;

1 0

[ion] 22535: Import latest NDK
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Fri Jun 23 21:57:51 2006 New Revision: 22535 URL: http://svn.reactos.org/svn/reactos?rev=22535&view=rev Log: Import latest NDK Added: vendor/NDK/current/arch/ vendor/NDK/current/arch/ketypes.h vendor/NDK/current/arch/mmtypes.h vendor/NDK/current/asm.h vendor/NDK/current/cctypes.h vendor/NDK/current/cmfuncs.h vendor/NDK/current/cmtypes.h vendor/NDK/current/dbgkfuncs.h vendor/NDK/current/dbgktypes.h vendor/NDK/current/exfuncs.h vendor/NDK/current/extypes.h vendor/NDK/current/halfuncs.h vendor/NDK/current/haltypes.h vendor/NDK/current/i386/ vendor/NDK/current/i386/ketypes.h vendor/NDK/current/i386/mmtypes.h vendor/NDK/current/ifssupp.h vendor/NDK/current/inbvfuncs.h vendor/NDK/current/iofuncs.h vendor/NDK/current/iotypes.h vendor/NDK/current/kdfuncs.h vendor/NDK/current/kdtypes.h vendor/NDK/current/kefuncs.h vendor/NDK/current/ketypes.h vendor/NDK/current/ldrfuncs.h vendor/NDK/current/ldrtypes.h vendor/NDK/current/lpcfuncs.h vendor/NDK/current/lpctypes.h vendor/NDK/current/mmfuncs.h vendor/NDK/current/mmtypes.h vendor/NDK/current/ntndk.h vendor/NDK/current/obfuncs.h vendor/NDK/current/obtypes.h vendor/NDK/current/pofuncs.h vendor/NDK/current/potypes.h vendor/NDK/current/powerpc/ vendor/NDK/current/powerpc/ketypes.h vendor/NDK/current/powerpc/mmtypes.h vendor/NDK/current/psfuncs.h vendor/NDK/current/pstypes.h vendor/NDK/current/rtlfuncs.h vendor/NDK/current/rtltypes.h vendor/NDK/current/sefuncs.h vendor/NDK/current/setypes.h vendor/NDK/current/umfuncs.h vendor/NDK/current/umtypes.h [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/NDK/current/arch/ketypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/arch/ketypes.h?rev=22… Added: vendor/NDK/current/arch/mmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/arch/mmtypes.h?rev=22… Added: vendor/NDK/current/asm.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/asm.h?rev=22535&view=… Added: vendor/NDK/current/cctypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/cctypes.h?rev=22535&v… Added: vendor/NDK/current/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/cmfuncs.h?rev=22535&v… Added: vendor/NDK/current/cmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/cmtypes.h?rev=22535&v… Added: vendor/NDK/current/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/dbgkfuncs.h?rev=22535… Added: vendor/NDK/current/dbgktypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/dbgktypes.h?rev=22535… Added: vendor/NDK/current/exfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/exfuncs.h?rev=22535&v… Added: vendor/NDK/current/extypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/extypes.h?rev=22535&v… Added: vendor/NDK/current/halfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/halfuncs.h?rev=22535&… Added: vendor/NDK/current/haltypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/haltypes.h?rev=22535&… Added: vendor/NDK/current/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/i386/ketypes.h?rev=22… Added: vendor/NDK/current/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/i386/mmtypes.h?rev=22… Added: vendor/NDK/current/ifssupp.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ifssupp.h?rev=22535&v… Added: vendor/NDK/current/inbvfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/inbvfuncs.h?rev=22535… Added: vendor/NDK/current/iofuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/iofuncs.h?rev=22535&v… Added: vendor/NDK/current/iotypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/iotypes.h?rev=22535&v… Added: vendor/NDK/current/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/kdfuncs.h?rev=22535&v… Added: vendor/NDK/current/kdtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/kdtypes.h?rev=22535&v… Added: vendor/NDK/current/kefuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/kefuncs.h?rev=22535&v… Added: vendor/NDK/current/ketypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ketypes.h?rev=22535&v… Added: vendor/NDK/current/ldrfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ldrfuncs.h?rev=22535&… Added: vendor/NDK/current/ldrtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ldrtypes.h?rev=22535&… Added: vendor/NDK/current/lpcfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/lpcfuncs.h?rev=22535&… Added: vendor/NDK/current/lpctypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/lpctypes.h?rev=22535&… Added: vendor/NDK/current/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/mmfuncs.h?rev=22535&v… Added: vendor/NDK/current/mmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/mmtypes.h?rev=22535&v… Added: vendor/NDK/current/ntndk.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/ntndk.h?rev=22535&vie… Added: vendor/NDK/current/obfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/obfuncs.h?rev=22535&v… Added: vendor/NDK/current/obtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/obtypes.h?rev=22535&v… Added: vendor/NDK/current/pofuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/pofuncs.h?rev=22535&v… Added: vendor/NDK/current/potypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/potypes.h?rev=22535&v… Added: vendor/NDK/current/powerpc/ketypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/powerpc/ketypes.h?rev… Added: vendor/NDK/current/powerpc/mmtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/powerpc/mmtypes.h?rev… Added: vendor/NDK/current/psfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/psfuncs.h?rev=22535&v… Added: vendor/NDK/current/pstypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/pstypes.h?rev=22535&v… Added: vendor/NDK/current/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/rtlfuncs.h?rev=22535&… Added: vendor/NDK/current/rtltypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/rtltypes.h?rev=22535&… Added: vendor/NDK/current/sefuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/sefuncs.h?rev=22535&v… Added: vendor/NDK/current/setypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/setypes.h?rev=22535&v… Added: vendor/NDK/current/umfuncs.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/umfuncs.h?rev=22535&v… Added: vendor/NDK/current/umtypes.h URL: http://svn.reactos.org/svn/reactos/vendor/NDK/current/umtypes.h?rev=22535&v…

1 0

[janderwald] 22534: include wingdi.h before winuser.h fixes last compile prob with msvc
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 21:57:19 2006 New Revision: 22534 URL: http://svn.reactos.org/svn/reactos?rev=22534&view=rev Log: include wingdi.h before winuser.h fixes last compile prob with msvc Modified: trunk/reactos/dll/win32/avifil32/editstream.c Modified: trunk/reactos/dll/win32/avifil32/editstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/editstr… ============================================================================== --- trunk/reactos/dll/win32/avifil32/editstream.c (original) +++ trunk/reactos/dll/win32/avifil32/editstream.c Fri Jun 23 21:57:19 2006 @@ -22,8 +22,8 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" -#include "wingdi.h" #include "winnls.h" #include "winerror.h" #include "windowsx.h"

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
60
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 June 2006