Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[greatlrd] 22533: Created folder remotely
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 21:54:41 2006 New Revision: 22533 URL: http://svn.reactos.org/svn/reactos?rev=22533&view=rev Log: Created folder remotely Added: vendor/NDK/current/

1 0

[greatlrd] 22532: Created folder remotely
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 21:54:05 2006 New Revision: 22532 URL: http://svn.reactos.org/svn/reactos?rev=22532&view=rev Log: Created folder remotely Added: vendor/NDK/

1 0

[ion] 22531: well it seems this didn't work so well. (would help not to have 5 year old and not-working docs on the Wiki..but hey..)
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Fri Jun 23 21:49:49 2006 New Revision: 22531 URL: http://svn.reactos.org/svn/reactos?rev=22531&view=rev Log: well it seems this didn't work so well. (would help not to have 5 year old and not-working docs on the Wiki..but hey..) Removed: vendor/NDK/

1 0

[ion] 22530: Create "current" ndk tag
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Fri Jun 23 21:48:16 2006 New Revision: 22530 URL: http://svn.reactos.org/svn/reactos?rev=22530&view=rev Log: Create "current" ndk tag Added: vendor/NDK/current/

1 0

[ion] 22529: Create NDK Vendor Tree
by ion＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: ion Date: Fri Jun 23 21:47:19 2006 New Revision: 22529 URL: http://svn.reactos.org/svn/reactos?rev=22529&view=rev Log: Create NDK Vendor Tree Added: vendor/NDK/

1 0

