Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[janderwald] 21796: resources for the keyboard control panel applet
by janderwald＠svn.reactos.org 04 May '06

04 May '06

Author: janderwald Date: Fri May 5 00:30:22 2006 New Revision: 21796 URL: http://svn.reactos.ru/svn/reactos?rev=21796&view=rev Log: resources for the keyboard control panel applet Modified: trunk/reactos/dll/cpl/main/En.rc trunk/reactos/dll/cpl/main/resource.h Modified: trunk/reactos/dll/cpl/main/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/En.rc?rev=2179… ============================================================================== --- trunk/reactos/dll/cpl/main/En.rc (original) +++ trunk/reactos/dll/cpl/main/En.rc Fri May 5 00:30:22 2006 @@ -5,7 +5,23 @@ CAPTION "Speed" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Keyboard Speed Page",-1,73,74,90,8 + GROUPBOX "Character repeat", -1, 5, 5, 230, 130 + ICON -1, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 + LTEXT "Repeat &delay", -1, 40, 15, 50, 10 + LTEXT "Long", -1, 40, 30, 20, 10 + LTEXT "Short", -1, 200, 30, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 + ICON -1, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 + LTEXT "&Repeat rate", -1, 40, 70, 50, 10 + LTEXT "Slow", -1, 40, 85, 20, 10 + LTEXT "Fast", -1, 200, 85, 20, 10 + CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 + LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15, 105, 150, 10 + EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Cursor &blink rate:", -1, 5, 145, 230, 50 + LTEXT "None", -1, 40, 165, 30, 10 + LTEXT "Fast", -1, 200, 165, 30, 10 + CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 END IDD_HARDWARE DIALOGEX 0, 0, 246, 228 Modified: trunk/reactos/dll/cpl/main/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/resource.h?rev… ============================================================================== --- trunk/reactos/dll/cpl/main/resource.h (original) +++ trunk/reactos/dll/cpl/main/resource.h Fri May 5 00:30:22 2006 @@ -20,49 +20,49 @@ #define IDS_CPLNAME_2 1002 #define IDS_CPLDESCRIPTION_2 1003 -#define IDC_SWAP_MOUSE_BUTTONS 2000 -#define IDC_SLIDER_DOUBLE_CLICK_SPEED 2001 +#define IDC_SWAP_MOUSE_BUTTONS 2000 +#define IDC_SLIDER_DOUBLE_CLICK_SPEED 2001 #define IDC_CHECK_CLICK_LOCK 2002 #define IDC_BUTTON_CLICK_LOCK 2003 -#define IDC_RADIO_WHEEL_SCROLL_LINES 2004 +#define IDC_RADIO_WHEEL_SCROLL_LINES 2004 #define IDC_EDIT_WHEEL_SCROLL_LINES 2005 -#define IDC_UPDOWN_WHEEL_SCROLL_LINES 2006 +#define IDC_UPDOWN_WHEEL_SCROLL_LINES 2006 #define IDC_RADIO_WHEEL_SCROLL_PAGE 2007 -#define IDC_SLIDER_MOUSE_SENSITIVITY 2008 +#define IDC_SLIDER_MOUSE_SENSITIVITY 2008 #define IDC_CHECK_SNAP_TO 2009 -#define IDC_CHECK_SHOW_POINTER 2010 -#define IDC_CHECK_HIDE_POINTER 2011 -#define IDC_CHECK_POINTER_TRAIL 2012 +#define IDC_CHECK_SHOW_POINTER 2010 +#define IDC_CHECK_HIDE_POINTER 2011 +#define IDC_CHECK_POINTER_TRAIL 2012 #define IDC_CHECK_POINTER_PRECISION 2013 #define IDC_SLIDER_POINTER_TRAIL 2014 #define IDC_LISTVIEW_CURSOR 2015 -#define IDS_ARROW 2016 -#define IDS_HELP 2017 +#define IDS_ARROW 2016 +#define IDS_HELP 2017 #define IDS_APPSTARTING 2018 -#define IDS_WAIT 2019 +#define IDS_WAIT 2019 #define IDS_CROSSHAIR 2020 -#define IDS_IBEAM 2021 -#define IDS_NWPEN 2022 +#define IDS_IBEAM 2021 +#define IDS_NWPEN 2022 #define IDS_NO 2023 #define IDS_SIZENS 2024 #define IDS_SIZENWSE 2025 #define IDS_SIZENESW 2026 #define IDS_SIZEALL 2027 #define IDS_UPARROW 2028 -#define IDS_HAND 2029 -#define IDC_COMBO_CURSOR_SCHEME 2030 -#define IDS_NONE 2031 +#define IDS_HAND 2029 +#define IDC_COMBO_CURSOR_SCHEME 2030 +#define IDS_NONE 2031 #define IDS_SYSTEM_SCHEME 2032 #define IDC_BUTTON_DELETE_SCHEME 2033 #define IDC_CHECK_DROP_SHADOW 2034 #define IDC_IMAGE_SWAP_MOUSE 2035 -#define IDC_IMAGE_DOUBLE_CLICK_SPEED 2036 +#define IDC_IMAGE_DOUBLE_CLICK_SPEED 2036 #define IDC_ICON_MOUSE_SENSITIVITY 2037 #define IDC_ICON_SNAP_TO 2038 -#define IDC_ICON_POINTER_TRAIL 2039 +#define IDC_ICON_POINTER_TRAIL 2039 #define IDC_ICON_SHOW_POINTER 2040 #define IDC_ICON_HIDE_POINTER 2041 -#define IDC_BUTTON_USE_DEFAULT_CURSOR 2042 +#define IDC_BUTTON_USE_DEFAULT_CURSOR 2042 #define IDC_BUTTON_BROWSE_CURSOR 2043 #define IDC_BUTTON_SAVEAS_SCHEME 2044 #define IDC_EDIT_SCHEME_NAME 2045 @@ -70,6 +70,13 @@ #define IDC_SLIDER_CLICK_LOCK 2047 #define IDC_ICON_WHEEL 2048 #define IDC_IMAGE_CURRENT_CURSOR 2049 +#define IDC_ICON_REPEAT_DELAY 2050 +#define IDC_SLIDER_REPEAT_DELAY 2051 +#define IDC_ICON_REPEAT_RATE 2052 +#define IDC_SLIDER_REPEAT_RATE 2053 +#define IDC_EDIT_REPEAT_RATE 2054 +#define IDC_SLIDER_CURSOR_BLINK 2055 + #endif /* __CPL_RESOURCE_H */

