October 2012 - Wine-Commits

Henri Verbeet : wined3d: wined3d_device_get_creation_parameters() never fails.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 2ad58089961aedd1c5e1d6bace503fcf56bae997 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad58089961aedd1c5e1d6bac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:12 2012 +0200 wined3d: wined3d_device_get_creation_parameters() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/dxgi/device.c | 10 +--------- dlls/wined3d/device.c | 3 +-- include/wine/wined3d.h | 2 +- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4f6162c..65070bb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -479,16 +479,15 @@ static HRESULT WINAPI d3d8_device_GetCreationParameters(IDirect3DDevice8 *iface, D3DDEVICE_CREATION_PARAMETERS *parameters) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, parameters %p.\n", iface, parameters); wined3d_mutex_lock(); - hr = wined3d_device_get_creation_parameters(device->wined3d_device, + wined3d_device_get_creation_parameters(device->wined3d_device, (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4d5c762..fc543d9 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -422,16 +422,15 @@ static HRESULT WINAPI d3d9_device_GetCreationParameters(IDirect3DDevice9Ex *ifac D3DDEVICE_CREATION_PARAMETERS *parameters) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, parameters %p.\n", iface, parameters); wined3d_mutex_lock(); - hr = wined3d_device_get_creation_parameters(device->wined3d_device, + wined3d_device_get_creation_parameters(device->wined3d_device, (struct wined3d_device_creation_parameters *)parameters); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface, diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 7bbc5e0..b8e6692 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -141,19 +141,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface, { struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); struct wined3d_device_creation_parameters create_parameters; - HRESULT hr; TRACE("iface %p, adapter %p\n", iface, adapter); EnterCriticalSection(&dxgi_cs); - - hr = wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); - if (FAILED(hr)) - { - LeaveCriticalSection(&dxgi_cs); - return hr; - } - + wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters); LeaveCriticalSection(&dxgi_cs); return IWineDXGIFactory_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f9ff67c..c03537d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5263,13 +5263,12 @@ HRESULT CDECL wined3d_device_set_dialog_box_mode(struct wined3d_device *device, } -HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device, +void CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *parameters) { TRACE("device %p, parameters %p.\n", device, parameters); *parameters = device->create_parms; - return WINED3D_OK; } void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index bc3e17f..a5465fb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2114,7 +2114,7 @@ HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *devic UINT plane_idx, struct wined3d_vec4 *plane); HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, struct wined3d_clip_status *clip_status); -HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, +void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_surface * __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps);

1 0

