Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[greatlrd] 16481: Fix minior bug in ConPrintfPaging so it count line right and do pause on the screen before it getting full. Fix the row size calc code. Move in page break code to the for. Write one char at time. Need to be fixed so it can write more that one char at time.

by greatlrd＠svn.reactos.com

Fix minior bug in ConPrintfPaging so it count line right and do pause on the screen before it getting full. Fix the row size calc code. Move in page break code to the for. Write one char at time. Need to be fixed so it can write more that one char at time. Modified: trunk/reactos/subsys/system/cmd/console.c _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-07-07 09:56:47 UTC (rev 16480) +++ trunk/reactos/subsys/system/cmd/console.c 2005-07-07 11:26:38 UTC (rev 16481) @@ -222,11 +222,14 @@ #else pBuf = szOut; #endif + WriteFile (GetStdHandle (nStdHandle), pBuf, len, &dwWritten, NULL); + + #ifdef UNICODE free(pBuf); #endif @@ -239,35 +242,42 @@ CONSOLE_SCREEN_BUFFER_INFO csbi; TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD dwWritten; - static int LineCount = 0; //used to count number of lines since last pause - int ScreenLines = 0; //used to see how big the screen is - int ScreenCol = 0; //the number of chars in a roow - int CharEL = 0; //chars since end of line + + /* used to count number of lines since last pause */ + static int LineCount = 0; + + /* used to see how big the screen is */ + int ScreenLines = 0; + + /* the number of chars in a roow */ + int ScreenCol = 0; + + /* chars since end of line */ + int CharEL = 0; + int i = 0; if(NewPage == TRUE) LineCount = 0; + /* rest LineCount and return if no string have been given */ + if (szFormat == NULL) + return; + + //get the size of the visual screen that can be printed too GetConsoleScreenBufferInfo(hConsole, &csbi); //subtract 2 to account for "press any key..." and for the blank line at the end of PagePrompt() - ScreenLines = csbi.srWindow.Bottom - csbi.srWindow.Top - 2; - ScreenCol = csbi.srWindow.Right + 1; + ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; + ScreenCol = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; //make sure they didnt make the screen to small - if(ScreenLines<2) + if(ScreenLines<4) + { ConPrintf(szFormat, arg_ptr, nStdHandle); - //if more lines have been printed then screen size it is time to stop - if(LineCount >= ScreenLines) - { - if(PagePrompt() != PROMPT_YES) - { - return; - } - //reset the number of lines being printed - LineCount = 0; - } - + return ; + } + len = _vstprintf (szOut, szFormat, arg_ptr); #ifdef _UNICODE pBuf = malloc(len + 1); @@ -275,43 +285,45 @@ #else pBuf = szOut; #endif - WriteFile (GetStdHandle (nStdHandle), - pBuf, - len, - &dwWritten, - NULL); + + for(i = 0; i < len; i++) + { + + if(szOut[i] == _T('\n')) + { + LineCount++; + CharEL=0; + } + else + { + CharEL++; + if (CharEL>=ScreenCol) + { + if (i+1<len) + { + if(szOut[i+1] != _T('\n')) LineCount++; + } + CharEL=0; + } + } + /* FIXME : write more that one char at time */ + WriteFile (GetStdHandle (nStdHandle),&pBuf[i],sizeof(TCHAR),&dwWritten,NULL); + if(LineCount >= ScreenLines) + { + if(_tcsncicmp(&szOut[i],_T("\n"),2)!=0) + WriteFile (GetStdHandle (nStdHandle),_T("\n"),sizeof(TCHAR),&dwWritten,NULL); - - if(len < ScreenCol) - { - //if it is smaller then a row then just check for \n - for(i = 0; i < len; i++) - if(szOut[i] == '\n') - LineCount++; - - } - else - { - //if it is bigger then a row check for \n and a string longer then a row can handle - for(i = 0; i < len; i++) - { - if(szOut[i] == '\n') - { - CharEL = 0; - LineCount++; - } - else - { - CharEL++; - if(CharEL > ScreenCol) - { - CharEL = 0; - LineCount++; - } - } + if(PagePrompt() != PROMPT_YES) + { + return; + } + //reset the number of lines being printed + LineCount = 0; + CharEL=0; + } + } - } #ifdef UNICODE free(pBuf);

19 years, 3 months

[navaraf] 16480: Once more, this time with proper character encoding.

by navaraf＠svn.reactos.com

