wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Aric Stewart : hid/tests: Test HidD_GetInputReport.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 41a82d803776c5cc485d47d26cbe74a0d7f676e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a82d803776c5cc485d47d26… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 31 11:04:11 2017 -0600 hid/tests: Test HidD_GetInputReport. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index adc6e10..ff47e30 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -305,8 +305,84 @@ static void test_read_device(void) HeapFree(GetProcessHeap(), 0, report); } +static void test_get_input_report(void) +{ + PHIDP_PREPARSED_DATA ppd; + HIDP_CAPS Caps; + WCHAR device_name[128]; + CHAR *data = NULL; + DWORD tick, spent, max_time; + char *report; + BOOL rc; + NTSTATUS status; + + USAGE device_usages[] = {HID_USAGE_GENERIC_JOYSTICK, HID_USAGE_GENERIC_GAMEPAD}; + HANDLE device = get_device(HID_USAGE_PAGE_GENERIC, device_usages, 2, GENERIC_READ); + + if (!device) + device = get_device(0x0, NULL, 0x0, GENERIC_READ); + + if (!device) + { + trace("No device found for testing\n"); + return; + } + rc = HidD_GetProductString(device, device_name, sizeof(device_name)); + ok(rc, "Failed to get product string(0x%x)\n", GetLastError()); + trace("HidD_GetInputRpeort tests on device :%s\n",wine_dbgstr_w(device_name)); + + rc = HidD_GetPreparsedData(device, &ppd); + ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); + status = HidP_GetCaps(ppd, &Caps); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get Caps(0x%x)\n", status); + data = HeapAlloc(GetProcessHeap(), 0, Caps.InputReportByteLength); + + if (winetest_interactive) + max_time = READ_MAX_TIME; + else + max_time = 100; + if (winetest_interactive) + trace("Test your device for the next %i seconds\n", max_time/1000); + report = HeapAlloc(GetProcessHeap(), 0, 3 * Caps.InputReportByteLength); + tick = GetTickCount(); + spent = 0; + do + { + int i; + + data[0] = 0; /* Just testing report ID 0 for now, That will catch most devices */ + rc = HidD_GetInputReport(device, data, Caps.InputReportByteLength); + spent = GetTickCount() - tick; + + if (rc) + { + report[0] = 0; + for (i = 0; i < Caps.InputReportByteLength && i < Caps.InputReportByteLength; i++) + { + char bytestr[5]; + sprintf(bytestr, "%x ", (BYTE)data[i]); + strcat(report, bytestr); + } + trace("Input report (%i): %s\n", Caps.InputReportByteLength, report); + + process_data(Caps, ppd, data, Caps.InputReportByteLength); + } + else + trace("Failed to get Input Report, (%x)\n", rc); + trace("REMAINING: %d ms\n", max_time - spent); + Sleep(500); + } while(spent < max_time); + + rc = HidD_FreePreparsedData(ppd); + ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + CloseHandle(device); + HeapFree(GetProcessHeap(), 0, data); + HeapFree(GetProcessHeap(), 0, report); +} + START_TEST(device) { run_for_each_device(test_device_info); test_read_device(); + test_get_input_report(); }

1 0

