Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[janderwald] 35153: * halfplement fonts shell folder * fix registration of nethood shell folder and printer shell folder - displaying is if'd out currently

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Aug 6 20:02:34 2008 New Revision: 35153 URL: http://svn.reactos.org/svn/reactos?rev=35153&view=rev Log: * halfplement fonts shell folder * fix registration of nethood shell folder and printer shell folder - displaying is if'd out currently Added: trunk/reactos/dll/win32/shell32/shfldr_fonts.c (with props) Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/pidl.c trunk/reactos/dll/win32/shell32/pidl.h trunk/reactos/dll/win32/shell32/regsvr.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_main.h trunk/reactos/dll/win32/shell32/shellole.c trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -714,8 +714,11 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END - - - - + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END + + + + Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -710,4 +710,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -712,4 +712,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -712,4 +712,7 @@ IDS_PREVIEW_VERB "Vorschau" IDS_FILE_FOLDER "%u Dateien, %u Ordner" -END + IDS_PRINTERS "Drucker" + IDS_FONTS "Schriftarten" + IDS_INSTALLNEWFONT "Neue Schriftart installieren..." +END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -712,4 +712,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -713,4 +713,7 @@ IDS_PREVIEW_VERB "Vista previa" IDS_FILE_FOLDER "%u Archivos, %u Carpetas" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -715,4 +715,7 @@ IDS_PREVIEW_VERB "Apercevoir" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -714,4 +714,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -712,4 +712,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -679,4 +679,17 @@ IDS_INI_FILE "Konfigurasjon innstilling" IDS_LNK_FILE "Snarvei" IDS_SYS_FILE "Systemfil" -END + + IDS_OPEN_VERB "Open" + IDS_RUNAS_VERB "Run as " + IDS_EDIT_VERB "Edit" + IDS_FIND_VERB "Find" + IDS_PRINT_VERB "Print" + IDS_PLAY_VERB "Play" + IDS_PREVIEW_VERB "Preview" + + IDS_FILE_FOLDER "%u Files, %u Folders" + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -717,4 +717,7 @@ IDS_PREVIEW_VERB "Podgl¹d" IDS_FILE_FOLDER "%u Plików, %u Katalogów" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -713,4 +713,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -713,4 +713,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -709,4 +709,7 @@ IDS_PREVIEW_VERB "Ïðåäïðîñìîòð" IDS_FILE_FOLDER "%u ôàéëîâ, %u ïàïîê" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -717,4 +717,7 @@ IDS_PREVIEW_VERB "Preview" //Náh¾ad, Ukáka, Prezrie ??? IDS_FILE_FOLDER "súbory: %u, prieèinky: %u" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -711,4 +711,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -712,4 +712,7 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -699,5 +699,8 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" -END - + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." +END + Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -712,6 +712,9 @@ IDS_PREVIEW_VERB "Preview" IDS_FILE_FOLDER "%u Files, %u Folders" + IDS_PRINTERS "Printers" + IDS_FONTS "Fonts" + IDS_INSTALLNEWFONT "Install New Font..." END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/pidl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.c?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.c [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -1643,6 +1643,11 @@ return _ILCreateGuid(PT_GUID, &CLSID_NetworkPlaces); } +LPITEMIDLIST _ILCreateFont(void) +{ + + return _ILCreateGuid(PT_GUID, &CLSID_FontsFolderShortcut); +} BOOL _ILIsMyComputer(LPCITEMIDLIST pidl) { Modified: trunk/reactos/dll/win32/shell32/pidl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/pidl.h?r… ============================================================================== --- trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/pidl.h [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -255,7 +255,8 @@ LPITEMIDLIST _ILCreateControlPanel (void); LPITEMIDLIST _ILCreatePrinters (void); LPITEMIDLIST _ILCreateNetwork (void); -LPITEMIDLIST _ILCreateNetHood (void); +LPITEMIDLIST _ILCreateNetHood (void); +LPITEMIDLIST _ILCreateFont (void); LPITEMIDLIST _ILCreateBitBucket (void); LPITEMIDLIST _ILCreateDrive (LPCWSTR); Modified: trunk/reactos/dll/win32/shell32/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/regsvr.c… ============================================================================== --- trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/regsvr.c [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -602,24 +602,49 @@ }, { &CLSID_Printers, "Printers & Fax", - 0, + IDS_PRINTERS, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES, + SFGAO_FOLDER, + 0, + NULL, + NULL, + IDI_SHELL_PRINTER + }, + { &CLSID_MyComputer, + "My Computer", + IDS_MYCOMPUTER, NULL, "shell32.dll", "Apartment" }, - { &CLSID_MyComputer, - "My Computer", - IDS_MYCOMPUTER, - NULL, - "shell32.dll", - "Apartment" - }, { &CLSID_NetworkPlaces, - "My Network Places", - IDS_NETWORKPLACE, - NULL, - "shell32.dll", - "Apartment" + "My Network Places", + IDS_NETWORKPLACE, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES, + SFGAO_FOLDER, + 0, + NULL, + NULL, + IDI_SHELL_MY_NETWORK_PLACES + }, + { &CLSID_FontsFolderShortcut, + "Fonts", + IDS_FONTS, + NULL, + "shell32.dll", + "Apartment", + SHELLFOLDER_ATTRIBUTES|SHELLFOLDER_WANTSFORPARSING|SHELLFOLDER_CALLFORATTRIBUTES, + SFGAO_FOLDER, + 0, + NULL, + NULL, + IDI_SHELL_FONTS_FOLDER }, { &CLSID_Shortcut, "Shortcut", @@ -731,6 +756,8 @@ static const WCHAR wszControlPanel[] = { 'C','o','n','t','r','o','l','P','a','n','e','l',0 }; static const WCHAR wszFolderOptions[] = { 'F','o','l','d','e','r',' ','O','p','t','i','o','n','s',0 }; static const WCHAR wszNethoodFolder[] = { 'N','e','t','h','o','o','d',' ','f','o','l','d','e','r',0}; +static const WCHAR wszPrinters[] = { 'P','r','i','n','t','e','r','s',0 }; +static const WCHAR wszFonts[] = { 'F','o','n','t','s',0 }; const GUID CLSID_FolderOptions = { 0x6DFD7C5C, 0x2451, 0x11d3, {0xa2,0x99,0x00,0xC0,0x4F,0x8e,0xf6,0xaf} }; @@ -768,6 +795,11 @@ wszFolderOptions }, #if 0 + { + &CLSID_FontsFolderShortcut, + wszControlPanel, + wszFonts + }, { &CLSID_Printers, wszControlPanel, Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -75,4 +75,5 @@ <file>shv_item_new.c</file> <file>folder_options.c</file> <file>shfldr_netplaces.c</file> + <file>shfldr_fonts.c</file> </module> Modified: trunk/reactos/dll/win32/shell32/shell32_main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.h [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -95,6 +95,7 @@ HRESULT WINAPI ISF_Printers_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_MyDocuments_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI ISF_NetworkPlaces_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); +HRESULT WINAPI ISF_Fonts_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IDropTargetHelper_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); HRESULT WINAPI IFileSystemBindData_Constructor(const WIN32_FIND_DATAW *pfd, LPBC *ppV); HRESULT WINAPI IControlPanel_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv); Modified: trunk/reactos/dll/win32/shell32/shellole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shellole… ============================================================================== --- trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shellole.c [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -75,7 +75,8 @@ {&CLSID_FolderShortcut, &FolderShortcut_Constructor}, #endif {&CLSID_MyDocuments, &ISF_MyDocuments_Constructor}, - {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, + {&CLSID_NetworkPlaces, &ISF_NetworkPlaces_Constructor}, + {&CLSID_FontsFolderShortcut, &ISF_Fonts_Constructor}, {&CLSID_Printers, &ISF_Printers_Constructor}, {&CLSID_RecycleBin, &RecycleBin_Constructor}, {&CLSID_OpenWith, &SHEOW_Constructor}, Added: trunk/reactos/dll/win32/shell32/shfldr_fonts.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_f… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_fonts.c (added) +++ trunk/reactos/dll/win32/shell32/shfldr_fonts.c [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -1,0 +1,655 @@ +/* + * Fonts folder + * + * Copyright 2008 Johannes Anderwald <janderwald(a)reactos.org> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "winerror.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" + +#include "pidl.h" +#include "enumidlist.h" +#include "undocshell.h" +#include "shell32_main.h" +#include "shresdef.h" +#include "wine/debug.h" +#include "debughlp.h" +#include "shfldr.h" +#include "shlwapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL (shell); + +/*********************************************************************** +* IShellFolder implementation +*/ + +typedef struct { + const IShellFolder2Vtbl *lpVtbl; + LONG ref; + const IPersistFolder2Vtbl *lpVtblPersistFolder2; + + /* both paths are parsible from the desktop */ + LPITEMIDLIST pidlRoot; /* absolute pidl */ +} IGenericSFImpl; + +static const IShellFolder2Vtbl vt_ShellFolder2; +static const IPersistFolder2Vtbl vt_NP_PersistFolder2; + + +#define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) +#define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); + +#define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) +#define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) +#define _IPersistFolder2_(This) (IPersistFolder2*)&(This->lpVtblPersistFolder2) + +static shvheader FontsSFHeader[] = { + {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, + {IDS_SHV_COLUMN9, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 10} +}; + +#define FontsSHELLVIEWCOLUMNS 2 + +/************************************************************************** +* ISF_Fonts_Constructor +*/ +HRESULT WINAPI ISF_Fonts_Constructor (IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) +{ + IGenericSFImpl *sf; + + TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); + + if (!ppv) + return E_POINTER; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + sf = (IGenericSFImpl *) HeapAlloc ( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof (IGenericSFImpl)); + if (!sf) + return E_OUTOFMEMORY; + + sf->ref = 0; + sf->lpVtbl = &vt_ShellFolder2; + sf->lpVtblPersistFolder2 = &vt_NP_PersistFolder2; + sf->pidlRoot = _ILCreateFont(); /* my qualified pidl */ + + if (!SUCCEEDED (IUnknown_QueryInterface (_IUnknown_ (sf), riid, ppv))) + { + IUnknown_Release (_IUnknown_ (sf)); + return E_NOINTERFACE; + } + + TRACE ("--(%p)\n", sf); + return S_OK; +} + +/************************************************************************** + * ISF_Fonts_fnQueryInterface + * + * NOTE + * supports not IPersist/IPersistFolder + */ +static HRESULT WINAPI ISF_Fonts_fnQueryInterface (IShellFolder2 *iface, REFIID riid, LPVOID *ppvObj) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(%s,%p)\n", This, shdebugstr_guid (riid), ppvObj); + + *ppvObj = NULL; + + if (IsEqualIID (riid, &IID_IUnknown) || + IsEqualIID (riid, &IID_IShellFolder) || + IsEqualIID (riid, &IID_IShellFolder2)) + { + *ppvObj = This; + } + else if (IsEqualIID (riid, &IID_IPersist) || + IsEqualIID (riid, &IID_IPersistFolder) || + IsEqualIID (riid, &IID_IPersistFolder2)) + { + *ppvObj = _IPersistFolder2_ (This); + } + + if (*ppvObj) + { + IUnknown_AddRef ((IUnknown *) (*ppvObj)); + TRACE ("-- Interface: (%p)->(%p)\n", ppvObj, *ppvObj); + return S_OK; + } + TRACE ("-- Interface: E_NOINTERFACE\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ISF_Fonts_fnAddRef (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedIncrement(&This->ref); + + TRACE ("(%p)->(count=%u)\n", This, refCount - 1); + + return refCount; +} + +static ULONG WINAPI ISF_Fonts_fnRelease (IShellFolder2 * iface) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + ULONG refCount = InterlockedDecrement(&This->ref); + + TRACE ("(%p)->(count=%u)\n", This, refCount + 1); + + if (!refCount) { + TRACE ("-- destroying IShellFolder(%p)\n", This); + SHFree (This->pidlRoot); + HeapFree (GetProcessHeap(), 0, This); + } + return refCount; +} + +/************************************************************************** +* ISF_Fonts_fnParseDisplayName +*/ +static HRESULT WINAPI ISF_Fonts_fnParseDisplayName (IShellFolder2 * iface, + HWND hwndOwner, LPBC pbcReserved, LPOLESTR lpszDisplayName, + DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + HRESULT hr = E_UNEXPECTED; + + TRACE ("(%p)->(HWND=%p,%p,%p=%s,%p,pidl=%p,%p)\n", This, + hwndOwner, pbcReserved, lpszDisplayName, debugstr_w (lpszDisplayName), + pchEaten, ppidl, pdwAttributes); + + *ppidl = 0; + if (pchEaten) + *pchEaten = 0; /* strange but like the original */ + + TRACE ("(%p)->(-- ret=0x%08x)\n", This, hr); + + return hr; +} + +/************************************************************************** +* ISF_Fonts_fnEnumObjects +*/ +static HRESULT WINAPI ISF_Fonts_fnEnumObjects (IShellFolder2 * iface, + HWND hwndOwner, DWORD dwFlags, LPENUMIDLIST * ppEnumIDList) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(HWND=%p flags=0x%08x pplist=%p)\n", This, + hwndOwner, dwFlags, ppEnumIDList); + + *ppEnumIDList = IEnumIDList_Constructor(); + + TRACE ("-- (%p)->(new ID List: %p)\n", This, *ppEnumIDList); + + return (*ppEnumIDList) ? S_OK : E_OUTOFMEMORY; +} + +/************************************************************************** +* ISF_Fonts_fnBindToObject +*/ +static HRESULT WINAPI ISF_Fonts_fnBindToObject (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", This, + pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + return SHELL32_BindToChild (This->pidlRoot, NULL, pidl, riid, ppvOut); +} + +/************************************************************************** +* ISF_Fonts_fnBindToStorage +*/ +static HRESULT WINAPI ISF_Fonts_fnBindToStorage (IShellFolder2 * iface, + LPCITEMIDLIST pidl, LPBC pbcReserved, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(pidl=%p,%p,%s,%p) stub\n", This, + pidl, pbcReserved, shdebugstr_guid (riid), ppvOut); + + *ppvOut = NULL; + return E_NOTIMPL; +} + +/************************************************************************** +* ISF_Fonts_fnCompareIDs +*/ + +static HRESULT WINAPI ISF_Fonts_fnCompareIDs (IShellFolder2 * iface, + LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + int nReturn; + + TRACE ("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", This, lParam, pidl1, pidl2); + nReturn = SHELL32_CompareIDs (_IShellFolder_ (This), lParam, pidl1, pidl2); + TRACE ("-- %i\n", nReturn); + return nReturn; +} + +/************************************************************************** +* ISF_Fonts_fnCreateViewObject +*/ +static HRESULT WINAPI ISF_Fonts_fnCreateViewObject (IShellFolder2 * iface, + HWND hwndOwner, REFIID riid, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + LPSHELLVIEW pShellView; + HRESULT hr = E_INVALIDARG; + + TRACE ("(%p)->(hwnd=%p,%s,%p)\n", This, + hwndOwner, shdebugstr_guid (riid), ppvOut); + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IDropTarget)) + { + WARN ("IDropTarget not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IContextMenu)) + { + WARN ("IContextMenu not implemented\n"); + hr = E_NOTIMPL; + } + else if (IsEqualIID (riid, &IID_IShellView)) + { + pShellView = IShellView_Constructor ((IShellFolder *) iface); + if (pShellView) + { + hr = IShellView_QueryInterface (pShellView, riid, ppvOut); + IShellView_Release (pShellView); + } + } + TRACE ("-- (%p)->(interface=%p)\n", This, ppvOut); + return hr; +} + +/************************************************************************** +* ISF_Fonts_fnGetAttributesOf +*/ +static HRESULT WINAPI ISF_Fonts_fnGetAttributesOf (IShellFolder2 * iface, + UINT cidl, LPCITEMIDLIST * apidl, DWORD * rgfInOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + HRESULT hr = S_OK; + + TRACE ("(%p)->(cidl=%d apidl=%p mask=%p (0x%08x))\n", This, + cidl, apidl, rgfInOut, rgfInOut ? *rgfInOut : 0); + + if (!rgfInOut) + return E_INVALIDARG; + if (cidl && !apidl) + return E_INVALIDARG; + + if (*rgfInOut == 0) + *rgfInOut = ~0; + + if (cidl == 0) + { + IShellFolder *psfParent = NULL; + LPCITEMIDLIST rpidl = NULL; + + hr = SHBindToParent(This->pidlRoot, &IID_IShellFolder, (LPVOID*)&psfParent, (LPCITEMIDLIST*)&rpidl); + if(SUCCEEDED(hr)) + { + SHELL32_GetItemAttributes (psfParent, rpidl, rgfInOut); + IShellFolder_Release(psfParent); + } + } + else + { + while (cidl > 0 && *apidl) + { + pdump (*apidl); + SHELL32_GetItemAttributes (_IShellFolder_ (This), *apidl, rgfInOut); + apidl++; + cidl--; + } + } + + /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */ + *rgfInOut &= ~SFGAO_VALIDATE; + + TRACE ("-- result=0x%08x\n", *rgfInOut); + return hr; +} + +/************************************************************************** +* ISF_Fonts_fnGetUIObjectOf +* +* PARAMETERS +* hwndOwner [in] Parent window for any output +* cidl [in] array size +* apidl [in] simple pidl array +* riid [in] Requested Interface +* prgfInOut [ ] reserved +* ppvObject [out] Resulting Interface +* +*/ +static HRESULT WINAPI ISF_Fonts_fnGetUIObjectOf (IShellFolder2 * iface, + HWND hwndOwner, UINT cidl, LPCITEMIDLIST * apidl, REFIID riid, + UINT * prgfInOut, LPVOID * ppvOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + LPITEMIDLIST pidl; + IUnknown *pObj = NULL; + HRESULT hr = E_INVALIDARG; + + TRACE ("(%p)->(%p,%u,apidl=%p,%s,%p,%p)\n", This, + hwndOwner, cidl, apidl, shdebugstr_guid (riid), prgfInOut, ppvOut); + + if (!ppvOut) + return hr; + + *ppvOut = NULL; + + if (IsEqualIID (riid, &IID_IContextMenu) && (cidl >= 1)) + { + pObj = (LPUNKNOWN) ISvItemCm_Constructor ((IShellFolder *) iface, This->pidlRoot, apidl, cidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IDataObject) && (cidl >= 1)) + { + pObj = (LPUNKNOWN) IDataObject_Constructor (hwndOwner, This->pidlRoot, apidl, cidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IExtractIconA) && (cidl == 1)) + { + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconA_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IExtractIconW) && (cidl == 1)) + { + pidl = ILCombine (This->pidlRoot, apidl[0]); + pObj = (LPUNKNOWN) IExtractIconW_Constructor (pidl); + SHFree (pidl); + hr = S_OK; + } + else if (IsEqualIID (riid, &IID_IDropTarget) && (cidl >= 1)) + { + hr = IShellFolder_QueryInterface (iface, &IID_IDropTarget, (LPVOID *) & pObj); + } + else + hr = E_NOINTERFACE; + + if (SUCCEEDED(hr) && !pObj) + hr = E_OUTOFMEMORY; + + *ppvOut = pObj; + TRACE ("(%p)->hr=0x%08x\n", This, hr); + return hr; +} + +/************************************************************************** +* ISF_Fonts_fnGetDisplayNameOf +* +*/ +static HRESULT WINAPI ISF_Fonts_fnGetDisplayNameOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, DWORD dwFlags, LPSTRRET strRet) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(pidl=%p,0x%08x,%p)\n", This, pidl, dwFlags, strRet); + pdump (pidl); + + if (!strRet) + return E_INVALIDARG; + + return E_NOTIMPL; +} + +/************************************************************************** +* ISF_Fonts_fnSetNameOf +* Changes the name of a file object or subfolder, possibly changing its item +* identifier in the process. +* +* PARAMETERS +* hwndOwner [in] Owner window for output +* pidl [in] simple pidl of item to change +* lpszName [in] the items new display name +* dwFlags [in] SHGNO formatting flags +* ppidlOut [out] simple pidl returned +*/ +static HRESULT WINAPI ISF_Fonts_fnSetNameOf (IShellFolder2 * iface, + HWND hwndOwner, LPCITEMIDLIST pidl, /*simple pidl */ + LPCOLESTR lpName, DWORD dwFlags, LPITEMIDLIST * pPidlOut) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)->(%p,pidl=%p,%s,%u,%p)\n", This, + hwndOwner, pidl, debugstr_w (lpName), dwFlags, pPidlOut); + return E_FAIL; +} + +static HRESULT WINAPI ISF_Fonts_fnGetDefaultSearchGUID ( + IShellFolder2 * iface, GUID * pguid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Fonts_fnEnumSearches (IShellFolder2 * iface, + IEnumExtraSearch ** ppenum) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Fonts_fnGetDefaultColumn (IShellFolder2 * iface, + DWORD dwRes, ULONG * pSort, ULONG * pDisplay) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)\n", This); + + if (pSort) + *pSort = 0; + if (pDisplay) + *pDisplay = 0; + + return S_OK; +} + +static HRESULT WINAPI ISF_Fonts_fnGetDefaultColumnState ( + IShellFolder2 * iface, UINT iColumn, DWORD * pcsFlags) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + TRACE ("(%p)\n", This); + + if (!pcsFlags || iColumn >= FontsSHELLVIEWCOLUMNS) + return E_INVALIDARG; + *pcsFlags = FontsSFHeader[iColumn].pcsFlags; + return S_OK; +} + +static HRESULT WINAPI ISF_Fonts_fnGetDetailsEx (IShellFolder2 * iface, + LPCITEMIDLIST pidl, const SHCOLUMNID * pscid, VARIANT * pv) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + FIXME ("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Fonts_fnGetDetailsOf (IShellFolder2 * iface, + LPCITEMIDLIST pidl, UINT iColumn, SHELLDETAILS * psd) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)->(%p %i %p)\n", This, pidl, iColumn, psd); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ISF_Fonts_fnMapColumnToSCID (IShellFolder2 * iface, + UINT column, SHCOLUMNID * pscid) +{ + IGenericSFImpl *This = (IGenericSFImpl *)iface; + + FIXME ("(%p)\n", This); + + return E_NOTIMPL; +} + +static const IShellFolder2Vtbl vt_ShellFolder2 = { + ISF_Fonts_fnQueryInterface, + ISF_Fonts_fnAddRef, + ISF_Fonts_fnRelease, + ISF_Fonts_fnParseDisplayName, + ISF_Fonts_fnEnumObjects, + ISF_Fonts_fnBindToObject, + ISF_Fonts_fnBindToStorage, + ISF_Fonts_fnCompareIDs, + ISF_Fonts_fnCreateViewObject, + ISF_Fonts_fnGetAttributesOf, + ISF_Fonts_fnGetUIObjectOf, + ISF_Fonts_fnGetDisplayNameOf, + ISF_Fonts_fnSetNameOf, + /* ShellFolder2 */ + ISF_Fonts_fnGetDefaultSearchGUID, + ISF_Fonts_fnEnumSearches, + ISF_Fonts_fnGetDefaultColumn, + ISF_Fonts_fnGetDefaultColumnState, + ISF_Fonts_fnGetDetailsEx, + ISF_Fonts_fnGetDetailsOf, + ISF_Fonts_fnMapColumnToSCID +}; + +/************************************************************************ + * INPFldr_PersistFolder2_QueryInterface + */ +static HRESULT WINAPI INPFldr_PersistFolder2_QueryInterface (IPersistFolder2 * iface, + REFIID iid, LPVOID * ppvObj) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)\n", This); + + return IUnknown_QueryInterface (_IUnknown_ (This), iid, ppvObj); +} + +/************************************************************************ + * INPFldr_PersistFolder2_AddRef + */ +static ULONG WINAPI INPFldr_PersistFolder2_AddRef (IPersistFolder2 * iface) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(count=%u)\n", This, This->ref); + + return IUnknown_AddRef (_IUnknown_ (This)); +} + +/************************************************************************ + * ISFPersistFolder_Release + */ +static ULONG WINAPI INPFldr_PersistFolder2_Release (IPersistFolder2 * iface) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(count=%u)\n", This, This->ref); + + return IUnknown_Release (_IUnknown_ (This)); +} + +/************************************************************************ + * INPFldr_PersistFolder2_GetClassID + */ +static HRESULT WINAPI INPFldr_PersistFolder2_GetClassID ( + IPersistFolder2 * iface, CLSID * lpClassId) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)\n", This); + + if (!lpClassId) + return E_POINTER; + + *lpClassId = CLSID_FontsFolderShortcut; + + return S_OK; +} + +/************************************************************************ + * INPFldr_PersistFolder2_Initialize + * + * NOTES: it makes no sense to change the pidl + */ +static HRESULT WINAPI INPFldr_PersistFolder2_Initialize ( + IPersistFolder2 * iface, LPCITEMIDLIST pidl) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + return E_NOTIMPL; +} + +/************************************************************************** + * IPersistFolder2_fnGetCurFolder + */ +static HRESULT WINAPI INPFldr_PersistFolder2_GetCurFolder ( + IPersistFolder2 * iface, LPITEMIDLIST * pidl) +{ + _ICOM_THIS_From_IPersistFolder2 (IGenericSFImpl, iface); + + TRACE ("(%p)->(%p)\n", This, pidl); + + if (!pidl) + return E_POINTER; + + *pidl = ILClone (This->pidlRoot); + + return S_OK; +} + +static const IPersistFolder2Vtbl vt_NP_PersistFolder2 = +{ + INPFldr_PersistFolder2_QueryInterface, + INPFldr_PersistFolder2_AddRef, + INPFldr_PersistFolder2_Release, + INPFldr_PersistFolder2_GetClassID, + INPFldr_PersistFolder2_Initialize, + INPFldr_PersistFolder2_GetCurFolder +}; Propchange: trunk/reactos/dll/win32/shell32/shfldr_fonts.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Wed Aug 6 20:02:34 2008 @@ -87,6 +87,8 @@ #define IDS_DRIVE_CDROM 73 #define IDS_DRIVE_NETWORK 74 #define IDS_NETWORKPLACE 75 +#define IDS_FONTS 76 +#define IDS_PRINTERS 77 #define IDS_CREATEFOLDER_DENIED 128 #define IDS_CREATEFOLDER_CAPTION 129 @@ -142,6 +144,7 @@ #define IDS_PREVIEW_VERB 306 #define IDS_FILE_FOLDER 307 #define IDS_CREATELINK 308 +#define IDS_INSTALLNEWFONT 309 /* Note: this string is referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964

