February 2015 - Wine-commits

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_DrawBitmap().
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 2f2e1b98fd285e76352a4d9b922d1eeb17535fcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2e1b98fd285e76352a4d9b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 6 09:57:02 2015 +0100 d2d1: Implement d2d_d3d_render_target_DrawBitmap(). --- dlls/d2d1/render_target.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 3d9abb8..f109849 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -709,8 +709,62 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget ID2D1Bitmap *bitmap, const D2D1_RECT_F *dst_rect, float opacity, D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode, const D2D1_RECT_F *src_rect) { - FIXME("iface %p, bitmap %p, dst_rect %p, opacity %.8e, interpolation_mode %#x, src_rect %p stub!\n", + D2D1_BITMAP_BRUSH_PROPERTIES bitmap_brush_desc; + D2D1_BRUSH_PROPERTIES brush_desc; + ID2D1BitmapBrush *brush; + D2D1_RECT_F s, d; + HRESULT hr; + + TRACE("iface %p, bitmap %p, dst_rect %p, opacity %.8e, interpolation_mode %#x, src_rect %p.\n", iface, bitmap, dst_rect, opacity, interpolation_mode, src_rect); + + if (src_rect) + { + s = *src_rect; + } + else + { + D2D1_SIZE_F size; + + size = ID2D1Bitmap_GetSize(bitmap); + s.left = 0.0f; + s.top = 0.0f; + s.right = size.width; + s.bottom = size.height; + } + + if (dst_rect) + { + d = *dst_rect; + } + else + { + d.left = 0.0f; + d.top = 0.0f; + d.right = s.right - s.left; + d.bottom = s.bottom - s.top; + } + + bitmap_brush_desc.extendModeX = D2D1_EXTEND_MODE_CLAMP; + bitmap_brush_desc.extendModeY = D2D1_EXTEND_MODE_CLAMP; + bitmap_brush_desc.interpolationMode = interpolation_mode; + + brush_desc.opacity = opacity; + brush_desc.transform._11 = (d.right - d.left) / (s.right - s.left); + brush_desc.transform._21 = 0.0f; + brush_desc.transform._31 = d.left; + brush_desc.transform._12 = 0.0f; + brush_desc.transform._22 = (d.bottom - d.top) / (s.bottom - s.top); + brush_desc.transform._32 = d.top; + + if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush))) + { + ERR("Failed to create bitmap brush, hr %#x.\n", hr); + return; + } + + ID2D1RenderTarget_FillRectangle(iface, &d, (ID2D1Brush *)brush); + ID2D1BitmapBrush_Release(brush); } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawText(ID2D1RenderTarget *iface,

1 0

Stefan Dösinger : wined3d: Check the d3d buffer to find converted attributes.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: da5041eb4b3fc4bab7f6aef2a4b091a58c39f36a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5041eb4b3fc4bab7f6aef2a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Feb 6 10:46:48 2015 +0100 wined3d: Check the d3d buffer to find converted attributes. This fixes some tests with ARB shaders that were broken since 1360af6adcbc5c77a7b3c5e32f3c886e450456f5. When buffer_internal_preload is called by context_update_stream_info, si->elements[i].data is not yet set. --- dlls/wined3d/buffer.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2fba83b..f2a22b0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -266,7 +266,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *This, #define WINED3D_BUFFER_FIXUP_XYZRHW 0x02 static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) + const struct wined3d_state *state, UINT attrib_idx, DWORD fixup_flags, DWORD *stride_this_run) { const struct wined3d_stream_info_element *attrib = &si->elements[attrib_idx]; enum wined3d_format_id format; @@ -276,7 +276,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win * there, on nonexistent attribs the vbo is 0. */ if (!(si->use_map & (1 << attrib_idx)) - || attrib->data.buffer_object != This->buffer_object) + || state->streams[attrib->stream_idx].buffer != This) return FALSE; format = attrib->format->id; @@ -304,7 +304,7 @@ static BOOL buffer_check_attribute(struct wined3d_buffer *This, const struct win } static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_stream_info *si, - DWORD fixup_flags) + const struct wined3d_state *state, DWORD fixup_flags) { UINT stride_this_run = 0; BOOL ret = FALSE; @@ -378,31 +378,31 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This, const struct wined3d_s * texcoord needs no conversion while a FLOAT4 positiont needs one */ - ret = buffer_check_attribute(This, si, WINED3D_FFP_POSITION, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_POSITION, fixup_flags, &stride_this_run) || ret; fixup_flags &= ~WINED3D_BUFFER_FIXUP_XYZRHW; - ret = buffer_check_attribute(This, si, WINED3D_FFP_NORMAL, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_NORMAL, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_DIFFUSE, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_DIFFUSE, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_SPECULAR, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_SPECULAR, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD0, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD0, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD1, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD1, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD2, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD2, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD3, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD3, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD4, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD4, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD5, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD5, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD6, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD6, fixup_flags, &stride_this_run) || ret; - ret = buffer_check_attribute(This, si, WINED3D_FFP_TEXCOORD7, + ret = buffer_check_attribute(This, si, state, WINED3D_FFP_TEXCOORD7, fixup_flags, &stride_this_run) || ret; if (!stride_this_run && This->conversion_map) @@ -767,7 +767,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; } - decl_changed = buffer_find_decl(buffer, &context->stream_info, fixup_flags); + decl_changed = buffer_find_decl(buffer, &context->stream_info, state, fixup_flags); buffer->flags |= WINED3D_BUFFER_HASDESC; }

1 0

Jacek Caban : jscript: Pass 'this' as jsdisp_t to getters.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: d541b525e40b9ff0c1f654dff95c6f70ae2de02b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d541b525e40b9ff0c1f654dff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 6 12:09:40 2015 +0100 jscript: Pass 'this' as jsdisp_t to getters. --- dlls/jscript/array.c | 21 +++++++++++++-------- dlls/jscript/date.c | 11 ++++++++--- dlls/jscript/dispex.c | 6 +----- dlls/jscript/function.c | 24 +++++++++++++----------- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/jsregexp.c | 45 ++++++++++++++++++++++++--------------------- dlls/jscript/number.c | 11 ++++++++--- dlls/jscript/object.c | 2 +- dlls/jscript/string.c | 15 ++++++++++----- 9 files changed, 80 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d541b525e40b9ff0c1f65…

1 0

Jacek Caban : jscript: Pass 'this' as jsdisp_t to setters.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 131640377058a35f392a352fd45b2760f4a4b20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=131640377058a35f392a352fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 6 12:09:47 2015 +0100 jscript: Pass 'this' as jsdisp_t to setters. --- dlls/jscript/array.c | 4 ++-- dlls/jscript/dispex.c | 11 +++-------- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 4 ++-- dlls/jscript/jsregexp.c | 12 ++++++------ dlls/jscript/string.c | 2 +- 6 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 6092555..a005309 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -126,9 +126,9 @@ static HRESULT Array_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) return S_OK; } -static HRESULT Array_set_length(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT Array_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { - ArrayInstance *This = array_from_vdisp(jsthis); + ArrayInstance *This = array_from_jsdisp(jsthis); DOUBLE len = -1; DWORD i; HRESULT hres; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6f225da..40e1749 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -470,14 +470,9 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServi switch(prop->type) { case PROP_BUILTIN: - if(prop->u.p->setter) { - vdisp_t vthis; + if(prop->u.p->setter) + return prop->u.p->setter(This->ctx, This, val); - set_jsdisp(&vthis, This); - hres = prop->u.p->setter(This->ctx, &vthis, val); - vdisp_release(&vthis); - return hres; - } if(prop->u.p->setter) { FIXME("getter with no setter\n"); return E_FAIL; @@ -512,7 +507,7 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, IServi return S_OK; } -HRESULT builtin_set_const(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +HRESULT builtin_set_const(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { TRACE("%p %s\n", jsthis, debugstr_jsval(value)); return S_OK; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ec610cf..0ac6c61 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -375,7 +375,7 @@ static HRESULT Function_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return S_OK; } -static HRESULT Function_set_length(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT Function_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9dd772b..3cfc4ba 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -188,9 +188,9 @@ static inline jsdisp_t *get_jsdisp(vdisp_t *vdisp) typedef HRESULT (*builtin_invoke_t)(script_ctx_t*,vdisp_t*,WORD,unsigned,jsval_t*,jsval_t*); typedef HRESULT (*builtin_getter_t)(script_ctx_t*,jsdisp_t*,jsval_t*); -typedef HRESULT (*builtin_setter_t)(script_ctx_t*,vdisp_t*,jsval_t); +typedef HRESULT (*builtin_setter_t)(script_ctx_t*,jsdisp_t*,jsval_t); -HRESULT builtin_set_const(script_ctx_t*,vdisp_t*,jsval_t) DECLSPEC_HIDDEN; +HRESULT builtin_set_const(script_ctx_t*,jsdisp_t*,jsval_t) DECLSPEC_HIDDEN; typedef struct { const WCHAR *name; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index ed3d0b1..402b527 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -256,7 +256,7 @@ static HRESULT RegExp_get_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT RegExp_set_source(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; @@ -268,7 +268,7 @@ static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return E_NOTIMPL; } -static HRESULT RegExp_set_global(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; @@ -280,7 +280,7 @@ static HRESULT RegExp_get_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_ return E_NOTIMPL; } -static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; @@ -292,7 +292,7 @@ static HRESULT RegExp_get_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return E_NOTIMPL; } -static HRESULT RegExp_set_multiline(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_multiline(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("\n"); return E_NOTIMPL; @@ -322,9 +322,9 @@ static HRESULT RegExp_get_lastIndex(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t return jsval_copy(regexp->last_index_val, r); } -static HRESULT RegExp_set_lastIndex(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT RegExp_set_lastIndex(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { - RegExpInstance *regexp = regexp_from_vdisp(jsthis); + RegExpInstance *regexp = regexp_from_jsdisp(jsthis); HRESULT hres; TRACE("\n"); diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 3f83675..73de517 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -121,7 +121,7 @@ static HRESULT String_get_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r return S_OK; } -static HRESULT String_set_length(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t value) +static HRESULT String_set_length(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) { FIXME("%p\n", jsthis); return E_NOTIMPL;

1 0

Jacek Caban : jscript: Fixed handling VT_VARIANT|VY_BYREF types.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: a1543a3f7b0eafe67ff52e72a6d4c367c57d8944 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1543a3f7b0eafe67ff52e72a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 6 12:10:00 2015 +0100 jscript: Fixed handling VT_VARIANT|VY_BYREF types. --- dlls/jscript/jsutils.c | 3 +++ dlls/jscript/tests/run.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 20e659c..85f573f 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -246,6 +246,9 @@ HRESULT jsval_copy(jsval_t v, jsval_t *r) HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) { + if(V_VT(var) == (VT_VARIANT|VT_BYREF)) + var = V_VARIANTREF(var); + switch(V_VT(var)) { case VT_EMPTY: *r = jsval_undefined(); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 2044789..97799db 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1211,7 +1211,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[5]; + VARIANT args[6], v; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1249,6 +1249,10 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_UNKNOWN(args+3) = NULL; V_VT(args+4) = VT_UI4; V_UI4(args+4) = 0xffffffff; + V_VT(args+5) = VT_BYREF|VT_VARIANT; + V_VARIANTREF(args+5) = &v; + V_VT(&v) = VT_I4; + V_I4(&v) = 2; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); ok(hres == S_OK, "Invoke failed: %08x\n", hres); @@ -2412,14 +2416,16 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(ui4,nullunk,d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(i4ref,ui4,nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" " ok(getVT(nullunk) === 'VT_DISPATCH', 'getVT(nullunk) = ' + getVT(nullunk));" " ok(nullunk === null, 'nullunk !== null');" - " ok(getVT(ui4) === 'VT_R8', 'getVT(s) = ' + getVT(s));" + " ok(getVT(ui4) === 'VT_R8', 'getVT(ui4) = ' + getVT(ui4));" " ok(ui4 > 0, 'ui4 = ' + ui4);" + " ok(getVT(i4ref) === 'VT_I4', 'getVT(i4ref) = ' + getVT(i4ref));" + " ok(i4ref === 2, 'i4ref = ' + i4ref);" "});"); CHECK_CALLED(global_testargtypes_i);

1 0

Austin English : cryptui: Add CryptUIDlgSelectCertificateFromStore stub.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 5ed719d590adbb17d72d200e04f8b2a319ae1e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed719d590adbb17d72d200e0… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 5 16:24:00 2015 -0600 cryptui: Add CryptUIDlgSelectCertificateFromStore stub. --- dlls/cryptui/cryptui.spec | 2 +- dlls/cryptui/main.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/cryptui/cryptui.spec b/dlls/cryptui/cryptui.spec index bce5de0..c4b579a 100644 --- a/dlls/cryptui/cryptui.spec +++ b/dlls/cryptui/cryptui.spec @@ -3,7 +3,7 @@ 3 stub CryptUIDlgFreeCAContext 4 stub CryptUIDlgSelectCA 5 stdcall CryptUIDlgSelectCertificateA(ptr) -6 stub CryptUIDlgSelectCertificateFromStore +6 stdcall CryptUIDlgSelectCertificateFromStore(ptr ptr wstr wstr long long ptr) 7 stdcall CryptUIDlgSelectCertificateW(ptr) 8 stdcall CryptUIDlgSelectStoreA(ptr) 9 stdcall CryptUIDlgSelectStoreW(ptr) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 0aea379..9f76456 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -7049,3 +7049,11 @@ PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateA(PCCRYPTUI_SELECTCERTIFICATE_S FIXME("%p: stub\n", pcsc); return NULL; } + +PCCERT_CONTEXT WINAPI CryptUIDlgSelectCertificateFromStore(HCERTSTORE hCertStore, HWND hwnd, LPCWSTR pwszTitle, + LPCWSTR pwszDisplayString, DWORD dwDontUseColumn, + DWORD dwFlags, void *pvReserved) +{ + FIXME("%p %p %s %s %d %d %p: stub\n", hCertStore, hwnd, debugstr_w(pwszTitle), debugstr_w(pwszDisplayString), dwDontUseColumn, dwFlags, pvReserved); + return NULL; +}

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 31e588b73ef6909e72f2e7fd93bd0131e9f6152b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31e588b73ef6909e72f2e7fd9… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Feb 5 22:21:46 2015 +0100 po: Update German translation. --- po/de.po | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/po/de.po b/po/de.po index 50e98e4..bf6e069 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-10-06 21:51+0200\n" +"PO-Revision-Date: 2015-02-05 22:22+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -13175,20 +13175,16 @@ msgid "&Test Sound" msgstr "Sound &testen" #: winecfg.rc:275 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Wine-Konfiguration" +msgstr "Lautsprecher-Konfiguration" #: winecfg.rc:276 -#, fuzzy -#| msgid "De&vice:" msgid "Device:" -msgstr "Ge&rät:" +msgstr "Gerät:" #: winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "Lautsprecher:" #: winecfg.rc:286 msgid "Appearance" @@ -13288,29 +13284,27 @@ msgstr "(Kein)" #: winecfg.rc:86 msgid "Audio test failed!" -msgstr "Festplattenreset fehlgeschlagen!" +msgstr "Audiotest fehlgeschlagen!" #: winecfg.rc:88 msgid "(System default)" -msgstr "(System Standard)" +msgstr "(Systemstandard)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 Surround" #: winecfg.rc:90 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "Grafik" +msgstr "Quadrofon" #: winecfg.rc:91 msgid "Stereo" -msgstr "" +msgstr "Stereo" #: winecfg.rc:92 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid ""

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 4dd4d0b30a7bb261b12a843ec5f452aaa88f0a9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dd4d0b30a7bb261b12a843ec… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Feb 5 19:18:15 2015 +0200 po: Update Finnish translation. --- po/fi.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/fi.po b/po/fi.po index 12d117e..c609240 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13060,20 +13060,16 @@ msgid "&Test Sound" msgstr "&Testiääni" #: winecfg.rc:275 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Winen asetukset" +msgstr "Kaiutinasetukset" #: winecfg.rc:276 -#, fuzzy -#| msgid "De&vice:" msgid "Device:" -msgstr "Lai&te:" +msgstr "Laite:" #: winecfg.rc:278 msgid "Speakers:" -msgstr "" +msgstr "Kaiuttimet:" #: winecfg.rc:286 msgid "Appearance" @@ -13181,21 +13177,19 @@ msgstr "(Järjestelmän oletus)" #: winecfg.rc:89 msgid "5.1 Surround" -msgstr "" +msgstr "5.1 Surround" #: winecfg.rc:90 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "kuva" +msgstr "Neliääninen" #: winecfg.rc:91 msgid "Stereo" -msgstr "" +msgstr "Stereo" #: winecfg.rc:92 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid ""

1 0

Charles Davis : ntdll: Support 64-bit Mac OS.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: 97bda9a05f50018d551776e0801c6604bde3f329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bda9a05f50018d551776e08… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 5 13:28:58 2015 -0700 ntdll: Support 64-bit Mac OS. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_x86_64.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 20 ++++++++++++--- include/winnt.h | 2 +- 4 files changed, 81 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 51de6e7..9355d04 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -146,7 +146,7 @@ @ stdcall NtCreateTimer(ptr long ptr long) @ stub NtCreateToken # @ stub NtCreateWaitablePort -@ stdcall -arch=win32,arm64 NtCurrentTeb() +@ stdcall NtCurrentTeb() # @ stub NtDebugActiveProcess # @ stub NtDebugContinue @ stdcall NtDelayExecution(long ptr) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 05581c2..c71069d 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -236,6 +236,39 @@ static inline int arch_prctl( int func, void *ptr ) { return syscall( __NR_arch_ #define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) #define FPU_sig(context) ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs)) +#elif defined (__APPLE__) +static pthread_key_t teb_key; + +#define RAX_sig(context) ((context)->uc_mcontext->__ss.__rax) +#define RBX_sig(context) ((context)->uc_mcontext->__ss.__rbx) +#define RCX_sig(context) ((context)->uc_mcontext->__ss.__rcx) +#define RDX_sig(context) ((context)->uc_mcontext->__ss.__rdx) +#define RSI_sig(context) ((context)->uc_mcontext->__ss.__rsi) +#define RDI_sig(context) ((context)->uc_mcontext->__ss.__rdi) +#define RBP_sig(context) ((context)->uc_mcontext->__ss.__rbp) +#define R8_sig(context) ((context)->uc_mcontext->__ss.__r8) +#define R9_sig(context) ((context)->uc_mcontext->__ss.__r9) +#define R10_sig(context) ((context)->uc_mcontext->__ss.__r10) +#define R11_sig(context) ((context)->uc_mcontext->__ss.__r11) +#define R12_sig(context) ((context)->uc_mcontext->__ss.__r12) +#define R13_sig(context) ((context)->uc_mcontext->__ss.__r13) +#define R14_sig(context) ((context)->uc_mcontext->__ss.__r14) +#define R15_sig(context) ((context)->uc_mcontext->__ss.__r15) + +#define CS_sig(context) ((context)->uc_mcontext->__ss.__cs) +#define FS_sig(context) ((context)->uc_mcontext->__ss.__fs) +#define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) + +#define EFL_sig(context) ((context)->uc_mcontext->__ss.__rflags) + +#define RIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rip)) +#define RSP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rsp)) + +#define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) +#define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) + +#define FPU_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->__fs.__fpu_fcw) + #else #error You must define the signal context functions for your platform #endif @@ -2506,6 +2539,12 @@ void signal_free_thread( TEB *teb ) NtFreeVirtualMemory( NtCurrentProcess(), (void **)&teb, &size, MEM_RELEASE ); } +#ifdef __APPLE__ +static void init_teb_key(void) +{ + pthread_key_create( &teb_key, NULL ); +} +#endif /********************************************************************** * signal_init_thread @@ -2515,12 +2554,20 @@ void signal_init_thread( TEB *teb ) const WORD fpu_cw = 0x27f; stack_t ss; +#ifdef __APPLE__ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; +#endif + #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); #elif defined(__NetBSD__) sysarch( X86_64_SET_GSBASE, &teb ); +#elif defined (__APPLE__) + /* FIXME: Actually setting %gs needs support from the OS */ + pthread_once( &init_once, init_teb_key ); + pthread_setspecific( teb_key, teb ); #else # error Please define setting %gs for your architecture #endif @@ -3425,4 +3472,19 @@ __ASM_STDCALL_FUNC( DbgBreakPoint, 0, "int $3; ret") */ __ASM_STDCALL_FUNC( DbgUserBreakPoint, 0, "int $3; ret") +/********************************************************************** + * NtCurrentTeb (NTDLL.@) + * + * FIXME: This isn't exported from NTDLL on real NT. This should be + * removed if and when we can set the GSBASE MSR on Mac OS X. + */ +#ifdef __APPLE__ +TEB * WINAPI NtCurrentTeb(void) +{ + return pthread_getspecific( teb_key ); +} +#else +__ASM_STDCALL_FUNC( NtCurrentTeb, 0, ".byte 0x65\n\tmovq 0x30,%rax\n\tret" ) +#endif + #endif /* __x86_64__ */ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 7dd13f2..3696c8e 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -189,9 +189,9 @@ done: #include <mach/mach.h> #include <mach/mach_error.h> -static ULONG get_dyld_image_info_addr(void) +static ULONG64 get_dyld_image_info_addr(void) { - ULONG ret = 0; + ULONG64 ret = 0; #ifdef TASK_DYLD_INFO struct task_dyld_info dyld_info; mach_msg_type_number_t size = TASK_DYLD_INFO_COUNT; @@ -219,6 +219,9 @@ HANDLE thread_init(void) NTSTATUS status; struct ntdll_thread_data *thread_data; static struct debug_info debug_info; /* debug info for initial thread */ +#ifdef __APPLE__ + ULONG64 dyld_image_info; +#endif virtual_init(); @@ -263,7 +266,18 @@ HANDLE thread_init(void) InitializeListHead( &ldr.InMemoryOrderModuleList ); InitializeListHead( &ldr.InInitializationOrderModuleList ); #ifdef __APPLE__ - peb->Reserved[0] = get_dyld_image_info_addr(); + dyld_image_info = get_dyld_image_info_addr(); +#ifdef __LP64__ +#ifdef WORDS_BIGENDIAN + peb->Reserved[1] = dyld_image_info & 0xFFFFFFFF; + peb->Reserved[0] = dyld_image_info >> 32; +#else + peb->Reserved[0] = dyld_image_info & 0xFFFFFFFF; + peb->Reserved[1] = dyld_image_info >> 32; +#endif +#else + peb->Reserved[0] = dyld_image_info & 0xFFFFFFFF; +#endif #endif /* allocate and initialize the initial TEB */ diff --git a/include/winnt.h b/include/winnt.h index 709a93f..4b06b2c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2284,7 +2284,7 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm mov teb, eax; return teb; } -#elif defined(__x86_64__) && defined(__GNUC__) +#elif defined(__x86_64__) && defined(__GNUC__) && !defined(__APPLE__) static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) { struct _TEB *teb;

1 0

Charles Davis : dbghelp: Support 64-bit dyld_all_image_infos structures, too.
by Alexandre Julliard 06 Feb '15

06 Feb '15

Module: wine Branch: master Commit: b3232e7c9d5232839160380bbbfd246f44862232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3232e7c9d5232839160380bb… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Feb 5 13:28:59 2015 -0700 dbghelp: Support 64-bit dyld_all_image_infos structures, too. --- dlls/dbghelp/macho_module.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 2eb2b94..bb49aa5 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -981,10 +981,10 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, &pbi, sizeof(pbi), NULL); if (status == STATUS_SUCCESS) { - ULONG dyld_image_info; + ULONG_PTR dyld_image_info; /* Read dyld image info address from PEB */ - if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved, + if (ReadProcessMemory(pcs->handle, &pbi.PebBaseAddress->Reserved[0], &dyld_image_info, sizeof(dyld_image_info), NULL)) { TRACE("got dyld_image_info 0x%08x from PEB %p MacDyldImageInfo %p\n", @@ -994,6 +994,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, } } +#ifndef __LP64__ /* No reading the symtab with nlist(3) in LP64 */ if (!ret) { static void* dyld_all_image_infos_addr; @@ -1017,6 +1018,7 @@ static BOOL macho_load_file(struct process* pcs, const WCHAR* filename, ret = TRUE; } } +#endif } if (macho_info->flags & MACHO_INFO_MODULE)

1 0