May 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : wineandroid: Add an initial GDI driver.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: e5069b1017359253ff2c5444c251d24b9e6682c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5069b1017359253ff2c5444c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 10:58:55 2017 +0200 wineandroid: Add an initial GDI driver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 6 + dlls/wineandroid.drv/init.c | 239 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 4 +- 3 files changed, 248 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5069b1017359253ff2c5…

1 0

Hugh McMaster : regedit: Update handling of the 'Delete' menu item.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 4144847aa59aa71b2c26bc05af2b0a63fb4d3f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4144847aa59aa71b2c26bc05a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 31 13:07:15 2017 +0000 regedit: Update handling of the 'Delete' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 3fd048b..f63b1e1 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -132,6 +132,25 @@ update: SetMenuItemInfoW(hMenu, ID_TREE_EXPAND_COLLAPSE, FALSE, &info); } +static void update_delete_item(HMENU hMenu, WCHAR *keyName) +{ + unsigned int state = MF_ENABLED; + + if (!g_pChildWnd->nFocusPanel) + { + if (!keyName || !*keyName) + state = MF_GRAYED; + } + else + { + if (SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)) == -1) + state = MF_GRAYED; + } + + EnableMenuItem(hMenu, ID_EDIT_DELETE, state | MF_BYCOMMAND); +} + static void UpdateMenuItems(HMENU hMenu) { HWND hwndTV = g_pChildWnd->hTreeWnd; BOOL bAllowEdit = FALSE; @@ -147,7 +166,7 @@ static void UpdateMenuItems(HMENU hMenu) { update_expand_or_collapse_item(hwndTV, selection, hMenu); EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - EnableMenuItem(hMenu, ID_EDIT_DELETE, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); + update_delete_item(hMenu, keyName); EnableMenuItem(hMenu, ID_EDIT_RENAME, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE,

1 0

Józef Kucia : d3d11: Partially implement d3d11_device_CheckFormatSupport() on top of wined3d_check_device_format().
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 9fe0764a0e588291dec66fcfcb6a6abf5a9aa456 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fe0764a0e588291dec66fcfc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 31 11:43:19 2017 +0200 d3d11: Partially implement d3d11_device_CheckFormatSupport() on top of wined3d_check_device_format(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/d3d11/tests/d3d11.c | 16 +++++++------- 2 files changed, 61 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8966460..fcf5d10 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3318,9 +3318,60 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_OpenSharedResource(ID3D11Device *i static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device *iface, DXGI_FORMAT format, UINT *format_support) { - FIXME("iface %p, format %u, format_support %p stub!\n", iface, format, format_support); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct wined3d_device_creation_parameters params; + enum wined3d_format_id wined3d_format; + struct wined3d *wined3d; + unsigned int i; - return E_NOTIMPL; + static const const struct + { + enum wined3d_resource_type rtype; + unsigned int usage; + D3D11_FORMAT_SUPPORT flag; + } + flag_mapping[] = + { + {WINED3D_RTYPE_TEXTURE_2D, WINED3DUSAGE_TEXTURE, D3D11_FORMAT_SUPPORT_TEXTURE2D}, + {WINED3D_RTYPE_TEXTURE_3D, WINED3DUSAGE_TEXTURE, D3D11_FORMAT_SUPPORT_TEXTURE3D}, + {WINED3D_RTYPE_NONE, WINED3DUSAGE_RENDERTARGET, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, + {WINED3D_RTYPE_NONE, WINED3DUSAGE_DEPTHSTENCIL, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, + }; + HRESULT hr; + + FIXME("iface %p, format %u, format_support %p partial-stub!\n", iface, format, format_support); + + wined3d_format = wined3dformat_from_dxgi_format(format); + if (format && !wined3d_format) + { + WARN("Invalid format %#x.\n", format); + *format_support = 0; + return E_FAIL; + } + + *format_support = 0; + + wined3d_mutex_lock(); + wined3d = wined3d_device_get_wined3d(device->wined3d_device); + wined3d_device_get_creation_parameters(device->wined3d_device, &params); + for (i = 0; i < ARRAY_SIZE(flag_mapping); ++i) + { + hr = wined3d_check_device_format(wined3d, params.adapter_idx, params.device_type, + WINED3DFMT_UNKNOWN, flag_mapping[i].usage, flag_mapping[i].rtype, wined3d_format); + if (hr == WINED3DERR_NOTAVAILABLE || hr == WINED3DOK_NOAUTOGEN) + continue; + if (hr != WINED3D_OK) + { + WARN("Failed to check device format support, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return E_FAIL; + } + + *format_support |= flag_mapping[i].flag; + } + wined3d_mutex_unlock(); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CheckMultisampleQualityLevels(ID3D11Device *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b160977..84ffe4e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14046,7 +14046,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE if (formats[i].fl_required <= feature_level) { - ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", + todo_wine ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); continue; } @@ -14071,6 +14071,7 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) ID3D11Device *device; DXGI_FORMAT format; ULONG refcount; + UINT support; HRESULT hr; static const struct format_support index_buffers[] = @@ -14087,20 +14088,19 @@ static void test_required_format_support(const D3D_FEATURE_LEVEL feature_level) return; } + support = 0xdeadbeef; + hr = ID3D11Device_CheckFormatSupport(device, ~0u, &support); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!support, "Got unexpected format support %#x.\n", support); + memset(format_support, 0, sizeof(format_support)); for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) { hr = ID3D11Device_CheckFormatSupport(device, format, &format_support[format]); - todo_wine ok(hr == S_OK || (hr == E_FAIL && !format_support[format]), + ok(hr == S_OK || (hr == E_FAIL && !format_support[format]), "Got unexpected result for format %#x: hr %#x, format_support %#x.\n", format, hr, format_support[format]); } - if (hr == E_NOTIMPL) - { - skip("CheckFormatSupport not implemented.\n"); - ID3D11Device_Release(device); - return; - } check_format_support(format_support, feature_level, index_buffers, ARRAY_SIZE(index_buffers),

1 0

Józef Kucia : wined3d: Extend wined3d_check_device_format() to allow querying general format support.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 9128ec0bce04a862faf5f09d20fc9dbb7e72bdd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9128ec0bce04a862faf5f09d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 31 11:43:18 2017 +0200 wined3d: Extend wined3d_check_device_format() to allow querying general format support. For D3D10+. When WINED3D_RTYPE_NONE is passed the wined3d_check_device_format() function checks if a format is supported for all reasonable resource types for a given usage. For now render target and depth stencil support can be queried using this method. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 68 ++++++++++++++++++++++++++++++-------------------- dlls/wined3d/utils.c | 1 + include/wine/wined3d.h | 1 + 3 files changed, 43 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e6cefbd..9614e16 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5236,9 +5236,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad const struct wined3d_format *adapter_format = wined3d_get_format(gl_info, adapter_format_id, WINED3DUSAGE_RENDERTARGET); const struct wined3d_format *format = wined3d_get_format(gl_info, check_format_id, usage); + enum wined3d_gl_resource_type gl_type, gl_type_end; DWORD format_flags = 0; DWORD allowed_usage; - enum wined3d_gl_resource_type gl_type; TRACE("wined3d %p, adapter_idx %u, device_type %s, adapter_format %s, usage %s, %s, " "resource_type %s, check_format %s.\n", @@ -5251,6 +5251,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad switch (resource_type) { + case WINED3D_RTYPE_NONE: + allowed_usage = WINED3DUSAGE_DEPTHSTENCIL + | WINED3DUSAGE_RENDERTARGET; + gl_type = WINED3D_GL_RES_TYPE_TEX_2D; + gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; + break; + case WINED3D_RTYPE_TEXTURE_2D: allowed_usage = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_RENDERTARGET @@ -5265,7 +5272,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - gl_type = WINED3D_GL_RES_TYPE_RB; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_RB; break; } allowed_usage |= WINED3DUSAGE_AUTOGENMIPMAP @@ -5279,11 +5286,11 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; - gl_type = WINED3D_GL_RES_TYPE_TEX_2D; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_2D; if (usage & WINED3DUSAGE_LEGACY_CUBEMAP) { allowed_usage &= ~(WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_QUERY_LEGACYBUMPMAP); - gl_type = WINED3D_GL_RES_TYPE_TEX_CUBE; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_CUBE; } else if ((usage & WINED3DUSAGE_DEPTHSTENCIL) && (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SHADOW) @@ -5304,7 +5311,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; - gl_type = WINED3D_GL_RES_TYPE_TEX_3D; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; default: @@ -5334,39 +5341,46 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) format_flags |= WINED3DFMT_FLAG_BUMPMAP; - if ((format->flags[gl_type] & format_flags) != format_flags) - { - TRACE("Requested format flags %#x, but format %s only has %#x.\n", - format_flags, debug_d3dformat(check_format_id), format->flags[gl_type]); - return WINED3DERR_NOTAVAILABLE; - } - if ((format_flags & WINED3DFMT_FLAG_TEXTURE) && (wined3d->flags & WINED3D_NO3D)) { TRACE("Requested texturing support, but wined3d was created with WINED3D_NO3D.\n"); return WINED3DERR_NOTAVAILABLE; } - if ((usage & WINED3DUSAGE_DEPTHSTENCIL) - && !CheckDepthStencilCapability(adapter, adapter_format, format, gl_type)) + if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !gl_info->supported[SGIS_GENERATE_MIPMAP]) { - TRACE("Requested WINED3DUSAGE_DEPTHSTENCIL, but format %s is not supported for depth / stencil buffers.\n", - debug_d3dformat(check_format_id)); - return WINED3DERR_NOTAVAILABLE; + TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); + return WINED3DOK_NOAUTOGEN; } - if ((usage & WINED3DUSAGE_RENDERTARGET) - && !CheckRenderTargetCapability(adapter, adapter_format, format, gl_type)) + for (; gl_type <= gl_type_end; ++gl_type) { - TRACE("Requested WINED3DUSAGE_RENDERTARGET, but format %s is not supported for render targets.\n", - debug_d3dformat(check_format_id)); - return WINED3DERR_NOTAVAILABLE; - } + if ((format->flags[gl_type] & format_flags) != format_flags) + { + TRACE("Requested format flags %#x, but format %s only has %#x.\n", + format_flags, debug_d3dformat(check_format_id), format->flags[gl_type]); + return WINED3DERR_NOTAVAILABLE; + } - if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !gl_info->supported[SGIS_GENERATE_MIPMAP]) - { - TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); - return WINED3DOK_NOAUTOGEN; + if ((usage & WINED3DUSAGE_RENDERTARGET) + && !CheckRenderTargetCapability(adapter, adapter_format, format, gl_type)) + { + TRACE("Requested WINED3DUSAGE_RENDERTARGET, but format %s is not supported for render targets.\n", + debug_d3dformat(check_format_id)); + return WINED3DERR_NOTAVAILABLE; + } + + /* 3D depth / stencil textures are never supported. */ + if (usage == WINED3DUSAGE_DEPTHSTENCIL && gl_type == WINED3D_GL_RES_TYPE_TEX_3D) + continue; + + if ((usage & WINED3DUSAGE_DEPTHSTENCIL) + && !CheckDepthStencilCapability(adapter, adapter_format, format, gl_type)) + { + TRACE("Requested WINED3DUSAGE_DEPTHSTENCIL, but format %s is not supported for depth / stencil buffers.\n", + debug_d3dformat(check_format_id)); + return WINED3DERR_NOTAVAILABLE; + } } return WINED3D_OK; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2af75bf..79c322f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4120,6 +4120,7 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) switch (resource_type) { #define WINED3D_TO_STR(x) case x: return #x + WINED3D_TO_STR(WINED3D_RTYPE_NONE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_2D); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8697fbf..8ead497 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -670,6 +670,7 @@ enum wined3d_texture_filter_type enum wined3d_resource_type { + WINED3D_RTYPE_NONE = 0, WINED3D_RTYPE_BUFFER = 1, WINED3D_RTYPE_TEXTURE_2D = 2, WINED3D_RTYPE_TEXTURE_3D = 3,

1 0

Henri Verbeet : wined3d: Validate parameter lengths in shader_sm4_read_param() (AFL).
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: a61cfe0fd776cc84131901941a597c1147a605f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a61cfe0fd776cc84131901941… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 31 11:07:05 2017 +0200 wined3d: Validate parameter lengths in shader_sm4_read_param() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 07e206a..142c0f8 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1370,8 +1370,14 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p enum wined3d_shader_src_modifier *modifier) { enum wined3d_sm4_register_type register_type; - DWORD token = *(*ptr)++; - DWORD order; + DWORD token, order; + + if (*ptr >= end) + { + WARN("Invalid ptr %p >= end %p.\n", *ptr, end); + return FALSE; + } + token = *(*ptr)++; register_type = (token & WINED3D_SM4_REGISTER_TYPE_MASK) >> WINED3D_SM4_REGISTER_TYPE_SHIFT; if (register_type >= sizeof(register_type_table) / sizeof(*register_type_table) @@ -1388,7 +1394,14 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p if (token & WINED3D_SM4_REGISTER_MODIFIER) { - DWORD m = *(*ptr)++; + DWORD m; + + if (*ptr >= end) + { + WARN("Invalid ptr %p >= end %p.\n", *ptr, end); + return FALSE; + } + m = *(*ptr)++; switch (m) { @@ -1453,12 +1466,22 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p { case WINED3D_SM4_IMMCONST_SCALAR: param->immconst_type = WINED3D_IMMCONST_SCALAR; + if (end - *ptr < 1) + { + WARN("Invalid ptr %p, end %p.\n", *ptr, end); + return FALSE; + } memcpy(param->u.immconst_data, *ptr, 1 * sizeof(DWORD)); *ptr += 1; break; case WINED3D_SM4_IMMCONST_VEC4: param->immconst_type = WINED3D_IMMCONST_VEC4; + if (end - *ptr < 4) + { + WARN("Invalid ptr %p, end %p.\n", *ptr, end); + return FALSE; + } memcpy(param->u.immconst_data, *ptr, 4 * sizeof(DWORD)); *ptr += 4; break;

1 0

Henri Verbeet : wined3d: Validate parameter lengths in shader_sm4_read_src_param() (AFL).
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 986adeef963d14df6e4a2b586f338c52292c2c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=986adeef963d14df6e4a2b586… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 31 11:07:04 2017 +0200 wined3d: Validate parameter lengths in shader_sm4_read_src_param() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a1b30e5..07e206a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -508,7 +508,7 @@ static const enum wined3d_data_type data_type_table[] = /* WINED3D_SM4_DATA_FLOAT */ WINED3D_DATA_FLOAT, }; -static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD **ptr, +static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum wined3d_data_type data_type, struct wined3d_shader_src_param *src_param); static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum wined3d_data_type data_type, struct wined3d_shader_dst_param *dst_param); @@ -517,7 +517,7 @@ static void shader_sm4_read_conditional_op(struct wined3d_shader_instruction *in DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_src_param(priv, &tokens, WINED3D_DATA_UINT, &priv->src_param[0]); + shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_UINT, &priv->src_param[0]); ins->flags = (opcode_token & WINED3D_SM4_CONDITIONAL_NZ) ? WINED3D_SHADER_CONDITIONAL_OP_NZ : WINED3D_SHADER_CONDITIONAL_OP_Z; } @@ -596,7 +596,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct wined3d_shader_instructio DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_src_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.src); + shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_FLOAT, &ins->declaration.src); if (opcode_token & WINED3D_SM4_INDEX_TYPE_MASK) ins->flags |= WINED3DSI_INDEXED_DYNAMIC; } @@ -723,7 +723,7 @@ static void shader_sm5_read_fcall(struct wined3d_shader_instruction *ins, struct wined3d_sm4_data *priv) { priv->src_param[0].reg.u.fp_body_idx = *tokens++; - shader_sm4_read_src_param(priv, &tokens, WINED3D_DATA_OPAQUE, &priv->src_param[0]); + shader_sm4_read_src_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_OPAQUE, &priv->src_param[0]); } static void shader_sm5_read_dcl_function_body(struct wined3d_shader_instruction *ins, @@ -1337,7 +1337,7 @@ static void shader_sm4_read_header(void *data, const DWORD **ptr, struct wined3d *shader_version = priv->shader_version; } -static BOOL shader_sm4_read_reg_idx(struct wined3d_sm4_data *priv, const DWORD **ptr, +static BOOL shader_sm4_read_reg_idx(struct wined3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, DWORD addressing, struct wined3d_shader_register_index *reg_idx) { if (addressing & WINED3D_SM4_ADDRESSING_RELATIVE) @@ -1354,7 +1354,7 @@ static BOOL shader_sm4_read_reg_idx(struct wined3d_sm4_data *priv, const DWORD * reg_idx->offset = *(*ptr)++; else reg_idx->offset = 0; - shader_sm4_read_src_param(priv, ptr, WINED3D_DATA_INT, rel_addr); + shader_sm4_read_src_param(priv, ptr, end, WINED3D_DATA_INT, rel_addr); } else { @@ -1365,7 +1365,7 @@ static BOOL shader_sm4_read_reg_idx(struct wined3d_sm4_data *priv, const DWORD * return TRUE; } -static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **ptr, +static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum wined3d_data_type data_type, struct wined3d_shader_register *param, enum wined3d_shader_src_modifier *modifier) { @@ -1422,7 +1422,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p else { DWORD addressing = (token & WINED3D_SM4_ADDRESSING_MASK0) >> WINED3D_SM4_ADDRESSING_SHIFT0; - if (!(shader_sm4_read_reg_idx(priv, ptr, addressing, &param->idx[0]))) + if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[0]))) { ERR("Failed to read register index.\n"); return FALSE; @@ -1434,7 +1434,7 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p else { DWORD addressing = (token & WINED3D_SM4_ADDRESSING_MASK1) >> WINED3D_SM4_ADDRESSING_SHIFT1; - if (!(shader_sm4_read_reg_idx(priv, ptr, addressing, &param->idx[1]))) + if (!(shader_sm4_read_reg_idx(priv, ptr, end, addressing, &param->idx[1]))) { ERR("Failed to read register index.\n"); return FALSE; @@ -1474,12 +1474,19 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p return TRUE; } -static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD **ptr, +static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum wined3d_data_type data_type, struct wined3d_shader_src_param *src_param) { - DWORD token = **ptr; + DWORD token; + + if (*ptr >= end) + { + WARN("Invalid ptr %p >= end %p.\n", *ptr, end); + return FALSE; + } + token = **ptr; - if (!shader_sm4_read_param(priv, ptr, data_type, &src_param->reg, &src_param->modifiers)) + if (!shader_sm4_read_param(priv, ptr, end, data_type, &src_param->reg, &src_param->modifiers)) { ERR("Failed to read parameter.\n"); return FALSE; @@ -1531,7 +1538,7 @@ static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD } token = **ptr; - if (!shader_sm4_read_param(priv, ptr, data_type, &dst_param->reg, &modifier)) + if (!shader_sm4_read_param(priv, ptr, end, data_type, &dst_param->reg, &modifier)) { ERR("Failed to read parameter.\n"); return FALSE; @@ -1683,7 +1690,8 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi for (i = 0; i < ins->src_count; ++i) { - if (!(shader_sm4_read_src_param(priv, &p, map_data_type(opcode_info->src_info[i]), &priv->src_param[i]))) + if (!(shader_sm4_read_src_param(priv, &p, *ptr, map_data_type(opcode_info->src_info[i]), + &priv->src_param[i]))) { ins->handler_idx = WINED3DSIH_TABLE_SIZE; return;

1 0

Henri Verbeet : wined3d: Validate parameter lengths in shader_sm4_read_dst_param() (AFL).
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: a5b4dedaddbf612daf3eaf263bb4bbc8bf447e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b4dedaddbf612daf3eaf263… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 31 11:07:03 2017 +0200 wined3d: Validate parameter lengths in shader_sm4_read_dst_param() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 48 ++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a9fedbc..a1b30e5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -510,7 +510,7 @@ static const enum wined3d_data_type data_type_table[] = static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD **ptr, enum wined3d_data_type data_type, struct wined3d_shader_src_param *src_param); -static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD **ptr, +static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum wined3d_data_type data_type, struct wined3d_shader_dst_param *dst_param); static void shader_sm4_read_conditional_op(struct wined3d_shader_instruction *ins, @@ -571,7 +571,7 @@ static void shader_sm4_read_dcl_resource(struct wined3d_shader_instruction *ins, ins->declaration.semantic.resource_type = resource_type_table[resource_type]; } reg_data_type = opcode == WINED3D_SM4_OP_DCL_RESOURCE ? WINED3D_DATA_RESOURCE : WINED3D_DATA_UAV; - shader_sm4_read_dst_param(priv, &tokens, reg_data_type, &ins->declaration.semantic.reg); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], reg_data_type, &ins->declaration.semantic.reg); components = *tokens++; if ((components & 0xfff0) != (components & 0xf) * 0x1110) @@ -608,14 +608,15 @@ static void shader_sm4_read_dcl_sampler(struct wined3d_shader_instruction *ins, ins->flags = (opcode_token & WINED3D_SM4_SAMPLER_MODE_MASK) >> WINED3D_SM4_SAMPLER_MODE_SHIFT; if (ins->flags & ~WINED3D_SM4_SAMPLER_COMPARISON) FIXME("Unhandled sampler mode %#x.\n", ins->flags); - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_SAMPLER, &ins->declaration.dst); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_SAMPLER, &ins->declaration.dst); } static void shader_sm4_read_dcl_index_range(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_OPAQUE, &ins->declaration.index_range.first_register); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_OPAQUE, + &ins->declaration.index_range.first_register); ins->declaration.index_range.last_register = *tokens; } @@ -671,14 +672,15 @@ static void shader_sm4_read_declaration_dst(struct wined3d_shader_instruction *i DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.dst); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_FLOAT, &ins->declaration.dst); } static void shader_sm4_read_declaration_register_semantic(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.register_semantic.reg); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_FLOAT, + &ins->declaration.register_semantic.reg); ins->declaration.register_semantic.sysval_semantic = *tokens; } @@ -687,7 +689,7 @@ static void shader_sm4_read_dcl_input_ps(struct wined3d_shader_instruction *ins, struct wined3d_sm4_data *priv) { ins->flags = (opcode_token & WINED3D_SM4_INTERPOLATION_MODE_MASK) >> WINED3D_SM4_INTERPOLATION_MODE_SHIFT; - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.dst); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_FLOAT, &ins->declaration.dst); } static void shader_sm4_read_dcl_input_ps_siv(struct wined3d_shader_instruction *ins, @@ -695,7 +697,8 @@ static void shader_sm4_read_dcl_input_ps_siv(struct wined3d_shader_instruction * struct wined3d_sm4_data *priv) { ins->flags = (opcode_token & WINED3D_SM4_INTERPOLATION_MODE_MASK) >> WINED3D_SM4_INTERPOLATION_MODE_SHIFT; - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.register_semantic.reg); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_FLOAT, + &ins->declaration.register_semantic.reg); ins->declaration.register_semantic.sysval_semantic = *tokens; } @@ -801,7 +804,7 @@ static void shader_sm5_read_dcl_uav_raw(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_UAV, &ins->declaration.dst); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_UAV, &ins->declaration.dst); ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; } @@ -809,7 +812,8 @@ static void shader_sm5_read_dcl_uav_structured(struct wined3d_shader_instruction DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_UAV, &ins->declaration.structured_resource.reg); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_UAV, + &ins->declaration.structured_resource.reg); ins->flags = (opcode_token & WINED3D_SM5_UAV_FLAGS_MASK) >> WINED3D_SM5_UAV_FLAGS_SHIFT; ins->declaration.structured_resource.byte_stride = *tokens; if (ins->declaration.structured_resource.byte_stride % 4) @@ -820,7 +824,7 @@ static void shader_sm5_read_dcl_tgsm_raw(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_raw.reg); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_FLOAT, &ins->declaration.tgsm_raw.reg); ins->declaration.tgsm_raw.byte_count = *tokens; if (ins->declaration.tgsm_raw.byte_count % 4) FIXME("Byte count %u is not multiple of 4.\n", ins->declaration.tgsm_raw.byte_count); @@ -830,7 +834,8 @@ static void shader_sm5_read_dcl_tgsm_structured(struct wined3d_shader_instructio DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_FLOAT, &ins->declaration.tgsm_structured.reg); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_FLOAT, + &ins->declaration.tgsm_structured.reg); ins->declaration.tgsm_structured.byte_stride = *tokens++; ins->declaration.tgsm_structured.structure_count = *tokens; if (ins->declaration.tgsm_structured.byte_stride % 4) @@ -841,7 +846,8 @@ static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instru DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.structured_resource.reg); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_RESOURCE, + &ins->declaration.structured_resource.reg); ins->declaration.structured_resource.byte_stride = *tokens; if (ins->declaration.structured_resource.byte_stride % 4) FIXME("Byte stride %u is not multiple of 4.\n", ins->declaration.structured_resource.byte_stride); @@ -851,7 +857,7 @@ static void shader_sm5_read_dcl_resource_raw(struct wined3d_shader_instruction * DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { - shader_sm4_read_dst_param(priv, &tokens, WINED3D_DATA_RESOURCE, &ins->declaration.dst); + shader_sm4_read_dst_param(priv, &tokens, &tokens[token_count], WINED3D_DATA_RESOURCE, &ins->declaration.dst); } static void shader_sm5_read_sync(struct wined3d_shader_instruction *ins, @@ -1512,11 +1518,18 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD return TRUE; } -static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD **ptr, +static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD **ptr, const DWORD *end, enum wined3d_data_type data_type, struct wined3d_shader_dst_param *dst_param) { enum wined3d_shader_src_modifier modifier; - DWORD token = **ptr; + DWORD token; + + if (*ptr >= end) + { + WARN("Invalid ptr %p >= end %p.\n", *ptr, end); + return FALSE; + } + token = **ptr; if (!shader_sm4_read_param(priv, ptr, data_type, &dst_param->reg, &modifier)) { @@ -1659,7 +1672,8 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi for (i = 0; i < ins->dst_count; ++i) { - if (!(shader_sm4_read_dst_param(priv, &p, map_data_type(opcode_info->dst_info[i]), &priv->dst_param[i]))) + if (!(shader_sm4_read_dst_param(priv, &p, *ptr, map_data_type(opcode_info->dst_info[i]), + &priv->dst_param[i]))) { ins->handler_idx = WINED3DSIH_TABLE_SIZE; return;

1 0

Alexandre Julliard : wineandroid: Add an event queue to support handling Java callbacks in the desktop thread.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 5be4a0e38842d2fa241ca769ce4d50e4eb55c68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5be4a0e38842d2fa241ca769c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 11:49:12 2017 +0200 wineandroid: Add an event queue to support handling Java callbacks in the desktop thread. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 18 ++++ dlls/wineandroid.drv/window.c | 168 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 2 + 3 files changed, 188 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index ab4a431..9fefb11 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -57,6 +57,24 @@ extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; /* JNI entry points */ extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; +enum event_type +{ + DESKTOP_CHANGED, +}; + +union event_data +{ + enum event_type type; + struct + { + enum event_type type; + unsigned int width; + unsigned int height; + } desktop; +}; + +int send_event( const union event_data *data ); + extern JavaVM *wine_get_java_vm(void); extern jobject wine_get_java_object(void); diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index e7c83b0..cf35215 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -44,6 +44,7 @@ #include "wine/unicode.h" #include "android.h" +#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(android); @@ -133,6 +134,35 @@ static void release_win_data( struct android_win_data *data ) } +/* Handling of events coming from the Java side */ + +struct java_event +{ + struct list entry; + union event_data data; +}; + +static struct list event_queue = LIST_INIT( event_queue ); +static struct java_event *current_event; +static int event_pipe[2]; +static DWORD desktop_tid; + +/*********************************************************************** + * send_event + */ +int send_event( const union event_data *data ) +{ + int res; + + if ((res = write( event_pipe[1], data, sizeof(*data) )) != sizeof(*data)) + { + p__android_log_print( ANDROID_LOG_ERROR, "wine", "failed to send event" ); + return -1; + } + return 0; +} + + /*********************************************************************** * desktop_changed * @@ -140,7 +170,145 @@ static void release_win_data( struct android_win_data *data ) */ void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) { + union event_data data; + + memset( &data, 0, sizeof(data) ); + data.type = DESKTOP_CHANGED; + data.desktop.width = width; + data.desktop.height = height; p__android_log_print( ANDROID_LOG_INFO, "wine", "desktop_changed: %ux%u", width, height ); + send_event( &data ); +} + + +/*********************************************************************** + * init_event_queue + */ +static void init_event_queue(void) +{ + HANDLE handle; + int ret; + + if (pipe2( event_pipe, O_CLOEXEC | O_NONBLOCK ) == -1) + { + ERR( "could not create data\n" ); + ExitProcess(1); + } + if (wine_server_fd_to_handle( event_pipe[0], GENERIC_READ | SYNCHRONIZE, 0, &handle )) + { + ERR( "Can't allocate handle for event fd\n" ); + ExitProcess(1); + } + SERVER_START_REQ( set_queue_fd ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + if (ret) + { + ERR( "Can't store handle for event fd %x\n", ret ); + ExitProcess(1); + } + CloseHandle( handle ); + desktop_tid = GetCurrentThreadId(); +} + + +/*********************************************************************** + * pull_events + * + * Pull events from the event pipe and add them to the queue + */ +static void pull_events(void) +{ + struct java_event *event; + int res; + + for (;;) + { + if (!(event = HeapAlloc( GetProcessHeap(), 0, sizeof(*event) ))) break; + + res = read( event_pipe[0], &event->data, sizeof(event->data) ); + if (res != sizeof(event->data)) break; + list_add_tail( &event_queue, &event->entry ); + } + HeapFree( GetProcessHeap(), 0, event ); +} + + +/*********************************************************************** + * process_events + */ +static int process_events( DWORD mask ) +{ + struct java_event *event, *next, *previous; + unsigned int count = 0; + + assert( GetCurrentThreadId() == desktop_tid ); + + pull_events(); + + previous = current_event; + + LIST_FOR_EACH_ENTRY_SAFE( event, next, &event_queue, struct java_event, entry ) + { + if (!(mask & QS_SENDMESSAGE)) continue; /* skip it */ + + /* remove it first, in case we process events recursively */ + list_remove( &event->entry ); + current_event = event; + + switch (event->data.type) + { + case DESKTOP_CHANGED: + TRACE( "DESKTOP_CHANGED %ux%u\n", event->data.desktop.width, event->data.desktop.height ); + screen_width = event->data.desktop.width; + screen_height = event->data.desktop.height; + init_monitors( screen_width, screen_height ); + SetWindowPos( GetDesktopWindow(), 0, 0, 0, screen_width, screen_height, + SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); + break; + + default: + FIXME( "got event %u\n", event->data.type ); + } + HeapFree( GetProcessHeap(), 0, event ); + count++; + } + current_event = previous; + return count; +} + + +/*********************************************************************** + * ANDROID_MsgWaitForMultipleObjectsEx + */ +DWORD CDECL ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, + DWORD timeout, DWORD mask, DWORD flags ) +{ + if (GetCurrentThreadId() == desktop_tid) + { + /* don't process nested events */ + if (current_event) mask = 0; + if (process_events( mask )) return count - 1; + } + return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, + timeout, flags & MWMO_ALERTABLE ); +} + +/********************************************************************** + * ANDROID_CreateWindow + */ +BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) +{ + TRACE( "%p\n", hwnd ); + + if (hwnd == GetDesktopWindow()) + { + init_event_queue(); + } + return TRUE; } diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index b94c9f8..49402a8 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -6,6 +6,8 @@ @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo +@ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow +@ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

1 0

Alexandre Julliard : wineandroid: Register a JNI callback for reporting desktop size changes.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 77d55905b1ee712d09e0e3ce7d6ddde46bde4cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d55905b1ee712d09e0e3ce7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 11:47:49 2017 +0200 wineandroid: Register a JNI callback for reporting desktop size changes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 13 ++++++++ dlls/wineandroid.drv/init.c | 68 ++++++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 11 +++++++ 3 files changed, 92 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 7c708f3..ab4a431 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdlib.h> #include <jni.h> +#include <android/log.h> #include "windef.h" #include "winbase.h" @@ -34,6 +35,15 @@ /************************************************************************** + * Android interface + */ + +#define DECL_FUNCPTR(f) extern typeof(f) * p##f DECLSPEC_HIDDEN +DECL_FUNCPTR( __android_log_print ); +#undef DECL_FUNCPTR + + +/************************************************************************** * USER driver */ @@ -44,6 +54,9 @@ extern MONITORINFOEXW default_monitor DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; +/* JNI entry points */ +extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; + extern JavaVM *wine_get_java_vm(void); extern jobject wine_get_java_object(void); diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 3a3ce80..406edf9 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -385,3 +385,71 @@ const struct gdi_dc_funcs * CDECL ANDROID_get_gdi_driver( unsigned int version ) } return &android_drv_funcs; } + + +static const JNINativeMethod methods[] = +{ + { "wine_desktop_changed", "(II)V", desktop_changed }, +}; + +#define DECL_FUNCPTR(f) typeof(f) * p##f = NULL +#define LOAD_FUNCPTR(lib, func) do { \ + if ((p##func = wine_dlsym( lib, #func, NULL, 0 )) == NULL) \ + { ERR( "can't find symbol %s\n", #func); return; } \ + } while(0) + +DECL_FUNCPTR( __android_log_print ); + +static void load_android_libs(void) +{ + void *liblog; + char error[1024]; + + if (!(liblog = wine_dlopen( "liblog.so", RTLD_GLOBAL, error, sizeof(error) ))) + { + ERR( "failed to load liblog.so: %s\n", error ); + return; + } + LOAD_FUNCPTR( liblog, __android_log_print ); +} + +#undef DECL_FUNCPTR +#undef LOAD_FUNCPTR + +static BOOL process_attach(void) +{ + jclass class; + jobject object = wine_get_java_object(); + JNIEnv *jni_env; + JavaVM *java_vm; + + if ((java_vm = wine_get_java_vm())) /* running under Java */ + { +#ifdef __i386__ + WORD old_fs = wine_get_fs(); +#endif + load_android_libs(); + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); + class = (*jni_env)->GetObjectClass( jni_env, object ); + (*jni_env)->RegisterNatives( jni_env, class, methods, sizeof(methods)/sizeof(methods[0]) ); + (*jni_env)->DeleteLocalRef( jni_env, class ); +#ifdef __i386__ + wine_set_fs( old_fs ); /* the Java VM hijacks %fs for its own purposes, restore it */ +#endif + } + return TRUE; +} + +/*********************************************************************** + * dll initialisation routine + */ +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( inst ); + return process_attach(); + } + return TRUE; +} diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index f874458..e7c83b0 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -134,6 +134,17 @@ static void release_win_data( struct android_win_data *data ) /*********************************************************************** + * desktop_changed + * + * JNI callback, runs in the context of the Java thread. + */ +void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) +{ + p__android_log_print( ANDROID_LOG_INFO, "wine", "desktop_changed: %ux%u", width, height ); +} + + +/*********************************************************************** * ANDROID_DestroyWindow */ void CDECL ANDROID_DestroyWindow( HWND hwnd )

1 0

Alexandre Julliard : wineandroid: Add support for storing per-window driver information.
by Alexandre Julliard May 31, 2017

May 31, 2017

Module: wine Branch: master Commit: 2ecca0100817c3bf3c3d93b3ecb41e073621bcdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecca0100817c3bf3c3d93b3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 31 11:22:20 2017 +0200 wineandroid: Add support for storing per-window driver information. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 3 +- dlls/wineandroid.drv/window.c | 233 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 3 + 3 files changed, 238 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index dd3ad19..f83d494 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -2,7 +2,8 @@ MODULE = wineandroid.drv IMPORTS = user32 gdi32 C_SRCS = \ - init.c + init.c \ + window.c IN_SRCS = \ build.gradle.in diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c new file mode 100644 index 0000000..f874458 --- /dev/null +++ b/dlls/wineandroid.drv/window.c @@ -0,0 +1,233 @@ +/* + * Window related functions + * + * Copyright 1993, 1994, 1995, 1996, 2001, 2013-2017 Alexandre Julliard + * Copyright 1993 David Metcalfe + * Copyright 1995, 1996 Alex Korobka + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <fcntl.h> +#include <poll.h> +#include <errno.h> +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "wine/unicode.h" + +#include "android.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(android); + +/* private window data */ +struct android_win_data +{ + HWND hwnd; /* hwnd that this private data belongs to */ + HWND parent; /* parent hwnd for child windows */ + RECT window_rect; /* USER window rectangle relative to parent */ + RECT whole_rect; /* X window rectangle for the whole window relative to parent */ + RECT client_rect; /* client area relative to parent */ +}; + +#define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) + +static CRITICAL_SECTION win_data_section; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &win_data_section, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": win_data_section") } +}; +static CRITICAL_SECTION win_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + +static struct android_win_data *win_data_context[32768]; + +static inline int context_idx( HWND hwnd ) +{ + return LOWORD( hwnd ) >> 1; +} + + +/*********************************************************************** + * alloc_win_data + */ +static struct android_win_data *alloc_win_data( HWND hwnd ) +{ + struct android_win_data *data; + + if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) + { + data->hwnd = hwnd; + EnterCriticalSection( &win_data_section ); + win_data_context[context_idx(hwnd)] = data; + } + return data; +} + + +/*********************************************************************** + * free_win_data + */ +static void free_win_data( struct android_win_data *data ) +{ + win_data_context[context_idx( data->hwnd )] = NULL; + LeaveCriticalSection( &win_data_section ); + HeapFree( GetProcessHeap(), 0, data ); +} + + +/*********************************************************************** + * get_win_data + * + * Lock and return the data structure associated with a window. + */ +static struct android_win_data *get_win_data( HWND hwnd ) +{ + struct android_win_data *data; + + if (!hwnd) return NULL; + EnterCriticalSection( &win_data_section ); + if ((data = win_data_context[context_idx(hwnd)]) && data->hwnd == hwnd) return data; + LeaveCriticalSection( &win_data_section ); + return NULL; +} + + +/*********************************************************************** + * release_win_data + * + * Release the data returned by get_win_data. + */ +static void release_win_data( struct android_win_data *data ) +{ + if (data) LeaveCriticalSection( &win_data_section ); +} + + +/*********************************************************************** + * ANDROID_DestroyWindow + */ +void CDECL ANDROID_DestroyWindow( HWND hwnd ) +{ + struct android_win_data *data; + + if (!(data = get_win_data( hwnd ))) return; + + free_win_data( data ); +} + + +/*********************************************************************** + * create_win_data + * + * Create a data window structure for an existing window. + */ +static struct android_win_data *create_win_data( HWND hwnd, const RECT *window_rect, + const RECT *client_rect ) +{ + struct android_win_data *data; + HWND parent; + + if (!(parent = GetAncestor( hwnd, GA_PARENT ))) return NULL; /* desktop or HWND_MESSAGE */ + + if (parent != GetDesktopWindow()) + { + if (!(data = get_win_data( parent )) && + !(data = create_win_data( parent, NULL, NULL ))) + return NULL; + release_win_data( data ); + } + + if (!(data = alloc_win_data( hwnd ))) return NULL; + + data->parent = (parent == GetDesktopWindow()) ? 0 : parent; + + if (window_rect) + { + data->whole_rect = data->window_rect = *window_rect; + data->client_rect = *client_rect; + } + else + { + GetWindowRect( hwnd, &data->window_rect ); + MapWindowPoints( 0, parent, (POINT *)&data->window_rect, 2 ); + data->whole_rect = data->window_rect; + GetClientRect( hwnd, &data->client_rect ); + MapWindowPoints( hwnd, parent, (POINT *)&data->client_rect, 2 ); + } + return data; +} + + +/*********************************************************************** + * ANDROID_WindowPosChanging + */ +void CDECL ANDROID_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flags, + const RECT *window_rect, const RECT *client_rect, RECT *visible_rect, + struct window_surface **surface ) +{ + struct android_win_data *data = get_win_data( hwnd ); + + TRACE( "win %p window %s client %s style %08x flags %08x\n", + hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), + GetWindowLongW( hwnd, GWL_STYLE ), swp_flags ); + + if (!data && !(data = create_win_data( hwnd, window_rect, client_rect ))) return; + + *visible_rect = *window_rect; + + release_win_data( data ); +} + + +/*********************************************************************** + * ANDROID_WindowPosChanged + */ +void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags, + const RECT *window_rect, const RECT *client_rect, + const RECT *visible_rect, const RECT *valid_rects, + struct window_surface *surface ) +{ + struct android_win_data *data; + DWORD new_style = GetWindowLongW( hwnd, GWL_STYLE ); + + if (!(data = get_win_data( hwnd ))) return; + + data->window_rect = *window_rect; + data->whole_rect = *visible_rect; + data->client_rect = *client_rect; + + release_win_data( data ); + + TRACE( "win %p window %s client %s style %08x flags %08x\n", + hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), new_style, swp_flags ); +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 1723bd4..b94c9f8 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -6,3 +6,6 @@ @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo +@ cdecl DestroyWindow(long) ANDROID_DestroyWindow +@ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging +@ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged

1 0