December 2012 - Wine-commits

Henri Verbeet : ddraw: Avoid LPD3DFINDDEVICESEARCH.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 04decc795ae1a317033d09446f3a8a00aa3ed8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=04decc795ae1a317033d09446… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 12 23:10:39 2012 +0100 ddraw: Avoid LPD3DFINDDEVICESEARCH. --- include/d3d.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index f74cd19..5b55274 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -216,7 +216,7 @@ DECLARE_INTERFACE_(IDirect3D,IUnknown) STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport **viewport, IUnknown *outer) PURE; - STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lplpD3DDevice) PURE; + STDMETHOD(FindDevice)(THIS_ D3DFINDDEVICESEARCH *search, D3DFINDDEVICERESULT *result) PURE; }; #undef INTERFACE @@ -262,7 +262,7 @@ DECLARE_INTERFACE_(IDirect3D2,IUnknown) STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial2 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport2 **viewport, IUnknown *outer) PURE; - STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; + STDMETHOD(FindDevice)(THIS_ D3DFINDDEVICESEARCH *search, D3DFINDDEVICERESULT *result) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface *surface, struct IDirect3DDevice2 **device) PURE; }; @@ -310,7 +310,7 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD(CreateLight)(THIS_ struct IDirect3DLight **light, IUnknown *outer) PURE; STDMETHOD(CreateMaterial)(THIS_ struct IDirect3DMaterial3 **material, IUnknown *outer) PURE; STDMETHOD(CreateViewport)(THIS_ struct IDirect3DViewport3 **viewport, IUnknown *outer) PURE; - STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; + STDMETHOD(FindDevice)(THIS_ D3DFINDDEVICESEARCH *search, D3DFINDDEVICERESULT *result) PURE; STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface, struct IDirect3DDevice3 **device, IUnknown *outer) PURE; STDMETHOD(CreateVertexBuffer)(THIS_ D3DVERTEXBUFFERDESC *desc, struct IDirect3DVertexBuffer **buffer,

1 0

