February 2017 - Wine-Commits

Hugh McMaster : regedit: Update some comments in edit.c.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

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

Ken Thomases : winemac: Make some operations on Cocoa views asynchronous.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: 733e22d0c12671848a90a2bd5d01eb7213728493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=733e22d0c12671848a90a2bd5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Feb 1 10:12:29 2017 -0600 winemac: Make some operations on Cocoa views asynchronous. There's no reason for them to be synchronous and this improves performance. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index a68ba03..57587d9 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -3340,7 +3340,7 @@ void macdrv_set_view_frame(macdrv_view v, CGRect rect) if (CGRectIsNull(rect)) rect = CGRectZero; - OnMainThread(^{ + OnMainThreadAsync(^{ NSRect newFrame = NSRectFromCGRect(cgrect_mac_from_win(rect)); NSRect oldFrame = [view frame]; @@ -3387,7 +3387,7 @@ void macdrv_set_view_superview(macdrv_view v, macdrv_view s, macdrv_window w, ma if (!superview) superview = [window contentView]; - OnMainThread(^{ + OnMainThreadAsync(^{ if (superview == [view superview]) { NSArray* subviews = [superview subviews]; @@ -3430,7 +3430,7 @@ void macdrv_set_view_hidden(macdrv_view v, int hidden) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineContentView* view = (WineContentView*)v; - OnMainThread(^{ + OnMainThreadAsync(^{ [view setHidden:hidden]; });

1 0

Andrey Gusev : d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

Module: wine Branch: master Commit: 943ed2c3eba5e72a080417683b9a6ca6d7b7be65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=943ed2c3eba5e72a080417683… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Jan 30 14:00:56 2017 +0200 d3dx11: Add D3DX11CreateShaderResourceViewFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 2 +- dlls/d3dx11_43/d3dx11_43.spec | 2 +- dlls/d3dx11_43/texture.c | 10 ++++++++++ include/d3dx11tex.h | 4 ++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index f97ec24..815c162 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 217cad1..452e513 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -17,7 +17,7 @@ @ stub D3DX11CreateAsyncTextureProcessor @ stub D3DX11CreateShaderResourceViewFromFileA @ stub D3DX11CreateShaderResourceViewFromFileW -@ stub D3DX11CreateShaderResourceViewFromMemory +@ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW @ stub D3DX11CreateTextureFromFileA diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index 65598a6..fe291d9 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -25,6 +25,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); +HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11ShaderResourceView **view, HRESULT *hresult) +{ + FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, view %p, hresult %p stub!\n", + device, data, data_size, load_info, pump, view, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index bd22f32..16b280a 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -86,6 +86,10 @@ typedef struct D3DX11_IMAGE_LOAD_INFO extern "C" { #endif +HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data, + SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, + ID3D11ShaderResourceView **view, HRESULT *hresult); + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);

1 0

Huw Davies : gameux/tests: Run the MTA tests before the STA tests to avoid a crash on Windows 10.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

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 dialog messages related to key and value renaming.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

1 0

Hugh McMaster : regedit: Combine error() and error_code_messagebox().
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

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: Update search completion message handling.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

1 0

Hugh McMaster : regedit: Display custom error messages instead of strings from the system table.
by Alexandre Julliard Feb. 1, 2017

Feb. 1, 2017

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 Feb. 1, 2017

Feb. 1, 2017

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 Feb. 1, 2017

Feb. 1, 2017

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