Ros-diffs April 2019

ros-diffs@reactos.org

32 participants
240 discussions

[reactos] 01/01: [STOBJECT] Improvements to the power notification icon

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=453e5bc2afacf8c9595a5… commit 453e5bc2afacf8c9595a50a61714febf21636135 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Apr 19 21:50:13 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Apr 19 21:54:37 2019 +0200 [STOBJECT] Improvements to the power notification icon - Use GetSystemPowerStatus() instead of querying each battery. - Add an ugly AC power icon. Should be fixed or replaced. - Display AC power, battery charging, battery depleting and error cases. The AC power case was missing. - Update some strings because we are no longer using float for the charge percentage. @Turkish translators: Please check and update the translation of IDS_PWR_CHARGING! --- dll/shellext/stobject/lang/cs-CZ.rc | 4 +- dll/shellext/stobject/lang/de-DE.rc | 4 +- dll/shellext/stobject/lang/en-US.rc | 4 +- dll/shellext/stobject/lang/es-ES.rc | 4 +- dll/shellext/stobject/lang/fr-FR.rc | 4 +- dll/shellext/stobject/lang/hi-IN.rc | 4 +- dll/shellext/stobject/lang/it-IT.rc | 4 +- dll/shellext/stobject/lang/pl-PL.rc | 4 +- dll/shellext/stobject/lang/ro-RO.rc | 4 +- dll/shellext/stobject/lang/ru-RU.rc | 4 +- dll/shellext/stobject/lang/tr-TR.rc | 4 +- dll/shellext/stobject/lang/zh-CN.rc | 4 +- dll/shellext/stobject/lang/zh-TW.rc | 4 +- dll/shellext/stobject/power.cpp | 181 +++++-------------------- dll/shellext/stobject/resource.h | 1 + dll/shellext/stobject/resources/battery/ac.ico | Bin 0 -> 9062 bytes dll/shellext/stobject/stobject.rc | 1 + 17 files changed, 59 insertions(+), 176 deletions(-) diff --git a/dll/shellext/stobject/lang/cs-CZ.rc b/dll/shellext/stobject/lang/cs-CZ.rc index 57ec1bca55..34d63c3707 100644 --- a/dll/shellext/stobject/lang/cs-CZ.rc +++ b/dll/shellext/stobject/lang/cs-CZ.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Upravit možnosti napájení" IDS_PWR_METER "&Otevřít ukazatel spotřeby" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "zbývá %.2f%%" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_PERCENT_REMAINING "zbývá %u%%" + IDS_PWR_CHARGING "%u%% and charging" IDS_PWR_UNKNOWN_REMAINING "Zbývá neznámo" IDS_PWR_AC "On AC power" IDS_PWR_HOURS_REMAINING "zbývá %1!u!:%2!02u! hodin (%3!u!%%)" diff --git a/dll/shellext/stobject/lang/de-DE.rc b/dll/shellext/stobject/lang/de-DE.rc index 7d0657dcef..5363c29767 100644 --- a/dll/shellext/stobject/lang/de-DE.rc +++ b/dll/shellext/stobject/lang/de-DE.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Energieverwaltungseigenschaften einstellen" IDS_PWR_METER "Batterieanzeige ö&ffnen" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%.2f%% verbleibend" - IDS_PWR_CHARGING "%.2f%% und wird geladen" + IDS_PWR_PERCENT_REMAINING "%u%% verbleibend" + IDS_PWR_CHARGING "%u%% und wird geladen" IDS_PWR_UNKNOWN_REMAINING "Unbekannt verbleibend" IDS_PWR_AC "Mit Wechselstrom" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! Stunden (%3!u!%%) verbleibend" diff --git a/dll/shellext/stobject/lang/en-US.rc b/dll/shellext/stobject/lang/en-US.rc index ea1f17ffcd..807fd93abe 100644 --- a/dll/shellext/stobject/lang/en-US.rc +++ b/dll/shellext/stobject/lang/en-US.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Adjust Power Properties" IDS_PWR_METER "&Open Power Meter" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%.2f%% remaining" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_PERCENT_REMAINING "%u%% remaining" + IDS_PWR_CHARGING "%u%% and charging" IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" IDS_PWR_AC "On AC power" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! hours (%3!u!%%) remaining" diff --git a/dll/shellext/stobject/lang/es-ES.rc b/dll/shellext/stobject/lang/es-ES.rc index 3da6c8f48e..623412fa0d 100644 --- a/dll/shellext/stobject/lang/es-ES.rc +++ b/dll/shellext/stobject/lang/es-ES.rc @@ -19,8 +19,8 @@ BEGIN IDS_PWR_PROPERTIES "&Ajustar propiedades de energía" IDS_PWR_METER "Abrir &medidor de energía" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "Queda un %.2f%%" - IDS_PWR_CHARGING "%.2f%% y cargando" + IDS_PWR_PERCENT_REMAINING "Queda un %u%%" + IDS_PWR_CHARGING "%u%% y cargando" IDS_PWR_UNKNOWN_REMAINING "Estado de batería desconocido" IDS_PWR_AC "En corriente alterna" IDS_PWR_HOURS_REMAINING "Quedan %1!u!:%2!02u! horas (%3!u!%%)" diff --git a/dll/shellext/stobject/lang/fr-FR.rc b/dll/shellext/stobject/lang/fr-FR.rc index de393af36f..f0dfd9db9f 100644 --- a/dll/shellext/stobject/lang/fr-FR.rc +++ b/dll/shellext/stobject/lang/fr-FR.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Adjust Power Properties" IDS_PWR_METER "&Open Power Meter" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%.2f%% remaining" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_PERCENT_REMAINING "%u%% remaining" + IDS_PWR_CHARGING "%u%% and charging" IDS_PWR_UNKNOWN_REMAINING "Unknown remaining" IDS_PWR_AC "On AC power" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! hours (%3!u!%%) remaining" diff --git a/dll/shellext/stobject/lang/hi-IN.rc b/dll/shellext/stobject/lang/hi-IN.rc index 0abe3e5f4a..6b4b56febe 100644 --- a/dll/shellext/stobject/lang/hi-IN.rc +++ b/dll/shellext/stobject/lang/hi-IN.rc @@ -25,8 +25,8 @@ BEGIN IDS_PWR_PROPERTIES "पावर &गुण समायोजित करें" IDS_PWR_METER "पावर मीटर &खोलें" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%.2f%% शेष" - IDS_PWR_CHARGING "%.2f%% और चार्ज" + IDS_PWR_PERCENT_REMAINING "%u%% शेष" + IDS_PWR_CHARGING "%u%% और चार्ज" IDS_PWR_UNKNOWN_REMAINING "अज्ञात शेष" IDS_PWR_AC "On AC power" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! घंटे (%3!u!%%) शेष" diff --git a/dll/shellext/stobject/lang/it-IT.rc b/dll/shellext/stobject/lang/it-IT.rc index 628466edbe..e6fb7a3b93 100644 --- a/dll/shellext/stobject/lang/it-IT.rc +++ b/dll/shellext/stobject/lang/it-IT.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Modifica proprietà alimentazione" IDS_PWR_METER "&Apri misuratore alimentazione" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%.2f%% rimanenti" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_PERCENT_REMAINING "%u%% rimanenti" + IDS_PWR_CHARGING "%u%% and charging" IDS_PWR_UNKNOWN_REMAINING "Autonomia sconosciuta" IDS_PWR_AC "Alimentazione da rete AC" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! ore (%3!u!%%) rimanenti" diff --git a/dll/shellext/stobject/lang/pl-PL.rc b/dll/shellext/stobject/lang/pl-PL.rc index 3f1cc8d4da..74649a00a4 100644 --- a/dll/shellext/stobject/lang/pl-PL.rc +++ b/dll/shellext/stobject/lang/pl-PL.rc @@ -18,8 +18,8 @@ BEGIN IDS_PWR_PROPERTIES "&Opcje zasilania" IDS_PWR_METER "&Otwórz miernik baterii" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "Pozostało %.2f%%" - IDS_PWR_CHARGING "%.2f%% i ładuje" + IDS_PWR_PERCENT_REMAINING "Pozostało %u%%" + IDS_PWR_CHARGING "%u%% i ładuje" IDS_PWR_UNKNOWN_REMAINING "Stan naładowania nieznany" IDS_PWR_AC "Podłączony do zasilania" IDS_PWR_HOURS_REMAINING "Pozostało %1!u!:%2!02u! godzin (%3!u!%%)" diff --git a/dll/shellext/stobject/lang/ro-RO.rc b/dll/shellext/stobject/lang/ro-RO.rc index abbf38ba7a..b06b3e45e1 100644 --- a/dll/shellext/stobject/lang/ro-RO.rc +++ b/dll/shellext/stobject/lang/ro-RO.rc @@ -20,8 +20,8 @@ BEGIN IDS_PWR_PROPERTIES "&Ajustare proprietăți de consum energie" IDS_PWR_METER "&Deschide Contor de energie" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "Au mai rămas %.2f%%" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_PERCENT_REMAINING "Au mai rămas %u%%" + IDS_PWR_CHARGING "%u%% and charging" IDS_PWR_UNKNOWN_REMAINING "Nu este disponibil cât a mai rămas" IDS_PWR_AC "În rețea de CA" IDS_PWR_HOURS_REMAINING "Au mai rămas %1!u!:%2!02u! ore (%3!u!%%)" diff --git a/dll/shellext/stobject/lang/ru-RU.rc b/dll/shellext/stobject/lang/ru-RU.rc index af307d3024..07fae4b374 100644 --- a/dll/shellext/stobject/lang/ru-RU.rc +++ b/dll/shellext/stobject/lang/ru-RU.rc @@ -20,8 +20,8 @@ BEGIN IDS_PWR_PROPERTIES "&Настройка параметров электропитания" IDS_PWR_METER "&Открыть показатели питания" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%.2f%% осталось" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_PERCENT_REMAINING "%u%% осталось" + IDS_PWR_CHARGING "%u%% and charging" IDS_PWR_UNKNOWN_REMAINING "Неизвестно" IDS_PWR_AC "От сети переменного тока" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! часов (%3!u!%%) осталось" diff --git a/dll/shellext/stobject/lang/tr-TR.rc b/dll/shellext/stobject/lang/tr-TR.rc index 6fa7816e2d..2aa1f9b7df 100644 --- a/dll/shellext/stobject/lang/tr-TR.rc +++ b/dll/shellext/stobject/lang/tr-TR.rc @@ -20,8 +20,8 @@ BEGIN IDS_PWR_PROPERTIES "&Güç Özelliklerini Düzenle" IDS_PWR_METER "G&üç Ölçücüsünü Aç" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "%%%1!u! kaldı." - IDS_PWR_CHARGING " (Yükleniyor)" + IDS_PWR_PERCENT_REMAINING "%%%u kaldı." + IDS_PWR_CHARGING "%%%u (Yükleniyor)" IDS_PWR_UNKNOWN_REMAINING "Bilinmeyen kalan." IDS_PWR_AC "Dalgalı akımda." IDS_PWR_HOURS_REMAINING "%1!u!.%2!02u! saat (%%%3!u!) kalan" diff --git a/dll/shellext/stobject/lang/zh-CN.rc b/dll/shellext/stobject/lang/zh-CN.rc index b75b267d61..0589656ce6 100644 --- a/dll/shellext/stobject/lang/zh-CN.rc +++ b/dll/shellext/stobject/lang/zh-CN.rc @@ -20,8 +20,8 @@ BEGIN IDS_PWR_PROPERTIES "调整电源属性(&A)" IDS_PWR_METER "开放式电源表(&O)" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "剩余 %.2f%%" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_PERCENT_REMAINING "剩余 %u%%" + IDS_PWR_CHARGING "%u%% and charging" IDS_PWR_UNKNOWN_REMAINING "未知剩余" IDS_PWR_AC "交流电源" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! 小时剩余 (%3!u!%%) " diff --git a/dll/shellext/stobject/lang/zh-TW.rc b/dll/shellext/stobject/lang/zh-TW.rc index 001cf847f3..af6e90e888 100644 --- a/dll/shellext/stobject/lang/zh-TW.rc +++ b/dll/shellext/stobject/lang/zh-TW.rc @@ -20,8 +20,8 @@ BEGIN IDS_PWR_PROPERTIES "調整電源屬性(&A)" IDS_PWR_METER "開放式電源表(&O)" IDS_PWR_RUN "shell32.dll,Control_RunDLL PowerCfg.cpl" - IDS_PWR_PERCENT_REMAINING "剩餘 %.2f%%" - IDS_PWR_CHARGING "%.2f%% and charging" + IDS_PWR_PERCENT_REMAINING "剩餘 %u%%" + IDS_PWR_CHARGING "%u%% and charging" IDS_PWR_UNKNOWN_REMAINING "未知剩餘" IDS_PWR_AC "交流電源" IDS_PWR_HOURS_REMAINING "%1!u!:%2!02u! 小時剩餘 (%3!u!%%) " diff --git a/dll/shellext/stobject/power.cpp b/dll/shellext/stobject/power.cpp index 24d5fd888b..347fb01e53 100644 --- a/dll/shellext/stobject/power.cpp +++ b/dll/shellext/stobject/power.cpp @@ -16,9 +16,6 @@ #include <windows.h> #include <batclass.h> -#define GBS_HASBATTERY 0x1 -#define GBS_ONBATTERY 0x2 - int br_icons[5] = { IDI_BATTCAP0, IDI_BATTCAP1, IDI_BATTCAP2, IDI_BATTCAP3, IDI_BATTCAP4 }; // battery mode icons. int bc_icons[5] = { IDI_BATTCHA0, IDI_BATTCHA1, IDI_BATTCHA2, IDI_BATTCHA3, IDI_BATTCHA4 }; // charging mode icons. @@ -30,126 +27,9 @@ typedef struct _PWRSCHEMECONTEXT } PWRSCHEMECONTEXT, *PPWRSCHEMECONTEXT; CString g_strTooltip; -static float g_batCap = 0; static HICON g_hIconBattery = NULL; static BOOL g_IsRunning = FALSE; -/*++ -* @name GetBatteryState -* -* Enumerates the available battery devices and provides the remaining capacity. -* -* @param cap -* If no error occurs, then this will contain average remaining capacity. -* @param dwResult -* Helps in making battery type checks. -* { -* Returned value includes GBS_HASBATTERY if the system has a non-UPS battery, -* and GBS_ONBATTERY if the system is running on a battery. -* dwResult & GBS_ONBATTERY means we have not yet found AC power. -* dwResult & GBS_HASBATTERY means we have found a non-UPS battery. -* } -* -* @return The error code. -* -*--*/ -static HRESULT GetBatteryState(float& cap, DWORD& dwResult) -{ - cap = 0; - dwResult = GBS_ONBATTERY; - - HDEVINFO hdev = SetupDiGetClassDevs(&GUID_DEVCLASS_BATTERY, 0, 0, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE); - if (INVALID_HANDLE_VALUE == hdev) - return E_HANDLE; - - // Limit search to 100 batteries max - for (int idev = 0, count = 0; idev < 100; idev++) - { - SP_DEVICE_INTERFACE_DATA did = { 0 }; - did.cbSize = sizeof(did); - - if (SetupDiEnumDeviceInterfaces(hdev, 0, &GUID_DEVCLASS_BATTERY, idev, &did)) - { - DWORD cbRequired = 0; - - SetupDiGetDeviceInterfaceDetail(hdev, &did, 0, 0, &cbRequired, 0); - if (ERROR_INSUFFICIENT_BUFFER == GetLastError()) - { - PSP_DEVICE_INTERFACE_DETAIL_DATA pdidd = (PSP_DEVICE_INTERFACE_DETAIL_DATA)LocalAlloc(LPTR, cbRequired); - if (pdidd) - { - pdidd->cbSize = sizeof(*pdidd); - if (SetupDiGetDeviceInterfaceDetail(hdev, &did, pdidd, cbRequired, &cbRequired, 0)) - { - // Enumerated a battery. Ask it for information. - HANDLE hBattery = CreateFile(pdidd->DevicePath, GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - - if (INVALID_HANDLE_VALUE != hBattery) - { - // Ask the battery for its tag. - BATTERY_QUERY_INFORMATION bqi = { 0 }; - - DWORD dwWait = 0; - DWORD dwOut; - - if (DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_TAG, &dwWait, sizeof(dwWait), &bqi.BatteryTag, - sizeof(bqi.BatteryTag), &dwOut, NULL) && bqi.BatteryTag) - { - // With the tag, you can query the battery info. - BATTERY_INFORMATION bi = { 0 }; - bqi.InformationLevel = BatteryInformation; - - if (DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_INFORMATION, &bqi, sizeof(bqi), &bi, - sizeof(bi), &dwOut, NULL)) - { - // Only non-UPS system batteries count - if (bi.Capabilities & BATTERY_SYSTEM_BATTERY) - { - if (!(bi.Capabilities & BATTERY_IS_SHORT_TERM)) - dwResult |= GBS_HASBATTERY; - - // Query the battery status. - BATTERY_WAIT_STATUS bws = { 0 }; - bws.BatteryTag = bqi.BatteryTag; - - BATTERY_STATUS bs; - if (DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_STATUS, &bws, sizeof(bws), - &bs, sizeof(bs), &dwOut, NULL)) - { - if (bs.PowerState & BATTERY_POWER_ON_LINE) - dwResult &= ~GBS_ONBATTERY; - - // Take average of total capacity of batteries detected! - cap = cap*(count)+(float)bs.Capacity / bi.FullChargedCapacity * 100; - cap /= count + 1; - count++; - } - } - } - } - CloseHandle(hBattery); - } - } - LocalFree(pdidd); - } - } - } - else if (ERROR_NO_MORE_ITEMS == GetLastError()) - { - break; // Enumeration failed - perhaps we're out of items - } - } - SetupDiDestroyDeviceInfoList(hdev); - - // Final cleanup: If we didn't find a battery, then presume that we - // are on AC power. - - if (!(dwResult & GBS_HASBATTERY)) - dwResult &= ~GBS_ONBATTERY; - - return S_OK; -} /*++ * @name Quantize @@ -158,23 +38,9 @@ static HRESULT GetBatteryState(float& cap, DWORD& dwResult) * * @param p * Should be a quantity in percentage. -* @param lvl -* Quantization level (this excludes base level 0, which will always be present), default is 10. * * @return Nearest quantized level, can be directly used as array index based on context. * -*--*/ -static UINT Quantize(float p, UINT lvl = 10) -{ - int i = 0; - float f, q = (float)100 / lvl, d = q / 2; - for (f = 0; f < p; f += q, i++); - - if ((f - d) <= p) - return i; - else - return i - 1; -/* @remarks This function uses centred/symmetric logic for quantization. For the case of lvl = 4, You will get following integer levels if given (p) value falls in between the range partitions: 0 <= p < 12.5 : returns 0; (corresponding to 0% centre) @@ -182,7 +48,19 @@ static UINT Quantize(float p, UINT lvl = 10) 37.5 <= p < 62.5 : returns 2; (corresponding to 50% centre) 62.5 <= p < 87.5 : returns 3; (corresponding to 75% centre) 87.5 <= p <= 100 : returns 4; (corresponding to 100% centre) -*/ + *--*/ +static UINT Quantize(BYTE p) +{ + if (p <= 12) + return 0; + else if (p > 12 && p <= 37) + return 1; + else if (p > 37 && p <= 62) + return 2; + else if (p > 62 && p <= 87) + return 3; + else + return 4; } /*++ @@ -198,35 +76,38 @@ static UINT Quantize(float p, UINT lvl = 10) * *--*/ static HICON DynamicLoadIcon(HINSTANCE hinst) -{ +{ + SYSTEM_POWER_STATUS PowerStatus; HICON hBatIcon; - float cap = 0; - DWORD dw = 0; UINT index = -1; - HRESULT hr = GetBatteryState(cap, dw); - if (!FAILED(hr) && (dw & GBS_HASBATTERY)) - { - index = Quantize(cap, 4); - g_batCap = cap; - } - else + if (!GetSystemPowerStatus(&PowerStatus) || + PowerStatus.ACLineStatus == AC_LINE_UNKNOWN || + PowerStatus.BatteryFlag == BATTERY_FLAG_UNKNOWN) { - g_batCap = 0; hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_BATTCAP_ERR)); g_strTooltip.LoadStringW(IDS_PWR_UNKNOWN_REMAINING); return hBatIcon; } - if (dw & GBS_ONBATTERY) + if (((PowerStatus.BatteryFlag & BATTERY_FLAG_NO_BATTERY) == 0) && + ((PowerStatus.BatteryFlag & BATTERY_FLAG_CHARGING) == BATTERY_FLAG_CHARGING)) { + index = Quantize(PowerStatus.BatteryLifePercent); + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(bc_icons[index])); + g_strTooltip.Format(IDS_PWR_CHARGING, PowerStatus.BatteryLifePercent); + } + else if (((PowerStatus.BatteryFlag & BATTERY_FLAG_NO_BATTERY) == 0) && + ((PowerStatus.BatteryFlag & BATTERY_FLAG_CHARGING) == 0)) + { + index = Quantize(PowerStatus.BatteryLifePercent); hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(br_icons[index])); - g_strTooltip.Format(IDS_PWR_PERCENT_REMAINING, cap); + g_strTooltip.Format(IDS_PWR_PERCENT_REMAINING, PowerStatus.BatteryLifePercent); } else { - hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(bc_icons[index])); - g_strTooltip.Format(IDS_PWR_CHARGING, cap); + hBatIcon = LoadIcon(hinst, MAKEINTRESOURCE(IDI_POWER_AC)); + g_strTooltip.LoadStringW(IDS_PWR_AC); } return hBatIcon; diff --git a/dll/shellext/stobject/resource.h b/dll/shellext/stobject/resource.h index a7466f77d3..71d500ec25 100644 --- a/dll/shellext/stobject/resource.h +++ b/dll/shellext/stobject/resource.h @@ -51,6 +51,7 @@ #define IDI_BATTCHA3 409 #define IDI_BATTCHA4 410 #define IDI_BATTCAP_ERR 412 +#define IDI_POWER_AC 413 #define IDI_HOTPLUG_ERR 420 #define IDI_HOTPLUG_OK 421 diff --git a/dll/shellext/stobject/resources/battery/ac.ico b/dll/shellext/stobject/resources/battery/ac.ico new file mode 100644 index 0000000000..b10bb471e8 Binary files /dev/null and b/dll/shellext/stobject/resources/battery/ac.ico differ diff --git a/dll/shellext/stobject/stobject.rc b/dll/shellext/stobject/stobject.rc index 5946127ece..0540b5a696 100644 --- a/dll/shellext/stobject/stobject.rc +++ b/dll/shellext/stobject/stobject.rc @@ -25,6 +25,7 @@ IDI_BATTCHA3 ICON "resources/battery/charging3.ico" IDI_BATTCHA4 ICON "resources/battery/charging4.ico" IDI_BATTCAP_ERR ICON "resources/battery/error.ico" +IDI_POWER_AC ICON "resources/battery/ac.ico" IDI_HOTPLUG_ERR ICON "resources/hotplug/0.ico" IDI_HOTPLUG_OK ICON "resources/hotplug/1.ico"