[janderwald] 22528: replace DECL_WINELIB_TYPE_AW macros with typedefs thnx to Greatlord for reviewing patch
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 21:39:04 2006 New Revision: 22528 URL: http://svn.reactos.org/svn/reactos?rev=22528&view=rev Log: replace DECL_WINELIB_TYPE_AW macros with typedefs thnx to Greatlord for reviewing patch Modified: trunk/reactos/include/objsel.h trunk/reactos/include/reactos/wine/msacm.h Modified: trunk/reactos/include/objsel.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/objsel.h?rev=22528… ============================================================================== --- trunk/reactos/include/objsel.h (original) +++ trunk/reactos/include/objsel.h Fri Jun 23 21:39:04 2006 @@ -20,6 +20,9 @@ #ifdef __cplusplus extern "C" { #endif + +#include <objidl.h> +#include <oaidl.h> /* the PSDK headers defines it as EXTERN_C const GUID CLSID_DsObjectPicker = {...}, * but that's not a good idea when EXTERN_C is extern... */ @@ -164,7 +167,7 @@ STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDsObjectPicker methods ***/ STDMETHOD_(HRESULT,Initialize)(THIS_ PDSOP_INIT_INFO pInitInfo) PURE; - STDMETHOD_(HRESULT,InvokeDialog)(THIS_ HWND hwndParent, IDataObject** ppdoSelections) PURE; + STDMETHOD_(HRESULT,InvokeDialog)(THIS_ HWND hwndParent, IDataObject ** ppdoSelections) PURE; }; #undef INTERFACE Modified: trunk/reactos/include/reactos/wine/msacm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/msacm… ============================================================================== --- trunk/reactos/include/reactos/wine/msacm.h (original) +++ trunk/reactos/include/reactos/wine/msacm.h Fri Jun 23 21:39:04 2006 @@ -318,9 +318,15 @@ WCHAR szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS]; } ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW; -DECL_WINELIB_TYPE_AW(ACMDRIVERDETAILS) -DECL_WINELIB_TYPE_AW(PACMDRIVERDETAILS) -DECL_WINELIB_TYPE_AW(LPACMDRIVERDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMDRIVERDETAILSW ACMDRIVERDETAILS; +typedef PACMDRIVERDETAILSW PACMDRIVERDETAILS; +typedef LPACMDRIVERDETAILSW LPACMDRIVERDETAILS; +#else +typedef struct ACMDRIVERDETAILSA ACMDRIVERDETAILS; +typedef PACMDRIVERDETAILSA PACMDRIVERDETAILS; +typedef LPACMDRIVERDETAILSA LPACMDRIVERDETAILS; +#endif typedef struct _ACMFILTERCHOOSEA { @@ -374,9 +380,15 @@ ACMFILTERCHOOSEHOOKPROCW pfnHook; } ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW, *LPACMFILTERCHOOSEW; -DECL_WINELIB_TYPE_AW(ACMFILTERCHOOSE) -DECL_WINELIB_TYPE_AW(PACMFILTERCHOOSE) -DECL_WINELIB_TYPE_AW(LPACMFILTERCHOOSE) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFILTERCHOOSEW ACMFILTERCHOOSE; +typedef PACMFILTERCHOOSEW PACMFILTERCHOOSE; +typedef LPACMFILTERCHOOSEW LPACMFILTERCHOOSE; +#else +typedef struct ACMFILTERCHOOSEA ACMFILTERCHOOSE; +typedef PACMFILTERCHOOSEA PACMFILTERCHOOSE; +typedef LPACMFILTERCHOOSEA LPACMFILTERCHOOSE; +#endif typedef struct _ACMFILTERDETAILSA { @@ -400,9 +412,15 @@ WCHAR szFilter[ACMFILTERDETAILS_FILTER_CHARS]; } ACMFILTERDETAILSW, *PACMFILTERDETAILSW, *LPACMFILTERDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFILTERDETAILS) -DECL_WINELIB_TYPE_AW(PACMFILTERDETAILS) -DECL_WINELIB_TYPE_AW(LPACMFILTERDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFILTERDETAILSW ACMFILTERDETAILS; +typedef PACMFILTERDETAILSW PACMFILTERDETAILS; +typedef LPACMFILTERDETAILSW LPACMFILTERDETAILS; +#else +typedef struct ACMFILTERDETAILSA ACMFILTERDETAILS; +typedef PACMFILTERDETAILSA PACMFILTERDETAILS; +typedef LPACMFILTERDETAILSA LPACMFILTERDETAILS; +#endif typedef struct _ACMFILTERTAGDETAILSA { @@ -426,9 +444,15 @@ WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS]; } ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW, *LPACMFILTERTAGDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFILTERTAGDETAILS) -DECL_WINELIB_TYPE_AW(PACMFILTERTAGDETAILS) -DECL_WINELIB_TYPE_AW(LPACMFILTERTAGDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFILTERTAGDETAILSW ACMFILTERTAGDETAILS; +typedef PACMFILTERTAGDETAILSW PACMFILTERTAGDETAILS; +typedef LPACMFILTERTAGDETAILSW LPACMFILTERTAGDETAILS; +#else +typedef struct ACMFILTERTAGDETAILSA ACMFILTERTAGDETAILS; +typedef PACMFILTERTAGDETAILSA PACMFILTERTAGDETAILS; +typedef LPACMFILTERTAGDETAILSA LPACMFILTERTAGDETAILS; +#endif typedef struct _ACMFORMATCHOOSEA { @@ -482,9 +506,15 @@ ACMFORMATCHOOSEHOOKPROCW pfnHook; } ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW, *LPACMFORMATCHOOSEW; -DECL_WINELIB_TYPE_AW(ACMFORMATCHOOSE) -DECL_WINELIB_TYPE_AW(PACMFORMATCHOOSE) -DECL_WINELIB_TYPE_AW(LPACMFORMATCHOOSE) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFORMATCHOOSEW ACMFORMATCHOOSE; +typedef PACMFORMATCHOOSEW PACMFORMATCHOOSE; +typedef LPACMFORMATCHOOSEW LPACMFORMATCHOOSE; +#else +typedef struct ACMFORMATCHOOSEA ACMFORMATCHOOSE; +typedef PACMFORMATCHOOSEA PACMFORMATCHOOSE; +typedef LPACMFORMATCHOOSEA LPACMFORMATCHOOSE; +#endif typedef struct _ACMFORMATDETAILSA { @@ -508,9 +538,15 @@ WCHAR szFormat[ACMFORMATDETAILS_FORMAT_CHARS]; } ACMFORMATDETAILSW, *PACMFORMATDETAILSW, *LPACMFORMATDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFORMATDETAILS) -DECL_WINELIB_TYPE_AW(PACMFORMATDETAILS) -DECL_WINELIB_TYPE_AW(LPACMFORMATDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFORMATDETAILSW ACMFORMATDETAILS; +typedef PACMFORMATDETAILSW PACMFORMATDETAILS; +typedef LPACMFORMATDETAILSW LPACMFORMATDETAILS; +#else +typedef struct ACMFORMATDETAILSA ACMFORMATDETAILS; +typedef PACMFORMATDETAILSA PACMFORMATDETAILS; +typedef LPACMFORMATDETAILSA LPACMFORMATDETAILS; +#endif typedef struct _ACMFORMATTAGDETAILSA { @@ -534,9 +570,15 @@ WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS]; } ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW; -DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS) -DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS) -DECL_WINELIB_TYPE_AW(LPACMFORMATTAGDETAILS) +#if defined(UNICODE) || defined (_UNICODE) +typedef struct ACMFORMATTAGDETAILSW ACMFORMATTAGDETAILS; +typedef PACMFORMATTAGDETAILSW PACMFORMATTAGDETAILS; +typedef LPACMFORMATTAGDETAILSW LPACMFORMATTAGDETAILS; +#else +typedef struct ACMFORMATTAGDETAILSA ACMFORMATTAGDETAILS; +typedef PACMFORMATTAGDETAILSA PACMFORMATTAGDETAILS; +typedef LPACMFORMATTAGDETAILSA LPACMFORMATTAGDETAILS; +#endif typedef struct _ACMSTREAMHEADER {

