backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

fix saved cursor pos

Browse Source
This commit is contained in:
FunkyFr3sh 2021-06-17 06:13:16 +02:00
parent 570d7f11bb
commit 5700a0eb4c
5 changed files with 72 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dd.c
View File

@ -461,8 +461,8 @@ HRESULT dd_SetDisplayMode(DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, BOOL setBy
g_ddraw->height = dwHeight; g_ddraw->height = dwHeight;
g_ddraw->bpp = dwBPP; g_ddraw->bpp = dwBPP;
g_ddraw->cursor.x = dwWidth / 2; InterlockedExchange((LONG*)&g_ddraw->cursor.x, dwWidth / 2);
g_ddraw->cursor.y = dwHeight / 2; InterlockedExchange((LONG*)&g_ddraw->cursor.y, dwHeight / 2);
BOOL border = g_ddraw->border; BOOL border = g_ddraw->border;
@ -820,7 +820,7 @@ HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags)
} }
int cursor_count = real_ShowCursor(TRUE) - 1; int cursor_count = real_ShowCursor(TRUE) - 1;
InterlockedExchange(&g_ddraw->show_cursor_count, cursor_count); InterlockedExchange((LONG*)&g_ddraw->show_cursor_count, cursor_count);
real_ShowCursor(FALSE); real_ShowCursor(FALSE);
/* Make sure the cursor is visible in windowed mode initially */ /* Make sure the cursor is visible in windowed mode initially */

2
src/directinput.c
View File

@ -104,7 +104,7 @@ static HRESULT WINAPI fake_di_CreateDevice(
while (real_ShowCursor(FALSE) >= 0); while (real_ShowCursor(FALSE) >= 0);
} }
InterlockedExchange(&g_ddraw->show_cursor_count, -1); InterlockedExchange((LONG*)&g_ddraw->show_cursor_count, -1);
} }
real_did_SetCooperativeLevel = real_did_SetCooperativeLevel =

18
src/mouse.c
View File

@ -42,15 +42,18 @@ void mouse_lock()
rc.bottom -= (LONG)((g_ddraw->mouse_y_adjust * 2) * g_ddraw->render.scale_h); rc.bottom -= (LONG)((g_ddraw->mouse_y_adjust * 2) * g_ddraw->render.scale_h);
int cur_x = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.x, 0);
int cur_y = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.y, 0);
if (g_ddraw->adjmouse) if (g_ddraw->adjmouse)
{ {
real_SetCursorPos( real_SetCursorPos(
(int)(rc.left + (g_ddraw->cursor.x * g_ddraw->render.scale_w)), (int)(rc.left + (cur_x * g_ddraw->render.scale_w)),
(int)(rc.top + ((g_ddraw->cursor.y - g_ddraw->mouse_y_adjust) * g_ddraw->render.scale_h))); (int)(rc.top + ((cur_y - g_ddraw->mouse_y_adjust) * g_ddraw->render.scale_h)));
} }
else else
{ {
real_SetCursorPos(rc.left + g_ddraw->cursor.x, rc.top + g_ddraw->cursor.y - g_ddraw->mouse_y_adjust); real_SetCursorPos(rc.left + cur_x, rc.top + cur_y - g_ddraw->mouse_y_adjust);
} }
real_SetCursor(g_ddraw->old_cursor); real_SetCursor(g_ddraw->old_cursor);
@ -58,7 +61,7 @@ void mouse_lock()
int cur_count = real_ShowCursor(TRUE) - 1; int cur_count = real_ShowCursor(TRUE) - 1;
real_ShowCursor(FALSE); real_ShowCursor(FALSE);
int game_count = InterlockedExchangeAdd(&g_ddraw->show_cursor_count, 0); int game_count = (int)InterlockedExchangeAdd((LONG*)&g_ddraw->show_cursor_count, 0);
if (cur_count > game_count) if (cur_count > game_count)
{ {
@ -112,8 +115,11 @@ void mouse_unlock()
real_ClipCursor(NULL); real_ClipCursor(NULL);
int cur_x = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.x, 0);
int cur_y = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.y, 0);
real_SetCursorPos( real_SetCursorPos(
(int)(rc.left + g_ddraw->render.viewport.x + (g_ddraw->cursor.x * g_ddraw->render.scale_w)), (int)(rc.left + g_ddraw->render.viewport.x + (cur_x * g_ddraw->render.scale_w)),
(int)(rc.top + g_ddraw->render.viewport.y + ((g_ddraw->cursor.y + g_ddraw->mouse_y_adjust) * g_ddraw->render.scale_h))); (int)(rc.top + g_ddraw->render.viewport.y + ((cur_y + g_ddraw->mouse_y_adjust) * g_ddraw->render.scale_h)));
} }
} }

43
src/winapi_hooks.c
View File

@ -59,16 +59,18 @@ BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint)
if (diffx || diffy) if (diffx || diffy)
real_SetCursorPos(realpt.x - diffx, realpt.y - diffy); real_SetCursorPos(realpt.x - diffx, realpt.y - diffy);
int x = 0;
int y = 0;
if (g_ddraw->adjmouse) if (g_ddraw->adjmouse)
{ {
g_ddraw->cursor.x = min((DWORD)(roundf(pt.x * g_ddraw->render.unscale_w)), g_ddraw->width); x = min((DWORD)(roundf(pt.x * g_ddraw->render.unscale_w)), g_ddraw->width);
g_ddraw->cursor.y = min((DWORD)(roundf(pt.y * g_ddraw->render.unscale_h)), g_ddraw->height); y = min((DWORD)(roundf(pt.y * g_ddraw->render.unscale_h)), g_ddraw->height);
} }
else else
{ {
g_ddraw->cursor.x = pt.x; x = pt.x;
g_ddraw->cursor.y = pt.y; y = pt.y;
} }
if (g_ddraw->vhack && InterlockedExchangeAdd(&g_ddraw->upscale_hack_active, 0)) if (g_ddraw->vhack && InterlockedExchangeAdd(&g_ddraw->upscale_hack_active, 0))
@ -76,27 +78,38 @@ BOOL WINAPI fake_GetCursorPos(LPPOINT lpPoint)
diffx = 0; diffx = 0;
diffy = 0; diffy = 0;
if (g_ddraw->cursor.x > g_ddraw->upscale_hack_width) if (x > g_ddraw->upscale_hack_width)
{ {
diffx = g_ddraw->cursor.x - g_ddraw->upscale_hack_width; diffx = x - g_ddraw->upscale_hack_width;
g_ddraw->cursor.x = g_ddraw->upscale_hack_width; x = g_ddraw->upscale_hack_width;
} }
if (g_ddraw->cursor.y > g_ddraw->upscale_hack_height) if (y > g_ddraw->upscale_hack_height)
{ {
diffy = g_ddraw->cursor.y - g_ddraw->upscale_hack_height; diffy = y - g_ddraw->upscale_hack_height;
g_ddraw->cursor.y = g_ddraw->upscale_hack_height; y = g_ddraw->upscale_hack_height;
} }
if (diffx || diffy) if (diffx || diffy)
real_SetCursorPos(realpt.x - diffx, realpt.y - diffy); real_SetCursorPos(realpt.x - diffx, realpt.y - diffy);
} }
InterlockedExchange((LONG*)&g_ddraw->cursor.x, x);
InterlockedExchange((LONG*)&g_ddraw->cursor.y, y);
if (lpPoint)
{
lpPoint->x = x;
lpPoint->y = y;
}
return TRUE;
} }
if (lpPoint) if (lpPoint)
{ {
lpPoint->x = g_ddraw->cursor.x; lpPoint->x = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.x, 0);
lpPoint->y = g_ddraw->cursor.y; lpPoint->y = InterlockedExchangeAdd((LONG*)&g_ddraw->cursor.y, 0);
} }
return TRUE; return TRUE;
@ -120,14 +133,14 @@ int WINAPI fake_ShowCursor(BOOL bShow)
if (g_ddraw->locked || g_ddraw->devmode) if (g_ddraw->locked || g_ddraw->devmode)
{ {
int count = real_ShowCursor(bShow); int count = real_ShowCursor(bShow);
InterlockedExchange(&g_ddraw->show_cursor_count, count); InterlockedExchange((LONG*)&g_ddraw->show_cursor_count, count);
return count; return count;
} }
else else
{ {
return bShow ? return bShow ?
InterlockedIncrement(&g_ddraw->show_cursor_count) : InterlockedIncrement((LONG*)&g_ddraw->show_cursor_count) :
InterlockedDecrement(&g_ddraw->show_cursor_count); InterlockedDecrement((LONG*)&g_ddraw->show_cursor_count);
} }
} }

45
src/wndproc.c
View File

@ -1,5 +1,6 @@
#include <windows.h> #include <windows.h>
#include <windowsx.h> #include <windowsx.h>
#include <math.h>
#include "dllmain.h" #include "dllmain.h"
#include "dd.h" #include "dd.h"
#include "hook.h" #include "hook.h"
@ -636,15 +637,18 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
y > g_ddraw->render.viewport.y + g_ddraw->render.viewport.height || y > g_ddraw->render.viewport.y + g_ddraw->render.viewport.height ||
y < g_ddraw->render.viewport.y) y < g_ddraw->render.viewport.y)
{ {
g_ddraw->cursor.x = g_ddraw->width / 2; x = g_ddraw->width / 2;
g_ddraw->cursor.y = g_ddraw->height / 2; y = g_ddraw->height / 2;
} }
else else
{ {
g_ddraw->cursor.x = (DWORD)((x - g_ddraw->render.viewport.x) * g_ddraw->render.unscale_w); x = (DWORD)((x - g_ddraw->render.viewport.x) * g_ddraw->render.unscale_w);
g_ddraw->cursor.y = (DWORD)((y - g_ddraw->render.viewport.y) * g_ddraw->render.unscale_h); y = (DWORD)((y - g_ddraw->render.viewport.y) * g_ddraw->render.unscale_h);
} }
InterlockedExchange((LONG*)&g_ddraw->cursor.x, x);
InterlockedExchange((LONG*)&g_ddraw->cursor.y, y);
mouse_lock(); mouse_lock();
return 0; return 0;
} }
@ -684,8 +688,9 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
if (g_ddraw->adjmouse) if (g_ddraw->adjmouse)
{ {
fake_GetCursorPos(NULL); /* update our own cursor */ POINT pt;
lParam = MAKELPARAM(g_ddraw->cursor.x, g_ddraw->cursor.y); fake_GetCursorPos(&pt);
lParam = MAKELPARAM(pt.x, pt.y);
} }
} }
@ -693,15 +698,18 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
{ {
if (g_ddraw->adjmouse) if (g_ddraw->adjmouse)
{ {
g_ddraw->cursor.x = (DWORD)(roundf(GET_X_LPARAM(lParam) * g_ddraw->render.unscale_w)); x = (DWORD)(roundf(GET_X_LPARAM(lParam) * g_ddraw->render.unscale_w));
g_ddraw->cursor.y = (DWORD)(roundf(GET_Y_LPARAM(lParam) * g_ddraw->render.unscale_h)); y = (DWORD)(roundf(GET_Y_LPARAM(lParam) * g_ddraw->render.unscale_h));
lParam = MAKELPARAM(g_ddraw->cursor.x, g_ddraw->cursor.y); InterlockedExchange((LONG*)&g_ddraw->cursor.x, x);
InterlockedExchange((LONG*)&g_ddraw->cursor.y, y);
lParam = MAKELPARAM(x, y);
} }
else else
{ {
g_ddraw->cursor.x = GET_X_LPARAM(lParam); InterlockedExchange((LONG*)&g_ddraw->cursor.x, GET_X_LPARAM(lParam));
g_ddraw->cursor.y = GET_Y_LPARAM(lParam); InterlockedExchange((LONG*)&g_ddraw->cursor.y, GET_Y_LPARAM(lParam));
} }
} }
@ -710,8 +718,11 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
x = min(GET_X_LPARAM(lParam), g_ddraw->width); x = min(GET_X_LPARAM(lParam), g_ddraw->width);
y = min(GET_Y_LPARAM(lParam), g_ddraw->height); y = min(GET_Y_LPARAM(lParam), g_ddraw->height);
g_ddraw->cursor.x = x; if (g_ddraw->devmode)
g_ddraw->cursor.y = y; {
InterlockedExchange((LONG*)&g_ddraw->cursor.x, x);
InterlockedExchange((LONG*)&g_ddraw->cursor.y, y);
}
lParam = MAKELPARAM(x, y); lParam = MAKELPARAM(x, y);
} }
@ -732,11 +743,11 @@ LRESULT CALLBACK fake_WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
{ {
if (!g_ddraw->devmode && !g_ddraw->locked) if (!g_ddraw->devmode && !g_ddraw->locked)
{ {
int x = GET_X_LPARAM(lParam); int x = (DWORD)((GET_X_LPARAM(lParam) - g_ddraw->render.viewport.x) * g_ddraw->render.unscale_w);
int y = GET_Y_LPARAM(lParam); int y = (DWORD)((GET_Y_LPARAM(lParam) - g_ddraw->render.viewport.y) * g_ddraw->render.unscale_h);
g_ddraw->cursor.x = (DWORD)((x - g_ddraw->render.viewport.x) * g_ddraw->render.unscale_w); InterlockedExchange((LONG*)&g_ddraw->cursor.x, x);
g_ddraw->cursor.y = (DWORD)((y - g_ddraw->render.viewport.y) * g_ddraw->render.unscale_h); InterlockedExchange((LONG*)&g_ddraw->cursor.y, y);
mouse_lock(); mouse_lock();
} }