Once more, this time with proper character encoding. Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-07-07 09:48:44 UTC (rev 16479) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-07-07 09:56:47 UTC (rev 16480) @@ -1,6 +1,6 @@ /* * ReactOS Xbox miniport video driver - * Copyright (C) 2004 Gé van Geldorp + * Copyright (C) 2004 GÚ van Geldorp * * Based on VBE miniport video driver * Copyright (C) 2004 Filip Navara _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-07-07 09:48:44 UTC (rev 16479) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-07-07 09:56:47 UTC (rev 16480) @@ -1,6 +1,6 @@ /* * ReactOS Xbox miniport video driver - * Copyright (C) 2004 Gé van Geldorp + * Copyright (C) 2004 GÚ van Geldorp * * Based on VBE miniport video driver * Copyright (C) 2004 Filip Navara

19 years, 3 months

[navaraf] 16479: Correct the copyright headers.

by navaraf＠svn.reactos.com

Correct the copyright headers. Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-07-07 08:57:03 UTC (rev 16478) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.c 2005-07-07 09:48:44 UTC (rev 16479) @@ -1,12 +1,10 @@ /* * ReactOS Xbox miniport video driver + * Copyright (C) 2004 Gé van Geldorp * * Based on VBE miniport video driver * Copyright (C) 2004 Filip Navara * - * Power Management and VBE 1.2 support - * Copyright (C) 2004 Magnus Olsen - * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 _____ Modified: trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h --- trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-07-07 08:57:03 UTC (rev 16478) +++ trunk/reactos/drivers/video/miniport/xboxvmp/xboxvmp.h 2005-07-07 09:48:44 UTC (rev 16479) @@ -1,5 +1,6 @@ /* * ReactOS Xbox miniport video driver + * Copyright (C) 2004 Gé van Geldorp * * Based on VBE miniport video driver * Copyright (C) 2004 Filip Navara

19 years, 3 months

[navaraf] 16478: Fix the problems introduced in r16449 by changing "-mdll --dll" to "-shared" and letting the linker generate the relocations in all cases.

by navaraf＠svn.reactos.com

Fix the problems introduced in r16449 by changing "-mdll --dll" to "-shared" and letting the linker generate the relocations in all cases. Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-07 08:29:22 UTC (rev 16477) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-07 08:57:03 UTC (rev 16478) @@ -647,7 +647,7 @@ if ( use_pch && module.pch != NULL ) { fprintf ( fMakefile, - " -I %s", + " -I%s", GetDirectory ( GetPrecompiledHeaderFilename () ).c_str () ); } @@ -2086,7 +2086,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll --dll", + string linkerParameters = ssprintf ( "-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", module.GetBasePath ().c_str (), module.entrypoint.c_str (), module.baseaddress.c_str () ); @@ -2173,7 +2173,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll --dll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2220,7 +2220,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll --dll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2266,7 +2266,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll --dll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -shared", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2364,7 +2364,7 @@ else linker = "${gcc}"; - string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -mdll --dll", + string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -shared", module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies,

19 years, 3 months

[greatlrd] 16477: adding page break on almost all help param and on help command.

by greatlrd＠svn.reactos.com

adding page break on almost all help param and on help command. Modified: trunk/reactos/subsys/system/cmd/alias.c Modified: trunk/reactos/subsys/system/cmd/attrib.c Modified: trunk/reactos/subsys/system/cmd/beep.c Modified: trunk/reactos/subsys/system/cmd/call.c Modified: trunk/reactos/subsys/system/cmd/chcp.c Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cls.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmdtable.c Modified: trunk/reactos/subsys/system/cmd/color.c Modified: trunk/reactos/subsys/system/cmd/console.c Modified: trunk/reactos/subsys/system/cmd/copy.c Modified: trunk/reactos/subsys/system/cmd/date.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/cmd/delay.c Modified: trunk/reactos/subsys/system/cmd/echo.c Modified: trunk/reactos/subsys/system/cmd/for.c Modified: trunk/reactos/subsys/system/cmd/free.c Modified: trunk/reactos/subsys/system/cmd/goto.c Modified: trunk/reactos/subsys/system/cmd/if.c Modified: trunk/reactos/subsys/system/cmd/internal.c Modified: trunk/reactos/subsys/system/cmd/label.c Modified: trunk/reactos/subsys/system/cmd/memory.c Modified: trunk/reactos/subsys/system/cmd/move.c Modified: trunk/reactos/subsys/system/cmd/msgbox.c Modified: trunk/reactos/subsys/system/cmd/path.c Modified: trunk/reactos/subsys/system/cmd/pause.c Modified: trunk/reactos/subsys/system/cmd/prompt.c Modified: trunk/reactos/subsys/system/cmd/ren.c Modified: trunk/reactos/subsys/system/cmd/screen.c Modified: trunk/reactos/subsys/system/cmd/set.c Modified: trunk/reactos/subsys/system/cmd/shift.c Modified: trunk/reactos/subsys/system/cmd/start.c Modified: trunk/reactos/subsys/system/cmd/time.c Modified: trunk/reactos/subsys/system/cmd/title.c Modified: trunk/reactos/subsys/system/cmd/type.c Modified: trunk/reactos/subsys/system/cmd/ver.c Modified: trunk/reactos/subsys/system/cmd/verify.c Modified: trunk/reactos/subsys/system/cmd/vol.c Modified: trunk/reactos/subsys/system/cmd/window.c _____ Modified: trunk/reactos/subsys/system/cmd/alias.c --- trunk/reactos/subsys/system/cmd/alias.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/alias.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -308,7 +308,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_ALIAS_HELP); + ConOutResPaging(TRUE,STRING_ALIAS_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/attrib.c --- trunk/reactos/subsys/system/cmd/attrib.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/attrib.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -205,7 +205,7 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_ATTRIB_HELP); + ConOutResPaging(TRUE,STRING_ATTRIB_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/beep.c --- trunk/reactos/subsys/system/cmd/beep.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/beep.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -34,7 +34,7 @@ { if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutResPuts(STRING_BEEP_HELP); + ConOutResPaging(TRUE,STRING_BEEP_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/call.c --- trunk/reactos/subsys/system/cmd/call.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/call.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -50,7 +50,7 @@ #endif if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_CALL_HELP); + ConOutResPaging(TRUE,STRING_CALL_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/chcp.c --- trunk/reactos/subsys/system/cmd/chcp.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/chcp.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -28,7 +28,7 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_CHCP_HELP); + ConOutResPaging(TRUE,STRING_CHCP_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -128,7 +128,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutResPuts(STRING_CHOICE_HELP); + ConOutResPaging(TRUE,STRING_CHOICE_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/cls.c --- trunk/reactos/subsys/system/cmd/cls.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/cls.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -39,7 +39,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_CLS_HELP); + ConOutResPaging(TRUE,STRING_CLS_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -1186,7 +1186,7 @@ if (argc >= 2 && !_tcsncmp (argv[1], _T("/?"), 2)) { - ConOutResPuts(STRING_CMD_HELP8); + ConOutResPaging(TRUE,STRING_CMD_HELP8); ExitProcess(0); } SetConsoleMode (hIn, ENABLE_PROCESSED_INPUT); _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-07-07 08:29:22 UTC (rev 16477) @@ -163,6 +163,7 @@ VOID ConOutResPuts (UINT resID); VOID ConErrResPuts (UINT resID); +VOID ConOutResPaging(BOOL NewPage, UINT resID); /* Prototypes for COPY.C */ INT cmd_copy (LPTSTR, LPTSTR); _____ Modified: trunk/reactos/subsys/system/cmd/cmdtable.c --- trunk/reactos/subsys/system/cmd/cmdtable.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/cmdtable.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -262,8 +262,8 @@ VOID PrintCommandListDetail (VOID) { - ConOutResPuts(STRING_HELP1); - ConOutResPuts(STRING_HELP2); + ConOutResPaging(TRUE,STRING_HELP1); + ConOutResPaging(FALSE,STRING_HELP2); } /* EOF */ _____ Modified: trunk/reactos/subsys/system/cmd/color.c --- trunk/reactos/subsys/system/cmd/color.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/color.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -26,12 +26,9 @@ #ifdef INCLUDE_CMD_COLOR -static VOID ColorHelp (VOID) -{ - ConOutResPuts(STRING_COLOR_HELP1); -} + VOID SetScreenColor (WORD wColor, BOOL bNoFill) { DWORD dwWritten; @@ -73,7 +70,7 @@ if (_tcsncmp (rest, _T("/?"), 2) == 0) { - ColorHelp (); + ConOutResPaging(TRUE,STRING_COLOR_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/console.c --- trunk/reactos/subsys/system/cmd/console.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/console.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -187,6 +187,13 @@ #endif } +VOID ConOutResPaging(BOOL NewPage, UINT resID) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE); + ConOutPrintfPaging(NewPage, szMsg); +} + VOID ConOutResPuts (UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -647,7 +647,7 @@ if (!_tcsncmp (rest, _T("/?"), 2)) { - ConOutResPuts(STRING_COPY_HELP2); + ConOutResPaging(TRUE,STRING_COPY_HELP2); return 1; } _____ Modified: trunk/reactos/subsys/system/cmd/date.c --- trunk/reactos/subsys/system/cmd/date.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/date.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -192,7 +192,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_DATE_HELP4); + ConOutResPaging(TRUE,STRING_DATE_HELP4); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/del.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -169,7 +169,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_DEL_HELP1); + ConOutResPaging(TRUE,STRING_DEL_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/delay.c --- trunk/reactos/subsys/system/cmd/delay.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/delay.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -22,7 +22,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutResPuts(STRING_DELAY_HELP); + ConOutResPaging(TRUE,STRING_DELAY_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/echo.c --- trunk/reactos/subsys/system/cmd/echo.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/echo.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -40,7 +40,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_ECHO_HELP4); + ConOutResPaging(TRUE,STRING_ECHO_HELP4); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/for.c --- trunk/reactos/subsys/system/cmd/for.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/for.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -61,7 +61,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_FOR_HELP1); + ConOutResPaging(TRUE,STRING_FOR_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/free.c --- trunk/reactos/subsys/system/cmd/free.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/free.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -135,7 +135,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_FREE_HELP2); + ConOutResPaging(TRUE,STRING_FREE_HELP2); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/goto.c --- trunk/reactos/subsys/system/cmd/goto.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/goto.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -48,9 +48,8 @@ #endif if (!_tcsncmp (param, _T("/?"), 2)) - { - LoadString(CMD_ModuleHandle, STRING_GOTO_HELP1, szMsg, RC_STRING_MAX_SIZE); - ConOutResPuts(STRING_GOTO_HELP1); + { + ConOutResPaging(TRUE,STRING_GOTO_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/if.c --- trunk/reactos/subsys/system/cmd/if.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/if.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -48,7 +48,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_IF_HELP1); + ConOutResPaging(TRUE,STRING_IF_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/internal.c --- trunk/reactos/subsys/system/cmd/internal.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/internal.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -168,7 +168,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_CD_HELP); + ConOutResPaging(TRUE,STRING_CD_HELP); return 0; } @@ -351,7 +351,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_MKDIR_HELP); + ConOutResPaging(TRUE,STRING_MKDIR_HELP); return 0; } @@ -424,7 +424,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_RMDIR_HELP); + ConOutResPaging(TRUE,STRING_RMDIR_HELP); return 0; } @@ -488,7 +488,7 @@ INT CommandExit (LPTSTR cmd, LPTSTR param) { if (!_tcsncmp (param, _T("/?"), 2)) - ConOutResPuts(STRING_EXIT_HELP); + ConOutResPaging(TRUE,STRING_EXIT_HELP); if (bc != NULL && _tcsnicmp(param,_T("/b"),2) == 0) { @@ -517,7 +517,7 @@ { if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_REM_HELP); + ConOutResPaging(TRUE,STRING_REM_HELP); } return 0; _____ Modified: trunk/reactos/subsys/system/cmd/label.c --- trunk/reactos/subsys/system/cmd/label.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/label.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -39,7 +39,7 @@ /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_LABEL_HELP1); + ConOutResPaging(TRUE,STRING_LABEL_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/memory.c --- trunk/reactos/subsys/system/cmd/memory.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/memory.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -68,7 +68,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_MEMMORY_HELP1); + ConOutResPaging(TRUE,STRING_MEMMORY_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/move.c --- trunk/reactos/subsys/system/cmd/move.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/move.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -86,7 +86,7 @@ " /-Y\n" "...")); #else - ConOutResPuts(STRING_MOVE_HELP2); + ConOutResPaging(TRUE,STRING_MOVE_HELP2); #endif return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/msgbox.c --- trunk/reactos/subsys/system/cmd/msgbox.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/msgbox.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -44,7 +44,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutResPuts(STRING_MSGBOX_HELP); + ConOutResPaging(TRUE,STRING_MSGBOX_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/path.c --- trunk/reactos/subsys/system/cmd/path.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/path.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -39,7 +39,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_PATH_HELP1); + ConOutResPaging(TRUE,STRING_PATH_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/pause.c --- trunk/reactos/subsys/system/cmd/pause.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/pause.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -44,7 +44,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_PAUSE_HELP1); + ConOutResPaging(TRUE,STRING_PAUSE_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -184,12 +184,12 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_PROMPT_HELP1); + ConOutResPaging(TRUE,STRING_PROMPT_HELP1); #ifdef FEATURE_DIRECTORY_STACK - ConOutResPuts(STRING_PROMPT_HELP2); + ConOutResPaging(FALSE,STRING_PROMPT_HELP2); #endif - ConOutResPuts(STRING_PROMPT_HELP3); + ConOutResPaging(FALSE,STRING_PROMPT_HELP3); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/ren.c --- trunk/reactos/subsys/system/cmd/ren.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/ren.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -62,7 +62,7 @@ if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPuts(STRING_REN_HELP1); + ConOutResPaging(TRUE,STRING_REN_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/screen.c --- trunk/reactos/subsys/system/cmd/screen.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/screen.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -24,7 +24,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutResPuts(STRING_SCREEN_HELP); + ConOutResPaging(TRUE,STRING_SCREEN_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/set.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -51,7 +51,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_SET_HELP); + ConOutResPaging(TRUE,STRING_SET_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/shift.c --- trunk/reactos/subsys/system/cmd/shift.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/shift.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -46,7 +46,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_SHIFT_HELP); + ConOutResPaging(TRUE,STRING_SHIFT_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/start.c --- trunk/reactos/subsys/system/cmd/start.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/start.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -25,7 +25,7 @@ if (_tcsncmp (rest, _T("/?"), 2) == 0) { - ConOutResPuts(STRING_START_HELP1); + ConOutResPaging(TRUE,STRING_START_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/time.c --- trunk/reactos/subsys/system/cmd/time.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/time.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -140,7 +140,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_TIME_HELP1); + ConOutResPaging(TRUE,STRING_TIME_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/title.c --- trunk/reactos/subsys/system/cmd/title.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/title.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -25,7 +25,7 @@ /* Asking help? */ if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPuts(STRING_TITLE_HELP); + ConOutResPaging(TRUE,STRING_TITLE_HELP); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/type.c --- trunk/reactos/subsys/system/cmd/type.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/type.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -48,7 +48,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_TYPE_HELP1); + ConOutResPaging(TRUE,STRING_TYPE_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/ver.c --- trunk/reactos/subsys/system/cmd/ver.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/ver.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -67,7 +67,7 @@ if (_tcsstr (param, _T("/?")) != NULL) { - ConOutResPuts(STRING_VERSION_HELP1); + ConOutResPaging(TRUE,STRING_VERSION_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/verify.c --- trunk/reactos/subsys/system/cmd/verify.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/verify.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -34,7 +34,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_VERIFY_HELP1); + ConOutResPaging(TRUE,STRING_VERIFY_HELP1); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/vol.c --- trunk/reactos/subsys/system/cmd/vol.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/vol.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -73,7 +73,7 @@ if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutResPuts(STRING_VOL_HELP4); + ConOutResPaging(TRUE,STRING_VOL_HELP4); return 0; } _____ Modified: trunk/reactos/subsys/system/cmd/window.c --- trunk/reactos/subsys/system/cmd/window.c 2005-07-07 00:21:21 UTC (rev 16476) +++ trunk/reactos/subsys/system/cmd/window.c 2005-07-07 08:29:22 UTC (rev 16477) @@ -183,7 +183,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutResPuts(STRING_WINDOW_HELP1); + ConOutResPaging(TRUE,STRING_WINDOW_HELP1); return 0; } @@ -200,7 +200,7 @@ if (_tcsncmp (param, _T("/?"), 2) == 0) { - ConOutResPuts(STRING_WINDOW_HELP2); + ConOutResPaging(TRUE,STRING_WINDOW_HELP2); return 0; }

19 years, 3 months

[jimtabor] 16476: Added MNS_ defines for MenuInfo dwStyle. Misc Wine Menu porting.

by jimtabor＠svn.reactos.com

Added MNS_ defines for MenuInfo dwStyle. Misc Wine Menu porting. Modified: trunk/reactos/w32api/include/winuser.h _____ Modified: trunk/reactos/w32api/include/winuser.h --- trunk/reactos/w32api/include/winuser.h 2005-07-06 22:49:08 UTC (rev 16475) +++ trunk/reactos/w32api/include/winuser.h 2005-07-07 00:21:21 UTC (rev 16476) @@ -689,6 +689,12 @@ #define MFS_HILITE 128 #define MFS_UNCHECKED 0 #define MFS_UNHILITE 0 +#define MNS_NOCHECK 0x80000000 +#define MNS_MODELESS 0x40000000 +#define MNS_DRAGDROP 0x20000000 +#define MNS_AUTODISMISS 0x10000000 +#define MNS_NOTIFYBYPOS 0x08000000 +#define MNS_CHECKORBMP 0x04000000 #define GW_HWNDNEXT 2 #define GW_HWNDPREV 3 #define GW_CHILD 5

19 years, 3 months

[gvg] 16475: Sync to Wine-20050628:

by gvg＠svn.reactos.com

Sync to Wine-20050628: Alexandre Julliard <julliard(a)winehq.org> - Sort entry points in the same order as Windows. Modified: trunk/reactos/lib/icmp/icmp.spec _____ Modified: trunk/reactos/lib/icmp/icmp.spec --- trunk/reactos/lib/icmp/icmp.spec 2005-07-06 22:47:23 UTC (rev 16474) +++ trunk/reactos/lib/icmp/icmp.spec 2005-07-06 22:49:08 UTC (rev 16475) @@ -1,8 +1,8 @@ @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() @ stub IcmpParseReplies +@ stub IcmpSendEcho2 @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) -@ stub IcmpSendEcho2 @ stub do_echo_rep @ stub do_echo_req @ stub register_icmp

19 years, 3 months

[hpoussin] 16474: Open remote registry if needed in SetupDiCreateDeviceInfoListExW and SetupDiOpenClassRegKeyExW

by hpoussin＠svn.reactos.com

