Ros-diffs September 2016

ros-diffs@reactos.org

18 participants
342 discussions

[dreimer] 72860: [POWERCFG] Bug fix and improvements to PowerCfg applet by Carlo Bramini CORE-11801 #resolve #comment Committed, thx ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 29 20:54:58 2016 New Revision: 72860 URL: http://svn.reactos.org/svn/reactos?rev=72860&view=rev Log: [POWERCFG] Bug fix and improvements to PowerCfg applet by Carlo Bramini CORE-11801 #resolve #comment Committed, thx ^^ Modified: trunk/reactos/dll/cpl/powercfg/CMakeLists.txt trunk/reactos/dll/cpl/powercfg/hibernate.c trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc trunk/reactos/dll/cpl/powercfg/lang/en-US.rc trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc trunk/reactos/dll/cpl/powercfg/lang/sq-AL.rc trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc trunk/reactos/dll/cpl/powercfg/lang/zh-TW.rc trunk/reactos/dll/cpl/powercfg/powercfg.h trunk/reactos/dll/cpl/powercfg/resource.h Modified: trunk/reactos/dll/cpl/powercfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/CMakeList… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/CMakeLists.txt [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -18,6 +18,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def) set_module_type(powercfg cpl UNICODE) -add_importlibs(powercfg user32 powrprof comctl32 shell32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(powercfg user32 powrprof comctl32 shell32 advapi32 msvcrt kernel32 ntdll shlwapi) add_pch(powercfg powercfg.h SOURCE) add_cd_file(TARGET powercfg DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/cpl/powercfg/hibernate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/hibernate… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/hibernate.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/hibernate.c [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -20,8 +20,8 @@ { SYSTEM_POWER_CAPABILITIES PowerCaps; MEMORYSTATUSEX msex; - TCHAR szSize[MAX_PATH]; TCHAR szTemp[MAX_PATH]; + LPTSTR lpRoot; ULARGE_INTEGER FreeBytesAvailable, TotalNumberOfBytes, TotalNumberOfFreeBytes; if (GetPwrCapabilities(&PowerCaps)) @@ -37,49 +37,21 @@ } if (GetWindowsDirectory(szTemp,MAX_PATH)) - { - if (!GetDiskFreeSpaceEx(szTemp,&FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) - TotalNumberOfFreeBytes.QuadPart = 0; - } + lpRoot = szTemp; else - { - if (!GetDiskFreeSpaceEx(NULL,&FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) - TotalNumberOfFreeBytes.QuadPart = 0; - } + lpRoot = NULL; - if (TotalNumberOfFreeBytes.QuadPart > 0x100000) - { - if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) - { - _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart / 0x100000); - SetDlgItemText(hwndDlg, IDC_FREESPACE, szSize); - } - } - else - { - if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) - { - _stprintf(szSize,szTemp,TotalNumberOfFreeBytes.QuadPart); - SetDlgItemText(hwndDlg, IDC_FREESPACE, szSize); - } - } + // Get available space and size of selected volume. + if (!GetDiskFreeSpaceEx(lpRoot, &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) + TotalNumberOfFreeBytes.QuadPart = 0; - if (msex.ullTotalPhys>0x100000) - { - if (LoadString(hApplet, IDS_SIZEMB, szTemp, MAX_PATH)) - { - _stprintf(szSize,szTemp,msex.ullTotalPhys/0x100000); - SetDlgItemText(hwndDlg, IDC_SPACEFORHIBERNATEFILE,szSize); - } - } - else - { - if (LoadString(hApplet, IDS_SIZEBYTS, szTemp, MAX_PATH)) - { - _stprintf(szSize,szTemp,msex.ullTotalPhys); - SetDlgItemText(hwndDlg, IDC_SPACEFORHIBERNATEFILE, szSize); - } - } + // Print the free available space into selected volume. + StrFormatByteSize(TotalNumberOfFreeBytes.QuadPart, szTemp, _countof(szTemp)); + SetDlgItemText(hwndDlg, IDC_FREESPACE, szTemp); + + // Print the amount of space required for hibernation. + StrFormatByteSize(msex.ullTotalPhys, szTemp, _countof(szTemp)); + SetDlgItemText(hwndDlg, IDC_SPACEFORHIBERNATEFILE, szTemp); if (TotalNumberOfFreeBytes.QuadPart < msex.ullTotalPhys && !PowerCaps.HiberFilePresent) { Modified: trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/bg-B… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/bg-BG.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -110,8 +110,6 @@ IDS_TEXT "Ð¢ÐµÐºÑÑ" IDS_CONFIG1 "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð° Ð·Ð°ÑÑÐ°Ð½Ð²Ð°ÑÐ° Ð½Ð°ÑÐµÐ´Ð±Ð° %1" IDS_CONFIG2 "Ð Ð°Ð·ÑÐ¸ÑÐµÐ½Ð¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð° %1" - IDS_SIZEBYTS "%i Ð±Ð°Ð¹ÑÐ°" - IDS_SIZEMB "%i ÐÐ" IDS_NOACTION "ÐÐµ Ð¿ÑÐ°Ð²Ð¸ Ð½Ð¸ÑÐ¾" IDS_PowerActionNone1 "ÐÐµÐ·Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ" IDS_PowerActionUnknown "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾" Modified: trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/cs-C… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/cs-CZ.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -110,8 +110,6 @@ IDS_TEXT "Text" IDS_CONFIG1 "NastavenÃ pro schÃ©ma napÃ¡jenÃ %1" IDS_CONFIG2 "PokroÄilÃ¡ nastavenÃ pro %1" - IDS_SIZEBYTS "%i bytÅ¯" - IDS_SIZEMB "%i MB" IDS_NOACTION "NedÄlat nic" IDS_PowerActionNone1 "Å½Ã¡dnÃ¡ akce" IDS_PowerActionUnknown "NeznÃ¡mÃ½" Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "Text" IDS_CONFIG1 "Einstellungen fÃ¼r Energieschema %s." IDS_CONFIG2 "Erweiterte Einstellungen fÃ¼r %s." - IDS_SIZEBYTS "%i Bytes" - IDS_SIZEMB "%i MB" IDS_NOACTION "Nichts unternehmen" IDS_PowerActionNone1 "Keine Aktion" IDS_PowerActionUnknown "Unbekannt" Modified: trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/el-G… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/el-GR.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "ÎÎµÎ¯Î¼ÎµÎ½Î¿" IDS_CONFIG1 "Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ¿Ï ÏÏÎ½Î´Î¹Î±ÏÎ¼Î¿Ï ÏÏÎ¿ÏÎ¿Î´Î¿ÏÎ¯Î±Ï %1" IDS_CONFIG2 "ÎÎ¹Î´Î¹ÎºÎÏ ÏÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÏÎ¿Ï ÏÏÎ½Î´Î¹Î±ÏÎ¼Î¿Ï %1" - IDS_SIZEBYTS "%i bytes" - IDS_SIZEMB "%i MB" IDS_NOACTION "ÎÎ±Î¼Î¯Î± ÎµÎ½ÎÏÎ³ÎµÎ¹Î±" IDS_PowerActionNone1 "ÎÎ± Î¼Î· Î³Î¯Î½ÎµÏÎ±Î¹ ÎºÎ±Î¼Î¯Î± ÎµÎ½ÎÏÎ³ÎµÎ¹Î±" IDS_PowerActionUnknown "Unknown" Modified: trunk/reactos/dll/cpl/powercfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/en-U… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/en-US.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -110,8 +110,6 @@ IDS_TEXT "Text" IDS_CONFIG1 "Settings for %1 power scheme" IDS_CONFIG2 "Advanced settings for %1" - IDS_SIZEBYTS "%i bytes" - IDS_SIZEMB "%i MB" IDS_NOACTION "Do nothing" IDS_PowerActionNone1 "No action" IDS_PowerActionUnknown "Unknown" Modified: trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/es-E… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/es-ES.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "Texto" IDS_CONFIG1 "ConfiguraciÃ³n para la combinaciÃ³n de energÃa %1" IDS_CONFIG2 "Opciones avanzadas para %1" - IDS_SIZEBYTS "%i bytes" - IDS_SIZEMB "%i MB" IDS_NOACTION "No hacer nada" IDS_PowerActionNone1 "No hacer nada" IDS_PowerActionUnknown "desconocido" Modified: trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/fr-F… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/fr-FR.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "Texte" IDS_CONFIG1 "RÃ©glages pour le profil d'alimentation %1" IDS_CONFIG2 "RÃ©glages avancÃ©s pour %1" - IDS_SIZEBYTS "%i octets" - IDS_SIZEMB "%i Mo" IDS_NOACTION "Ne rien faire" IDS_PowerActionNone1 "Pas d'action" IDS_PowerActionUnknown "Inconnue" Modified: trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/he-I… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/he-IL.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "××§×¡×" IDS_CONFIG1 "Settings for %1 power scheme" IDS_CONFIG2 "××¤×©×¨××××ª ××ª×§××××ª × %1" - IDS_SIZEBYTS "%i ×××ª" - IDS_SIZEMB "%i MB" IDS_NOACTION "×× ×ª×¢×©× ×××¨" IDS_PowerActionNone1 "×©×× ×¤×¢×××" IDS_PowerActionUnknown "×× ××××¢" Modified: trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/id-I… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/id-ID.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "Teks" IDS_CONFIG1 "Menyetel untuk %1 skema tenaga" IDS_CONFIG2 "Setelan Lanjutan untuk %1" - IDS_SIZEBYTS "%i byte" - IDS_SIZEMB "%i MB" IDS_NOACTION "Tidak melakukan apapun" IDS_PowerActionNone1 "Tidak ada aksi" IDS_PowerActionUnknown "Tidak dikenal" Modified: trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/it-I… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -110,8 +110,6 @@ IDS_TEXT "Testo" IDS_CONFIG1 "Impostazioni per lo schema %1 " IDS_CONFIG2 "Impostazioni avanzate per %1" - IDS_SIZEBYTS "%i bytes" - IDS_SIZEMB "%i MB" IDS_NOACTION "Nessuna azione" IDS_PowerActionNone1 "Nessuna azione" IDS_PowerActionUnknown "Sconosciuto" Modified: trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ja-J… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ja-JP.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "ããã¹ã" IDS_CONFIG1 "[%1] ã®é»æºè¨å®" IDS_CONFIG2 "%1ã®è©³ç´°è¨å®" - IDS_SIZEBYTS "%i ãã¤ã" - IDS_SIZEMB "%i MB" IDS_NOACTION "ä½ãããªã" IDS_PowerActionNone1 "ä½ãããªã" IDS_PowerActionUnknown "ä¸æ" Modified: trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/nl-N… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/nl-NL.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -110,8 +110,6 @@ IDS_TEXT "Text" IDS_CONFIG1 "Settings for %1 power scheme" IDS_CONFIG2 "Advanced settings for %1" - IDS_SIZEBYTS "%i bytes" - IDS_SIZEMB "%i MB" IDS_NOACTION "Doe niets" IDS_PowerActionNone1 "Geen actie" IDS_PowerActionUnknown "Onbekend" Modified: trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/no-N… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/no-NO.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "Tekst" IDS_CONFIG1 "Innstillinger for %1 strÃ¸mplan" IDS_CONFIG2 "Avanserte innstillinger for %1" - IDS_SIZEBYTS "%i byte" - IDS_SIZEMB "%i MB" IDS_NOACTION "Ikke gjÃ¸r noe" IDS_PowerActionNone1 "Ingen handling" IDS_PowerActionUnknown "Ukjent" Modified: trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/pl-P… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/pl-PL.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -118,8 +118,6 @@ IDS_TEXT "Tekst" IDS_CONFIG1 "Ustawienia dla schematu %1" IDS_CONFIG2 "Zaawansowane ustawienia dla %1" - IDS_SIZEBYTS "%i bajtÃ³w" - IDS_SIZEMB "%i MB" IDS_NOACTION "Nie rÃ³b nic" IDS_PowerActionNone1 "Brak akcji" IDS_PowerActionUnknown "Nieznana" Modified: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ro-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -115,8 +115,6 @@ IDS_TEXT "text" IDS_CONFIG1 "Configurare regim %1" IDS_CONFIG2 "OpÈiuni avansate pentru %1" - IDS_SIZEBYTS "%i octeÈi" - IDS_SIZEMB "%i Mo" IDS_NOACTION "nespecificatÄ" IDS_PowerActionNone1 "acÈiune nespecificatÄ" IDS_PowerActionUnknown "acÈiune necunoscutÄ" Modified: trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ru-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ru-RU.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "Ð¢ÐµÐºÑÑ" IDS_CONFIG1 "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ ÑÑÐµÐ¼Ñ %1" IDS_CONFIG2 "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ ÑÑÐµÐ¼Ñ %1" - IDS_SIZEBYTS "%i Ð±Ð°Ð¹Ñ" - IDS_SIZEMB "%i ÐÐ" IDS_NOACTION "ÐÐµ Ð´ÐµÐ»Ð°ÑÑ Ð½Ð¸ÑÐµÐ³Ð¾" IDS_PowerActionNone1 "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð½Ðµ ÑÑÐµÐ±ÑÐµÑÑÑ" IDS_PowerActionUnknown "ÐÐµÑ Ð´Ð°Ð½Ð½ÑÑ" Modified: trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/sk-S… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/sk-SK.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -118,8 +118,6 @@ IDS_TEXT "Text" IDS_CONFIG1 "Nastavenie pre schÃ©mu napÃ¡jania %1" IDS_CONFIG2 "RozÅ¡ÃrenÃ© nastavenie pre %1" - IDS_SIZEBYTS "%i bajtov" - IDS_SIZEMB "%i MB" IDS_NOACTION "Do nothing" IDS_PowerActionNone1 "No action" IDS_PowerActionUnknown "NeznÃ¡me" Modified: trunk/reactos/dll/cpl/powercfg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/sq-A… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/sq-AL.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -115,8 +115,6 @@ IDS_TEXT "Teksti" IDS_CONFIG1 "Konfigurimet pÃ«r %1 skema energjise" IDS_CONFIG2 "Konfigurimet Avancuara pÃ«r %1" - IDS_SIZEBYTS "%i bytes" - IDS_SIZEMB "%i MB" IDS_NOACTION "Mos bÃ«j gjÃ«" IDS_PowerActionNone1 "AsnjÃ« veprim" IDS_PowerActionUnknown "i panjohur" Modified: trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/th-T… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/th-TH.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -110,8 +110,6 @@ IDS_TEXT "à¸à¹à¸à¸à¸§à¸²à¸¡" IDS_CONFIG1 "à¸à¸±à¹à¸à¸à¹à¸²à¹à¸«à¹à¸à¸±à¸ %1 à¸à¹à¸²à¸à¸¥à¸±à¸à¸à¸²à¸" IDS_CONFIG2 "à¸à¸²à¸£à¸à¸±à¹à¸à¸à¹à¸²à¹à¸à¸à¸à¸±à¹à¸à¸ªà¸¹à¸à¹à¸à¹à¸ %1" - IDS_SIZEBYTS "%i bytes" - IDS_SIZEMB "%i MB" IDS_NOACTION "à¹à¸¡à¹à¹à¸à¸¥à¸µà¹à¸¢à¸à¸à¹à¸²" IDS_PowerActionNone1 "à¹à¸¡à¹à¹à¸à¸¥à¸µà¹à¸¢à¸à¸à¹à¸²" IDS_PowerActionUnknown "à¹à¸¡à¹à¸à¸£à¸²à¸" Modified: trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/tr-T… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "Metin" IDS_CONFIG1 "%1 GÃ¼Ã§ DÃ¼zeni Ä°Ã§in Ayarlar" IDS_CONFIG2 "%1 Ä°Ã§in GeliÅmiÅ Ayarlar" - IDS_SIZEBYTS "%i Ãoklu" - IDS_SIZEMB "%i MB" IDS_NOACTION "Bir Åey Yapma" IDS_PowerActionNone1 "Eylem Yok" IDS_PowerActionUnknown "Bilinmiyor" Modified: trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/uk-U… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/uk-UA.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -118,8 +118,6 @@ IDS_TEXT "Ð¢ÐµÐºÑÑ" IDS_CONFIG1 "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ ÑÑÐµÐ¼Ð¸ Ð¶Ð¸Ð²Ð»ÐµÐ½Ð½Ñ %1" IDS_CONFIG2 "ÐÐ¾Ð´Ð°ÑÐºÐ¾Ð²Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ %1" - IDS_SIZEBYTS "%i Ð±Ð°Ð¹Ñ" - IDS_SIZEMB "%i ÐÐ" IDS_NOACTION "ÐÐµ ÑÐ¾Ð±Ð¸ÑÐ¸ Ð½ÑÑÐ¾Ð³Ð¾" IDS_PowerActionNone1 "ÐÑÑ Ð½Ðµ Ð¿Ð¾ÑÑÑÐ±Ð½Ð°" IDS_PowerActionUnknown "ÐÐµÐ¼Ð°Ñ Ð´Ð°Ð½Ð¸Ñ" Modified: trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/zh-C… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/zh-CN.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "ææ¬" IDS_CONFIG1 "ä¸º %i è®¾ç½®çµæºä½¿ç¨æ¹æ¡" IDS_CONFIG2 "%i çé«çº§è®¾ç½®" - IDS_SIZEBYTS "%i åè" - IDS_SIZEMB "%i MB" IDS_NOACTION "æ æä½" IDS_PowerActionNone1 "æ å¨ä½" IDS_PowerActionUnknown "æªç¥" Modified: trunk/reactos/dll/cpl/powercfg/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/zh-T… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/zh-TW.rc [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -112,8 +112,6 @@ IDS_TEXT "ææ¬" IDS_CONFIG1 "ç² %i è¨ç½®é»æºä½¿ç¨æ¹æ¡" IDS_CONFIG2 "%i çé«ç´è¨ç½®" - IDS_SIZEBYTS "%i åç¯" - IDS_SIZEMB "%i MB" IDS_NOACTION "ç¡æä½" IDS_PowerActionNone1 "ç¡åä½" IDS_PowerActionUnknown "æªç¥" Modified: trunk/reactos/dll/cpl/powercfg/powercfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/powercfg.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/powercfg.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/powercfg.h [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -10,9 +10,11 @@ #define WIN32_NO_STATUS #include <windef.h> #include <winbase.h> +#include <winreg.h> #include <cpl.h> #include <tchar.h> #include <shlobj.h> +#include <shlwapi.h> #include <powrprof.h> #include "resource.h" Modified: trunk/reactos/dll/cpl/powercfg/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/resource.… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/resource.h [iso-8859-1] Thu Sep 29 20:54:58 2016 @@ -9,15 +9,15 @@ #define ICONSIZE 16 /* IDs */ -#define IDC_CPLICON_1 1 + +/* Set default to IDI_AC */ +#define IDC_CPLICON_1 IDI_AC #define IDS_PROCENT 49 #define IDS_SOUND 50 #define IDS_TEXT 51 #define IDS_CONFIG1 53 #define IDS_CONFIG2 54 -#define IDS_SIZEBYTS 55 -#define IDS_SIZEMB 56 #define IDD_PROPPAGEPOWERSHEMES 70 #define IDD_PROPPAGEALARMS 71

