January 2018 - Wine-Commits

Andrey Semakin : winemine: Save board without need to correctly finish the app.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 89e62aca1d919d175c8b2db378e361feee7d000b URL: https://source.winehq.org/git/wine.git/?a=commit;h=89e62aca1d919d175c8b2db3… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Mon Nov 6 14:23:19 2017 +0500 winemine: Save board without need to correctly finish the app. Thus player will never lose his best time even if app crashes. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1392ab11122848de566424a6fee589d653237f3d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemine/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index c7d4925..d8201b3 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -178,6 +178,8 @@ static void SaveBoard( BOARD *p_board ) RegSetValueExW( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); } RegCloseKey( hkey ); + + WINE_TRACE("Board has been saved.\n"); } static void DestroyBoard( BOARD *p_board ) @@ -823,6 +825,7 @@ static void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg ) DialogBoxParamW( p_board->hInst, MAKEINTRESOURCEW(DLG_CONGRATS), hWnd, CongratsDlgProc, (LPARAM) p_board); + SaveBoard( p_board ); DialogBoxParamW( p_board->hInst, MAKEINTRESOURCEW(DLG_TIMES), hWnd, TimesDlgProc, (LPARAM) p_board); }

1 0

Alexandre Julliard : wineconsole: Avoid some fatal errors.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 7e9816f137af91f1a2c77c2d01d6a9836a217510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e9816f137af91f1a2c77c2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 17 22:20:40 2017 +0200 wineconsole: Avoid some fatal errors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9032849d068a8a0a026c12b62a1a25c3cff53d63) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wineconsole/registry.c | 2 +- programs/wineconsole/user.c | 5 ++--- programs/wineconsole/wineconsole.c | 8 ++------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index e537a86..080431a 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -76,7 +76,7 @@ static LPWSTR WINECON_CreateKeyName(LPCWSTR kn) LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(kn) + 1) * sizeof(WCHAR)); LPWSTR ptr = ret; - if (!ptr) WINECON_Fatal("OOM"); + if (!ret) return NULL; do { diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 316c011..fe1cf46 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -56,8 +56,7 @@ static void WCUSER_FillMemDC(const struct inner_data* data, int upd_tp, int upd_ /* FIXME: could set up a mechanism to reuse the line between different * calls to this function */ - if (!(line = HeapAlloc(GetProcessHeap(), 0, data->curcfg.sb_width * sizeof(WCHAR)))) - WINECON_Fatal("OOM\n"); + if (!(line = HeapAlloc(GetProcessHeap(), 0, data->curcfg.sb_width * sizeof(WCHAR)))) return; dx = HeapAlloc( GetProcessHeap(), 0, data->curcfg.sb_width * sizeof(*dx) ); hOldFont = SelectObject(PRIVATE(data)->hMemDC, PRIVATE(data)->hFont); @@ -169,7 +168,7 @@ static void WCUSER_ShapeCursor(struct inner_data* data, int size, int vis, BOOL w16b = ((data->curcfg.cell_width + 15) & ~15) / 8; ptr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, w16b * data->curcfg.cell_height); - if (!ptr) WINECON_Fatal("OOM"); + if (!ptr) return; nbl = max((data->curcfg.cell_height * size) / 100, 1); for (j = data->curcfg.cell_height - nbl; j < data->curcfg.cell_height; j++) { diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index d6efa2f..d1d38be 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -655,11 +655,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna GetStartupInfoW(&si); - if (pid == 0) - { - if (!si.lpTitle) WINECON_Fatal("Should have a title set"); - appname = si.lpTitle; - } + if (pid == 0) appname = si.lpTitle; data->nCmdShow = nCmdShow; /* load settings */ @@ -729,7 +725,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna WINECON_GetServerConfig(data); data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); - if (!data->cells) WINECON_Fatal("OOM\n"); + if (!data->cells) goto error; data->fnResizeScreenBuffer(data); data->fnComputePositions(data); WINECON_SetConfig(data, &cfg);

1 0

Andrey Semakin : winemine: Add WM_RBUTTONUP to cases of TestMines().
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: a2c36177f4ed224d9235f9c15dd003060fb9308c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c36177f4ed224d9235f9c1… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Sun Nov 5 19:24:25 2017 +0500 winemine: Add WM_RBUTTONUP to cases of TestMines(). Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc3293612db9ac6ff621d68d9b134e0d8d065209) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemine/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 27fc159..c7d4925 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -743,9 +743,9 @@ static void TestMines( BOARD *p_board, POINT pt, int msg ) case WM_RBUTTONDOWN: AddFlag( p_board, col, row ); break; - default: - WINE_TRACE("Unknown message type received in TestMines\n"); - break; + + case WM_RBUTTONUP: + return; } if( draw )

1 0

Lauri Kenttä : readme: Move WineHQ URLs to https in translations.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 2fb4ada68fe02c8fc0e215bd2c219452a84b0daa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fb4ada68fe02c8fc0e215bd… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Dec 7 17:00:34 2017 +0200 readme: Move WineHQ URLs to https in translations. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fad999e36746926e22bbb3cc4a9938a6c5d4ade2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.de | 24 ++++++++++++------------ documentation/README.es | 22 +++++++++++----------- documentation/README.fi | 20 ++++++++++---------- documentation/README.fr | 24 ++++++++++++------------ documentation/README.hu | 14 +++++++------- documentation/README.it | 24 ++++++++++++------------ documentation/README.ja | 20 ++++++++++---------- documentation/README.ko | 16 ++++++++-------- documentation/README.no | 24 ++++++++++++------------ documentation/README.pt | 12 ++++++------ documentation/README.pt_br | 24 ++++++++++++------------ documentation/README.ru | 20 ++++++++++---------- documentation/README.tr | 22 +++++++++++----------- documentation/README.uk | 24 ++++++++++++------------ documentation/README.zh_cn | 24 ++++++++++++------------ 15 files changed, 157 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2fb4ada68fe02c8fc0e2…

1 0

Austin English : maintainers: Move WineHQ URLs to https.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 212d9fc70aadecb90bc5cf6f47dda2f9c0cbf7bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=212d9fc70aadecb90bc5cf6f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 6 13:51:09 2017 -0600 maintainers: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 83bbeab9b2d0ceac2548d2a9d8e5aefb0d9f5606) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index cec6cdb..d5815fd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3,7 +3,7 @@ List of Wine subsection maintainers When submitting patches to Wine, the guidelines at -<http://wiki.winehq.org/SubmittingPatches> should be followed. This file +<https://wiki.winehq.org/SubmittingPatches> should be followed. This file contains a list of maintainers for subsections of Wine. When submitting patches, you may want to CC relevant people from this list. If you have questions about your work in an area of Wine, you may find a list of @@ -279,7 +279,7 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> -W: http://wiki.winehq.org/StableRules +W: https://wiki.winehq.org/StableRules Staging Branch M: Sebastian Lackner <sebastian(a)fds-team.de>

1 0

Jacek Caban : services: Call RpcMgmtWaitServerListen in RPC_Stop.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 9fb6f376c7c670c01b3dfc4aa8f44b5ac4a88500 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fb6f376c7c670c01b3dfc4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 14:27:58 2017 +0200 services: Call RpcMgmtWaitServerListen in RPC_Stop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 69608af0a960658fcb3b0958c395614f286bcaa1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/services/rpc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 08b5776a..8c95b7e 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1958,6 +1958,7 @@ void RPC_Stop(void) { RpcMgmtStopServerListening(NULL); RpcServerUnregisterIf(svcctl_v2_0_s_ifspec, NULL, TRUE); + RpcMgmtWaitServerListen(); CloseThreadpoolCleanupGroupMembers(cleanup_group, TRUE, NULL); CloseThreadpoolCleanupGroup(cleanup_group);

1 0

Akihiro Sagawa : explorer: Use neutral language for the version resource.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: fffc9b41815bdd3efa6e761d97798067ce32c4aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=fffc9b41815bdd3efa6e761d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:04 2017 +0900 explorer: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ecd34e5896ba8c9900fdc5e0ef40a4f6737da57f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/explorer.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/explorer/explorer.rc b/programs/explorer/explorer.rc index 53224a8..b9ca5d8 100644 --- a/programs/explorer/explorer.rc +++ b/programs/explorer/explorer.rc @@ -33,6 +33,8 @@ STRINGTABLE IDS_RUN "&Run..." } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Explorer" #define WINE_FILENAME_STR "explorer.exe" #define WINE_FILEVERSION 6,1,7601,17567

1 0

Alexandre Julliard : wordpad: New high resolution cursor generated from SVG.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: f5e341b4845a87b1b4f991b227be3ee2a3acbf1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e341b4845a87b1b4f991b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 14 13:12:27 2017 +0200 wordpad: New high resolution cursor generated from SVG. Based on a cursor set published by Ludvig Hummel under the X11 license. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 756fdd029c6587a0be99042485d674ca0850de14) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wordpad/Makefile.in | 3 +- programs/wordpad/zoom.cur | Bin 766 -> 33134 bytes programs/wordpad/zoom.svg | 246 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 248 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f5e341b4845a87b1b4f9…

1 0

André Hentschel : ntdll: Bump Win 10 version to 15063.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: 05e53259456c1672ef1d2bbdb3c9ee119183a8d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05e53259456c1672ef1d2bbd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 8 16:15:43 2017 +0200 ntdll: Bump Win 10 version to 15063. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 72aecacf94d93fa640de761d2866490276fe07d5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/version.c | 2 +- programs/winecfg/appdefaults.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 06f9827..c06aef6 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -185,7 +185,7 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = }, /* WIN10 */ { - sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3839, VER_PLATFORM_WIN32_NT, + sizeof(RTL_OSVERSIONINFOEXW), 10, 0, 0x3AD7, VER_PLATFORM_WIN32_NT, {0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index f674824..402ec16 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -48,7 +48,7 @@ static const struct const char *szProductType; } win_versions[] = { - { "win10", "Windows 10", 10, 0, 0x3839,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, + { "win10", "Windows 10", 10, 0, 0x3AD7,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, "", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"},

1 0

Fabian Maurer : winecfg: Remove processorArchitecture from manifest.
by Alexandre Julliard Jan. 2, 2018

Jan. 2, 2018

Module: wine Branch: stable Commit: c4a470ef338daab8a5af6ec6ac31a727a344e8a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a470ef338daab8a5af6ec6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Sep 2 01:19:39 2017 +0200 winecfg: Remove processorArchitecture from manifest. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 685bdb2614503f7df7658000c46a5acaff11eb6e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winecfg/winecfg.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/winecfg.manifest b/programs/winecfg/winecfg.manifest index a7e4d88..9008877 100644 --- a/programs/winecfg/winecfg.manifest +++ b/programs/winecfg/winecfg.manifest @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> -<assemblyIdentity type="win32" name="Wine.Winecfg" version="0.0.0.0" processorArchitecture=""/> +<assemblyIdentity type="win32" name="Wine.Winecfg" version="0.0.0.0"/> <dependency> <dependentAssembly> <assemblyIdentity

1 0