June 2022 - Wine-Commits - list.winehq.org

Jeremy Newman : rss feed updates
by Jeremy Newman June 7, 2022

June 7, 2022

Module: website Branch: master Commit: 3ec9ef1e73cffb14c0a4001d6400281fcddaecd2 URL: https://source.winehq.org/git/website.git/?a=commit;h=3ec9ef1e73cffb14c0a40… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jun 7 15:59:16 2022 -0500 rss feed updates * add etag based on last modified * stream news items * use RSS 2.0 XML format --- include/plugins/news.php | 72 +++++++++++++++++++++++++-------------- templates/global/xml/rss.template | 11 ++---- 2 files changed, 49 insertions(+), 34 deletions(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index e05dfeb6..f305f5b2 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -98,21 +98,52 @@ switch ($flag) // RSS view case 'rss': - // get list of news items $news = get_files($config->news_xml_path."/".$config->lang, $feed); - $news = array_reverse ($news); + $news = array_reverse($news); - // clear cache and output the rss file - $rss_rows = ""; - $c = 0; - foreach ($news as $key => $item) + // get last modified + $f = get_xml_tags($config->news_xml_path.'/'.$html->lang.'/'.$news[0], array('date')); + $last_modified = strtotime($f['date']); + + // if etag set in header, and matches timestamp, send 304 + if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $last_modified || trim($_SERVER['HTTP_IF_NONE_MATCH']) == $last_modified) + { + header("HTTP/1.1 304 Not Modified"); + exit(); + } + + // clear cache + $html->clear_buffer(); + + // headers + header("Last-Modified: ".gmdate("D, d M Y H:i:s", $last_modified)." GMT"); + header("Expires: ".gmdate("D, d M Y H:i:s", (time()+86400))." GMT"); + header("Etag: \"{$last_modified}\""); + header("Pragma: public"); + header("Cache-Control: public, max-age=86400"); + header("Content-Type: application/xml"); + header('Content-Disposition: inline; filename="winehq_news.xml";'); + + // rss header + $rss = array( + 'rss_title' => "{$config->site_name} News", + 'rss_link' => "{$config->base_url}news/rss/", + 'rss_img' => "https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announceme…", + 'rss_desc' => 'News and information about Wine', + 'rss_crt' => '(C) '.$config->site_name.' '.date("Y", time()), + 'atom_link' => "https://{$_SERVER['SERVER_NAME']}{$_SERVER['PHP_SELF']}rss" + ); + $rss_head = $html->template('global', 'xml/rss', $rss, 1); + list($rss_head, $rss_foot) = preg_split('/\{\$rss_rows\}/', $rss_head, 2); + echo $rss_head; + + // rss rows + foreach ($news as $c => $item) { - $c++; - // limit to 10 most recent articles - if ($c > 10) - continue; + if ($c == 10) + break; // get data from XML file if (file_exists($config->news_xml_path.'/'.$html->lang.'/'.$item)) @@ -139,25 +170,14 @@ switch ($flag) 'item_guid' => $config->base_url.'?news='.$item, 'item_date' => date("r", strtotime($vars['date'])) ); - $rss_rows .= $html->template('global', 'xml/rss_row', $rss_row, 1); - $html->set_last_modified($vars['date'], true); + echo $html->template('global', 'xml/rss_row', $rss_row, 1); } - unset($c); - $rss = array( - 'rss_date' => date("r", $top_date), - 'rss_title' => "{$config->site_name} News", - 'rss_link' => "{$config->base_url}news/rss/", - 'rss_img' => "https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announceme…", - 'rss_desc' => 'News and information about Wine', - 'rss_crt' => '(C) '.$config->site_name.' '.date("Y", time()), - 'rss_rows' => $rss_rows - ); - $html->http_header("application/xml"); - header('Content-Disposition: inline; filename="winehq_news.xml";'); - echo $html->template('global', 'xml/rss', $rss); + + // rss footer + echo $rss_foot; exit(); break; - // end rss + // end rss // default view default: diff --git a/templates/global/xml/rss.template b/templates/global/xml/rss.template index 92c68a93..60329b89 100644 --- a/templates/global/xml/rss.template +++ b/templates/global/xml/rss.template @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="http://feeds.gawker.com/~d/styles/rss2full.xsl" type="text/xsl" media="screen"?> -<?xml-stylesheet href="http://feeds.gawker.com/~d/styles/itemcontent.css" type="text/css" media="screen"?> -<rss xmlns:feedburner="http://rssnamespace.org/feedburner/ext/1.0" version="2.0"> +<rss version="2.0" xmlns:atom="https://www.w3.org/2005/Atom"> <channel> <title>{$rss_title}</title> <image> @@ -11,12 +9,9 @@ </image> <link>{$rss_link}</link> <description>{$rss_desc}</description> - <language>en</language> + <language>{$html_lang}</language> <copyright>{$rss_crt}</copyright> - <atom10:link xmlns:atom10="http://www.w3.org/2005/Atom" rel="self" href="{$rss_link}" type="application/rss+xml" /> - <feedburner:browserFriendly>This is an XML content feed. It is intended to be viewed in a newsreader or syndicated to another site.</feedburner:browserFriendly> - + <atom:link href="{$atom_link}" rel="self" type="application/rss+xml" /> {$rss_rows} - </channel> </rss>

1 0