1 0

[janderwald] 21795: fix build on linux plattforms
by janderwald＠svn.reactos.org 04 May '06

04 May '06

Author: janderwald Date: Thu May 4 09:31:53 2006 New Revision: 21795 URL: http://svn.reactos.ru/svn/reactos?rev=21795&view=rev Log: fix build on linux plattforms Modified: trunk/reactos/base/applications/notepad/notepad.h Modified: trunk/reactos/base/applications/notepad/notepad.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/n… ============================================================================== --- trunk/reactos/base/applications/notepad/notepad.h (original) +++ trunk/reactos/base/applications/notepad/notepad.h Thu May 4 09:31:53 2006 @@ -7,7 +7,7 @@ #include <commdlg.h> #include <commctrl.h> #include <tchar.h> -#include <Richedit.h> +#include <richedit.h> #include "main.h" #include "dialog.h"

1 0

[greatlrd] 21794: Bug : 1452 : patch from w3seek, some xlate obj fixes for indexed palettes, should fix a hack introduced in r21292
by greatlrd＠svn.reactos.org 04 May '06

04 May '06

Author: greatlrd Date: Thu May 4 09:23:54 2006 New Revision: 21794 URL: http://svn.reactos.ru/svn/reactos?rev=21794&view=rev Log: Bug : 1452 : patch from w3seek, some xlate obj fixes for indexed palettes, should fix a hack introduced in r21292 Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/objects.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/objects.h (original) +++ trunk/reactos/subsystems/win32/win32k/eng/objects.h Thu May 4 09:23:54 2006 @@ -158,9 +158,6 @@ INT GreenShift; INT BlueShift; // }; -// struct { /* For Table Translations */ - ULONG *translationTable; -// }; // struct { /* For Color -> Mono Translations */ ULONG BackgroundColor; // }; Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/eng… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c Thu May 4 09:23:54 2006 @@ -181,6 +181,7 @@ XlateObj->iSrcType = SourcePalType; XlateObj->iDstType = DestPalType; XlateObj->flXlate = 0; + XlateObj->cEntries = 0; /* Store handles of palettes in internal Xlate GDI object (or NULLs) */ XlateGDI->SourcePal = PaletteSource; @@ -237,34 +238,34 @@ /* Indexed -> Indexed */ if (SourcePalType == PAL_INDEXED && DestPalType == PAL_INDEXED) { - XlateGDI->translationTable = - EngAllocMem(0, sizeof(ULONG) * SourcePalGDI->NumColors, 0); + XlateObj->cEntries = SourcePalGDI->NumColors; + XlateObj->pulXlate = + EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, 0); XlateObj->flXlate |= XO_TRIVIAL; - for (i = 0; i < SourcePalGDI->NumColors; i++) + for (i = 0; i < XlateObj->cEntries; i++) { - XlateGDI->translationTable[i] = ClosestColorMatch( + XlateObj->pulXlate[i] = ClosestColorMatch( XlateGDI, SourcePalGDI->IndexedColors + i, - DestPalGDI->IndexedColors, DestPalGDI->NumColors); - if (XlateGDI->translationTable[i] != i) + DestPalGDI->IndexedColors, XlateObj->cEntries); + if (XlateObj->pulXlate[i] != i) XlateObj->flXlate &= ~XO_TRIVIAL; } XlateObj->flXlate |= XO_TABLE; - XlateObj->pulXlate = XlateGDI->translationTable; goto end; } /* Indexed -> Bitfields/RGB/BGR */ if (SourcePalType == PAL_INDEXED) { - XlateGDI->translationTable = - EngAllocMem(0, sizeof(ULONG) * SourcePalGDI->NumColors, 0); - for (i = 0; i < SourcePalGDI->NumColors; i++) - XlateGDI->translationTable[i] = + XlateObj->cEntries = SourcePalGDI->NumColors; + XlateObj->pulXlate = + EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, 0); + for (i = 0; i < XlateObj->cEntries; i++) + XlateObj->pulXlate[i] = ShiftAndMask(XlateGDI, *((ULONG *)&SourcePalGDI->IndexedColors[i])); XlateObj->flXlate |= XO_TABLE; - XlateObj->pulXlate = XlateGDI->translationTable; goto end; } @@ -313,6 +314,7 @@ XlateGDI->SourcePal = PaletteSource; XlateObj->flXlate = XO_TO_MONO; + XlateObj->cEntries = 1; XlateObj->pulXlate = &XlateGDI->BackgroundColor; switch (SourcePalType) { @@ -368,16 +370,15 @@ } XlateObj = GDIToObj(XlateGDI, XLATE); - XlateGDI->translationTable = EngAllocMem(0, sizeof(ULONG) * 2, 0); - if (XlateGDI->translationTable == NULL) + XlateObj->cEntries = 2; + XlateObj->pulXlate = EngAllocMem(0, sizeof(ULONG) * XlateObj->cEntries, 0); + if (XlateObj->pulXlate == NULL) { PALETTE_UnlockPalette(DestPalGDI); EngFreeMem(XlateGDI); return NULL; } - XlateObj->pulXlate = XlateGDI->translationTable; - XlateObj->iSrcType = PAL_INDEXED; XlateObj->iDstType = DestPalGDI->Mode; @@ -394,19 +395,19 @@ XlateGDI->GreenShift = CalculateShift(RGB(0x00, 0xFF, 0x00)) - CalculateShift(XlateGDI->GreenMask); XlateGDI->BlueShift = CalculateShift(RGB(0x00, 0x00, 0xFF)) - CalculateShift(XlateGDI->BlueMask); - XlateGDI->translationTable[0] = ShiftAndMask(XlateGDI, BackgroundColor); - XlateGDI->translationTable[1] = ShiftAndMask(XlateGDI, ForegroundColor); + XlateObj->pulXlate[0] = ShiftAndMask(XlateGDI, BackgroundColor); + XlateObj->pulXlate[1] = ShiftAndMask(XlateGDI, ForegroundColor); if (XlateObj->iDstType == PAL_INDEXED) { - XlateGDI->translationTable[0] = + XlateObj->pulXlate[0] = ClosestColorMatch(XlateGDI, - (LPPALETTEENTRY)&XlateGDI->translationTable[0], + (LPPALETTEENTRY)&XlateObj->pulXlate[0], DestPalGDI->IndexedColors, DestPalGDI->NumColors); - XlateGDI->translationTable[1] = + XlateObj->pulXlate[1] = ClosestColorMatch(XlateGDI, - (LPPALETTEENTRY)&XlateGDI->translationTable[1], + (LPPALETTEENTRY)&XlateObj->pulXlate[1], DestPalGDI->IndexedColors, DestPalGDI->NumColors); } @@ -453,9 +454,9 @@ XlateGDI = ObjToGDI(XlateObj, XLATE); if ((XlateObj->flXlate & XO_TABLE) && - XlateGDI->translationTable != NULL) - { - EngFreeMem(XlateGDI->translationTable); + XlateObj->pulXlate != NULL) + { + EngFreeMem(XlateObj->pulXlate); } EngFreeMem(XlateGDI); @@ -467,11 +468,9 @@ PULONG STDCALL XLATEOBJ_piVector(XLATEOBJ *XlateObj) { - XLATEGDI *XlateGDI = ObjToGDI(XlateObj, XLATE); - if (XlateObj->iSrcType == PAL_INDEXED) { - return XlateGDI->translationTable; + return XlateObj->pulXlate; } return NULL; @@ -494,8 +493,13 @@ if (XlateObj->flXlate & XO_TRIVIAL) return Color; - if ((XlateObj->flXlate & XO_TABLE)) - return XlateObj->pulXlate[Color & 0xff]; + if (XlateObj->flXlate & XO_TABLE) + { + if (Color >= XlateObj->cEntries) + Color %= XlateObj->cEntries; + + return XlateObj->pulXlate[Color]; + } if (XlateObj->flXlate & XO_TO_MONO)