5 years, 8 months

[reactos] 06/06: [DBGHELP] SymFromAddr: Handle 2 or more symbols at the same address correct.

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0263151f3c49446f76af5… commit 0263151f3c49446f76af53f9648109de3653c0b9 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Thu Nov 22 22:15:55 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 19 21:09:45 2019 +0200 [DBGHELP] SymFromAddr: Handle 2 or more symbols at the same address correct. There could be more then 2 symbols at the same addr. Adjust function to handle that case correct. --- dll/win32/dbghelp/symbol.c | 58 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c index fea06e2f2a..5b0ad32cee 100644 --- a/dll/win32/dbghelp/symbol.c +++ b/dll/win32/dbghelp/symbol.c @@ -874,6 +874,33 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON *size = 0x1000; /* arbitrary value */ } +/* neede by symt_find_nearest */ +int symt_get_best_at(struct module* module, int idx_sorttab) +{ + ULONG64 ref_addr; + int idx_sorttab_orig = idx_sorttab; + if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) + { + symt_get_address(&module->addr_sorttab[idx_sorttab]->symt, &ref_addr); + while (idx_sorttab > 0 && + module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol && + !cmp_sorttab_addr(module, idx_sorttab - 1, ref_addr)) + idx_sorttab--; + if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) + { + idx_sorttab = idx_sorttab_orig; + while (idx_sorttab < module->num_sorttab - 1 && + module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol && + !cmp_sorttab_addr(module, idx_sorttab + 1, ref_addr)) + idx_sorttab++; + } + /* if no better symbol fond restore original */ + if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) + idx_sorttab = idx_sorttab_orig; + } + return idx_sorttab; +} + /* assume addr is in module */ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) { @@ -892,7 +919,12 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) high = module->num_sorttab; symt_get_address(&module->addr_sorttab[0]->symt, &ref_addr); - if (addr < ref_addr) return NULL; + if (addr <= ref_addr) + { + low = symt_get_best_at(module, 0); + return module->addr_sorttab[low]; + } + if (high) { symt_get_address(&module->addr_sorttab[high - 1]->symt, &ref_addr); @@ -915,23 +947,13 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) /* If found symbol is a public symbol, check if there are any other entries that * might also have the same address, but would get better information */ - if (module->addr_sorttab[low]->symt.tag == SymTagPublicSymbol) - { - symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr); - if (low > 0 && - module->addr_sorttab[low - 1]->symt.tag != SymTagPublicSymbol && - !cmp_sorttab_addr(module, low - 1, ref_addr)) - low--; - else if (low < module->num_sorttab - 1 && - module->addr_sorttab[low + 1]->symt.tag != SymTagPublicSymbol && - !cmp_sorttab_addr(module, low + 1, ref_addr)) - low++; - } + low = symt_get_best_at(module, low); + /* finally check that we fit into the found symbol */ - symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr); - if (addr < ref_addr) return NULL; - symt_get_length(module, &module->addr_sorttab[low]->symt, &ref_size); - if (addr >= ref_addr + ref_size) return NULL; + //symt_get_address(&module->addr_sorttab[low]->symt, &ref_addr); + //if (addr < ref_addr) return NULL; + //symt_get_length(module, &module->addr_sorttab[low]->symt, &ref_size); + //if (addr >= ref_addr + ref_size) return NULL; return module->addr_sorttab[low]; } @@ -1260,7 +1282,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); if (Displacement) - *Displacement = Address - Symbol->Address; + *Displacement = (Address >= Symbol->Address) ? (Address - Symbol->Address) : (DWORD64)-1; return TRUE; }

