Author: akhaldi
Date: Sun Sep 24 11:18:18 2017
New Revision: 75948
URL: http://svn.reactos.org/svn/reactos?rev=75948&view=rev
Log:
[WINMINE] Sync with Wine Staging 2.16. CORE-13762
ca8f056 winemine: Added Shift+LClick hotkey to uncover multiple cells.
9b90266 winemine: Mine random placing fix.
Modified:
trunk/reactos/base/applications/games/winmine/main.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/base/applications/games/winmine/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/winmine/main.c?rev=75948&r1=75947&r2=75948&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1]
(original)
+++ trunk/reactos/base/applications/games/winmine/main.c [iso-8859-1]
Sun Sep 24 11:18:18 2017
@@ -342,8 +342,8 @@
/* 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++;
@@ -883,7 +883,7 @@
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 );
@@ -891,7 +891,7 @@
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();
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=75948&r1=75947&r2=75948&view=diff
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 24 11:18:18 2017
@@ -233,7 +233,7 @@
reactos/base/applications/cmdutils/wmic # Synced to WineStaging-2.9
reactos/base/applications/cmdutils/wscript # Synced to WineStaging-2.9
reactos/base/applications/cmdutils/xcopy # Synced to WineStaging-2.9
-reactos/base/applications/games/winmine # Synced to WineStaging-1.9.16
with our own resources.
+reactos/base/applications/games/winmine # Synced to WineStaging-2.16 with
our own resources.
reactos/base/applications/extrac32 # Synced to WineStaging-2.9
reactos/base/applications/iexplore # Synced to WineStaging-2.9
reactos/base/applications/notepad # Forked at Wine-20041201