1 0

[janderwald] 21793: implement notepad view status bar - TODO: update caret position on arrow key/mouse scroll events
by janderwald＠svn.reactos.org 03 May '06

03 May '06

Author: janderwald Date: Wed May 3 20:17:12 2006 New Revision: 21793 URL: http://svn.reactos.ru/svn/reactos?rev=21793&view=rev Log: implement notepad view status bar - TODO: update caret position on arrow key/mouse scroll events Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/dialog.h trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/main.h trunk/reactos/base/applications/notepad/notepad.h trunk/reactos/base/applications/notepad/notepad.rbuild trunk/reactos/base/applications/notepad/notepad_res.h Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/d… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c (original) +++ trunk/reactos/base/applications/notepad/dialog.c Wed May 3 20:17:12 2006 @@ -236,7 +236,7 @@ SendMessage(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); SetFocus(Globals.hEdit); - + /* If the file starts with .LOG, add a time/date at the end and set cursor after * See http://support.microsoft.com/?kbid=260563 */ @@ -366,7 +366,7 @@ hCombo = GetDlgItem(hDlg, ID_EOLN); if (hCombo) - Globals.iEoln = SendMessage(hCombo, CB_GETCURSEL, 0, 0); + Globals.iEoln = SendMessage(hCombo, CB_GETCURSEL, 0, 0); } break; } @@ -620,7 +620,7 @@ { static const WCHAR editW[] = { 'e','d','i','t',0 }; DWORD dwStyle; - RECT rc; + RECT rc, rcstatus; DWORD size; LPWSTR pTemp; @@ -637,6 +637,19 @@ DestroyWindow(Globals.hEdit); GetClientRect(Globals.hMainWnd, &rc); dwStyle = Globals.bWrapLongLines ? EDIT_STYLE_WRAP : EDIT_STYLE; + EnableMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, + MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_DISABLED | MF_GRAYED : MF_ENABLED)); + if ( Globals.hStatusBar ) + { + if ( Globals.bWrapLongLines ) + ShowWindow(Globals.hStatusBar, SW_HIDE); + else if ( Globals.bShowStatusBar ) + { + GetClientRect(Globals.hStatusBar, &rcstatus); + rc.bottom -= (rcstatus.bottom - rcstatus.top); + ShowWindow(Globals.hStatusBar, SW_SHOW); + } + } Globals.hEdit = CreateWindowEx(WS_EX_CLIENTEDGE, editW, NULL, dwStyle, 0, 0, rc.right, rc.bottom, Globals.hMainWnd, NULL, Globals.hInstance, NULL); @@ -645,6 +658,7 @@ SetWindowTextW(Globals.hEdit, pTemp); SetFocus(Globals.hEdit); HeapFree(GetProcessHeap(), 0, pTemp); + DrawMenuBar(Globals.hMainWnd); } VOID DIALOG_SelectFont(VOID) @@ -780,6 +794,50 @@ HeapFree(GetProcessHeap(), 0, pszText); } +VOID DIALOG_StatusBarUpdateCaretPos(VOID) +{ + int line; + int col; + int ccol; + POINT point; + TCHAR buff[MAX_PATH]; + + GetCaretPos(&point); + line = SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0); + ccol = SendMessage(Globals.hEdit, EM_CHARFROMPOS, (WPARAM)0, (LPARAM)MAKELPARAM(point.x, point.y)); + ccol = LOWORD(ccol); + col = ccol - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, (LPARAM)0); + + _stprintf(buff, TEXT("%S %d, %S %d"), Globals.szStatusBarLine, line+1, Globals.szStatusBarCol, col+1); + SendMessage(Globals.hStatusBar, SB_SETTEXT, (WPARAM) SB_SIMPLEID, (LPARAM)buff); +} + +VOID DIALOG_ViewStatusBar(VOID) +{ + RECT rc; + RECT rcstatus; + + Globals.bShowStatusBar = !Globals.bShowStatusBar; + if ( !Globals.hStatusBar ) + { + Globals.hStatusBar = CreateStatusWindow(WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE, TEXT("test"), Globals.hMainWnd, CMD_STATUSBAR_WND_ID ); + LoadString(Globals.hInstance, STRING_LINE, Globals.szStatusBarLine, MAX_PATH-1); + LoadString(Globals.hInstance, STRING_COLUMN, Globals.szStatusBarCol, MAX_PATH-1); + SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); + } + CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, + MF_BYCOMMAND | (Globals.bShowStatusBar ? MF_CHECKED : MF_UNCHECKED)); + DrawMenuBar(Globals.hMainWnd); + GetClientRect(Globals.hMainWnd, &rc); + GetClientRect(Globals.hStatusBar, &rcstatus); + if ( Globals.bShowStatusBar ) + rc.bottom -= (rcstatus.bottom - rcstatus.top); + + MoveWindow(Globals.hEdit, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE); + ShowWindow(Globals.hStatusBar, Globals.bShowStatusBar); + DIALOG_StatusBarUpdateCaretPos(); +} + VOID DIALOG_HelpContents(VOID) { WinHelp(Globals.hMainWnd, helpfileW, HELP_INDEX, 0); Modified: trunk/reactos/base/applications/notepad/dialog.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/d… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.h (original) +++ trunk/reactos/base/applications/notepad/dialog.h Wed May 3 20:17:12 2006 @@ -43,6 +43,9 @@ VOID DIALOG_SelectFont(VOID); +VOID DIALOG_ViewStatusBar(VOID); +VOID DIALOG_StatusBarUpdateCaretPos(VOID); + VOID DIALOG_HelpContents(VOID); VOID DIALOG_HelpSearch(VOID); VOID DIALOG_HelpHelp(VOID); Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/m… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c (original) +++ trunk/reactos/base/applications/notepad/main.c Wed May 3 20:17:12 2006 @@ -75,6 +75,8 @@ case CMD_WRAP: DIALOG_EditWrap(); break; case CMD_FONT: DIALOG_SelectFont(); break; + case CMD_STATUSBAR: DIALOG_ViewStatusBar(); break; + case CMD_HELP_CONTENTS: DIALOG_HelpContents(); break; case CMD_HELP_SEARCH: DIALOG_HelpSearch(); break; case CMD_HELP_ON_HELP: DIALOG_HelpHelp(); break; @@ -82,7 +84,7 @@ MAKEINTRESOURCE(IDD_ABOUTBOX), Globals.hMainWnd, AboutDialogProc); - break; + break; case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; default: @@ -267,7 +269,11 @@ CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); - + if ( !Globals.bWrapLongLines ) + { + CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_STATUSBAR, + MF_BYCOMMAND | (Globals.bShowStatusBar ? MF_CHECKED : MF_UNCHECKED)); + } EnableMenuItem(menu, CMD_UNDO, SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(menu, CMD_PASTE, @@ -277,9 +283,10 @@ EnableMenuItem(menu, CMD_CUT, enable); EnableMenuItem(menu, CMD_COPY, enable); EnableMenuItem(menu, CMD_DELETE, enable); - + EnableMenuItem(menu, CMD_SELECT_ALL, GetWindowTextLength(Globals.hEdit) ? MF_ENABLED : MF_GRAYED); + DrawMenuBar(Globals.hMainWnd); } /*********************************************************************** @@ -308,6 +315,8 @@ } case WM_COMMAND: + if (HIWORD(wParam) == EN_CHANGE || HIWORD(wParam) == EN_HSCROLL || HIWORD(wParam) == EN_VSCROLL) + DIALOG_StatusBarUpdateCaretPos(); NOTEPAD_MenuCommand(LOWORD(wParam)); break; @@ -350,11 +359,10 @@ DoOpenFile(szFileName); break; } - + case WM_CHAR: case WM_INITMENUPOPUP: NOTEPAD_InitMenuPopup((HMENU)wParam, lParam); break; - default: if (msg == aFINDMSGSTRING) { @@ -515,7 +523,7 @@ class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); class.lpszClassName = className; - class.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_NPICON), + class.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_NPICON), IMAGE_ICON, 16, 16, 0); if (!RegisterClassEx(&class)) return FALSE; Modified: trunk/reactos/base/applications/notepad/main.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/m… ============================================================================== --- trunk/reactos/base/applications/notepad/main.h (original) +++ trunk/reactos/base/applications/notepad/main.h Wed May 3 20:17:12 2006 @@ -45,9 +45,11 @@ HWND hMainWnd; HWND hFindReplaceDlg; HWND hEdit; + HWND hStatusBar; HFONT hFont; /* Font used by the edit control */ LOGFONT lfFont; BOOL bWrapLongLines; + BOOL bShowStatusBar; WCHAR szFindText[MAX_PATH]; WCHAR szReplaceText[MAX_PATH]; WCHAR szFileName[MAX_PATH]; @@ -59,6 +61,8 @@ WCHAR szMarginRight[MAX_PATH]; WCHAR szHeader[MAX_PATH]; WCHAR szFooter[MAX_PATH]; + WCHAR szStatusBarLine[MAX_PATH]; + WCHAR szStatusBarCol[MAX_PATH]; int iEncoding; int iEoln; Modified: trunk/reactos/base/applications/notepad/notepad.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/n… ============================================================================== --- trunk/reactos/base/applications/notepad/notepad.h (original) +++ trunk/reactos/base/applications/notepad/notepad.h Wed May 3 20:17:12 2006 @@ -5,7 +5,9 @@ #include <stdio.h> #include <windows.h> #include <commdlg.h> +#include <commctrl.h> #include <tchar.h> +#include <Richedit.h> #include "main.h" #include "dialog.h" Modified: trunk/reactos/base/applications/notepad/notepad.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/n… ============================================================================== --- trunk/reactos/base/applications/notepad/notepad.rbuild (original) +++ trunk/reactos/base/applications/notepad/notepad.rbuild Wed May 3 20:17:12 2006 @@ -6,6 +6,7 @@ <library>user32</library> <library>gdi32</library> <library>comdlg32</library> + <library>comctl32</library> <library>advapi32</library> <library>shell32</library> <file>dialog.c</file> Modified: trunk/reactos/base/applications/notepad/notepad_res.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/notepad/n… ============================================================================== --- trunk/reactos/base/applications/notepad/notepad_res.h (original) +++ trunk/reactos/base/applications/notepad/notepad_res.h Wed May 3 20:17:12 2006 @@ -57,7 +57,8 @@ #define CMD_WRAP 0x119 #define CMD_FONT 0x140 -#define CMD_STATUSBAR 0x150 +#define CMD_STATUSBAR 0x150 +#define CMD_STATUSBAR_WND_ID 0x151 #define CMD_HELP_CONTENTS 0x130 #define CMD_HELP_SEARCH 0x131 @@ -100,3 +101,5 @@ #define STRING_CR 0x184 #define STRING_LICENSE 0x185 +#define STRING_LINE 0x186 +#define STRING_COLUMN 0x187