5 years, 8 months

[reactos] 05/06: [DBGHELP] Set LastError for SymGetModuleBase-calls to ERROR_MOD_NOT_FOUND.

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2bcd8afdd6c47b4a403d… commit b2bcd8afdd6c47b4a403db4b75272a21dc93c904 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Thu Nov 22 22:14:24 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 19 21:09:45 2019 +0200 [DBGHELP] Set LastError for SymGetModuleBase-calls to ERROR_MOD_NOT_FOUND. Correct last error in module_find_by_addr. --- dll/win32/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c index 0173469bd6..aaa0ff6f98 100644 --- a/dll/win32/dbghelp/module.c +++ b/dll/win32/dbghelp/module.c @@ -417,7 +417,7 @@ struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr, return module; } } - SetLastError(ERROR_INVALID_ADDRESS); + SetLastError(ERROR_MOD_NOT_FOUND); return module; }

5 years, 8 months

[reactos] 04/06: [DBGHELP] set correct values in symt_fill_sym_info (SYMBOL_INFO).

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6175044aed2858637a6d0… commit 6175044aed2858637a6d07aa2be1e8d2252fe9db Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Thu Nov 22 21:47:45 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 19 21:09:45 2019 +0200 [DBGHELP] set correct values in symt_fill_sym_info (SYMBOL_INFO). * symtype: set to SymPdb not SymCv (may be for old pdb-files pre VS 6.0) * flags: return SYMFLAG_PUBLIC_CODE for SymTagPublicSymbol if its a function. * flags: do not return SYMFLAG_FUNCTION for SymTagFuncion. --- dll/win32/dbghelp/dbghelp_private.h | 5 ++++- dll/win32/dbghelp/msc.c | 5 ++++- dll/win32/dbghelp/pe_module.c | 13 +++++++------ dll/win32/dbghelp/rsym.c | 2 +- dll/win32/dbghelp/symbol.c | 13 ++++++++++--- 5 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 23ee3f4662..0d1e8e4274 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -244,6 +244,7 @@ struct symt_public struct symt symt; struct hash_table_elt hash_elt; struct symt* container; /* compiland */ + BOOL is_function; unsigned long address; unsigned long size; }; @@ -722,7 +723,9 @@ extern struct symt_public* symt_new_public(struct module* module, struct symt_compiland* parent, const char* typename, - unsigned long address, unsigned size) DECLSPEC_HIDDEN; + BOOL is_function, + unsigned long address, + unsigned size) DECLSPEC_HIDDEN; extern struct symt_data* symt_new_global_variable(struct module* module, struct symt_compiland* parent, diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index 6dc9276925..07f3e3a469 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2072,6 +2072,7 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->public_v1.p_name), + sym->public_v1.symtype == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v1.segment, sym->public_v1.offset), 1); } break; @@ -2080,6 +2081,7 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->public_v2.p_name), + sym->public_v3.symtype == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v2.segment, sym->public_v2.offset), 1); } break; @@ -2089,6 +2091,7 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, sym->public_v3.name, + sym->public_v3.symtype == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v3.segment, sym->public_v3.offset), 1); } break; @@ -2885,7 +2888,7 @@ static BOOL pdb_process_file(const struct process* pcs, if (ret) { struct pdb_module_info* pdb_info = msc_dbg->module->format_info[DFI_PDB]->u.pdb_info; - msc_dbg->module->module.SymType = SymCv; + msc_dbg->module->module.SymType = SymPdb; if (pdb_info->pdb_files[0].kind == PDB_JG) msc_dbg->module->module.PdbSig = pdb_info->pdb_files[0].u.jg.timestamp; else diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c index 4b9eac4f03..8e48fd8bbd 100644 --- a/dll/win32/dbghelp/pe_module.c +++ b/dll/win32/dbghelp/pe_module.c @@ -444,9 +444,9 @@ static BOOL pe_load_coff_symbol_table(struct module* module) source_new(module, NULL, lastfilename)); if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) - symt_new_public(module, compiland, name, + symt_new_public(module, compiland, name, FALSE, module->module.BaseOfImage + sect[isym->SectionNumber - 1].VirtualAddress + - isym->Value, + isym->Value, 1); } naux = isym->NumberOfAuxSymbols + 1; @@ -674,11 +674,11 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* #if 0 /* Add start of DLL (better use the (yet unimplemented) Exe SymTag for this) */ /* FIXME: module.ModuleName isn't correctly set yet if it's passed in SymLoadModule */ - symt_new_public(module, NULL, module->module.ModuleName, base, 1); + symt_new_public(module, NULL, module->module.ModuleName, FALSE, base, 1); #endif /* Add entry point */ - symt_new_public(module, NULL, "EntryPoint", + symt_new_public(module, NULL, "EntryPoint", FALSE, base + nth->OptionalHeader.AddressOfEntryPoint, 1); #if 0 /* FIXME: we'd better store addresses linked to sections rather than @@ -689,7 +689,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) { - symt_new_public(module, NULL, section->Name, + symt_new_public(module, NULL, section->Name, FALSE, RtlImageRvaToVa(nth, mapping, section->VirtualAddress, NULL), 1); } #endif @@ -715,6 +715,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* if (!names[i]) continue; symt_new_public(module, NULL, RtlImageRvaToVa(nth, mapping, names[i], NULL), + FALSE, base + functions[ordinals[i]], 1); } @@ -726,7 +727,7 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* if ((ordinals[j] == i) && names[j]) break; if (j < exports->NumberOfNames) continue; snprintf(buffer, sizeof(buffer), "%d", i + exports->Base); - symt_new_public(module, NULL, buffer, base + (DWORD)functions[i], 1); + symt_new_public(module, NULL, buffer, FALSE, base + (DWORD)functions[i], 1); } } } diff --git a/dll/win32/dbghelp/rsym.c b/dll/win32/dbghelp/rsym.c index 9b7bf4ee1d..de4b315085 100644 --- a/dll/win32/dbghelp/rsym.c +++ b/dll/win32/dbghelp/rsym.c @@ -125,7 +125,7 @@ BOOL rsym_parse(struct module* module, unsigned long load_offset, if (use_raw_address(SymbolName)) Address = Entry->Address; - symt_new_public(module, NULL, SymbolName, Address, Size); + symt_new_public(module, NULL, SymbolName, FALSE, Address, Size); } else { diff --git a/dll/win32/dbghelp/symbol.c b/dll/win32/dbghelp/symbol.c index 633aa45d31..fea06e2f2a 100644 --- a/dll/win32/dbghelp/symbol.c +++ b/dll/win32/dbghelp/symbol.c @@ -226,6 +226,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, struct symt_public* symt_new_public(struct module* module, struct symt_compiland* compiland, const char* name, + BOOL is_function, unsigned long address, unsigned size) { struct symt_public* sym; @@ -241,6 +242,7 @@ struct symt_public* symt_new_public(struct module* module, sym->symt.tag = SymTagPublicSymbol; sym->hash_elt.name = pool_strdup(&module->pool, name); sym->container = compiland ? &compiland->symt : NULL; + sym->is_function = is_function; sym->address = address; sym->size = size; symt_add_module_ht(module, (struct symt_ht*)sym); @@ -697,11 +699,16 @@ static void symt_fill_sym_info(struct module_pair* pair, } break; case SymTagPublicSymbol: - sym_info->Flags |= SYMFLAG_EXPORT; - symt_get_address(sym, &sym_info->Address); + { + const struct symt_public* pub = (const struct symt_public*)sym; + if (pub->is_function) + sym_info->Flags |= SYMFLAG_PUBLIC_CODE; + else + sym_info->Flags |= SYMFLAG_EXPORT; + symt_get_address(sym, &sym_info->Address); + } break; case SymTagFunction: - sym_info->Flags |= SYMFLAG_FUNCTION; symt_get_address(sym, &sym_info->Address); break; case SymTagThunk:

