wine-commits December 2013

wine-commits@winehq.org

3 participants
462 discussions

Henri Verbeet : ddraw: Implement flips inside ddraw.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 7524258aaf57fe11de6d3dbf9d0842eb2accf966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7524258aaf57fe11de6d3dbf9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 5 10:34:17 2013 +0100 ddraw: Implement flips inside ddraw. --- dlls/ddraw/surface.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/resource.c | 5 +++++ dlls/wined3d/surface.c | 23 ----------------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 43 insertions(+), 27 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4c96da8..59c88c0 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1175,6 +1175,8 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, 0}; + struct wined3d_surface *tmp, *rt; + struct wined3d_texture *texture; IDirectDrawSurface7 *current; HRESULT hr; @@ -1185,6 +1187,10 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra wined3d_mutex_lock(); + tmp = dst_impl->wined3d_surface; + texture = dst_impl->wined3d_texture; + rt = wined3d_device_get_render_target(dst_impl->ddraw->wined3d_device, 0); + if (src_impl) { for (current = iface; current != src;) @@ -1216,9 +1222,37 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra ddraw_surface7_Release(current); } - if (SUCCEEDED(hr = wined3d_surface_flip(dst_impl->wined3d_surface, src_impl->wined3d_surface, flags)) - && (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + if (rt == dst_impl->wined3d_surface) + wined3d_device_set_render_target(dst_impl->ddraw->wined3d_device, 0, src_impl->wined3d_surface, FALSE); + wined3d_resource_set_parent(wined3d_surface_get_resource(src_impl->wined3d_surface), dst_impl); + dst_impl->wined3d_surface = src_impl->wined3d_surface; + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), + wined3d_texture_get_parent(dst_impl->wined3d_texture)); + dst_impl->wined3d_texture = src_impl->wined3d_texture; + + /* We don't have to worry about potential texture bindings, since + * flippable surfaces can never be textures. */ + if (rt == src_impl->wined3d_surface) + wined3d_device_set_render_target(dst_impl->ddraw->wined3d_device, 0, tmp, FALSE); + wined3d_resource_set_parent(wined3d_surface_get_resource(tmp), src_impl); + src_impl->wined3d_surface = tmp; + wined3d_resource_set_parent(wined3d_texture_get_resource(texture), + wined3d_texture_get_parent(src_impl->wined3d_texture)); + src_impl->wined3d_texture = texture; + + if (flags) + { + static UINT once; + if (!once++) + FIXME("Ignoring flags %#x.\n", flags); + else + WARN("Ignoring flags %#x.\n", flags); + } + + if (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) hr = ddraw_surface_update_frontbuffer(dst_impl, NULL, FALSE); + else + hr = DD_OK; wined3d_mutex_unlock(); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6a0a29b..b76783f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -328,6 +328,11 @@ void * CDECL wined3d_resource_get_parent(const struct wined3d_resource *resource return resource->parent; } +void CDECL wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent) +{ + resource->parent = parent; +} + void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, struct wined3d_resource_desc *desc) { desc->resource_type = resource->type; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 48512eb..5b28e9b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3414,29 +3414,6 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINED3D_OK; } -HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined3d_surface *override, DWORD flags) -{ - TRACE("surface %p, override %p, flags %#x.\n", surface, override, flags); - - if (flags) - { - static UINT once; - if (!once++) - FIXME("Ignoring flags %#x.\n", flags); - else - WARN("Ignoring flags %#x.\n", flags); - } - - if (surface->swapchain) - { - ERR("Not supported on swapchain surfaces.\n"); - return WINEDDERR_NOTFLIPPABLE; - } - - flip_surface(surface, override); - return WINED3D_OK; -} - static void read_from_framebuffer(struct wined3d_surface *surface) { struct wined3d_device *device = surface->resource.device; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 03f10d2..ed8e24b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -176,6 +176,7 @@ @ cdecl wined3d_resource_get_desc(ptr ptr) @ cdecl wined3d_resource_get_parent(ptr) @ cdecl wined3d_resource_get_private_data(ptr ptr ptr ptr) +@ cdecl wined3d_resource_set_parent(ptr ptr) @ cdecl wined3d_resource_set_private_data(ptr ptr ptr long long) @ cdecl wined3d_rendertarget_view_create(ptr ptr ptr) @@ -206,7 +207,6 @@ @ cdecl wined3d_surface_blt(ptr ptr ptr ptr long ptr long) @ cdecl wined3d_surface_decref(ptr) -@ cdecl wined3d_surface_flip(ptr ptr long) @ cdecl wined3d_surface_from_resource(ptr) @ cdecl wined3d_surface_get_blt_status(ptr long) @ cdecl wined3d_surface_get_flip_status(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 269aa23..2c748ed 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2261,6 +2261,7 @@ void __cdecl wined3d_resource_get_desc(const struct wined3d_resource *resource, void * __cdecl wined3d_resource_get_parent(const struct wined3d_resource *resource); HRESULT __cdecl wined3d_resource_get_private_data(const struct wined3d_resource *resource, REFGUID guid, void *data, DWORD *data_size); +void __cdecl wined3d_resource_set_parent(struct wined3d_resource *resource, void *parent); HRESULT __cdecl wined3d_resource_set_private_data(struct wined3d_resource *resource, REFGUID guid, const void *data, DWORD data_size, DWORD flags); @@ -2304,7 +2305,6 @@ HRESULT __cdecl wined3d_surface_blt(struct wined3d_surface *dst_surface, const R struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const WINEDDBLTFX *blt_fx, enum wined3d_texture_filter_type filter); ULONG __cdecl wined3d_surface_decref(struct wined3d_surface *surface); -HRESULT __cdecl wined3d_surface_flip(struct wined3d_surface *surface, struct wined3d_surface *override, DWORD flags); struct wined3d_surface * __cdecl wined3d_surface_from_resource(struct wined3d_resource *resource); HRESULT __cdecl wined3d_surface_get_blt_status(const struct wined3d_surface *surface, DWORD flags); HRESULT __cdecl wined3d_surface_get_flip_status(const struct wined3d_surface *surface, DWORD flags);

1 0

Henri Verbeet : ddraw/tests: Add a test for primary surface capabilities.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: f637c229f9cf58546434c680ba2876021a1bd07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f637c229f9cf58546434c680b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 5 10:34:16 2013 +0100 ddraw/tests: Add a test for primary surface capabilities. --- dlls/ddraw/tests/ddraw1.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 157 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 628 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f637c229f9cf58546434c…

1 0

Henri Verbeet : ddraw: Require a non-zero back buffer count for swap chains .
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 8797a9eda3f4ccc256cb0716389d8225da6c4615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8797a9eda3f4ccc256cb07163… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 5 10:34:15 2013 +0100 ddraw: Require a non-zero back buffer count for swap chains. --- dlls/ddraw/surface.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 7cb18a1..4c96da8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5647,6 +5647,13 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } + if (!(desc->dwFlags & DDSD_BACKBUFFERCOUNT) || !desc->dwBackBufferCount) + { + WARN("Tried to create a flippable primary surface without any back buffers.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + if (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) { WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n");

1 0

Henri Verbeet : ddraw: Require DDSCAPS_FLIP and DDSCAPS_COMPLEX to be used together.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 23f47b573e3836e6e19729b75bd823e696e9f3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23f47b573e3836e6e19729b75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 5 10:34:14 2013 +0100 ddraw: Require DDSCAPS_FLIP and DDSCAPS_COMPLEX to be used together. --- dlls/ddraw/surface.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 79d5b31..7cb18a1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5629,6 +5629,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { + DWORD flippable = desc->ddsCaps.dwCaps & (DDSCAPS_FLIP | DDSCAPS_COMPLEX); + if (desc->ddsCaps.dwCaps & DDSCAPS_TEXTURE) { WARN("Tried to create a primary surface with DDSCAPS_TEXTURE.\n"); @@ -5636,11 +5638,21 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return DDERR_INVALIDCAPS; } - if ((desc->ddsCaps.dwCaps & DDSCAPS_FLIP) && !(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + if (flippable) { - WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); - HeapFree(GetProcessHeap(), 0, texture); - return DDERR_NOEXCLUSIVEMODE; + if (flippable != (DDSCAPS_FLIP | DDSCAPS_COMPLEX)) + { + WARN("Tried to create a flippable primary surface without both DDSCAPS_FLIP and DDSCAPS_COMPLEX.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDCAPS; + } + + if (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE)) + { + WARN("Tried to create a flippable primary surface without DDSCL_EXCLUSIVE.\n"); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_NOEXCLUSIVEMODE; + } } }

1 0

Nikolay Sivov : ole32: Explicitly check for S_OK.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: a6944484a45b15686d29dab7f7c595084557cd20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6944484a45b15686d29dab7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 08:57:52 2013 +0400 ole32: Explicitly check for S_OK. --- dlls/ole32/marshal.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 4f6aee4..b308600 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -108,7 +108,8 @@ static inline HRESULT get_facbuf_for_iid(REFIID riid, IPSFactoryBuffer **facbuf) HRESULT hr; CLSID clsid; - if ((hr = CoGetPSClsid(riid, &clsid))) + hr = CoGetPSClsid(riid, &clsid); + if (hr != S_OK) return hr; return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER | WINE_CLSCTX_DONT_HOST, NULL, &IID_IPSFactoryBuffer, (LPVOID*)facbuf);

1 0

Nikolay Sivov : ole32: Use existing code to return IMarshal from CoGetStandardMarshal().
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 97ec8b0150403d98e86a57a697a8cc6f3aca09bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ec8b0150403d98e86a57a69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 08:57:33 2013 +0400 ole32: Use existing code to return IMarshal from CoGetStandardMarshal(). --- dlls/ole32/marshal.c | 50 ++++++++++++++++++++++---------------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index c8a02e5..4f6aee4 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1166,13 +1166,10 @@ HRESULT apartment_disconnectproxies(struct apartment *apt) /********************** StdMarshal implementation ****************************/ typedef struct _StdMarshalImpl { - IMarshal IMarshal_iface; - LONG ref; - - IID iid; - DWORD dwDestContext; - LPVOID pvDestContext; - DWORD mshlflags; + IMarshal IMarshal_iface; + LONG ref; + DWORD dest_context; + void *dest_context_data; } StdMarshalImpl; static inline StdMarshalImpl *impl_from_StdMarshal(IMarshal *iface) @@ -1401,8 +1398,8 @@ StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream *pStm, REFIID riid, v wine_dbgstr_longlong(stdobjref.oxid)); if (hres == S_OK) - hres = unmarshal_object(&stdobjref, apt, This->dwDestContext, - This->pvDestContext, riid, + hres = unmarshal_object(&stdobjref, apt, This->dest_context, + This->dest_context_data, riid, stubmgr ? &stubmgr->oxid_info : NULL, ppv); if (stubmgr) stub_manager_int_release(stubmgr); @@ -1476,15 +1473,24 @@ static const IMarshalVtbl StdMarshalVtbl = StdMarshalImpl_DisconnectObject }; -static HRESULT StdMarshalImpl_Construct(REFIID riid, void** ppvObject) +static HRESULT StdMarshalImpl_Construct(REFIID riid, DWORD dest_context, void *dest_context_data, void** ppvObject) { - StdMarshalImpl * pStdMarshal = - HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StdMarshalImpl)); + HRESULT hr; + + StdMarshalImpl *pStdMarshal = HeapAlloc(GetProcessHeap(), 0, sizeof(StdMarshalImpl)); if (!pStdMarshal) return E_OUTOFMEMORY; + pStdMarshal->IMarshal_iface.lpVtbl = &StdMarshalVtbl; pStdMarshal->ref = 0; - return IMarshal_QueryInterface(&pStdMarshal->IMarshal_iface, riid, ppvObject); + pStdMarshal->dest_context = dest_context; + pStdMarshal->dest_context_data = dest_context_data; + + hr = IMarshal_QueryInterface(&pStdMarshal->IMarshal_iface, riid, ppvObject); + if (FAILED(hr)) + HeapFree(GetProcessHeap(), 0, pStdMarshal); + + return hr; } /*********************************************************************** @@ -1514,8 +1520,6 @@ HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, DWORD dwDestContext, LPVOID pvDestContext, DWORD mshlflags, LPMARSHAL *ppMarshal) { - StdMarshalImpl *dm; - if (pUnk == NULL) { FIXME("(%s,NULL,%x,%p,%x,%p), unimplemented yet.\n", @@ -1525,17 +1529,7 @@ HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, TRACE("(%s,%p,%x,%p,%x,%p)\n", debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags,ppMarshal); - *ppMarshal = HeapAlloc(GetProcessHeap(),0,sizeof(StdMarshalImpl)); - dm = (StdMarshalImpl*) *ppMarshal; - if (!dm) return E_FAIL; - dm->IMarshal_iface.lpVtbl = &StdMarshalVtbl; - dm->ref = 1; - - dm->iid = *riid; - dm->dwDestContext = dwDestContext; - dm->pvDestContext = pvDestContext; - dm->mshlflags = mshlflags; - return S_OK; + return StdMarshalImpl_Construct(&IID_IMarshal, dwDestContext, pvDestContext, (void**)ppMarshal); } /*********************************************************************** @@ -1592,7 +1586,7 @@ static HRESULT get_unmarshaler_from_stream(IStream *stream, IMarshal **marshal, if (objref.flags & OBJREF_STANDARD) { TRACE("Using standard unmarshaling\n"); - hr = StdMarshalImpl_Construct(&IID_IMarshal, (LPVOID*)marshal); + hr = StdMarshalImpl_Construct(&IID_IMarshal, 0, NULL, (LPVOID*)marshal); } else if (objref.flags & OBJREF_CUSTOM) { @@ -2029,7 +2023,7 @@ static HRESULT WINAPI StdMarshalCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IMarshal)) - return StdMarshalImpl_Construct(riid, ppv); + return StdMarshalImpl_Construct(riid, 0, NULL, ppv); FIXME("(%s), not supported.\n",debugstr_guid(riid)); return E_NOINTERFACE;

1 0

Nikolay Sivov : ole32: COM cleanup for StdMarshal.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: d52f18da8e4c180854dc445b56a99b055aea6f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d52f18da8e4c180854dc445b5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 5 08:57:12 2013 +0400 ole32: COM cleanup for StdMarshal. --- dlls/ole32/marshal.c | 38 ++++++++++++++++++++++---------------- 1 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index ddaaa53..c8a02e5 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1166,7 +1166,7 @@ HRESULT apartment_disconnectproxies(struct apartment *apt) /********************** StdMarshal implementation ****************************/ typedef struct _StdMarshalImpl { - const IMarshalVtbl *lpvtbl; + IMarshal IMarshal_iface; LONG ref; IID iid; @@ -1175,6 +1175,11 @@ typedef struct _StdMarshalImpl DWORD mshlflags; } StdMarshalImpl; +static inline StdMarshalImpl *impl_from_StdMarshal(IMarshal *iface) +{ + return CONTAINING_RECORD(iface, StdMarshalImpl, IMarshal_iface); +} + static HRESULT WINAPI StdMarshalImpl_QueryInterface(IMarshal *iface, REFIID riid, void **ppv) { @@ -1190,16 +1195,16 @@ StdMarshalImpl_QueryInterface(IMarshal *iface, REFIID riid, void **ppv) } static ULONG WINAPI -StdMarshalImpl_AddRef(LPMARSHAL iface) +StdMarshalImpl_AddRef(IMarshal *iface) { - StdMarshalImpl *This = (StdMarshalImpl *)iface; + StdMarshalImpl *This = impl_from_StdMarshal(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI -StdMarshalImpl_Release(LPMARSHAL iface) +StdMarshalImpl_Release(IMarshal *iface) { - StdMarshalImpl *This = (StdMarshalImpl *)iface; + StdMarshalImpl *This = impl_from_StdMarshal(iface); ULONG ref = InterlockedDecrement(&This->ref); if (!ref) HeapFree(GetProcessHeap(),0,This); @@ -1208,7 +1213,7 @@ StdMarshalImpl_Release(LPMARSHAL iface) static HRESULT WINAPI StdMarshalImpl_GetUnmarshalClass( - LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, + IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, CLSID* pCid) { *pCid = CLSID_DfMarshal; @@ -1217,7 +1222,7 @@ StdMarshalImpl_GetUnmarshalClass( static HRESULT WINAPI StdMarshalImpl_GetMarshalSizeMax( - LPMARSHAL iface, REFIID riid, void* pv, DWORD dwDestContext, + IMarshal *iface, REFIID riid, void* pv, DWORD dwDestContext, void* pvDestContext, DWORD mshlflags, DWORD* pSize) { *pSize = sizeof(STDOBJREF); @@ -1226,7 +1231,7 @@ StdMarshalImpl_GetMarshalSizeMax( static HRESULT WINAPI StdMarshalImpl_MarshalInterface( - LPMARSHAL iface, IStream *pStm,REFIID riid, void* pv, DWORD dest_context, + IMarshal *iface, IStream *pStm,REFIID riid, void* pv, DWORD dest_context, void* dest_context_data, DWORD mshlflags) { STDOBJREF stdobjref; @@ -1328,9 +1333,9 @@ static HRESULT unmarshal_object(const STDOBJREF *stdobjref, APARTMENT *apt, } static HRESULT WINAPI -StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, void **ppv) +StdMarshalImpl_UnmarshalInterface(IMarshal *iface, IStream *pStm, REFIID riid, void **ppv) { - StdMarshalImpl *This = (StdMarshalImpl *)iface; + StdMarshalImpl *This = impl_from_StdMarshal(iface); struct stub_manager *stubmgr = NULL; STDOBJREF stdobjref; ULONG res; @@ -1410,7 +1415,7 @@ StdMarshalImpl_UnmarshalInterface(LPMARSHAL iface, IStream *pStm, REFIID riid, v } static HRESULT WINAPI -StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm) +StdMarshalImpl_ReleaseMarshalData(IMarshal *iface, IStream *pStm) { STDOBJREF stdobjref; ULONG res; @@ -1452,13 +1457,13 @@ StdMarshalImpl_ReleaseMarshalData(LPMARSHAL iface, IStream *pStm) } static HRESULT WINAPI -StdMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwReserved) +StdMarshalImpl_DisconnectObject(IMarshal *iface, DWORD dwReserved) { FIXME("(), stub!\n"); return S_OK; } -static const IMarshalVtbl VT_StdMarshal = +static const IMarshalVtbl StdMarshalVtbl = { StdMarshalImpl_QueryInterface, StdMarshalImpl_AddRef, @@ -1477,9 +1482,9 @@ static HRESULT StdMarshalImpl_Construct(REFIID riid, void** ppvObject) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(StdMarshalImpl)); if (!pStdMarshal) return E_OUTOFMEMORY; - pStdMarshal->lpvtbl = &VT_StdMarshal; + pStdMarshal->IMarshal_iface.lpVtbl = &StdMarshalVtbl; pStdMarshal->ref = 0; - return IMarshal_QueryInterface((IMarshal*)pStdMarshal, riid, ppvObject); + return IMarshal_QueryInterface(&pStdMarshal->IMarshal_iface, riid, ppvObject); } /*********************************************************************** @@ -1519,10 +1524,11 @@ HRESULT WINAPI CoGetStandardMarshal(REFIID riid, IUnknown *pUnk, } TRACE("(%s,%p,%x,%p,%x,%p)\n", debugstr_guid(riid),pUnk,dwDestContext,pvDestContext,mshlflags,ppMarshal); + *ppMarshal = HeapAlloc(GetProcessHeap(),0,sizeof(StdMarshalImpl)); dm = (StdMarshalImpl*) *ppMarshal; if (!dm) return E_FAIL; - dm->lpvtbl = &VT_StdMarshal; + dm->IMarshal_iface.lpVtbl = &StdMarshalVtbl; dm->ref = 1; dm->iid = *riid;

1 0

Akira Nakagawa : po: Update Japanese translation.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 6f245443c0e1ae44bf0e76c3b05c58759fbc916c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f245443c0e1ae44bf0e76c3b… Author: Akira Nakagawa <matyapiro31(a)gmail.com> Date: Thu Dec 5 20:10:24 2013 +0900 po: Update Japanese translation. --- po/ja.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/ja.po b/po/ja.po index 065dc48..8285301 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-10-02 19:45+0900\n" -"Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" +"PO-Revision-Date: 2013-12-05 20:08+0900\n" +"Last-Translator: Akira Nakagawa <matyapiro31(a)yahoo.co.jp>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" @@ -4688,8 +4688,6 @@ msgid "No Unicode translation.\n" msgstr "Unicode 変換がありません。\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "DLL の初期化に失敗しました。\n" @@ -12718,10 +12716,8 @@ msgid "Select Drive Letter" msgstr "ドライブレターを選択" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Wine 設定" +msgstr "ドライブの設定" #: winecfg.rc:227 msgid "" @@ -13000,10 +12996,8 @@ msgid "Letter" msgstr "文字" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "新しいフォルダ" +msgstr "対象のフォルダ" #: winecfg.rc:79 msgid ""

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 02bb13c029edbce9c9a3ffcfa0f48d9b4ca19c95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bb13c029edbce9c9a3ffcfa… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Dec 5 01:26:43 2013 -0200 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index d0290ba..130dc89 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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: 2013-06-19 23:36-0300\n" +"PO-Revision-Date: 2013-12-05 01:21-0200\n" "Last-Translator: Bruno Jesus <00cpxxx(a)gmail.com>\n" "Language-Team: none\n" "Language: Portuguese (Brazil)\n" @@ -4708,10 +4708,8 @@ msgid "No Unicode translation.\n" msgstr "Sem tradução Unicode.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" -msgstr "Falha na inicialização do DLL.\n" +msgstr "Falha ao iniciar DLL.\n" #: winerror.mc:1371 msgid "Shutdown in progress.\n" @@ -12800,10 +12798,8 @@ msgid "Select Drive Letter" msgstr "Selecione a Letra" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Configuração do Wine" +msgstr "Configuração de unidades" #: winecfg.rc:227 msgid "" @@ -13082,10 +13078,8 @@ msgid "Letter" msgstr "Letra" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Nova Pasta" +msgstr "Diretório alvo" #: winecfg.rc:79 msgid ""

1 0

Andrey Gusev : po: Some Ukrainian translation updates and typo fixes.
by Alexandre Julliard 05 Dec '13

05 Dec '13

Module: wine Branch: master Commit: 4e685119bf78701f8b8bc355de895c310635e0f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e685119bf78701f8b8bc355d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Dec 5 01:58:47 2013 +0200 po: Some Ukrainian translation updates and typo fixes. --- po/uk.po | 64 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 30 insertions(+), 34 deletions(-) diff --git a/po/uk.po b/po/uk.po index 26a63c9..d0fe2f0 100644 --- a/po/uk.po +++ b/po/uk.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: 2013-11-08 16:34+0300\n" +"PO-Revision-Date: 2013-12-05 01:45+0300\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: none\n" "Language: Ukrainian\n" @@ -491,7 +491,7 @@ msgstr "Принтер" #: comdlg32.rc:225 msgid "&Default Printer" -msgstr "Принтер за &обумовленням" +msgstr "Принтер за &замовчуванням" #: comdlg32.rc:226 msgid "[none]" @@ -986,7 +986,7 @@ msgstr "Виникла помилка принтера." #: comdlg32.rc:67 msgid "No default printer defined." -msgstr "Немає принтера, поставленого за обумовленням." +msgstr "Немає принтера, поставленого за замовчуванням." #: comdlg32.rc:68 msgid "Cannot find the printer." @@ -1014,7 +1014,7 @@ msgstr "" #: comdlg32.rc:140 msgid "Select a font size between %1!d! and %2!d! points." -msgstr "Биберіть шрифт розміром %1!d! - %2!d! пунктів." +msgstr "Виберіть шрифт розміром %1!d! - %2!d! пунктів." #: comdlg32.rc:141 ieframe.rc:35 msgid "&Save" @@ -1062,7 +1062,7 @@ msgstr "Поставте папір вручну; " #: comdlg32.rc:89 msgid "Paper problem; " -msgstr "Проблема с папером; " +msgstr "Проблема з папером; " #: comdlg32.rc:90 msgid "Printer offline; " @@ -1086,7 +1086,7 @@ msgstr "Лоток переповнений папером; " #: comdlg32.rc:95 msgid "Not available; " -msgstr "Не доступний; " +msgstr "Недоступний; " #: comdlg32.rc:96 msgid "Waiting; " @@ -1854,7 +1854,7 @@ msgstr "Немає" #: crypt32.rc:199 msgid "Information Not Available" -msgstr "Інформація не доступна" +msgstr "Інформація недоступна" #: crypt32.rc:200 msgid "Authority Info Access" @@ -2926,7 +2926,7 @@ msgstr "" #: devenum.rc:33 msgid "Default DirectSound" -msgstr "Стандартний DirectSound" +msgstr "DirectSound за замовчуванням" #: devenum.rc:34 msgid "DirectSound: %s" @@ -2934,11 +2934,11 @@ msgstr "DirectSound: %s" #: devenum.rc:35 msgid "Default WaveOut Device" -msgstr "Звуковий пристрій виводу по замовчуванні" +msgstr "Звуковий пристрій виводу за замовчуванням" #: devenum.rc:36 msgid "Default MidiOut Device" -msgstr "Пристрій виводу Midi по замовчуванні" +msgstr "Пристрій виводу Midi за замовчуванням" #: dinput.rc:43 msgid "Configure Devices" @@ -3279,7 +3279,7 @@ msgstr "Шукається %s" #: ieframe.rc:82 msgid "Start downloading %s" -msgstr "Завантаження %s" +msgstr "Початок завантаження %s" #: ieframe.rc:83 msgid "Downloading %s" @@ -3669,7 +3669,7 @@ msgstr "Пам'ять засмічена.\n" #: winerror.mc:66 msgid "Not enough memory.\n" -msgstr "Не досить пам'яті.\n" +msgstr "Недосить пам'яті.\n" #: winerror.mc:71 msgid "Invalid block.\n" @@ -3801,7 +3801,7 @@ msgstr "Дубльоване мережне ім'я.\n" #: winerror.mc:231 msgid "Bad network path.\n" -msgstr "Невірний мрежний шлях.\n" +msgstr "Невірний мережний шлях.\n" #: winerror.mc:236 msgid "Network busy.\n" @@ -4581,7 +4581,7 @@ msgstr "Процес перервано.\n" #: winerror.mc:1216 msgid "Service dependency failed.\n" -msgstr "невдала сервісна залежність.\n" +msgstr "Невдала сервісна залежність.\n" #: winerror.mc:1221 msgid "Service login failed.\n" @@ -5905,7 +5905,7 @@ msgstr "Помилка створення.\n" #: winerror.mc:2881 msgid "Temporary directory not writable.\n" -msgstr "Тимчасова тека не доступна для запису.\n" +msgstr "Тимчасова тека недоступна для запису.\n" #: winerror.mc:2886 msgid "Installation platform not supported.\n" @@ -6641,7 +6641,7 @@ msgstr "Введіть Мережний Пароль" #: mpr.rc:38 wininet.rc:40 wininet.rc:60 msgid "Please enter your username and password:" -msgstr "Будь ласка, введіть Ваші ім'я та пароль:" +msgstr "Будь-ласка, введіть Ваші ім'я та пароль:" #: mpr.rc:39 wininet.rc:41 msgid "Proxy" @@ -9537,7 +9537,7 @@ msgstr "" #: cmd.rc:105 msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" -msgstr "MD <ім'я> це коротка версія MKDIR. Вона створює пвдтеку.\n" +msgstr "MD <ім'я> це коротка версія MKDIR. Вона створює підтеку.\n" #: cmd.rc:106 msgid "MKDIR <name> creates a subdirectory.\n" @@ -11272,7 +11272,7 @@ msgstr "" #: progman.rc:77 msgid "Help not available." -msgstr "Довідка не доступна." +msgstr "Довідка недоступна." #: progman.rc:78 msgid "Unknown feature in %s" @@ -12764,10 +12764,8 @@ msgid "Select Drive Letter" msgstr "Виберіть букву диску" #: winecfg.rc:226 -#, fuzzy -#| msgid "Wine configuration" msgid "Drive configuration" -msgstr "Параметри Wine" +msgstr "Налаштування привода" #: winecfg.rc:227 msgid "" @@ -12879,7 +12877,7 @@ msgstr "Диски" #: winecfg.rc:36 msgid "Select the Unix target directory, please." -msgstr "Виберіть цільову теку Unix, будь ласка." +msgstr "Будь-ласка, виберіть цільову теку Unix." #: winecfg.rc:37 msgid "Hide &Advanced" @@ -13046,10 +13044,8 @@ msgid "Letter" msgstr "Буква" #: winecfg.rc:78 -#, fuzzy -#| msgid "New Folder" msgid "Target folder" -msgstr "Нова Тека" +msgstr "Цільова тека" #: winecfg.rc:79 msgid "" @@ -13207,7 +13203,7 @@ msgstr "Керування" #: wineconsole.rc:69 msgid "Popup menu" -msgstr "Сплив. меню" +msgstr "Спливаюче меню" #: wineconsole.rc:70 msgid "&Control" @@ -13219,7 +13215,7 @@ msgstr "" #: wineconsole.rc:72 msgid "Quick edit" -msgstr "Швидке редагув" +msgstr "Швидке редагування" #: wineconsole.rc:73 msgid "&enable" @@ -13299,7 +13295,7 @@ msgstr "Змінювати лише поточну сесію" #: wineconsole.rc:29 msgid "Set &Defaults" -msgstr "За &замовчанням" +msgstr "За &замовчуванням" #: wineconsole.rc:31 msgid "&Mark" @@ -13612,11 +13608,11 @@ msgstr "Пр&ихований" #: winefile.rc:178 msgid "&Archive" -msgstr "&Архів" +msgstr "&Архівний" #: winefile.rc:179 msgid "&System" -msgstr "&Сисемний" +msgstr "&Системний" #: winefile.rc:180 msgid "&Compressed" @@ -13724,7 +13720,7 @@ msgstr "&Свої параметри..." #: winemine.rc:47 msgid "&Fastest Times" -msgstr "&Кращі Часи" +msgstr "&Найкращі результати" #: winemine.rc:52 msgid "&About WineMine" @@ -13932,7 +13928,7 @@ msgstr "&Формат символів" #: wordpad.rc:64 msgid "&Def. char format" -msgstr "Формат &символів за замовч." +msgstr "Формат символів за &замовч." #: wordpad.rc:65 msgid "Paragrap&h format" @@ -14107,7 +14103,7 @@ msgstr "Текстові документи (*.txt)" #: wordpad.rc:141 msgid "Unicode text document (*.txt)" -msgstr "Текстовий документ юнікод (*.txt)" +msgstr "Текстовий документ Юнікод (*.txt)" #: wordpad.rc:142 msgid "Rich text format (*.rtf)" @@ -14123,7 +14119,7 @@ msgstr "Текстовий документ" #: wordpad.rc:145 msgid "Unicode text document" -msgstr "Текстовий документ юнікод" +msgstr "Текстовий документ Юнікод" #: wordpad.rc:146 msgid "Printer files (*.prn)"

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2013