1 0

[janderwald] 22527: fix TCHAR/WCHAR mixtures spotted by Christoph_vW
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 21:14:29 2006 New Revision: 22527 URL: http://svn.reactos.org/svn/reactos?rev=22527&view=rev Log: fix TCHAR/WCHAR mixtures spotted by Christoph_vW Modified: trunk/reactos/dll/cpl/powercfg/advanced.c trunk/reactos/dll/cpl/powercfg/alarms.c trunk/reactos/dll/cpl/powercfg/hibernate.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 21:14:29 2006 @@ -137,7 +137,7 @@ // to PowerActionNone and sets the Flags & EventCode - swprintf(szBuffer, L"Action: %x EventCode %x Flags %x",Policy->Action, Policy->EventCode, Policy->Flags); + _stprintf(szBuffer, L"Action: %x EventCode %x Flags %x",Policy->Action, Policy->EventCode, Policy->Flags); MessageBoxW(NULL, szBuffer, NULL, MB_OK); */ 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 21:14:29 2006 @@ -14,6 +14,7 @@ #include <commctrl.h> #include <cpl.h> #include <stdio.h> +#include <tchar.h> #include "resource.h" #include "powercfg.h" @@ -69,19 +70,19 @@ if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) { - swprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); + _stprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE1),szBatteryLevel); } - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR1), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1), TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 100)); - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR1), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1), TBM_SETTICFREQ, (WPARAM)TRUE, (LPARAM)20); - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR1), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR1), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_LOW].BatteryLevel); @@ -100,14 +101,14 @@ { if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH) && LoadString(hApplet, IDS_TEXT, szText, MAX_PATH)) { - swprintf(szMessage,L"%s, %s",szSound,szText); + _stprintf(szMessage,_T("%s, %s"),szSound,szText); } } else { if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH)) { - swprintf(szMessage,L"%s",szText); + _stprintf(szMessage,_T("%s"),szText); } } } @@ -117,7 +118,7 @@ { if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH)) { - swprintf(szMessage,L"%s",szSound); + _stprintf(szMessage,_T("%s"),szSound); } } } @@ -131,28 +132,28 @@ } if (gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable) { - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARM2), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARM2), BM_SETCHECK, (gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].Enable ? BST_CHECKED : BST_UNCHECKED), (LPARAM)0); if (LoadString(hApplet, IDS_PROCENT, szTemp, MAX_PATH)) { - swprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); + _stprintf(szBatteryLevel,szTemp,gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); SetWindowText(GetDlgItem(hwndDlg, IDC_ALARMVALUE2),szBatteryLevel); } - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR2), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR2), TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 100)); - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMBAR2), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMBAR2), TBM_SETPOS, (WPARAM)TRUE, (LPARAM)gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].BatteryLevel); if (LoadString(hApplet, gGPP.user.DischargePolicy[DISCHARGE_POLICY_CRITICAL].PowerPolicy.Action+IDS_PowerActionNone1, szAction, MAX_PATH)) { - SendMessageW(GetDlgItem(hwndDlg, IDC_ALARMAKTION2), + SendMessage(GetDlgItem(hwndDlg, IDC_ALARMAKTION2), WM_SETTEXT, (WPARAM)0, (LPARAM)szAction); @@ -167,14 +168,14 @@ { if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH) && LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH)) { - swprintf(szMessage,L"%s, %s",szSound,szText); + _stprintf(szMessage,_T("%s, %s"),szSound,szText); } } else { if (LoadString(hApplet, IDS_TEXT, szText, MAX_PATH)) { - swprintf(szMessage,L"%s",szText); + _stprintf(szMessage,_T("%s"),szText); } } } @@ -184,7 +185,7 @@ { if (LoadString(hApplet, IDS_SOUND, szSound, MAX_PATH)) { - swprintf(szMessage,L"%s",szSound); + _stprintf(szMessage,_T("%s"),szSound); } } } Modified: trunk/reactos/dll/cpl/powercfg/hibernate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/hibernate… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/hibernate.c (original) +++ trunk/reactos/dll/cpl/powercfg/hibernate.c Fri Jun 23 21:14:29 2006 @@ -15,6 +15,7 @@ #include <commctrl.h> #include <cpl.h> #include <stdio.h> +#include <tchar.h> #include "resource.h" #include "powercfg.h" @@ -65,22 +66,22 @@ { SYSTEM_POWER_CAPABILITIES PowerCaps; MEMORYSTATUSEX msex; - WCHAR szSize[MAX_PATH]; - WCHAR szTemp[MAX_PATH]; + TCHAR szSize[MAX_PATH]; + TCHAR szTemp[MAX_PATH]; ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes; if (GetPwrCapabilities(&PowerCaps)) { if (PowerCaps.HiberFilePresent) { - SendMessageW(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), + SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } else { - SendMessageW(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), + SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); @@ -106,7 +107,7 @@ { if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) { - swprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart / 0x100000); + _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart / 0x100000); SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize); } } @@ -114,7 +115,7 @@ { if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) { - swprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart); + _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart); SetWindowText(GetDlgItem(hwndDlg, IDC_FREESPACE),szSize); } } @@ -123,7 +124,7 @@ { if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) { - swprintf(szSize,szTemp,msex.ullTotalPhys/0x100000); + _stprintf(szSize,szTemp,msex.ullTotalPhys/0x100000); SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize); } } @@ -131,7 +132,7 @@ { if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) { - swprintf(szSize,szTemp,msex.ullTotalPhys); + _stprintf(szSize,szTemp,msex.ullTotalPhys); SetWindowText(GetDlgItem(hwndDlg, IDC_SPACEFORHIBERNATEFILE),szSize); } } @@ -152,7 +153,7 @@ { BOOLEAN bHibernate; - bHibernate = (BOOLEAN)SendMessageW(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), + bHibernate = (BOOLEAN)SendMessage(GetDlgItem(hwndDlg, IDC_HIBERNATEFILE), BM_GETCHECK, (WPARAM)0, (LPARAM)0); 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 21:14:29 2006 @@ -27,7 +27,7 @@ HINSTANCE hApplet = 0; GLOBAL_POWER_POLICY gGPP; -WCHAR langSel[255]; +TCHAR langSel[255]; /* Applets */ APPLET Applets[NUM_APPLETS] = 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 21:14:29 2006 @@ -220,7 +220,7 @@ return TRUE; } -BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPWSTR sName, DWORD dwDesc, +BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName, DWORD dwDesc, LPWSTR sDesc, PPOWER_POLICY pp,LPARAM lParam ) { int index; @@ -237,21 +237,21 @@ memcpy(&gPP[guiIndex], pp, sizeof(POWER_POLICY)); guiIndex++; - index = SendMessageW(hList, + index = SendMessage(hList, CB_ADDSTRING, 0, (LPARAM)sName); if (index == CB_ERR) return FALSE; - SendMessageW(hList, + SendMessage(hList, CB_SETITEMDATA, index, (LPARAM)uiIndex); if (aps == uiIndex) { - SendMessageW(hList, + SendMessage(hList, CB_SELECTSTRING, TRUE, (LPARAM)sName); @@ -307,7 +307,7 @@ { int ifrom=0,i=0,imin=0; HWND hwnd = NULL; - WCHAR szName[MAX_PATH]; + TCHAR szName[MAX_PATH]; LRESULT index; for(i=1;i<9;i++) @@ -353,7 +353,7 @@ { if (LoadString(hApplet, ifrom, szName, MAX_PATH)) { - index = SendMessageW(hwnd, + index = SendMessage(hwnd, CB_ADDSTRING, 0, (LPARAM)szName); @@ -361,7 +361,7 @@ if (index == CB_ERR) return; - SendMessageW(hwnd, + SendMessage(hwnd, CB_SETITEMDATA, index, (LPARAM)Sec[ifrom-IDS_TIMEOUT16]); @@ -369,14 +369,14 @@ } if (LoadString(hApplet, IDS_TIMEOUT16, szName, MAX_PATH)) { - index = SendMessageW(hwnd, + index = SendMessage(hwnd, CB_ADDSTRING, 0, (LPARAM)szName); if (index == CB_ERR) return; - SendMessageW(hwnd, + SendMessage(hwnd, CB_SETITEMDATA, index, (LPARAM)Sec[0]); @@ -388,12 +388,12 @@ { INT i=0, iCurSel=0; UINT uiIndex; - WCHAR szProfile[MAX_PATH]; - WCHAR szTemp[MAX_PATH]; - WCHAR szConfig[MAX_PATH]; + TCHAR szProfile[MAX_PATH]; + TCHAR szTemp[MAX_PATH]; + TCHAR szConfig[MAX_PATH]; POWER_POLICY pp; - iCurSel = SendMessageW(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0); @@ -408,7 +408,7 @@ SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETLBTEXT, uiIndex, (LPARAM)szProfile); if(LoadString(hApplet, IDS_CONFIG1, szTemp, MAX_PATH)) { - swprintf(szConfig,szTemp,szProfile); + _stprintf(szConfig,szTemp,szProfile); SetWindowText(GetDlgItem(hwndDlg, IDC_GRPDETAIL),szConfig); } } @@ -479,7 +479,7 @@ { INT iCurSel=0,tmp=0; - iCurSel = SendMessageW(GetDlgItem(hwndDlg, IDC_ENERGYLIST), + iCurSel = SendMessage(GetDlgItem(hwndDlg, IDC_ENERGYLIST), CB_GETCURSEL, 0, 0);