8 years, 2 months

[dreimer] 72859: [3DTEXT] 3d Text Screensaver pt-BR translation by Lucas Raziel CORE-11672 #resolve #comment Committed, thx ^^

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Sep 29 20:46:14 2016 New Revision: 72859 URL: http://svn.reactos.org/svn/reactos?rev=72859&view=rev Log: [3DTEXT] 3d Text Screensaver pt-BR translation by Lucas Raziel CORE-11672 #resolve #comment Committed, thx ^^ Added: trunk/reactos/base/applications/screensavers/3dtext/lang/pt-BR.rc (with props) Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc Added: trunk/reactos/base/applications/screensavers/3dtext/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/lang/pt-BR.rc (added) +++ trunk/reactos/base/applications/screensavers/3dtext/lang/pt-BR.rc [iso-8859-1] Thu Sep 29 20:46:14 2016 @@ -0,0 +1,18 @@ +/* Portuguese translation of 3D Text ScreenSaver by Lucas Raziel (Oldcpv3) (raziellucas(a)hotmail.com) */ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 273, 178 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "OpÃ§Ãµes do Protetor de Tela" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 216, 7, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 216, 24, 50, 14 + EDITTEXT IDC_MESSAGE_TEXT, 18, 28, 122, 14, ES_AUTOHSCROLL + LTEXT "Personalizar Text", IDC_STATIC, 18, 17, 65, 8 +END + +STRINGTABLE +BEGIN + IDS_DESCRIPTION "Texto 3D" +END Propchange: trunk/reactos/base/applications/screensavers/3dtext/lang/pt-BR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] Thu Sep 29 20:46:14 2016 @@ -61,6 +61,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_BR + #include "lang/pt-BR.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

