Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 17897: - String id 0 becomes a reserved (invalid) id.
by ekohl＠svn.reactos.com 17 Sep '05

17 Sep '05

- String id 0 becomes a reserved (invalid) id. - StringTableStringFromId returns a pointer to an empty string if the string id is invalid. This fixes the stringtable tests. Modified: trunk/reactos/lib/setupapi/stringtable.c _____ Modified: trunk/reactos/lib/setupapi/stringtable.c --- trunk/reactos/lib/setupapi/stringtable.c 2005-09-17 16:02:37 UTC (rev 17896) +++ trunk/reactos/lib/setupapi/stringtable.c 2005-09-17 17:16:33 UTC (rev 17897) @@ -49,7 +49,9 @@ DWORD dwMaxDataSize; } STRING_TABLE, *PSTRING_TABLE; +WCHAR empty[] = {0}; + /*********************************************************************** *** * StringTableInitialize [SETUPAPI.@] * @@ -240,14 +242,14 @@ { if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) { - return i; + return i + 1; } } else { if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) { - return i; + return i + 1; } } } @@ -276,7 +278,7 @@ pStringTable->dwUsedSlots++; - return i; + return i + 1; } } @@ -437,20 +439,20 @@ return FALSE; } - if (dwId >= pStringTable->dwMaxSlots) + if (dwId == 0 || dwId > pStringTable->dwMaxSlots) { ERR("Invalid Slot id!\n"); return FALSE; } - if (pStringTable->pSlots[dwId].dwSize < dwExtraDataSize) + if (pStringTable->pSlots[dwId - 1].dwSize < dwExtraDataSize) { ERR("Data size is too large!\n"); return FALSE; } memcpy(lpExtraData, - pStringTable->pSlots[dwId].pData, + pStringTable->pSlots[dwId - 1].pData, dwExtraDataSize); return TRUE; @@ -497,12 +499,12 @@ if (dwFlags & 1) { if (!lstrcmpW(pStringTable->pSlots[i].pString, lpString)) - return i; + return i + 1; } else { if (!lstrcmpiW(pStringTable->pSlots[i].pString, lpString)) - return i; + return i + 1; } } } @@ -573,7 +575,7 @@ return FALSE; } - if (dwId >= pStringTable->dwMaxSlots) + if (dwId == 0 || dwId > pStringTable->dwMaxSlots) { ERR("Invalid Slot id!\n"); return FALSE; @@ -585,17 +587,17 @@ return FALSE; } - pStringTable->pSlots[dwId].pData = MyMalloc(dwExtraDataSize); - if (pStringTable->pSlots[dwId].pData == NULL) + pStringTable->pSlots[dwId - 1].pData = MyMalloc(dwExtraDataSize); + if (pStringTable->pSlots[dwId - 1].pData == NULL) { ERR("\n"); return FALSE; } - memcpy(pStringTable->pSlots[dwId].pData, + memcpy(pStringTable->pSlots[dwId - 1].pData, lpExtraData, dwExtraDataSize); - pStringTable->pSlots[dwId].dwSize = dwExtraDataSize; + pStringTable->pSlots[dwId - 1].dwSize = dwExtraDataSize; return TRUE; } @@ -629,10 +631,10 @@ return NULL; } - if (dwId >= pStringTable->dwMaxSlots) - return NULL; + if (dwId == 0 || dwId > pStringTable->dwMaxSlots) + return empty; - return pStringTable->pSlots[dwId].pString; + return pStringTable->pSlots[dwId - 1].pString; } @@ -672,18 +674,18 @@ return FALSE; } - if (dwId >= pStringTable->dwMaxSlots || - pStringTable->pSlots[dwId].pString == NULL) + if (dwId == 0 || dwId > pStringTable->dwMaxSlots || + pStringTable->pSlots[dwId - 1].pString == NULL) { WARN("Invalid string ID!\n"); *lpBufferLength = 0; return FALSE; } - dwLength = (lstrlenW(pStringTable->pSlots[dwId].pString) + 1) * sizeof(WCHAR); + dwLength = (lstrlenW(pStringTable->pSlots[dwId - 1].pString) + 1) * sizeof(WCHAR); if (dwLength <= *lpBufferLength) { - lstrcpyW(lpBuffer, pStringTable->pSlots[dwId].pString); + lstrcpyW(lpBuffer, pStringTable->pSlots[dwId - 1].pString); bResult = TRUE; }

1 0

[greatlrd] 17896: Update the swedish translation by Harteex.
by greatlrd＠svn.reactos.com 17 Sep '05

17 Sep '05

Update the swedish translation by Harteex. Modified: trunk/reactos/subsys/system/regedit/Sv.rc _____ Modified: trunk/reactos/subsys/system/regedit/Sv.rc --- trunk/reactos/subsys/system/regedit/Sv.rc 2005-09-17 13:48:38 UTC (rev 17895) +++ trunk/reactos/subsys/system/regedit/Sv.rc 2005-09-17 16:02:37 UTC (rev 17896) @@ -123,6 +123,23 @@ MENUITEM "&DWORD-võrde", ID_EDIT_NEW_DWORDVALUE END END + POPUP "" + BEGIN + MENUITEM "Visa/d÷lj nivÕ", ID_TREE_EXPANDBRANCH + POPUP "&Ny(tt)" + BEGIN + MENUITEM "&Nyckel", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&Strõngvõrde", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binõrvõrde", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD-võrde", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&S÷k", ID_EDIT_FIND, GRAYED + MENUITEM "&Ta bort", ID_TREE_DELETE + MENUITEM "&Byt namn", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Kopiera nyckelnamn", ID_EDIT_COPYKEYNAME, GRAYED + END END @@ -314,6 +331,12 @@ IDS_INHERIT_SUBKEYSONLY "Endast undernycklar" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Visa nivÕ" + IDS_COLLAPSE "&D÷lj nivÕ" +END + /*****************************************************************/