1 0

[janderwald] 21792: set double click speed with latest slider pos
by janderwald＠svn.reactos.org 03 May '06

03 May '06

Author: janderwald Date: Wed May 3 19:06:09 2006 New Revision: 21792 URL: http://svn.reactos.ru/svn/reactos?rev=21792&view=rev Log: set double click speed with latest slider pos Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Wed May 3 19:06:09 2006 @@ -228,7 +228,7 @@ EnableWindow(hDlgCtrl, FALSE); } hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED); - SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 11)); + SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 14)); pos = ((float)g_DoubleClickSpeed / MAX_DOUBLE_CLICK_SPEED); pos /= (1.0f/11.0f); SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)(INT)rintf(pos)); @@ -290,7 +290,13 @@ lppsn = (LPPSHNOTIFY) lParam; if (lppsn->hdr.code == PSN_APPLY) { + /* apply swap mouse button */ SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, g_SwapMouseButtons, NULL, SPIF_SENDCHANGE); + + /* apply double click speed */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED); + lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0); + g_DoubleClickSpeed = (INT)lResult * 50 + 200; SystemParametersInfo(SPI_SETDOUBLECLICKTIME, g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE); #if (WINVER >= 0x0500)

1 0

[hpoussin] 21791: Don't call IoRaiseHardError at DISPATCH_LEVEL
by hpoussin＠svn.reactos.org 03 May '06