Aric Stewart : hid/tests: Test device reads.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 150f1797163963d5beca989a6f352ce2547fb697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=150f1797163963d5beca989a6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 31 11:03:58 2017 -0600 hid/tests: Test device reads. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 221 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 068360a..adc6e10 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -16,14 +16,18 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdio.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windows.h" #include "setupapi.h" +#include "hidusage.h" #include "ddk/hidsdi.h" #include "wine/test.h" +#define READ_MAX_TIME 5000 + typedef void (device_test)(HANDLE device); static void test_device_info(HANDLE device) @@ -85,7 +89,224 @@ static void run_for_each_device(device_test *test) SetupDiDestroyDeviceInfoList(info_set); } +static HANDLE get_device(USHORT page, USHORT usages[], UINT usage_count, DWORD access) +{ + GUID hid_guid; + HDEVINFO info_set; + DWORD index = 0; + SP_DEVICE_INTERFACE_DATA interface_data; + DWORD detail_size = MAX_PATH * sizeof(WCHAR); + SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; + NTSTATUS status; + BOOL rc; + + HidD_GetHidGuid(&hid_guid); + + ZeroMemory(&interface_data, sizeof(interface_data)); + interface_data.cbSize = sizeof(interface_data); + + data = HeapAlloc(GetProcessHeap(), 0 , sizeof(*data) + detail_size); + data->cbSize = sizeof(*data); + + info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE); + while (SetupDiEnumDeviceInterfaces(info_set, NULL, &hid_guid, index, &interface_data)) + { + index ++; + + if (SetupDiGetDeviceInterfaceDetailW(info_set, &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) + { + PHIDP_PREPARSED_DATA ppd; + HIDP_CAPS Caps; + HANDLE file = CreateFileW(data->DevicePath, access, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); + if (file == INVALID_HANDLE_VALUE) + { + trace("Failed to access device %s, likely not plugged in or access is denied.\n", wine_dbgstr_w(data->DevicePath)); + continue; + } + rc = HidD_GetPreparsedData(file, &ppd); + ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); + status = HidP_GetCaps(ppd, &Caps); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get Caps(0x%x)\n", status); + rc = HidD_FreePreparsedData(ppd); + ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + if (!page || page == Caps.UsagePage) + { + int j; + if (!usage_count) + { + HeapFree(GetProcessHeap(), 0, data); + SetupDiDestroyDeviceInfoList(info_set); + return file; + } + for (j = 0; j < usage_count; j++) + if (!usages[j] || usages[j] == Caps.Usage) + { + HeapFree(GetProcessHeap(), 0, data); + SetupDiDestroyDeviceInfoList(info_set); + return file; + } + } + CloseHandle(file); + } + } + HeapFree(GetProcessHeap(), 0, data); + SetupDiDestroyDeviceInfoList(info_set); + return NULL; +} + +static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, DWORD data_length) +{ + INT i; + NTSTATUS status; + + if (Caps.NumberInputButtonCaps) + { + USAGE button_pages[100]; + + for (i = 1; i < 0xff; i++) + { + ULONG usage_length = 100; + status = HidP_GetUsages(HidP_Input, i, 0, button_pages, &usage_length, ppd, data, data_length); + ok (status == HIDP_STATUS_SUCCESS || (status != HIDP_STATUS_SUCCESS && usage_length == 0), + "HidP_GetUsages failed (%x) but usage length still %i\n", status, usage_length); + if (usage_length) + { + CHAR report[50]; + int count; + int j; + + count = usage_length; + j = 0; + report[0] = 0; + trace("\tButtons [0x%x: %i buttons]:\n", i, usage_length); + for (count = 0; count < usage_length; count += 15) + { + for (j=count; j < count+15 && j < usage_length; j++) + { + CHAR btn[5]; + sprintf(btn, "%i ", button_pages[j]); + strcat(report, btn); + } + trace("\t\t%s\n", report); + } + } + } + } + + if (Caps.NumberInputValueCaps) + { + ULONG value; + USHORT length; + HIDP_VALUE_CAPS *values = NULL; + + values = HeapAlloc(GetProcessHeap(), 0, sizeof(HIDP_VALUE_CAPS) * Caps.NumberInputValueCaps); + length = Caps.NumberInputValueCaps; + status = HidP_GetValueCaps(HidP_Input, values, &length, ppd); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value caps (%x)\n",status); + + trace("\tValues: \n"); + for (i = 0; i < length; i++) + { + status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0, + values[i].Range.UsageMin, &value, ppd, data, data_length); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get value [%i,%i] (%x)\n", + values[i].UsagePage, values[i].Range.UsageMin, status); + trace("[%02x, %02x]: %u\n",values[i].UsagePage, values[i].Range.UsageMin, value); + } + + HeapFree(GetProcessHeap(), 0, values); + } +} + +static void test_read_device(void) +{ + PHIDP_PREPARSED_DATA ppd; + HIDP_CAPS Caps; + OVERLAPPED overlapped; + WCHAR device_name[128]; + CHAR *data = NULL; + DWORD read; + BOOL rc; + NTSTATUS status; + DWORD timeout, tick, spent, max_time; + char *report; + + USAGE device_usages[] = {HID_USAGE_GENERIC_JOYSTICK, HID_USAGE_GENERIC_GAMEPAD}; + HANDLE device = get_device(HID_USAGE_PAGE_GENERIC, device_usages, 2, GENERIC_READ); + + if (!device) + device = get_device(0x0, NULL, 0x0, GENERIC_READ); + + if (!device) + { + trace("No device found for reading\n"); + return; + } + rc = HidD_GetProductString(device, device_name, sizeof(device_name)); + ok(rc, "Failed to get product string(0x%x)\n", GetLastError()); + trace("Read tests on device :%s\n",wine_dbgstr_w(device_name)); + + rc = HidD_GetPreparsedData(device, &ppd); + ok(rc, "Failed to get preparsed data(0x%x)\n", GetLastError()); + status = HidP_GetCaps(ppd, &Caps); + ok(status == HIDP_STATUS_SUCCESS, "Failed to get Caps(0x%x)\n", status); + data = HeapAlloc(GetProcessHeap(), 0, Caps.InputReportByteLength); + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + if (winetest_interactive) + { + max_time = READ_MAX_TIME; + timeout = 1000; + } + else + max_time = timeout = 100; + if (winetest_interactive) + trace("Test your device for the next %i seconds\n", max_time/1000); + report = HeapAlloc(GetProcessHeap(), 0, 3 * Caps.InputReportByteLength); + tick = GetTickCount(); + spent = 0; + do + { + ReadFile(device, data, Caps.InputReportByteLength, NULL, &overlapped); + if (WaitForSingleObject(overlapped.hEvent, timeout) != WAIT_OBJECT_0) + { + ResetEvent(overlapped.hEvent); + spent = GetTickCount() - tick; + trace("REMAINING: %d ms\n", max_time - spent); + continue; + } + ResetEvent(overlapped.hEvent); + spent = GetTickCount() - tick; + GetOverlappedResult(device, &overlapped, &read, FALSE); + if (read) + { + int i; + + report[0] = 0; + for (i = 0; i < read && i < Caps.InputReportByteLength; i++) + { + char bytestr[5]; + sprintf(bytestr, "%x ", (BYTE)data[i]); + strcat(report, bytestr); + } + trace("Input report (%i): %s\n", read, report); + + process_data(Caps, ppd, data, read); + } + trace("REMAINING: %d ms\n", max_time - spent); + } while(spent < max_time); + + CloseHandle(overlapped.hEvent); + rc = HidD_FreePreparsedData(ppd); + ok(rc, "Failed to free preparsed data(0x%x)\n", GetLastError()); + CloseHandle(device); + HeapFree(GetProcessHeap(), 0, data); + HeapFree(GetProcessHeap(), 0, report); +} + START_TEST(device) { run_for_each_device(test_device_info); + test_read_device(); }