8 years, 2 months

[mjansen] 72858: [DXDIAG] Fix DirectDraw test titles & 16bit icon. Patch by Jared Smudde. CORE-11054 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Thu Sep 29 20:29:59 2016 New Revision: 72858 URL: http://svn.reactos.org/svn/reactos?rev=72858&view=rev Log: [DXDIAG] Fix DirectDraw test titles & 16bit icon. Patch by Jared Smudde. CORE-11054 #resolve #comment Thanks! Modified: trunk/reactos/base/applications/dxdiag/ddtest.c trunk/reactos/base/applications/dxdiag/res/dxdiag.ico Modified: trunk/reactos/base/applications/dxdiag/ddtest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/d… ============================================================================== --- trunk/reactos/base/applications/dxdiag/ddtest.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/ddtest.c [iso-8859-1] Thu Sep 29 20:29:59 2016 @@ -31,7 +31,7 @@ WCHAR szError[256]; BOOL Result; - LoadStringW(hInstance, IDS_DDTEST_TITLE, szCaption, sizeof(szCaption) / sizeof(WCHAR)); + LoadStringW(hInstance, IDS_MAIN_DIALOG, szCaption, sizeof(szCaption) / sizeof(WCHAR)); LoadStringW(hInstance, IDS_DDTEST_ERROR, szError, sizeof(szError) / sizeof(WCHAR)); LoadStringW(hInstance, resTestDescription, szTestDescription, sizeof(szTestDescription) / sizeof(WCHAR)); LoadStringW(hInstance, resResult, szResult, sizeof(szResult) / sizeof(WCHAR)); @@ -103,7 +103,7 @@ } LoadStringW(hInstance, IDS_DDTEST_DESCRIPTION, szDescription, sizeof(szDescription) / sizeof(WCHAR)); - LoadStringW(hInstance, IDS_DDTEST_DESCRIPTION, szCaption, sizeof(szCaption) / sizeof(WCHAR)); + LoadStringW(hInstance, IDS_MAIN_DIALOG, szCaption, sizeof(szCaption) / sizeof(WCHAR)); if(MessageBox(NULL, szDescription, szCaption, MB_YESNO | MB_ICONQUESTION) == IDNO) return; Modified: trunk/reactos/base/applications/dxdiag/res/dxdiag.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/r… ============================================================================== Binary files - no diff available.

