Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 68051: [LAUTUS] Make the text files UTF-8 without BOM, and convert them to UTF-16 LE at compile time. Remove the now unneeded application/octet-stream type property and set native EOL one...
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 18:27:12 2015 New Revision: 68051 URL: http://svn.reactos.org/svn/reactos?rev=68051&view=rev Log: [LAUTUS] Make the text files UTF-8 without BOM, and convert them to UTF-16 LE at compile time. Remove the now unneeded application/octet-stream type property and set native EOL one. CORE-9770 Modified: trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt trunk/reactos/media/themes/lautus.msstyles/lautus.rc trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI (contents, props changed) Modified: trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/CMakeLists.txt [iso-8859-1] Sat Jun 6 18:27:12 2015 @@ -1,4 +1,22 @@ +list(APPEND TEXTFILES + textfiles/ExtraLargeNormal.INI + textfiles/LargeFontsNormal.INI + textfiles/NormalNormal.INI) + +foreach(_file ${TEXTFILES}) + get_filename_component(_file_name ${_file} NAME_WE) + string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _converted_file "${_file}") + string(REPLACE ${_file_name} "${_file_name}_utf16" _converted_file ${_converted_file}) + set(_file ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) + set(_converted_file ${CMAKE_CURRENT_BINARY_DIR}/${_converted_file}) + add_custom_command(OUTPUT ${_converted_file} + COMMAND native-utf16le ${_file} ${_converted_file} + DEPENDS native-utf16le ${_file}) + list(APPEND _converted_files ${_converted_file}) +endforeach() + +set_source_files_properties(lautus.rc PROPERTIES OBJECT_DEPENDS "${_converted_files}") add_library(lautus.msstyles SHARED lautus.rc) set_module_type(lautus.msstyles module) set_target_properties(lautus.msstyles PROPERTIES SUFFIX "") Modified: trunk/reactos/media/themes/lautus.msstyles/lautus.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== --- trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/lautus.msstyles/lautus.rc [iso-8859-1] Sat Jun 6 18:27:12 2015 @@ -15,9 +15,9 @@ 1 SIZENAMES {L"Normal Size\0Large Fonts\0Extra Large Fonts\0\0"} 1 MINDEPTH {0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x000F,0x0000,} -EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal.INI" -LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal.INI" -NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal.INI" +EXTRALARGENORMAL_INI TEXTFILE "textfiles/ExtraLargeNormal_utf16.INI" +LARGEFONTSNORMAL_INI TEXTFILE "textfiles/LargeFontsNormal_utf16.INI" +NORMALNORMAL_INI TEXTFILE "textfiles/NormalNormal_utf16.INI" THEMES_INI TEXTFILE {L"\r\n"} NORMAL_BALLOONCLOSE_BMP BITMAP "bitmaps/NORMAL_BALLOONCLOSE.bmp" Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream

1 0