1 0

[royce] 17895: Fix "numberf" function to correctly handle 'g' format specifier. Debugged by Michael Fritscher <michael@fritscher.net>
by royce＠svn.reactos.com 17 Sep '05

17 Sep '05

Fix "numberf" function to correctly handle 'g' format specifier. Debugged by Michael Fritscher <michael(a)fritscher.net> (fixed a couple return values while I was in there) Modified: trunk/reactos/tools/rbuild/ssprintf.cpp _____ Modified: trunk/reactos/tools/rbuild/ssprintf.cpp --- trunk/reactos/tools/rbuild/ssprintf.cpp 2005-09-17 11:20:25 UTC (rev 17894) +++ trunk/reactos/tools/rbuild/ssprintf.cpp 2005-09-17 13:48:38 UTC (rev 17895) @@ -126,7 +126,7 @@ if (type & LEFT) type &= ~ZEROPAD; if (base < 2 || base > 36) - return 0; + return false; c = (type & ZEROPAD) ? '0' : ' '; sign = 0; if (type & SIGN) { @@ -205,7 +205,7 @@ if (base < 2 || base > 36) return 0; c = (type & ZEROPAD) ? L'0' : L' '; - sign = 0; + sign = false; if (type & SIGN) { if (num < 0) { sign = L'-'; @@ -305,7 +305,9 @@ if ( exp_sign == 'g' || exp_sign == 'G' ) { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E + exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == 'e' || exp_sign == 'E' ) { @@ -495,7 +497,9 @@ { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E + exp_sign -= 2; // g -> e and G -> E + else + exp_sign = L'f'; } if ( exp_sign == L'e' || exp_sign == L'E' ) @@ -694,7 +698,9 @@ if ( exp_sign == 'g' || exp_sign == 'G' ) { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E + exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == 'e' || exp_sign == 'E' ) { @@ -789,7 +795,7 @@ { while ( intr > 0.0 ) { - p=intr; + p=intr; intr/=10.0L; modfl(intr, &intr); @@ -896,7 +902,9 @@ if ( exp_sign == L'g' || exp_sign == L'G' ) { type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) - exp_sign -= 2; // g -> e and G -> E + exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == L'e' || exp_sign == L'E' ) {

1 0

[navaraf] 17894: Fix "numberf" function to correctly handle 'g' format specifier. Debugged by Michael Fritscher <michael@fritscher.net>.
by navaraf＠svn.reactos.com 17 Sep '05

17 Sep '05

Fix "numberf" function to correctly handle 'g' format specifier. Debugged by Michael Fritscher <michael(a)fritscher.net>. Modified: trunk/reactos/lib/crt/stdio/vfprintf.c Modified: trunk/reactos/lib/crt/stdio/vfwprint.c _____ Modified: trunk/reactos/lib/crt/stdio/vfprintf.c --- trunk/reactos/lib/crt/stdio/vfprintf.c 2005-09-17 10:55:29 UTC (rev 17893) +++ trunk/reactos/lib/crt/stdio/vfprintf.c 2005-09-17 11:20:25 UTC (rev 17894) @@ -225,6 +225,8 @@ type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == 'e' || exp_sign == 'E' ) { _____ Modified: trunk/reactos/lib/crt/stdio/vfwprint.c --- trunk/reactos/lib/crt/stdio/vfwprint.c 2005-09-17 10:55:29 UTC (rev 17893) +++ trunk/reactos/lib/crt/stdio/vfwprint.c 2005-09-17 11:20:25 UTC (rev 17894) @@ -238,6 +238,8 @@ type |= ZEROTRUNC; if ( exponent < -4 || fabs(exponent) >= precision ) exp_sign -= 2; // g -> e and G -> E + else + exp_sign = 'f'; } if ( exp_sign == L'e' || exp_sign == L'E' ) {

1 0

[navaraf] 17893: Patricio Martínez Ros <silencium@wanadoo.es>
by navaraf＠svn.reactos.com 17 Sep '05

17 Sep '05

Patricio Martínez Ros <silencium(a)wanadoo.es> Spanish translation. Modified: trunk/reactos/subsys/system/calc/Es.rc _____ Modified: trunk/reactos/subsys/system/calc/Es.rc --- trunk/reactos/subsys/system/calc/Es.rc 2005-09-17 10:54:46 UTC (rev 17892) +++ trunk/reactos/subsys/system/calc/Es.rc 2005-09-17 10:55:29 UTC (rev 17893) @@ -1,7 +1,7 @@ /* - * WineCalc (Es.rc) + * WineCalc (Spanish resources) * - * Copyright 2003 James Briggs + * Copyright 2005 Patricio MartÝnez Ros * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,19 +22,19 @@ #include "resource.h" #include "winecalc.h" -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH STRINGTABLE DISCARDABLE { - IDS_APPNAME, "Calculator" + IDS_APPNAME, "Calculadora" - IDS_COPYRIGHT1, "Calculator 5.0. Licensed under LGPL 2" + IDS_COPYRIGHT1, "Calculadora 5.0. bajo licencia LGPL 2" IDS_COPYRIGHT2 "Copyright 2003, James Briggs" IDS_COPYRIGHT3 "San Jose, California, USA" IDS_COPYRIGHT4 "james(a)ActionMessage.com" IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" - IDS_BTN_BACKSPACE, "Backspace" + IDS_BTN_BACKSPACE, "Retroceso" IDS_BTN_CLEAR_ENTRY, "CE" IDS_BTN_CLEAR_ALL, "C" IDS_BTN_MEM_CLEAR, "MC" @@ -43,84 +43,84 @@ IDS_BTN_MEM_PLUS, "M+" IDS_BTN_MEM_STATUS_M, "M" IDS_BTN_SQRT, "sqrt" - IDS_ERR_INVALID_INPUT, "Invalid input for function." - IDS_ERR_DIVIDE_BY_ZERO, "Cannot divide by zero." - IDS_ERR_UNDEFINED, "Result of function is undefined." + IDS_ERR_INVALID_INPUT, "Entrada no vßlida para la funci¾n." + IDS_ERR_DIVIDE_BY_ZERO, "No se puede dividir entre cero." + IDS_ERR_UNDEFINED, "El resultado de esta funci¾n no estß definido." } MAIN_MENU MENU DISCARDABLE { - POPUP "&Edit" { - MENUITEM "&Copy Ctrl+C", IDM_COPY - MENUITEM "&Paste Ctrl+V", IDM_PASTE + POPUP "&Editar" { + MENUITEM "&Copiar Ctrl+C", IDM_COPY + MENUITEM "&Pegar Ctrl+V", IDM_PASTE } - POPUP "&View" { - MENUITEM "Standard", IDM_MODE_STANDARD - MENUITEM "Scientific", IDM_MODE_SCIENTIFIC + POPUP "&Ver" { + MENUITEM "Estßndar", IDM_MODE_STANDARD + MENUITEM "CientÝfica", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "Digit Grouping", IDM_DIGIT_GROUPING + MENUITEM "Agrupaci¾n de dÝgitos", IDM_DIGIT_GROUPING } - POPUP "&Help" { - MENUITEM "Help Topics", IDM_HELP_TOPICS + POPUP "Ayuda" { + MENUITEM "Temas de Ayuda", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "About Calculator", IDM_ABOUT + MENUITEM "Acerca de Calculadora", IDM_ABOUT } } SCIMS_MENU MENU DISCARDABLE { - POPUP "&Edit" { - MENUITEM "&Copy Ctrl+C", IDM_COPY - MENUITEM "&Paste Ctrl+V", IDM_PASTE + POPUP "&Editar" { + MENUITEM "&Copiar Ctrl+C", IDM_COPY + MENUITEM "&Pegar Ctrl+V", IDM_PASTE } - POPUP "&View" { - MENUITEM "Standard", IDM_MODE_STANDARD - MENUITEM "Scientific", IDM_MODE_SCIENTIFIC + POPUP "&Ver" { + MENUITEM "Estßndar", IDM_MODE_STANDARD + MENUITEM "CientÝfica", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "Hex\tF5", ID_CALC_NS_HEX + MENUITEM "Hesadecimal\tF5", ID_CALC_NS_HEX MENUITEM "Decimal\tF6", ID_CALC_NS_DEC MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binary\tF8", ID_CALC_NS_BIN + MENUITEM "Binario\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR - MENUITEM "Degrees\tF2", ID_CALC_MS_DEGREES - MENUITEM "Radians\tF3", ID_CALC_MS_RADIANS - MENUITEM "Grads\tF4", ID_CALC_MS_GRADS + MENUITEM "Sexagesimal\tF2", ID_CALC_MS_DEGREES + MENUITEM "Radißn\tF3", ID_CALC_MS_RADIANS + MENUITEM "Centesimal\tF4", ID_CALC_MS_GRADS MENUITEM SEPARATOR - MENUITEM "Digit Grouping", IDM_DIGIT_GROUPING + MENUITEM "Agrupaci¾n de dÝgitos", IDM_DIGIT_GROUPING } - POPUP "&Help" { - MENUITEM "Help Topics", IDM_HELP_TOPICS + POPUP "Ayuda" { + MENUITEM "Temas de Ayuda", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "About Calculator", IDM_ABOUT + MENUITEM "Acerca de Calculadora", IDM_ABOUT } } SCIWS_MENU MENU DISCARDABLE { - POPUP "&Edit" { - MENUITEM "&Copy Ctrl+C", IDM_COPY - MENUITEM "&Paste Ctrl+V", IDM_PASTE + POPUP "&Editar" { + MENUITEM "&Copiar Ctrl+C", IDM_COPY + MENUITEM "&Pegar Ctrl+V", IDM_PASTE } - POPUP "&View" { - MENUITEM "Standard", IDM_MODE_STANDARD - MENUITEM "Scientific", IDM_MODE_SCIENTIFIC + POPUP "&Ver" { + MENUITEM "Estßndar", IDM_MODE_STANDARD + MENUITEM "CientÝfica", IDM_MODE_SCIENTIFIC MENUITEM SEPARATOR - MENUITEM "Hex\tF5", ID_CALC_NS_HEX + MENUITEM "Hexadecimal\tF5", ID_CALC_NS_HEX MENUITEM "Decimal\tF6", ID_CALC_NS_DEC MENUITEM "Octal\tF7", ID_CALC_NS_OCT - MENUITEM "Binary\tF8", ID_CALC_NS_BIN + MENUITEM "Binario\tF8", ID_CALC_NS_BIN MENUITEM SEPARATOR MENUITEM "Qword\tF12", ID_CALC_WS_QWORD MENUITEM "Dword\tF2", ID_CALC_WS_DWORD MENUITEM "Word\tF3", ID_CALC_WS_WORD MENUITEM "Byte\tF4", ID_CALC_WS_BYTE MENUITEM SEPARATOR - MENUITEM "Digit Grouping", IDM_DIGIT_GROUPING + MENUITEM "Agrupaci¾n de dÝgitos", IDM_DIGIT_GROUPING } - POPUP "&Help" { - MENUITEM "Help Topics", IDM_HELP_TOPICS + POPUP "Ayuda" { + MENUITEM "Temas de Ayuda", IDM_HELP_TOPICS MENUITEM SEPARATOR - MENUITEM "About Calculator", IDM_ABOUT + MENUITEM "Acerca de Calculadora", IDM_ABOUT } } @@ -129,27 +129,27 @@ VK_F1, IDV_HELP, VIRTKEY END -WHATS_THIS_MENU MENU DISCARDABLE -{ - POPUP "" { - MENUITEM "What's This?", IDM_WHATS_THIS - } -} - DLG_ABOUT DIALOG 12,0,120,82 -CAPTION "About GNU winecalc" +CAPTION "Acerca de GNU winecalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "Aceptar", IDOK, 42, 60, 29, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "?QuÚ es esto?", IDM_WHATS_THIS + } +} + DLG_STATS DIALOG 12,0,125,78 -CAPTION "Statistics Box" +CAPTION "Cuadro de estadÝsticas" FONT 9, "Tahoma" STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE BEGIN DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "Cargar", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP END

1 0

[mf] 17892: add new winefile icon images in 48x48 and 16x16 resolutions
by mf＠svn.reactos.com 17 Sep '05

17 Sep '05

add new winefile icon images in 48x48 and 16x16 resolutions Modified: trunk/reactos/subsys/system/winefile/winefile.ico _____ Modified: trunk/reactos/subsys/system/winefile/winefile.ico (Binary files differ)

1 0

[mf] 17891: add comment
by mf＠svn.reactos.com 17 Sep '05

17 Sep '05

add comment Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-09-16 21:15:58 UTC (rev 17890) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-09-17 10:52:43 UTC (rev 17891) @@ -1821,12 +1821,12 @@ static TCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n',' s','l','a','t','i','o','n','\0'}; static TCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; - DWORD dwVersionDataLen = GetFileVersionInfoSize((LPTSTR)strFilename, NULL); + DWORD dwVersionDataLen = GetFileVersionInfoSize((LPTSTR)strFilename, NULL); /* VC6 and MinGW headers use LPTSTR instead of LPCTSTR */ if (dwVersionDataLen) { dlg->pVersionData = malloc(dwVersionDataLen); - if (GetFileVersionInfo((LPTSTR)strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { + if (GetFileVersionInfo((LPTSTR)strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { /* VC6 and MinGW headers use LPTSTR instead of LPCTSTR */ LPVOID pVal; UINT nValLen;

1 0

[gvg] 17890: Hopefully the last in a series of fixes for size of maximized windows
by gvg＠svn.reactos.com 16 Sep '05

16 Sep '05

Hopefully the last in a series of fixes for size of maximized windows Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-16 20:13:26 UTC (rev 17889) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-16 21:15:58 UTC (rev 17890) @@ -351,8 +351,8 @@ case SW_MAXIMIZE: { - co_WinPosGetMinMaxInfo(Window, NULL, &InternalPos->MaxPos, - NULL, &Size); + co_WinPosGetMinMaxInfo(Window, &Size, &InternalPos->MaxPos, + NULL, NULL); DPRINT("Maximize: %d,%d %dx%d\n", InternalPos->MaxPos.x, InternalPos->MaxPos.y, Size.x, Size.y); if (Window->Style & WS_MINIMIZE) @@ -420,25 +420,23 @@ IntGetDesktopWorkArea(Desktop, &WorkArea); /* Get default values. */ - Info->ptMaxSize.x = WorkArea.right - WorkArea.left; - Info->ptMaxSize.y = WorkArea.bottom - WorkArea.top; Info->ptMinTrackSize.x = UserGetSystemMetrics(SM_CXMINTRACK); Info->ptMinTrackSize.y = UserGetSystemMetrics(SM_CYMINTRACK); + + IntGetWindowBorderMeasures(Window, &XInc, &YInc); + Info->ptMaxSize.x = WorkArea.right - WorkArea.left + 2 * XInc; + Info->ptMaxSize.y = WorkArea.bottom - WorkArea.top + 2 * YInc; Info->ptMaxTrackSize.x = Info->ptMaxSize.x; Info->ptMaxTrackSize.y = Info->ptMaxSize.y; - IntGetWindowBorderMeasures(Window, &XInc, &YInc); - Info->ptMaxTrackSize.x += 2 * XInc; - Info->ptMaxTrackSize.y += 2 * YInc; - if (Window->InternalPos != NULL) { Info->ptMaxPosition = Window->InternalPos->MaxPos; } else { - Info->ptMaxPosition.x -= WorkArea.left + XInc; - Info->ptMaxPosition.y -= WorkArea.top + YInc; + Info->ptMaxPosition.x = WorkArea.left - XInc; + Info->ptMaxPosition.y = WorkArea.top - YInc; } }

1 0

[gvg] 17889: Bletch <npwoods@mess.org>
by gvg＠svn.reactos.com 16 Sep '05

16 Sep '05

Bletch <npwoods(a)mess.org> Partially implemented the treeview right-click menu on Regedit. Just supporting Expand and Collapse for now, and also started work on renaming keys. Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/hexedit.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/resource.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-09-16 20:13:26 UTC (rev 17889) @@ -123,6 +123,23 @@ MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE END END + POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + POPUP "&New" + BEGIN + MENUITEM "&Key", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&Find", ID_EDIT_FIND, GRAYED + MENUITEM "&Delete", ID_TREE_DELETE + MENUITEM "&Rename", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME, GRAYED + END END @@ -314,6 +331,12 @@ IDS_INHERIT_SUBKEYSONLY "Subkeys only" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Expand" + IDS_COLLAPSE "&Collapse" +END + /*****************************************************************/ _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-09-16 20:13:26 UTC (rev 17889) @@ -110,6 +110,16 @@ case ID_VIEW_REFRESH: /* TODO */ break; + case ID_TREE_EXPANDBRANCH: + TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_EXPAND); + break; + case ID_TREE_COLLAPSEBRANCH: + TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_COLLAPSE); + break; + case ID_TREE_RENAME: + SetFocus(pChildWnd->hTreeWnd); + TreeView_EditLabel(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd)); + break; case ID_SWITCH_PANELS: pChildWnd->nFocusPanel = !pChildWnd->nFocusPanel; SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd); @@ -296,6 +306,13 @@ case NM_SETFOCUS: pChildWnd->nFocusPanel = 0; break; + case TVN_ENDLABELEDIT: + { + TCHAR msg[32]; + _stprintf(msg, _T("rename to %s"), ((NMTVDISPINFO *) lParam)->item.pszText); + MessageBox(pChildWnd->hTreeWnd, msg, NULL, MB_OK); + } + break; default: return 0; } @@ -347,6 +364,45 @@ TrackPopupMenu(mnu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); } } + else if ((HWND)wParam == pChildWnd->hTreeWnd) + { + TVHITTESTINFO hti; + HMENU hContextMenu; + TVITEM item; + MENUITEMINFO mii; + TCHAR buffer[256]; + LPTSTR s; + + pt = MAKEPOINTS(lParam); + hti.pt.x = pt.x; + hti.pt.y = pt.y; + ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); + TreeView_HitTest(pChildWnd->hTreeWnd, &hti); + + if ((hti.flags & TVHT_ONITEM) != 0) + { + hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT); + TreeView_SelectItem(pChildWnd->hTreeWnd, hti.hItem); + + memset(&item, 0, sizeof(item)); + item.mask = TVIF_STATE | TVIF_CHILDREN; + item.hItem = hti.hItem; + TreeView_GetItem(pChildWnd->hTreeWnd, &item); + + LoadString(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, sizeof(buffer) / sizeof(buffer[0])); + + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STRING | MIIM_STATE | MIIM_ID; + mii.fState = (item.cChildren > 0) ? MFS_DEFAULT : MFS_GRAYED; + mii.wID = (item.state & TVIS_EXPANDED) ? ID_TREE_COLLAPSEBRANCH : ID_TREE_EXPANDBRANCH; + s = buffer; + memcpy(&mii.dwTypeData, &s, sizeof(mii.dwTypeData)); /* arg MinGW */ + SetMenuItemInfo(hContextMenu, 0, TRUE, &mii); + + TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, pChildWnd->hWnd, NULL); + } + } break; } _____ Modified: trunk/reactos/subsys/system/regedit/hexedit.c --- trunk/reactos/subsys/system/regedit/hexedit.c 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/hexedit.c 2005-09-16 20:13:26 UTC (rev 17889) @@ -24,6 +24,7 @@ #include <stdlib.h> #include <stdio.h> #include <tchar.h> +#include <zmouse.h> #include "hexedit.h" _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/main.h 2005-09-16 20:13:26 UTC (rev 17889) @@ -35,6 +35,7 @@ #define PM_MODIFYVALUE 0 #define PM_NEW 1 +#define PM_TREECONTEXT 2 extern HINSTANCE hInst; _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-09-16 20:13:26 UTC (rev 17889) @@ -128,6 +128,8 @@ #define IDS_ERR_RENVAL_TOEMPTY 32857 #define ID_SWITCH_PANELS 32871 #define ID_EDIT_PERMISSIONS 32872 +#define ID_TREE_DELETE 32873 +#define ID_TREE_RENAME 32874 #define IDS_FLT_REGFILES 31001 #define IDS_FLT_REGFILES_FLT 31002 @@ -152,6 +154,8 @@ #define IDS_INHERIT_THISKEYONLY 31121 #define IDS_INHERIT_THISKEYANDSUBKEYS 31122 #define IDS_INHERIT_SUBKEYSONLY 31123 +#define IDS_EXPAND 31124 +#define IDS_COLLAPSE 31125 #define IDD_EDIT_STRING 2000 _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-09-16 20:13:26 UTC (rev 17889) @@ -273,7 +273,7 @@ /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL, - WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, (HMENU)id, hInst, NULL); /* Initialize the image list, and add items to the control. */

1 0

[gvg] 17888: RegQueryValueExW retrieves Unicode strings but the size must be specified in
by gvg＠svn.reactos.com 16 Sep '05

16 Sep '05

RegQueryValueExW retrieves Unicode strings but the size must be specified in bytes. Fixes bug 770. Modified: trunk/reactos/lib/comctl32/comctl32undoc.c _____ Modified: trunk/reactos/lib/comctl32/comctl32undoc.c --- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-09-16 18:18:48 UTC (rev 17887) +++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-09-16 19:47:44 UTC (rev 17888) @@ -682,17 +682,17 @@ /* get values from key 'MRUList' */ if (newkey) { - datasize = mp->extview.nMaxItems + 1; + datasize = (mp->extview.nMaxItems + 1) * sizeof(WCHAR); if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, (LPBYTE)mp->realMRU, &datasize))) { - /* not present - set size to 1 (will become 0 later) */ - datasize = 1; + /* not present - set size to 2 (will become 0 later) */ + datasize = 2; *mp->realMRU = 0; } TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize); - mp->cursize = datasize - 1; + mp->cursize = datasize / sizeof(WCHAR) - 1; /* datasize now has number of items in the MRUList */ /* get actual values for each entry */

1 0

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