8 years, 2 months

[janderwald] 72857: [USBAUDIO] - fix bug in UsbAudioSetFormat

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Sep 29 19:25:31 2016 New Revision: 72857 URL: http://svn.reactos.org/svn/reactos?rev=72857&view=rev Log: [USBAUDIO] - fix bug in UsbAudioSetFormat Modified: trunk/reactos/drivers/usb/usbaudio/pin.c Modified: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Thu Sep 29 19:25:31 2016 @@ -32,9 +32,9 @@ IsEqualGUIDAligned(&Pin->ConnectionFormat->Specifier, &KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)) { WaveFormatEx = (PKSDATAFORMAT_WAVEFORMATEX)Pin->ConnectionFormat; - SampleRateBuffer[0] = (WaveFormatEx->WaveFormatEx.nSamplesPerSec >> 16) & 0xFF; + SampleRateBuffer[2] = (WaveFormatEx->WaveFormatEx.nSamplesPerSec >> 16) & 0xFF; SampleRateBuffer[1] = (WaveFormatEx->WaveFormatEx.nSamplesPerSec >> 8) & 0xFF; - SampleRateBuffer[2] = (WaveFormatEx->WaveFormatEx.nSamplesPerSec >> 0) & 0xFF; + SampleRateBuffer[0] = (WaveFormatEx->WaveFormatEx.nSamplesPerSec >> 0) & 0xFF; /* TODO: verify connection format */ } @@ -58,7 +58,7 @@ /* format urb */ UsbBuildVendorRequest(Urb, URB_FUNCTION_CLASS_ENDPOINT, - sizeof(URB), + sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), USBD_TRANSFER_DIRECTION_OUT, 0, 0x01, @@ -71,7 +71,7 @@ /* get pin context */ PinContext = Pin->Context; - DbgBreakPoint(); + /* submit urb */ Status = SubmitUrbSync(PinContext->LowerDevice, Urb);

8 years, 2 months

[hbelusca] 72856: [EVENTCREATE]: Check for a better last error after the GetModuleFileNameW call.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Sep 29 17:42:20 2016 New Revision: 72856 URL: http://svn.reactos.org/svn/reactos?rev=72856&view=rev Log: [EVENTCREATE]: Check for a better last error after the GetModuleFileNameW call. Modified: trunk/reactos/base/applications/cmdutils/eventcreate/eventcreate.c Modified: trunk/reactos/base/applications/cmdutils/eventcreate/eventcreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/eventcreate/eventcreate.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/eventcreate/eventcreate.c [iso-8859-1] Thu Sep 29 17:42:20 2016 @@ -249,7 +249,7 @@ * - In case of failure, use a default path. */ PathSize = GetModuleFileNameW(NULL, ExePath, ARRAYSIZE(ExePath)); - if ((PathSize == 0) || (GetLastError() != ERROR_SUCCESS)) + if ((PathSize == 0) || (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { /* We failed, copy the default value */ StringCchCopyW(ExePath, ARRAYSIZE(ExePath),

8 years, 2 months

[hbelusca] 72855: Temporarily switch the message file to English language to try to "fix" windmc compilation on linux host (*of course*, this problem didn't happen on the "GNU windmc (GNU Binutils)...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Sep 29 16:58:02 2016 New Revision: 72855 URL: http://svn.reactos.org/svn/reactos?rev=72855&view=rev Log: Temporarily switch the message file to English language to try to "fix" windmc compilation on linux host (*of course*, this problem didn't happen on the "GNU windmc (GNU Binutils) 2.23.51.20121208" provided in RosBE 2.1.3 for Windows, nor with MC.EXE from MSVC...) Modified: trunk/reactos/base/applications/cmdutils/eventcreate/evtmsgstr.mc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/eventcreate/evtmsgstr.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…

8 years, 2 months

[hbelusca] 72854: [EVENTCREATE]: Implement the EventCreate command-line tool, which allows reporting custom user events in event logs, by using the old-school NT <= 2k3 logging API. More informatio...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Sep 29 16:49:27 2016 New Revision: 72854 URL: http://svn.reactos.org/svn/reactos?rev=72854&view=rev Log: [EVENTCREATE]: Implement the EventCreate command-line tool, which allows reporting custom user events in event logs, by using the old-school NT <= 2k3 logging API. More information in the JIRA report and in the source code (eventcreate.c). The generator (evtmsggen) for the event message string templates file "evtmsgstr.mc" is also provided. CORE-12065 #resolve Added: trunk/reactos/base/applications/cmdutils/eventcreate/ trunk/reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/eventcreate/eventcreate.c (with props) trunk/reactos/base/applications/cmdutils/eventcreate/eventcreate.rc (with props) trunk/reactos/base/applications/cmdutils/eventcreate/evtmsggen.c (with props) trunk/reactos/base/applications/cmdutils/eventcreate/evtmsgstr.mc (with props) trunk/reactos/base/applications/cmdutils/eventcreate/lang/ trunk/reactos/base/applications/cmdutils/eventcreate/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/eventcreate/lang/fr-FR.rc (with props) trunk/reactos/base/applications/cmdutils/eventcreate/resource.h (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/eventcreate/eventcreate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/eventcreate/eventcreate.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/eventcreate/evtmsggen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/eventcreate/evtmsgstr.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/eventcreate/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/eventcreate/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Added: trunk/reactos/base/applications/cmdutils/eventcreate/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils…

8 years, 2 months