1 0

Huw Davies : gameux/tests: Run the MTA tests before the STA tests to avoid a crash on Windows 10.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: bc84397e30d19b766d1be72f05fbcf86053fbbaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc84397e30d19b766d1be72f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 1 13:19:10 2017 +0000 gameux/tests: Run the MTA tests before the STA tests to avoid a crash on Windows 10. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/tests/gameexplorer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gameux/tests/gameexplorer.c b/dlls/gameux/tests/gameexplorer.c index 1f25f71..1ef7a78 100644 --- a/dlls/gameux/tests/gameexplorer.c +++ b/dlls/gameux/tests/gameexplorer.c @@ -673,16 +673,16 @@ START_TEST(gameexplorer) { HRESULT hr; - hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); - trace("Running apartment threaded tests.\n"); + trace("Running multithreaded tests.\n"); run_tests(); if(SUCCEEDED(hr)) CoUninitialize(); - hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); + hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); ok(hr == S_OK, "Failed to initialize COM, hr %#x.\n", hr); - trace("Running multithreaded tests.\n"); + trace("Running apartment threaded tests.\n"); run_tests(); if(SUCCEEDED(hr)) CoUninitialize();

1 0

Hugh McMaster : regedit: Update some comments in edit.c.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 8ce48b9fcd01e37e8f711517238f933171c8e705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce48b9fcd01e37e8f7115172… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 1 12:57:32 2017 +0000 regedit: Update some comments in edit.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index ea73dc1..c6a6629 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -249,7 +249,7 @@ BOOL CreateKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPWSTR keyName) if (!LoadStringW(GetModuleHandleW(0), IDS_NEWKEY, newKey, COUNT_OF(newKey))) goto done; - /* try to find out a name for the newly create key (max 100 times) */ + /* try to find a name for the key being created (maximum = 100 attempts) */ for (keyNum = 1; keyNum < 100; keyNum++) { wsprintfW(keyName, newKey, keyNum); lRet = RegOpenKeyW(hKey, keyName, &retKey); @@ -453,7 +453,7 @@ BOOL CreateValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, DWORD valueType, LPW if (!LoadStringW(GetModuleHandleW(0), IDS_NEWVALUE, newValue, COUNT_OF(newValue))) goto done; - /* try to find out a name for the newly create key (max 100 times) */ + /* try to find a name for the value being created (maximum = 100 attempts) */ for (valueNum = 1; valueNum < 100; valueNum++) { wsprintfW(valueName, newValue, valueNum); lRet = RegQueryValueExW(hKey, valueName, 0, 0, 0, 0); @@ -492,7 +492,7 @@ BOOL RenameValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR oldName, LPC error_code_messagebox(hwnd, IDS_RENAME_VALUE_FAILED); return FALSE; } - /* check if value already exists */ + /* check if the value already exists */ if (check_value(hwnd, hKey, newName)) { error_code_messagebox(hwnd, IDS_VALUE_EXISTS, oldName); goto done;

1 0

Hugh McMaster : regedit: Update dialog messages related to key and value renaming.
by Alexandre Julliard 01 Feb '17

01 Feb '17

1 0

Hugh McMaster : regedit: Update search completion message handling.
by Alexandre Julliard 01 Feb '17

01 Feb '17

1 0

Hugh McMaster : regedit: Combine error() and error_code_messagebox().
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 6a8aea20acc35f15145e93b6d49dbb5997ab2d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8aea20acc35f15145e93b6d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 1 12:56:51 2017 +0000 regedit: Combine error() and error_code_messagebox(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 23 +++++++++-------------- programs/regedit/framewnd.c | 2 +- programs/regedit/main.h | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 7cac512..64ecfcb 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -76,20 +76,15 @@ static INT __cdecl messagebox(HWND hwnd, INT buttons, INT titleId, INT resId, .. return result; } -void __cdecl error(HWND hwnd, INT resId, ...) +void __cdecl error_code_messagebox(HWND hwnd, unsigned int msg_id, ...) { __ms_va_list ap; - __ms_va_start(ap, resId); - vmessagebox(hwnd, MB_OK | MB_ICONERROR, IDS_ERROR, resId, ap); + __ms_va_start(ap, msg_id); + vmessagebox(hwnd, MB_OK|MB_ICONERROR, IDS_ERROR, msg_id, ap); __ms_va_end(ap); } -static void error_code_messagebox(HWND hwnd, unsigned int msg_id) -{ - vmessagebox(hwnd, MB_OK|MB_ICONERROR, IDS_ERROR, msg_id, NULL); -} - static BOOL change_dword_base(HWND hwndDlg, BOOL toHex) { static const WCHAR percent_u[] = {'%','u',0}; @@ -214,17 +209,17 @@ static LPWSTR read_value(HWND hwnd, HKEY hKey, LPCWSTR valueName, DWORD *lpType, *buffer = '\0'; return buffer; } - error(hwnd, IDS_BAD_VALUE, valueName); + error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); goto done; } if ( *lpType == REG_DWORD ) valueDataLen = sizeof(DWORD); if (!(buffer = HeapAlloc(GetProcessHeap(), 0, valueDataLen+sizeof(WCHAR)))) { - error(hwnd, IDS_TOO_BIG_VALUE, valueDataLen); + error_code_messagebox(hwnd, IDS_TOO_BIG_VALUE, valueDataLen); goto done; } lRet = RegQueryValueExW(hKey, valueName, 0, 0, (LPBYTE)buffer, &valueDataLen); if (lRet != ERROR_SUCCESS) { - error(hwnd, IDS_BAD_VALUE, valueName); + error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); goto done; } if((valueDataLen % sizeof(WCHAR)) == 0) @@ -375,7 +370,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) else error_code_messagebox(hwnd, IDS_SET_VALUE_FAILED); } } else { - error(hwnd, IDS_UNSUPPORTED_TYPE, type); + error_code_messagebox(hwnd, IDS_UNSUPPORTED_TYPE, type); } done: @@ -402,7 +397,7 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath) lRet = SHDeleteKeyW(hKeyRoot, keyPath); if (lRet != ERROR_SUCCESS) { - error(hwnd, IDS_BAD_KEY, keyPath); + error_code_messagebox(hwnd, IDS_BAD_KEY, keyPath); goto done; } result = TRUE; @@ -431,7 +426,7 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, B lRet = RegDeleteValueW(hKey, valueName ? valueName : &empty); if (lRet != ERROR_SUCCESS && valueName) { - error(hwnd, IDS_BAD_VALUE, valueName); + error_code_messagebox(hwnd, IDS_BAD_VALUE, valueName); } if (lRet != ERROR_SUCCESS) goto done; result = TRUE; diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 43c581b..018759e 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -773,7 +773,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) SetFocus(g_pChildWnd->hTreeWnd); } } else { - error(hWnd, IDS_NOTFOUND, searchString); + error_code_messagebox(hWnd, IDS_NOTFOUND, searchString); } } break; diff --git a/programs/regedit/main.h b/programs/regedit/main.h index 1528c41..bbf6c09 100644 --- a/programs/regedit/main.h +++ b/programs/regedit/main.h @@ -143,7 +143,7 @@ extern BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath); extern BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, BOOL showMessageBox); extern BOOL RenameValue(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR oldName, LPCWSTR newName); extern BOOL RenameKey(HWND hwnd, HKEY hRootKey, LPCWSTR keyPath, LPCWSTR newName); -extern void __cdecl error(HWND hwnd, INT resId, ...); +extern void __cdecl error_code_messagebox(HWND hwnd, unsigned int msg_id, ...); /* hexedit.c */ extern void HexEdit_Register(void);

1 0

Hugh McMaster : regedit: Display custom error messages instead of strings from the system table.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: e0ab47ce87a074b20c6a1a124128a9fc2d503a39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ab47ce87a074b20c6a1a124… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 1 12:56:40 2017 +0000 regedit: Display custom error messages instead of strings from the system table. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 150 +++++++++++++++++++++++++++++--------------- po/bg.po | 150 +++++++++++++++++++++++++++++--------------- po/ca.po | 150 +++++++++++++++++++++++++++++--------------- po/cs.po | 150 +++++++++++++++++++++++++++++--------------- po/da.po | 150 +++++++++++++++++++++++++++++--------------- po/de.po | 150 +++++++++++++++++++++++++++++--------------- po/el.po | 138 +++++++++++++++++++++++++--------------- po/en.po | 142 ++++++++++++++++++++++++++--------------- po/en_US.po | 142 ++++++++++++++++++++++++++--------------- po/eo.po | 150 +++++++++++++++++++++++++++++--------------- po/es.po | 150 +++++++++++++++++++++++++++++--------------- po/fa.po | 144 +++++++++++++++++++++++++++--------------- po/fi.po | 150 +++++++++++++++++++++++++++++--------------- po/fr.po | 150 +++++++++++++++++++++++++++++--------------- po/he.po | 150 +++++++++++++++++++++++++++++--------------- po/hi.po | 138 +++++++++++++++++++++++++--------------- po/hr.po | 150 +++++++++++++++++++++++++++++--------------- po/hu.po | 150 +++++++++++++++++++++++++++++--------------- po/it.po | 150 +++++++++++++++++++++++++++++--------------- po/ja.po | 150 +++++++++++++++++++++++++++++--------------- po/ko.po | 150 +++++++++++++++++++++++++++++--------------- po/lt.po | 150 +++++++++++++++++++++++++++++--------------- po/ml.po | 138 +++++++++++++++++++++++++--------------- po/nb_NO.po | 150 +++++++++++++++++++++++++++++--------------- po/nl.po | 150 +++++++++++++++++++++++++++++--------------- po/or.po | 138 +++++++++++++++++++++++++--------------- po/pa.po | 138 +++++++++++++++++++++++++--------------- po/pl.po | 150 +++++++++++++++++++++++++++++--------------- po/pt_BR.po | 150 +++++++++++++++++++++++++++++--------------- po/pt_PT.po | 150 +++++++++++++++++++++++++++++--------------- po/rm.po | 144 +++++++++++++++++++++++++++--------------- po/ro.po | 150 +++++++++++++++++++++++++++++--------------- po/ru.po | 150 +++++++++++++++++++++++++++++--------------- po/sk.po | 150 +++++++++++++++++++++++++++++--------------- po/sl.po | 150 +++++++++++++++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 150 +++++++++++++++++++++++++++++--------------- po/sr_RS(a)latin.po | 150 +++++++++++++++++++++++++++++--------------- po/sv.po | 150 +++++++++++++++++++++++++++++--------------- po/te.po | 138 +++++++++++++++++++++++++--------------- po/th.po | 144 +++++++++++++++++++++++++++--------------- po/tr.po | 150 +++++++++++++++++++++++++++++--------------- po/uk.po | 150 +++++++++++++++++++++++++++++--------------- po/wa.po | 144 +++++++++++++++++++++++++++--------------- po/wine.pot | 138 +++++++++++++++++++++++++--------------- po/zh_CN.po | 150 +++++++++++++++++++++++++++++--------------- po/zh_TW.po | 150 +++++++++++++++++++++++++++++--------------- programs/regedit/edit.c | 50 +++++++-------- programs/regedit/regedit.rc | 12 ++++ programs/regedit/resource.h | 9 +++ 49 files changed, 4472 insertions(+), 2375 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0ab47ce87a074b20c6a1…