16 years, 2 months

[cgutman] 35152: - Don't check Status so we don't quit looping after the first unsuccessful IRP

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Aug 6 17:19:53 2008 New Revision: 35152 URL: http://svn.reactos.org/svn/reactos?rev=35152&view=rev Log: - Don't check Status so we don't quit looping after the first unsuccessful IRP Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Wed Aug 6 17:19:53 2008 @@ -168,11 +168,8 @@ FCB, FCB->Recv.Content)); /*OskitDumpBuffer( FCB->Recv.Window, FCB->Recv.Content );*/ - Status = STATUS_SUCCESS; - /* Try to clear some requests */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) && - NT_SUCCESS(Status) ) { + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); NextIrp = @@ -476,10 +473,14 @@ InsertTailList( &FCB->DatagramList, &DatagramRecv->ListEntry ); } else Status = STATUS_NO_MEMORY; + if( !NT_SUCCESS( Status ) ) { + SocketStateUnlock( FCB ); + return Status; + } + /* Satisfy as many requests as we can */ - while( NT_SUCCESS(Status) && - !IsListEmpty( &FCB->DatagramList ) && + while( !IsListEmpty( &FCB->DatagramList ) && !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { AFD_DbgPrint(MID_TRACE,("Looping trying to satisfy request\n")); ListEntry = RemoveHeadList( &FCB->DatagramList ); Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Wed Aug 6 17:19:53 2008 @@ -85,8 +85,7 @@ FCB->Send.BytesUsed -= Irp->IoStatus.Information; if( !FCB->Send.BytesUsed && - !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) && - NT_SUCCESS(Status) ) { + !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp =

16 years, 2 months

[janderwald] 35151: - add CLSID_FontsFolderShortcut for fonts shell folder

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Aug 6 16:11:14 2008 New Revision: 35151 URL: http://svn.reactos.org/svn/reactos?rev=35151&view=rev Log: - add CLSID_FontsFolderShortcut for fonts shell folder Modified: trunk/reactos/include/psdk/shlguid.h Modified: trunk/reactos/include/psdk/shlguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlguid.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shlguid.h [iso-8859-1] Wed Aug 6 16:11:14 2008 @@ -116,7 +116,7 @@ DEFINE_GUID(CLSID_Printers, 0x2227A280, 0x3AEA, 0x1069, 0xA2, 0xDE, 0x08, 0x00, 0x2B, 0x30, 0x30, 0x9D); DEFINE_GUID(CLSID_MyDocuments, 0x450d8fba, 0xad25, 0x11d0, 0x98, 0xa8, 0x08, 0x00, 0x36, 0x1b, 0x11, 0x03); DEFINE_GUID(CLSID_FolderShortcut, 0x0AFACED1, 0xE828, 0x11D1, 0x91, 0x87, 0xB5, 0x32, 0xF1, 0xE9, 0x57, 0x5D); - +DEFINE_GUID(CLSID_FontsFolderShortcut, 0xD20EA4E1, 0x3957, 0x11D2, 0xA4, 0x0B, 0x0C, 0x50, 0x20, 0x52, 0x41,0x52); DEFINE_GUID(IID_IQueryAssociations, 0xc46ca590, 0x3c3f, 0x11d2, 0xbe, 0xe6, 0x00, 0x00, 0xf8, 0x05, 0xca, 0x57); DEFINE_GUID(CLSID_DragDropHelper, 0x4657278a, 0x411b, 0x11d2, 0x83, 0x9a, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0xd0);

16 years, 2 months

[janderwald] 35150: * Enable/Disable finish button based on the right edit control * fixes bug 3625

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Aug 6 13:18:43 2008 New Revision: 35150 URL: http://svn.reactos.org/svn/reactos?rev=35150&view=rev Log: * Enable/Disable finish button based on the right edit control * fixes bug 3625 Modified: trunk/reactos/dll/cpl/appwiz/createlink.c Modified: trunk/reactos/dll/cpl/appwiz/createlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/createlink.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/createlink.c [iso-8859-1] Wed Aug 6 13:18:43 2008 @@ -188,7 +188,7 @@ switch(HIWORD(wParam)) { case EN_CHANGE: - if (SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_LOCATION, WM_GETTEXTLENGTH, 0, 0)) + if (SendDlgItemMessage(hwndDlg, IDC_SHORTCUT_NAME, WM_GETTEXTLENGTH, 0, 0)) { PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_FINISH); }

16 years, 2 months

[janderwald] 35149: * OpenWith dialog must have WS_POPUP style in order to show up properly - fixes bug 3635

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Aug 6 12:48:04 2008 New Revision: 35149 URL: http://svn.reactos.org/svn/reactos?rev=35149&view=rev Log: * OpenWith dialog must have WS_POPUP style in order to show up properly - fixes bug 3635 Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -357,7 +357,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Îòâàðÿíå ñ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -360,7 +360,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Otevøít v..." FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -361,7 +361,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Öffnen mit" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "¢íïéãìá ìå" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -360,7 +360,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Abrir con" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -362,7 +362,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Ouvrir avec" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -361,7 +361,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -359,7 +359,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Apri con" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 9, "MS UI Gothic", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -337,7 +337,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Åpne med" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -364,7 +364,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Otwórz za pomoc¹" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -360,7 +360,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -360,7 +360,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Âûáîð ïðîãðàììû" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -364,7 +364,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Otvori v programe" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -358,7 +358,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -347,7 +347,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Wed Aug 6 12:48:04 2008 @@ -359,7 +359,7 @@ END OPEN_WITH_PROGRAMM_DLG DIALOGEX 0, 0, 264, 256 -STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Open With" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN

16 years, 2 months