[akhaldi] 72853: [TRANSLATIONS] Turkish translation update by Erdem Ersoy. CORE-12039

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 29 11:33:25 2016 New Revision: 72853 URL: http://svn.reactos.org/svn/reactos?rev=72853&view=rev Log: [TRANSLATIONS] Turkish translation update by Erdem Ersoy. CORE-12039 Modified: trunk/reactos/base/applications/cmdutils/help/lang/tr-TR.rc trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc trunk/reactos/base/applications/fltmc/lang/tr-TR.rc trunk/reactos/base/applications/mmc/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc trunk/reactos/base/applications/network/ping/lang/tr-TR.rc trunk/reactos/base/applications/osk/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc trunk/reactos/dll/win32/aclui/lang/tr-TR.rc trunk/reactos/dll/win32/browseui/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/setupapi/lang/tr-TR.rc trunk/reactos/dll/win32/shdoclc/lang/Tr.rc trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc trunk/reactos/media/rapps/farmanager.txt trunk/reactos/media/rapps/freemat.txt trunk/reactos/media/rapps/podcasteasy.txt trunk/reactos/media/rapps/scilab.txt trunk/reactos/media/rapps/tcc.txt trunk/reactos/media/rapps/unxutils.txt trunk/reactos/win32ss/user/user32/lang/tr-TR.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/tr-TR.rc trunk/reactos/win32ss/user/winsrv/usersrv/lang/tr-TR.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/help/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/reg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/fltmc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… Modified: trunk/reactos/base/applications/mmc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… Modified: trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/network/ping/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/osk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/rapps_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… Modified: trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/tr-TR… Modified: trunk/reactos/dll/win32/aclui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/lang/tr-TR… Modified: trunk/reactos/dll/win32/browseui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/tr… Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… Modified: trunk/reactos/dll/win32/setupapi/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/tr… Modified: trunk/reactos/dll/win32/shdoclc/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/lang/Tr.… Modified: trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/tr-… Modified: trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/tr… Modified: trunk/reactos/media/rapps/farmanager.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/farmanager.txt… Modified: trunk/reactos/media/rapps/freemat.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/freemat.txt?re… Modified: trunk/reactos/media/rapps/podcasteasy.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/podcasteasy.tx… Modified: trunk/reactos/media/rapps/scilab.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/scilab.txt?rev… Modified: trunk/reactos/media/rapps/tcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/tcc.txt?rev=72… Modified: trunk/reactos/media/rapps/unxutils.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/rapps/unxutils.txt?r… Modified: trunk/reactos/win32ss/user/user32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/t… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/usersrv/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr…

8 years, 2 months