1 0

Hugh McMaster : regedit: Use FormatMessage() for optimal memory usage.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: e31a0cc2414315988a38ee0590a7c30471475aa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31a0cc2414315988a38ee059… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 1 12:56:27 2017 +0000 regedit: Use FormatMessage() for optimal memory usage. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 30 ++++++++++++++++++------------ po/bg.po | 28 ++++++++++++++++------------ po/ca.po | 30 ++++++++++++++++++------------ po/cs.po | 30 ++++++++++++++++++------------ po/da.po | 30 ++++++++++++++++++------------ po/de.po | 30 ++++++++++++++++++------------ po/el.po | 16 ++++++---------- po/en.po | 26 +++++++++++--------------- po/en_US.po | 26 +++++++++++--------------- po/eo.po | 30 ++++++++++++++++++------------ po/es.po | 30 ++++++++++++++++++------------ po/fa.po | 22 ++++++++++------------ po/fi.po | 30 ++++++++++++++++++------------ po/fr.po | 30 ++++++++++++++++++------------ po/he.po | 30 ++++++++++++++++++------------ po/hi.po | 16 ++++++---------- po/hr.po | 26 ++++++++++++++------------ po/hu.po | 30 ++++++++++++++++++------------ po/it.po | 30 ++++++++++++++++++------------ po/ja.po | 30 ++++++++++++++++++------------ po/ko.po | 30 ++++++++++++++++++------------ po/lt.po | 30 ++++++++++++++++++------------ po/ml.po | 16 ++++++---------- po/nb_NO.po | 30 ++++++++++++++++++------------ po/nl.po | 30 ++++++++++++++++++------------ po/or.po | 16 ++++++---------- po/pa.po | 16 ++++++---------- po/pl.po | 30 ++++++++++++++++++------------ po/pt_BR.po | 30 ++++++++++++++++++------------ po/pt_PT.po | 30 ++++++++++++++++++------------ po/rm.po | 22 ++++++++++------------ po/ro.po | 30 ++++++++++++++++++------------ po/ru.po | 30 ++++++++++++++++++------------ po/sk.po | 28 ++++++++++++++++------------ po/sl.po | 30 ++++++++++++++++++------------ po/sr_RS(a)cyrillic.po | 25 ++++++++++++------------- po/sr_RS(a)latin.po | 25 ++++++++++++------------- po/sv.po | 30 ++++++++++++++++++------------ po/te.po | 16 ++++++---------- po/th.po | 22 ++++++++++------------ po/tr.po | 30 ++++++++++++++++++------------ po/uk.po | 30 ++++++++++++++++++------------ po/wa.po | 22 ++++++++++------------ po/wine.pot | 16 ++++++---------- po/zh_CN.po | 30 ++++++++++++++++++------------ po/zh_TW.po | 30 ++++++++++++++++++------------ programs/regedit/edit.c | 32 ++++++++++++++++++-------------- programs/regedit/main.h | 2 +- programs/regedit/regedit.rc | 12 ++++++------ 49 files changed, 703 insertions(+), 567 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e31a0cc2414315988a38e…