[akhaldi] 68050: [FONTVIEW][HIVECLS] File filter improvements by Lee Schroeder. See CORE-9763 for details.
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 17:20:49 2015 New Revision: 68050 URL: http://svn.reactos.org/svn/reactos?rev=68050&view=rev Log: [FONTVIEW][HIVECLS] File filter improvements by Lee Schroeder. See CORE-9763 for details. Modified: trunk/reactos/base/applications/fontview/fontview.c trunk/reactos/base/applications/fontview/lang/bg-BG.rc trunk/reactos/base/applications/fontview/lang/cs-CZ.rc trunk/reactos/base/applications/fontview/lang/de-DE.rc trunk/reactos/base/applications/fontview/lang/en-US.rc trunk/reactos/base/applications/fontview/lang/es-ES.rc trunk/reactos/base/applications/fontview/lang/fr-FR.rc trunk/reactos/base/applications/fontview/lang/he-IL.rc trunk/reactos/base/applications/fontview/lang/it-IT.rc trunk/reactos/base/applications/fontview/lang/lt-LT.rc trunk/reactos/base/applications/fontview/lang/no-NO.rc trunk/reactos/base/applications/fontview/lang/pl-PL.rc trunk/reactos/base/applications/fontview/lang/pt-BR.rc trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/fontview/lang/ru-RU.rc trunk/reactos/base/applications/fontview/lang/sk-SK.rc trunk/reactos/base/applications/fontview/lang/sq-AL.rc trunk/reactos/base/applications/fontview/lang/sv-SE.rc trunk/reactos/base/applications/fontview/lang/tr-TR.rc trunk/reactos/base/applications/fontview/lang/uk-UA.rc trunk/reactos/base/applications/fontview/lang/zh-CN.rc trunk/reactos/base/applications/fontview/lang/zh-TW.rc trunk/reactos/base/applications/fontview/resource.h trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -24,6 +24,7 @@ #include <winnls.h> #include <shellapi.h> +#include <windowsx.h> #include "fontview.h" #include "resource.h" @@ -65,7 +66,7 @@ } static void -ErrorMsgBox(HWND hParent, DWORD dwCaptionID, DWORD dwMessageId, ...) +ErrorMsgBox(HWND hParent, DWORD dwMessageId, ...) { HLOCAL hMemCaption = NULL; HLOCAL hMemText = NULL; @@ -77,7 +78,7 @@ va_end(args); FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, dwCaptionID, 0, (LPWSTR)&hMemCaption, 0, NULL); + NULL, IDS_ERROR, 0, (LPWSTR)&hMemCaption, 0, NULL); MessageBoxW(hParent, hMemText, hMemCaption, MB_ICONERROR); @@ -117,11 +118,10 @@ if (argc < 2) { OPENFILENAMEW fontOpen; - HLOCAL dialogTitle = NULL; - - /* Gets the title for the dialog box ready */ - FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, IDS_OPEN, 0, (LPWSTR)&dialogTitle, 0, NULL); + WCHAR filter[MAX_PATH], dialogTitle[MAX_PATH]; + + LoadStringW(NULL, IDS_OPEN, dialogTitle, MAX_PATH); + LoadStringW(NULL, IDS_FILTER_LIST, filter, MAX_PATH); /* Clears out any values of fontOpen before we use it */ ZeroMemory(&fontOpen, sizeof(fontOpen)); @@ -129,8 +129,7 @@ /* Sets up the open dialog box */ fontOpen.lStructSize = sizeof(fontOpen); fontOpen.hwndOwner = NULL; - fontOpen.lpstrFilter = L"TrueType Font (*.ttf)\0*.ttf\0" - L"All Files (*.*)\0*.*\0"; + fontOpen.lpstrFilter = filter; fontOpen.lpstrFile = szFileName; fontOpen.lpstrTitle = dialogTitle; fontOpen.nMaxFile = MAX_PATH; @@ -145,11 +144,8 @@ } else { /* If the user decides to close out of the open dialog effectively exiting the program altogether */ - LocalFree(dialogTitle); return 0; } - - LocalFree(dialogTitle); } else { @@ -160,7 +156,7 @@ if (!AddFontResourceW(fileName)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); + ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); return -1; } @@ -168,20 +164,20 @@ dwSize = sizeof(g_ExtLogFontW.elfFullName); if (!GetFontResourceInfoW(fileName, &dwSize, g_ExtLogFontW.elfFullName, 1)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); + ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); return -1; } dwSize = sizeof(LOGFONTW); if (!GetFontResourceInfoW(fileName, &dwSize, &g_ExtLogFontW.elfLogFont, 2)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); + ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); return -1; } if (!Display_InitClass(hThisInstance)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOCLASS); + ErrorMsgBox(0, IDS_ERROR_NOCLASS); return -1; } @@ -202,7 +198,7 @@ /* Register the window class, and if it fails quit the program */ if (!RegisterClassExW (&wincl)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOCLASS); + ErrorMsgBox(0, IDS_ERROR_NOCLASS); return 0; } @@ -266,7 +262,7 @@ SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_ExtLogFontW); ShowWindow(hDisplay, SW_SHOWNORMAL); - /* Create the quit button */ + /* Create the install button */ LoadStringW(g_hInstance, IDS_INSTALL, szQuit, MAX_BUTTONNAME); hButtonInstall = CreateWindowExW( 0, /* Extended style */ @@ -342,7 +338,7 @@ fontExists = GetFileAttributes((LPCSTR)g_fileName); if (fontExists != 0xFFFFFFFF) /* If the file does not exist */ { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, g_fileName); + ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName); return -1; } Modified: trunk/reactos/base/applications/fontview/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/bg-BG.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "ÐÑÐ¼Ð° Ð´Ð¾ÑÑÐ°ÑÑÑÐ½Ð¾ Ð¼ÑÑÑÐ¾ Ð·Ð° Ð·Ð°Ð²ÑÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð´ÐµÐ¹ÑÑÐ²Ð¸ÐµÑÐ¾." IDS_ERROR_NOFONT "%1 Ð½Ðµ Ðµ ÑÐµÐ´Ð¾Ð²ÐµÐ½ ÑÑÐ¸ÑÑÐ¾Ð² ÑÐ°Ð¹Ð»." IDS_ERROR_NOCLASS "ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð¸Ð·Ð¿ÑÐ»Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ»Ð°ÑÐ° Ð½Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/cs-CZ.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "K dokonÄenÃ operace nenÃ dostatek pamÄti." IDS_ERROR_NOFONT "Soubor %1 nenÃ platnÃ½m souborem pÃsma." IDS_ERROR_NOCLASS "Inicializace okna aplikace selhala." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/de-DE.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "Es steht nicht genÃ¼gend Speicher zur VerfÃ¼gung." IDS_ERROR_NOFONT "Die angegebene Datei %1 ist keine gÃ¼ltige Schriftartendatei." IDS_ERROR_NOCLASS "Fehler beim Initialisieren der Fensterklasse." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/en-US.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "There's not enough memory to complete the operation." IDS_ERROR_NOFONT "The file %1 is not a valid font file." IDS_ERROR_NOCLASS "Could not initialize window class." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/es-ES.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ IDS_ERROR_NOMEM "No hay memoria suficiente para completar la operaciÃ³n." IDS_ERROR_NOFONT "El archivo %1 no es un archivo de fuente vÃ¡lido." IDS_ERROR_NOCLASS "No es posible iniciar la clase de ventana." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "MÃ©moire insuffisante pour terminer l'opÃ©ration." IDS_ERROR_NOFONT "Le fichier %1 n'est pas un fichier police valide." IDS_ERROR_NOCLASS "Impossible d'initialiser la classe de fenÃªtre." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/he-IL.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ IDS_ERROR_NOMEM "××× ××¡×¤××§ ××××¨×× ××× ×××©××× ××ª ××¤×¢×××." IDS_ERROR_NOFONT "××§×××¥ %1 ××× × ×§×××¥ ×××¤× ×× ×××§×." IDS_ERROR_NOCLASS "Could not initialize window class." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/it-IT.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "Memoria insufficiente per completare l'operazione." IDS_ERROR_NOFONT "Il file% 1 non Ã¨ un file di origine valido." IDS_ERROR_NOCLASS "Impossibile avviare la classe." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/lt-LT.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ IDS_ERROR_NOMEM "UÅ¾duoÄiai uÅ¾baigti, nepakanka atminties." IDS_ERROR_NOFONT "%1 nÄra teisinga Å¡rifto byla." IDS_ERROR_NOCLASS "Nepavyko inicijuoti lango klasÄs." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/no-NO.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "Det er ikke nok minne for Ã¥ fullfÃ¸re oppgaven." IDS_ERROR_NOFONT "Filen %1 er ikke et gyldig skriftfil." IDS_ERROR_NOCLASS "Kunne ikke initialise vindu klassen." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -18,4 +18,9 @@ IDS_ERROR_NOMEM "Brakuje pamiÄci do ukoÅczenia tej operacji." IDS_ERROR_NOFONT "Plik %1 nie jest poprawnym plikiem czcionki." IDS_ERROR_NOCLASS "Nie udaÅo siÄ zainicjowaÄ klasy window." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/pt-BR.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ IDS_ERROR_NOMEM "NÃ£o hÃ¡ memÃ³ria suficiente para completar a operaÃ§Ã£o." IDS_ERROR_NOFONT "O arquivo %1 nÃ£o Ã© um arquivo de fonte vÃ¡lida." IDS_ERROR_NOCLASS "NÃ£o foi possÃvel inicializar a janela." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ IDS_ERROR_NOMEM "Nu e destulÄ memorie pentru a Ã®ncheia operaÈia." IDS_ERROR_NOFONT "FiÈierul Â«%1Â» este un fiÈier font deteriorat." IDS_ERROR_NOCLASS "Nu s-a putut iniÈializa clasa de ferestre." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ IDS_ERROR_NOMEM "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸ Ð´Ð»Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸." IDS_ERROR_NOFONT "%1 Ð½Ðµ ÑÐ²Ð»ÑÐµÑÑÑ ÐºÐ¾ÑÑÐµÐºÑÐ½ÑÐ¼ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÑÐ¸ÑÑÐ°." IDS_ERROR_NOCLASS "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÐºÐ»Ð°ÑÑ Ð¾ÐºÐ½Ð°." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -15,4 +15,9 @@ IDS_ERROR_NOMEM "Na vykonanie tejto operÃ¡cie nie je dostatok voÄ¾nej pamÃ¤te." IDS_ERROR_NOFONT "PoÅ¾adovanÃ½ sÃºbor %1 nie je platnÃ½m sÃºborom pÃsiem." IDS_ERROR_NOCLASS "Nepodarilo sa inicializovaÅ¥ triedu window." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/sq-AL.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -14,4 +14,9 @@ IDS_ERROR_NOMEM "Nuk ka memorie tÃ« mjaftueshme pÃ«r tÃ« pÃ«rfunduar operacionin." IDS_ERROR_NOFONT "Dokumenti %1 nuk Ã«shtÃ« njÃ« font i vlefshem." IDS_ERROR_NOCLASS "Nuk mund tÃ« fillojÃ« dritaren e klases." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/sv-SE.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -17,4 +17,9 @@ IDS_ERROR_NOMEM "Det er inte nog minne fÃ¶r att slutfÃ¶re operationen." IDS_ERROR_NOFONT "Filen %1 Ã¤r inte en giltig typsnittsfil." IDS_ERROR_NOCLASS "Kunde inte initialisera Windows klassen." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/tr-TR.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -11,4 +11,9 @@ IDS_ERROR_NOMEM "Bu iÅlemi bitirmek iÃ§in yeterli bellek yok." IDS_ERROR_NOFONT "%1 kÃ¼tÃ¼ÄÃ¼, geÃ§erli bir yazÄ± tipi kÃ¼tÃ¼ÄÃ¼ deÄil." IDS_ERROR_NOCLASS "Pencere sÄ±nÄ±fÄ± baÅlatÄ±lamadÄ±." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -18,4 +18,9 @@ IDS_ERROR_NOMEM "ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ½ÑÐ¾ Ð¿Ð°Ð¼'ÑÑÑ Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð½Ñ Ð¾Ð¿ÐµÑÐ°ÑÑÑ." IDS_ERROR_NOFONT "Ð¤Ð°Ð¹Ð» %1 Ð½Ðµ Ñ ÐºÐ¾ÑÐµÐºÑÐ½Ð¸Ð¼ ÑÐ°Ð¹Ð»Ð¾Ð¼ ÑÑÐ¸ÑÑÑ." IDS_ERROR_NOCLASS "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÑÐ½ÑÑÑÐ°Ð»ÑÐ·ÑÐ²Ð°ÑÐ¸ Ð²ÑÐºÐ¾Ð½Ð½Ð¸Ð¹ ÐºÐ»Ð°Ñ." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -18,4 +18,9 @@ IDS_ERROR_NOMEM "æ²¡æè¶³å¤çååæ¥å®ææä½ã" IDS_ERROR_NOFONT "ï¼1ä¸æ¯ä¸ä¸ªææçåä½æ¡£æ¡ã" IDS_ERROR_NOCLASS "çªå£æ æ³åå§åã" + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -18,4 +18,9 @@ IDS_ERROR_NOMEM "æ²æè¶³å¤ çè¨æ¶é«ä¾å®ææä½ã" IDS_ERROR_NOFONT "%1 ä¸æ¯ä¸åææçåé«æªæ¡ã" IDS_ERROR_NOCLASS "çªå£ç¡æ³åå§åã" + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END Modified: trunk/reactos/base/applications/fontview/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -4,6 +4,7 @@ #define IDS_ERROR_NOMEM 101 #define IDS_ERROR_NOFONT 102 #define IDS_ERROR_NOCLASS 103 +#define IDS_FILTER_LIST 104 #define IDS_INSTALL 500 #define IDS_PRINT 501 Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -110,15 +110,22 @@ ; Fonts HKCR,".fon","",0x00000000,"fonfile" -HKCR,"fonfile","",0x00000000,"Font File" +HKCR,"fonfile","",0x00000000,"Font file" HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-166" HKCR,"fonfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155" +HKCR,"fonfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1" HKCR,".ttf","",0x00000000,"ttffile" -HKCR,"ttffile","",0x00000000,"TrueType Font File" +HKCR,"ttffile","",0x00000000,"TrueType font file" +HKCR,"ttffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-167" HKCR,"ttffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156" -HKCR,"ttffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-167" HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1" + +HKCR,".otf","",0x00000000,"otffile" +HKCR,"otffile","",0x00000000,"OpenType font file" +HKCR,"otffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156" +HKCR,"otffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-167" +HKCR,"otffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1" ; Help Files HKCR,".hlp","",0x00000000,"hlpfile"