[sginsberg] 35148: - Move Direct Draw syscall stubs to /ntddraw/ - Make ros ntgdi.h more compatible with the official header (fix two prototypes)

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Aug 6 11:55:07 2008 New Revision: 35148 URL: http://svn.reactos.org/svn/reactos?rev=35148&view=rev Log: - Move Direct Draw syscall stubs to /ntddraw/ - Make ros ntgdi.h more compatible with the official header (fix two prototypes) Added: branches/nwin32/subsystems/win32/win32k/ntddraw/d3d.c (with props) branches/nwin32/subsystems/win32/win32k/ntddraw/dd.c (with props) branches/nwin32/subsystems/win32/win32k/ntddraw/ddsurf.c (with props) branches/nwin32/subsystems/win32/win32k/ntddraw/dvp.c (with props) branches/nwin32/subsystems/win32/win32k/ntddraw/mocomp.c (with props) Modified: branches/nwin32/include/psdk/ntgdi.h branches/nwin32/subsystems/win32/win32k/ntgdi/gdistubs.c branches/nwin32/subsystems/win32/win32k/todo.c branches/nwin32/subsystems/win32/win32k/win32k.rbuild Modified: branches/nwin32/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/psdk/ntgdi.h?rev… ============================================================================== --- branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] (original) +++ branches/nwin32/include/psdk/ntgdi.h [iso-8859-1] Wed Aug 6 11:55:07 2008 @@ -705,7 +705,7 @@ ); W32KAPI -DWORD +VOID APIENTRY NtGdiDdUnattachSurface( IN HANDLE hSurface, @@ -801,7 +801,7 @@ ); W32KAPI -BOOL +DWORD APIENTRY NtGdiD3dContextCreate( IN HANDLE hDirectDrawLocal, Added: branches/nwin32/subsystems/win32/win32k/ntddraw/d3d.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntddraw/d3d.c (added) +++ branches/nwin32/subsystems/win32/win32k/ntddraw/d3d.c [iso-8859-1] Wed Aug 6 11:55:07 2008 @@ -1,0 +1,114 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntddraw/d3d.c + * PURPOSE: Direct 3D Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +DWORD +APIENTRY +NtGdiDdCanCreateD3DBuffer(IN HANDLE hDirectDraw, + IN OUT PDD_CANCREATESURFACEDATA puCanCreateSurfaceData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiD3dContextCreate(IN HANDLE hDirectDrawLocal, + IN HANDLE hSurfColor, + IN HANDLE hSurfZ, + IN OUT D3DNTHAL_CONTEXTCREATEI *pdcci) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiD3dContextDestroy(IN LPD3DNTHAL_CONTEXTDESTROYDATA pdcdd) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiD3dContextDestroyAll(OUT LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcdad) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdCreateD3DBuffer(IN HANDLE hDirectDraw, + IN OUT HANDLE* hSurface, + IN OUT DDSURFACEDESC* puSurfaceDescription, + IN OUT DD_SURFACE_GLOBAL* puSurfaceGlobalData, + IN OUT DD_SURFACE_LOCAL* puSurfaceLocalData, + IN OUT DD_SURFACE_MORE* puSurfaceMoreData, + IN OUT DD_CREATESURFACEDATA* puCreateSurfaceData, + IN OUT HANDLE* puhSurface) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdDestroyD3DBuffer(IN HANDLE hSurface) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiD3dDrawPrimitives2(IN HANDLE hCmdBuf, + IN HANDLE hVBuf, + IN OUT LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, + IN OUT FLATPTR* pfpVidMemCmd, + IN OUT DWORD* pdwSizeCmd, + IN OUT FLATPTR* pfpVidMemVtx, + IN OUT DWORD* pdwSizeVtx) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiD3dValidateTextureStageState(IN OUT LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdLockD3D(IN HANDLE hSurface, + IN OUT PDD_LOCKDATA puLockData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdUnlockD3D(IN HANDLE hSurface, + IN OUT PDD_UNLOCKDATA puUnlockData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/d3d.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntddraw/dd.c (added) +++ branches/nwin32/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] Wed Aug 6 11:55:07 2008 @@ -1,0 +1,200 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntddraw/dd.c + * PURPOSE: General Direct Draw Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +DWORD +APIENTRY +NtGdiDdGetScanLine(IN HANDLE hDirectDraw, + IN OUT PDD_GETSCANLINEDATA puGetScanLineData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdWaitForVerticalBlank(IN HANDLE hDirectDraw, + IN OUT PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +HANDLE +APIENTRY +NtGdiDdCreateDirectDrawObject(IN HDC hdc) +{ + UNIMPLEMENTED; + return NULL; +} + +DWORD +APIENTRY +NtGdiDxgGenericThunk(IN ULONG_PTR ulIndex, + IN ULONG_PTR ulHandle, + IN OUT SIZE_T *pdwSizeOfPtr1, + IN OUT PVOID pvPtr1, + IN OUT SIZE_T *pdwSizeOfPtr2, + IN OUT PVOID pvPtr2) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdGetDriverState(IN OUT PDD_GETDRIVERSTATEDATA pdata) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdColorControl(IN HANDLE hSurface, + IN OUT PDD_COLORCONTROLDATA puColorControlData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +HANDLE +APIENTRY +NtGdiDdCreateSurfaceObject(IN HANDLE hDirectDrawLocal, + IN HANDLE hSurface, + IN PDD_SURFACE_LOCAL puSurfaceLocal, + IN PDD_SURFACE_MORE puSurfaceMore, + IN PDD_SURFACE_GLOBAL puSurfaceGlobal, + IN BOOL bComplete) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +NtGdiDdDeleteDirectDrawObject(IN HANDLE hDirectDrawLocal) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiDdDeleteSurfaceObject(IN HANDLE hSurface) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiDdQueryDirectDrawObject(IN HANDLE hDirectDrawLocal, + OUT PDD_HALINFO pHalInfo, + OUT DWORD* pCallBackFlags, + OUT OPTIONAL LPD3DNTHAL_CALLBACKS puD3dCallbacks, + OUT OPTIONAL LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, + OUT OPTIONAL PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, + OUT OPTIONAL LPDDSURFACEDESC puD3dTextureFormats, + OUT DWORD* puNumHeaps, + OUT OPTIONAL VIDEOMEMORY* puvmList, + OUT DWORD* puNumFourCC, + OUT OPTIONAL DWORD* puFourCC) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiDdReenableDirectDrawObject(IN HANDLE hDirectDrawLocal, + IN OUT BOOL* pubNewMode) +{ + UNIMPLEMENTED; + return FALSE; +} + +DWORD +APIENTRY +NtGdiDdGetDriverInfo(IN HANDLE hDirectDraw, + IN OUT PDD_GETDRIVERINFODATA puGetDriverInfoData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdGetAvailDriverMemory(IN HANDLE hDirectDraw, + IN OUT PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdSetExclusiveMode(IN HANDLE hDirectDraw, + IN OUT PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +HDC +APIENTRY +NtGdiDdGetDC(IN HANDLE hSurface, + IN PALETTEENTRY* puColorTable) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +NtGdiDdReleaseDC(IN HANDLE hSurface) +{ + UNIMPLEMENTED; + return FALSE; +} + +HANDLE +APIENTRY +NtGdiDdGetDxHandle(IN OPTIONAL HANDLE hDirectDraw, + IN OPTIONAL HANDLE hSurface, + IN BOOL bRelease) +{ + UNIMPLEMENTED; + return NULL; +} + +BOOL +APIENTRY +NtGdiDdResetVisrgn(IN HANDLE hSurface, + IN HWND hwnd) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL +APIENTRY +NtGdiDdSetGammaRamp(IN HANDLE hDirectDraw, + IN HDC hdc, + IN LPVOID lpGammaRamp) +{ + UNIMPLEMENTED; + return FALSE; +} Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/dd.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/ntddraw/ddsurf.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntddraw/ddsurf.c (added) +++ branches/nwin32/subsystems/win32/win32k/ntddraw/ddsurf.c [iso-8859-1] Wed Aug 6 11:55:07 2008 @@ -1,0 +1,192 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntddraw/ddsurf.c + * PURPOSE: Direct Draw Surface Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +DWORD +APIENTRY +NtGdiDdCanCreateSurface(IN HANDLE hDirectDraw, + IN OUT PDD_CANCREATESURFACEDATA puCanCreateSurfaceData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdCreateSurface(IN HANDLE hDirectDraw, + IN HANDLE* hSurface, + IN OUT DDSURFACEDESC* puSurfaceDescription, + IN OUT DD_SURFACE_GLOBAL* puSurfaceGlobalData, + IN OUT DD_SURFACE_LOCAL* puSurfaceLocalData, + IN OUT DD_SURFACE_MORE* puSurfaceMoreData, + IN OUT DD_CREATESURFACEDATA* puCreateSurfaceData, + OUT HANDLE* puhSurface) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdCreateSurfaceEx(IN HANDLE hDirectDraw, + IN HANDLE hSurface, + IN DWORD dwSurfaceHandle) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdDestroySurface(IN HANDLE hSurface, + IN BOOL bRealDestroy) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +BOOL +APIENTRY +NtGdiDdAttachSurface(IN HANDLE hSurfaceFrom, + IN HANDLE hSurfaceTo) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +APIENTRY +NtGdiDdUnattachSurface(IN HANDLE hSurface, + IN HANDLE hSurfaceAttached) +{ + UNIMPLEMENTED; +} + +DWORD +APIENTRY +NtGdiDdAddAttachedSurface(IN HANDLE hSurface, + IN HANDLE hSurfaceAttached, + IN OUT PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdFlip(IN HANDLE hSurfaceCurrent, + IN HANDLE hSurfaceTarget, + IN HANDLE hSurfaceCurrentLeft, + IN HANDLE hSurfaceTargetLeft, + IN OUT PDD_FLIPDATA puFlipData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdFlipToGDISurface(IN HANDLE hDirectDraw, + IN OUT PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdLock(IN HANDLE hSurface, + IN OUT PDD_LOCKDATA puLockData, + IN HDC hdcClip) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdUnlock(IN HANDLE hSurface, + IN OUT PDD_UNLOCKDATA puUnlockData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdAlphaBlt(IN HANDLE hSurfaceDest, + IN OPTIONAL HANDLE hSurfaceSrc, + IN OUT PDD_BLTDATA puBltData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdBlt(IN HANDLE hSurfaceDest, + IN HANDLE hSurfaceSrc, + IN OUT PDD_BLTDATA puBltData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdUpdateOverlay(IN HANDLE hSurfaceDestination, + IN HANDLE hSurfaceSource, + IN OUT PDD_UPDATEOVERLAYDATA puUpdateOverlayData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdGetBltStatus(IN HANDLE hSurface, + IN OUT PDD_GETBLTSTATUSDATA puGetBltStatusData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdGetFlipStatus(IN HANDLE hSurface, + IN OUT PDD_GETFLIPSTATUSDATA puGetFlipStatusData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdSetColorKey(IN HANDLE hSurface, + IN OUT PDD_SETCOLORKEYDATA puSetColorKeyData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdSetOverlayPosition(IN HANDLE hSurfaceSource, + IN HANDLE hSurfaceDestination, + IN OUT PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/ddsurf.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/ntddraw/dvp.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntddraw/dvp.c (added) +++ branches/nwin32/subsystems/win32/win32k/ntddraw/dvp.c [iso-8859-1] Wed Aug 6 11:55:07 2008 @@ -1,0 +1,174 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntddraw/dvp.c + * PURPOSE: Direct Draw Videoport Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +DWORD +APIENTRY +NtGdiDvpCanCreateVideoPort(IN HANDLE hDirectDraw, + IN OUT PDD_CANCREATEVPORTDATA puCanCreateVPortData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpColorControl(IN HANDLE hVideoPort, + IN OUT PDD_VPORTCOLORDATA puVPortColorData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +HANDLE +APIENTRY +NtGdiDvpCreateVideoPort(IN HANDLE hDirectDraw, + IN OUT PDD_CREATEVPORTDATA puCreateVPortData) +{ + UNIMPLEMENTED; + return NULL; +} + +DWORD +APIENTRY +NtGdiDvpDestroyVideoPort(IN HANDLE hVideoPort, + IN OUT PDD_DESTROYVPORTDATA puDestroyVPortData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpFlipVideoPort(IN HANDLE hVideoPort, + IN HANDLE hDDSurfaceCurrent, + IN HANDLE hDDSurfaceTarget, + IN OUT PDD_FLIPVPORTDATA puFlipVPortData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpGetVideoPortBandwidth(IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpGetVideoPortField(IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTFIELDDATA puGetVPortFieldData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpGetVideoPortFlipStatus(IN HANDLE hDirectDraw, + IN OUT PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpGetVideoPortInputFormats(IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpGetVideoPortLine(IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTLINEDATA puGetVPortLineData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpGetVideoPortOutputFormats(IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpGetVideoPortConnectInfo(IN HANDLE hDirectDraw, + IN OUT PDD_GETVPORTCONNECTDATA puGetVPortConnectData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpGetVideoSignalStatus(IN HANDLE hVideoPort, + IN OUT PDD_GETVPORTSIGNALDATA puGetVPortSignalData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpUpdateVideoPort(IN HANDLE hVideoPort, + IN HANDLE* phSurfaceVideo, + IN HANDLE* phSurfaceVbi, + IN OUT PDD_UPDATEVPORTDATA puUpdateVPortData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpWaitForVideoPortSync(IN HANDLE hVideoPort, + IN OUT PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDvpAcquireNotification(IN HANDLE hVideoPort, + IN OUT HANDLE* hEvent, + IN LPDDVIDEOPORTNOTIFY pNotify) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + + +DWORD +APIENTRY +NtGdiDvpReleaseNotification(IN HANDLE hVideoPort, + IN HANDLE hEvent) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/dvp.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/nwin32/subsystems/win32/win32k/ntddraw/mocomp.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntddraw/mocomp.c (added) +++ branches/nwin32/subsystems/win32/win32k/ntddraw/mocomp.c [iso-8859-1] Wed Aug 6 11:55:07 2008 @@ -1,0 +1,105 @@ +/* + * PROJECT: ReactOS Win32K + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsystems/win32/win32k/ntddraw/mocomp.c + * PURPOSE: Motion Compensation Routines + * PROGRAMMERS: Stefan Ginsberg (stefan__100__(a)hotmail.com) + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC FUNCTIONS **********************************************************/ + +DWORD +APIENTRY +NtGdiDdBeginMoCompFrame(IN HANDLE hMoComp, + IN OUT PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +HANDLE +APIENTRY +NtGdiDdCreateMoComp(IN HANDLE hDirectDraw, + IN OUT PDD_CREATEMOCOMPDATA puCreateMoCompData) +{ + UNIMPLEMENTED; + return NULL; +} + +DWORD +APIENTRY +NtGdiDdDestroyMoComp(IN HANDLE hMoComp, + IN OUT PDD_DESTROYMOCOMPDATA puDestroyMoCompData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdEndMoCompFrame(IN HANDLE hMoComp, + IN OUT PDD_ENDMOCOMPFRAMEDATA puEndFrameData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdGetInternalMoCompInfo(IN HANDLE hDirectDraw, + IN OUT PDD_GETINTERNALMOCOMPDATA puGetInternalData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdGetMoCompBuffInfo(IN HANDLE hDirectDraw, + IN OUT PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdGetMoCompFormats(IN HANDLE hDirectDraw, + IN OUT PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdGetMoCompGuids(IN HANDLE hDirectDraw, + IN OUT PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdQueryMoCompStatus(IN HANDLE hMoComp, + IN OUT PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} + +DWORD +APIENTRY +NtGdiDdRenderMoComp(IN HANDLE hMoComp, + IN OUT PDD_RENDERMOCOMPDATA puRenderMoCompData) +{ + UNIMPLEMENTED; + return DDHAL_DRIVER_NOTHANDLED; +} Propchange: branches/nwin32/subsystems/win32/win32k/ntddraw/mocomp.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdistubs.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/ntgdi/gdistubs.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/ntgdi/gdistubs.c [iso-8859-1] Wed Aug 6 11:55:07 2008 @@ -3268,939 +3268,6 @@ return 0; } - -DWORD -APIENTRY -NtGdiDxgGenericThunk( - IN ULONG_PTR ulIndex, - IN ULONG_PTR ulHandle, - IN OUT SIZE_T *pdwSizeOfPtr1, - IN OUT PVOID pvPtr1, - IN OUT SIZE_T *pdwSizeOfPtr2, - IN OUT PVOID pvPtr2 -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdAddAttachedSurface( - IN HANDLE hSurface, - IN HANDLE hSurfaceAttached, - IN OUT PDD_ADDATTACHEDSURFACEDATA puAddAttachedSurfaceData -) -{ - UNIMPLEMENTED; - return 0; -} - - -BOOL -APIENTRY -NtGdiDdAttachSurface( - IN HANDLE hSurfaceFrom, - IN HANDLE hSurfaceTo -) -{ - UNIMPLEMENTED; - return FALSE; -} - - -DWORD -APIENTRY -NtGdiDdBlt( - IN HANDLE hSurfaceDest, - IN HANDLE hSurfaceSrc, - IN OUT PDD_BLTDATA puBltData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdCanCreateSurface( - IN HANDLE hDirectDraw, - IN OUT PDD_CANCREATESURFACEDATA puCanCreateSurfaceData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdColorControl( - IN HANDLE hSurface, - IN OUT PDD_COLORCONTROLDATA puColorControlData -) -{ - UNIMPLEMENTED; - return 0; -} - - -HANDLE -APIENTRY -NtGdiDdCreateDirectDrawObject( - IN HDC hdc -) -{ - UNIMPLEMENTED; - return NULL; -} - - -DWORD -APIENTRY -NtGdiDdCreateSurface( - IN HANDLE hDirectDraw, - IN HANDLE* hSurface, - IN OUT DDSURFACEDESC* puSurfaceDescription, - IN OUT DD_SURFACE_GLOBAL* puSurfaceGlobalData, - IN OUT DD_SURFACE_LOCAL* puSurfaceLocalData, - IN OUT DD_SURFACE_MORE* puSurfaceMoreData, - IN OUT DD_CREATESURFACEDATA* puCreateSurfaceData, - OUT HANDLE* puhSurface -) -{ - UNIMPLEMENTED; - return 0; -} - - -HANDLE -APIENTRY -NtGdiDdCreateSurfaceObject( - IN HANDLE hDirectDrawLocal, - IN HANDLE hSurface, - IN PDD_SURFACE_LOCAL puSurfaceLocal, - IN PDD_SURFACE_MORE puSurfaceMore, - IN PDD_SURFACE_GLOBAL puSurfaceGlobal, - IN BOOL bComplete -) -{ - UNIMPLEMENTED; - return NULL; -} - - -BOOL -APIENTRY -NtGdiDdDeleteSurfaceObject( - IN HANDLE hSurface -) -{ - UNIMPLEMENTED; - return FALSE; -} - - -BOOL -APIENTRY -NtGdiDdDeleteDirectDrawObject( - IN HANDLE hDirectDrawLocal -) -{ - UNIMPLEMENTED; - return FALSE; -} - - -DWORD -APIENTRY -NtGdiDdDestroySurface( - IN HANDLE hSurface, - IN BOOL bRealDestroy -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdFlip( - IN HANDLE hSurfaceCurrent, - IN HANDLE hSurfaceTarget, - IN HANDLE hSurfaceCurrentLeft, - IN HANDLE hSurfaceTargetLeft, - IN OUT PDD_FLIPDATA puFlipData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdGetAvailDriverMemory( - IN HANDLE hDirectDraw, - IN OUT PDD_GETAVAILDRIVERMEMORYDATA puGetAvailDriverMemoryData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdGetBltStatus( - IN HANDLE hSurface, - IN OUT PDD_GETBLTSTATUSDATA puGetBltStatusData -) -{ - UNIMPLEMENTED; - return 0; -} - - -HDC -APIENTRY -NtGdiDdGetDC( - IN HANDLE hSurface, - IN PALETTEENTRY* puColorTable -) -{ - UNIMPLEMENTED; - return NULL; -} - - -DWORD -APIENTRY -NtGdiDdGetDriverInfo( - IN HANDLE hDirectDraw, - IN OUT PDD_GETDRIVERINFODATA puGetDriverInfoData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdGetFlipStatus( - IN HANDLE hSurface, - IN OUT PDD_GETFLIPSTATUSDATA puGetFlipStatusData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdGetScanLine( - IN HANDLE hDirectDraw, - IN OUT PDD_GETSCANLINEDATA puGetScanLineData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdSetExclusiveMode( - IN HANDLE hDirectDraw, - IN OUT PDD_SETEXCLUSIVEMODEDATA puSetExclusiveModeData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdFlipToGDISurface( - IN HANDLE hDirectDraw, - IN OUT PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdLock( - IN HANDLE hSurface, - IN OUT PDD_LOCKDATA puLockData, - IN HDC hdcClip -) -{ - UNIMPLEMENTED; - return 0; -} - - -BOOL -APIENTRY -NtGdiDdQueryDirectDrawObject( - IN HANDLE hDirectDrawLocal, - OUT PDD_HALINFO pHalInfo, - OUT DWORD* pCallBackFlags, - OUT OPTIONAL LPD3DNTHAL_CALLBACKS puD3dCallbacks, - OUT OPTIONAL LPD3DNTHAL_GLOBALDRIVERDATA puD3dDriverData, - OUT OPTIONAL PDD_D3DBUFCALLBACKS puD3dBufferCallbacks, - OUT OPTIONAL LPDDSURFACEDESC puD3dTextureFormats, - OUT DWORD* puNumHeaps, - OUT OPTIONAL VIDEOMEMORY* puvmList, - OUT DWORD* puNumFourCC, - OUT OPTIONAL DWORD* puFourCC -) -{ - UNIMPLEMENTED; - return FALSE; -} - - -BOOL -APIENTRY -NtGdiDdReenableDirectDrawObject( - IN HANDLE hDirectDrawLocal, - IN OUT BOOL* pubNewMode -) -{ - UNIMPLEMENTED; - return FALSE; -} - - -BOOL -APIENTRY -NtGdiDdReleaseDC( - IN HANDLE hSurface -) -{ - UNIMPLEMENTED; - return FALSE; -} - - -BOOL -APIENTRY -NtGdiDdResetVisrgn( - IN HANDLE hSurface, - IN HWND hwnd -) -{ - UNIMPLEMENTED; - return FALSE; -} - - -DWORD -APIENTRY -NtGdiDdSetColorKey( - IN HANDLE hSurface, - IN OUT PDD_SETCOLORKEYDATA puSetColorKeyData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdSetOverlayPosition( - IN HANDLE hSurfaceSource, - IN HANDLE hSurfaceDestination, - IN OUT PDD_SETOVERLAYPOSITIONDATA puSetOverlayPositionData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdUnattachSurface( - IN HANDLE hSurface, - IN HANDLE hSurfaceAttached -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdUnlock( - IN HANDLE hSurface, - IN OUT PDD_UNLOCKDATA puUnlockData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdUpdateOverlay( - IN HANDLE hSurfaceDestination, - IN HANDLE hSurfaceSource, - IN OUT PDD_UPDATEOVERLAYDATA puUpdateOverlayData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdWaitForVerticalBlank( - IN HANDLE hDirectDraw, - IN OUT PDD_WAITFORVERTICALBLANKDATA puWaitForVerticalBlankData -) -{ - UNIMPLEMENTED; - return 0; -} - - -HANDLE -APIENTRY -NtGdiDdGetDxHandle( - IN OPTIONAL HANDLE hDirectDraw, - IN OPTIONAL HANDLE hSurface, - IN BOOL bRelease -) -{ - UNIMPLEMENTED; - return NULL; -} - - -BOOL -APIENTRY -NtGdiDdSetGammaRamp( - IN HANDLE hDirectDraw, - IN HDC hdc, - IN LPVOID lpGammaRamp -) -{ - UNIMPLEMENTED; - return FALSE; -} - - -DWORD -APIENTRY -NtGdiDdLockD3D( - IN HANDLE hSurface, - IN OUT PDD_LOCKDATA puLockData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdUnlockD3D( - IN HANDLE hSurface, - IN OUT PDD_UNLOCKDATA puUnlockData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdCreateD3DBuffer( - IN HANDLE hDirectDraw, - IN OUT HANDLE* hSurface, - IN OUT DDSURFACEDESC* puSurfaceDescription, - IN OUT DD_SURFACE_GLOBAL* puSurfaceGlobalData, - IN OUT DD_SURFACE_LOCAL* puSurfaceLocalData, - IN OUT DD_SURFACE_MORE* puSurfaceMoreData, - IN OUT DD_CREATESURFACEDATA* puCreateSurfaceData, - IN OUT HANDLE* puhSurface -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdCanCreateD3DBuffer( - IN HANDLE hDirectDraw, - IN OUT PDD_CANCREATESURFACEDATA puCanCreateSurfaceData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdDestroyD3DBuffer( - IN HANDLE hSurface -) -{ - UNIMPLEMENTED; - return 0; -} - - -BOOL -APIENTRY -NtGdiD3dContextCreate( - IN HANDLE hDirectDrawLocal, - IN HANDLE hSurfColor, - IN HANDLE hSurfZ, - IN OUT D3DNTHAL_CONTEXTCREATEI *pdcci -) -{ - UNIMPLEMENTED; - return FALSE; -} - - -DWORD -APIENTRY -NtGdiD3dContextDestroy( - IN LPD3DNTHAL_CONTEXTDESTROYDATA pdcdd -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiD3dContextDestroyAll( - OUT LPD3DNTHAL_CONTEXTDESTROYALLDATA pdcdad -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiD3dValidateTextureStageState( - IN OUT LPD3DNTHAL_VALIDATETEXTURESTAGESTATEDATA pData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiD3dDrawPrimitives2( - IN HANDLE hCmdBuf, - IN HANDLE hVBuf, - IN OUT LPD3DNTHAL_DRAWPRIMITIVES2DATA pded, - IN OUT FLATPTR* pfpVidMemCmd, - IN OUT DWORD* pdwSizeCmd, - IN OUT FLATPTR* pfpVidMemVtx, - IN OUT DWORD* pdwSizeVtx -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdGetDriverState( - IN OUT PDD_GETDRIVERSTATEDATA pdata -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdCreateSurfaceEx( - IN HANDLE hDirectDraw, - IN HANDLE hSurface, - IN DWORD dwSurfaceHandle -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpCanCreateVideoPort( - IN HANDLE hDirectDraw, - IN OUT PDD_CANCREATEVPORTDATA puCanCreateVPortData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpColorControl( - IN HANDLE hVideoPort, - IN OUT PDD_VPORTCOLORDATA puVPortColorData -) -{ - UNIMPLEMENTED; - return 0; -} - - -HANDLE -APIENTRY -NtGdiDvpCreateVideoPort( - IN HANDLE hDirectDraw, - IN OUT PDD_CREATEVPORTDATA puCreateVPortData -) -{ - UNIMPLEMENTED; - return NULL; -} - - -DWORD -APIENTRY -NtGdiDvpDestroyVideoPort( - IN HANDLE hVideoPort, - IN OUT PDD_DESTROYVPORTDATA puDestroyVPortData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpFlipVideoPort( - IN HANDLE hVideoPort, - IN HANDLE hDDSurfaceCurrent, - IN HANDLE hDDSurfaceTarget, - IN OUT PDD_FLIPVPORTDATA puFlipVPortData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpGetVideoPortBandwidth( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTBANDWIDTHDATA puGetVPortBandwidthData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpGetVideoPortField( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTFIELDDATA puGetVPortFieldData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpGetVideoPortFlipStatus( - IN HANDLE hDirectDraw, - IN OUT PDD_GETVPORTFLIPSTATUSDATA puGetVPortFlipStatusData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpGetVideoPortInputFormats( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTINPUTFORMATDATA puGetVPortInputFormatData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpGetVideoPortLine( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTLINEDATA puGetVPortLineData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpGetVideoPortOutputFormats( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTOUTPUTFORMATDATA puGetVPortOutputFormatData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpGetVideoPortConnectInfo( - IN HANDLE hDirectDraw, - IN OUT PDD_GETVPORTCONNECTDATA puGetVPortConnectData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpGetVideoSignalStatus( - IN HANDLE hVideoPort, - IN OUT PDD_GETVPORTSIGNALDATA puGetVPortSignalData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpUpdateVideoPort( - IN HANDLE hVideoPort, - IN HANDLE* phSurfaceVideo, - IN HANDLE* phSurfaceVbi, - IN OUT PDD_UPDATEVPORTDATA puUpdateVPortData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpWaitForVideoPortSync( - IN HANDLE hVideoPort, - IN OUT PDD_WAITFORVPORTSYNCDATA puWaitForVPortSyncData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpAcquireNotification( - IN HANDLE hVideoPort, - IN OUT HANDLE* hEvent, - IN LPDDVIDEOPORTNOTIFY pNotify -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDvpReleaseNotification( - IN HANDLE hVideoPort, - IN HANDLE hEvent -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdGetMoCompGuids( - IN HANDLE hDirectDraw, - IN OUT PDD_GETMOCOMPGUIDSDATA puGetMoCompGuidsData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdGetMoCompFormats( - IN HANDLE hDirectDraw, - IN OUT PDD_GETMOCOMPFORMATSDATA puGetMoCompFormatsData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdGetMoCompBuffInfo( - IN HANDLE hDirectDraw, - IN OUT PDD_GETMOCOMPCOMPBUFFDATA puGetBuffData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdGetInternalMoCompInfo( - IN HANDLE hDirectDraw, - IN OUT PDD_GETINTERNALMOCOMPDATA puGetInternalData -) -{ - UNIMPLEMENTED; - return 0; -} - - -HANDLE -APIENTRY -NtGdiDdCreateMoComp( - IN HANDLE hDirectDraw, - IN OUT PDD_CREATEMOCOMPDATA puCreateMoCompData -) -{ - UNIMPLEMENTED; - return NULL; -} - - -DWORD -APIENTRY -NtGdiDdDestroyMoComp( - IN HANDLE hMoComp, - IN OUT PDD_DESTROYMOCOMPDATA puDestroyMoCompData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdBeginMoCompFrame( - IN HANDLE hMoComp, - IN OUT PDD_BEGINMOCOMPFRAMEDATA puBeginFrameData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdEndMoCompFrame( - IN HANDLE hMoComp, - IN OUT PDD_ENDMOCOMPFRAMEDATA puEndFrameData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdRenderMoComp( - IN HANDLE hMoComp, - IN OUT PDD_RENDERMOCOMPDATA puRenderMoCompData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdQueryMoCompStatus( - IN HANDLE hMoComp, - IN OUT PDD_QUERYMOCOMPSTATUSDATA puQueryMoCompStatusData -) -{ - UNIMPLEMENTED; - return 0; -} - - -DWORD -APIENTRY -NtGdiDdAlphaBlt( - IN HANDLE hSurfaceDest, - IN OPTIONAL HANDLE hSurfaceSrc, - IN OUT PDD_BLTDATA puBltData -) -{ - UNIMPLEMENTED; - return 0; -} - - BOOL APIENTRY NtGdiAlphaBlend( Modified: branches/nwin32/subsystems/win32/win32k/todo.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/todo.c [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/todo.c [iso-8859-1] Wed Aug 6 11:55:07 2008 @@ -2,7 +2,7 @@ -DriverEntry - We are loaded once per session by smss. - What functions does smss use to load us? When is DriverEntry actually called? - -What should DriverEntry do, and what should NtGdiInit and NtUserInitialize do? + - What should we do here? -NtGdiInit - When are we called and what should we do? -NtUserInitialize @@ -10,25 +10,16 @@ System calls: -NtGdi compatible with 2003. Missing parameters only for NtGdiGetSpoolMessage. - - Add stubs in /ntgdi/ + - Add stubs in /ntgdi/ and /ntddraw/ -NtUser: Functions need to be researched for parameters. - We miss quite a few and I guess the functions which are compatible in name/parameter numbers may have ros-specific params. + We miss quite a few and most of the functions which are compatible in name/parameter numbers probably have ros-specific parameters/behaviour. In short, a lot of research and review is needed. - gdi32 and user32 - - Need to be fixed not to use ros-specific system calls. + - Need to be fixed to compile (not to use ros-specific system calls). - gdi32 is the easiest. Much is done but #if 0-ed due to remaining problems. - - user32 needs a big overview (*cough*, rewrite, *cough*) and fixup. *Requires more NtUser syscall documentation.* + - user32 needs a big overview (*cough*, rewrite, *cough*) and fixup. Interaction with display drivers - - Videoprt needs cleanup (rewriteeeeeeeee) and review. I have begun some major cleanup, but not done yet (mostly code style and unfscking). - -Interaction with csrss and friends - - ... - - - -NOTE - The module is named "nwin32k" as to not conflict with win32k during build. + - Videoprt needs cleanup (rewriteeeeeeeee) and review. I have begun some major cleanup, but not done yet (mostly code style and unfscking). Modified: branches/nwin32/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Wed Aug 6 11:55:07 2008 @@ -47,7 +47,12 @@ <file>init.c</file> </directory> <directory name="ntddraw"> + <file>d3d.c</file> + <file>dd.c</file> <file>ddeng.c</file> + <file>ddsurf.c</file> + <file>dvp.c</file> + <file>mocomp.c</file> </directory> <directory name="ntgdi"> <file>gdifuncs.c</file>

16 years, 2 months

[jmorlan] 35147: - GetUserNameW: Re-set an_len to the actual buffer size before second LookupAccountSidW call; set *lpSize correctly; fix leakage of hToken in failure cases. - GetUserNameA: Don't include nul terminator when calculating NameW.Length. Remove redundant nul termination of NameA (RtlUnicodeStringToAnsiString already does it)

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Wed Aug 6 10:41:09 2008 New Revision: 35147 URL: http://svn.reactos.org/svn/reactos?rev=35147&view=rev Log: - GetUserNameW: Re-set an_len to the actual buffer size before second LookupAccountSidW call; set *lpSize correctly; fix leakage of hToken in failure cases. - GetUserNameA: Don't include nul terminator when calculating NameW.Length. Remove redundant nul termination of NameA (RtlUnicodeStringToAnsiString already does it) Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c Modified: trunk/reactos/dll/win32/advapi32/sec/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/mis… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/misc.c [iso-8859-1] Wed Aug 6 10:41:09 2008 @@ -739,9 +739,8 @@ lpSize); if(Ret) { - NameW.Length = (*lpSize) * sizeof(WCHAR); + NameW.Length = (*lpSize - 1) * sizeof(WCHAR); RtlUnicodeStringToAnsiString(&NameA, &NameW, FALSE); - NameA.Buffer[NameA.Length] = '\0'; *lpSize = NameA.Length + 1; } @@ -791,6 +790,7 @@ if ( !tu_buf ) { SetLastError ( ERROR_NOT_ENOUGH_MEMORY ); + CloseHandle ( hToken ); return FALSE; } if ( !GetTokenInformation ( hToken, TokenUser, tu_buf, 36, &tu_len ) || tu_len > 36 ) @@ -800,6 +800,7 @@ if ( !tu_buf ) { SetLastError ( ERROR_NOT_ENOUGH_MEMORY ); + CloseHandle ( hToken ); return FALSE; } if ( !GetTokenInformation ( hToken, TokenUser, tu_buf, tu_len, &tu_len ) ) @@ -811,6 +812,7 @@ return FALSE; } } + CloseHandle ( hToken ); token_user = (TOKEN_USER*)tu_buf; an_len = *lpSize; @@ -836,27 +838,21 @@ return FALSE; } } + an_len = *lpSize; if ( !LookupAccountSidW ( NULL, token_user->User.Sid, lpszName, &an_len, domain_name, &dn_len, &snu ) ) { /* don't call SetLastError(), as LookupAccountSid() ought to have set one */ LocalFree ( domain_name ); - CloseHandle ( hToken ); + LocalFree ( tu_buf ); + *lpSize = an_len; return FALSE; } } LocalFree ( domain_name ); LocalFree ( tu_buf ); - CloseHandle ( hToken ); - - if ( an_len > *lpSize ) - { - *lpSize = an_len; - SetLastError(ERROR_INSUFFICIENT_BUFFER); - return FALSE; - } - + *lpSize = an_len + 1; return TRUE; }

16 years, 2 months

[fireball] 35146: - Replace stupid concept of using a set of global variables for various boolean flags (1 variable per 1 flag) by a concept of one global var having a specified set of flags (FSCHECK_VERBOSE, etc).

by fireball＠svn.reactos.org

Author: fireball Date: Wed Aug 6 08:07:28 2008 New Revision: 35146 URL: http://svn.reactos.org/svn/reactos?rev=35146&view=rev Log: - Replace stupid concept of using a set of global variables for various boolean flags (1 variable per 1 flag) by a concept of one global var having a specified set of flags (FSCHECK_VERBOSE, etc). Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c trunk/reactos/lib/fslib/vfatlib/check/check.c trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h trunk/reactos/lib/fslib/vfatlib/check/fat.c trunk/reactos/lib/fslib/vfatlib/check/io.c trunk/reactos/lib/fslib/vfatlib/check/lfn.c Modified: trunk/reactos/lib/fslib/vfatlib/check/boot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/bo… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/boot.c [iso-8859-1] Wed Aug 6 08:07:28 2008 @@ -119,10 +119,10 @@ VfatPrint( "And there is no space for creating one!\n" ); return; } - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint( "1) Create one\n2) Do without a backup\n" ); else VfatPrint( " Auto-creating backup boot block.\n" ); - if (!interactive || get_key("12","?") == '1') { + if (!(FsCheckFlags & FSCHECK_INTERACTIVE) || get_key("12","?") == '1') { int bbs; /* The usual place for the backup boot sector is sector 6. Choose * that or the last reserved sector. */ @@ -167,12 +167,12 @@ } VfatPrint( "\n" ); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint( "1) Copy original to backup\n" "2) Copy backup to original\n" "3) No action\n" ); else VfatPrint( " Not automatically fixing this.\n" ); - switch (interactive ? get_key("123","?") : '3') { + switch ((FsCheckFlags & FSCHECK_INTERACTIVE) ? get_key("123","?") : '3') { case '1': fs_write(fs->backupboot_start,sizeof(*b),b); break; @@ -200,10 +200,10 @@ if (!b->info_sector) { VfatPrint( "No FSINFO sector\n" ); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint( "1) Create one\n2) Do without FSINFO\n" ); else VfatPrint( " Not automatically creating it.\n" ); - if (interactive && get_key("12","?") == '1') { + if ((FsCheckFlags & FSCHECK_INTERACTIVE) && get_key("12","?") == '1') { /* search for a free reserved sector (not boot sector and not * backup boot sector) */ __u32 s; @@ -248,10 +248,10 @@ VfatPrint( " Offset %llu: 0x%04x != expected 0x%04x\n", (__u64)offsetof(struct info_sector,boot_sign), CF_LE_W(i.boot_sign),0xaa55); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint( "1) Correct\n2) Don't correct (FSINFO invalid then)\n" ); else VfatPrint( " Auto-correcting it.\n" ); - if (!interactive || get_key("12","?") == '1') { + if (!(FsCheckFlags & FSCHECK_INTERACTIVE) || get_key("12","?") == '1') { init_fsinfo(&i); fs_write(fs->fsinfo_start,sizeof(i),&i); } @@ -280,7 +280,7 @@ fs->nfats = b.fats; sectors = GET_UNALIGNED_W(b.sectors); total_sectors = sectors ? sectors : CF_LE_L(b.total_sect); - if (verbose) VfatPrint("Checking we can access the last sector of the filesystem\n"); + if (FsCheckFlags & FSCHECK_VERBOSE) VfatPrint("Checking we can access the last sector of the filesystem\n"); /* Can't access last odd sector anyway, so round down */ fs_test((loff_t)((total_sectors & ~1)-1)*(loff_t)logical_sector_size, logical_sector_size); @@ -358,7 +358,7 @@ /* ++roman: On Atari, these two fields are often left uninitialized */ if (!atari_format && (!b.secs_track || !b.heads)) die("Invalid disk format in boot sector."); - if (verbose) dump_boot(fs,&b,logical_sector_size); + if (FsCheckFlags & FSCHECK_VERBOSE) dump_boot(fs,&b,logical_sector_size); } /* Local Variables: */ Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] Wed Aug 6 08:07:28 2008 @@ -267,7 +267,7 @@ /* Only complain about too much suspicious chars in interactive mode, * never correct them automatically. The chars are all basically ok, so we * shouldn't auto-correct such names. */ - if (interactive && suspicious > 6) + if ((FsCheckFlags & FSCHECK_INTERACTIVE) && suspicious > 6) return 1; return 0; } @@ -365,11 +365,11 @@ name = strncmp((char*)file->dir_ent.name,MSDOS_DOT,MSDOS_NAME) ? ".." : "."; if (!(file->dir_ent.attr & ATTR_DIR)) { VfatPrint("%s\n Is a non-directory.\n",path_name(file)); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint("1) Drop it\n2) Auto-rename\n3) Rename\n" "4) Convert to directory\n"); else VfatPrint(" Auto-renaming it.\n"); - switch (interactive ? get_key("1234","?") : '2') { + switch ((FsCheckFlags & FSCHECK_INTERACTIVE) ? get_key("1234","?") : '2') { case '1': drop_file(fs,file); return 1; @@ -483,7 +483,7 @@ "is FAT32 root dir.\n", clusters*fs->cluster_size ); do_trunc = 1; } - else if (interactive) + else if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint("1) Truncate first to %lu bytes%s\n" "2) Truncate second to %lu bytes\n",clusters*fs->cluster_size, restart ? " and restart" : "",clusters2*fs->cluster_size); @@ -491,7 +491,7 @@ fs->cluster_size); if (do_trunc != 2 && (do_trunc == 1 || - (interactive && get_key("12","?") == '1'))) { + ((FsCheckFlags & FSCHECK_INTERACTIVE) && get_key("12","?") == '1'))) { prev = 0; clusters = 0; for (this = FSTART(owner,fs); this > 0 && this != -1; this = @@ -561,7 +561,7 @@ VfatPrint("%s\n Has a large number of bad entries. (%d/%d)\n", path_name(parent),bad,good+bad); if (!dots) VfatPrint( " Not dropping root directory.\n" ); - else if (!interactive) VfatPrint(" Not dropping it in auto-mode.\n"); + else if (!(FsCheckFlags & FSCHECK_INTERACTIVE)) VfatPrint(" Not dropping it in auto-mode.\n"); else if (get_key("yn","Drop directory ? (y/n)") == 'y') { truncate_file(fs,parent,0); MODIFY(parent,name[0],DELETED_FLAG); @@ -584,11 +584,11 @@ if (!((*walk)->dir_ent.attr & ATTR_VOLUME) && bad_name((*walk)->dir_ent.name)) { VfatPrint("%s\n Bad file name.\n",path_name(*walk)); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint("1) Drop file\n2) Rename file\n3) Auto-rename\n" "4) Keep it\n"); else VfatPrint(" Auto-renaming it.\n"); - switch (interactive ? get_key("1234","?") : '3') { + switch ((FsCheckFlags & FSCHECK_INTERACTIVE) ? get_key("1234","?") : '3') { case '1': drop_file(fs,*walk); walk = &(*walk)->next; @@ -616,12 +616,12 @@ VfatPrint("%s\n Duplicate directory entry.\n First %s\n", path_name(*walk),file_stat(*walk)); VfatPrint(" Second %s\n",file_stat(*scan)); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint("1) Drop first\n2) Drop second\n3) Rename first\n" "4) Rename second\n5) Auto-rename first\n" "6) Auto-rename second\n"); else VfatPrint(" Auto-renaming second.\n"); - switch (interactive ? get_key("123456","?") : '6') { + switch ((FsCheckFlags & FSCHECK_INTERACTIVE) ? get_key("123456","?") : '6') { case '1': drop_file(fs,*walk); *walk = (*walk)->next; @@ -789,7 +789,7 @@ if (type == fdt_undelete) undelete(fs,new); **chain = new; *chain = &new->next; - if (list) { + if (FsCheckFlags & FSCHECK_LIST_FILES) { VfatPrint("Checking file %s",path_name(new)); if (new->lfn) VfatPrint(" (%s)", file_name(new->dir_ent.name) ); @@ -799,7 +799,7 @@ strncmp((char*)de.name,MSDOS_DOT,MSDOS_NAME) != 0 && strncmp((char*)de.name,MSDOS_DOTDOT,MSDOS_NAME) != 0) ++n_files; - test_file(fs,new,test); + test_file(fs,new,FsCheckFlags & FSCHECK_TEST_READ); } Modified: trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/do… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/dosfsck.h [iso-8859-1] Wed Aug 6 08:07:28 2008 @@ -28,13 +28,6 @@ #define CT_LE_L(v) (v) #endif - -#define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */ -#define _LINUX_STRING_H_ /* hack to avoid inclusion of <linux/string.h>*/ -#define _LINUX_FS_H /* hack to avoid inclusion of <linux/fs.h> */ - -//#include <linux/version.h> -//# include "types.h" #ifdef _M_IX86 #include "byteorder.h" @@ -165,7 +158,13 @@ #define offsetof(t,e) ((int)&(((t *)0)->e)) #endif -extern int interactive,list,verbose,test,write_immed; +#define FSCHECK_INTERACTIVE 0x01 +#define FSCHECK_LIST_FILES 0x02 +#define FSCHECK_TEST_READ 0x04 +#define FSCHECK_VERBOSE 0x08 +#define FSCHECK_IMMEDIATE_WRITE 0x10 + +extern ULONG FsCheckFlags; extern int atari_format; extern unsigned n_files; extern void *mem_queue; Modified: trunk/reactos/lib/fslib/vfatlib/check/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fa… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] Wed Aug 6 08:07:28 2008 @@ -79,7 +79,7 @@ fs_write(fs->fat_start,eff_size,use = second); } if (first_ok && second_ok) { - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { VfatPrint("FATs differ but appear to be intact. Use which FAT ?\n" "1) Use first FAT\n2) Use second FAT\n"); if (get_key("12","?") == '1') @@ -199,7 +199,7 @@ { unsigned long i; - if (verbose) + if (FsCheckFlags & FSCHECK_VERBOSE) VfatPrint("Checking for bad clusters.\n"); for (i = 2; i < fs->clusters+2; i++) if (!get_owner(fs,i) && !FAT_IS_BAD(fs,fs->fat[i].value)) @@ -215,7 +215,7 @@ int reclaimed; unsigned long i; - if (verbose) + if (FsCheckFlags & FSCHECK_VERBOSE) VfatPrint("Checking for unused clusters.\n"); reclaimed = 0; for (i = 2; i < fs->clusters+2; i++) @@ -261,7 +261,7 @@ int reclaimed,files,changed; unsigned long i,next,walk; - if (verbose) + if (FsCheckFlags & FSCHECK_VERBOSE) VfatPrint("Reclaiming unconnected clusters.\n"); for (i = 2; i < fs->clusters+2; i++) fs->fat[i].prev = 0; for (i = 2; i < fs->clusters+2; i++) { @@ -324,25 +324,25 @@ if (!fs->fsinfo_start) return free; - if (verbose) + if (FsCheckFlags & FSCHECK_VERBOSE) VfatPrint("Checking free cluster summary.\n"); if (fs->free_clusters >= 0) { if (free != fs->free_clusters) { VfatPrint( "Free cluster summary wrong (%ld vs. really %ld)\n", fs->free_clusters,free); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint( "1) Correct\n2) Don't correct\n" ); else VfatPrint( " Auto-correcting.\n" ); - if (!interactive || get_key("12","?") == '1') + if (!(FsCheckFlags & FSCHECK_INTERACTIVE) || get_key("12","?") == '1') do_set = 1; } } else { VfatPrint( "Free cluster summary uninitialized (should be %ld)\n", free ); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint( "1) Set it\n2) Leave it uninitialized\n" ); else VfatPrint( " Auto-setting.\n" ); - if (!interactive || get_key("12","?") == '1') + if (!(FsCheckFlags & FSCHECK_INTERACTIVE) || get_key("12","?") == '1') do_set = 1; } Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] Wed Aug 6 08:07:28 2008 @@ -139,7 +139,7 @@ int did; #if 1 //SAE - if (write_immed) { + if (FsCheckFlags & FSCHECK_IMMEDIATE_WRITE) { void *scratch; const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; const loff_t seekpos_aligned = pos - (pos % 512); @@ -204,10 +204,10 @@ static void fs_flush(void) { CHANGE *this; - int old_write_immed = write_immed; + int old_write_immed = (FsCheckFlags & FSCHECK_IMMEDIATE_WRITE); /* Disable writes to the list now */ - write_immed = 1; + FsCheckFlags |= FSCHECK_IMMEDIATE_WRITE; while (changes) { this = changes; @@ -220,7 +220,7 @@ } /* Restore values */ - write_immed = old_write_immed; + if (!old_write_immed) FsCheckFlags ^= FSCHECK_IMMEDIATE_WRITE; } Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] Wed Aug 6 08:07:28 2008 @@ -173,13 +173,13 @@ vffree( part2 ); can_clear = 1; } - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { VfatPrint( "1: Delete previous LFN\n2: Leave it as it is.\n" ); if (can_clear) VfatPrint( "3: Clear start bit and concatenate LFNs\n" ); } else VfatPrint( " Not auto-correcting this.\n" ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { switch( get_key( can_clear ? "123" : "12", "?" )) { case '1': clear_lfn_slots( 0, lfn_parts-1 ); @@ -210,12 +210,12 @@ VfatPrint( "Long filename fragment \"%s\" found outside a LFN " "sequence.\n (Maybe the start bit is missing on the " "last fragment)\n", part ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { VfatPrint( "1: Delete fragment\n2: Leave it as it is.\n" "3: Set start bit\n" ); } else VfatPrint( " Not auto-correcting this.\n" ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { switch( get_key( "123", "?" )) { case '1': if (!lfn_offsets) @@ -259,13 +259,13 @@ vffree( part2 ); can_fix = 1; } - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { VfatPrint( "1: Delete LFN\n2: Leave it as it is (and ignore LFN so far)\n" ); if (can_fix) VfatPrint( "3: Correct sequence number\n" ); } else VfatPrint( " Not auto-correcting this.\n" ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { switch( get_key( can_fix ? "123" : "12", "?" )) { case '1': lfn_offsets[lfn_parts++] = dir_offset; @@ -291,12 +291,12 @@ VfatPrint( "Checksum in long filename part wrong " "(%02x vs. expected %02x).\n", lfn->alias_checksum, lfn_checksum ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { VfatPrint( "1: Delete LFN\n2: Leave it as it is.\n" "3: Correct checksum\n" ); } else VfatPrint( " Not auto-correcting this.\n" ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { switch( get_key( "123", "?" )) { case '1': lfn_offsets[lfn_parts++] = dir_offset; @@ -326,10 +326,10 @@ if (lfn->reserved != 0) { VfatPrint( "Reserved field in VFAT long filename slot is not 0 " "(but 0x%02x).\n", lfn->reserved ); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint( "1: Fix.\n2: Leave it.\n" ); else VfatPrint( "Auto-setting to 0.\n" ); - if (!interactive || get_key("12","?") == '1') { + if (!(FsCheckFlags & FSCHECK_INTERACTIVE) || get_key("12","?") == '1') { lfn->reserved = 0; fs_write( dir_offset+offsetof(LFN_ENT,reserved), sizeof(lfn->reserved), &lfn->reserved ); @@ -338,10 +338,10 @@ if (lfn->start != CT_LE_W(0)) { VfatPrint( "Start cluster field in VFAT long filename slot is not 0 " "(but 0x%04x).\n", lfn->start ); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint( "1: Fix.\n2: Leave it.\n" ); else VfatPrint( "Auto-setting to 0.\n" ); - if (!interactive || get_key("12","?") == '1') { + if (!(FsCheckFlags & FSCHECK_INTERACTIVE) || get_key("12","?") == '1') { lfn->start = CT_LE_W(0); fs_write( dir_offset+offsetof(LFN_ENT,start), sizeof(lfn->start),&lfn->start ); @@ -382,13 +382,13 @@ " (Start may have been overwritten by %s)\n", long_name, short_name ); vffree( long_name ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { VfatPrint( "1: Delete LFN\n2: Leave it as it is.\n" "3: Fix numbering (truncates long name and attaches " "it to short name %s)\n", short_name ); } else VfatPrint( " Not auto-correcting this.\n" ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { switch( get_key( "123", "?" )) { case '1': clear_lfn_slots( 0, lfn_parts-1 ); @@ -422,13 +422,13 @@ " (Short name %s may have changed without updating the long name)\n", long_name, short_name ); vffree( long_name ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { VfatPrint( "1: Delete LFN\n2: Leave it as it is.\n" "3: Fix checksum (attaches to short name %s)\n", short_name ); } else VfatPrint( " Not auto-correcting this.\n" ); - if (interactive) { + if (FsCheckFlags & FSCHECK_INTERACTIVE) { switch( get_key( "123", "?" )) { case '1': clear_lfn_slots( 0, lfn_parts-1 ); @@ -461,10 +461,10 @@ long_name = CNV_PARTS_SO_FAR(); VfatPrint("Orphaned long file name part \"%s\"\n", long_name); - if (interactive) + if (FsCheckFlags & FSCHECK_INTERACTIVE) VfatPrint( "1: Delete.\n2: Leave it.\n" ); else VfatPrint( " Auto-deleting.\n" ); - if (!interactive || get_key("12","?") == '1') { + if (!(FsCheckFlags & FSCHECK_INTERACTIVE) || get_key("12","?") == '1') { clear_lfn_slots(0, lfn_parts - 1); } lfn_reset();

16 years, 2 months

[sedwards] 35145: added library section msxml3, mfc40, runtimes: vc6, vc2005, vc2005sp1, vc2008runtime, vb3, vb4, vb5, vb6 Most don't work yet.

by sedwards＠svn.reactos.org

Author: sedwards Date: Wed Aug 6 07:48:36 2008 New Revision: 35145 URL: http://svn.reactos.org/svn/reactos?rev=35145&view=rev Log: added library section msxml3, mfc40, runtimes: vc6, vc2005, vc2005sp1, vc2008runtime,vb3,vb4,vb5,vb6 Most don't work yet. Modified: trunk/rosapps/applications/downloader/downloader.xml Modified: trunk/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/do… ============================================================================== --- trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/rosapps/applications/downloader/downloader.xml [iso-8859-1] Wed Aug 6 07:48:36 2008 @@ -116,6 +116,76 @@ <location>http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe</location> </application> </category> + <category name="Libraries" icon="4"> + <application name="Microsoft XML 3"> + <regname>msxml3</regname> + <version>3.0</version> + <description>MSXML3 is needed for some MSI Installers.</description> + <location>http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b1…</location> + </application> + <application name="OLE Viewer and Microsoft Foundation Classes version 4"> + <regname>mfc40</regname> + <version>4.0</version> + <description>MFC 4 is needed by some applications</description> + <location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location> + </application> + + <application name="Visual Basic 3 Runtime"> + <regname>vb3run</regname> + <version>3.0</version> + <description>Visual Basic 3 Runtime</description> + <location>http://download.microsoft.com/download/vb30/utility/1/w9xnt4/en-us/vb3run.e…</location> + </application> + + <application name="Visual Basic 4 Runtime"> + <regname>vb4run</regname> + <version>4.0</version> + <description>Visual Basic 4 Runtime</description> + <location>http://download.microsoft.com/download/vb40ent/sample27/1/w9xnt4/en-us/vb4r…</location> + </application> + + <application name="Visual Basic 5 Runtime"> + <regname>vb5run</regname> + <version>5.0</version> + <description>Visual Basic 5 Runtime</description> + <location>http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm…</location> + </application> + + <application name="Visual Basic 6 Runtime"> + <regname>vb6run</regname> + <version>6.0</version> + <description>Visual Basic 6 Runtime</description> + <location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru…</location> + </application> + + <application name="Visual Studio 6 Runtime"> + <regname>vc6run</regname> + <version>6.0</version> + <description>Visual Studio 6 Runtime</description> + <location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red…</location> + </application> + + <application name="Visual Studio 2005 Runtime"> + <regname>vc2005run</regname> + <version>7.0</version> + <description>Visual Studio 2005 Runtime</description> + <location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486…</location> + </application> + + <application name="Visual Studio 2005 Runtime SP1"> + <regname>vc2005sp1run</regname> + <version>7.1</version> + <description>Visual Studio 2005 Runtime SP1</description> + <location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906…</location> + </application> + + <application name="Visual Studio 2008 Runtime"> + <regname>vc2008run</regname> + <version>8.0</version> + <description>Visual Studio 2008 Runtime</description> + <location>http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5…</location> + </application> + </category> <category name="Multimedia" icon="4"> </category> <category name="Development" icon="5">

16 years, 2 months

[fireball] 35144: - Rename alloc/free to vfalloc/vffree to not conflict with other apps vfatlib links to.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Aug 6 07:03:34 2008 New Revision: 35144 URL: http://svn.reactos.org/svn/reactos?rev=35144&view=rev Log: - Rename alloc/free to vfalloc/vffree to not conflict with other apps vfatlib links to. Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c trunk/reactos/lib/fslib/vfatlib/check/common.c trunk/reactos/lib/fslib/vfatlib/check/common.h trunk/reactos/lib/fslib/vfatlib/check/fat.c trunk/reactos/lib/fslib/vfatlib/check/file.c trunk/reactos/lib/fslib/vfatlib/check/io.c trunk/reactos/lib/fslib/vfatlib/check/lfn.c Modified: trunk/reactos/lib/fslib/vfatlib/check/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/ch… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/check.c [iso-8859-1] Wed Aug 6 07:03:34 2008 @@ -130,7 +130,7 @@ DIR_ENT *root; int next_free = 0, scan; - root = alloc(fs->root_entries*sizeof(DIR_ENT)); + root = vfalloc(fs->root_entries*sizeof(DIR_ENT)); fs_read(fs->root_start,fs->root_entries*sizeof(DIR_ENT),root); while (next_free < (int)fs->root_entries) @@ -151,7 +151,7 @@ if (scan == (int)fs->root_entries) break; if (++curr_num >= 10000) die("Unable to create unique name"); } - free(root); + vffree(root); } ++n_files; return offset; Modified: trunk/reactos/lib/fslib/vfatlib/check/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/co… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/common.c [iso-8859-1] Wed Aug 6 07:03:34 2008 @@ -44,7 +44,7 @@ } -void *alloc(int size) +void *vfalloc(int size) { void *ptr; @@ -61,7 +61,7 @@ return ptr; } -void free(void *ptr) +void vffree(void *ptr) { RtlFreeHeap(RtlGetProcessHeap(), 0, ptr); } @@ -70,10 +70,10 @@ { LINK *link; - link = alloc(sizeof(LINK)); + link = vfalloc(sizeof(LINK)); link->next = *root; *root = link; - return link->data = alloc(size); + return link->data = vfalloc(size); } @@ -84,8 +84,8 @@ while (*root) { this = (LINK *) *root; *root = this->next; - free(this->data); - free(this); + vffree(this->data); + vffree(this); } } Modified: trunk/reactos/lib/fslib/vfatlib/check/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/co… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/common.h [iso-8859-1] Wed Aug 6 07:03:34 2008 @@ -17,8 +17,8 @@ /* Like die, but appends an error message according to the state of errno. */ -void *alloc(int size); -void free(void *ptr); +void *vfalloc(int size); +void vffree(void *ptr); /* mallocs SIZE bytes and returns a pointer to the data. Terminates the program if malloc fails. */ Modified: trunk/reactos/lib/fslib/vfatlib/check/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fa… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/fat.c [iso-8859-1] Wed Aug 6 07:03:34 2008 @@ -55,11 +55,11 @@ if (eff_size % 512) { eff_size += 512 - (eff_size % 512); } - first = alloc(eff_size); + first = vfalloc(eff_size); fs_read(fs->fat_start,eff_size,first); use = first; if (fs->nfats > 1) { - second = alloc(eff_size); + second = vfalloc(eff_size); fs_read(fs->fat_start+fs->fat_size,eff_size,second); } else @@ -106,9 +106,9 @@ i-2,fs->fat[i].value,fs->clusters+2-1); set_fat(fs,i,-1); } - free(first); + vffree(first); if (second) - free(second); + vffree(second); } Modified: trunk/reactos/lib/fslib/vfatlib/check/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/fi… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/file.c [iso-8859-1] Wed Aug 6 07:03:34 2008 @@ -128,7 +128,7 @@ die("Ambiguous name: \"%s\"",path); else if (here && !strncmp(name,walk->name,MSDOS_NAME)) break; if (!walk) { - walk = alloc(sizeof(FDSC)); + walk = vfalloc(sizeof(FDSC)); strncpy(walk->name,name,MSDOS_NAME); walk->type = here ? fdt_none : type; walk->first = NULL; @@ -203,7 +203,7 @@ die("Internal error: file_modify"); } next = (*this)->next; - free(*this); + vffree(*this); *this = next; } @@ -218,7 +218,7 @@ else if (this->type != fdt_none) VfatPrint("Warning: did not %s file %s\n",this->type == fdt_drop ? "drop" : "undelete",file_name((unsigned char*)this->name)); - free(this); + vffree(this); this = next; } } Modified: trunk/reactos/lib/fslib/vfatlib/check/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/io… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/io.c [iso-8859-1] Wed Aug 6 07:03:34 2008 @@ -86,14 +86,14 @@ const loff_t seekpos_aligned = pos - (pos % 512); // TMN: const size_t seek_delta = (size_t)(pos - seekpos_aligned); // TMN: const size_t readsize = (size_t)(pos - seekpos_aligned) + readsize_aligned; // TMN: - char* tmpBuf = alloc(readsize_aligned); // TMN: + char* tmpBuf = vfalloc(readsize_aligned); // TMN: if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %I64d",pos); if ((got = read(fd,tmpBuf,readsize_aligned)) < 0) pdie("Read %d bytes at %I64d",size,pos); assert(got >= size); got = size; assert(seek_delta + size <= readsize); memcpy(data, tmpBuf+seek_delta, size); - free(tmpBuf); + vffree(tmpBuf); #else // TMN: if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos); if ((got = read(fd,data,size)) < 0) pdie("Read %d bytes at %lld",size,pos); @@ -119,15 +119,15 @@ #if 1 // TMN const size_t readsize_aligned = (size % 512) ? (size + (512 - (size % 512))) : size; // TMN: const loff_t seekpos_aligned = pos - (pos % 512); // TMN: - scratch = alloc(readsize_aligned); + scratch = vfalloc(readsize_aligned); if (llseek(fd,seekpos_aligned,0) != seekpos_aligned) pdie("Seek to %lld",pos); okay = read(fd,scratch,readsize_aligned) == (int)readsize_aligned; - free(scratch); + vffree(scratch); #else // TMN: if (llseek(fd,pos,0) != pos) pdie("Seek to %lld",pos); - scratch = alloc(size); + scratch = vfalloc(size); okay = read(fd,scratch,size) == size; - free(scratch); + vffree(scratch); #endif // TMN: return okay; } @@ -148,7 +148,7 @@ /* Aloc temp buffer if write is not aligned */ if (use_read) - scratch = alloc(readsize_aligned); + scratch = vfalloc(readsize_aligned); else scratch = data; @@ -167,16 +167,16 @@ /* Write it back */ if ((did = write(fd,scratch,readsize_aligned)) == (int)readsize_aligned) { - if (use_read) free(scratch); + if (use_read) vffree(scratch); return; } if (did < 0) pdie("Write %d bytes at %I64d",size,pos); die("Wrote %d bytes instead of %d at %I64d",did,size,pos); } - new = alloc(sizeof(CHANGE)); + new = vfalloc(sizeof(CHANGE)); new->pos = pos; - memcpy(new->data = alloc(new->size = size),data,size); + memcpy(new->data = vfalloc(new->size = size),data,size); new->next = NULL; if (last) last->next = new; else changes = new; @@ -190,9 +190,9 @@ if (did < 0) pdie("Write %d bytes at %lld",size,pos); die("Wrote %d bytes instead of %d at %lld",did,size,pos); } - new = alloc(sizeof(CHANGE)); + new = vfalloc(sizeof(CHANGE)); new->pos = pos; - memcpy(new->data = alloc(new->size = size),data,size); + memcpy(new->data = vfalloc(new->size = size),data,size); new->next = NULL; if (last) last->next = new; else changes = new; @@ -215,8 +215,8 @@ fs_write(this->pos, this->size, this->data); - free(this->data); - free(this); + vffree(this->data); + vffree(this); } /* Restore values */ @@ -233,8 +233,8 @@ if (write) fs_flush(); else while (changes) { next = changes->next; - free(changes->data); - free(changes); + vffree(changes->data); + vffree(changes); changes = next; } if (close(fd) < 0) pdie("closing file system"); Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] Wed Aug 6 07:03:34 2008 @@ -81,7 +81,7 @@ else len += 4; } - cp = out = use_q ? qalloc( &mem_queue, len+1 ) : alloc( len+1 ); + cp = out = use_q ? qalloc( &mem_queue, len+1 ) : vfalloc( len+1 ); for( up = uni; (up-uni)/2 < maxlen && (up[0] || up[1]); up += 2 ) { if (UNICODE_CONVERTABLE(up[0],up[1])) @@ -132,10 +132,10 @@ void lfn_reset( void ) { if (lfn_unicode) - free( lfn_unicode ); + vffree( lfn_unicode ); lfn_unicode = NULL; if (lfn_offsets) - free( lfn_offsets ); + vffree( lfn_offsets ); lfn_offsets = NULL; lfn_slot = -1; } @@ -169,8 +169,8 @@ char *part2 = CNV_PARTS_SO_FAR(); VfatPrint( " It could be that the LFN start bit is wrong here\n" " if \"%s\" seems to match \"%s\".\n", part1, part2 ); - free( part1 ); - free( part2 ); + vffree( part1 ); + vffree( part2 ); can_clear = 1; } if (interactive) { @@ -197,8 +197,8 @@ } lfn_slot = lfn->id & LFN_ID_SLOTMASK; lfn_checksum = lfn->alias_checksum; - lfn_unicode = alloc( (lfn_slot*CHARS_PER_LFN+1)*2 ); - lfn_offsets = alloc( lfn_slot*sizeof(loff_t) ); + lfn_unicode = vfalloc( (lfn_slot*CHARS_PER_LFN+1)*2 ); + lfn_offsets = vfalloc( lfn_slot*sizeof(loff_t) ); lfn_parts = 0; } else if (lfn_slot == -1) { @@ -219,7 +219,7 @@ switch( get_key( "123", "?" )) { case '1': if (!lfn_offsets) - lfn_offsets = alloc( sizeof(loff_t) ); + lfn_offsets = vfalloc( sizeof(loff_t) ); lfn_offsets[0] = dir_offset; clear_lfn_slots( 0, 0 ); lfn_reset(); @@ -233,8 +233,8 @@ sizeof(lfn->id), &lfn->id ); lfn_slot = lfn->id & LFN_ID_SLOTMASK; lfn_checksum = lfn->alias_checksum; - lfn_unicode = alloc( (lfn_slot*CHARS_PER_LFN+1)*2 ); - lfn_offsets = alloc( lfn_slot*sizeof(loff_t) ); + lfn_unicode = vfalloc( (lfn_slot*CHARS_PER_LFN+1)*2 ); + lfn_offsets = vfalloc( lfn_slot*sizeof(loff_t) ); lfn_parts = 0; break; } @@ -255,8 +255,8 @@ char *part2 = CNV_PARTS_SO_FAR(); VfatPrint( " It could be that just the number is wrong\n" " if \"%s\" seems to match \"%s\".\n", part1, part2 ); - free( part1 ); - free( part2 ); + vffree( part1 ); + vffree( part2 ); can_fix = 1; } if (interactive) { @@ -381,7 +381,7 @@ VfatPrint( "Unfinished long file name \"%s\".\n" " (Start may have been overwritten by %s)\n", long_name, short_name ); - free( long_name ); + vffree( long_name ); if (interactive) { VfatPrint( "1: Delete LFN\n2: Leave it as it is.\n" "3: Fix numbering (truncates long name and attaches " @@ -421,7 +421,7 @@ VfatPrint( "Wrong checksum for long file name \"%s\".\n" " (Short name %s may have changed without updating the long name)\n", long_name, short_name ); - free( long_name ); + vffree( long_name ); if (interactive) { VfatPrint( "1: Delete LFN\n2: Leave it as it is.\n" "3: Fix checksum (attaches to short name %s)\n",

16 years, 2 months

← Newer
1
...
67
68
69
70
71
72
73
...
86
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 August 2008