03 May '06

Author: hpoussin Date: Wed May 3 18:42:28 2006 New Revision: 21791 URL: http://svn.reactos.ru/svn/reactos?rev=21791&view=rev Log: Don't call IoRaiseHardError at DISPATCH_LEVEL Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbdc… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Wed May 3 18:42:28 2006 @@ -495,16 +495,15 @@ if (InputCount != 0) { if (ClassDeviceExtension->InputCount + InputCount > ClassDeviceExtension->DriverExtension->DataQueueSize) + { + /* + * We're exceeding the buffer, and data will be thrown away... + * FIXME: What could we do, as we are at DISPATCH_LEVEL? + */ ReadSize = ClassDeviceExtension->DriverExtension->DataQueueSize - ClassDeviceExtension->InputCount; + } else ReadSize = InputCount; - - /* - * If we exceed the buffer, data gets thrown away... - * Try at least to display a dialog - */ - if (Irp != NULL) - IoRaiseHardError(Irp, NULL, ClassDeviceObject); /* * Move the input data from the port data queue to our class data Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/mouclass/mouc… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Wed May 3 18:42:28 2006 @@ -471,16 +471,15 @@ if (InputCount != 0) { if (ClassDeviceExtension->InputCount + InputCount > ClassDeviceExtension->DriverExtension->DataQueueSize) + { + /* + * We're exceeding the buffer, and data will be thrown away... + * FIXME: What could we do, as we are at DISPATCH_LEVEL? + */ ReadSize = ClassDeviceExtension->DriverExtension->DataQueueSize - ClassDeviceExtension->InputCount; + } else ReadSize = InputCount; - - /* - * If we exceed the buffer, data gets thrown away... - * Try at least to display a dialog - */ - if (Irp != NULL) - IoRaiseHardError(Irp, NULL, ClassDeviceObject); /* * Move the input data from the port data queue to our class data