5 years, 8 months

[reactos] 03/06: [DBGHELP] Add SYMFLAG_- and SYMTYPE_-defines.

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9466a005e9c324940de1e… commit 9466a005e9c324940de1e5f927dee8c1349c1d3a Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Thu Nov 22 21:34:14 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 19 21:09:44 2019 +0200 [DBGHELP] Add SYMFLAG_- and SYMTYPE_-defines. --- dll/win32/dbghelp/compat.h | 7 +++++++ sdk/include/psdk/dbghelp.h | 7 +++++++ sdk/include/reactos/wine/mscvpdb.h | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index 46b07d18c6..a356585253 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -655,6 +655,13 @@ typedef VOID IMAGEHLP_CONTEXT, *PIMAGEHLP_CONTEXT; #define SYMFLAG_THUNK 0x00002000 #define SYMFLAG_TLSREL 0x00004000 #define SYMFLAG_SLOT 0x00008000 +#define SYMFLAG_ILREL 0x00010000 +#define SYMFLAG_METADATA 0x00020000 +#define SYMFLAG_CLR_TOKEN 0x00040000 +#define SYMFLAG_NULL 0x00080000 +#define SYMFLAG_FUNC_NO_RETURN 0x00100000 +#define SYMFLAG_SYNTHETIC_ZEROBASE 0x00200000 +#define SYMFLAG_PUBLIC_CODE 0x00400000 #define UNDNAME_COMPLETE (0x0000) #define UNDNAME_NAME_ONLY (0x1000) typedef struct _TI_FINDCHILDREN_PARAMS diff --git a/sdk/include/psdk/dbghelp.h b/sdk/include/psdk/dbghelp.h index 7a379466e9..b26908a673 100644 --- a/sdk/include/psdk/dbghelp.h +++ b/sdk/include/psdk/dbghelp.h @@ -1106,6 +1106,13 @@ BOOL WINAPI SymUnloadModule64(_In_ HANDLE, _In_ DWORD64); #define SYMFLAG_THUNK 0x00002000 #define SYMFLAG_TLSREL 0x00004000 #define SYMFLAG_SLOT 0x00008000 +#define SYMFLAG_ILREL 0x00010000 +#define SYMFLAG_METADATA 0x00020000 +#define SYMFLAG_CLR_TOKEN 0x00040000 +#define SYMFLAG_NULL 0x00080000 +#define SYMFLAG_FUNC_NO_RETURN 0x00100000 +#define SYMFLAG_SYNTHETIC_ZEROBASE 0x00200000 +#define SYMFLAG_PUBLIC_CODE 0x00400000 #define MAX_SYM_NAME 2000 diff --git a/sdk/include/reactos/wine/mscvpdb.h b/sdk/include/reactos/wine/mscvpdb.h index f11f4065de..af521ffe56 100644 --- a/sdk/include/reactos/wine/mscvpdb.h +++ b/sdk/include/reactos/wine/mscvpdb.h @@ -1229,6 +1229,13 @@ union codeview_fieldtype #define LF_COMPLEX128 0x800f #define LF_VARSTRING 0x8010 +/* symtype e.g. for public_vx.symtype */ +#define SYMTYPE_NONE 0x0000 +#define SYMTYPE_CODE 0x0001 +#define SYMTYPE_FUNCTION 0x0002 +#define SYMTYPE_MANAGED 0x0004 +#define SYMTYPE_MSIL 0x0008 + /* ======================================== * * Symbol information * ======================================== */