[bfreisen] 72852: [PSDK][GDIPLUS] Make previously untested GDI+ C++ wrappers compilable. This involves: - adding the respective headers to gdiplus.h in a sensible order - adding forward-declaration...

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Thu Sep 29 11:15:10 2016 New Revision: 72852 URL: http://svn.reactos.org/svn/reactos?rev=72852&view=rev Log: [PSDK][GDIPLUS] Make previously untested GDI+ C++ wrappers compilable. This involves: - adding the respective headers to gdiplus.h in a sensible order - adding forward-declarations - adding friend-declarations, so that the wrapper functions in those classes can access the private GpXXX members - const-qualifying the getters in class Color - adding the EmfToWmfBitsFlags enum - commenting out bits that use unavailable flatapi functions - commenting out bits that for some reason the compiler does not like - the typical typo/data type fixes that untested code tends to need - moving the Font class within the same header to fulfill dependencies - adding private GpXXX members to otherwise unimplemented classes - adding a data-members-only implementation of SizeF Modified: trunk/reactos/sdk/include/psdk/gdiplus.h trunk/reactos/sdk/include/psdk/gdiplusbrush.h trunk/reactos/sdk/include/psdk/gdipluscolor.h trunk/reactos/sdk/include/psdk/gdiplusenums.h trunk/reactos/sdk/include/psdk/gdiplusgraphics.h trunk/reactos/sdk/include/psdk/gdiplusheaders.h trunk/reactos/sdk/include/psdk/gdiplusmatrix.h trunk/reactos/sdk/include/psdk/gdipluspath.h trunk/reactos/sdk/include/psdk/gdipluspen.h trunk/reactos/sdk/include/psdk/gdiplustypes.h Modified: trunk/reactos/sdk/include/psdk/gdiplus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplus.h… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplus.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplus.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -42,6 +42,18 @@ { #include "gdiplusflat.h" }; + +#include "gdiplusbase.h" +#include "gdiplusmatrix.h" +#include "gdiplusimageattributes.h" +#include "gdiplusbrush.h" +#include "gdipluspen.h" +#include "gdiplusstringformat.h" +#include "gdipluspath.h" +#include "gdiplusgraphics.h" +#include "gdiplusheaders.h" +#include "gdiplusmetafile.h" +#include "gdipluslinecaps.h" }; #else /* end c++ includes */ Modified: trunk/reactos/sdk/include/psdk/gdiplusbrush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusbr… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusbrush.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusbrush.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -19,6 +19,8 @@ #ifndef _GDIPLUSBRUSH_H #define _GDIPLUSBRUSH_H +class Image; + class Brush : public GdiplusBase { public: Modified: trunk/reactos/sdk/include/psdk/gdipluscolor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusco… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluscolor.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluscolor.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -54,47 +54,47 @@ Argb = a << 24 | r << 16 | g << 8 | b; } - BYTE GetA(VOID) + BYTE GetA(VOID) const { return (Argb >> 24) & 0xff; } - BYTE GetAlpha(VOID) + BYTE GetAlpha(VOID) const { return (Argb >> 24) & 0xff; } - BYTE GetB(VOID) + BYTE GetB(VOID) const { return Argb & 0xff; } - BYTE GetBlue(VOID) + BYTE GetBlue(VOID) const { return Argb & 0xff; } - BYTE GetG(VOID) + BYTE GetG(VOID) const { return (Argb >> 8) & 0xff; } - BYTE GetGreen(VOID) + BYTE GetGreen(VOID) const { return (Argb >> 8) & 0xff; } - BYTE GetR(VOID) + BYTE GetR(VOID) const { return (Argb >> 16) & 0xff; } - BYTE GetRed(VOID) + BYTE GetRed(VOID) const { return (Argb >> 16) & 0xff; } - ARGB GetValue(VOID) + ARGB GetValue(VOID) const { return Argb; } @@ -114,7 +114,7 @@ Argb = argb; } - COLORREF ToCOLORREF(VOID) + COLORREF ToCOLORREF(VOID) const { return (Argb & 0x000000ff) << 16 | (Argb & 0x0000ff00) | (Argb & 0x00ff0000) >> 16; } Modified: trunk/reactos/sdk/include/psdk/gdiplusenums.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusen… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusenums.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusenums.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -226,6 +226,14 @@ EmfTypeEmfOnly = MetafileTypeEmf, EmfTypeEmfPlusOnly = MetafileTypeEmfPlusOnly, EmfTypeEmfPlusDual = MetafileTypeEmfPlusDual +}; + +enum EmfToWmfBitsFlags +{ + EmfToWmfBitsFlagsDefault = 0, + EmfToWmfBitsFlagsEmbedEmf = 1, + EmfToWmfBitsFlagsIncludePlaceable = 2, + EmfToWmfBitsFlagsNoXORClip = 4 }; enum CompositingMode Modified: trunk/reactos/sdk/include/psdk/gdiplusgraphics.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusgr… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusgraphics.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusgraphics.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -19,8 +19,21 @@ #ifndef _GDIPLUSGRAPHICS_H #define _GDIPLUSGRAPHICS_H +class Image; +class ImageAttributes; +class CachedBitmap; +class Region; +class Font; +class GraphicsPath; +class Metafile; + class Graphics : public GdiplusBase { + friend class Region; + friend class Font; + friend class Bitmap; + friend class CachedBitmap; + public: Graphics(Image *image) { Modified: trunk/reactos/sdk/include/psdk/gdiplusheaders.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplushe… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusheaders.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusheaders.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -69,14 +69,15 @@ Status GetEncoderParameterList(const CLSID *clsidEncoder, UINT size, EncoderParameters *buffer) { - return SetStatus(DllExports::GdipGetEncoderParameterList(image, clsidEncoder, size, buffer)); + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipGetEncoderParameterList(image, clsidEncoder, size, buffer)); } UINT GetEncoderParameterListSize(const CLSID *clsidEncoder) { - UINT size; - SetStatus(DllExports::GdipGetEncoderParameterListSize(image, clsidEncoder, &size)); - return size; + return 0; // FIXME: not available: +// UINT size; +// SetStatus(DllExports::GdipGetEncoderParameterListSize(image, clsidEncoder, &size)); +// return size; } UINT GetFlags(VOID) @@ -138,7 +139,7 @@ Status GetPhysicalDimension(SizeF *size) { - return SetStatus(DllExports::GdipGetImagePhysicalDimension(image, &(size->Width), &(size->Height))); + return SetStatus(DllExports::GdipGetImageDimension(image, &size->Width, &size->Height)); } PixelFormat GetPixelFormat(VOID) @@ -179,7 +180,7 @@ Status GetRawFormat(GUID *format) { - return SetStatus(DllExports::GdipGetRawFormat(image, format)); + return SetStatus(DllExports::GdipGetImageRawFormat(image, format)); } Image *GetThumbnailImage(UINT thumbWidth, UINT thumbHeight, GetThumbnailImageAbort callback, VOID *callbackData) @@ -232,12 +233,12 @@ Status SaveAdd(const EncoderParameters* encoderParams) { - return SetStatus(DllExports::GdipSaveAdd(image, encoderParams)); + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAdd(image, encoderParams)); } Status SaveAdd(Image *newImage, const EncoderParameters *encoderParams) { - return SetStatus(DllExports::GdipSaveAddImage(image, newImage->image, encoderParams)); + return NotImplemented; // FIXME: not available: SetStatus(DllExports::GdipSaveAddImage(image, newImage->image, encoderParams)); } Status SelectActiveFrame(const GUID *dimensionID, UINT frameIndex) @@ -276,11 +277,13 @@ class Bitmap : public Image { + friend class CachedBitmap; + public: - Bitmap(IDirectDrawSurface7 *surface) - { - status = DllExports::GdipCreateBitmapFromDirectDrawSurface(surface, &bitmap); - } +// Bitmap(IDirectDrawSurface7 *surface) // <-- FIXME: compiler does not like this +// { +// status = DllExports::GdipCreateBitmapFromDirectDrawSurface(surface, &bitmap); +// } Bitmap(INT width, INT height, Graphics *target) { @@ -365,10 +368,10 @@ return new Bitmap(gdiBitmapInfo, gdiBitmapData); } - static Bitmap *FromDirectDrawSurface7(IDirectDrawSurface7 *surface) - { - return new Bitmap(surface); - } +// static Bitmap *FromDirectDrawSurface7(IDirectDrawSurface7 *surface) // <-- FIXME: compiler does not like this +// { +// return new Bitmap(surface); +// } static Bitmap *FromFile(const WCHAR *filename, BOOL useEmbeddedColorManagement) { @@ -402,7 +405,7 @@ Status GetHICON(HICON *hicon) { - return SetStatus(DllExports::GdipCreateHICONFromBitmap(bitmap, hbmReturn)); + return SetStatus(DllExports::GdipCreateHICONFromBitmap(bitmap, hicon)); } Status GetPixel(INT x, INT y, Color *color) @@ -458,7 +461,7 @@ public: CachedBitmap(Bitmap *bitmap, Graphics *graphics) { - status = DllExports::GdipCreateCachedBitmap(bitmap, graphics, &cachedBitmap); + status = DllExports::GdipCreateCachedBitmap(bitmap->bitmap, graphics->graphics, &cachedBitmap); } Status GetLastStatus(VOID) @@ -469,6 +472,167 @@ private: mutable Status status; GpCachedBitmap *cachedBitmap; +}; + + +class FontCollection : public GdiplusBase +{ + friend class FontFamily; + +public: + FontCollection(VOID) + { + } + + Status GetFamilies(INT numSought, FontFamily *gpfamilies, INT *numFound) const + { + return NotImplemented; + } + + INT GetFamilyCount(VOID) const + { + return 0; + } + + Status GetLastStatus(VOID) + { + return NotImplemented; + } + +private: + GpFontCollection *fontCollection; +}; + + +class FontFamily : public GdiplusBase +{ + friend class Font; + +public: + FontFamily(VOID) + { + } + + FontFamily(const WCHAR *name, const FontCollection *fontCollection) + { + status = DllExports::GdipCreateFontFamilyFromName(name, fontCollection->fontCollection, &fontFamily); + } + + FontFamily *Clone(VOID) + { + return NULL; + } + + static const FontFamily *GenericMonospace(VOID) + { + FontFamily *genericMonospace = new FontFamily(); + genericMonospace->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericMonospace->fontFamily)); + return genericMonospace; + } + + static const FontFamily *GenericSansSerif(VOID) + { + FontFamily *genericSansSerif = new FontFamily(); + genericSansSerif->status = DllExports::GdipGetGenericFontFamilySansSerif(&(genericSansSerif->fontFamily)); + return genericSansSerif; + } + + static const FontFamily *GenericSerif(VOID) + { + FontFamily *genericSerif = new FontFamily(); + genericSerif->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericSerif->fontFamily)); + return genericSerif; + } + + UINT16 GetCellAscent(INT style) const + { + UINT16 CellAscent; + SetStatus(DllExports::GdipGetCellAscent(fontFamily, style, &CellAscent)); + return CellAscent; + } + + UINT16 GetCellDescent(INT style) const + { + UINT16 CellDescent; + SetStatus(DllExports::GdipGetCellDescent(fontFamily, style, &CellDescent)); + return CellDescent; + } + + UINT16 GetEmHeight(INT style) + { + UINT16 EmHeight; + SetStatus(DllExports::GdipGetEmHeight(fontFamily, style, &EmHeight)); + return EmHeight; + } + + Status GetFamilyName(WCHAR name[LF_FACESIZE], WCHAR language) const + { + return SetStatus(DllExports::GdipGetFamilyName(fontFamily, name, language)); + } + + Status GetLastStatus(VOID) const + { + return status; + } + + UINT16 GetLineSpacing(INT style) const + { + UINT16 LineSpacing; + SetStatus(DllExports::GdipGetLineSpacing(fontFamily, style, &LineSpacing)); + return LineSpacing; + } + + BOOL IsAvailable(VOID) const + { + return FALSE; + } + + BOOL IsStyleAvailable(INT style) const + { + BOOL StyleAvailable; + SetStatus(DllExports::GdipIsStyleAvailable(fontFamily, style, &StyleAvailable)); + return StyleAvailable; + } + +private: + mutable Status status; + GpFontFamily *fontFamily; + + Status SetStatus(Status status) const + { + if (status == Ok) + return status; + this->status = status; + return status; + } +}; + + +class InstalledFontFamily : public FontFamily +{ +public: + InstalledFontFamily(VOID) + { + } +}; + + +class PrivateFontCollection : public FontCollection +{ +public: + PrivateFontCollection(VOID) + { + } + + Status AddFontFile(const WCHAR* filename) + { + return NotImplemented; + } + + Status AddMemoryFont(const VOID *memory, INT length) + { + return NotImplemented; + } }; @@ -481,7 +645,7 @@ Font(const FontFamily *family, REAL emSize, INT style, Unit unit) { - status = DllExports::GdipCreateFont(family->fontFamily, emSize, style. unit, &font); + status = DllExports::GdipCreateFont(family->fontFamily, emSize, style, unit, &font); } Font(HDC hdc, const HFONT hfont) @@ -565,13 +729,18 @@ Unit GetUnit(VOID) const { Unit unit; - SetStatus(DllExports::GdipGetFontUnit(font, &unit); + SetStatus(DllExports::GdipGetFontUnit(font, &unit)); return unit; } BOOL IsAvailable(VOID) const { return FALSE; + } + +protected: + Font() + { } private: @@ -584,160 +753,6 @@ return status; this->status = status; return status; - } -}; - - -class FontCollection : public GdiplusBase -{ -public: - FontCollection(VOID) - { - } - - Status GetFamilies(INT numSought, FontFamily *gpfamilies, INT *numFound) const - { - return NotImplemented; - } - - INT GetFamilyCount(VOID) const - { - return 0; - } - - Status GetLastStatus(VOID) - { - return NotImplemented; - } -}; - - -class FontFamily : public GdiplusBase -{ -public: - FontFamily(VOID) - { - } - - FontFamily(const WCHAR *name, const FontCollection *fontCollection) - { - status = DllExports::GdipCreateFontFamilyFromName(name, fontCollection, &fontFamily); - } - - FontFamily *Clone(VOID) - { - return NULL; - } - - static const FontFamily *GenericMonospace(VOID) - { - FontFamily *genericMonospace = new FontFamily(); - genericMonospace->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericMonospace->fontFamily)); - return genericMonospace; - } - - static const FontFamily *GenericSansSerif(VOID) - { - FontFamily *genericSansSerif = new FontFamily(); - genericSansSerif->status = DllExports::GdipGetGenericFontFamilySansSerif(&(genericSansSerif->fontFamily)); - return genericSansSerif; - } - - static const FontFamily *GenericSerif(VOID) - { - FontFamily *genericSerif = new FontFamily(); - genericSerif->status = DllExports::GdipGetGenericFontFamilyMonospace(&(genericSerif->fontFamily)); - return genericSerif; - } - - UINT16 GetCellAscent(INT style) const - { - UINT16 CellAscent; - SetStatus(DllExports::GdipGetCellAscent(fontFamily, style, &CellAscent)); - return CellAscent; - } - - UINT16 GetCellDescent(INT style) const - { - UINT16 CellDescent; - SetStatus(DllExports::GdipGetCellDescent(fontFamily, style, &CellDescent)); - return CellDescent; - } - - UINT16 GetEmHeight(INT style) - { - UINT16 EmHeight; - SetStatus(DllExports::GdipGetEmHeight(fontFamily, style, &EmHeight)); - return EmHeight; - } - - Status GetFamilyName(WCHAR name[LF_FACESIZE], WCHAR language) const - { - return SetStatus(DllExports::GdipGetFamilyName(fontFamily, name, language)); - } - - Status GetLastStatus(VOID) const - { - return status; - } - - UINT16 GetLineSpacing(INT style) const - { - UINT16 LineSpacing; - SetStatus(DllExports::GdipGetLineSpacing(fontFamily, style, &LineSpacing)); - return LineSpacing; - } - - BOOL IsAvailable(VOID) const - { - return FALSE; - } - - BOOL IsStyleAvailable(INT style) const - { - BOOL StyleAvailable; - SetStatus(DllExports::GdipIsStyleAvailable(fontFamily, style, &StyleAvailable)); - return StyleAvailable; - } - -private: - mutable Status status; - GpFontFamily *fontFamily; - - Status SetStatus(Status status) const - { - if (status == Ok) - return status; - this->status = status; - return status; - } -}; - - -class InstalledFontFamily : public FontFamily -{ -public: - InstalledFontFamily(VOID) - { - } -}; - - -class PrivateFontCollection : public FontCollection -{ -public: - PrivateFontCollection(VOID) - { - } - - Status AddFontFile(const WCHAR* filename) - { - return NotImplemented; - } - - Status AddMemoryFont(const VOID *memory, INT length) - { - return NotImplemented; } }; @@ -776,13 +791,13 @@ Region(const RectF &rect) { - status = DllExports::GdipCreateRegionRectF(&rect, &region); + status = DllExports::GdipCreateRegionRect(&rect, &region); } Region *Clone(VOID) { - region *cloneRegion = new Region(); - cloneRegion->status = DllExports::GdipCloneRegion(region, &cloneRegion); + Region *cloneRegion = new Region(); + cloneRegion->status = DllExports::GdipCloneRegion(region, &cloneRegion->region); return cloneRegion; } @@ -850,7 +865,7 @@ Status GetData(BYTE *buffer, UINT bufferSize, UINT *sizeFilled) const { - return SetStatus(DllExports::GdipGetRegionData(region, budder, bufferSize, sizeFilled)); + return SetStatus(DllExports::GdipGetRegionData(region, buffer, bufferSize, sizeFilled)); } UINT GetDataSize(VOID) const @@ -926,21 +941,21 @@ BOOL IsVisible(const PointF &point, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionPoint(region, point.x, point.y, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionPoint(region, point.X, point.Y, g->graphics, &result)); return result; } BOOL IsVisible(const RectF &rect, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionRect(region, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionRect(region, rect.X, rect.Y, rect.Width, rect.Height, g->graphics, &result)); return result; } BOOL IsVisible(const Rect &rect, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionRectI(region, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionRectI(region, rect.X, rect.Y, rect.Width, rect.Height, g->graphics, &result)); return result; } @@ -968,7 +983,7 @@ BOOL IsVisible(const Point &point, const Graphics *g) const { BOOL result; - SetStatus(DllExports::GdipIsVisibleRegionPointI(region, point.x, point.y, g->graphics, &result)); + SetStatus(DllExports::GdipIsVisibleRegionPointI(region, point.X, point.Y, g->graphics, &result)); return result; } Modified: trunk/reactos/sdk/include/psdk/gdiplusmatrix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusma… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplusmatrix.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplusmatrix.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -21,6 +21,8 @@ class Matrix : public GdiplusBase { + friend class Region; + public: Matrix(const RectF &rect, const PointF *dstplg) { @@ -45,7 +47,7 @@ Matrix *Clone(VOID) { Matrix *cloneMatrix = new Matrix(); // FIXME: Matrix::matrix already initialized --> potential memory leak - cloneMatrix->status = DllExports::GdipCloneMatrix(matrix, &cloneMatrix); + cloneMatrix->status = DllExports::GdipCloneMatrix(matrix, &cloneMatrix->matrix); return cloneMatrix; } @@ -130,7 +132,7 @@ return SetStatus(DllExports::GdipSetMatrixElements(matrix, m11, m12, m21, m22, dx, dy)); } - Status Shear(REAL shearX, REAL shearY, REAL order) + Status Shear(REAL shearX, REAL shearY, MatrixOrder order) { return SetStatus(DllExports::GdipShearMatrix(matrix, shearX, shearY, order)); } @@ -155,7 +157,7 @@ return SetStatus(DllExports::GdipVectorTransformMatrixPoints(matrix, pts, count)); } - Status Translate(REAL offsetX, REAL offsetY, REAL order) + Status Translate(REAL offsetX, REAL offsetY, MatrixOrder order) { return SetStatus(DllExports::GdipTranslateMatrix(matrix, offsetX, offsetY, order)); } Modified: trunk/reactos/sdk/include/psdk/gdipluspath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdipluspa… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluspath.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluspath.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -19,8 +19,13 @@ #ifndef _GDIPLUSPATH_H #define _GDIPLUSPATH_H +class FontFamily; +class Graphics; + class GraphicsPath : public GdiplusBase { + friend class Region; + public: GraphicsPath(const Point *points, const BYTE *types, INT count, FillMode fillMode) { @@ -418,6 +423,9 @@ { return NotImplemented; } + +private: + GpPath *path; }; Modified: trunk/reactos/sdk/include/psdk/gdipluspen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdipluspe… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdipluspen.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -18,6 +18,8 @@ #ifndef _GDIPLUSPEN_H #define _GDIPLUSPEN_H + +class CustomLineCap; class Pen : public GdiplusBase { Modified: trunk/reactos/sdk/include/psdk/gdiplustypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/gdiplusty… ============================================================================== --- trunk/reactos/sdk/include/psdk/gdiplustypes.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/gdiplustypes.h [iso-8859-1] Thu Sep 29 11:15:10 2016 @@ -227,6 +227,14 @@ INT Length; }; +/* FIXME: missing the methods. */ +class SizeF +{ +public: + REAL Width; + REAL Height; +}; + #else /* end of c++ typedefs */ typedef struct Point