Open remote registry if needed in SetupDiCreateDeviceInfoListExW and SetupDiOpenClassRegKeyExW Set last error in more places Add my name to copyright due to my recent changes Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-07-06 22:40:35 UTC (rev 16473) +++ trunk/reactos/lib/setupapi/devinst.c 2005-07-06 22:47:23 UTC (rev 16474) @@ -2,6 +2,7 @@ * SetupAPI device installer * * Copyright 2000 Andreas Mohr for CodeWeavers + * 2005 HervÚ Poussineau (hpoussin(a)reactos.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -645,6 +646,7 @@ PVOID Reserved) { DeviceInfoList* list; + DWORD rc; TRACE("%p %p %p %p\n", ClassGuid, hwndParent, MachineName, Reserved); @@ -658,10 +660,13 @@ list->magic = SETUP_DEV_INFO_LIST_MAGIC; list->hWnd = hwndParent; list->numberOfEntries = 0; - /* FIXME: open distant registry */ - //if (RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &list->HKLM) != ERROR_SUCCESS) - if (RegOpenKey(HKEY_LOCAL_MACHINE, NULL, &list->HKLM) != ERROR_SUCCESS) + if (MachineName) + rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &list->HKLM); + else + rc = RegOpenKey(HKEY_LOCAL_MACHINE, NULL, &list->HKLM); + if (rc != ERROR_SUCCESS) { + SetLastError(rc); HeapFree(GetProcessHeap(), 0, list); return (HDEVINFO)INVALID_HANDLE_VALUE; } @@ -2042,16 +2047,12 @@ LPWSTR lpGuidString; LPWSTR lpFullGuidString; DWORD dwLength; + HKEY HKLM; HKEY hClassesKey; HKEY hClassKey; + DWORD rc; LPCWSTR lpKeyName; - if (MachineName != NULL) - { - FIXME("Remote access not supported yet!\n"); - return INVALID_HANDLE_VALUE; - } - if (Flags == DIOCR_INSTALLER) { lpKeyName = ControlClass; @@ -2067,12 +2068,27 @@ return INVALID_HANDLE_VALUE; } - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + if (MachineName != NULL) + { + rc = RegConnectRegistryW(MachineName, HKEY_LOCAL_MACHINE, &HKLM); + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + return INVALID_HANDLE_VALUE; + } + } + else + HKLM = HKEY_LOCAL_MACHINE; + + rc = RegOpenKeyExW(HKLM, lpKeyName, 0, KEY_ALL_ACCESS, - &hClassesKey)) + &hClassesKey); + if (MachineName != NULL) RegCloseKey(HKLM); + if (rc != ERROR_SUCCESS) { + SetLastError(rc); return INVALID_HANDLE_VALUE; } @@ -2081,6 +2097,7 @@ if (UuidToStringW((UUID*)ClassGuid, &lpGuidString) != RPC_S_OK) { + SetLastError(ERROR_GEN_FAILURE); RegCloseKey(hClassesKey); return INVALID_HANDLE_VALUE; } @@ -2089,6 +2106,7 @@ lpFullGuidString = HeapAlloc(GetProcessHeap(), 0, (dwLength + 3) * sizeof(WCHAR)); if (!lpFullGuidString) { + SetLastError(ERROR_NO_SYSTEM_RESOURCES); RpcStringFreeW(&lpGuidString); return INVALID_HANDLE_VALUE; } @@ -2098,12 +2116,14 @@ lpFullGuidString[dwLength + 2] = UNICODE_NULL; RpcStringFreeW(&lpGuidString); - if (RegOpenKeyExW(hClassesKey, + rc = RegOpenKeyExW(hClassesKey, lpFullGuidString, 0, KEY_ALL_ACCESS, - &hClassKey)) + &hClassKey); + if (rc != ERROR_SUCCESS) { + SetLastError(rc); HeapFree(GetProcessHeap(), 0, lpFullGuidString); RegCloseKey(hClassesKey); return INVALID_HANDLE_VALUE;

19 years, 3 months

[gvg] 16473: Sync to Wine-20050628:

by gvg＠svn.reactos.com

Sync to Wine-20050628: Juan Lang <juan_lang(a)yahoo.com> - Fix return code abuse (don't use HRESULT when it isn't meant), make functions static where possible, remove unused prototypes. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Make some of the OLE interface vtables const. Michael Jung <mjung(a)iss.tu-darmstadt.de> - Use IShellFolder::GetDisplayNameOf instead of SHGetPathFromIDList to be able to browse shell namespace extensions. Vitaly Lipatov <lav(a)etersoft.ru> - Add some descriptions for PageSetupDlg functions. - Implement user paint hook support and PSD_ENABLEPAGEPAINTHOOK checking. Huw Davies <huw(a)codeweavers.com> - If a folder is selected on Open then browse into it, otherwise we should return the path in the edit box whether that be a folder or a file. - Don't add extensions to a folder. - Use DWLP_MSGRESULT to return values from the dialog proc. - Send CDN_FOLDERCHANGE whenever we change folder. Modified: trunk/reactos/lib/comdlg32/filedlg.c Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.c Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.h Modified: trunk/reactos/lib/comdlg32/printdlg.c _____ Modified: trunk/reactos/lib/comdlg32/filedlg.c --- trunk/reactos/lib/comdlg32/filedlg.c 2005-07-06 22:33:11 UTC (rev 16472) +++ trunk/reactos/lib/comdlg32/filedlg.c 2005-07-06 22:40:35 UTC (rev 16473) @@ -196,6 +196,9 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd); static BOOL FILEDLG95_SHELL_BrowseToDesktop(HWND hwnd); +/* Functions used by the EDIT box */ +static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator); + /* Functions used by the filetype combo box */ static HRESULT FILEDLG95_FILETYPE_Init(HWND hwnd); static BOOL FILEDLG95_FILETYPE_OnCommand(HWND hwnd, WORD wNotifyCode); @@ -203,7 +206,7 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd); /* Functions used by the Look In combo box */ -static HRESULT FILEDLG95_LOOKIN_Init(HWND hwndCombo); +static void FILEDLG95_LOOKIN_Init(HWND hwndCombo); static LRESULT FILEDLG95_LOOKIN_DrawItem(LPDRAWITEMSTRUCT pDIStruct); static BOOL FILEDLG95_LOOKIN_OnCommand(HWND hwnd, WORD wNotifyCode); static int FILEDLG95_LOOKIN_AddItem(HWND hwnd,LPITEMIDLIST pidl, int iInsertId); @@ -214,8 +217,7 @@ static void FILEDLG95_LOOKIN_Clean(HWND hwnd); /* Miscellaneous tool functions */ -HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName); -HRESULT GetFileName(HWND hwnd, LPITEMIDLIST pidl, LPSTR lpstrFileName); +static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName); IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs); LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPWSTR lpcstrFileName); @@ -224,11 +226,10 @@ static void *MemAlloc(UINT size); static void MemFree(void *mem); -BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos); INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); -HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed); +void SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); +static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +static BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed); static BOOL BrowseSelectedFolder(HWND hwnd); /*********************************************************************** @@ -241,7 +242,7 @@ * OUT : TRUE on success * FALSE on cancel, error, close or filename-does-not-fit-in-buffer. */ -BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos) +static BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos) { LRESULT lRes; @@ -511,6 +512,27 @@ return ret; } +/********************************************************************** ******** + * COMDLG32_GetDisplayNameOf [internal] + * + * Helper function to get the display name for a pidl. + */ +static BOOL COMDLG32_GetDisplayNameOf(LPCITEMIDLIST pidl, LPWSTR pwszPath) { + LPSHELLFOLDER psfDesktop; + STRRET strret; + + if (FAILED(SHGetDesktopFolder(&psfDesktop))) + return FALSE; + + if (FAILED(IShellFolder_GetDisplayNameOf(psfDesktop, pidl, SHGDN_FORPARSING, &strret))) { + IShellFolder_Release(psfDesktop); + return FALSE; + } + + IShellFolder_Release(psfDesktop); + return SUCCEEDED(StrRetToBufW(&strret, pidl, pwszPath, MAX_PATH)); +} + /*********************************************************************** * ArrangeCtrlPositions [internal] * @@ -790,17 +812,16 @@ * Send CustomDialogNotification (CDN_FIRST -- CDN_LAST) message to the custom template dialog */ -HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) +void SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode) { FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwndParentDlg,FileOpenDlgInfosStr); TRACE("%p 0x%04x\n",hwndParentDlg, uCode); - if(!fodInfos) return 0; + if(!fodInfos) return; if(fodInfos->DlgInfos.hwndCustomDlg) { - HRESULT ret; TRACE("CALL NOTIFY for %x\n", uCode); if(fodInfos->unicode) { @@ -810,7 +831,7 @@ ofnNotify.hdr.code = uCode; ofnNotify.lpOFN = fodInfos->ofnInfos; ofnNotify.pszFile = NULL; - ret = SendMessageW(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNo tify); + SendMessageW(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNo tify); } else { @@ -820,17 +841,15 @@ ofnNotify.hdr.code = uCode; ofnNotify.lpOFN = (LPOPENFILENAMEA)fodInfos->ofnInfos; ofnNotify.pszFile = NULL; - ret = SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNo tify); + SendMessageA(fodInfos->DlgInfos.hwndCustomDlg,WM_NOTIFY,0,(LPARAM)&ofnNo tify); } TRACE("RET NOTIFY\n"); - return ret; } - return TRUE; } -HRESULT FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer) +static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer) { - UINT sizeUsed = 0, n, total; + INT_PTR sizeUsed = 0, n, total; LPWSTR lpstrFileList = NULL; WCHAR lpstrCurrentDir[MAX_PATH]; FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); @@ -841,7 +860,7 @@ return -1; /* get path and filenames */ - SHGetPathFromIDListW(fodInfos->ShellInfos.pidlAbsCurrent,lpstrCurrentDir ); + COMDLG32_GetDisplayNameOf(fodInfos->ShellInfos.pidlAbsCurrent, lpstrCurrentDir); n = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' '); TRACE("path >%s< filespec >%s< %d files\n", @@ -890,9 +909,9 @@ return total; } -HRESULT FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer) +static INT_PTR FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer) { - UINT sizeUsed = 0; + INT_PTR sizeUsed = 0; LPWSTR lpstrFileList = NULL; FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); @@ -922,37 +941,37 @@ * * Handle Custom Dialog Messages (CDM_FIRST -- CDM_LAST) messages */ -HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); - if(!fodInfos) return -1; + WCHAR lpstrPath[MAX_PATH]; + INT_PTR retval; + if(!fodInfos) return FALSE; + switch(uMsg) { case CDM_GETFILEPATH: - return FILEDLG95_Handle_GetFilePath(hwnd, (UINT)wParam, (LPVOID)lParam); + retval = FILEDLG95_Handle_GetFilePath(hwnd, (UINT)wParam, (LPVOID)lParam); + break; case CDM_GETFOLDERPATH: TRACE("CDM_GETFOLDERPATH:\n"); - if( fodInfos->unicode ) + COMDLG32_GetDisplayNameOf(fodInfos->ShellInfos.pidlAbsCurrent, lpstrPath); + if (lParam) { - WCHAR lpstrPath[MAX_PATH], *bufW = (LPWSTR)lParam; - SHGetPathFromIDListW(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath); - if (bufW) - lstrcpynW(bufW,lpstrPath,(int)wParam); - return strlenW(lpstrPath); - } - else - { - char lpstrPath[MAX_PATH], *bufA = (LPSTR)lParam; - SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath); - if (bufA) - lstrcpynA(bufA,lpstrPath,(int)wParam); - return strlen(lpstrPath); - } + if (fodInfos->unicode) + lstrcpynW((LPWSTR)lParam, lpstrPath, (int)wParam); + else + WideCharToMultiByte(CP_ACP, 0, lpstrPath, -1, + (LPSTR)lParam, (int)wParam, NULL, NULL); + } + retval = strlenW(lpstrPath); + break; case CDM_GETSPEC: - return FILEDLG95_Handle_GetFileSpec(hwnd, (UINT)wParam, (LPSTR)lParam); + retval = FILEDLG95_Handle_GetFileSpec(hwnd, (UINT)wParam, (LPSTR)lParam); + break; case CDM_SETCONTROLTEXT: TRACE("CDM_SETCONTROLTEXT:\n"); @@ -963,13 +982,19 @@ else SetDlgItemTextA( hwnd, (UINT) wParam, (LPSTR) lParam ); } - return TRUE; + retval = TRUE; + break; case CDM_HIDECONTROL: case CDM_SETDEFEXT: FIXME("CDM_HIDECONTROL,CDM_SETCONTROLTEXT,CDM_SETDEFEXT not implemented\n"); - return -1; + retval = -1; + break; + + default: + return FALSE; } + SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, retval); return TRUE; } @@ -1597,7 +1622,7 @@ ofn->lpstrFile[0] = '\0'; } - SHGetPathFromIDListW( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec ); + COMDLG32_GetDisplayNameOf( fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathSpec ); if ( !(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE) && ( fodInfos->ofnInfos->Flags & OFN_FILEMUSTEXIST) && @@ -1685,9 +1710,8 @@ * * If the function succeeds, the return value is nonzero. */ -#define ONOPEN_BROWSE 1 -#define ONOPEN_OPEN 2 -#define ONOPEN_SEARCH 3 +#define ONOPEN_OPEN 1 +#define ONOPEN_SEARCH 2 static void FILEDLG95_OnOpenMessage(HWND hwnd, int idCaption, int idText) { WCHAR strMsgTitle[MAX_PATH]; @@ -1714,15 +1738,15 @@ TRACE("hwnd=%p\n", hwnd); + if(BrowseSelectedFolder(hwnd)) + return FALSE; + /* get the files from the edit control */ nFileCount = FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, '\0'); /* try if the user selected a folder in the shellview */ if(nFileCount == 0) - { - BrowseSelectedFolder(hwnd); return FALSE; - } if(nFileCount > 1) { @@ -1742,14 +1766,10 @@ */ /* Get the current directory name */ - if (!SHGetPathFromIDListW(fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathAndFile)) + if (!COMDLG32_GetDisplayNameOf(fodInfos->ShellInfos.pidlAbsCurrent, lpstrPathAndFile)) { - /* we are in a special folder, default to desktop */ - if(FAILED(COMDLG32_SHGetFolderPathW(hwnd, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, 0, 0, lpstrPathAndFile))) - { - /* last fallback */ - GetCurrentDirectoryW(MAX_PATH, lpstrPathAndFile); - } + /* last fallback */ + GetCurrentDirectoryW(MAX_PATH, lpstrPathAndFile); } PathAddBackslashW(lpstrPathAndFile); @@ -1787,7 +1807,7 @@ lpstrPathAndFile: cleaned up path */ - nOpenAction = ONOPEN_BROWSE; + nOpenAction = ONOPEN_OPEN; /* don't apply any checks with OFN_NOVALIDATE */ { @@ -1920,6 +1940,7 @@ int iPos; LPWSTR lpszTemp = PathFindFileNameW(lpstrPathAndFile); DWORD len; + IPersistFolder2 * ppf2; /* replace the current filter */ if(fodInfos->ShellInfos.lpstrCurrentFilter) @@ -1931,12 +1952,7 @@ /* set the filter cb to the extension when possible */ if(-1 < (iPos = FILEDLG95_FILETYPE_SearchExt(fodInfos->DlgInfos.hwndFileTypeCB, lpszTemp))) CBSetCurSel(fodInfos->DlgInfos.hwndFileTypeCB, iPos); - } - /* fall through */ - case ONOPEN_BROWSE: /* browse to the highest folder we could bind to */ - TRACE("ONOPEN_BROWSE\n"); - { - IPersistFolder2 * ppf2; + if(SUCCEEDED(IShellFolder_QueryInterface( lpsf, &IID_IPersistFolder2, (LPVOID*)&ppf2))) { LPITEMIDLIST pidlCurrent; @@ -1946,10 +1962,11 @@ { IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidlCurrent, SBSP_ABSOLUTE); } - else if( nOpenAction == ONOPEN_SEARCH ) + else { IShellView_Refresh(fodInfos->Shell.FOIShellView); } + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); COMDLG32_SHFree(pidlCurrent); } } @@ -1967,48 +1984,51 @@ fodInfos->ofnInfos->Flags &= ~OFN_READONLY; /* Attach the file extension with file name*/ - ext = PathFindExtensionW(lpstrPathAndFile); - if (! *ext) + + if(!PathIsDirectoryW(lpstrPathAndFile)) { - /* if no extension is specified with file name, then */ - /* attach the extension from file filter or default one */ + if((ext = PathFindExtensionW(lpstrPathAndFile)) == NULL) + { + /* if no extension is specified with file name, then */ + /* attach the extension from file filter or default one */ - WCHAR *filterExt = NULL; - LPWSTR lpstrFilter = NULL; - static const WCHAR szwDot[] = {'.',0}; - int PathLength = strlenW(lpstrPathAndFile); + WCHAR *filterExt = NULL; + LPWSTR lpstrFilter = NULL; + static const WCHAR szwDot[] = {'.',0}; + int PathLength = strlenW(lpstrPathAndFile); - /* Attach the dot*/ - strcatW(lpstrPathAndFile, szwDot); + /* Attach the dot*/ + strcatW(lpstrPathAndFile, szwDot); - /*Get the file extension from file type filter*/ - lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, - fodInfos->ofnInfos->nFilterIndex-1); + /*Get the file extension from file type filter*/ + lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB, + fodInfos->ofnInfos->nFilterIndex-1); - if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ - filterExt = PathFindExtensionW(lpstrFilter); + if (lpstrFilter != (LPWSTR)CB_ERR) /* control is not empty */ + filterExt = PathFindExtensionW(lpstrFilter); - if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/ - strcatW(lpstrPathAndFile, filterExt + 1); - else if ( fodInfos->defext ) /* attach the default file extension*/ - strcatW(lpstrPathAndFile, fodInfos->defext); + if ( filterExt && *filterExt ) /* attach the file extension from file type filter*/ + strcatW(lpstrPathAndFile, filterExt + 1); + else if ( fodInfos->defext ) /* attach the default file extension*/ + strcatW(lpstrPathAndFile, fodInfos->defext); - /* In Open dialog: if file does not exist try without extension */ - if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) - lpstrPathAndFile[PathLength] = '\0'; + /* In Open dialog: if file does not exist try without extension */ + if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG) && !PathFileExistsW(lpstrPathAndFile)) + lpstrPathAndFile[PathLength] = '\0'; + } + + if (fodInfos->defext) /* add default extension */ + { + /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ + if (*ext) + ext++; + if (!lstrcmpiW(fodInfos->defext, ext)) + fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; + else + fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; + } } - if (fodInfos->defext) /* add default extension */ - { - /* Set/clear the output OFN_EXTENSIONDIFFERENT flag */ - if (*ext) - ext++; - if (!lstrcmpiW(fodInfos->defext, ext)) - fodInfos->ofnInfos->Flags &= ~OFN_EXTENSIONDIFFERENT; - else - fodInfos->ofnInfos->Flags |= OFN_EXTENSIONDIFFERENT; - } - /* In Save dialog: check if the file already exists */ if (fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG && fodInfos->ofnInfos->Flags & OFN_OVERWRITEPROMPT @@ -2208,6 +2228,7 @@ NULL, SBSP_PARENT))) { + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); return TRUE; } return FALSE; @@ -2229,6 +2250,7 @@ SHGetSpecialFolderLocation(0,CSIDL_DESKTOP,&pidl); hres = IShellBrowser_BrowseObject(fodInfos->Shell.FOIShellBrowser, pidl, SBSP_ABSOLUTE); + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); COMDLG32_SHFree(pidl); return SUCCEEDED(hres); } @@ -2361,8 +2383,7 @@ } } else fodInfos->ofnInfos->nFilterIndex = 0; - - return NOERROR; + return S_OK; } /*********************************************************************** @@ -2465,7 +2486,7 @@ * * Initialisation of the look in combo box */ -static HRESULT FILEDLG95_LOOKIN_Init(HWND hwndCombo) +static void FILEDLG95_LOOKIN_Init(HWND hwndCombo) { IShellFolder *psfRoot, *psfDrives; IEnumIDList *lpeRoot, *lpeDrives; @@ -2532,7 +2553,6 @@ } COMDLG32_SHFree(pidlDrives); - return NOERROR; } /*********************************************************************** @@ -2680,6 +2700,7 @@ tmpFolder->pidlItem, SBSP_ABSOLUTE))) { + SendCustomDlgNotificationMessage(hwnd, CDN_FOLDERCHANGE); return TRUE; } break; @@ -3009,7 +3030,9 @@ } -/* copied from shell32 to avoid linking to it */ +/* copied from shell32 to avoid linking to it + * FIXME: why? shell32 is already linked + */ static HRESULT COMDLG32_StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl) { switch (src->uType) @@ -3033,7 +3056,7 @@ { *(LPSTR)dest = '\0'; } - return(FALSE); + return(E_FAIL); } return S_OK; } @@ -3045,7 +3068,7 @@ * The delimiter is specified by the parameter 'separator', * usually either a space or a nul */ -int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator) +static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator) { FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); UINT nStrCharCount = 0; /* index in src buffer */ @@ -3211,7 +3234,7 @@ * E_FAIL otherwise */ -HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName) +static HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName) { STRRET str; HRESULT hRes; @@ -3351,8 +3374,8 @@ ' ','n','o','t',' ','e','x','i','s','t',0}; MessageBoxW( hwnd, notexist, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } - - bBrowseSelFolder = TRUE; + bBrowseSelFolder = TRUE; + SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); } COMDLG32_SHFree( pidlSelection ); } _____ Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.c --- trunk/reactos/lib/comdlg32/filedlgbrowser.c 2005-07-06 22:33:11 UTC (rev 16472) +++ trunk/reactos/lib/comdlg32/filedlgbrowser.c 2005-07-06 22:40:35 UTC (rev 16473) @@ -47,9 +47,9 @@ typedef struct { - IShellBrowserVtbl * lpVtbl; - ICommDlgBrowserVtbl * lpVtblCommDlgBrowser; - IServiceProviderVtbl* lpVtblServiceProvider; + const IShellBrowserVtbl *lpVtbl; + const ICommDlgBrowserVtbl *lpVtblCommDlgBrowser; + const IServiceProviderVtbl *lpVtblServiceProvider; DWORD ref; /* Reference counter */ HWND hwndOwner; /* Owner dialog of the interface */ @@ -58,9 +58,9 @@ /*********************************************************************** *** * vtable */ -static IShellBrowserVtbl IShellBrowserImpl_Vtbl; -static ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl; -static IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl; +static const IShellBrowserVtbl IShellBrowserImpl_Vtbl; +static const ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl; +static const IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl; /*********************************************************************** *** * Local Prototypes @@ -76,19 +76,12 @@ */ extern const char *FileOpenDlgInfosStr; -extern HRESULT GetName(LPSHELLFOLDER lpsf, LPITEMIDLIST pidl,DWORD dwFlags,LPSTR lpstrFileName); -extern HRESULT GetFileName(HWND hwnd, LPITEMIDLIST pidl, LPSTR lpstrFileName); extern IShellFolder* GetShellFolderFromPidl(LPITEMIDLIST pidlAbs); extern LPITEMIDLIST GetParentPidl(LPITEMIDLIST pidl); extern LPITEMIDLIST GetPidlFromName(IShellFolder *psf,LPCSTR lpcstrFileName); -extern BOOL FILEDLG95_SHELL_FillIncludedItemList(HWND hwnd, - LPITEMIDLIST pidlCurrentFolder, - LPSTR lpstrMask); - extern int FILEDLG95_LOOKIN_SelectItem(HWND hwnd,LPITEMIDLIST pidl); -extern BOOL FILEDLG95_OnOpen(HWND hwnd); -extern HRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); +extern void SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); /* @@ -140,11 +133,25 @@ static void COMDLG32_UpdateCurrentDir(FileOpenDlgInfos *fodInfos) { - char lpstrPath[MAX_PATH]; - if(SHGetPathFromIDListA(fodInfos->ShellInfos.pidlAbsCurrent,lpstrPath)) { - SetCurrentDirectoryA(lpstrPath); - TRACE("new current folder %s\n", lpstrPath); + LPSHELLFOLDER psfDesktop; + STRRET strret; + HRESULT res; + + res = SHGetDesktopFolder(&psfDesktop); + if (FAILED(res)) + return; + + res = IShellFolder_GetDisplayNameOf(psfDesktop, fodInfos->ShellInfos.pidlAbsCurrent, + SHGDN_FORPARSING, &strret); + if (SUCCEEDED(res)) { + WCHAR wszCurrentDir[MAX_PATH]; + + res = StrRetToBufW(&strret, fodInfos->ShellInfos.pidlAbsCurrent, wszCurrentDir, MAX_PATH); + if (SUCCEEDED(res)) + SetCurrentDirectoryW(wszCurrentDir); } + + IShellFolder_Release(psfDesktop); } /* copied from shell32 to avoid linking to it */ @@ -675,7 +682,7 @@ return E_NOTIMPL; } -static IShellBrowserVtbl IShellBrowserImpl_Vtbl = +static const IShellBrowserVtbl IShellBrowserImpl_Vtbl = { /* IUnknown */ IShellBrowserImpl_QueryInterface, @@ -900,7 +907,7 @@ return S_OK; } -static ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl = +static const ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl = { /* IUnknown */ IShellBrowserImpl_ICommDlgBrowser_QueryInterface, @@ -989,7 +996,7 @@ } -static IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl = +static const IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl = { /* IUnknown */ IShellBrowserImpl_IServiceProvider_QueryInterface, _____ Modified: trunk/reactos/lib/comdlg32/filedlgbrowser.h --- trunk/reactos/lib/comdlg32/filedlgbrowser.h 2005-07-06 22:33:11 UTC (rev 16472) +++ trunk/reactos/lib/comdlg32/filedlgbrowser.h 2005-07-06 22:40:35 UTC (rev 16473) @@ -161,6 +161,5 @@ /* Functions used by the EDIT box */ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd); -int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, UINT * sizeUsed, char separator); #endif /*SHBROWSER_H*/ _____ Modified: trunk/reactos/lib/comdlg32/printdlg.c --- trunk/reactos/lib/comdlg32/printdlg.c 2005-07-06 22:33:11 UTC (rev 16472) +++ trunk/reactos/lib/comdlg32/printdlg.c 2005-07-06 22:40:35 UTC (rev 16473) @@ -1945,11 +1945,6 @@ * PrintDlg: * * The Collate Icons do not display, even though they are in the code. * * The Properties Button(s) should call DocumentPropertiesA(). - * PrintSetupDlg: - * * The Paper Orientation Icons are not implemented yet. - * * The Properties Button(s) should call DocumentPropertiesA(). - * * Settings are not yet taken from a provided DevMode or - * default printer settings. */ BOOL WINAPI PrintDlgA( @@ -2266,6 +2261,7 @@ * PageSetupDlg * rad1 - portrait * rad2 - landscape + * cmb1 - printer select (not in standart dialog template) * cmb2 - paper size * cmb3 - source (tray?) * edt4 - border left @@ -2609,24 +2605,153 @@ } +/********************************************************************** * + * DefaultPagePaintHook + * Default hook paint procedure that receives WM_PSD_* messages from the dialog box + * whenever the sample page is redrawn. +*/ + +static UINT_PTR +PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, PageSetupDataA *pda) +{ + LPRECT lprc = (LPRECT) lParam; + HDC hdc = (HDC) wParam; + HPEN hpen, holdpen; + LOGFONTW lf; + HFONT hfont, holdfont; + INT oldbkmode; + TRACE("uMsg: WM_USER+%d\n",uMsg-WM_USER); + + /* Call user paint hook if enable */ + if (pda->dlga->Flags & PSD_ENABLEPAGEPAINTHOOK) + if (pda->dlga->lpfnPagePaintHook(hwndDlg, uMsg, wParam, lParam)) + return TRUE; + + switch (uMsg) { + /* LPPAGESETUPDLG in lParam */ + case WM_PSD_PAGESETUPDLG: + /* Inform about the sample page rectangle */ + case WM_PSD_FULLPAGERECT: + /* Inform about the margin rectangle */ + case WM_PSD_MINMARGINRECT: + return FALSE; + + /* Draw dashed rectangle showing margins */ + case WM_PSD_MARGINRECT: + hpen = CreatePen(PS_DASH, 1, GetSysColor(COLOR_3DSHADOW)); + holdpen = SelectObject(hdc, hpen); + Rectangle(hdc, lprc->left, lprc->top, lprc->right, lprc->bottom); + DeleteObject(SelectObject(hdc, holdpen)); + return TRUE; + + + /* Draw the fake document */ + case WM_PSD_GREEKTEXTRECT: + /* select a nice scalable font, because we want the text really small */ + SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0); + lf.lfHeight = 6; /* value chosen based on visual effect */ + hfont = CreateFontIndirectW(&lf); + holdfont = SelectObject(hdc, hfont); + + /* if text not loaded, then do so now */ + if (wszFakeDocumentText[0] == '\0') + LoadStringW(COMDLG32_hInstance, + IDS_FAKEDOCTEXT, + wszFakeDocumentText, + sizeof(wszFakeDocumentText)/sizeof(wszFakeDocumentText[0])); + + oldbkmode = SetBkMode(hdc, TRANSPARENT); + DrawTextW(hdc, wszFakeDocumentText, -1, lprc, DT_TOP|DT_LEFT|DT_NOPREFIX|DT_WORDBREAK); + SetBkMode(hdc, oldbkmode); + + DeleteObject(SelectObject(hdc, holdfont)); + return TRUE; + + /* Envelope stamp */ + case WM_PSD_ENVSTAMPRECT: + /* Return address */ + case WM_PSD_YAFULLPAGERECT: + FIXME("envelope/stamp is not implemented\n"); + return FALSE; + default: + FIXME("Unknown message %x\n",uMsg); + return FALSE; + } + return TRUE; +} + +/********************************************************************** * + * PagePaintProc + * The main paint procedure for the PageSetupDlg function. + * The Page Setup dialog box includes an image of a sample page that shows how + * the user's selections affect the appearance of the printed output. + * The image consists of a rectangle that represents the selected paper + * or envelope type, with a dotted-line rectangle representing + * the current margins, and partial (Greek text) characters + * to show how text looks on the printed page. + * + * The following messages in the order sends to user hook procedure: + * WM_PSD_PAGESETUPDLG Draw the contents of the sample page + * WM_PSD_FULLPAGERECT Inform about the bounding rectangle + * WM_PSD_MINMARGINRECT Inform about the margin rectangle (min margin?) + * WM_PSD_MARGINRECT Draw the margin rectangle + * WM_PSD_GREEKTEXTRECT Draw the Greek text inside the margin rectangle + * If any of first three messages returns TRUE, painting done. + * + * PARAMS: + * hWnd [in] Handle to the Page Setup dialog box + * uMsg [in] Received message + * + * TODO: + * WM_PSD_ENVSTAMPRECT Draw in the envelope-stamp rectangle (for envelopes only) + * WM_PSD_YAFULLPAGERECT Draw the return address portion (for envelopes and other paper sizes) + * + * RETURNS: + * FALSE if all done correctly + * + */ static LRESULT CALLBACK -PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - if (uMsg == WM_PAINT) - { - PAINTSTRUCT ps; - RECT rcClient; - HPEN hpen, holdpen; - HDC hdc; - HFONT hfont, holdfont; - LOGFONTW lf; - HBRUSH hbrush, holdbrush; - INT oldbkmode; + PAINTSTRUCT ps; + RECT rcClient, rcMargin; + HPEN hpen, holdpen; + HDC hdc; + HBRUSH hbrush, holdbrush; + PageSetupDataA *pda; + int papersize=0, orientation=0; /* FIXME: set this values */ - hdc = BeginPaint(hWnd, &ps); +#define CALLPAINTHOOK(msg,lprc) PRINTDLG_DefaultPagePaintHook( hWnd, msg, (WPARAM)hdc, (LPARAM)lprc, pda) - GetClientRect(hWnd, &rcClient); + if (uMsg != WM_PAINT) + return CallWindowProcA(lpfnStaticWndProc, hWnd, uMsg, wParam, lParam); + /* Processing WM_PAINT message */ + pda = (PageSetupDataA*)GetPropA(hWnd, "__WINE_PAGESETUPDLGDATA"); + if (!pda) { + WARN("__WINE_PAGESETUPDLGDATA prop not set?\n"); + return FALSE; + } + if (PRINTDLG_DefaultPagePaintHook(hWnd, WM_PSD_PAGESETUPDLG, MAKELONG(papersize, orientation), (LPARAM)pda->dlga, pda)) + return FALSE; + + hdc = BeginPaint(hWnd, &ps); + GetClientRect(hWnd, &rcClient); + + /* FIXME: use real margin values */ + rcMargin = rcClient; + rcMargin.left += 5; + rcMargin.top += 5; + rcMargin.right -= 5; + rcMargin.bottom -= 5; + + /* if the space is too small then we make sure to not draw anything */ + rcMargin.left = min(rcMargin.left, rcMargin.right); + rcMargin.top = min(rcMargin.top, rcMargin.bottom); + + if (!CALLPAINTHOOK(WM_PSD_FULLPAGERECT, &rcClient) && + !CALLPAINTHOOK(WM_PSD_MINMARGINRECT, &rcMargin) ) + { /* fill background */ hbrush = GetSysColorBrush(COLOR_3DHIGHLIGHT); FillRect(hdc, &rcClient, hbrush); @@ -2635,6 +2760,7 @@ hpen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW)); holdpen = SelectObject(hdc, hpen); + /* paint left edge */ MoveToEx(hdc, rcClient.left, rcClient.top, NULL); LineTo(hdc, rcClient.left, rcClient.bottom-1); @@ -2654,79 +2780,51 @@ MoveToEx(hdc, rcClient.left, rcClient.bottom-1, NULL); LineTo(hdc, rcClient.right, rcClient.bottom-1); - hpen = CreatePen(PS_DASH, 1, GetSysColor(COLOR_3DSHADOW)); - DeleteObject(SelectObject(hdc, hpen)); + DeleteObject(SelectObject(hdc, holdpen)); + DeleteObject(SelectObject(hdc, holdbrush)); - /* draw dashed rectangle showing margins */ - /* FIXME: use real margin values */ - rcClient.left += 5; - rcClient.top += 5; - rcClient.right -= 5; - rcClient.bottom -= 5; + CALLPAINTHOOK(WM_PSD_MARGINRECT, &rcMargin); - /* if the space is too small then we make sure to not draw anything */ - rcClient.left = min(rcClient.left,rcClient.right); - rcClient.top = min(rcClient.top,rcClient.bottom); - Rectangle(hdc, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); - - DeleteObject(SelectObject(hdc, holdpen)); - - /* draw the fake document */ - /* give text a bit of a space from the frame */ - rcClient.left += 2; - rcClient.top += 2; - rcClient.right -= 2; - rcClient.bottom -= 2; - + rcMargin.left += 2; + rcMargin.top += 2; + rcMargin.right -= 2; + rcMargin.bottom -= 2; + /* if the space is too small then we make sure to not draw anything */ - rcClient.left = min(rcClient.left,rcClient.right); - rcClient.top = min(rcClient.top,rcClient.bottom); + rcMargin.left = min(rcMargin.left, rcMargin.right); + rcMargin.top = min(rcMargin.top, rcMargin.bottom); - /* select a nice scalable font, because we want the text really small */ - SystemParametersInfoW(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0); - lf.lfHeight = 6; /* value chosen based on visual effect */ - hfont = CreateFontIndirectW(&lf); - holdfont = SelectObject(hdc, hfont); + CALLPAINTHOOK(WM_PSD_GREEKTEXTRECT, &rcMargin); + } - /* if text not loaded, then do so now */ - if (wszFakeDocumentText[0] == '\0') - LoadStringW(COMDLG32_hInstance, - IDS_FAKEDOCTEXT, - wszFakeDocumentText, - sizeof(wszFakeDocumentText)/sizeof(wszFakeDocumentText[0])); - - oldbkmode = SetBkMode(hdc, TRANSPARENT); - DrawTextW(hdc, wszFakeDocumentText, -1, &rcClient, DT_TOP|DT_LEFT|DT_NOPREFIX|DT_WORDBREAK); - SetBkMode(hdc, oldbkmode); - - DeleteObject(SelectObject(hdc, holdfont)); - - SelectObject(hdc, holdbrush); - - EndPaint(hWnd, &ps); - return 0; - } - else - return CallWindowProcW(lpfnStaticWndProc, hWnd, uMsg, wParam, lParam); + EndPaint(hWnd, &ps); + return FALSE; +#undef CALLPAINTHOOK } +/********************************************************************** * + * PRINTDLG_PageDlgProcA + * Message handler + */ static INT_PTR CALLBACK -PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { PageSetupDataA *pda; INT_PTR res = FALSE; - if (uMsg==WM_INITDIALOG) { + if (uMsg == WM_INITDIALOG) { + pda = (PageSetupDataA*)lParam; + TRACE("set property to %p", pda); + SetPropA(hDlg, "__WINE_PAGESETUPDLGDATA", pda); + SetPropA(GetDlgItem(hDlg, rct1), "__WINE_PAGESETUPDLGDATA", pda); lpfnStaticWndProc = (WNDPROC)SetWindowLongPtrW( GetDlgItem(hDlg, rct1), GWLP_WNDPROC, - (ULONG_PTR)PagePaintProc); + (ULONG_PTR)PRINTDLG_PagePaintProc); res = TRUE; - pda = (PageSetupDataA*)lParam; - SetPropA(hDlg,"__WINE_PAGESETUPDLGDATA",pda); if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) { res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga); if (!res) { @@ -2734,9 +2832,7 @@ res = TRUE; } } - if (pda->dlga->Flags & PSD_ENABLEPAGEPAINTHOOK) { - FIXME("PagePaintHook not yet implemented!\n"); - } + if (pda->dlga->Flags & PSD_DISABLEPRINTER) EnableWindow(GetDlgItem(hDlg, psh3), FALSE); if (pda->dlga->Flags & PSD_DISABLEMARGINS) { @@ -2886,7 +2982,29 @@ /*********************************************************************** * PageSetupDlgA (COMDLG32.@) + * + * Displays the the PAGE SETUP dialog box, which enables the user to specify + * specific properties of a printed page such as + * size, source, orientation and the width of the page margins. + * + * PARAMS + * setupdlg [in] PAGESETUPDLGA struct + * + * RETURNS + * TRUE if the user pressed the OK button + * FALSE if the user cancelled the window or an error occurred + * + * NOTES + * The values of hDevMode and hDevNames are filled on output and can be + * changed in PAGESETUPDLG when they are passed in PageSetupDlg. + * BUGS + * PrintSetupDlg: + * * The Paper Orientation Icons are not implemented yet. + * * The Properties Button(s) should call DocumentPropertiesA(). + * * Settings are not yet taken from a provided DevMode or + * default printer settings. */ + BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { HGLOBAL hDlgTmpl; LPVOID ptr; @@ -2909,6 +3027,11 @@ setupdlg->hDevNames, setupdlg->hInstance, setupdlg->Flags, flagstr); } + if (setupdlg->Flags & PSD_ENABLEPAGEPAINTHOOK) + if (setupdlg->lpfnPagePaintHook == NULL) { + COMDLG32_SetCommDlgExtendedError(CDERR_NOHOOK); + return FALSE; + } /* First get default printer data, we need it right after that. */ memset(&pdlg,0,sizeof(pdlg)); @@ -2945,7 +3068,7 @@ [truncated at 1000 lines; 17 more skipped]