5 years, 8 months

[reactos] 02/06: [DBGHELP] use correct record in codeview_snarf_public.

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3447d02c1d7c8fe39d17… commit e3447d02c1d7c8fe39d17614b00ad2a768439001 Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Thu Nov 22 21:27:48 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 19 21:09:44 2019 +0200 [DBGHELP] use correct record in codeview_snarf_public. Use public_vx iststead of data_vx for public symbols. --- dll/win32/dbghelp/msc.c | 16 ++++++++-------- sdk/include/reactos/wine/mscvpdb.h | 10 ++++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index 58a4a55f2e..6dc9276925 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2067,20 +2067,20 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY switch (sym->generic.id) { - case S_PUB_V1: /* FIXME is this really a 'data_v1' structure ?? */ + case S_PUB_V1: if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - terminate_string(&sym->data_v1.p_name), - codeview_get_address(msc_dbg, sym->data_v1.segment, sym->data_v1.offset), 1); + terminate_string(&sym->public_v1.p_name), + codeview_get_address(msc_dbg, sym->public_v1.segment, sym->public_v1.offset), 1); } break; - case S_PUB_V2: /* FIXME is this really a 'data_v2' structure ?? */ + case S_PUB_V2: if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - terminate_string(&sym->data_v2.p_name), - codeview_get_address(msc_dbg, sym->data_v2.segment, sym->data_v2.offset), 1); + terminate_string(&sym->public_v2.p_name), + codeview_get_address(msc_dbg, sym->public_v2.segment, sym->public_v2.offset), 1); } break; @@ -2088,8 +2088,8 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY if (!(dbghelp_options & SYMOPT_NO_PUBLICS)) { symt_new_public(msc_dbg->module, compiland, - sym->data_v3.name, - codeview_get_address(msc_dbg, sym->data_v3.segment, sym->data_v3.offset), 1); + sym->public_v3.name, + codeview_get_address(msc_dbg, sym->public_v3.segment, sym->public_v3.offset), 1); } break; case S_PUB_FUNC1_V3: diff --git a/sdk/include/reactos/wine/mscvpdb.h b/sdk/include/reactos/wine/mscvpdb.h index 744c17faba..f11f4065de 100644 --- a/sdk/include/reactos/wine/mscvpdb.h +++ b/sdk/include/reactos/wine/mscvpdb.h @@ -1350,6 +1350,16 @@ union codeview_symbol char name[1]; } proc_v3; + struct + { + short int len; + short int id; + unsigned int offset; + unsigned short segment; + unsigned short symtype; + struct p_string p_name; + } public_v1; + struct { short int len;

5 years, 8 months

[reactos] 01/06: [DBGHELP] search for debugfiles in modulepath too.

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=183294a12e6a1b832ec99… commit 183294a12e6a1b832ec994399e5efd602ba2b81f Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Sat Nov 3 21:26:48 2018 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 19 21:09:38 2019 +0200 [DBGHELP] search for debugfiles in modulepath too. Debug symbols (like PDB, ...) could not be found if the direcory of the module and application differs. Applying this patch they will be found. Dbghelp searches the module path too. (See MS docs). --- dll/win32/dbghelp/dbghelp_private.h | 6 +++--- dll/win32/dbghelp/msc.c | 4 ++-- dll/win32/dbghelp/path.c | 35 ++++++++++++++++++++++++++++++++--- dll/win32/dbghelp/pe_module.c | 2 +- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dll/win32/dbghelp/dbghelp_private.h b/dll/win32/dbghelp/dbghelp_private.h index 9eb0592fca..23ee3f4662 100644 --- a/dll/win32/dbghelp/dbghelp_private.h +++ b/dll/win32/dbghelp/dbghelp_private.h @@ -655,9 +655,9 @@ extern BOOL pdb_virtual_unwind(struct cpu_stack_walk* csw, DWORD_PTR ip, CONTEXT* context, struct pdb_cmd_pair* cpair) DECLSPEC_HIDDEN; /* path.c */ -extern BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, - const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, - BOOL* is_unmatched) DECLSPEC_HIDDEN; +extern BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, + PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, + PSTR buffer, BOOL* is_unmatched) DECLSPEC_HIDDEN; /* pe_module.c */ extern BOOL pe_load_nt_header(HANDLE hProc, DWORD64 base, IMAGE_NT_HEADERS* nth) DECLSPEC_HIDDEN; diff --git a/dll/win32/dbghelp/msc.c b/dll/win32/dbghelp/msc.c index eba26498cb..58a4a55f2e 100644 --- a/dll/win32/dbghelp/msc.c +++ b/dll/win32/dbghelp/msc.c @@ -2450,11 +2450,11 @@ static HANDLE map_pdb_file(const struct process* pcs, switch (lookup->kind) { case PDB_JG: - ret = path_find_symbol_file(pcs, lookup->filename, NULL, lookup->timestamp, + ret = path_find_symbol_file(pcs, module, lookup->filename, NULL, lookup->timestamp, lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; case PDB_DS: - ret = path_find_symbol_file(pcs, lookup->filename, &lookup->guid, 0, + ret = path_find_symbol_file(pcs, module, lookup->filename, &lookup->guid, 0, lookup->age, dbg_file_path, &module->module.PdbUnmatched); break; } diff --git a/dll/win32/dbghelp/path.c b/dll/win32/dbghelp/path.c index 8c74426eec..f8f268d8e9 100644 --- a/dll/win32/dbghelp/path.c +++ b/dll/win32/dbghelp/path.c @@ -49,6 +49,17 @@ static inline const WCHAR* file_nameW(const WCHAR* str) return p + 1; } +static inline void file_pathW(const WCHAR* srcFileNameW, + WCHAR* dstFilePathW) +{ + int len; + + for (len = strlenW(srcFileNameW) - 1; (len > 0) && (!is_sepW(srcFileNameW[len])); len--); + + strncpyW(dstFilePathW, srcFileNameW, len); + dstFilePathW[len] = L'\0'; +} + /****************************************************************** * FindDebugInfoFile (DBGHELP.@) * @@ -612,9 +623,9 @@ static BOOL CALLBACK module_find_cb(PCWSTR buffer, PVOID user) return mf->matched == 2; } -BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, - const GUID* guid, DWORD dw1, DWORD dw2, PSTR buffer, - BOOL* is_unmatched) +BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, + PCSTR full_path, const GUID* guid, DWORD dw1, DWORD dw2, + PSTR buffer, BOOL* is_unmatched) { struct module_find mf; WCHAR full_pathW[MAX_PATH]; @@ -643,6 +654,24 @@ BOOL path_find_symbol_file(const struct process* pcs, PCSTR full_path, return TRUE; } + /* FIXME: Use Environment-Variables (see MS docs) + _NT_SYMBOL_PATH and _NT_ALT_SYMBOL_PATH + FIXME: Implement "Standard Path Elements" (Path) ... (see MS docs) + do a search for (every?) path-element like this ... + <path> + <path>\dll + <path>\symbols\dll + (dll may be exe, or sys depending on the file extension) */ + + /* 2. check module-path */ + file_pathW(module->module.LoadedImageName, tmp); + if (do_searchW(filename, tmp, FALSE, module_find_cb, &mf)) + { + WideCharToMultiByte(CP_ACP, 0, tmp, -1, buffer, MAX_PATH, NULL, NULL); + return TRUE; + } + + /* 3. check search-path */ while (searchPath) { ptr = strchrW(searchPath, ';'); diff --git a/dll/win32/dbghelp/pe_module.c b/dll/win32/dbghelp/pe_module.c index 376a780653..4b9eac4f03 100644 --- a/dll/win32/dbghelp/pe_module.c +++ b/dll/win32/dbghelp/pe_module.c @@ -560,7 +560,7 @@ static BOOL pe_load_dbg_file(const struct process* pcs, struct module* module, TRACE("Processing DBG file %s\n", debugstr_a(dbg_name)); - if (path_find_symbol_file(pcs, dbg_name, NULL, timestamp, 0, tmp, &module->module.DbgUnmatched) && + if (path_find_symbol_file(pcs, module, dbg_name, NULL, timestamp, 0, tmp, &module->module.DbgUnmatched) && (hFile = CreateFileA(tmp, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)) != INVALID_HANDLE_VALUE && ((hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL)) != 0) &&

5 years, 8 months

[reactos] 01/01: [CMAKE] msvc.cmake: Remove now redundant '/we4028' special case

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9f3eb1f9a21a874212a73… commit 9f3eb1f9a21a874212a73c6c4f29857937b01a1f Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Apr 19 15:39:16 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 19 20:47:03 2019 +0200 [CMAKE] msvc.cmake: Remove now redundant '/we4028' special case Addendum to 545a2c79367e1457e4bc7ac14d3c0f840c7e063c. CORE-7538 --- sdk/cmake/msvc.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 8419591b8b..e3319a1eee 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -99,10 +99,6 @@ add_compile_flags("/wd4018") # - C4700: uninitialized variable usage # - C4716: function must return a value add_compile_flags("/we4013 /we4020 /we4022 /we4028 /we4047 /we4098 /we4113 /we4129 /we4133 /we4163 /we4229 /we4311 /we4312 /we4603 /we4700 /we4716") -# TODO: Check and fix other architectures. -if(ARCH STREQUAL "i386") - add_compile_flags("/we4028") -endif() # - C4189: local variable initialized but not referenced # Not in Release mode and not with MSVC 2010

5 years, 8 months

[reactos] 01/01: [APPVEYOR] Enable fast_finish (#1494)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48f98e88edc26688a3bac… commit 48f98e88edc26688a3bac5f5b7525cd90494f572 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 19 23:39:18 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 19 23:39:18 2019 +0900 [APPVEYOR] Enable fast_finish (#1494) It stops the remaining jobs if any error happened. It becomes less time for waiting for building. --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 8e88b5e7b1..f4e1512326 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,6 +9,8 @@ version: reactos.appveyor.{build} skip_branch_with_pr: true clone_depth: 5 clone_folder: c:\reactos-cov +matrix: + fast_finish: true init: - ps: (New-Object System.Net.WebClient).DownloadFile("https://svn.reactos.org/amine/RosCMakeNinja.zip","C:\RosCMakeNinja.zip")

5 years, 8 months

[reactos] 01/01: [BOOTDATA] AHKAppTests.cmd: Fix 'media' typo (#1502)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4126817f7ffc06dc2fb15… commit 4126817f7ffc06dc2fb1521f8b8ed7dc57a59607 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Apr 19 15:12:16 2019 +0200 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Apr 19 22:12:16 2019 +0900 [BOOTDATA] AHKAppTests.cmd: Fix 'media' typo (#1502) Addendum to df2a8c4. s/media/medium/ --- boot/bootdata/bootcdregtest/AHKAppTests.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/bootcdregtest/AHKAppTests.cmd b/boot/bootdata/bootcdregtest/AHKAppTests.cmd index 2c969a6745..6c93dfe21d 100644 --- a/boot/bootdata/bootcdregtest/AHKAppTests.cmd +++ b/boot/bootdata/bootcdregtest/AHKAppTests.cmd @@ -5,7 +5,7 @@ for %%X in (A B C D E F G H I J K L M N O P Q R S T U V W X Y Z) do (if exist %% if not defined DRIVE ( dbgprint "AHK Application testing suite not present, skipping." - dbgprint "Insert ReactOS boot media and try again." + dbgprint "Insert ReactOS boot medium and try again." exit /b 0 )

5 years, 8 months

← Newer
1
...
6
7
8
9
10
11
12
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2019