[PATCH 0/2] MR5739: wineandroid: Fix some build errors.

[Rémi Bernon]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5739

[PATCH 1/2] wineandroid: Fix NtUserSendHardwareInput parameter order.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/wineandroid.drv/window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c
index 3e900aa6f4d..1f998c0b2ae 100644
--- a/dlls/wineandroid.drv/window.c
+++ b/dlls/wineandroid.drv/window.c
@@ -514,7 +514,7 @@ static int process_events( DWORD mask )
                     }
                     SERVER_END_REQ;
                 }
-                NtUserSendHardwareInput( capture ? capture : event->data.motion.hwnd, &event->data.motion.input, 0, 0 );
+                NtUserSendHardwareInput( capture ? capture : event->data.motion.hwnd, 0, &event->data.motion.input, 0 );
             }
             break;
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/5739

[PATCH 2/2] wineandroid: Use DWORD for pixel pointers.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/wineandroid.drv/window.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c
index 1f998c0b2ae..584af060700 100644
--- a/dlls/wineandroid.drv/window.c
+++ b/dlls/wineandroid.drv/window.c
@@ -743,7 +743,7 @@ static void android_surface_flush( struct window_surface *window_surface )
     if (!surface->window->perform( surface->window, NATIVE_WINDOW_LOCK, &buffer, &rc ))
     {
         const RECT *rgn_rect = NULL, *end = NULL;
-        unsigned int *src, *dst;
+        DWORD *src, *dst;
         int x, y, width;
 
         rect.left   = rc.left;
@@ -757,10 +757,10 @@ static void android_surface_flush( struct window_surface *window_surface )
             rgn_rect = (RECT *)surface->region_data->Buffer;
             end = rgn_rect + surface->region_data->rdh.nCount;
         }
-        src = (unsigned int *)surface->bits
+        src = (DWORD *)surface->bits
             + (rect.top - surface->header.rect.top) * surface->info.bmiHeader.biWidth
             + (rect.left - surface->header.rect.left);
-        dst = (unsigned int *)buffer.bits + rect.top * buffer.stride + rect.left;
+        dst = (DWORD *)buffer.bits + rect.top * buffer.stride + rect.left;
         width = min( rect.right - rect.left, buffer.stride );
 
         for (y = rect.top; y < min( buffer.height, rect.bottom); y++)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/5739

[PATCH 2/2] wineandroid: Use DWORD for pixel pointers.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=145864

Your paranoid android.


=== debian11b (build log) ===

error: patch failed: dlls/wineandroid.drv/window.c:514
error: patch failed: dlls/wineandroid.drv/window.c:743
Task: Patch failed to apply