19 years, 3 months

[gvg] 16472: Sync to Wine-20050628:

by gvg＠svn.reactos.com

Sync to Wine-20050628: Robert Shearman <rob(a)codeweavers.com> - Document how the native lays out the internal components of buttons. - Fix control to follow these rules. - Don't redraw disabled buttons. - Padding is never less that GetSystemMetrics(SM_{CX,CY}EDGE). - Change default iListGap value to 4 to match native. - Fix a regression in IE where the Favourites menu didn't appear correctly because the height and width were swapped in the pager control. Stefan Huehner <stefan(a)huehner.org> - Fix more -Wstrict-prototypes warnings. Mike McCormack <mike(a)codeweavers.com> - Warning fixes for -Wmissing-declarations and -Wwrite-strings. Felix Nawothnig <felix.nawothnig(a)t-online.de> - Fix some missed invalidations after column resize. - Pass the right hwnd to ReleaseDC(). Kouji Sasaki <taro-x(a)justsystem.co.jp> - Added the feature to change row height in owner draw controls. - Added the callback item processing for LISTVIEW_EndEditLabelT function. - Corrected the priority of operators for LISTVIEW_GetNextItem function. Huw Davies <huw(a)codeweavers.com> - For modal propsheets we should run our own message loop rather than use a modal dialogbox just like Windows does. This helps apps that subclass the propsheet's wndproc. Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. James Hawkins <truiken(a)gmail.com> - Audit the Tab control. - Factor out common text shifting logic. - Shift selected tab text up instead of down. Alex Zorach <info(a)suscomputing.com> - Fixed SetFocus behavior. Krzysztof Foltman <wdev(a)foltman.com> - Don't send TVN_SELCHANGING nor TVN_SELCHANGED if the same item is selected again. Modified: trunk/reactos/lib/comctl32/comctl32.h Modified: trunk/reactos/lib/comctl32/commctrl.c Modified: trunk/reactos/lib/comctl32/flatsb.c Modified: trunk/reactos/lib/comctl32/ipaddress.c Modified: trunk/reactos/lib/comctl32/listview.c Modified: trunk/reactos/lib/comctl32/monthcal.c Modified: trunk/reactos/lib/comctl32/pager.c Modified: trunk/reactos/lib/comctl32/propsheet.c Modified: trunk/reactos/lib/comctl32/tab.c Modified: trunk/reactos/lib/comctl32/toolbar.c Modified: trunk/reactos/lib/comctl32/treeview.c Modified: trunk/reactos/lib/comctl32/updown.c _____ Modified: trunk/reactos/lib/comctl32/comctl32.h --- trunk/reactos/lib/comctl32/comctl32.h 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/comctl32.h 2005-07-06 22:33:11 UTC (rev 16472) @@ -191,4 +191,62 @@ LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet); BOOL WINAPI MirrorIcon(HICON *phicon1, HICON *phicon2); +extern void ANIMATE_Register(void); +extern void ANIMATE_Unregister(void); +extern void COMBOEX_Register(void); +extern void COMBOEX_Unregister(void); +extern void DATETIME_Register(void); +extern void DATETIME_Unregister(void); +extern void FLATSB_Register(void); +extern void FLATSB_Unregister(void); +extern void HEADER_Register(void); +extern void HEADER_Unregister(void); +extern void HOTKEY_Register(void); +extern void HOTKEY_Unregister(void); +extern void IPADDRESS_Register(void); +extern void IPADDRESS_Unregister(void); +extern void LISTVIEW_Register(void); +extern void LISTVIEW_Unregister(void); +extern void MONTHCAL_Register(void); +extern void MONTHCAL_Unregister(void); +extern void NATIVEFONT_Register(void); +extern void NATIVEFONT_Unregister(void); +extern void PAGER_Register(void); +extern void PAGER_Unregister(void); +extern void PROGRESS_Register(void); +extern void PROGRESS_Unregister(void); +extern void REBAR_Register(void); +extern void REBAR_Unregister(void); +extern void STATUS_Register(void); +extern void STATUS_Unregister(void); +extern void SYSLINK_Register(void); +extern void SYSLINK_Unregister(void); +extern void TAB_Register(void); +extern void TAB_Unregister(void); +extern void TOOLBAR_Register(void); +extern void TOOLBAR_Unregister(void); +extern void TOOLTIPS_Register(void); +extern void TOOLTIPS_Unregister(void); +extern void TRACKBAR_Register(void); +extern void TRACKBAR_Unregister(void); +extern void TREEVIEW_Register(void); +extern void TREEVIEW_Unregister(void); +extern void UPDOWN_Register(void); +extern void UPDOWN_Unregister(void); + + +int MONTHCAL_MonthLength(int month, int year); + +static inline void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) +{ + to->wYear = from->wYear; + to->wMonth = from->wMonth; + to->wDayOfWeek = from->wDayOfWeek; + to->wDay = from->wDay; + to->wHour = from->wHour; + to->wMinute = from->wMinute; + to->wSecond = from->wSecond; + to->wMilliseconds = from->wMilliseconds; +} + #endif /* __WINE_COMCTL32_H */ _____ Modified: trunk/reactos/lib/comctl32/commctrl.c --- trunk/reactos/lib/comctl32/commctrl.c 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/commctrl.c 2005-07-06 22:33:11 UTC (rev 16472) @@ -73,49 +73,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); -extern void ANIMATE_Register(void); -extern void ANIMATE_Unregister(void); -extern void COMBOEX_Register(void); -extern void COMBOEX_Unregister(void); -extern void DATETIME_Register(void); -extern void DATETIME_Unregister(void); -extern void FLATSB_Register(void); -extern void FLATSB_Unregister(void); -extern void HEADER_Register(void); -extern void HEADER_Unregister(void); -extern void HOTKEY_Register(void); -extern void HOTKEY_Unregister(void); -extern void IPADDRESS_Register(void); -extern void IPADDRESS_Unregister(void); -extern void LISTVIEW_Register(void); -extern void LISTVIEW_Unregister(void); -extern void MONTHCAL_Register(void); -extern void MONTHCAL_Unregister(void); -extern void NATIVEFONT_Register(void); -extern void NATIVEFONT_Unregister(void); -extern void PAGER_Register(void); -extern void PAGER_Unregister(void); -extern void PROGRESS_Register(void); -extern void PROGRESS_Unregister(void); -extern void REBAR_Register(void); -extern void REBAR_Unregister(void); -extern void STATUS_Register(void); -extern void STATUS_Unregister(void); -extern void SYSLINK_Register(void); -extern void SYSLINK_Unregister(void); -extern void TAB_Register(void); -extern void TAB_Unregister(void); -extern void TOOLBAR_Register(void); -extern void TOOLBAR_Unregister(void); -extern void TOOLTIPS_Register(void); -extern void TOOLTIPS_Unregister(void); -extern void TRACKBAR_Register(void); -extern void TRACKBAR_Unregister(void); -extern void TREEVIEW_Register(void); -extern void TREEVIEW_Unregister(void); -extern void UPDOWN_Register(void); -extern void UPDOWN_Unregister(void); - LRESULT WINAPI COMCTL32_SubclassProc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LPWSTR COMCTL32_wSubclass = NULL; _____ Modified: trunk/reactos/lib/comctl32/flatsb.c --- trunk/reactos/lib/comctl32/flatsb.c 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/flatsb.c 2005-07-06 22:33:11 UTC (rev 16472) @@ -36,6 +36,7 @@ #include "winerror.h" #include "winuser.h" #include "commctrl.h" +#include "comctl32.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(commctrl); _____ Modified: trunk/reactos/lib/comctl32/ipaddress.c --- trunk/reactos/lib/comctl32/ipaddress.c 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/ipaddress.c 2005-07-06 22:33:11 UTC (rev 16472) @@ -346,11 +346,7 @@ { TRACE("(index=%d)\n", index); - if (index > 3) { - for (index = 0; index < 4; index++) - if (!GetWindowTextLengthW(infoPtr->Part[index].EditHwnd)) break; - } - if (index < 9 || index > 3) index = 0; + if (index > 3 || index < 0) index=0; SetFocus (infoPtr->Part[index].EditHwnd); } _____ Modified: trunk/reactos/lib/comctl32/listview.c --- trunk/reactos/lib/comctl32/listview.c 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/listview.c 2005-07-06 22:33:11 UTC (rev 16472) @@ -277,7 +277,8 @@ HFONT hDefaultFont; HFONT hFont; INT ntmHeight; /* Some cached metrics of the font used */ - INT ntmAveCharWidth; /* by the listview to draw items */ + INT ntmMaxCharWidth; /* by the listview to draw items */ + INT nEllipsisWidth; BOOL bRedraw; /* Turns on/off repaints & invalidations */ BOOL bAutoarrange; /* Autoarrange flag when NOT in LVS_AUTOARRANGE */ BOOL bFocus; @@ -307,6 +308,7 @@ INT nSearchParamLength; WCHAR szSearchParam[ MAX_PATH ]; BOOL bIsDrawing; + INT nMeasureItemHeight; } LISTVIEW_INFO; /* @@ -548,7 +550,7 @@ return isW ? debugstr_wn(text, n) : debugstr_an((LPCSTR)text, n); } -static char* debug_getbuf() +static char* debug_getbuf(void) { static int index = 0; static char buffers[DEBUG_BUFFERS][DEBUG_BUFFER_SIZE]; @@ -2454,6 +2456,8 @@ nItemHeight = max(nItemHeight, infoPtr->iconSize.cy); if (infoPtr->himlState || infoPtr->himlSmall) nItemHeight += HEIGHT_PADDING; + if (infoPtr->nMeasureItemHeight > 0) + nItemHeight = infoPtr->nMeasureItemHeight; } return max(nItemHeight, 1); @@ -2491,12 +2495,17 @@ HFONT hFont = infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont; HFONT hOldFont = SelectObject(hdc, hFont); TEXTMETRICW tm; + SIZE sz; if (GetTextMetricsW(hdc, &tm)) { infoPtr->ntmHeight = tm.tmHeight; - infoPtr->ntmAveCharWidth = tm.tmAveCharWidth; + infoPtr->ntmMaxCharWidth = tm.tmMaxCharWidth; } + + if (GetTextExtentPoint32A(hdc, "...", 3, &sz)) + infoPtr->nEllipsisWidth = sz.cx; + SelectObject(hdc, hOldFont); ReleaseDC(infoPtr->hwndSelf, hdc); @@ -4268,6 +4277,7 @@ { COLUMN_INFO *lpColumnInfo; RECT rcOld, rcCol; + POINT ptOrigin; INT nCol; if (nColumn < 0 || DPA_GetPtrCount(infoPtr->hdpaColumns) < 1) return; @@ -4294,10 +4304,11 @@ infoPtr->nItemWidth += dx; LISTVIEW_UpdateScroll(infoPtr); + LISTVIEW_GetOrigin(infoPtr, &ptOrigin); /* scroll to cover the deleted column, and invalidate for redraw */ rcOld = infoPtr->rcList; - rcOld.left = rcCol.left; + rcOld.left = ptOrigin.x + rcCol.left + dx; ScrollWindowEx(infoPtr->hwndSelf, dx, 0, &rcOld, &rcOld, 0, 0, SW_ERASE | SW_INVALIDATE); /* we can restore focus now */ @@ -4562,6 +4573,17 @@ if (!notify_dispinfoT(infoPtr, LVN_ENDLABELEDITW, &dispInfo, isW)) return FALSE; if (!pszText) return TRUE; + if (!(infoPtr->dwStyle & LVS_OWNERDATA)) + { + HDPA hdpaSubItems = (HDPA)DPA_GetPtr(infoPtr->hdpaItems, infoPtr->nEditLabelItem); + ITEM_INFO* lpItem = (ITEM_INFO *)DPA_GetPtr(hdpaSubItems, 0); + if (lpItem && lpItem->hdr.pszText == LPSTR_TEXTCALLBACKW) + { + LISTVIEW_InvalidateItem(infoPtr, infoPtr->nEditLabelItem); + return TRUE; + } + } + ZeroMemory(&dispInfo, sizeof(dispInfo)); dispInfo.item.mask = LVIF_TEXT; dispInfo.item.iItem = infoPtr->nEditLabelItem; @@ -5738,7 +5760,7 @@ * so it's worth optimizing */ if (uFlags & LVNI_FOCUSED) { - if (!(LISTVIEW_GetItemState(infoPtr, infoPtr->nFocusedItem, uMask) & uMask) == uMask) return -1; + if ((LISTVIEW_GetItemState(infoPtr, infoPtr->nFocusedItem, uMask) & uMask) != uMask) return -1; return (infoPtr->nFocusedItem == nItem) ? -1 : infoPtr->nFocusedItem; } @@ -6906,7 +6928,7 @@ return oldspacing; } -inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) +static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) { INT cx, cy; @@ -7500,6 +7522,7 @@ infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING); infoPtr->nEditLabelItem = -1; infoPtr->dwHoverTime = -1; /* default system hover time */ + infoPtr->nMeasureItemHeight = 0; /* get default font (icon title) */ SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); @@ -8275,21 +8298,27 @@ dx = cxy - (lpColumnInfo->rcHeader.right - lpColumnInfo->rcHeader.left); if (dx != 0) { - RECT rcCol = lpColumnInfo->rcHeader; - lpColumnInfo->rcHeader.right += dx; LISTVIEW_ScrollColumns(infoPtr, lpnmh->iItem + 1, dx); LISTVIEW_UpdateItemSize(infoPtr); if (uView == LVS_REPORT && is_redrawing(infoPtr)) { - /* this trick works for left aligned columns only */ + POINT ptOrigin; + RECT rcCol = lpColumnInfo->rcHeader; + + LISTVIEW_GetOrigin(infoPtr, &ptOrigin); + OffsetRect(&rcCol, ptOrigin.x, 0); + + rcCol.top = infoPtr->rcList.top; + rcCol.bottom = infoPtr->rcList.bottom; + + /* resizing left-aligned columns leaves most of the left side untouched */ if ((lpColumnInfo->fmt & LVCFMT_JUSTIFYMASK) == LVCFMT_LEFT) { - rcCol.right = min (rcCol.right, lpColumnInfo->rcHeader.right); - rcCol.left = max (rcCol.left, rcCol.right - 3 * infoPtr->ntmAveCharWidth); + INT nMaxDirty = infoPtr->nEllipsisWidth + infoPtr->ntmMaxCharWidth + dx; + rcCol.left = max (rcCol.left, rcCol.right - nMaxDirty); } - rcCol.top = infoPtr->rcList.top; - rcCol.bottom = infoPtr->rcList.bottom; + LISTVIEW_InvalidateRect(infoPtr, &rcCol); } } @@ -9314,8 +9343,24 @@ case WM_WINDOWPOSCHANGED: if (!(((WINDOWPOS *)lParam)->flags & SWP_NOSIZE)) { + UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; SetWindowPos(infoPtr->hwndSelf, 0, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE); + + if ((infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (uView == LVS_REPORT)) + { + MEASUREITEMSTRUCT mis; + mis.CtlType = ODT_LISTVIEW; + mis.CtlID = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); + mis.itemID = -1; + mis.itemWidth = 0; + mis.itemData = 0; + mis.itemHeight= infoPtr->nItemHeight; + SendMessageW(infoPtr->hwndNotify, WM_MEASUREITEM, mis.CtlID, (LPARAM)&mis); + if (infoPtr->nItemHeight != max(mis.itemHeight, 1)) + infoPtr->nMeasureItemHeight = infoPtr->nItemHeight = max(mis.itemHeight, 1); + } + LISTVIEW_UpdateSize(infoPtr); LISTVIEW_UpdateScroll(infoPtr); } @@ -9433,7 +9478,7 @@ if(hFont != 0) SelectObject(hdc, hOldFont); - ReleaseDC(infoPtr->hwndSelf, hdc); + ReleaseDC(infoPtr->hwndEdit, hdc); break; } _____ Modified: trunk/reactos/lib/comctl32/monthcal.c --- trunk/reactos/lib/comctl32/monthcal.c 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/monthcal.c 2005-07-06 22:33:11 UTC (rev 16472) @@ -134,7 +134,7 @@ /* january is 1, december is 12 */ int MONTHCAL_MonthLength(int month, int year) { -const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0}; + const int mdays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0}; /*Wrap around, this eases handling*/ if(month == 0) month = 12; @@ -170,19 +170,6 @@ } -void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) -{ - to->wYear = from->wYear; - to->wMonth = from->wMonth; - to->wDayOfWeek = from->wDayOfWeek; - to->wDay = from->wDay; - to->wHour = from->wHour; - to->wMinute = from->wMinute; - to->wSecond = from->wSecond; - to->wMilliseconds = from->wMilliseconds; -} - - /* Note:Depending on DST, this may be offset by a day. Need to find out if we're on a DST place & adjust the clock accordingly. Above function assumes we have a valid data. @@ -212,7 +199,7 @@ GetClientRect(infoPtr->hwndSelf, &rcClient); /* if the point is outside the x bounds of the window put - it at the boundry */ + it at the boundary */ if (x > rcClient.right) x = rcClient.right; _____ Modified: trunk/reactos/lib/comctl32/pager.c --- trunk/reactos/lib/comctl32/pager.c 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/pager.c 2005-07-06 22:33:11 UTC (rev 16472) @@ -1227,9 +1227,9 @@ TRACE("[%p] %d,%d\n", infoPtr->hwndSelf, x, y); if (infoPtr->dwStyle & PGS_HORZ) - infoPtr->nHeight = x; + infoPtr->nHeight = y; else - infoPtr->nWidth = y; + infoPtr->nWidth = x; return PAGER_RecalcSize(infoPtr); } _____ Modified: trunk/reactos/lib/comctl32/propsheet.c --- trunk/reactos/lib/comctl32/propsheet.c 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/propsheet.c 2005-07-06 22:33:11 UTC (rev 16472) @@ -131,6 +131,7 @@ int width; int height; HIMAGELIST hImageList; + BOOL ended; } PropSheetInfo; typedef struct @@ -296,7 +297,7 @@ * * Find page index corresponding to page resource id. */ -INT PROPSHEET_FindPageByResId(PropSheetInfo * psInfo, LRESULT resId) +static INT PROPSHEET_FindPageByResId(PropSheetInfo * psInfo, LRESULT resId) { INT i; @@ -707,39 +708,21 @@ * -1 (error). */ if( psInfo->unicode ) { - if (!(psInfo->ppshheader.dwFlags & PSH_MODELESS)) - ret = DialogBoxIndirectParamW(psInfo->ppshheader.hInstance, - (LPDLGTEMPLATEW) temp, - psInfo->ppshheader.hwndParent, - PROPSHEET_DialogProc, - (LPARAM)psInfo); - else - { - ret = (int)CreateDialogIndirectParamW(psInfo->ppshheader.hInstance, - (LPDLGTEMPLATEW) temp, - psInfo->ppshheader.hwndParent, - PROPSHEET_DialogProc, - (LPARAM)psInfo); - if ( !ret ) ret = -1; - } + ret = (int)CreateDialogIndirectParamW(psInfo->ppshheader.hInstance, + (LPDLGTEMPLATEW) temp, + psInfo->ppshheader.hwndParent, + PROPSHEET_DialogProc, + (LPARAM)psInfo); + if ( !ret ) ret = -1; } else { - if (!(psInfo->ppshheader.dwFlags & PSH_MODELESS)) - ret = DialogBoxIndirectParamA(psInfo->ppshheader.hInstance, - (LPDLGTEMPLATEA) temp, - psInfo->ppshheader.hwndParent, - PROPSHEET_DialogProc, - (LPARAM)psInfo); - else - { - ret = (int)CreateDialogIndirectParamA(psInfo->ppshheader.hInstance, - (LPDLGTEMPLATEA) temp, - psInfo->ppshheader.hwndParent, - PROPSHEET_DialogProc, - (LPARAM)psInfo); - if ( !ret ) ret = -1; - } + ret = (int)CreateDialogIndirectParamA(psInfo->ppshheader.hInstance, + (LPDLGTEMPLATEA) temp, + psInfo->ppshheader.hwndParent, + PROPSHEET_DialogProc, + (LPARAM)psInfo); + if ( !ret ) ret = -1; } Free(temp); @@ -1265,7 +1248,7 @@ * Subclassing window procedure for wizard extrior pages to prevent drawing * background and so drawing above the watermark. */ -LRESULT CALLBACK +static LRESULT CALLBACK PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uID, DWORD_PTR dwRef) { switch (uMsg) @@ -1757,7 +1740,7 @@ if (psInfo->isModeless) psInfo->activeValid = FALSE; else - EndDialog(hwndDlg, TRUE); + psInfo->ended = TRUE; return TRUE; } @@ -1870,7 +1853,7 @@ psInfo->activeValid = FALSE; } else - EndDialog(hwndDlg, FALSE); + psInfo->ended = TRUE; } /*********************************************************************** ******* @@ -2396,7 +2379,7 @@ psInfo->active_page = -1; if (!psInfo->isModeless) { - EndDialog(hwndDlg, FALSE); + psInfo->ended = TRUE; return TRUE; } } @@ -2737,6 +2720,34 @@ GlobalFree((HGLOBAL)psInfo); } +static INT do_loop(PropSheetInfo *psInfo) +{ + MSG msg; + INT ret = -1; + HWND hwnd = psInfo->hwnd; + + while(IsWindow(hwnd) && !psInfo->ended && (ret = GetMessageW(&msg, NULL, 0, 0))) + { + if(ret == -1) + break; + + if(!IsDialogMessageW(hwnd, &msg)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + + if(ret == 0) + { + PostQuitMessage(msg.wParam); + ret = -1; + } + + DestroyWindow(hwnd); + return ret; +} + /*********************************************************************** ******* * PropertySheet (COMCTL32.@) * PropertySheetA (COMCTL32.@) @@ -2787,7 +2798,11 @@ } psInfo->unicode = FALSE; + psInfo->ended = FALSE; + bRet = PROPSHEET_CreateDialog(psInfo); + if(!psInfo->isModeless) + bRet = do_loop(psInfo); return bRet; } @@ -2834,7 +2849,11 @@ } psInfo->unicode = TRUE; + psInfo->ended = FALSE; + bRet = PROPSHEET_CreateDialog(psInfo); + if(!psInfo->isModeless) + bRet = do_loop(psInfo); return bRet; } @@ -3039,7 +3058,7 @@ if (psInfo->isModeless) psInfo->activeValid = FALSE; else - EndDialog(hwnd, result); + psInfo->ended = TRUE; } else EnableWindow(hwndApplyBtn, FALSE); @@ -3424,6 +3443,17 @@ } return TRUE; + case WM_SYSCOMMAND: + switch(wParam & 0xfff0) + { + case SC_CLOSE: + PROPSHEET_Cancel(hwnd, 1); + return TRUE; + + default: + return FALSE; + } + case WM_NOTIFY: { NMHDR* pnmh = (LPNMHDR) lParam; _____ Modified: trunk/reactos/lib/comctl32/tab.c --- trunk/reactos/lib/comctl32/tab.c 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/tab.c 2005-07-06 22:33:11 UTC (rev 16472) @@ -20,17 +20,47 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * NOTES + * + * This code was audited for completeness against the documented features + * of Comctl32.dll version 6.0 on May. 20, 2005, by James Hawkins. + * + * Unless otherwise noted, we believe this code to be complete, as per + * the specification mentioned above. + * If you discover missing features, or bugs, please note them below. + * * TODO: * * Styles: + * TCS_MULTISELECT + * TCS_RIGHT + * TCS_RIGHTJUSTIFY + * TCS_SCROLLOPPOSITE + * TCS_SINGLELINE * TCIF_RTLREADING * + * Extended Styles: + * TCS_EX_FLATSEPARATORS + * TCS_EX_REGISTERDROP + * + * States: + * TCIS_BUTTONPRESSED + * + * Notifications: + * NM_RELEASEDCAPTURE + * TCN_FOCUSCHANGE + * TCN_GETOBJECT + * TCN_KEYDOWN + * * Messages: * TCM_REMOVEIMAGE * TCM_DESELECTALL * TCM_GETEXTENDEDSTYLE * TCM_SETEXTENDEDSTYLE * + * Macros: + * TabCtrl_AdjustRect + * */ #include <stdarg.h> @@ -1727,14 +1757,20 @@ else drawRect->bottom-=center_offset_h; - center_offset_v = ((drawRect->right - drawRect->left) - (rcText.bottom - rcText.top) + infoPtr->uVItemPadding) / 2; + center_offset_v = ((drawRect->right - drawRect->left) - (rcText.bottom - rcText.top)) / 2; } else { drawRect->left += center_offset_h; - center_offset_v = ((drawRect->bottom - drawRect->top) - (rcText.bottom - rcText.top) + infoPtr->uVItemPadding) / 2; + center_offset_v = ((drawRect->bottom - drawRect->top) - (rcText.bottom - rcText.top)) / 2; } + /* if an item is selected, the text is shifted up instead of down */ + if (iItem == infoPtr->iSelected) + center_offset_v -= infoPtr->uVItemPadding / 2; + else + center_offset_v += infoPtr->uVItemPadding / 2; + if (center_offset_v < 0) center_offset_v = 0; _____ Modified: trunk/reactos/lib/comctl32/toolbar.c --- trunk/reactos/lib/comctl32/toolbar.c 2005-07-06 22:24:04 UTC (rev 16471) +++ trunk/reactos/lib/comctl32/toolbar.c 2005-07-06 22:33:11 UTC (rev 16472) @@ -211,12 +211,13 @@ #define DEFPAD_CX 7 #define DEFPAD_CY 6 +#define DEFLISTGAP 4 -/* gap between border of button and text/image */ -#define OFFSET_X 1 -#define OFFSET_Y 1 +/* vertical padding used in list mode when image is present */ +#define LISTPAD_CY 9 + /* how wide to treat the bitmap if it isn't present */ -#define LIST_IMAGE_ABSENT_WIDTH 2 +#define NONLIST_NOTEXT_OFFSET 2 #define TOOLBAR_NOWHERE (-1) @@ -224,11 +225,6 @@ #define TOOLBAR_HasText(x, y) (TOOLBAR_GetText(x, y) ? TRUE : FALSE) #define TOOLBAR_HasDropDownArrows(exStyle) ((exStyle & TBSTYLE_EX_DRAWDDARROWS) ? TRUE : FALSE) -static inline int TOOLBAR_GetListTextOffset(TOOLBAR_INFO *infoPtr, INT iListGap) -{ - return GetSystemMetrics(SM_CXEDGE) + iListGap - infoPtr->szPadding.cx/2; -} - /* Used to find undocumented extended styles */ #define TBSTYLE_EX_ALL (TBSTYLE_EX_DRAWDDARROWS | \ TBSTYLE_EX_UNDOC1 | \ @@ -396,6 +392,14 @@ } +static inline BOOL +TOOLBAR_IsValidImageList(TOOLBAR_INFO *infoPtr, INT index) +{ + HIMAGELIST himl = GETDEFIMAGELIST(infoPtr, GETHIMLID(infoPtr, index)); + return (himl != NULL) && (ImageList_GetImageCount(himl) > 0); +} + + /*********************************************************************** * TOOLBAR_GetImageListForDrawing * @@ -445,37 +449,6 @@ } -/********************************************************************** * -* TOOLBAR_TestImageExist -* -* This function is similar to TOOLBAR_GetImageListForDrawing, except it does not -* return the image list. The I_IMAGECALLBACK functionality is implemented. -*/ -static BOOL -TOOLBAR_TestImageExist (TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HIMAGELIST himl) -{ - INT index; - - if (!himl) return FALSE; - - if (!TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) { - if (btnPtr->iBitmap == I_IMAGENONE) return FALSE; - ERR("index %d is not valid, max %d\n", - btnPtr->iBitmap, infoPtr->nNumBitmaps); - return FALSE; - } - - if ((index = TOOLBAR_GetBitmapIndex(infoPtr, btnPtr)) < 0) { - if ((index == I_IMAGECALLBACK) || - (index == I_IMAGENONE)) return FALSE; - ERR("TBN_GETDISPINFO returned invalid index %d\n", - index); - return FALSE; - } - return TRUE; -} - - static void TOOLBAR_DrawFlatSeparator (LPRECT lpRect, HDC hdc, TOOLBAR_INFO *infoPtr) { @@ -755,7 +728,7 @@ /* draws a blank frame for a toolbar button */ static void -TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, BOOL flat, const NMTBCUSTOMDRAW *tbcd) +TOOLBAR_DrawFrame(const TOOLBAR_INFO *infoPtr, const NMTBCUSTOMDRAW *tbcd) { HDC hdc = tbcd->nmcd.hdc; RECT rc = tbcd->nmcd.rc; @@ -771,7 +744,7 @@ if (infoPtr->dwItemCDFlag & TBCDRF_NOEDGES) return; - if (flat) + if (infoPtr->dwStyle & TBSTYLE_FLAT) { if (pressed_look) DrawEdge (hdc, &rc, BDR_SUNKENOUTER, BF_RECT); @@ -845,7 +818,6 @@ rc = btnPtr->rect; CopyRect (&rcArrow, &rc); - CopyRect(&rcBitmap, &rc); /* get a pointer to the text */ lpText = TOOLBAR_GetText(infoPtr, btnPtr); @@ -865,47 +837,51 @@ rcArrow.left = right; } - /* copy text rect after adjusting for drop-down arrow - * so that text is centred in the rectangle not containing + /* copy text & bitmap rects after adjusting for drop-down arrow + * so that text & bitmap is centred in the rectangle not containing * the arrow */ CopyRect(&rcText, &rc); + CopyRect(&rcBitmap, &rc); /* Center the bitmap horizontally and vertically */ if (dwStyle & TBSTYLE_LIST) - rcBitmap.left += GetSystemMetrics(SM_CXEDGE); + { + if (lpText && + infoPtr->nMaxTextRows > 0 && + (!(infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || + (btnPtr->fsStyle & BTNS_SHOWTEXT)) ) + rcBitmap.left += GetSystemMetrics(SM_CXEDGE) + infoPtr->szPadding.cx / 2; + else + rcBitmap.left += GetSystemMetrics(SM_CXEDGE) + infoPtr->iListGap / 2; + } else - rcBitmap.left+=(infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2; + rcBitmap.left += (infoPtr->nButtonWidth - infoPtr->nBitmapWidth) / 2; - if(lpText) - rcBitmap.top+= GetSystemMetrics(SM_CYEDGE); - else - rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2; + rcBitmap.top += infoPtr->szPadding.cy / 2; - TRACE("iBitmap: %d, start=(%ld,%ld) w=%d, h=%d\n", + TRACE("iBitmap=%d, start=(%ld,%ld) w=%d, h=%d\n", btnPtr->iBitmap, rcBitmap.left, rcBitmap.top, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight); - TRACE ("iString: %x\n", btnPtr->iString); - TRACE ("Stringtext: %s\n", debugstr_w(lpText)); + TRACE("Text=%s\n", debugstr_w(lpText)); + TRACE("iListGap=%d, padding = { %ld, %ld }\n", infoPtr->iListGap, infoPtr->szPadding.cx, infoPtr->szPadding.cy); - /* draw text */ - if (lpText) { - rcText.left += GetSystemMetrics(SM_CXEDGE) + OFFSET_X; - rcText.right -= GetSystemMetrics(SM_CXEDGE) + OFFSET_X; - if (GETDEFIMAGELIST(infoPtr, GETHIMLID(infoPtr,btnPtr->iBitmap)) && - TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) + /* calculate text position */ + if (lpText) + { + rcText.left += GetSystemMetrics(SM_CXEDGE); + rcText.right -= GetSystemMetrics(SM_CXEDGE); + if (dwStyle & TBSTYLE_LIST) { - if (dwStyle & TBSTYLE_LIST) - rcText.left += infoPtr->nBitmapWidth + TOOLBAR_GetListTextOffset(infoPtr, infoPtr->iListGap); + if (TOOLBAR_IsValidBitmapIndex(infoPtr,btnPtr->iBitmap)) + rcText.left += infoPtr->nBitmapWidth + infoPtr->iListGap + 2; + } + else + { + if (ImageList_GetImageCount(GETDEFIMAGELIST(infoPtr, 0)) > 0) + rcText.top += infoPtr->szPadding.cy/2 + infoPtr->nBitmapHeight + 1; else - rcText.top += GetSystemMetrics(SM_CYEDGE) + OFFSET_Y + infoPtr->nBitmapHeight + infoPtr->szPadding.cy/2; + rcText.top += infoPtr->szPadding.cy/2 + 2; } - else - if (dwStyle & TBSTYLE_LIST) - rcText.left += LIST_IMAGE_ABSENT_WIDTH + TOOLBAR_GetListTextOffset(infoPtr, infoPtr->iListGap); - - if (!(infoPtr->dwItemCDFlag & TBCDRF_NOOFFSET) && - (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED))) - OffsetRect(&rcText, 1, 1); } /* Initialize fields in all cases, because we use these later @@ -980,6 +956,10 @@ goto FINALNOTIFY; } + if (!(infoPtr->dwItemCDFlag & TBCDRF_NOOFFSET) && + (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED))) + OffsetRect(&rcText, 1, 1); + if (!(tbcd.nmcd.uItemState & CDIS_HOT) && ((tbcd.nmcd.uItemState & CDIS_CHECKED) || (tbcd.nmcd.uItemState & CDIS_INDETERMINATE))) TOOLBAR_DrawPattern (&rc, &tbcd); @@ -998,7 +978,7 @@ } } - TOOLBAR_DrawFrame(infoPtr, dwStyle & TBSTYLE_FLAT, &tbcd); + TOOLBAR_DrawFrame(infoPtr, &tbcd); if (drawSepDropDownArrow) TOOLBAR_DrawSepDDArrow(infoPtr, &tbcd, &rcArrow, btnPtr->bDropDownPressed); @@ -1398,6 +1378,166 @@ /*********************************************************************** +* TOOLBAR_MeasureButton +* +* Calculates the width and height required for a button. Used in +* TOOLBAR_CalcToolbar to set the all-button width and height and also for +* the width of buttons that are autosized. +* +* Note that it would have been rather elegant to use one piece of code for +* both the laying out of the toolbar and for controlling where button parts +* are drawn, but the native control has inconsistencies between the two that +* prevent this from being effectively. These inconsistencies can be seen as +* artefacts where parts of the button appear outside of the bounding button +* rectangle. +* +* There are several cases for the calculation of the button dimensions and +* button part positioning: +* +* List +* ==== +* +* With Bitmap: +* +* +--------------------------------------------------------+ ^ +* | ^ ^ | | +* | | pad.cy / 2 | centred | | +* | pad.cx/2 + cxedge +--------------+ +------------+ | | DEFPAD_CY + +* |<----------------->| nBitmapWidth | | Text | | | max(nBitmapHeight, szText.cy) +* | |<------------>| | | | | +* | +--------------+ +------------+ | | +* |<-------------------------------------->| | | +* | cxedge + iListGap + nBitmapWidth + 2 |<-----------> | | +* | szText.cx | | +* +--------------------------------------------------------+ - +* <--------------------------------------------------------> +* 2*cxedge + nBitmapWidth + iListGap + szText.cx + pad.cx +* +* Without Bitmap (I_IMAGENONE): +* +* +-----------------------------------+ ^ +* | ^ | | +* | | centred | | LISTPAD_CY + +* | +------------+ | | szText.cy +* | | Text | | | +* | | | | | +* | +------------+ | | +* |<----------------->| | | +* | cxedge |<-----------> | | +* | szText.cx | | +* +-----------------------------------+ - +* <-----------------------------------> +* szText.cx + pad.cx +* +* Without text: +* +* +--------------------------------------+ ^ +* | ^ | | +* | | padding.cy/2 | | DEFPAD_CY + +* | +------------+ | | nBitmapHeight +* | | Bitmap | | | +* | | | | | +* | +------------+ | | +* |<------------------->| | | +* | cxedge + iListGap/2 |<-----------> | | +* | nBitmapWidth | | +* +--------------------------------------+ - +* <--------------------------------------> +* 2*cxedge + nBitmapWidth + iListGap +* +* Non-List +* ======== +* +* With bitmap: +* +* +-----------------------------------+ ^ +* | ^ | | +* | | pad.cy / 2 | | nBitmapHeight + +* | - | | szText.cy + +* | +------------+ | | DEFPAD_CY + 1 +* | centred | Bitmap | | | +* |<----------------->| | | | +* | +------------+ | | +* | ^ | | +* | 1 | | | +* | - | | +* | centred +---------------+ | | +* |<--------------->| Text | | | +* | +---------------+ | | +* +-----------------------------------+ - +* <-----------------------------------> +* pad.cx + max(nBitmapWidth, szText.cx) +* +* Without bitmaps (NULL imagelist or ImageList_GetImageCount() = 0): +* +* +---------------------------------------+ ^ +* | ^ | | +* | | 2 + pad.cy / 2 | | +* | - | | szText.cy + +* | centred +-----------------+ | | pad.cy + 2 +* |<--------------->| Text | | | +* | +-----------------+ | | +* | | | +* +---------------------------------------+ - +* <---------------------------------------> +* 2*cxedge + pad.cx + szText.cx +* +* Without text: +* As for with bitmaps, but with szText.cx zero. +*/ +static inline SIZE TOOLBAR_MeasureButton(TOOLBAR_INFO *infoPtr, SIZE sizeString, BOOL bHasBitmap, BOOL bValidImageList) +{ + SIZE sizeButton; + if (infoPtr->dwStyle & TBSTYLE_LIST) + { + /* set button height from bitmap / text height... */ [truncated at 1000 lines; 234 more skipped]

19 years, 3 months

← Newer
1
...
42
43
44
45
46
47
48
...
57
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005