Henri Verbeet : wined3d: Recognize the SM4 dcl_constantBuffer opcode.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 6d948e1a8cdd8a9a5ae2b6124468275cbf13f2b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d948e1a8cdd8a9a5ae2b6124… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 22:48:13 2012 +0200 wined3d: Recognize the SM4 dcl_constantBuffer opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 7 +++++++ dlls/wined3d/shader_sm4.c | 14 +++++++++++++- dlls/wined3d/wined3d_private.h | 7 +++++-- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a54a37f..4f5efe0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5101,6 +5101,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, + /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_hw_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_hw_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index db04c6a..d344bfa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5120,6 +5120,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, /* WINED3DSIH_DCL */ shader_glsl_nop, + /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 72f2fa6..d07809b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -50,6 +50,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_DCL */ "dcl", + /* WINED3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ "dcl_outputTopology", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", @@ -1367,6 +1368,12 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe TRACE(" "); shader_dump_dst_param(&ins.declaration.semantic.reg, &shader_version); } + else if (ins.handler_idx == WINED3DSIH_DCL_CONSTANT_BUFFER) + { + TRACE("%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_src_param(&ins.declaration.src, &shader_version); + TRACE(", %s", ins.flags & WINED3DSI_INDEXED_DYNAMIC ? "dynamicIndexed" : "immediateIndexed"); + } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE || ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f50fd76..cd93fb3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -32,6 +32,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 #define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x7 << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT) +#define WINED3D_SM4_INDEX_TYPE_SHIFT 11 +#define WINED3D_SM4_INDEX_TYPE_MASK (0x1 << WINED3D_SM4_INDEX_TYPE_SHIFT) + #define WINED3D_SM4_OPCODE_MASK 0xff #define WINED3D_SM4_REGISTER_MODIFIER (1 << 31) @@ -102,6 +105,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, + WINED3D_SM4_OP_DCL_CONSTANT_BUFFER = 0x59, WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY = 0x5c, WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, @@ -222,6 +226,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, + {WINED3D_SM4_OP_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_CONSTANT_BUFFER, "", ""}, {WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, "", ""}, {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, {WINED3D_SM4_OP_DCL_VERTICES_OUT, WINED3DSIH_DCL_VERTICES_OUT, "", ""}, @@ -592,7 +597,14 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Skipping modifier 0x%08x.\n", modifier); } - if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) + if (opcode == WINED3D_SM4_OP_DCL_CONSTANT_BUFFER) + { + shader_sm4_read_src_param(priv, &p, WINED3D_DATA_FLOAT, + &ins->declaration.src, NULL); + if (opcode_token & WINED3D_SM4_INDEX_TYPE_MASK) + ins->flags |= WINED3DSI_INDEXED_DYNAMIC; + } + else if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) { enum wined3d_sm4_output_primitive_type primitive_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6db495f..b14e85d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -374,8 +374,9 @@ enum wined3d_shader_dst_modifier }; /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ -#define WINED3DSI_TEXLD_PROJECT 1 -#define WINED3DSI_TEXLD_BIAS 2 +#define WINED3DSI_TEXLD_PROJECT 0x1 +#define WINED3DSI_TEXLD_BIAS 0x2 +#define WINED3DSI_INDEXED_DYNAMIC 0x4 enum wined3d_shader_rel_op { @@ -439,6 +440,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CRS, WINED3DSIH_CUT, WINED3DSIH_DCL, + WINED3DSIH_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_OUTPUT_TOPOLOGY, WINED3DSIH_DCL_VERTICES_OUT, @@ -670,6 +672,7 @@ struct wined3d_shader_instruction { struct wined3d_shader_semantic semantic; enum wined3d_primitive_type primitive_type; + struct wined3d_shader_src_param src; UINT count; } declaration; };

1 0

Jacek Caban : vbscript: Added LTrim() implementation.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 71a4a1d43a5b50e5b68b99b16617148a44027334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71a4a1d43a5b50e5b68b99b16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 10:33:50 2012 +0200 vbscript: Added LTrim() implementation. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index e6211b7..6db59ca 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -852,8 +852,29 @@ static HRESULT Global_UCase(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_LTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, conv_str = NULL; + WCHAR *ptr; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_BSTR) { + str = V_BSTR(arg); + }else { + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + for(ptr = str; *ptr && isspaceW(*ptr); ptr++); + + str = SysAllocString(ptr); + SysFreeString(conv_str); + if(!str) + return E_OUTOFMEMORY; + + return return_bstr(res, str); } static HRESULT Global_RTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 7553d59..b64043d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -237,6 +237,18 @@ TestTrim "", "" TestTrim 123, "123" if isEnglishLang then TestTrim true, "True" +Sub TestLTrim(str, exstr) + Call ok(LTrim(str) = exstr, "LTrim(" & str & ") = " & LTrim(str)) +End Sub + +TestLTrim " test ", "test " +TestLTrim "test ", "test " +TestLTrim " test", "test" +TestLTrim "test", "test" +TestLTrim "", "" +TestLTrim 123, "123" +if isEnglishLang then TestLTrim true, "True" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Nikolay Sivov : mshtml: Implement IHTMLFrameBase_put_name().
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 1075118cdbdc261011bf3af46dd21101f0f42ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=1075118cdbdc261011bf3af46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 15:06:32 2012 +0400 mshtml: Implement IHTMLFrameBase_put_name(). --- dlls/mshtml/htmlframebase.c | 24 ++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 25 ++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 55a56db..acb493a 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -148,8 +148,28 @@ static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) static HRESULT WINAPI HTMLFrameBase_put_name(IHTMLFrameBase *iface, BSTR v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->nsframe && !This->nsiframe) { + ERR("No attached ns frame object\n"); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&name_str, v); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetName(This->nsframe, &name_str); + else + nsres = nsIDOMHTMLIFrameElement_SetName(This->nsiframe, &name_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("SetName failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFrameBase_get_name(IHTMLFrameBase *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d6fbd64..08ea83e7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4227,6 +4227,25 @@ static void _test_framebase_name(unsigned line, IHTMLElement *elem, const char * IHTMLFrameBase_Release(fbase); } +#define test_framebase_put_name(a,b) _test_framebase_put_name(__LINE__,a,b) +static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLFrameBase *fbase; + HRESULT hres; + BSTR str; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + + str = name ? a2bstr(name) : NULL; + hres = IHTMLFrameBase_put_name(fbase, str); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + SysFreeString(str); + + _test_framebase_name(line, elem, name); + IHTMLFrameBase_Release(fbase); +} + static void test_framebase(IUnknown *unk) { IHTMLFrameBase *fbase; @@ -6273,12 +6292,16 @@ static void test_frameset(IHTMLDocument2 *doc) test_framebase((IUnknown*)elem); test_framebase_name(elem, "nm1"); - + test_framebase_put_name(elem, "frame name"); + test_framebase_put_name(elem, NULL); + test_framebase_put_name(elem, "nm1"); IHTMLElement_Release(elem); /* get_name with no name attr */ elem = get_doc_elem_by_id(doc, "fr3"); test_framebase_name(elem, NULL); + test_framebase_put_name(elem, "frame name"); + test_framebase_put_name(elem, NULL); IHTMLElement_Release(elem); IHTMLWindow2_Release(window);

1 0

Dan Kegel : vcomp: Better stub for omp_get_num_threads.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 9ba01e0246b4edc832b864b35867fa54bde3876a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba01e0246b4edc832b864b35… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:36 2012 -0700 vcomp: Better stub for omp_get_num_threads. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1e51eef..170bd43 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -35,6 +35,12 @@ int CDECL omp_get_num_procs(void) return 1; } +int CDECL omp_get_num_threads(void) +{ + TRACE("stub\n"); + return 1; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 3e02bea..e53a475 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -94,7 +94,7 @@ @ stub omp_get_max_threads @ stub omp_get_nested @ cdecl omp_get_num_procs() -@ stub omp_get_num_threads +@ cdecl omp_get_num_threads() @ stub omp_get_thread_num @ stub omp_get_wtick @ cdecl omp_get_wtime()

1 0

Dan Kegel : vcomp: Better stub for omp_set_num_threads.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 54a10eb1aa0bb0fe46a205a67de2b39eb82a17ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a10eb1aa0bb0fe46a205a67… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:37 2012 -0700 vcomp: Better stub for omp_set_num_threads. --- dlls/vcomp/main.c | 5 +++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 170bd43..a369af1 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -47,6 +47,11 @@ double CDECL omp_get_wtime(void) return GetTickCount() / 1000.0; } +void CDECL omp_set_num_threads(int num_threads) +{ + TRACE("(%d): stub\n", num_threads); +} + void CDECL _vcomp_set_num_threads(int num_threads) { TRACE("(%d): stub\n", num_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index e53a475..cca56f1 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -105,7 +105,7 @@ @ stub omp_set_lock @ stub omp_set_nest_lock @ stub omp_set_nested -@ stub omp_set_num_threads +@ cdecl omp_set_num_threads(long) @ stub omp_test_lock @ stub omp_test_nest_lock @ stub omp_unset_lock

1 0

Dan Kegel : vcomp: Better stub for omp_get_max_threads.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: ed23241733c5071aec3d1d51275ed478cc97f745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed23241733c5071aec3d1d512… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:38 2012 -0700 vcomp: Better stub for omp_get_max_threads. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index a369af1..78c2c08 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +int CDECL omp_get_max_threads(void) +{ + TRACE("stub\n"); + return 1; +} + int CDECL omp_get_num_procs(void) { TRACE("stub\n"); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index cca56f1..a29b9f9 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -91,7 +91,7 @@ @ stub omp_destroy_lock @ stub omp_destroy_nest_lock @ stub omp_get_dynamic -@ stub omp_get_max_threads +@ cdecl omp_get_max_threads() @ stub omp_get_nested @ cdecl omp_get_num_procs() @ cdecl omp_get_num_threads()

1 0

Dan Kegel : vcomp: Better stub for omp_get_thread_num.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: d0955b1bd610298ad546300243882be3ed20f8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0955b1bd610298ad54630024… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:41 2012 -0700 vcomp: Better stub for omp_get_thread_num. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index b758fbd..5faf0a1 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -59,6 +59,12 @@ int CDECL omp_get_num_threads(void) return 1; } +int CDECL omp_get_thread_num(void) +{ + TRACE("stub\n"); + return 0; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 1b58b25..41b57fb 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -95,7 +95,7 @@ @ cdecl omp_get_nested() @ cdecl omp_get_num_procs() @ cdecl omp_get_num_threads() -@ stub omp_get_thread_num +@ cdecl omp_get_thread_num() @ stub omp_get_wtick @ cdecl omp_get_wtime() @ stub omp_in_parallel

1 0

Alexandre Julliard : winex11: Add support for per-window visuals.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 8dcbeff760115834656f3f1fc85922e3a9af14d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcbeff760115834656f3f1fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 12:19:37 2012 +0200 winex11: Add support for per-window visuals. --- dlls/winex11.drv/desktop.c | 3 +-- dlls/winex11.drv/window.c | 24 +++++++++++++++--------- dlls/winex11.drv/x11drv.h | 2 ++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 3448afd..8d9de20 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -190,8 +190,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam changes.x = data->whole_rect.left - virtual_screen_rect.left; changes.y = data->whole_rect.top - virtual_screen_rect.top; - XReconfigureWMWindow( data->display, data->whole_window, - DefaultScreen(data->display), mask, &changes ); + XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); } release_win_data( data ); if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, TRUE ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 344fe44..b3d7279 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -312,7 +312,7 @@ static void get_x11_rect_offset( struct x11drv_win_data *data, RECT *rect ) static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttributes *attr ) { attr->override_redirect = !data->managed; - attr->colormap = default_colormap; + attr->colormap = data->colormap ? data->colormap : default_colormap; attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); attr->bit_gravity = NorthWestGravity; attr->win_gravity = StaticGravity; @@ -1110,7 +1110,7 @@ static void unmap_window( HWND hwnd ) if (data->embedded) set_xembed_flags( data, 0 ); else if (!data->managed) XUnmapWindow( data->display, data->whole_window ); - else XWithdrawWindow( data->display, data->whole_window, DefaultScreen(data->display) ); + else XWithdrawWindow( data->display, data->whole_window, data->vis.screen ); data->mapped = FALSE; data->net_wm_state = 0; @@ -1132,7 +1132,7 @@ void make_window_embedded( HWND hwnd ) if (data->mapped) { if (data->managed) XUnmapWindow( data->display, data->whole_window ); - else XWithdrawWindow( data->display, data->whole_window, DefaultScreen(data->display) ); + else XWithdrawWindow( data->display, data->whole_window, data->vis.screen ); data->net_wm_state = 0; } data->embedded = TRUE; @@ -1244,8 +1244,7 @@ static void sync_window_position( struct x11drv_win_data *data, set_size_hints( data, style ); set_mwm_hints( data, style, ex_style ); data->configure_serial = NextRequest( data->display ); - XReconfigureWMWindow( data->display, data->whole_window, - DefaultScreen(data->display), mask, &changes ); + XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); #ifdef HAVE_LIBXSHAPE if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) sync_window_region( data, (HRGN)1 ); @@ -1367,6 +1366,9 @@ static void create_whole_window( struct x11drv_win_data *data ) } data->shaped = (win_rgn != 0); + if (data->vis.visualid != default_visual.visualid) + data->colormap = XCreateColormap( data->display, root_window, data->vis.visual, AllocNone ); + mask = get_window_attributes( data, &attr ); data->whole_rect = data->window_rect; @@ -1379,8 +1381,8 @@ static void create_whole_window( struct x11drv_win_data *data ) data->whole_window = XCreateWindow( data->display, root_window, data->whole_rect.left - virtual_screen_rect.left, data->whole_rect.top - virtual_screen_rect.top, - cx, cy, 0, default_visual.depth, InputOutput, - default_visual.visual, mask, &attr ); + cx, cy, 0, data->vis.depth, InputOutput, + data->vis.visual, mask, &attr ); if (!data->whole_window) goto done; set_initial_wm_hints( data->display, data->whole_window ); @@ -1435,7 +1437,9 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des TRACE( "win %p xwin %lx\n", data->hwnd, data->whole_window ); XDeleteContext( data->display, data->whole_window, winContext ); if (!already_destroyed) XDestroyWindow( data->display, data->whole_window ); + if (data->colormap) XFreeColormap( data->display, data->colormap ); data->whole_window = 0; + data->colormap = 0; data->wm_state = WithdrawnState; data->net_wm_state = 0; data->mapped = FALSE; @@ -1542,6 +1546,7 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { data->display = display; + data->vis = default_visual; data->hwnd = hwnd; EnterCriticalSection( &win_data_section ); XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data ); @@ -2034,6 +2039,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!data->whole_window) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; + if (data->vis.visualid != default_visual.visualid) goto done; if (*surface) window_surface_release( *surface ); *surface = NULL; /* indicate that we want to draw directly to the window */ @@ -2059,7 +2065,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!layered || !GetLayeredWindowAttributes( hwnd, &key, NULL, &flags ) || !(flags & LWA_COLORKEY)) key = CLR_INVALID; - *surface = create_surface( data->whole_window, &default_visual, &surface_rect, key ); + *surface = create_surface( data->whole_window, &data->vis, &surface_rect, key ); done: release_win_data( data ); @@ -2185,7 +2191,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags data->iconic = (new_style & WS_MINIMIZE) != 0; TRACE( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); if (data->iconic) - XIconifyWindow( data->display, data->whole_window, DefaultScreen(data->display) ); + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); else if (is_window_rect_mapped( rectWindow )) XMapWindow( data->display, data->whole_window ); update_net_wm_states( data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7a7cfd3..5557f7c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -530,6 +530,8 @@ enum x11drv_net_wm_state struct x11drv_win_data { Display *display; /* display connection for the thread owning the window */ + XVisualInfo vis; /* X visual used by this window */ + Colormap colormap; /* colormap if non-default visual */ HWND hwnd; /* hwnd that this private data belongs to */ Window whole_window; /* X window for the complete window */ RECT window_rect; /* USER window rectangle relative to parent */

1 0

Alexandre Julliard : winex11: Switch to an ARGB visual for layered windows with per-pixel alpha.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: f12c1c6630f0bf842dde9af10da4ab188ff16e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12c1c6630f0bf842dde9af10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 13:12:17 2012 +0200 winex11: Switch to an ARGB visual for layered windows with per-pixel alpha. --- dlls/winex11.drv/event.c | 2 + dlls/winex11.drv/window.c | 111 +++++++++++++++++++++++++++++----------- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 21 +++++++- 4 files changed, 103 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f12c1c6630f0bf842dde9…

1 0