1 0

[janderwald] 21790: fix compiling with gcc4 patch from w3seek
by janderwald＠svn.reactos.org 03 May '06

03 May '06

Author: janderwald Date: Wed May 3 18:34:01 2006 New Revision: 21790 URL: http://svn.reactos.ru/svn/reactos?rev=21790&view=rev Log: fix compiling with gcc4 patch from w3seek Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=21… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Wed May 3 18:34:01 2006 @@ -496,7 +496,7 @@ INT index = 0; hDlgCtrl = GetDlgItem(hwndDlg, IDC_LISTVIEW_CURSOR); - ListView_DeleteAllItems(hDlgCtrl); + (void)ListView_DeleteAllItems(hDlgCtrl); ZeroMemory(&column, sizeof(LV_COLUMN)); column.mask = LVCF_SUBITEM | LVCF_WIDTH; @@ -516,60 +516,60 @@ listItem.iItem = index++; listItem.lParam = 0; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_HELP, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_APPSTARTING, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_WAIT, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_CROSSHAIR, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_IBEAM, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_NWPEN, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_NO, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_SIZENS, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_SIZENWSE, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_SIZENESW, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_SIZEALL, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_UPARROW, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); LoadString(hApplet, IDS_HAND, szCursorName, MAX_PATH); listItem.iItem = index++; - ListView_InsertItem(hDlgCtrl, &listItem); + (void)ListView_InsertItem(hDlgCtrl, &listItem); } BOOL DeleteUserCursorScheme(TCHAR * szScheme) @@ -686,7 +686,7 @@ if (lppsn->hdr.code == PSN_APPLY) { #if (WINVER >= 0x0500) - SystemParametersInfo(SPI_SETDROPSHADOW, 0, g_DropShadow, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETDROPSHADOW, 0, (PVOID)g_DropShadow, SPIF_SENDCHANGE); #endif SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; @@ -1030,14 +1030,14 @@ /* calc pos and set mouse sensitivity */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY); lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 1; - SystemParametersInfo(SPI_SETMOUSESPEED, 0, g_MouseSensitivity, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)g_MouseSensitivity, SPIF_SENDCHANGE); /* hide pointer while typing */ - SystemParametersInfo(SPI_SETMOUSEVANISH, 0, g_HidePointer, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)g_HidePointer, SPIF_SENDCHANGE); /* show pointer with Ctrl-Key */ - SystemParametersInfo(SPI_SETMOUSESONAR, 0, g_ShowPointer, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)g_ShowPointer, SPIF_SENDCHANGE); #endif SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR);