1 0

[janderwald] 22526: msvc fix (remove obsolete semicolon)
by janderwald＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: janderwald Date: Fri Jun 23 20:30:22 2006 New Revision: 22526 URL: http://svn.reactos.ru/svn/reactos?rev=22526&view=rev Log: msvc fix (remove obsolete semicolon) Modified: trunk/reactos/include/authz.h Modified: trunk/reactos/include/authz.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/authz.h?rev=22526&r… ============================================================================== --- trunk/reactos/include/authz.h (original) +++ trunk/reactos/include/authz.h Fri Jun 23 20:30:22 2006 @@ -83,7 +83,7 @@ DWORD ResultListLength; PACCESS_MASK GrantedAccessMask; PDWORD SaclEvaluationResults; - PDWORD Error;; + PDWORD Error; } AUTHZ_ACCESS_REPLY, *PAUTHZ_ACCESS_REPLY; typedef struct _AUTHZ_REGISTRATION_OBJECT_TYPE_NAME_OFFSET

1 0

[tretiakov] 22525: Fix buffer overflow vulnerability (bug 1528)
by tretiakov＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: tretiakov Date: Fri Jun 23 18:55:52 2006 New Revision: 22525 URL: http://svn.reactos.ru/svn/reactos?rev=22525&view=rev Log: Fix buffer overflow vulnerability (bug 1528) Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/services/umpnpmgr/umpn… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Fri Jun 23 18:55:52 2006 @@ -832,7 +832,9 @@ lstrcpyW(szKeyName, L"System\\CurrentControlSet\\Control\\Class"); lstrcatW(szKeyName, L"\\"); - lstrcatW(szKeyName, ClassGuid); + if(lstrlenW(ClassGuid) < sizeof(szKeyName)-lstrlenW(szKeyName)) + lstrcatW(szKeyName, ClassGuid); + else return CR_INVALID_DATA; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szKeyName,

