wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Alexandre Julliard : wineconsole: Avoid some fatal errors.
by Alexandre Julliard 02 Jan '18

02 Jan '18

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: Save board without need to correctly finish the app.
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

Andrey Semakin : winemine: Add WM_RBUTTONUP to cases of TestMines().
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

Andrey Semakin : winemine: Added Shift+LClick hotkey to uncover multiple cells.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: cd2e5588d0319a8cf351b9e3983005858a6c7ef1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2e5588d0319a8cf351b9e3… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Tue Feb 14 21:44:42 2017 +0500 winemine: Added Shift+LClick hotkey to uncover multiple cells. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ca8f056da1f5eecd7d10cafde4fe5fc62d3185de) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemine/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index da47359..27fc159 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -884,7 +884,7 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_LBUTTONDOWN: WINE_TRACE("WM_LBUTTONDOWN\n"); - if( wParam & MK_RBUTTON ) + if( wParam & ( MK_RBUTTON | MK_SHIFT ) ) msg = WM_MBUTTONDOWN; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); SetCapture( hWnd ); @@ -892,7 +892,7 @@ static LRESULT WINAPI MainProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_LBUTTONUP: WINE_TRACE("WM_LBUTTONUP\n"); - if( wParam & MK_RBUTTON ) + if( wParam & ( MK_RBUTTON | MK_SHIFT ) ) msg = WM_MBUTTONUP; TestBoard( hWnd, &board, (short)LOWORD(lParam), (short)HIWORD(lParam), msg ); ReleaseCapture();

1 0

Andrey Semakin : winemine: Mine random placing fix.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 9b366eef9e44d120eea9be349da983800b466959 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b366eef9e44d120eea9be34… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Sun Feb 12 12:50:04 2017 +0500 winemine: Mine random placing fix. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9b90266cfbc0a52f0217eecea8c5c89327b844df) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemine/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 71ff75e..da47359 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -343,8 +343,8 @@ static void PlaceMines ( BOARD *p_board, int selected_col, int selected_row ) /* create mines */ i = 0; while( (unsigned) i < p_board->mines ) { - col = (int) (p_board->cols * (float) rand() / RAND_MAX + 1); - row = (int) (p_board->rows * (float) rand() / RAND_MAX + 1); + col = rand() % p_board->cols + 1; + row = rand() % p_board->rows + 1; if( !p_board->box[col][row].IsMine ) { i++;

1 0

Lauri Kenttä : readme: Move WineHQ URLs to https in translations.
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

Lauri Kenttä : readme: Use UTF-8 consistently in all translations.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: 839e43253404b4476e9632a245609a68598b27e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=839e43253404b4476e9632a2… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Dec 5 22:40:46 2017 +0200 readme: Use UTF-8 consistently in all translations. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0ad190b9b0eb3eb0261d08520dffbd36b840fcd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- documentation/README.hu | 274 ++++++++++++++++++++++----------------------- documentation/README.ko | 242 +++++++++++++++++++-------------------- documentation/README.pt | 210 +++++++++++++++++----------------- documentation/README.pt_br | 166 +++++++++++++-------------- 4 files changed, 446 insertions(+), 446 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=839e43253404b4476e96…

1 0

Austin English : loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

Module: wine Branch: stable Commit: adf14b2009cd90723739bbf50f6c73c04f8ec5e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adf14b2009cd90723739bbf5… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 6 17:35:49 2017 -0600 loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https. Missed in 3bc68c24b972643aba2b96dcdcf97ea2f9fb82bd. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f1512cf25f0c8ef3df192bc1980d047cfa650059) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- loader/wine.pl.UTF-8.man.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 9f1f2cf..c487d0a 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -305,7 +305,7 @@ można pobrać ze strony Najaktualnieszy zrzut kodu można pobrać przez GIT. Aby dowiedzieć się jak to zrobić, odwiedź stronę .I -http://www.winehq.org/git +https://www.winehq.org/git .PP WineHQ, siedziba rozwoju .B wine

1 0

Austin English : maintainers: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

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

Austin English : appwiz.cpl: Move WineHQ URLs to https.
by Alexandre Julliard 02 Jan '18

02 Jan '18

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
64
Older →

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 January 2018