8 years, 2 months

[akhaldi] 72851: [IPHLPAPI][KERNEL32] Revert r72722 and apply a proper fix based on tests. By Peter Hater. CORE-10440 ROSTESTS-243

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Sep 29 10:49:30 2016 New Revision: 72851 URL: http://svn.reactos.org/svn/reactos?rev=72851&view=rev Log: [IPHLPAPI][KERNEL32] Revert r72722 and apply a proper fix based on tests. By Peter Hater. CORE-10440 ROSTESTS-243 Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/kernel32/client/compname.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Thu Sep 29 10:49:30 2016 @@ -1404,7 +1404,7 @@ */ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) { - DWORD ret, size; + DWORD ret, size, type; LONG regReturn; HKEY hKey; PIPHLP_RES_INFO resInfo; @@ -1426,10 +1426,59 @@ } memset(pFixedInfo, 0, size); - size = sizeof(pFixedInfo->HostName); - GetComputerNameExA(ComputerNameDnsHostname, pFixedInfo->HostName, &size); - size = sizeof(pFixedInfo->DomainName); - GetComputerNameExA(ComputerNameDnsDomain, pFixedInfo->DomainName, &size); + /* Check for DhcpHostname and DhcpDomain first */ + regReturn = RegOpenKeyExA(HKEY_LOCAL_MACHINE, + "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", + 0, + KEY_READ, + &hKey); + if (regReturn == ERROR_SUCCESS) { + /* Windows doesn't honor DHCP option 12 even if RFC requires it if it is returned by DHCP server! */ +#if 0 + type = REG_SZ; + size = sizeof(pFixedInfo->HostName); + regReturn = RegQueryValueExA(hKey, + "DhcpHostname", + NULL, + &type, + (LPBYTE)pFixedInfo->HostName, + &size); + if (regReturn == ERROR_FILE_NOT_FOUND || (regReturn == ERROR_SUCCESS && size < 1)) + { +#endif + type = REG_SZ; + size = sizeof(pFixedInfo->HostName); + regReturn = RegQueryValueExA(hKey, + "Hostname", + NULL, + &type, + (LPBYTE)pFixedInfo->HostName, + &size); +#if 0 + } +#endif + + type = REG_SZ; + size = sizeof(pFixedInfo->DomainName); + regReturn = RegQueryValueExA(hKey, + "DhcpDomain", + NULL, + &type, + (LPBYTE)pFixedInfo->DomainName, + &size); + if (regReturn == ERROR_FILE_NOT_FOUND || (regReturn == ERROR_SUCCESS && size < 1)) + { + type = REG_SZ; + size = sizeof(pFixedInfo->DomainName); + regReturn = RegQueryValueExA(hKey, + "Domain", + NULL, + &type, + (LPBYTE)pFixedInfo->DomainName, + &size); + } + RegCloseKey(hKey); + } TRACE("GetComputerNameExA: %s\n", pFixedInfo->DomainName); Modified: trunk/reactos/dll/win32/kernel32/client/compname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/compname.c [iso-8859-1] Thu Sep 29 10:49:30 2016 @@ -137,7 +137,6 @@ NTSTATUS Status; BOOL ret = TRUE; DWORD HostSize; - DWORD nBufferSize; if ((nSize == NULL) || (lpBuffer == NULL && *nSize > 0)) @@ -156,27 +155,11 @@ nSize); case ComputerNameDnsDomain: - /* Save original buffer size for the second call if neccessery */ - nBufferSize = *nSize; - if (!GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"DhcpDomain", - lpBuffer, - nSize)) - { - /* The value is there, just the buffer is insufficient in length */ - if (GetLastError() == ERROR_MORE_DATA) - return FALSE; - /* Restore original buffer size for the second call */ - *nSize = nBufferSize; - return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" - L"\\Services\\Tcpip\\Parameters", - L"Domain", - lpBuffer, - nSize); - } - else - return TRUE; + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Domain", + lpBuffer, + nSize); case ComputerNameDnsFullyQualified: ResultString.Length = 0; @@ -212,7 +195,7 @@ RtlFreeUnicodeString(&DomainPart); RtlInitUnicodeString(&DomainPart, NULL); - QueryTable[0].Name = L"DhcpDomain"; + QueryTable[0].Name = L"Domain"; QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[0].EntryContext = &DomainPart; @@ -224,9 +207,7 @@ NULL, NULL); - if ((NT_SUCCESS(Status)) && - (DomainPart.Buffer != NULL) && - (wcslen(DomainPart.Buffer) > 0)) + if (NT_SUCCESS(Status)) { Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); if ((!NT_SUCCESS(Status)) || (!ret)) @@ -240,36 +221,6 @@ *nSize = ResultString.Length / sizeof(WCHAR) - 1; return TRUE; } - else - { - RtlInitUnicodeString(&DomainPart, NULL); - QueryTable[0].Name = L"Domain"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = &DomainPart; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - L"\\Registry\\Machine\\System" - L"\\CurrentControlSet\\Services\\Tcpip" - L"\\Parameters", - QueryTable, - NULL, - NULL); - - if (NT_SUCCESS(Status)) - { - Status = RtlAppendUnicodeStringToString(&ResultString, &DomainPart); - if ((!NT_SUCCESS(Status)) || (!ret)) - { - *nSize = HostSize + DomainPart.Length; - SetLastError(ERROR_MORE_DATA); - RtlFreeUnicodeString(&DomainPart); - return FALSE; - } - RtlFreeUnicodeString(&DomainPart); - *nSize = ResultString.Length / sizeof(WCHAR) - 1; - return TRUE; - } - } } return FALSE; @@ -281,9 +232,11 @@ nSize); case ComputerNamePhysicalDnsDomain: - return GetComputerNameExW(ComputerNameDnsDomain, - lpBuffer, - nSize); + return GetComputerNameFromRegistry(L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Domain", + lpBuffer, + nSize); /* XXX Redo these */ case ComputerNamePhysicalDnsFullyQualified:

8 years, 2 months

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 September 2016