1 0

[greatlrd] 22524: bugfix : patch from w3seek bug 1620 : RTL: Fix a locking bug in the vectored exception handling
by greatlrd＠svn.reactos.org 23 Jun '06

23 Jun '06

Author: greatlrd Date: Fri Jun 23 18:42:14 2006 New Revision: 22524 URL: http://svn.reactos.ru/svn/reactos?rev=22524&view=rev Log: bugfix : patch from w3seek bug 1620 : RTL: Fix a locking bug in the vectored exception handling Modified: trunk/reactos/lib/rtl/vectoreh.c Modified: trunk/reactos/lib/rtl/vectoreh.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/vectoreh.c?rev=2252… ============================================================================== --- trunk/reactos/lib/rtl/vectoreh.c (original) +++ trunk/reactos/lib/rtl/vectoreh.c Fri Jun 23 18:42:14 2006 @@ -51,11 +51,14 @@ RTL_VECTORED_EXCEPTION_HANDLER, ListEntry); VectoredHandler = RtlDecodePointer(veh->VectoredHandler); + RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); + if(VectoredHandler(&ExceptionInfo) == EXCEPTION_CONTINUE_EXECUTION) { - RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); return ExceptionContinueSearch; } + + RtlEnterCriticalSection(&RtlpVectoredExceptionLock); } RtlLeaveCriticalSection(&RtlpVectoredExceptionLock); }

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
60
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006