1 0

[akhaldi] 68049: [UXTHEME] Add a missing WS_EX_DLGMODALFRAME check from the unthemed titlebar drawing code. By Ismael Ferreras Morezuelas (IRC name swyter). CORE-9635
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 17:08:21 2015 New Revision: 68049 URL: http://svn.reactos.org/svn/reactos?rev=68049&view=rev Log: [UXTHEME] Add a missing WS_EX_DLGMODALFRAME check from the unthemed titlebar drawing code. By Ismael Ferreras Morezuelas (IRC name swyter). CORE-9635 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sat Jun 6 17:08:21 2015 @@ -352,7 +352,8 @@ rcPart.top += 3 ; /* Draw the icon */ - if(hIcon && !(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW)) + if(hIcon && !(pcontext->wi.dwExStyle & WS_EX_TOOLWINDOW) + && !(pcontext->wi.dwExStyle & WS_EX_DLGMODALFRAME)) { int IconHeight = GetSystemMetrics(SM_CYSMICON); int IconWidth = GetSystemMetrics(SM_CXSMICON);

1 0

[hbelusca] 68048: Really fix r68047.
by hbelusca＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: hbelusca Date: Sat Jun 6 15:39:25 2015 New Revision: 68048 URL: http://svn.reactos.org/svn/reactos?rev=68048&view=rev Log: Really fix r68047. Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available.

1 0