Henri Verbeet : ddraw: Avoid LPD3DEXECUTEBUFFERDESC.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: c3963b7eb8422695b1bc05d1ecc002ca8e23c4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3963b7eb8422695b1bc05d1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 12 23:10:40 2012 +0100 ddraw: Avoid LPD3DEXECUTEBUFFERDESC. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 5b55274..e326754 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -887,7 +887,7 @@ DECLARE_INTERFACE_(IDirect3DExecuteBuffer,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DExecuteBuffer methods ***/ STDMETHOD(Initialize)(THIS_ struct IDirect3DDevice *device, D3DEXECUTEBUFFERDESC *desc) PURE; - STDMETHOD(Lock)(THIS_ LPD3DEXECUTEBUFFERDESC lpDesc) PURE; + STDMETHOD(Lock)(THIS_ D3DEXECUTEBUFFERDESC *desc) PURE; STDMETHOD(Unlock)(THIS) PURE; STDMETHOD(SetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE; STDMETHOD(GetExecuteData)(THIS_ LPD3DEXECUTEDATA lpData) PURE;

1 0

Henri Verbeet : d3d10core: Implement d3d10_blend_state_GetDesc().
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 9d86c8b07c4082785ca3677bf7a6786ec8612595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d86c8b07c4082785ca3677bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 12 23:10:41 2012 +0100 d3d10core: Implement d3d10_blend_state_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 4 +++- dlls/d3d10core/device.c | 6 ++++-- dlls/d3d10core/state.c | 9 +++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index b32825e..8164e2f 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -216,9 +216,11 @@ struct d3d10_blend_state { ID3D10BlendState ID3D10BlendState_iface; LONG refcount; + + D3D10_BLEND_DESC desc; }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) DECLSPEC_HIDDEN; +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, const D3D10_BLEND_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilState */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 29f1648..1025b42 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1390,6 +1390,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + if (!desc) + return E_INVALIDARG; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1397,8 +1400,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa return E_OUTOFMEMORY; } - hr = d3d10_blend_state_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_blend_state_init(object, desc))) { WARN("Failed to initialize blend state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 387d561..4092acc 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -114,7 +114,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D1 static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, D3D10_BLEND_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = @@ -132,10 +136,11 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = d3d10_blend_state_GetDesc, }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, const D3D10_BLEND_DESC *desc) { state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; + state->desc = *desc; return S_OK; }

1 0

Henri Verbeet : d3d10core: Only create unique blend state objects.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 525e3da05137492e632e9ad8fa58238a8e4853bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=525e3da05137492e632e9ad8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 12 23:10:42 2012 +0100 d3d10core: Only create unique blend state objects. --- dlls/d3d10core/d3d10core_private.h | 6 ++++- dlls/d3d10core/device.c | 39 +++++++++++++++++++++++++++++++++++- dlls/d3d10core/state.c | 19 ++++++++++++---- 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 8164e2f..dd7d8f5 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -217,10 +217,13 @@ struct d3d10_blend_state ID3D10BlendState ID3D10BlendState_iface; LONG refcount; + struct d3d10_device *device; D3D10_BLEND_DESC desc; + struct wine_rb_entry entry; }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, const D3D10_BLEND_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_device *device, + const D3D10_BLEND_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *iface) DECLSPEC_HIDDEN; /* ID3D10DepthStencilState */ @@ -281,6 +284,7 @@ struct d3d10_device struct wined3d_device_parent device_parent; struct wined3d_device *wined3d_device; + struct wine_rb_tree blend_states; struct wine_rb_tree sampler_states; struct d3d10_blend_state *blend_state; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 1025b42..3ee13ae 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -82,6 +82,7 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) if (device->wined3d_device) wined3d_device_decref(device->wined3d_device); wine_rb_destroy(&device->sampler_states, NULL, NULL); + wine_rb_destroy(&device->blend_states, NULL, NULL); } return refcount; @@ -1385,7 +1386,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *iface, const D3D10_BLEND_DESC *desc, ID3D10BlendState **blend_state) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_blend_state *object; + struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); @@ -1393,6 +1396,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa if (!desc) return E_INVALIDARG; + if ((entry = wine_rb_get(&device->blend_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_blend_state, entry); + + TRACE("Returning existing blend state %p.\n", object); + *blend_state = &object->ID3D10BlendState_iface; + ID3D10BlendState_AddRef(*blend_state); + + return S_OK; + } + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1400,7 +1414,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device *ifa return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_blend_state_init(object, desc))) + if (FAILED(hr = d3d10_blend_state_init(object, device, desc))) { WARN("Failed to initialize blend state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -1955,6 +1969,22 @@ static const struct wine_rb_functions d3d10_sampler_state_rb_ops = d3d10_sampler_state_compare, }; +static int d3d10_blend_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const D3D10_BLEND_DESC *ka = key; + const D3D10_BLEND_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_blend_state, entry)->desc; + + return memcmp(ka, kb, sizeof(*ka)); +} + +static const struct wine_rb_functions d3d10_blend_state_rb_ops = +{ + d3d10_rb_alloc, + d3d10_rb_realloc, + d3d10_rb_free, + d3d10_blend_state_compare, +}; + HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { device->ID3D10Device_iface.lpVtbl = &d3d10_device_vtbl; @@ -1965,9 +1995,16 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) /* COM aggregation always takes place */ device->outer_unk = outer_unknown; + if (wine_rb_init(&device->blend_states, &d3d10_blend_state_rb_ops) == -1) + { + WARN("Failed to initialize blend state rbtree.\n"); + return E_FAIL; + } + if (wine_rb_init(&device->sampler_states, &d3d10_sampler_state_rb_ops) == -1) { WARN("Failed to initialize sampler state rbtree.\n"); + wine_rb_destroy(&device->blend_states, NULL, NULL); return E_FAIL; } diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index 4092acc..0992273 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -63,14 +63,15 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) { - struct d3d10_blend_state *This = impl_from_ID3D10BlendState(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_blend_state *state = impl_from_ID3D10BlendState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + wine_rb_remove(&state->device->blend_states, &state->desc); + HeapFree(GetProcessHeap(), 0, state); } return refcount; @@ -136,12 +137,20 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = d3d10_blend_state_GetDesc, }; -HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, const D3D10_BLEND_DESC *desc) +HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state, struct d3d10_device *device, + const D3D10_BLEND_DESC *desc) { state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; + state->device = device; state->desc = *desc; + if (wine_rb_put(&device->blend_states, desc, &state->entry) == -1) + { + ERR("Failed to insert blend state entry.\n"); + return E_FAIL; + } + return S_OK; }

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateBlendState().
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 3cd98e15fa422435ef38d58618e8c1733a5ecefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd98e15fa422435ef38d5861… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 12 23:10:43 2012 +0100 d3d10core/tests: Add a small test for ID3D10Device_CreateBlendState(). --- dlls/d3d10core/tests/device.c | 57 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f509b27..cfa131c 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -616,6 +616,62 @@ static void test_create_sampler_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_blend_state(void) +{ + ID3D10BlendState *blend_state1, *blend_state2; + D3D10_BLEND_DESC blend_desc; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CreateBlendState(device, NULL, &blend_state1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + blend_desc.AlphaToCoverageEnable = FALSE; + blend_desc.BlendEnable[0] = FALSE; + blend_desc.BlendEnable[1] = FALSE; + blend_desc.BlendEnable[2] = FALSE; + blend_desc.BlendEnable[3] = FALSE; + blend_desc.BlendEnable[4] = FALSE; + blend_desc.BlendEnable[5] = FALSE; + blend_desc.BlendEnable[6] = FALSE; + blend_desc.BlendEnable[7] = FALSE; + blend_desc.SrcBlend = D3D10_BLEND_ONE; + blend_desc.DestBlend = D3D10_BLEND_ZERO; + blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; + blend_desc.DestBlendAlpha = D3D10_BLEND_ZERO; + blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTargetWriteMask[1] = D3D10_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTargetWriteMask[2] = D3D10_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTargetWriteMask[3] = D3D10_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTargetWriteMask[4] = D3D10_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTargetWriteMask[5] = D3D10_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTargetWriteMask[6] = D3D10_COLOR_WRITE_ENABLE_ALL; + blend_desc.RenderTargetWriteMask[7] = D3D10_COLOR_WRITE_ENABLE_ALL; + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state1); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state2); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + ok(blend_state1 == blend_state2, "Got different blend state objects.\n"); + + refcount = ID3D10BlendState_Release(blend_state2); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D10BlendState_Release(blend_state1); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_device_interfaces(); @@ -626,4 +682,5 @@ START_TEST(device) test_create_shader_resource_view(); test_create_shader(); test_create_sampler_state(); + test_create_blend_state(); }

1 0

Austin English : atl80: Fix typos in spec file.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 756a3bba266acfdea1300f8933a6f2807dd2679b URL: http://source.winehq.org/git/wine.git/?a=commit;h=756a3bba266acfdea1300f893… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 12 17:47:11 2012 -0800 atl80: Fix typos in spec file. --- dlls/atl80/atl80.spec | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 67f001e..5982e4e 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -46,8 +46,8 @@ 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx 61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar -62 stub AltWinModuleRegisterClassExW -63 stub AltWinModuleRegisterClassExA -64 stdcall AltCallTermFunc(ptr) atl100.AltCallTermFunc -65 stub AltWinModuleInit -66 stub AltWinModuleTerm +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stdcall AtlCallTermFunc(ptr) atl100.AtlCallTermFunc +65 stub AtlWinModuleInit +66 stub AtlWinModuleTerm

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 967100120da51f8aa85ec7911caf522dc7149140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=967100120da51f8aa85ec7911… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Dec 13 02:31:56 2012 +0100 po: Update German translation. --- po/de.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/de.po b/po/de.po index 8eb02e09..729df8f 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: 2012-11-05 11:27+0100\n" +"PO-Revision-Date: 2012-12-13 02:22+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -3548,7 +3548,7 @@ msgstr "konstante Zeichenkette nicht terminiert" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "'return'-Anweisung außerhalb einer Funktion" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -10160,10 +10160,8 @@ msgid "Wine Command Prompt" msgstr "Wine Befehlsprozessor" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD Version %1!S!\n" +msgstr "Wine CMD Version %1!S!\n" #: cmd.rc:350 msgid "More? " @@ -13101,7 +13099,7 @@ msgstr "Menühervorhebung" #: winecfg.rc:121 msgid "Menu Bar" -msgstr "Menütitelleiste" +msgstr "Menüleiste" #: wineconsole.rc:60 msgid "Cursor size"

1 0

Jacek Caban : atl100: Added AtlRegisterClassCategoriesHelper stub.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 526fe933be6c63d19f587fbae96590f6b29de26d URL: http://source.winehq.org/git/wine.git/?a=commit;h=526fe933be6c63d19f587fbae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 13 12:00:23 2012 +0100 atl100: Added AtlRegisterClassCategoriesHelper stub. --- dlls/atl/atl.spec | 2 +- dlls/atl100/atl.c | 9 +++++++++ dlls/atl100/atl100.spec | 2 +- dlls/atl80/atl80.spec | 2 +- include/atlbase.h | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index 1de6f0c..47ed135 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -40,7 +40,7 @@ 46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost -49 stub AtlRegisterClassCategoriesHelper +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save 52 stub AtlIPersistPropertyBag_Load diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c index bbea756..d2e49c6 100644 --- a/dlls/atl100/atl.c +++ b/dlls/atl100/atl.c @@ -304,6 +304,15 @@ void WINAPI AtlWinModuleAddCreateWndData(_ATL_WIN_MODULE *pM, _AtlCreateWndData } /*********************************************************************** + * AtlRegisterClassCategoriesHelper [atl100.49] + */ +HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID clsid, const struct _ATL_CATMAP_ENTRY *catmap, BOOL reg) +{ + FIXME("(%s %p %x)\n", debugstr_guid(clsid), catmap, reg); + return E_NOTIMPL; +} + +/*********************************************************************** * AtlGetVersion [atl100.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec index 2204187..1c36112 100644 --- a/dlls/atl100/atl100.spec +++ b/dlls/atl100/atl100.spec @@ -32,7 +32,7 @@ 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) 48 stdcall AtlAxGetHost(long ptr) -49 stub AtlRegisterClassCategoriesHelper +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) 52 stub AtlIPersistPropertyBag_Load diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 5982e4e..1586e10 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -34,7 +34,7 @@ 46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost -49 stub AtlRegisterClassCategoriesHelper +49 stdcall AtlRegisterClassCategoriesHelper(ptr ptr long) atl100.AtlRegisterClassCategoriesHelper 50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load 51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save 52 stub AtlIPersistPropertyBag_Load diff --git a/include/atlbase.h b/include/atlbase.h index 140a227..37d60c8 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -230,5 +230,6 @@ HRESULT WINAPI AtlUnmarshalPtr(IStream *pStream, const IID *iid, IUnknown **ppUn HRESULT WINAPI AtlCreateRegistrar(IRegistrar**); HRESULT WINAPI AtlUpdateRegistryFromResourceD(HINSTANCE,LPCOLESTR,BOOL,struct _ATL_REGMAP_ENTRY*,IRegistrar*); HRESULT WINAPI AtlLoadTypeLib(HINSTANCE,LPCOLESTR,BSTR*,ITypeLib**); +HRESULT WINAPI AtlRegisterClassCategoriesHelper(REFCLSID,const struct _ATL_CATMAP_ENTRY*,BOOL); #endif /* __WINE_ATLBASE_H__ */

1 0

Jacek Caban : atl: Merge registrar.c into atl_main.c.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 86787db2ca14190cfb41a8b9215c5c5d6533a489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86787db2ca14190cfb41a8b92… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 13 12:00:41 2012 +0100 atl: Merge registrar.c into atl_main.c. --- dlls/atl/Makefile.in | 4 +- dlls/atl/atl_main.c | 115 +++++++++++++++++++++++++++++++++++++++- dlls/atl/registrar.c | 145 -------------------------------------------------- 3 files changed, 115 insertions(+), 149 deletions(-) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index 8af9e8b..cb114ff 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -3,9 +3,7 @@ IMPORTLIB = atl IMPORTS = uuid atl100 oleaut32 ole32 user32 EXTRADEFS = -D_ATL_VER=_ATL_VER_30 -C_SRCS = \ - atl_main.c \ - registrar.c +C_SRCS = atl_main.c IDL_R_SRCS = atl_classes.idl diff --git a/dlls/atl/atl_main.c b/dlls/atl/atl_main.c index d7c4dae..b6447ff 100644 --- a/dlls/atl/atl_main.c +++ b/dlls/atl/atl_main.c @@ -2,6 +2,7 @@ * Implementation of Active Template Library (atl.dll) * * Copyright 2004 Aric Stewart for CodeWeavers + * Copyright 2005 Jacek Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,6 +24,7 @@ #define COBJMACROS #include "objidl.h" +#include "rpcproxy.h" #include "atlbase.h" #include "atlwin.h" @@ -31,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -DECLSPEC_HIDDEN HINSTANCE hInst; +static HINSTANCE hInst; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -462,6 +464,117 @@ void* WINAPI AtlModuleExtractCreateWndData(_ATL_MODULEW *pM) } /*********************************************************************** + * AtlModuleUpdateRegistryFromResourceD [ATL.@] + * + */ +HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes, + BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg) +{ + TRACE("(%p %s %d %p %p)\n", pM, debugstr_w(lpszRes), bRegister, pMapEntries, pReg); + + return AtlUpdateRegistryFromResourceD(pM->m_hInst, lpszRes, bRegister, pMapEntries, pReg); +} + +static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObject) +{ + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { + *ppvObject = iface; + IClassFactory_AddRef( iface ); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI RegistrarCF_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnkOuter, + REFIID riid, void **ppv) +{ + IRegistrar *registrar; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + + if(pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + + hres = IRegistrar_QueryInterface(registrar, riid, ppv); + IRegistrar_Release(registrar); + return hres; +} + +static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) +{ + TRACE("(%p)->(%x)\n", iface, lock); + return S_OK; +} + +static const IClassFactoryVtbl IRegistrarCFVtbl = { + RegistrarCF_QueryInterface, + RegistrarCF_AddRef, + RegistrarCF_Release, + RegistrarCF_CreateInstance, + RegistrarCF_LockServer +}; + +static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; + +/************************************************************** + * DllGetClassObject (ATL.2) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) +{ + TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); + + if(IsEqualGUID(&CLSID_Registrar, clsid)) + return IClassFactory_QueryInterface( &RegistrarCF, riid, ppvObject ); + + FIXME("Not supported class %s\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllRegisterServer (ATL.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( hInst ); +} + +/*********************************************************************** + * DllUnRegisterServer (ATL.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( hInst ); +} + +/*********************************************************************** + * DllCanUnloadNow (ATL.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + +/*********************************************************************** * AtlGetVersion [ATL.@] */ DWORD WINAPI AtlGetVersion(void *pReserved) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c deleted file mode 100644 index fc4e08b..0000000 --- a/dlls/atl/registrar.c +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright 2005 Jacek Caban - * - * 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 COBJMACROS - -#include "oaidl.h" -#include "rpcproxy.h" -#include "atlbase.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl); - -/************************************************************** - * ClassFactory implementation - */ - -static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppvObject) -{ - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); - - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IClassFactory, riid)) { - *ppvObject = iface; - IClassFactory_AddRef( iface ); - return S_OK; - } - - return E_NOINTERFACE; -} - -static ULONG WINAPI RegistrarCF_AddRef(IClassFactory *iface) -{ - return 2; -} - -static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) -{ - return 1; -} - -static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnkOuter, - REFIID riid, void **ppv) -{ - IRegistrar *registrar; - HRESULT hres; - - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); - - if(pUnkOuter) { - *ppv = NULL; - return CLASS_E_NOAGGREGATION; - } - - hres = AtlCreateRegistrar(&registrar); - if(FAILED(hres)) - return hres; - - hres = IRegistrar_QueryInterface(registrar, riid, ppv); - IRegistrar_Release(registrar); - return hres; -} - -static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) -{ - TRACE("(%p)->(%x)\n", iface, lock); - return S_OK; -} - -static const IClassFactoryVtbl IRegistrarCFVtbl = { - RegistrarCF_QueryInterface, - RegistrarCF_AddRef, - RegistrarCF_Release, - RegistrarCF_CreateInstance, - RegistrarCF_LockServer -}; - -static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; - -/************************************************************** - * DllGetClassObject (ATL.2) - */ -HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) -{ - TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject); - - if(IsEqualGUID(&CLSID_Registrar, clsid)) - return IClassFactory_QueryInterface( &RegistrarCF, riid, ppvObject ); - - FIXME("Not supported class %s\n", debugstr_guid(clsid)); - return CLASS_E_CLASSNOTAVAILABLE; -} - -extern HINSTANCE hInst; - -/*********************************************************************** - * AtlModuleUpdateRegistryFromResourceD [ATL.@] - * - */ -HRESULT WINAPI AtlModuleUpdateRegistryFromResourceD(_ATL_MODULEW* pM, LPCOLESTR lpszRes, - BOOL bRegister, struct _ATL_REGMAP_ENTRY* pMapEntries, IRegistrar* pReg) -{ - TRACE("(%p %s %d %p %p)\n", pM, debugstr_w(lpszRes), bRegister, pMapEntries, pReg); - - return AtlUpdateRegistryFromResourceD(pM->m_hInst, lpszRes, bRegister, pMapEntries, pReg); -} - -/*********************************************************************** - * DllRegisterServer (ATL.@) - */ -HRESULT WINAPI DllRegisterServer(void) -{ - return __wine_register_resources( hInst ); -} - -/*********************************************************************** - * DllUnRegisterServer (ATL.@) - */ -HRESULT WINAPI DllUnregisterServer(void) -{ - return __wine_unregister_resources( hInst ); -} - -/*********************************************************************** - * DllCanUnloadNow (ATL.@) - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return S_FALSE; -}

1 0

Jacek Caban : jscript: Moved eval return value logic to specific statement handlers.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 162f2e6be2ce738f9bdf1d1d9d9ad6c65b9981f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=162f2e6be2ce738f9bdf1d1d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 13 12:08:34 2012 +0100 jscript: Moved eval return value logic to specific statement handlers. --- dlls/jscript/compile.c | 140 ++++++++++++++------------------------------ dlls/jscript/engine.c | 36 +++++------ dlls/jscript/engine.h | 2 + dlls/jscript/tests/lang.js | 6 ++ dlls/jscript/tests/run.c | 24 ++++++++ 5 files changed, 93 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=162f2e6be2ce738f9bdf1…

1 0