1 0

Hugh McMaster : regedit: Remove unnecessary error handling from message box functions in edit.c.
by Alexandre Julliard 01 Feb '17

01 Feb '17

Module: wine Branch: master Commit: 6350cfd8c7aa70b7168adc569d0184231cfbf9eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6350cfd8c7aa70b7168adc569… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Feb 1 12:56:15 2017 +0000 regedit: Remove unnecessary error handling from message box functions in edit.c. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/edit.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index e211ff8..a223535 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -48,15 +48,12 @@ struct edit_params static INT vmessagebox(HWND hwnd, INT buttons, INT titleId, INT resId, va_list ap) { - static const WCHAR errorW[] = {'E','r','r','o','r',0}; - static const WCHAR unknownW[] = {'U','n','k','n','o','w','n',' ','e','r','r','o','r',' ','s','t','r','i','n','g','!',0}; - WCHAR title[256]; WCHAR errfmt[1024]; WCHAR errstr[1024]; - if (!LoadStringW(hInst, titleId, title, COUNT_OF(title))) lstrcpyW(title, errorW); - if (!LoadStringW(hInst, resId, errfmt, COUNT_OF(errfmt))) lstrcpyW(errfmt, unknownW); + LoadStringW(hInst, titleId, title, COUNT_OF(title)); + LoadStringW(hInst, resId, errfmt, COUNT_OF(errfmt)); vsnprintfW(errstr, COUNT_OF(errstr), errfmt, ap); @@ -87,20 +84,14 @@ void error(HWND hwnd, INT resId, ...) static void error_code_messagebox(HWND hwnd, DWORD error_code) { LPWSTR lpMsgBuf; - DWORD status; WCHAR title[256]; - static WCHAR fallback[] = {'E','r','r','o','r',' ','d','i','s','p','l','a','y','i','n','g',' ','e','r','r','o','r',' ','m','e','s','s','a','g','e','.','\n',0}; - static const WCHAR title_error[] = {'E','r','r','o','r',0}; - - if (!LoadStringW(hInst, IDS_ERROR, title, COUNT_OF(title))) - lstrcpyW(title, title_error); - status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, NULL); - if (!status) - lpMsgBuf = fallback; + + LoadStringW(hInst, IDS_ERROR, title, COUNT_OF(title)); + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, NULL); + MessageBoxW(hwnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); - if (lpMsgBuf != fallback) - LocalFree(lpMsgBuf); + LocalFree(lpMsgBuf); } static BOOL change_dword_base(HWND hwndDlg, BOOL toHex)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017