Alexandre Julliard : atl: Support escaped quotes in registrar scripts.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 6f485a361f6b38bacf228b90f35f1200756555ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f485a361f6b38bacf228b90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 19:36:02 2022 +0200 atl: Support escaped quotes in registrar scripts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/registrar.c | 18 ++++++++++++------ dlls/atl/tests/registrar.c | 20 +++++++++++++++++++- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 5a3eef7dd4f..5e03b42132c 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -118,12 +118,18 @@ static HRESULT get_word(LPCOLESTR *str, strbuf *buf) if(*iter == '}' || *iter == '=') { strbuf_write(iter++, buf, 1); }else if(*iter == '\'') { - iter2 = ++iter; - iter = wcschr(iter, '\''); - if(!iter) { - WARN("Unexpected end of script\n"); - *str = iter; - return DISP_E_EXCEPTION; + for (;;) + { + iter2 = ++iter; + iter = wcschr(iter, '\''); + if(!iter) { + WARN("Unexpected end of script\n"); + *str = iter; + return DISP_E_EXCEPTION; + } + if (iter[1] != '\'') break; + iter++; + strbuf_write(iter2, buf, iter-iter2); } strbuf_write(iter2, buf, iter-iter2); iter++; diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index e332bbce0de..ab31f9532b1 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -42,7 +42,9 @@ static const char textA[] = "{ \n" " ForceRemove eebf73c4-50fd-478f-bbcf-db212221227a \n" " { \n" -" val 'string' = s 'string' \n" +" val 'str1' = s 'string' \n" +" val 'str2' = s 'str\\\"ing' \n" +" val 'str3' = s 'str''ing' \n" " val 'dword_quoted_dec' = d '1' \n" " val 'dword_unquoted_dec' = d 1 \n" " val 'dword_quoted_hex' = d '0xA' \n" @@ -81,6 +83,7 @@ static void test_registrar(void) LONG lret; HKEY key; BYTE bytes[4]; + char buffer[16]; MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, count); hr = IRegistrar_StringRegister(registrar, textW); @@ -94,6 +97,21 @@ static void test_registrar(void) lret = RegOpenKeyA(HKEY_CURRENT_USER, "eebf73c4-50fd-478f-bbcf-db212221227a", &key); ok(lret == ERROR_SUCCESS, "error %ld opening registry key\n", lret); + size = sizeof(buffer); + lret = RegQueryValueExA(key, "str1", NULL, NULL, (BYTE*)buffer, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %ld\n", lret); + ok(!strcmp( buffer, "string"), "wrong data %s\n", debugstr_a(buffer)); + + size = sizeof(buffer); + lret = RegQueryValueExA(key, "str2", NULL, NULL, (BYTE*)buffer, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %ld\n", lret); + ok(!strcmp( buffer, "str\\\"ing"), "wrong data %s\n", debugstr_a(buffer)); + + size = sizeof(buffer); + lret = RegQueryValueExA(key, "str3", NULL, NULL, (BYTE*)buffer, &size); + ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %ld\n", lret); + ok(!strcmp( buffer, "str'ing"), "wrong data %s\n", debugstr_a(buffer)); + size = sizeof(dword); lret = RegQueryValueExA(key, "dword_unquoted_hex", NULL, NULL, (BYTE*)&dword, &size); ok(lret == ERROR_SUCCESS, "RegQueryValueExA failed, error %ld\n", lret);

1 0

Dmitry Timoshkov : d2d1: Add partial support for image brushes.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: dd00c2075faec366d47133999a14c3cae394679d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd00c2075faec366d4713399… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 7 16:27:25 2022 +0300 d2d1: Add partial support for image brushes. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 68 ++++++++++++++++++++++++++++++++++++++++++-------- dlls/d2d1/tests/d2d1.c | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index b9a673fe54c..22116759b10 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1450,7 +1450,23 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) return TRUE; case D2D_BRUSH_TYPE_BITMAP: - bitmap = brush->u.bitmap.bitmap; + case D2D_BRUSH_TYPE_IMAGE: + { + ID2D1Bitmap *image_bitmap = NULL; + + if (brush->type == D2D_BRUSH_TYPE_BITMAP) + bitmap = brush->u.bitmap.bitmap; + else + { + if (FAILED(ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&image_bitmap))) + { + FIXME("Only image brushes with bitmaps are supported.\n"); + return FALSE; + } + + bitmap = unsafe_impl_from_ID2D1Bitmap(image_bitmap); + cb->type = D2D_BRUSH_TYPE_BITMAP; + } /* Scale for bitmap size and dpi. */ b = brush->transform; @@ -1477,7 +1493,11 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) cb->u.bitmap.ignore_alpha = bitmap->format.alphaMode == D2D1_ALPHA_MODE_IGNORE; + if (image_bitmap) + ID2D1Bitmap_Release(image_bitmap); + return TRUE; + } default: FIXME("Unhandled brush type %#x.\n", brush->type); @@ -1485,31 +1505,32 @@ BOOL d2d_brush_fill_cb(const struct d2d_brush *brush, struct d2d_brush_cb *cb) } } -static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_context *context, - unsigned int brush_idx) +static void d2d_brush_bind_bitmap(struct d2d_bitmap *bitmap, struct d2d_device_context *context, + D2D1_EXTEND_MODE extend_mode_x, D2D1_EXTEND_MODE extend_mode_y, + D2D1_INTERPOLATION_MODE interpolation_mode, unsigned int brush_idx) { ID3D11SamplerState **sampler_state; ID3D11DeviceContext *d3d_context; HRESULT hr; ID3D11Device1_GetImmediateContext(context->d3d_device, &d3d_context); - ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &brush->u.bitmap.bitmap->srv); + ID3D11DeviceContext_PSSetShaderResources(d3d_context, brush_idx, 1, &bitmap->srv); sampler_state = &context->sampler_states - [brush->u.bitmap.interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] - [brush->u.bitmap.extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT] - [brush->u.bitmap.extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT]; + [interpolation_mode % D2D_SAMPLER_INTERPOLATION_MODE_COUNT] + [extend_mode_x % D2D_SAMPLER_EXTEND_MODE_COUNT] + [extend_mode_y % D2D_SAMPLER_EXTEND_MODE_COUNT]; if (!*sampler_state) { D3D11_SAMPLER_DESC sampler_desc; - if (brush->u.bitmap.interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) + if (interpolation_mode == D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR) sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; else sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR; - sampler_desc.AddressU = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_x); - sampler_desc.AddressV = texture_address_mode_from_extend_mode(brush->u.bitmap.extend_mode_y); + sampler_desc.AddressU = texture_address_mode_from_extend_mode(extend_mode_x); + sampler_desc.AddressV = texture_address_mode_from_extend_mode(extend_mode_y); sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; sampler_desc.MipLODBias = 0.0f; sampler_desc.MaxAnisotropy = 0; @@ -1529,6 +1550,26 @@ static void d2d_brush_bind_bitmap(struct d2d_brush *brush, struct d2d_device_con ID3D11DeviceContext_Release(d3d_context); } +static void d2d_brush_bind_image(struct d2d_brush *brush, struct d2d_device_context *context, + unsigned int brush_idx) +{ + ID2D1Bitmap *image_bitmap; + struct d2d_bitmap *bitmap; + + if (FAILED(ID2D1Image_QueryInterface(brush->u.image.image, &IID_ID2D1Bitmap, (void **)&image_bitmap))) + { + FIXME("Only image brushes with bitmaps are supported.\n"); + return; + } + + bitmap = unsafe_impl_from_ID2D1Bitmap(image_bitmap); + + d2d_brush_bind_bitmap(bitmap, context, brush->u.image.extend_mode_x, brush->u.image.extend_mode_y, + brush->u.image.interpolation_mode, brush_idx); + + ID2D1Bitmap_Release(image_bitmap); +} + void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context *context, unsigned int brush_idx) { switch (brush->type) @@ -1545,7 +1586,12 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_device_context break; case D2D_BRUSH_TYPE_BITMAP: - d2d_brush_bind_bitmap(brush, context, brush_idx); + d2d_brush_bind_bitmap(brush->u.bitmap.bitmap, context, brush->u.bitmap.extend_mode_x, + brush->u.bitmap.extend_mode_y, brush->u.bitmap.interpolation_mode, brush_idx); + break; + + case D2D_BRUSH_TYPE_IMAGE: + d2d_brush_bind_image(brush, context, brush_idx); break; default: diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..752e34bf4da 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -2509,11 +2509,13 @@ static void test_image_brush(BOOL d3d11) D2D1_BITMAP_PROPERTIES bitmap_desc; D2D1_BRUSH_PROPERTIES brush_desc; ID2D1Image *image, *tmp_image; + D2D1_RECT_F dst_rect; struct d2d1_test_context ctx; D2D1_EXTEND_MODE extend_mode; D2D1_MATRIX_3X2_F matrix; ID2D1ImageBrush *brush; ID2D1Bitmap *bitmap; + D2D1_COLOR_F color; D2D1_SIZE_U size; D2D1_RECT_F rect; ULONG refcount; @@ -2585,6 +2587,50 @@ static void test_image_brush(BOOL d3d11) ID2D1ImageBrush_Release(brush); + /* FillRectangle */ + set_rect(&image_brush_desc.sourceRectangle, 0.0f, 0.0f, 4.0f, 4.0f); + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_SetInterpolationMode(brush, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(ctx.rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(ctx.rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(ctx.rt, &dst_rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(ctx.rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "89917481db82e6d683a75f068d3984fe2703cce5"); + ok(match, "Surface does not match.\n"); + + ID2D1ImageBrush_Release(brush); + + set_rect(&image_brush_desc.sourceRectangle, 0.0f, 0.0f, 1.0f, 1.0f); + hr = ID2D1DeviceContext_CreateImageBrush(device_context, image, &image_brush_desc, NULL, &brush); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ID2D1ImageBrush_SetInterpolationMode(brush, D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR); + + ID2D1RenderTarget_BeginDraw(ctx.rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(ctx.rt, &color); + + set_rect(&dst_rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(ctx.rt, &dst_rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(ctx.rt, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + match = compare_surface(&ctx, "23544adf9695a51428c194a1cffd531be3416e65"); + todo_wine + ok(match, "Surface does not match.\n"); + + ID2D1ImageBrush_Release(brush); + /* Custom brush description and image pointer. */ brush_desc.opacity = 2.0f; set_matrix_identity(&brush_desc.transform);

1 0

Torge Matthies : msvcp90: Fix segfault in bad_alloc exception default constructor.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 00012d3381c4fdd81d2e9c5fc7de5c74e7740cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00012d3381c4fdd81d2e9c5f… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Tue Jun 7 10:30:07 2022 +0200 msvcp90: Fix segfault in bad_alloc exception default constructor. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7f1dfd2188a..effe57063a1 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -36,7 +36,7 @@ int* __cdecl __processing_throw(void); #if _MSVCP_VER >= 70 || defined(_MSVCIRT) typedef const char **exception_name; #define EXCEPTION_STR(name) (*name) -#define EXCEPTION_NAME(str) ((exception_name)&str) +#define EXCEPTION_NAME(str) (&str) #else typedef const char *exception_name; #define EXCEPTION_STR(name) (name) @@ -96,7 +96,7 @@ exception* __thiscall exception_copy_ctor(exception *this, const exception *rhs) this->name = rhs->name; this->do_free = FALSE; } else - MSVCP_exception_ctor(this, EXCEPTION_NAME(rhs->name)); + MSVCP_exception_ctor(this, (exception_name)EXCEPTION_NAME(rhs->name)); TRACE("name = %s\n", this->name); return this; } @@ -214,7 +214,7 @@ bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, exception_name name) DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_default_ctor, 4) bad_alloc* __thiscall MSVCP_bad_alloc_default_ctor(bad_alloc *this) { - static const char name[] = "bad allocation"; + static const char *name = "bad allocation"; return MSVCP_bad_alloc_ctor(this, EXCEPTION_NAME(name)); }

1 0

Gabriel Ivăncescu : jscript: Use LIST_FOR_EACH_ENTRY_SAFE to clear Map and Set objects.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: bae77953ed9982db60486c4467199c10a7af6f4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae77953ed9982db60486c44… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jun 6 17:10:11 2022 +0300 jscript: Use LIST_FOR_EACH_ENTRY_SAFE to clear Map and Set objects. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/set.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index d1ea6637956..0ef014b86d0 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -223,6 +223,7 @@ static HRESULT iterate_map(MapInstance *map, script_ctx_t *ctx, unsigned argc, j static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + struct jsval_map_entry *entry, *entry2; MapInstance *map; HRESULT hres; @@ -232,10 +233,8 @@ static HRESULT Map_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned TRACE("%p\n", map); - while(!list_empty(&map->entries)) { - struct jsval_map_entry *entry = LIST_ENTRY(list_head(&map->entries), struct jsval_map_entry, list_entry); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &map->entries, struct jsval_map_entry, list_entry) delete_map_entry(map, entry); - } if(r) *r = jsval_undefined(); return S_OK; @@ -443,6 +442,7 @@ static HRESULT Set_add(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned ar static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + struct jsval_map_entry *entry, *entry2; MapInstance *set; HRESULT hres; @@ -452,10 +452,8 @@ static HRESULT Set_clear(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigned TRACE("%p\n", set); - while(!list_empty(&set->entries)) { - struct jsval_map_entry *entry = LIST_ENTRY(list_head(&set->entries), struct jsval_map_entry, list_entry); + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &set->entries, struct jsval_map_entry, list_entry) delete_map_entry(set, entry); - } if(r) *r = jsval_undefined(); return S_OK;

1 0

Jacek Caban : jscript/tests: Add test for releasing script context objects.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 34aeef628f68d5186761e2e6f91e497eefdce9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34aeef628f68d5186761e2e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 18:03:52 2022 +0200 jscript/tests: Add test for releasing script context objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/run.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index ec054f03d0d..f40ffb3a84e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -114,6 +114,7 @@ DEFINE_EXPECT(testobj_newenum); DEFINE_EXPECT(testobj_getidfail_d); DEFINE_EXPECT(testobj_tolocalestr_d); DEFINE_EXPECT(testobj_tolocalestr_i); +DEFINE_EXPECT(testdestrobj); DEFINE_EXPECT(enumvariant_next_0); DEFINE_EXPECT(enumvariant_next_1); DEFINE_EXPECT(enumvariant_reset); @@ -172,6 +173,7 @@ DEFINE_EXPECT(BindHandler); #define DISPID_GLOBAL_VDATE 0x1023 #define DISPID_GLOBAL_VCY 0x1024 #define DISPID_GLOBAL_TODOWINE 0x1025 +#define DISPID_GLOBAL_TESTDESTROBJ 0x1026 #define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_GLOBAL_TESTNOPROPDELETE 0x2001 @@ -342,6 +344,7 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, else return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*ppv); return S_OK; } @@ -626,6 +629,40 @@ static IDispatchExVtbl testObjVtbl = { static IDispatchEx testObj = { &testObjVtbl }; +static LONG test_destr_ref; + +static ULONG WINAPI testDestrObj_AddRef(IDispatchEx *iface) +{ + return ++test_destr_ref; +} + +static ULONG WINAPI testDestrObj_Release(IDispatchEx *iface) +{ + if (!--test_destr_ref) + CHECK_EXPECT(testdestrobj); + return test_destr_ref; +} + +static IDispatchExVtbl testDestrObjVtbl = { + DispatchEx_QueryInterface, + testDestrObj_AddRef, + testDestrObj_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + DispatchEx_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx testDestrObj = { &testDestrObjVtbl }; + static HRESULT WINAPI dispexFunc_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *res, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1065,6 +1102,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!lstrcmpW(bstrName, L"testDestrObj")) { + *pid = DISPID_GLOBAL_TESTDESTROBJ; + return S_OK; + } + if(strict_dispid_check && lstrcmpW(bstrName, L"t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -1268,6 +1310,22 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_DISPATCH(pvarRes) = (IDispatch*)&testObj; return S_OK; + case DISPID_GLOBAL_TESTDESTROBJ: + ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgvarg, "rgvarg != NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(!pdp->cArgs, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_DISPATCH; + V_DISPATCH(pvarRes) = (IDispatch*)&testDestrObj; + IDispatch_AddRef(V_DISPATCH(pvarRes)); + return S_OK; + case DISPID_GLOBAL_PUREDISP: ok(wFlags == INVOKE_PROPERTYGET, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); @@ -3386,6 +3444,25 @@ static void test_invokeex(void) IActiveScript_Release(script); } +static void test_destructors(void) +{ + IActiveScript *script; + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_EMPTY; + hres = parse_script_expr(L"Math.ref = testDestrObj, isNaN.ref = testDestrObj, true", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + + SET_EXPECT(testdestrobj); + hres = IActiveScript_SetScriptState(script, SCRIPTSTATE_UNINITIALIZED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_UNINITIALIZED) failed: %08lx\n", hres); + CHECK_CALLED(testdestrobj); + + IActiveScript_Release(script); +} + static void test_eval(void) { IActiveScriptParse *parser; @@ -3914,6 +3991,7 @@ static BOOL run_tests(void) test_script_exprs(); test_invokeex(); + test_destructors(); test_eval(); test_error_reports();

1 0

Alexandre Julliard : kernelbase: Implement IsNLSDefinedString().
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 1e52895ef71dfef32d12287e3186f7d3b323c233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e52895ef71dfef32d12287e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 7 15:58:22 2022 +0200 kernelbase: Implement IsNLSDefinedString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/locale.c | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/locale.c | 41 ++++++++++++++++++++++++++++++++ include/winnls.h | 1 + tools/winedump/nls.c | 2 +- 6 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 418aa8f1c92..556156686f2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -989,7 +989,7 @@ @ stdcall -import IsDBCSLeadByteEx(long long) @ stdcall -import IsDebuggerPresent() @ stub -i386 IsLSCallback -# @ stub IsNLSDefinedString +@ stdcall -import IsNLSDefinedString(long long ptr wstr long) @ stdcall -import IsNormalizedString(long wstr long) @ stdcall -import IsProcessInJob(long long ptr) @ stdcall -import IsProcessorFeaturePresent(long) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0edbe388720..9bd922dff98 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -95,6 +95,7 @@ static INT (WINAPI *pFindStringOrdinal)(DWORD, LPCWSTR lpStringSource, INT, LPCW static BOOL (WINAPI *pGetNLSVersion)(NLS_FUNCTION,LCID,NLSVERSIONINFO*); static BOOL (WINAPI *pGetNLSVersionEx)(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX*); static DWORD (WINAPI *pIsValidNLSVersion)(NLS_FUNCTION,LPCWSTR,NLSVERSIONINFOEX*); +static BOOL (WINAPI *pIsNLSDefinedString)(NLS_FUNCTION,DWORD,NLSVERSIONINFO*,const WCHAR *,int); static NTSTATUS (WINAPI *pRtlNormalizeString)(ULONG, LPCWSTR, INT, LPWSTR, INT*); static NTSTATUS (WINAPI *pRtlIsNormalizedString)(ULONG, LPCWSTR, INT, BOOLEAN*); static NTSTATUS (WINAPI *pNtGetNlsSectionPtr)(ULONG,ULONG,void*,void**,SIZE_T*); @@ -146,6 +147,7 @@ static void InitFunctionPointers(void) X(GetNLSVersion); X(GetNLSVersionEx); X(IsValidNLSVersion); + X(IsNLSDefinedString); mod = GetModuleHandleA("kernelbase"); X(NlsValidateLocale); @@ -7750,6 +7752,56 @@ static void test_NLSVersion(void) ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); } else win_skip( "IsValidNLSVersion not available\n" ); + + if (pIsNLSDefinedString) + { + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = sizeof(info); + ret = pIsNLSDefinedString( COMPARE_STRING, 0, (NLSVERSIONINFO *)&info, L"A", 1 ); + if (ret) + ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); + else + ok( broken( GetLastError() == ERROR_INSUFFICIENT_BUFFER ), /* win7 */ + "wrong error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = sizeof(info) + 1; + ret = pIsNLSDefinedString( COMPARE_STRING, 0, (NLSVERSIONINFO *)&info, L"A", 1 ); + ok( !ret, "IsNLSDefinedString succeeded\n" ); + ok( GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + info.dwNLSVersionInfoSize = offsetof( NLSVERSIONINFO, dwEffectiveId ); + ret = pIsNLSDefinedString( COMPARE_STRING, 0, (NLSVERSIONINFO *)&info, L"A", 1 ); + ok( ret, "IsNLSDefinedString failed err %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pIsNLSDefinedString( 2, 0, (NLSVERSIONINFO *)&info, L"A", 1 ); + ok( !ret, "IsNLSDefinedString succeeded\n" ); + ok( GetLastError() == ERROR_INVALID_FLAGS, "wrong error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pIsNLSDefinedString( COMPARE_STRING, 0, (NLSVERSIONINFO *)&info, L"ABC", -10 ); + ok( ret, "IsNLSDefinedString failed err %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pIsNLSDefinedString( COMPARE_STRING, 0, (NLSVERSIONINFO *)&info, L"ABC", -1 ); + ok( ret, "IsNLSDefinedString failed err %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pIsNLSDefinedString( COMPARE_STRING, 0, (NLSVERSIONINFO *)&info, L"\xd800", 1 ); + ok( !ret, "IsNLSDefinedString failed err %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = pIsNLSDefinedString( COMPARE_STRING, 0, (NLSVERSIONINFO *)&info, L"\xd800", -20 ); + ok( !ret, "IsNLSDefinedString failed err %lu\n", GetLastError() ); + ok( GetLastError() == 0xdeadbeef, "wrong error %lu\n", GetLastError() ); + } + else win_skip( "IsNLSDefinedString not available\n" ); } static void test_locale_nls(void) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index d4b5b5d3eb8..1296757b29a 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -892,7 +892,7 @@ # @ stub IsEnclaveTypeSupported # @ stub IsGlobalizationUserSettingsKeyRedirected @ stdcall IsInternetESCEnabled() -@ stub IsNLSDefinedString +@ stdcall IsNLSDefinedString(long long ptr wstr long) @ stdcall IsNormalizedString(long wstr long) # @ stub IsProcessCritical @ stdcall IsProcessInJob(long long ptr) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 4b00ed90408..6995209e30c 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -6430,6 +6430,47 @@ BOOL WINAPI DECLSPEC_HOTPATCH IsValidLocaleName( const WCHAR *locale ) } +/****************************************************************************** + * IsNLSDefinedString (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH IsNLSDefinedString( NLS_FUNCTION func, DWORD flags, NLSVERSIONINFO *info, + const WCHAR *str, int len ) +{ + int i; + + if (func != COMPARE_STRING) + { + SetLastError( ERROR_INVALID_FLAGS ); + return FALSE; + } + if (info) + { + if (info->dwNLSVersionInfoSize != sizeof(*info) && + (info->dwNLSVersionInfoSize != offsetof( NLSVERSIONINFO, dwEffectiveId ))) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + } + + if (len < 0) len = lstrlenW( str ) + 1; + + for (i = 0; i < len; i++) + { + if (is_private_use_area_char( str[i] )) return FALSE; + if (IS_LOW_SURROGATE( str[i] )) return FALSE; + if (IS_HIGH_SURROGATE( str[i] )) + { + if (++i == len) return FALSE; + if (!IS_LOW_SURROGATE( str[i] )) return FALSE; + continue; + } + if (!(get_char_type( CT_CTYPE1, str[i] ) & C1_DEFINED)) return FALSE; + } + return TRUE; +} + + /****************************************************************************** * IsValidNLSVersion (kernelbase.@) */ diff --git a/include/winnls.h b/include/winnls.h index e095cbcda89..d7d3d316509 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -964,6 +964,7 @@ WINNORMALIZEAPI INT WINAPI IdnToNameprepUnicode(DWORD,LPCWSTR,INT,LPWSTR,INT) WINNORMALIZEAPI INT WINAPI IdnToUnicode(DWORD,LPCWSTR,INT,LPWSTR,INT); WINBASEAPI BOOL WINAPI IsDBCSLeadByte(BYTE); WINBASEAPI BOOL WINAPI IsDBCSLeadByteEx(UINT,BYTE); +WINBASEAPI BOOL WINAPI IsNLSDefinedString(NLS_FUNCTION,DWORD,NLSVERSIONINFO*,LPCWSTR,INT); WINNORMALIZEAPI BOOL WINAPI IsNormalizedString(NORM_FORM,LPCWSTR,INT); WINBASEAPI BOOL WINAPI IsValidCodePage(UINT); WINBASEAPI BOOL WINAPI IsValidLanguageGroup(LGRPID,DWORD); diff --git a/tools/winedump/nls.c b/tools/winedump/nls.c index ab628517362..b52518604c8 100644 --- a/tools/winedump/nls.c +++ b/tools/winedump/nls.c @@ -110,7 +110,7 @@ struct ctype static const char *get_ctype( const struct ctype *ctype ) { static char buffer[100]; - static const char *c1[] = { "up ", "lo ", "dg ", "sp ", "pt ", "cl ", "bl ", "xd ", "al " }; + static const char *c1[] = { "up ", "lo ", "dg ", "sp ", "pt ", "cl ", "bl ", "xd ", "al " , "df "}; static const char *c2[] = { " ", "L ", "R ", "EN", "ES", "ET", "AN", "CS", "B ", "S ", "WS", "ON" }; static const char *c3[] = { "ns ", "di ", "vo ", "sy ", "ka ", "hi ", "hw ", "fw ",

1 0

Jacek Caban : wineandroid: Build with msvcrt.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 5e737175573a900fb895491cd64ecbfd93bd988e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e737175573a900fb895491c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 6 22:32:48 2022 +0200 wineandroid: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/Makefile.in | 7 +++---- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/device.c | 11 +++++++---- dlls/wineandroid.drv/dllmain.c | 10 +++++++++- dlls/wineandroid.drv/init.c | 12 +++++++++++- dlls/wineandroid.drv/keyboard.c | 4 ++++ dlls/wineandroid.drv/opengl.c | 4 ++++ dlls/wineandroid.drv/unixlib.h | 3 ++- dlls/wineandroid.drv/window.c | 15 ++++++++++----- 9 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index 4c4b63d2e78..a56ef3dc290 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,9 +1,8 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineandroid.drv -IMPORTS = user32 ntoskrnl win32u -EXTRALIBS = $(PTHREAD_LIBS) - -EXTRADLLFLAGS = -mcygwin +UNIXLIB = wineandroid.so +IMPORTS = ntoskrnl +EXTRALIBS = -lwin32u $(PTHREAD_LIBS) C_SRCS = \ device.c \ diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 22652f11d27..57f566b3cfd 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -120,6 +120,8 @@ extern NTSTATUS android_java_init( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS android_java_uninit( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS android_register_window( void *arg ) DECLSPEC_HIDDEN; extern PNTAPCFUNC register_window_callback; +extern NTSTATUS (WINAPI *pNtWaitForMultipleObjects)( ULONG,const HANDLE*,BOOLEAN, + BOOLEAN,const LARGE_INTEGER* ) DECLSPEC_HIDDEN; extern unsigned int screen_width DECLSPEC_HIDDEN; extern unsigned int screen_height DECLSPEC_HIDDEN; diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index fa11e0d071e..62bcbae72f3 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <assert.h> @@ -1174,10 +1178,9 @@ NTSTATUS android_java_uninit( void *arg ) void start_android_device(void) { - /* FIXME: use KeUserModeCallback instead */ - NTSTATUS (WINAPI *func)(void *, ULONG) = - ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[client_start_device]; - func( NULL, 0 ); + void *ret_ptr; + ULONG ret_len; + thread = ULongToHandle( KeUserModeCallback( client_start_device, NULL, 0, &ret_ptr, &ret_len )); } diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index 79b3c2c62a4..81581591770 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -32,6 +32,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(android); +static unixlib_handle_t unix_handle; +static NTSTATUS (CDECL *unix_call)( enum android_funcs code, void *params ); + extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); static HANDLE stop_event; static HANDLE thread; @@ -122,13 +125,18 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) if (reason == DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls( inst ); + if (NtQueryVirtualMemory( GetCurrentProcess(), inst, MemoryWineUnixFuncs, + &unix_handle, sizeof(unix_handle), NULL )) + return FALSE; params.register_window_callback = register_window_callback; - if (ANDROID_CALL( init, &params )) return FALSE; + params.pNtWaitForMultipleObjects = NtWaitForMultipleObjects; + if (__wine_unix_call( unix_handle, unix_init, &params )) return FALSE; callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; callback_table[client_start_device] = android_start_device; + unix_call = params.unix_call; return TRUE; } diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 527eda7a241..170ccb064a7 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -18,6 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #define NONAMELESSSTRUCT #define NONAMELESSUNION #include "config.h" @@ -558,6 +562,10 @@ JavaVM **p_java_vm = NULL; jobject *p_java_object = NULL; unsigned short *p_java_gdt_sel = NULL; +static NTSTATUS CDECL unix_call( enum android_funcs code, void *params ); +NTSTATUS (WINAPI *pNtWaitForMultipleObjects)( ULONG,const HANDLE*,BOOLEAN, + BOOLEAN,const LARGE_INTEGER* ); + static HRESULT android_init( void *arg ) { struct init_params *params = arg; @@ -603,6 +611,8 @@ static HRESULT android_init( void *arg ) #endif } __wine_set_user_driver( &android_drv_funcs, WINE_GDI_DRIVER_VERSION ); + pNtWaitForMultipleObjects = params->pNtWaitForMultipleObjects; + params->unix_call = unix_call; return STATUS_SUCCESS; } @@ -621,7 +631,7 @@ C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); /* FIXME: Use __wine_unix_call instead */ -NTSTATUS unix_call( enum android_funcs code, void *params ) +static NTSTATUS CDECL unix_call( enum android_funcs code, void *params ) { return __wine_unix_call_funcs[code]( params ); } diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index e92079c0f59..82035cc14dd 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -26,6 +26,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT diff --git a/dlls/wineandroid.drv/opengl.c b/dlls/wineandroid.drv/opengl.c index d7026be6599..911f6e3f3d1 100644 --- a/dlls/wineandroid.drv/opengl.c +++ b/dlls/wineandroid.drv/opengl.c @@ -24,6 +24,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #include "config.h" #include <assert.h> diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h index 8a94bb1253a..92d28176ee7 100644 --- a/dlls/wineandroid.drv/unixlib.h +++ b/dlls/wineandroid.drv/unixlib.h @@ -31,13 +31,14 @@ enum android_funcs }; /* FIXME: Use __wine_unix_call when the rest of the stack is ready */ -extern NTSTATUS unix_call( enum android_funcs func, void *arg ) DECLSPEC_HIDDEN; #define ANDROID_CALL(func, params) unix_call( unix_ ## func, params ) /* android_init params */ struct init_params { PNTAPCFUNC register_window_callback; + NTSTATUS (WINAPI *pNtWaitForMultipleObjects)( ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER* ); + NTSTATUS (CDECL *unix_call)( enum android_funcs code, void *params ); }; diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 3860e0a2772..c580a36c828 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -20,6 +20,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep unix +#endif + #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -1164,14 +1168,15 @@ static const struct static int get_cursor_system_id( const ICONINFOEXW *info ) { const struct system_cursors *cursors; + const WCHAR *module; unsigned int i; - HMODULE module; if (info->szResName[0]) return 0; /* only integer resources are supported here */ - if (!(module = GetModuleHandleW( info->szModName ))) return 0; + if ((module = wcsrchr( info->szModName, '\\' ))) module++; + else module = info->szModName; for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) - if (GetModuleHandleW( module_cursors[i].name ) == module) break; + if (!wcsicmp( module, module_cursors[i].name )) break; if (i == ARRAY_SIZE( module_cursors )) return 0; cursors = module_cursors[i].cursors; @@ -1207,8 +1212,8 @@ NTSTATUS ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles if (current_event) mask = 0; if (process_events( mask )) return count - 1; } - return NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), - !!(flags & MWMO_ALERTABLE), timeout ); + return pNtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), + !!(flags & MWMO_ALERTABLE), timeout ); } /**********************************************************************

1 0

Jacek Caban : win32u: Use public name for SetThreadDpiAwarenessContext.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: 84bed157e82a8c49d200645bcc780f0f83c93016 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84bed157e82a8c49d200645b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 6 22:52:39 2022 +0200 win32u: Use public name for SetThreadDpiAwarenessContext. To allow using it in drivers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/dce.c | 16 ++++++++-------- dlls/win32u/message.c | 6 +++--- dlls/win32u/sysparams.c | 6 ++++-- dlls/win32u/win32u_private.h | 1 - dlls/win32u/window.c | 28 ++++++++++++++-------------- 5 files changed, 29 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84bed157e82a8c49d200…

1 0

Jacek Caban : wineandroid: Use unixlib interface for register_window_callback.
by Alexandre Julliard June 7, 2022

June 7, 2022

Module: wine Branch: master Commit: ca4c6716771b7c083892f3dfed95272bfe388223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca4c6716771b7c083892f3df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 01:50:48 2022 +0200 wineandroid: Use unixlib interface for register_window_callback. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/device.c | 16 +++++++++------- dlls/wineandroid.drv/dllmain.c | 12 +++++++++++- dlls/wineandroid.drv/init.c | 6 ++++++ dlls/wineandroid.drv/unixlib.h | 17 +++++++++++++++++ 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index c73ab6bc765..22652f11d27 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -118,6 +118,8 @@ extern NTSTATUS android_create_desktop( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS android_dispatch_ioctl( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS android_java_init( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS android_java_uninit( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS android_register_window( void *arg ) DECLSPEC_HIDDEN; +extern PNTAPCFUNC register_window_callback; extern unsigned int screen_width DECLSPEC_HIDDEN; extern unsigned int screen_height DECLSPEC_HIDDEN; diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index b49b691b27a..fa11e0d071e 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -516,21 +516,22 @@ static struct native_win_data *create_native_win_data( HWND hwnd, BOOL opengl ) return data; } -static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3 ) +NTSTATUS android_register_window( void *arg ) { - HWND hwnd = (HWND)arg1; - struct ANativeWindow *win = (struct ANativeWindow *)arg2; - BOOL opengl = arg3; + struct register_window_params *params = arg; + HWND hwnd = (HWND)params->arg1; + struct ANativeWindow *win = (struct ANativeWindow *)params->arg2; + BOOL opengl = params->arg3; struct native_win_data *data = get_native_win_data( hwnd, opengl ); - if (!win) return; /* do nothing and hold on to the window until we get a new surface */ + if (!win) return 0; /* do nothing and hold on to the window until we get a new surface */ if (!data || data->parent == win) { pANativeWindow_release( win ); if (data) NtUserPostMessage( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); TRACE( "%p -> %p win %p (unchanged)\n", hwnd, data, win ); - return; + return 0; } release_native_window( data ); @@ -543,12 +544,13 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR unwrap_java_call(); NtUserPostMessage( hwnd, WM_ANDROID_REFRESH, opengl, 0 ); TRACE( "%p -> %p win %p\n", hwnd, data, win ); + return 0; } /* register a native window received from the Java side for use in ioctls */ void register_native_window( HWND hwnd, struct ANativeWindow *win, BOOL opengl ) { - NtQueueApcThread( thread, register_native_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, opengl ); + NtQueueApcThread( thread, register_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, opengl ); } void init_gralloc( const struct hw_module_t *module ) diff --git a/dlls/wineandroid.drv/dllmain.c b/dlls/wineandroid.drv/dllmain.c index 37539fa5756..79b3c2c62a4 100644 --- a/dlls/wineandroid.drv/dllmain.c +++ b/dlls/wineandroid.drv/dllmain.c @@ -104,17 +104,27 @@ static NTSTATUS WINAPI android_start_device(void *param, ULONG size) } +static void CALLBACK register_window_callback( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3 ) +{ + struct register_window_params params = { .arg1 = arg1, .arg2 = arg2, .arg3 = arg3 }; + ANDROID_CALL( register_window, &params ); +} + + /*********************************************************************** * dll initialisation routine */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) { + struct init_params params; void **callback_table; if (reason == DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls( inst ); - if (ANDROID_CALL( init, NULL )) return FALSE; + + params.register_window_callback = register_window_callback; + if (ANDROID_CALL( init, &params )) return FALSE; callback_table = NtCurrentTeb()->Peb->KernelCallbackTable; callback_table[client_start_device] = android_start_device; diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index b5f0b69fcec..527eda7a241 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -48,6 +48,8 @@ static RECT monitor_rc_work; static int device_init_done; static BOOL force_display_devices_refresh; +PNTAPCFUNC register_window_callback; + typedef struct { struct gdi_physdev dev; @@ -558,6 +560,7 @@ unsigned short *p_java_gdt_sel = NULL; static HRESULT android_init( void *arg ) { + struct init_params *params = arg; pthread_mutexattr_t attr; jclass class; jobject object; @@ -581,6 +584,8 @@ static HRESULT android_init( void *arg ) pthread_mutex_init( &win_data_mutex, &attr ); pthread_mutexattr_destroy( &attr ); + register_window_callback = params->register_window_callback; + if ((java_vm = *p_java_vm)) /* running under Java */ { #ifdef __i386__ @@ -608,6 +613,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = android_init, android_java_init, android_java_uninit, + android_register_window, }; diff --git a/dlls/wineandroid.drv/unixlib.h b/dlls/wineandroid.drv/unixlib.h index 2838047f4fe..8a94bb1253a 100644 --- a/dlls/wineandroid.drv/unixlib.h +++ b/dlls/wineandroid.drv/unixlib.h @@ -26,6 +26,7 @@ enum android_funcs unix_init, unix_java_init, unix_java_uninit, + unix_register_window, unix_funcs_count }; @@ -33,6 +34,13 @@ enum android_funcs extern NTSTATUS unix_call( enum android_funcs func, void *arg ) DECLSPEC_HIDDEN; #define ANDROID_CALL(func, params) unix_call( unix_ ## func, params ) +/* android_init params */ +struct init_params +{ + PNTAPCFUNC register_window_callback; +}; + + /* android_ioctl params */ struct ioctl_params { @@ -41,6 +49,15 @@ struct ioctl_params }; +/* android_register_window params */ +struct register_window_params +{ + UINT_PTR arg1; + UINT_PTR arg2; + UINT_PTR arg3; +}; + + enum { client_start_device = NtUserDriverCallbackFirst,

1 0