[akhaldi] 68047: [LAUTUS] Revert r68045. Things are not always what they seem (tm).
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 15:24:52 2015 New Revision: 68047 URL: http://svn.reactos.org/svn/reactos?rev=68047&view=rev Log: [LAUTUS] Revert r68045. Things are not always what they seem (tm). Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI (contents, props changed) Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1 +0,0 @@ -native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1 +0,0 @@ -native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style (removed) @@ -1 +0,0 @@ -native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[akhaldi] 68046: [UDFS] Remove some unneeded headers, we have our own. CORE-9774
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 15:23:00 2015 New Revision: 68046 URL: http://svn.reactos.org/svn/reactos?rev=68046&view=rev Log: [UDFS] Remove some unneeded headers, we have our own. CORE-9774 Removed: trunk/reactos/drivers/filesystems/udfs/Include/mountmgr.h trunk/reactos/drivers/filesystems/udfs/Include/ntddscsi.h Removed: trunk/reactos/drivers/filesystems/udfs/Include/mountmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/mountmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/mountmgr.h (removed) @@ -1,169 +0,0 @@ -//////////////////////////////////////////////////////////////////// -// Copyright (C) Alexander Telyatnikov, Ivan Keliukh, Yegor Anchishkin, SKIF Software, 1999-2013. Kiev, Ukraine -// All rights reserved -//////////////////////////////////////////////////////////////////// -/*++ - -Copyright (c) 1997-1999 Microsoft Corporation - -Module Name: - - mountmgr.h - -Abstract: - - This file defines the external mount point interface for administering - mount points. - -Author: - - norbertk - -Revision History: - ---*/ - -#ifndef _MOUNTMGR_ -#define _MOUNTMGR_ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#ifndef FAR -#define FAR -#endif - - -#define MOUNTMGR_DEVICE_NAME L"\\Device\\MountPointManager" -#define MOUNTMGR_DOS_DEVICE_NAME L"\\\\.\\MountPointManager" - -#define MOUNTMGRCONTROLTYPE ((ULONG) 'm') -#define MOUNTDEVCONTROLTYPE ((ULONG) 'M') - -// -// These are the IOCTLs supported by the mount point manager. -// - -#define IOCTL_MOUNTMGR_CREATE_POINT CTL_CODE(MOUNTMGRCONTROLTYPE, 0, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_DELETE_POINTS CTL_CODE(MOUNTMGRCONTROLTYPE, 1, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_QUERY_POINTS CTL_CODE(MOUNTMGRCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY CTL_CODE(MOUNTMGRCONTROLTYPE, 3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER CTL_CODE(MOUNTMGRCONTROLTYPE, 4, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_AUTO_DL_ASSIGNMENTS CTL_CODE(MOUNTMGRCONTROLTYPE, 5, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED CTL_CODE(MOUNTMGRCONTROLTYPE, 6, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED CTL_CODE(MOUNTMGRCONTROLTYPE, 7, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_CHANGE_NOTIFY CTL_CODE(MOUNTMGRCONTROLTYPE, 8, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_MOUNTMGR_KEEP_LINKS_WHEN_OFFLINE CTL_CODE(MOUNTMGRCONTROLTYPE, 9, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_MOUNTMGR_CHECK_UNPROCESSED_VOLUMES CTL_CODE(MOUNTMGRCONTROLTYPE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION CTL_CODE(MOUNTMGRCONTROLTYPE, 11, METHOD_BUFFERED, FILE_READ_ACCESS) - -// -// Input structure for IOCTL_MOUNTMGR_CREATE_POINT. -// - -typedef struct _MOUNTMGR_CREATE_POINT_INPUT { - USHORT SymbolicLinkNameOffset; - USHORT SymbolicLinkNameLength; - USHORT DeviceNameOffset; - USHORT DeviceNameLength; -} MOUNTMGR_CREATE_POINT_INPUT, *PMOUNTMGR_CREATE_POINT_INPUT; - -// -// Input structure for IOCTL_MOUNTMGR_DELETE_POINTS, -// IOCTL_MOUNTMGR_QUERY_POINTS, and IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY. -// - -typedef struct _MOUNTMGR_MOUNT_POINT { - ULONG SymbolicLinkNameOffset; - USHORT SymbolicLinkNameLength; - ULONG UniqueIdOffset; - USHORT UniqueIdLength; - ULONG DeviceNameOffset; - USHORT DeviceNameLength; -} MOUNTMGR_MOUNT_POINT, *PMOUNTMGR_MOUNT_POINT; - -// -// Output structure for IOCTL_MOUNTMGR_DELETE_POINTS, -// IOCTL_MOUNTMGR_QUERY_POINTS, and IOCTL_MOUNTMGR_DELETE_POINTS_DBONLY. -// - -typedef struct _MOUNTMGR_MOUNT_POINTS { - ULONG Size; - ULONG NumberOfMountPoints; - MOUNTMGR_MOUNT_POINT MountPoints[1]; -} MOUNTMGR_MOUNT_POINTS, *PMOUNTMGR_MOUNT_POINTS; - -// -// Input structure for IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER. -// - -typedef struct _MOUNTMGR_DRIVE_LETTER_TARGET { - USHORT DeviceNameLength; - WCHAR DeviceName[1]; -} MOUNTMGR_DRIVE_LETTER_TARGET, *PMOUNTMGR_DRIVE_LETTER_TARGET; - -// -// Output structure for IOCTL_MOUNTMGR_NEXT_DRIVE_LETTER. -// - -typedef struct _MOUNTMGR_DRIVE_LETTER_INFORMATION { - BOOLEAN DriveLetterWasAssigned; - UCHAR CurrentDriveLetter; -} MOUNTMGR_DRIVE_LETTER_INFORMATION, *PMOUNTMGR_DRIVE_LETTER_INFORMATION; - -// -// Input structure for IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_CREATED and -// IOCTL_MOUNTMGR_VOLUME_MOUNT_POINT_DELETED. -// - -typedef struct _MOUNTMGR_VOLUME_MOUNT_POINT { - USHORT SourceVolumeNameOffset; - USHORT SourceVolumeNameLength; - USHORT TargetVolumeNameOffset; - USHORT TargetVolumeNameLength; -} MOUNTMGR_VOLUME_MOUNT_POINT, *PMOUNTMGR_VOLUME_MOUNT_POINT; - -// -// Input structure for IOCTL_MOUNTMGR_CHANGE_NOTIFY. -// Output structure for IOCTL_MOUNTMGR_CHANGE_NOTIFY. -// - -typedef struct _MOUNTMGR_CHANGE_NOTIFY_INFO { - ULONG EpicNumber; -} MOUNTMGR_CHANGE_NOTIFY_INFO, *PMOUNTMGR_CHANGE_NOTIFY_INFO; - -// -// Input structure for IOCTL_MOUNTMGR_KEEP_LINKS_WHEN_OFFLINE and -// IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION. -// - -typedef struct _MOUNTMGR_TARGET_NAME { - USHORT DeviceNameLength; - WCHAR DeviceName[1]; -} MOUNTMGR_TARGET_NAME, *PMOUNTMGR_TARGET_NAME; - -// -// The following IOCTL is supported by mounted devices. -// - -#define IOCTL_MOUNTDEV_QUERY_DEVICE_NAME CTL_CODE(MOUNTDEVCONTROLTYPE, 2, METHOD_BUFFERED, FILE_ANY_ACCESS) - -// -// Output structure for IOCTL_MOUNTDEV_QUERY_DEVICE_NAME. -// - -typedef struct _MOUNTDEV_NAME { - USHORT NameLength; - WCHAR Name[1]; -} MOUNTDEV_NAME, *PMOUNTDEV_NAME; - -// -// Devices that wish to be mounted should report this GUID in -// IoRegisterDeviceInterface. -// - -//DEFINE_GUID(MOUNTDEV_MOUNTED_DEVICE_GUID, 0x53f5630d, 0xb6bf, 0x11d0, 0x94, 0xf2, 0x00, 0xa0, 0xc9, 0x1e, 0xfb, 0x8b); - -#endif - Removed: trunk/reactos/drivers/filesystems/udfs/Include/ntddscsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/I… ============================================================================== --- trunk/reactos/drivers/filesystems/udfs/Include/ntddscsi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/udfs/Include/ntddscsi.h (removed) @@ -1,235 +0,0 @@ -/*++ BUILD Version: 0001 // Increment this if a change has global effects - -Copyright (c) 1990-1993 Microsoft Corporation - -Module Name: - - ntddscsi.h - -Abstract: - - This is the include file that defines all constants and types for - accessing the SCSI port adapters. - -Author: - - Jeff Havens - -Revision History: - ---*/ - -#ifndef _NTDDSCSIH_ -#define _NTDDSCSIH_ - -#pragma pack(push, 8) - -// -// Device Name - this string is the name of the device. It is the name -// that should be passed to NtOpenFile when accessing the device. -// -// Note: For devices that support multiple units, it should be suffixed -// with the Ascii representation of the unit number. -// - -#define IOCTL_SCSI_BASE FILE_DEVICE_CONTROLLER - -#define DD_SCSI_DEVICE_NAME "\\Device\\ScsiPort" - - -// -// NtDeviceIoControlFile IoControlCode values for this device. -// -// Warning: Remember that the low two bits of the code specify how the -// buffers are passed to the driver! -// - -#define IOCTL_SCSI_PASS_THROUGH CTL_CODE(IOCTL_SCSI_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SCSI_MINIPORT CTL_CODE(IOCTL_SCSI_BASE, 0x0402, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SCSI_GET_INQUIRY_DATA CTL_CODE(IOCTL_SCSI_BASE, 0x0403, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_GET_CAPABILITIES CTL_CODE(IOCTL_SCSI_BASE, 0x0404, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_PASS_THROUGH_DIRECT CTL_CODE(IOCTL_SCSI_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_SCSI_GET_ADDRESS CTL_CODE(IOCTL_SCSI_BASE, 0x0406, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_RESCAN_BUS CTL_CODE(IOCTL_SCSI_BASE, 0x0407, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_SCSI_GET_DUMP_POINTERS CTL_CODE(IOCTL_SCSI_BASE, 0x0408, METHOD_BUFFERED, FILE_ANY_ACCESS) - -// -// Define the SCSI pass through structure. -// - -typedef struct _SCSI_PASS_THROUGH { - USHORT Length; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR CdbLength; - UCHAR SenseInfoLength; - UCHAR DataIn; - ULONG DataTransferLength; - ULONG TimeOutValue; - ULONG DataBufferOffset; - ULONG SenseInfoOffset; - UCHAR Cdb[16]; -}SCSI_PASS_THROUGH, *PSCSI_PASS_THROUGH; - -// -// Define the SCSI pass through direct structure. -// - -typedef struct _SCSI_PASS_THROUGH_DIRECT { - USHORT Length; - UCHAR ScsiStatus; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - UCHAR CdbLength; - UCHAR SenseInfoLength; - UCHAR DataIn; - ULONG DataTransferLength; - ULONG TimeOutValue; - PVOID DataBuffer; - ULONG SenseInfoOffset; - UCHAR Cdb[16]; -}SCSI_PASS_THROUGH_DIRECT, *PSCSI_PASS_THROUGH_DIRECT; - -// -// Define SCSI information. -// Used with the IOCTL_SCSI_GET_INQUIRY_DATA IOCTL. -// - -typedef struct _SCSI_BUS_DATA { - UCHAR NumberOfLogicalUnits; - UCHAR InitiatorBusId; - ULONG InquiryDataOffset; -}SCSI_BUS_DATA, *PSCSI_BUS_DATA; - -// -// Define SCSI adapter bus information structure.. -// Used with the IOCTL_SCSI_GET_INQUIRY_DATA IOCTL. -// - -typedef struct _SCSI_ADAPTER_BUS_INFO { - UCHAR NumberOfBuses; - SCSI_BUS_DATA BusData[1]; -} SCSI_ADAPTER_BUS_INFO, *PSCSI_ADAPTER_BUS_INFO; - -// -// Define SCSI adapter bus information. -// Used with the IOCTL_SCSI_GET_INQUIRY_DATA IOCTL. -// - -typedef struct _SCSI_INQUIRY_DATA { - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; - BOOLEAN DeviceClaimed; - ULONG InquiryDataLength; - ULONG NextInquiryDataOffset; - UCHAR InquiryData[1]; -}SCSI_INQUIRY_DATA, *PSCSI_INQUIRY_DATA; - -// -// Define header for I/O control SRB. -// - -typedef struct _SRB_IO_CONTROL { - ULONG HeaderLength; - UCHAR Signature[8]; - ULONG Timeout; - ULONG ControlCode; - ULONG ReturnCode; - ULONG Length; -} SRB_IO_CONTROL, *PSRB_IO_CONTROL; - -// -// SCSI port driver capabilities structure. -// - -typedef struct _IO_SCSI_CAPABILITIES { - - // - // Length of this structure - // - - ULONG Length; - - // - // Maximum transfer size in single SRB - // - - ULONG MaximumTransferLength; - - // - // Maximum number of physical pages per data buffer - // - - ULONG MaximumPhysicalPages; - - // - // Async calls from port to class - // - - ULONG SupportedAsynchronousEvents; - - // - // Alignment mask for data transfers. - // - - ULONG AlignmentMask; - - // - // Supports tagged queuing - // - - BOOLEAN TaggedQueuing; - - // - // Host adapter scans down for bios devices. - // - - BOOLEAN AdapterScansDown; - - // - // The host adapter uses programmed I/O. - // - - BOOLEAN AdapterUsesPio; - -} IO_SCSI_CAPABILITIES, *PIO_SCSI_CAPABILITIES; - -typedef struct _SCSI_ADDRESS { - ULONG Length; - UCHAR PortNumber; - UCHAR PathId; - UCHAR TargetId; - UCHAR Lun; -}SCSI_ADDRESS, *PSCSI_ADDRESS; - -// -// Define structure for returning crash dump pointers. -// - -struct _ADAPTER_OBJECT; - -typedef struct _DUMP_POINTERS { - struct _ADAPTER_OBJECT *AdapterObject; - PVOID MappedRegisterBase; - PVOID PortConfiguration; - PVOID CommonBufferVa; - LARGE_INTEGER CommonBufferPa; - ULONG CommonBufferSize; -} DUMP_POINTERS, *PDUMP_POINTERS; - -// -// Define values for pass-through DataIn field. -// - -#define SCSI_IOCTL_DATA_OUT 0 -#define SCSI_IOCTL_DATA_IN 1 -#define SCSI_IOCTL_DATA_UNSPECIFIED 2 - -#pragma pack(pop) - -#endif -