1 0

[hpoussin] 21789: Cleanup in SetupGetInfFileListW: - Better arguments check - Rename pFileSpecification to pFullFileName - Fix some possible buffer overflows spotted by w3seek
by hpoussin＠svn.reactos.org 03 May '06

03 May '06

Author: hpoussin Date: Wed May 3 18:26:43 2006 New Revision: 21789 URL: http://svn.reactos.ru/svn/reactos?rev=21789&view=rev Log: Cleanup in SetupGetInfFileListW: - Better arguments check - Rename pFileSpecification to pFullFileName - Fix some possible buffer overflows spotted by w3seek Modified: trunk/reactos/dll/win32/setupapi/parser.c Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c (original) +++ trunk/reactos/dll/win32/setupapi/parser.c Wed May 3 18:26:43 2006 @@ -2,7 +2,7 @@ * INF file parsing * * Copyright 2002 Alexandre Julliard for CodeWeavers - * 2005 Hervé Poussineau (hpoussin(a)reactos.org) + * 2005-2006 Hervé Poussineau (hpoussin(a)reactos.org) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1968,8 +1968,8 @@ OUT PDWORD RequiredSize OPTIONAL) { HANDLE hSearch; - LPWSTR pFileSpecification = NULL; - LPWSTR pFileName; /* Pointer into pFileSpecification buffer */ + LPWSTR pFullFileName = NULL; + LPWSTR pFileName; /* Pointer into pFullFileName buffer */ LPWSTR pBuffer = ReturnBuffer; WIN32_FIND_DATAW wfdFileInfo; size_t len; @@ -1985,38 +1985,55 @@ SetLastError(ERROR_INVALID_PARAMETER); goto cleanup; } + else if (ReturnBufferSize == 0 && ReturnBuffer != NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + else if (ReturnBufferSize > 0 && ReturnBuffer == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } /* Allocate memory for file filter */ - len = DirectoryPath ? strlenW(DirectoryPath) : MAX_PATH; - pFileSpecification = MyMalloc( - (len + 1 + strlenW(InfFileSpecification) + 1) * sizeof(WCHAR)); - if (!pFileSpecification) + if (DirectoryPath != NULL) + /* "DirectoryPath\*.inf" form */ + len = strlenW(DirectoryPath) + 1 + strlenW(InfFileSpecification) + 1; + else + /* "%WINDIR%\Inf\*.inf" form */ + len = MAX_PATH + 1 + strlenW(InfDirectory) + strlenW(InfFileSpecification) + 1; + pFullFileName = MyMalloc(len * sizeof(WCHAR)); + if (pFullFileName == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); goto cleanup; } + + /* Fill file filter buffer */ if (DirectoryPath) { - strcpyW(pFileSpecification, DirectoryPath); - if (pFileSpecification[strlenW(pFileSpecification)] != '\\') - strcatW(pFileSpecification, BackSlash); + strcpyW(pFullFileName, DirectoryPath); + if (pFullFileName[strlenW(pFullFileName) - 1] != '\\') + strcatW(pFullFileName, BackSlash); } else { - if (GetSystemWindowsDirectoryW(pFileSpecification, MAX_PATH) == 0) + len = GetSystemWindowsDirectoryW(pFullFileName, MAX_PATH); + if (len == 0 || len > MAX_PATH) goto cleanup; - if (pFileSpecification[strlenW(pFileSpecification)] != '\\') - strcatW(pFileSpecification, BackSlash); - strcatW(pFileSpecification, InfDirectory); - } - pFileName = &pFileSpecification[strlenW(pFileSpecification)]; + if (pFullFileName[strlenW(pFullFileName) - 1] != '\\') + strcatW(pFullFileName, BackSlash); + strcatW(pFullFileName, InfDirectory); + } + pFileName = &pFullFileName[strlenW(pFullFileName)]; /* Search for the first file */ strcpyW(pFileName, InfFileSpecification); - hSearch = FindFirstFileW(pFileSpecification, &wfdFileInfo); + hSearch = FindFirstFileW(pFullFileName, &wfdFileInfo); if (hSearch == INVALID_HANDLE_VALUE) { - TRACE("No file returned by %s\n", debugstr_w(pFileSpecification)); + TRACE("No file returned by %s\n", debugstr_w(pFullFileName)); goto cleanup; } @@ -2026,7 +2043,7 @@ strcpyW(pFileName, wfdFileInfo.cFileName); hInf = SetupOpenInfFileW( - pFileSpecification, + pFullFileName, NULL, /* Inf class */ InfStyle, NULL /* Error line */); @@ -2037,7 +2054,7 @@ /* InfStyle was not correct. Skip this file */ continue; } - TRACE("Invalid .inf file %s\n", debugstr_w(pFileSpecification)); + TRACE("Invalid .inf file %s\n", debugstr_w(pFullFileName)); continue; } @@ -2067,7 +2084,7 @@ *RequiredSize = requiredSize; cleanup: - MyFree(pFileSpecification); + MyFree(pFullFileName); return ret; }

1 0

[janderwald] 21788: added missing constanst #define SPI_GETMOUSECLICKLOCK 0x101E #define SPI_SETMOUSECLICKLOCK 0x101F
by janderwald＠svn.reactos.org 03 May '06

03 May '06

Author: janderwald Date: Wed May 3 18:09:39 2006 New Revision: 21788 URL: http://svn.reactos.ru/svn/reactos?rev=21788&view=rev Log: added missing constanst #define SPI_GETMOUSECLICKLOCK 0x101E #define SPI_SETMOUSECLICKLOCK 0x101F Modified: trunk/reactos/include/winuser.h Modified: trunk/reactos/include/winuser.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/winuser.h?rev=21788… ============================================================================== --- trunk/reactos/include/winuser.h (original) +++ trunk/reactos/include/winuser.h Wed May 3 18:09:39 2006 @@ -1295,6 +1295,8 @@ #define SPI_SETBLOCKSENDINPUTRESETS 0x1027 #define SPI_GETUIEFFECTS 0x103E #define SPI_SETUIEFFECTS 0x103F +#define SPI_GETMOUSECLICKLOCK 4126 +#define SPI_SETMOUSECLICKLOCK 4127 #define SPI_GETMOUSECLICKLOCKTIME 8200 #define SPI_SETMOUSECLICKLOCKTIME 8201 #define SPI_GETMOUSESONAR 0x101C

1 0

[hpoussin] 21787: Don't double free buffer in case of error
by hpoussin＠svn.reactos.org 03 May '06

03 May '06

Author: hpoussin Date: Wed May 3 17:56:12 2006 New Revision: 21787 URL: http://svn.reactos.ru/svn/reactos?rev=21787&view=rev Log: Don't double free buffer in case of error Modified: trunk/reactos/dll/win32/setupapi/parser.c Modified: trunk/reactos/dll/win32/setupapi/parser.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/parser.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/parser.c (original) +++ trunk/reactos/dll/win32/setupapi/parser.c Wed May 3 17:56:12 2006 @@ -1988,8 +1988,7 @@ /* Allocate memory for file filter */ len = DirectoryPath ? strlenW(DirectoryPath) : MAX_PATH; - pFileSpecification = HeapAlloc( - GetProcessHeap(), 0, + pFileSpecification = MyMalloc( (len + 1 + strlenW(InfFileSpecification) + 1) * sizeof(WCHAR)); if (!pFileSpecification) { @@ -2017,7 +2016,7 @@ hSearch = FindFirstFileW(pFileSpecification, &wfdFileInfo); if (hSearch == INVALID_HANDLE_VALUE) { - HeapFree(GetProcessHeap(), 0, pFileSpecification); + TRACE("No file returned by %s\n", debugstr_w(pFileSpecification)); goto cleanup; } @@ -2053,10 +2052,12 @@ } while (FindNextFileW(hSearch, &wfdFileInfo)); FindClose(hSearch); - ret = TRUE; requiredSize += sizeof(WCHAR); /* Final NULL char */ if (requiredSize <= ReturnBufferSize) + { *pBuffer = '\0'; + ret = TRUE; + } else { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -2066,7 +2067,7 @@ *RequiredSize = requiredSize; cleanup: - HeapFree(GetProcessHeap(), 0, pFileSpecification); + MyFree(pFileSpecification); return ret; }

1 0

Jump to page: