December 2018 - Wine-commits

Nikolay Sivov : shlwapi: Forward IStream helpers to shcore.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 77a8ac36838131d39f8345de014bd1447807acb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77a8ac36838131d39f8345de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:40:59 2018 +0300 shlwapi: Forward IStream helpers to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/istream.c | 112 +--------------------------------------------- dlls/shlwapi/shlwapi.spec | 8 ++-- 2 files changed, 6 insertions(+), 114 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index ba9874b..37fa4c6 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -35,35 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************* - * @ [SHLWAPI.184] - * - * Call IStream_Read() on a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpvDest [O] Destination for data read - * ulSize [I] Size of data to read - * - * RETURNS - * Success: S_OK. ulSize bytes have been read from the stream into lpvDest. - * Failure: An HRESULT error code, or E_FAIL if the read succeeded but the - * number of bytes read does not match. - */ -HRESULT WINAPI SHIStream_Read(IStream *lpStream, LPVOID lpvDest, ULONG ulSize) -{ - ULONG ulRead; - HRESULT hRet; - - TRACE("(%p,%p,%u)\n", lpStream, lpvDest, ulSize); - - hRet = IStream_Read(lpStream, lpvDest, ulSize, &ulRead); - - if (SUCCEEDED(hRet) && ulRead != ulSize) - hRet = E_FAIL; - return hRet; -} - -/************************************************************************* * @ [SHLWAPI.166] * * Determine if a stream has 0 length. @@ -91,10 +62,10 @@ BOOL WINAPI SHIsEmptyStream(IStream *lpStream) } else { - DWORD dwDummy; + DWORD dummy, read_len; /* Try to read from the stream */ - if(SUCCEEDED(SHIStream_Read(lpStream, &dwDummy, sizeof(dwDummy)))) + if (SUCCEEDED(IStream_Read(lpStream, &dummy, sizeof(dummy), &read_len)) && read_len == sizeof(dummy)) { LARGE_INTEGER zero; zero.QuadPart = 0; @@ -105,82 +76,3 @@ BOOL WINAPI SHIsEmptyStream(IStream *lpStream) } return bRet; } - -/************************************************************************* - * @ [SHLWAPI.212] - * - * Call IStream_Write() on a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpvSrc [I] Source for data to write - * ulSize [I] Size of data - * - * RETURNS - * Success: S_OK. ulSize bytes have been written to the stream from lpvSrc. - * Failure: An HRESULT error code, or E_FAIL if the write succeeded but the - * number of bytes written does not match. - */ -HRESULT WINAPI SHIStream_Write(IStream *lpStream, LPCVOID lpvSrc, ULONG ulSize) -{ - ULONG ulWritten; - HRESULT hRet; - - TRACE("(%p,%p,%d)\n", lpStream, lpvSrc, ulSize); - - hRet = IStream_Write(lpStream, lpvSrc, ulSize, &ulWritten); - - if (SUCCEEDED(hRet) && ulWritten != ulSize) - hRet = E_FAIL; - - return hRet; -} - -/************************************************************************* - * @ [SHLWAPI.213] - * - * Seek to the start of a stream. - * - * PARAMS - * lpStream [I] IStream object - * - * RETURNS - * Success: S_OK. The current position within the stream is updated - * Failure: An HRESULT error code. - */ -HRESULT WINAPI IStream_Reset(IStream *lpStream) -{ - LARGE_INTEGER zero; - TRACE("(%p)\n", lpStream); - zero.QuadPart = 0; - return IStream_Seek(lpStream, zero, 0, NULL); -} - -/************************************************************************* - * @ [SHLWAPI.214] - * - * Get the size of a stream. - * - * PARAMS - * lpStream [I] IStream object - * lpulSize [O] Destination for size - * - * RETURNS - * Success: S_OK. lpulSize contains the size of the stream. - * Failure: An HRESULT error code. - */ -HRESULT WINAPI IStream_Size(IStream *lpStream, ULARGE_INTEGER* lpulSize) -{ - STATSTG statstg; - HRESULT hRet; - - TRACE("(%p,%p)\n", lpStream, lpulSize); - - memset(&statstg, 0, sizeof(statstg)); - - hRet = IStream_Stat(lpStream, &statstg, 1); - - if (SUCCEEDED(hRet) && lpulSize) - *lpulSize = statstg.cbSize; - return hRet; -} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 9c01c3f..6e64a9c 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -181,7 +181,7 @@ 181 stdcall -noname SHEnableMenuItem(long long long) 182 stdcall -noname SHCheckMenuItem(long long long) 183 stdcall -noname SHRegisterClassA(ptr) -184 stdcall -ordinal IStream_Read(ptr ptr long) SHIStream_Read +184 stdcall -ordinal IStream_Read(ptr ptr long) shcore.IStream_Read 185 stdcall -ordinal SHMessageBoxCheckA(ptr str str long long str) 186 stdcall -noname SHSimulateDrop(ptr ptr long ptr ptr) 187 stdcall -noname SHLoadFromPropertyBag(ptr ptr) @@ -209,9 +209,9 @@ 209 stdcall -noname FDSA_Destroy(ptr) 210 stdcall -noname FDSA_InsertItem(ptr long ptr) 211 stdcall -noname FDSA_DeleteItem(ptr long) -212 stdcall -ordinal IStream_Write(ptr ptr long) SHIStream_Write -213 stdcall -ordinal IStream_Reset(ptr) -214 stdcall -ordinal IStream_Size(ptr ptr) +212 stdcall -ordinal IStream_Write(ptr ptr long) shcore.IStream_Write +213 stdcall -ordinal IStream_Reset(ptr) shcore.IStream_Reset +214 stdcall -ordinal IStream_Size(ptr ptr) shcore.IStream_Size 215 stdcall -ordinal SHAnsiToUnicode(str ptr long) 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -ordinal SHUnicodeToAnsi(wstr ptr ptr)

1 0

Nikolay Sivov : shlwapi: Forward ThreadRef functions to shcore.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 678c18b22ed81d2036c4b458eed29a33bc4c4751 URL: https://source.winehq.org/git/wine.git/?a=commit;h=678c18b22ed81d2036c4b458… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 10:41:00 2018 +0300 shlwapi: Forward ThreadRef functions to shcore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 1 - dlls/shlwapi/shlwapi.spec | 10 +- dlls/shlwapi/shlwapi_main.c | 3 - dlls/shlwapi/thread.c | 310 -------------------------------------------- 4 files changed, 5 insertions(+), 319 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=678c18b22ed81d2036c4…

1 0

Roberto Pungartnik : po: Portuguese (Brazil) translation fixes.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: f29c09dce2a4f2e75424588677b83d6a7d341348 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f29c09dce2a4f2e754245886… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sun Dec 2 22:35:56 2018 -0200 po: Portuguese (Brazil) translation fixes. Signed-off-by: Roberto Augusto Pungartnik <rpungartnik2gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 77 ++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 40 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f29c09dce2a4f2e75424…

1 0

Gabriel Ivăncescu : user32/listbox: Use a helper function to check the selection state of an item.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 3b087ce81faa102290f538cd6a0e2da251a9e464 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b087ce81faa102290f538cd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:06 2018 +0300 user32/listbox: Use a helper function to check the selection state of an item. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 286a33b..3eee691 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -120,6 +120,11 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); +static BOOL is_item_selected( const LB_DESCR *descr, UINT index ) +{ + return descr->items[index].selected; +} + /********************************************************************* * listbox class descriptor */ @@ -2866,7 +2871,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_GETSEL: if (((INT)wParam < 0) || ((INT)wParam >= descr->nb_items)) return LB_ERR; - return descr->items[wParam].selected; + return is_item_selected(descr, wParam); case LB_SETSEL: ret = LISTBOX_SetSelection( descr, lParam, wParam, FALSE );

1 0

Nikolay Sivov : user32/listbox: Use helper to test for selected state on painting.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 47058436426a306e7db8124508346204ee5865c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47058436426a306e7db81245… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 13:32:07 2018 +0300 user32/listbox: Use helper to test for selected state on painting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 3eee691..6dbf8d9 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -516,7 +516,13 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { LB_ITEMDATA *item = NULL; - if (index < descr->nb_items) item = &descr->items[index]; + BOOL selected = FALSE; + + if (index < descr->nb_items) + { + item = &descr->items[index]; + selected = is_item_selected(descr, index); + } if (IS_OWNERDRAW(descr)) { @@ -547,7 +553,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.hDC = hdc; dis.itemID = index; dis.itemState = 0; - if (item->selected) dis.itemState |= ODS_SELECTED; + if (selected) + dis.itemState |= ODS_SELECTED; if (!ignoreFocus && (descr->focus_item == index) && (descr->caret_on) && (descr->in_focus)) dis.itemState |= ODS_FOCUS; @@ -570,7 +577,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, DrawFocusRect( hdc, rect ); return; } - if (item && item->selected) + if (selected) { oldBk = SetBkColor( hdc, GetSysColor( COLOR_HIGHLIGHT ) ); oldText = SetTextColor( hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); @@ -595,7 +602,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, item->str, strlenW(item->str), descr->nb_tabs, descr->tabs, 0); } - if (item && item->selected) + if (selected) { SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText );

1 0

Nikolay Sivov : user32/listbox: Remove duplicated condition.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: db869b61a1a07421a40b65ee825e2cc7130009e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db869b61a1a07421a40b65ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 3 13:32:08 2018 +0300 user32/listbox: Remove duplicated condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6dbf8d9..6a33f81 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -515,8 +515,8 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, INT index, UINT action, BOOL ignoreFocus ) { + BOOL selected = FALSE, focused; LB_ITEMDATA *item = NULL; - BOOL selected = FALSE; if (index < descr->nb_items) { @@ -524,6 +524,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, selected = is_item_selected(descr, index); } + focused = !ignoreFocus && descr->focus_item == index && descr->caret_on && descr->in_focus; + if (IS_OWNERDRAW(descr)) { DRAWITEMSTRUCT dis; @@ -555,9 +557,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, dis.itemState = 0; if (selected) dis.itemState |= ODS_SELECTED; - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) dis.itemState |= ODS_FOCUS; + if (focused) + dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; dis.itemData = item->data; dis.rcItem = *rect; @@ -607,9 +608,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, SetBkColor( hdc, oldBk ); SetTextColor( hdc, oldText ); } - if (!ignoreFocus && (descr->focus_item == index) && - (descr->caret_on) && - (descr->in_focus)) DrawFocusRect( hdc, rect ); + if (focused) + DrawFocusRect( hdc, rect ); } }

1 0

Gabriel Ivăncescu : user32/listbox: Account for NULL item when painting ownerdrawn list.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 8700ef560eb50602af40a418b163f2b3f42e58b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8700ef560eb50602af40a418… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:09 2018 +0300 user32/listbox: Account for NULL item when painting ownerdrawn list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 6a33f81..b104bfd 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -560,10 +560,10 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, if (focused) dis.itemState |= ODS_FOCUS; if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED; - dis.itemData = item->data; + dis.itemData = item ? item->data : 0; dis.rcItem = *rect; TRACE("[%p]: drawitem %d (%s) action=%02x state=%02x rect=%s\n", - descr->self, index, debugstr_w(item->str), action, + descr->self, index, item ? debugstr_w(item->str) : "", action, dis.itemState, wine_dbgstr_rect(rect) ); SendMessageW(descr->owner, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); SelectClipRgn( hdc, hrgn );

1 0

Gabriel Ivăncescu : user32/listbox: Store the items array size instead of using HeapSize().
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: ae4199e26476d739e0dddb70ce181bbefd1a7c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae4199e26476d739e0dddb70… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 3 13:32:10 2018 +0300 user32/listbox: Store the items array size instead of using HeapSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index b104bfd..594c956 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -67,6 +67,7 @@ typedef struct INT height; /* Window height */ LB_ITEMDATA *items; /* Array of items */ INT nb_items; /* Number of items */ + UINT items_size; /* Total number of allocated items in the array */ INT top_item; /* Top visible item */ INT selected_item; /* Selected item */ INT focus_item; /* Item that has the focus */ @@ -713,7 +714,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) nb_items += LB_ARRAY_GRANULARITY - 1; nb_items -= (nb_items % LB_ARRAY_GRANULARITY); if (descr->items) { - nb_items += HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); + nb_items += descr->items_size; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, nb_items * sizeof(LB_ITEMDATA)); } @@ -727,6 +728,7 @@ static LRESULT LISTBOX_InitStorage( LB_DESCR *descr, INT nb_items ) SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = nb_items; descr->items = item; return LB_OKAY; } @@ -1537,12 +1539,10 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, if (index == -1) index = descr->nb_items; else if ((index < 0) || (index > descr->nb_items)) return LB_ERR; - if (!descr->items) max_items = 0; - else max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(*item); - if (descr->nb_items == max_items) + if (descr->nb_items == descr->items_size) { /* We need to grow the array */ - max_items += LB_ARRAY_GRANULARITY; + max_items = descr->items_size + LB_ARRAY_GRANULARITY; if (descr->items) item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); @@ -1554,6 +1554,7 @@ static LRESULT LISTBOX_InsertItem( LB_DESCR *descr, INT index, SEND_NOTIFICATION( descr, LBN_ERRSPACE ); return LB_ERRSPACE; } + descr->items_size = max_items; descr->items = item; } @@ -1713,13 +1714,17 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) /* Shrink the item array if possible */ - max_items = HeapSize( GetProcessHeap(), 0, descr->items ) / sizeof(LB_ITEMDATA); + max_items = descr->items_size; if (descr->nb_items < max_items - 2*LB_ARRAY_GRANULARITY) { max_items -= LB_ARRAY_GRANULARITY; item = HeapReAlloc( GetProcessHeap(), 0, descr->items, max_items * sizeof(LB_ITEMDATA) ); - if (item) descr->items = item; + if (item) + { + descr->items_size = max_items; + descr->items = item; + } } /* Repaint the items */ @@ -1765,6 +1770,7 @@ static void LISTBOX_ResetContent( LB_DESCR *descr ) descr->selected_item = -1; descr->focus_item = 0; descr->anchor_item = -1; + descr->items_size = 0; descr->items = NULL; } @@ -2506,6 +2512,7 @@ static BOOL LISTBOX_Create( HWND hwnd, LPHEADCOMBO lphc ) descr->width = rect.right - rect.left; descr->height = rect.bottom - rect.top; descr->items = NULL; + descr->items_size = 0; descr->nb_items = 0; descr->top_item = 0; descr->selected_item = -1;

1 0

Alexandre Julliard : wineandroid: Generate assets checksum from the gradle build file.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 0f19685917a9bc5cce2b581fc31d4bb90f8f2003 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f19685917a9bc5cce2b581f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 16:16:27 2018 +0100 wineandroid: Generate assets checksum from the gradle build file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 8 ++------ dlls/wineandroid.drv/build.gradle.in | 39 +++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index d2e2d01..40ab495 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -20,9 +20,5 @@ EXTRA_TARGETS = wine-debug.apk all: wine-debug.apk wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg - (test -d assets && \ - rm -f assets/files.sum assets/sums.sum && \ - sha256sum `find assets -type f -print` | sed 's/ assets\// /' >files.sum && \ - sha256sum files.sum >sums.sum && \ - mv files.sum sums.sum assets) || rm -rf assets - gradle -q assembleDebug && mv build/outputs/apk/wine-debug.apk . + gradle -q assembleDebug + mv build/outputs/apk/wine-debug.apk $@ diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 3fba34a..8ae2fb4 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -32,7 +32,8 @@ buildscript } } -def add_icon_task( dir, scale ) { +def add_icon_task( dir, scale ) +{ return tasks.create( "createIcon-" + dir, Exec ) { def outdir = new File( "res", "drawable-" + dir ) outputs.dir( outdir ) @@ -45,15 +46,33 @@ def add_icon_task( dir, scale ) { } } -tasks.whenTaskAdded { t -> - if (t.name.equals( "generateDebugResources" )) { - t.dependsOn add_icon_task( "ldpi", 0.75 ) - t.dependsOn add_icon_task( "mdpi", 1 ) - t.dependsOn add_icon_task( "hdpi", 1.5 ) - t.dependsOn add_icon_task( "xhdpi", 2 ) - t.dependsOn add_icon_task( "xxhdpi", 3 ) - t.dependsOn add_icon_task( "xxxhdpi", 4 ) - } +def checksum_task() +{ + return tasks.create( "checksumAssets", Exec ) { + commandLine "sh", "-c", + "(test -d assets && " + + "rm -f assets/files.sum assets/sums.sum && " + + "sha256sum \$(find assets -type f -print) | sed 's/ assets\\// /' >files.sum && " + + "sha256sum files.sum >sums.sum && " + + "mv files.sum sums.sum assets) || rm -rf assets"; + } +} + +tasks.whenTaskAdded +{ + if (name.equals( "generateDebugResources" )) + { + dependsOn add_icon_task( "ldpi", 0.75 ) + dependsOn add_icon_task( "mdpi", 1 ) + dependsOn add_icon_task( "hdpi", 1.5 ) + dependsOn add_icon_task( "xhdpi", 2 ) + dependsOn add_icon_task( "xxhdpi", 3 ) + dependsOn add_icon_task( "xxxhdpi", 4 ) + } + if (name.equals( "generateDebugAssets" )) + { + dependsOn checksum_task() + } } tasks.withType(JavaCompile)

1 0

Alexandre Julliard : wineandroid: Specify the window scale directly in the constructor.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 357c2bb9f984122f06f9d9a75c004ff05c1b625e URL: https://source.winehq.org/git/wine.git/?a=commit;h=357c2bb9f984122f06f9d9a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 16:16:48 2018 +0100 wineandroid: Specify the window scale directly in the constructor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 8013b3a..6e6bbff 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -348,16 +348,16 @@ public class WineActivity extends Activity protected WineWindowGroup window_group; protected WineWindowGroup client_group; - public WineWindow( int w, WineWindow parent ) + public WineWindow( int w, WineWindow parent, float scale ) { Log.i( LOGTAG, String.format( "create hwnd %08x", w )); hwnd = w; owner = 0; style = 0; - scale = 1.0f; visible = false; visible_rect = client_rect = new Rect( 0, 0, 0, 0 ); this.parent = parent; + this.scale = scale; children = new ArrayList<WineWindow>(); win_map.put( w, this ); if (parent != null) parent.children.add( this ); @@ -744,11 +744,11 @@ public class WineActivity extends Activity public TopView( Context context, int hwnd ) { super( context ); - desktop_window = new WineWindow( hwnd, null ); + desktop_window = new WineWindow( hwnd, null, 1.0f ); addView( desktop_window.create_whole_view() ); desktop_window.client_group.bringToFront(); - message_window = new WineWindow( WineWindow.HWND_MESSAGE, null ); + message_window = new WineWindow( WineWindow.HWND_MESSAGE, null, 1.0f ); message_window.create_window_groups(); } @@ -786,8 +786,7 @@ public class WineActivity extends Activity WineWindow win = get_window( hwnd ); if (win == null) { - win = new WineWindow( hwnd, get_window( parent )); - win.scale = scale; + win = new WineWindow( hwnd, get_window( parent ), scale ); win.create_window_groups(); if (win.parent == desktop_window) win.create_whole_view(); }

1 0