1 0

[akhaldi] 68045: [LAUTUS] These ini files do not seem to be of application/octet-stream type.
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 15:14:16 2015 New Revision: 68045 URL: http://svn.reactos.org/svn/reactos?rev=68045&view=rev Log: [LAUTUS] These ini files do not seem to be of application/octet-stream type. Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI (contents, props changed) trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI (contents, props changed) Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/ExtraLargeNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/LargeFontsNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream Modified: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/lautus.msstyl… ============================================================================== Binary files - no diff available. Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/media/themes/lautus.msstyles/textfiles/NormalNormal.INI ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type (removed) @@ -1 +0,0 @@ -application/octet-stream

1 0

[akhaldi] 68044: [HIVECLS] Add the needed registry items for AssocGetPerceivedType. By Mark Jansen. CORE-9754
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 14:30:30 2015 New Revision: 68044 URL: http://svn.reactos.org/svn/reactos?rev=68044&view=rev Log: [HIVECLS] Add the needed registry items for AssocGetPerceivedType. By Mark Jansen. CORE-9754 Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Jun 6 14:30:30 2015 @@ -35,7 +35,9 @@ ; Virtual Device Drivers HKCR,".386","",0x00000000,"vxdfile" +HKCR,".386","PerceivedType",0x00000000,"system" HKCR,".vxd","",0x00000000,"vxdfile" +HKCR,".vxd","PerceivedType",0x00000000,"system" HKCR,"vxdfile","",0x00000000,"Virtual Device Driver" HKCR,"vxdfile","NoOpen",0x00000000,"" HKCR,"vxdfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-157" @@ -134,8 +136,10 @@ ; set MIME type for .html and .htm because Tiny webserver needs it HKCR,".htm","",0x00000000,"htmlfile" HKCR,".htm","Content Type",0x00000000,"text/html" +HKCR,".htm","PerceivedType",0x00000000,"text" HKCR,".html","",0x00000000,"htmlfile" HKCR,".html","Content Type",0x00000000,"text/html" +HKCR,".html","PerceivedType",0x00000000,"text" HKCR,"htmlfile","",0x00000000,"HTML File" HKCR,"htmlfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\ieframe.dll,0" HKCR,"htmlfile\shell\open\command","",0x00020000,"""%programfiles%\Internet Explorer\iexplore.exe"" %1" @@ -209,6 +213,11 @@ HKCR,".cpp","",0x00000000,"txtfile" HKCR,".h","",0x00000000,"txtfile" HKCR,".hpp","",0x00000000,"txtfile" +HKCR,".txt","PerceivedType",0x00000000,"text" +HKCR,".c","PerceivedType",0x00000000,"text" +HKCR,".cpp","PerceivedType",0x00000000,"text" +HKCR,".h","PerceivedType",0x00000000,"text" +HKCR,".hpp","PerceivedType",0x00000000,"text" HKCR,".txt\shellnew","",0x00000000,"" HKCR,".txt\shellnew","NullFile",0x00020000,"" HKCR,"txtfile","",0x00000000,"Text Document" @@ -338,6 +347,43 @@ HKCR,"Applications\notepad.exe\shell\open\command","",0x00000002,"notepad.exe %1" HKCR,"Applications\mspaint.exe\shell\open\command","",0x00000002,"mspaint.exe %1" HKCR,"Applications\wordpad.exe\shell\open\command","",0x00000002,"wordpad.exe %1" + +; Misc Perceived types +HKCR,".asm","PerceivedType",0x00000000,"text" +HKCR,".asmx","PerceivedType",0x00000000,"text" +HKCR,".aspx","PerceivedType",0x00000000,"text" +HKCR,".chk","PerceivedType",0x00000000,"system" +HKCR,".css","",0x00000000,"CSSfile" +HKCR,".css","PerceivedType",0x00000000,"text" +HKCR,".cxx","PerceivedType",0x00000000,"text" +HKCR,".def","PerceivedType",0x00000000,"text" +HKCR,".diz","PerceivedType",0x00000000,"text" +HKCR,".gz","PerceivedType",0x00000000,"compressed" +HKCR,".hxx","PerceivedType",0x00000000,"text" +HKCR,".inc","PerceivedType",0x00000000,"text" +HKCR,".java","PerceivedType",0x00000000,"text" +HKCR,".local","PerceivedType",0x00000000,"system" +HKCR,".manifest","PerceivedType",0x00000000,"system" +HKCR,".nvr","PerceivedType",0x00000000,"text" +HKCR,".ocx","",0x00000000,"ocxfile" +HKCR,".ocx","PerceivedType",0x00000000,"system" +HKCR,".php3","PerceivedType",0x00000000,"text" +HKCR,".pl","PerceivedType",0x00000000,"text" +HKCR,".plg","PerceivedType",0x00000000,"text" +HKCR,".ps1xml","PerceivedType",0x00000000,"text" +HKCR,".sed","PerceivedType",0x00000000,"text" +HKCR,".shtml","PerceivedType",0x00000000,"text" +HKCR,".sql","PerceivedType",0x00000000,"text" +HKCR,".tar","PerceivedType",0x00000000,"compressed" +HKCR,".text","PerceivedType",0x00000000,"text" +HKCR,".tgz","PerceivedType",0x00000000,"compressed" +HKCR,".tsv","PerceivedType",0x00000000,"text" +HKCR,".wdp","PerceivedType",0x00000000,"image" +HKCR,".wmz","",0x00000000,"WMZFile" +HKCR,".wmz","PerceivedType",0x00000000,"compressed" +HKCR,".wsz","PerceivedType",0x00000000,"compressed" +HKCR,".x","PerceivedType",0x00000000,"text" +HKCR,".z","PerceivedType",0x00000000,"compressed" ; For language support:

1 0

[akhaldi] 68043: [SHLWAPI_WINETEST] Add tests for AssocGetPerceivedType. By Mark Jansen. CORE-9754
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 14:27:39 2015 New Revision: 68043 URL: http://svn.reactos.org/svn/reactos?rev=68043&view=rev Log: [SHLWAPI_WINETEST] Add tests for AssocGetPerceivedType. By Mark Jansen. CORE-9754 Modified: trunk/rostests/winetests/shlwapi/assoc.c Modified: trunk/rostests/winetests/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/assoc.c… ============================================================================== --- trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/shlwapi/assoc.c [iso-8859-1] Sat Jun 6 14:27:39 2015 @@ -28,12 +28,13 @@ #include <shlwapi.h> #include <shlguid.h> -#define expect(expected, got) ok ( expected == got, "Expected %d, got %d\n", expected, got) -#define expect_hr(expected, got) ok ( expected == got, "Expected %08x, got %08x\n", expected, got) +#define expect(expected, got) ok( (expected) == (got), "Expected %d, got %d\n", (expected), (got)) +#define expect_hr(expected, got) ok( (expected) == (got), "Expected %08x, got %08x\n", (expected), (got)) static HRESULT (WINAPI *pAssocQueryStringA)(ASSOCF,ASSOCSTR,LPCSTR,LPCSTR,LPSTR,LPDWORD) = NULL; static HRESULT (WINAPI *pAssocQueryStringW)(ASSOCF,ASSOCSTR,LPCWSTR,LPCWSTR,LPWSTR,LPDWORD) = NULL; static HRESULT (WINAPI *pAssocCreate)(CLSID, REFIID, void **) = NULL; +static HRESULT (WINAPI *pAssocGetPerceivedType)(LPCWSTR, PERCEIVED *, INT *, LPWSTR *) = NULL; /* Every version of Windows with IE should have this association? */ static const WCHAR dotHtml[] = { '.','h','t','m','l',0 }; @@ -309,6 +310,283 @@ } } +/* Based on http://www.geoffchappell.com/studies/windows/shell/shlwapi/api/assocapi/get… */ +struct assoc_test_struct +{ + PCSTR extension; + PERCEIVED perceived; + INT flags; + PCSTR type; + DWORD minversion; + HRESULT hr; +}; + +#define HARDCODED_NATIVE_WMSDK (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_WMSDK) +#define HARDCODED_NATIVE_GDIPLUS (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_GDIPLUS) +#define HARDCODED_NATIVE_ZIPFLDR (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_ZIPFOLDER) +#define SOFTCODED_NATIVESUPPORT (PERCEIVEDFLAG_SOFTCODED | PERCEIVEDFLAG_NATIVESUPPORT) + +static const struct assoc_test_struct assoc_perceived_types[] = +{ + /* builtins */ + { ".aif", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".aifc", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".aiff", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".asf", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".asx", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".au", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".avi", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".bas", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".bat", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".bmp", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".cmd", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".com", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".cpl", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_HARDCODED, "system", 0x600 }, + { ".dib", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".dvr-ms", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".emf", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".exe", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".gif", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".hta", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + /* htm & html are PERCEIVED_TYPE_TEXT, PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_SOFTCODED in w2k3 */ + { ".htm", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, "document", 0x600 }, + { ".html", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, "document", 0x600 }, + { ".ico", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".IVF", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".jfif", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".jpe", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".jpeg", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".jpg", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".lnk", PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_HARDCODED, NULL, 0x600, E_FAIL }, + { ".m1v", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".m3u", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".mht", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, "document", 0x600 }, + { ".mid", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".midi", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".msi", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + /* below win8 this is defined to be video */ + { ".mp2", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio", 0x602 }, + { ".mp2v", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mp3", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".mpa", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mpe", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mpeg", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mpg", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".mpv2", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".pif", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".png", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".reg", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".rle", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".rmi", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".scr", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".search-ms", PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_HARDCODED, NULL, 0x600, E_FAIL }, + { ".snd", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".tif", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".tiff", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".vb", PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, "application" }, + { ".wav", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".wax", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".wm", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".wma", PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, "audio" }, + { ".wmf", PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, "image" }, + { ".wmv", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".wmx", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".wvx", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }, + { ".zip", PERCEIVED_TYPE_COMPRESSED, HARDCODED_NATIVE_ZIPFLDR, "compressed" }, + /* found in the registry under HKEY_CLASSES_ROOT on a new Win7 VM */ + { ".386", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".3g2", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".3gp", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".3gp2", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".3gpp", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".AAC", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".ADT", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".ADTS", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".asm", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".asmx", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".aspx", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".c", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".cab", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed", 0x600 }, + { ".chk", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".cpp", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".css", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".cxx", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".def", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".diz", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".docx", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x601 }, + { ".drv", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system", 0x600 }, + { ".gz", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".h", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".hpp", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".hxx", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".inc", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".ini", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x600 }, + { ".java", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".local", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".M2T", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".M2TS", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".M2V", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".m4a", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".m4b", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".m4p", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".m4v", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".manifest", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".MOD", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".mov", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".mp4", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".mp4v", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".MTS", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".nvr", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".ocx", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".odt", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x601 }, + { ".php3", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".pl", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".plg", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".ps1xml", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "Text" }, + { ".rtf", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".sed", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".shtml", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".sql", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".sys", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system", 0x600 }, + { ".tar", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".text", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".tgz", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".TS", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".tsv", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".TTS", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".txt", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".vob", PERCEIVED_TYPE_VIDEO, PERCEIVEDFLAG_SOFTCODED, "video", 0x601 }, + { ".vxd", PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_SOFTCODED, "system" }, + { ".wdp", PERCEIVED_TYPE_IMAGE, PERCEIVEDFLAG_SOFTCODED, "image" }, + { ".wmz", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".wpl", PERCEIVED_TYPE_AUDIO, PERCEIVEDFLAG_SOFTCODED, "audio", 0x601 }, + { ".wsz", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + { ".x", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text" }, + { ".xml", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x601 }, + { ".xsl", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x601 }, + { ".z", PERCEIVED_TYPE_COMPRESSED, PERCEIVEDFLAG_SOFTCODED, "compressed" }, + /* found in the registry under HKEY_CLASSES_ROOT\PerceivedType */ + { ".doc", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".dot", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".mhtml", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".pot", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".ppt", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".rtf", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".wri", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".xls", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + { ".xlt", PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_SOFTCODED, "document", 0x600 }, + +}; + +static void test_assoc_one(const struct assoc_test_struct* test) +{ + LPWSTR extension, type_expected, type_returned; + PERCEIVED perceived; + HRESULT hr; + INT flags; + + /* if SHStrDupA receives a nullptr as input, it will null the output */ + SHStrDupA(test->extension, &extension); + SHStrDupA(test->type, &type_expected); + + perceived = 0xdeadbeef; + flags = 0xdeadbeef; + + hr = pAssocGetPerceivedType(extension, &perceived, &flags, NULL); + expect_hr(type_expected ? S_OK : test->hr, hr); + ok(perceived == test->perceived, "%s: got perceived 0x%x, expected 0x%x\n", + test->extension, perceived, test->perceived); + ok(flags == test->flags, "%s: got flags 0x%x, expected 0x%x\n", + test->extension, flags, test->flags); + + type_returned = (void *)0xdeadbeef; + perceived = 0xdeadbeef; + flags = 0xdeadbeef; + + hr = pAssocGetPerceivedType(extension, &perceived, &flags, &type_returned); + expect_hr(type_expected ? S_OK : test->hr, hr); + ok(perceived == test->perceived, "%s: got perceived 0x%x, expected 0x%x\n", + test->extension, perceived, test->perceived); + ok(flags == test->flags, "%s: got flags 0x%x, expected 0x%x\n", + test->extension, flags, test->flags); + + if (!type_expected) + { + ok(type_returned == (void *)0xdeadbeef || broken(type_returned == NULL) /* Win 8 */, + "%s: got type %p, expected 0xdeadbeef\n", test->extension, type_returned); + } + else if (type_returned == (void *)0xdeadbeef) + { + ok(type_returned != (void *)0xdeadbeef, "%s: got type %p, expected '%s'\n", + test->extension, type_returned, test->type); + } + else + { + ok(StrCmpIW(type_expected, type_returned) == 0, "%s: got type %s, expected '%s'\n", + test->extension, wine_dbgstr_w(type_returned), test->type); + } + + CoTaskMemFree(type_returned); + CoTaskMemFree(extension); + CoTaskMemFree(type_expected); +} + +static void test_assoc_perceived(void) +{ + static const struct assoc_test_struct should_not_exist = + { ".should_not_exist", PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_UNDEFINED, NULL, 0, 0x80070002 }; + static const struct assoc_test_struct htm[] = + { + { ".htm", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x600 }, + { ".html", PERCEIVED_TYPE_TEXT, SOFTCODED_NATIVESUPPORT, "text", 0x600 }, + }; + static const struct assoc_test_struct mp2 = + { ".mp2", PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, "video" }; + + OSVERSIONINFOEXW osvi; + DWORD version; + size_t i; + + if (!pAssocGetPerceivedType) + { + win_skip("AssocGetPerceivedType() is missing\n"); + return; + } + + memset(&osvi, 0, sizeof(osvi)); + osvi.dwOSVersionInfoSize = sizeof(osvi); + GetVersionExW((LPOSVERSIONINFOW)&osvi); + version = (osvi.dwMajorVersion << 8) | osvi.dwMinorVersion; + + /* invalid entry results in HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) */ + test_assoc_one(&should_not_exist); + + for (i = 0; i < sizeof(assoc_perceived_types) / sizeof(assoc_perceived_types[0]); ++i) + { + if (assoc_perceived_types[i].minversion && assoc_perceived_types[i].minversion > version) + continue; + if (!(assoc_perceived_types[i].flags & PERCEIVEDFLAG_HARDCODED)) + todo_wine test_assoc_one(&assoc_perceived_types[i]); + else + test_assoc_one(&assoc_perceived_types[i]); + } + + /* below Vista */ + if (version < 0x600) + { + todo_wine + test_assoc_one(&htm[0]); + todo_wine + test_assoc_one(&htm[1]); + } + + /* below Win8 */ + if (version < 0x602) + { + test_assoc_one(&mp2); + } +} + START_TEST(assoc) { HMODULE hshlwapi; @@ -316,9 +594,11 @@ pAssocQueryStringA = (void*)GetProcAddress(hshlwapi, "AssocQueryStringA"); pAssocQueryStringW = (void*)GetProcAddress(hshlwapi, "AssocQueryStringW"); pAssocCreate = (void*)GetProcAddress(hshlwapi, "AssocCreate"); + pAssocGetPerceivedType = (void*)GetProcAddress(hshlwapi, "AssocGetPerceivedType"); test_getstring_bad(); test_getstring_basic(); test_getstring_no_extra(); test_assoc_create(); + test_assoc_perceived(); }

1 0

[akhaldi] 68042: [SHLWAPI] Implement AssocGetPerceivedType. By Mark Jansen. CORE-9754
by akhaldi＠svn.reactos.org 06 Jun '15

06 Jun '15

Author: akhaldi Date: Sat Jun 6 14:23:05 2015 New Revision: 68042 URL: http://svn.reactos.org/svn/reactos?rev=68042&view=rev Log: [SHLWAPI] Implement AssocGetPerceivedType. By Mark Jansen. CORE-9754 Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/assoc.c Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Sat Jun 6 14:23:05 2015 @@ -1,5 +1,8 @@ project(SHELL) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) add_definitions( -D__WINESRC__ Modified: trunk/reactos/dll/win32/shlwapi/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/assoc.c?… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/assoc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/assoc.c [iso-8859-1] Sat Jun 6 14:23:05 2015 @@ -89,6 +89,172 @@ return SHCoCreateInstance( NULL, &clsid, NULL, refiid, lpInterface ); } +struct AssocPerceivedInfo +{ + PCWSTR Type; + PERCEIVED Perceived; + INT FlagHardcoded; + INT FlagSoftcoded; + PCWSTR Extensions; +}; + +static const WCHAR unspecified_exts[] = { + '.','l','n','k',0, + '.','s','e','a','r','c','h','-','m','s',0, + 0 +}; + +static const WCHAR image_exts[] = { + '.','b','m','p',0, + '.','d','i','b',0, + '.','e','m','f',0, + '.','g','i','f',0, + '.','i','c','o',0, + '.','j','f','i','f',0, + '.','j','p','e',0, + '.','j','p','e','g',0, + '.','j','p','g',0, + '.','p','n','g',0, + '.','r','l','e',0, + '.','t','i','f',0, + '.','t','i','f','f',0, + '.','w','m','f',0, + 0 +}; + +static const WCHAR audio_exts[] = { + '.','a','i','f',0, + '.','a','i','f','c',0, + '.','a','i','f','f',0, + '.','a','u',0, + '.','m','3','u',0, + '.','m','i','d',0, + '.','m','i','d','i',0, +#if _WIN32_WINNT > 0x602 + '.','m','p','2',0, +#endif + '.','m','p','3',0, + '.','r','m','i',0, + '.','s','n','d',0, + '.','w','a','v',0, + '.','w','a','x',0, + '.','w','m','a',0, + 0 +}; + +static const WCHAR video_exts[] = { + '.','a','s','f',0, + '.','a','s','x',0, + '.','a','v','i',0, + '.','d','v','r','-','m','s',0, + '.','I','V','F',0, + '.','m','1','v',0, +#if _WIN32_WINNT <= 0x602 + '.','m','p','2',0, +#endif + '.','m','p','2','v',0, + '.','m','p','a',0, + '.','m','p','e',0, + '.','m','p','e','g',0, + '.','m','p','g',0, + '.','m','p','v','2',0, + '.','w','m',0, + '.','w','m','v',0, + '.','w','m','x',0, + '.','w','v','x',0, + 0 +}; + +static const WCHAR compressed_exts[] = { + '.','z','i','p',0, + 0 +}; + +static const WCHAR document_exts[] = { +#if _WIN32_WINNT >= 0x600 + '.','h','t','m',0, + '.','h','t','m','l',0, +#endif + '.','m','h','t',0, + 0 +}; + +static const WCHAR system_exts[] = { + '.','c','p','l',0, + 0 +}; + +static const WCHAR application_exts[] = { + '.','b','a','s',0, + '.','b','a','t',0, + '.','c','m','d',0, + '.','c','o','m',0, + '.','e','x','e',0, + '.','h','t','a',0, + '.','m','s','i',0, + '.','p','i','f',0, + '.','r','e','g',0, + '.','s','c','r',0, + '.','v','b',0, + 0 +}; + +const WCHAR type_text[] = {'t','e','x','t',0}; +const WCHAR type_image[] = {'i','m','a','g','e',0}; +const WCHAR type_audio[] = {'a','u','d','i','o',0}; +const WCHAR type_video[] = {'v','i','d','e','o',0}; +const WCHAR type_compressed[] = {'c','o','m','p','r','e','s','s','e','d',0}; +const WCHAR type_document[] = {'d','o','c','u','m','e','n','t',0}; +const WCHAR type_system[] = {'s','y','s','t','e','m',0}; +const WCHAR type_application[] = {'a','p','p','l','i','c','a','t','i','o','n',0}; + +#define HARDCODED_NATIVE_WMSDK (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_WMSDK) +#define HARDCODED_NATIVE_GDIPLUS (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_GDIPLUS) +#define HARDCODED_NATIVE_ZIPFLDR (PERCEIVEDFLAG_HARDCODED | PERCEIVEDFLAG_NATIVESUPPORT | PERCEIVEDFLAG_ZIPFOLDER) +#define SOFTCODED_NATIVESUPPORT (PERCEIVEDFLAG_SOFTCODED | PERCEIVEDFLAG_NATIVESUPPORT) + +static const struct AssocPerceivedInfo known_types[] = { + { NULL, PERCEIVED_TYPE_UNSPECIFIED, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, unspecified_exts }, + { type_text, PERCEIVED_TYPE_TEXT, PERCEIVEDFLAG_HARDCODED, SOFTCODED_NATIVESUPPORT, NULL }, + { type_image, PERCEIVED_TYPE_IMAGE, HARDCODED_NATIVE_GDIPLUS, PERCEIVEDFLAG_SOFTCODED, image_exts }, + { type_audio, PERCEIVED_TYPE_AUDIO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, audio_exts }, + { type_video, PERCEIVED_TYPE_VIDEO, HARDCODED_NATIVE_WMSDK, PERCEIVEDFLAG_SOFTCODED, video_exts }, + { type_compressed, PERCEIVED_TYPE_COMPRESSED, HARDCODED_NATIVE_ZIPFLDR, PERCEIVEDFLAG_SOFTCODED, compressed_exts }, + { type_document, PERCEIVED_TYPE_DOCUMENT, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, document_exts }, + { type_system, PERCEIVED_TYPE_SYSTEM, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, system_exts }, + { type_application, PERCEIVED_TYPE_APPLICATION, PERCEIVEDFLAG_HARDCODED, PERCEIVEDFLAG_SOFTCODED, application_exts }, +}; + +static const struct AssocPerceivedInfo* AssocFindByBuiltinExtension(LPCWSTR pszExt) +{ + UINT n; + for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n) + { + PCWSTR Ext = known_types[n].Extensions; + while (Ext && *Ext) + { + if (!StrCmpIW(Ext, pszExt)) + return &known_types[n]; + Ext += (strlenW(Ext) + 1); + } + } + return NULL; +} + +static const struct AssocPerceivedInfo* AssocFindByType(LPCWSTR pszType) +{ + UINT n; + for (n = 0; n < sizeof(known_types) / sizeof(known_types[0]); ++n) + { + if (known_types[n].Type) + { + if (!StrCmpIW(known_types[n].Type, pszType)) + return &known_types[n]; + } + } + return NULL; +} + /************************************************************************* * AssocGetPerceivedType [SHLWAPI.@] * @@ -110,19 +276,64 @@ * lppszType is optional and it can be NULL. * if lpType or lpFlag are NULL, the function will crash. * if lpszExt is NULL, an error is returned. - * - * BUGS - * Unimplemented. */ HRESULT WINAPI AssocGetPerceivedType(LPCWSTR lpszExt, PERCEIVED *lpType, INT *lpFlag, LPWSTR *lppszType) { - FIXME("(%s, %p, %p, %p) not supported\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType); - - if (lpszExt == NULL) + static const WCHAR PerceivedTypeKey[] = {'P','e','r','c','e','i','v','e','d','T','y','p','e',0}; + static const WCHAR SystemFileAssociationsKey[] = {'S','y','s','t','e','m','F','i','l','e', + 'A','s','s','o','c','i','a','t','i','o','n','s','\\','%','s',0}; + const struct AssocPerceivedInfo *Info; + + TRACE("(%s,%p,%p,%p)\n", debugstr_w(lpszExt), lpType, lpFlag, lppszType); + + Info = AssocFindByBuiltinExtension(lpszExt); + if (Info) + { + *lpType = Info->Perceived; + *lpFlag = Info->FlagHardcoded; + } + else + { + WCHAR Buffer[100] = { 0 }; + DWORD Size = sizeof(Buffer); + if (RegGetValueW(HKEY_CLASSES_ROOT, lpszExt, PerceivedTypeKey, + RRF_RT_REG_SZ, NULL, Buffer, &Size) == ERROR_SUCCESS) + { + Info = AssocFindByType(Buffer); + } + if (!Info) + { + WCHAR KeyName[MAX_PATH] = { 0 }; + snprintfW(KeyName, MAX_PATH, SystemFileAssociationsKey, lpszExt); + Size = sizeof(Buffer); + if (RegGetValueW(HKEY_CLASSES_ROOT, KeyName, PerceivedTypeKey, + RRF_RT_REG_SZ, NULL, Buffer, &Size) == ERROR_SUCCESS) + { + Info = AssocFindByType(Buffer); + } + } + if (Info) + { + *lpType = Info->Perceived; + *lpFlag = Info->FlagSoftcoded; + } + } + + if (Info) + { + if (lppszType && Info->Type) + { + return SHStrDupW(Info->Type, lppszType); + } + return Info->Type ? S_OK : E_FAIL; + } + else + { + *lpType = PERCEIVED_TYPE_UNSPECIFIED; + *lpFlag = 0; + } return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); - - return E_NOTIMPL; } /*************************************************************************

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs