January 2014 - Wine-commits

Alistair Leslie-Hughes : dpnet: Add stubbed interface IDirectPlay8Server.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 64b40aeb82d0ef63995a55c6c89d0e75b880c9e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b40aeb82d0ef63995a55c6c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 8 13:19:47 2014 +1100 dpnet: Add stubbed interface IDirectPlay8Server. --- dlls/dpnet/server.c | 364 +++++++++++++++++++++++++++++++++++++++++- dlls/dpnet/tests/Makefile.in | 3 +- dlls/dpnet/tests/server.c | 66 ++++++++ 3 files changed, 429 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64b40aeb82d0ef63995a5…

1 0

Alistair Leslie-Hughes : dpnet: Cleanup IDirectPlay8Peer COM interface.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 1fd704b3af6de6a3c2ac0a5576689290e3832a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fd704b3af6de6a3c2ac0a557… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 10 10:27:59 2014 +1100 dpnet: Cleanup IDirectPlay8Peer COM interface. --- dlls/dpnet/dpnet_private.h | 10 ---------- dlls/dpnet/peer.c | 24 +++++++++++++++++++----- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 72012cd..4a42eae 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -35,7 +35,6 @@ typedef struct IDirectPlay8ClientImpl IDirectPlay8ClientImpl; typedef struct IDirectPlay8AddressImpl IDirectPlay8AddressImpl; typedef struct IDirectPlay8LobbiedApplicationImpl IDirectPlay8LobbiedApplicationImpl; -typedef struct IDirectPlay8PeerImpl IDirectPlay8PeerImpl; typedef struct IDirectPlay8ThreadPoolImpl IDirectPlay8ThreadPoolImpl; /* ------------------ */ @@ -78,15 +77,6 @@ struct IDirectPlay8LobbiedApplicationImpl }; /***************************************************************************** - * IDirectPlay8Peer implementation structure - */ -struct IDirectPlay8PeerImpl -{ - IDirectPlay8Peer IDirectPlay8Peer_iface; - LONG ref; -}; - -/***************************************************************************** * IDirectPlay8ThreadPool implementation structure */ struct IDirectPlay8ThreadPoolImpl diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index ef100a3..1b287dd 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -38,6 +38,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnet); + +typedef struct IDirectPlay8PeerImpl +{ + IDirectPlay8Peer IDirectPlay8Peer_iface; + LONG ref; +} IDirectPlay8PeerImpl; + static inline IDirectPlay8PeerImpl *impl_from_IDirectPlay8Peer(IDirectPlay8Peer *iface) { return CONTAINING_RECORD(iface, IDirectPlay8PeerImpl, IDirectPlay8Peer_iface); @@ -66,6 +73,8 @@ static ULONG WINAPI IDirectPlay8PeerImpl_AddRef(IDirectPlay8Peer *iface) IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); ULONG RefCount = InterlockedIncrement(&This->ref); + TRACE("(%p) ref=%d\n", This, RefCount); + return RefCount; } @@ -74,6 +83,8 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) IDirectPlay8PeerImpl* This = impl_from_IDirectPlay8Peer(iface); ULONG RefCount = InterlockedDecrement(&This->ref); + TRACE("(%p) ref=%d\n", This, RefCount); + if(!RefCount) HeapFree(GetProcessHeap(), 0, This); @@ -474,23 +485,26 @@ static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = IDirectPlay8PeerImpl_TerminateSession }; -HRESULT DPNET_CreateDirectPlay8Peer(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj) { +HRESULT DPNET_CreateDirectPlay8Peer(IClassFactory *iface, IUnknown *pUnkOuter, REFIID riid, LPVOID *ppobj) +{ IDirectPlay8PeerImpl* Client; HRESULT ret; Client = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectPlay8PeerImpl)); + *ppobj = NULL; + if(Client == NULL) { - *ppobj = NULL; WARN("Not enough memory\n"); return E_OUTOFMEMORY; } Client->IDirectPlay8Peer_iface.lpVtbl = &DirectPlay8Peer_Vtbl; - ret = IDirectPlay8PeerImpl_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); - if(ret != DPN_OK) - HeapFree(GetProcessHeap(), 0, Client); + Client->ref = 1; + + ret = IDirectPlay8Peer_QueryInterface(&Client->IDirectPlay8Peer_iface, riid, ppobj); + IDirectPlay8Peer_Release(&Client->IDirectPlay8Peer_iface); return ret; }

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 57c5cd6cbc55f6780ecf4b8240cd7c7424931dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c5cd6cbc55f6780ecf4b824… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 17 13:01:06 2014 +0200 po: Update Ukrainian translation. --- po/uk.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/uk.po b/po/uk.po index 4cba99d..1b08d4b 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-12-31 15:59+0300\n" +"PO-Revision-Date: 2014-01-17 12:58+0300\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: none\n" "Language: Ukrainian\n" @@ -5189,7 +5189,7 @@ msgstr "" #: winerror.mc:1981 msgid "Invalid account name.\n" -msgstr "Невірне ім'я акаунта.\n" +msgstr "Невірне ім'я облікового запису.\n" #: winerror.mc:1986 msgid "User already exists.\n" @@ -10102,7 +10102,7 @@ msgstr "Командний рядок Wine" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10175,10 +10175,8 @@ msgid "Wine Explorer" msgstr "Оглядач Wine" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Автозавантаження" +msgstr "Пуск" #: explorer.rc:34 winefile.rc:36 msgid "&Run..." @@ -12633,7 +12631,7 @@ msgstr "Wine" #: wineboot.rc:46 msgid "The Wine configuration in %s is being updated, please wait..." -msgstr "Оновлення конфігурації Wine в %s, будь-ласка зачекайте..." +msgstr "Оновлення конфігурації Wine в %s, будь-ласка, зачекайте..." #: winecfg.rc:135 msgid ""

1 0

Frédéric Delanoy : mmdevapi/tests: Remove unused dbgstr_guid function.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: b0071852e8821cf04bab5011e81f40fd3d6c66a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0071852e8821cf04bab5011e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jan 17 12:42:10 2014 +0100 mmdevapi/tests: Remove unused dbgstr_guid function. --- dlls/mmdevapi/tests/render.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 4117cb3..078eab7 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -60,16 +60,6 @@ static HRESULT hexcl = S_OK; /* or AUDCLNT_E_EXCLUSIVE_MODE_NOT_ALLOWED */ static const LARGE_INTEGER ullZero; -static inline const char *dbgstr_guid( const GUID *id ) -{ - static char ret[256]; - sprintf(ret, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - id->Data1, id->Data2, id->Data3, - id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], - id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); - return ret; -} - #define PI 3.14159265358979323846L static DWORD wave_generate_tone(PWAVEFORMATEX pwfx, BYTE* data, UINT32 frames) {

1 0

Jacek Caban : msctf.idl: Added some missing declarations.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: c30581274ed896523c0e5f26edfc06b1e95e9e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c30581274ed896523c0e5f26e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 17 14:14:12 2014 +0100 msctf.idl: Added some missing declarations. --- include/msctf.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/msctf.idl b/include/msctf.idl index a3db32e..e4b54e4 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -84,6 +84,8 @@ cpp_quote("#define TF_MOD_IGNORE_ALL_MODIFIER 0x0400") cpp_quote("#define TF_PROFILETYPE_INPUTPROCESSOR 0x0001") cpp_quote("#define TF_PROFILETYPE_KEYBOARDLAYOUT 0x0002") +cpp_quote("#define TF_IPSINK_FLAG_ACTIVE 0x0001") + interface ITfDocumentMgr; interface ITfContext; interface IEnumTfDocumentMgrs; @@ -326,6 +328,8 @@ interface ITfContext : IUnknown }; +const DWORD TF_INVALID_COOKIE = 0xffffffff; + [ object, uuid(4ea48a35-60ae-446f-8fd6-e6a8d82459f7), @@ -1522,3 +1526,20 @@ interface ITfThreadFocusSink : IUnknown HRESULT OnKillThreadFocus(); }; + +[ + object, + uuid(71c6e74e-0f28-11d8-a82a-00065b84435c), + pointer_default(unique) +] +interface ITfInputProcessorProfileActivationSink : IUnknown +{ + HRESULT OnActivated( + [in] DWORD dwProfileType, + [in] LANGID langid, + [in] REFCLSID clsid, + [in] REFGUID catid, + [in] REFGUID guidProfile, + [in] HKL hkl, + [in] DWORD dwFlags); +}

1 0

Jacek Caban : include: Fixed eConnTypeRJ11Modem declaration.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 2190601ca20a5088a1cd6e50a0587e6fe1cf2c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2190601ca20a5088a1cd6e50a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 17 14:40:50 2014 +0100 include: Fixed eConnTypeRJ11Modem declaration. --- include/devicetopology.idl | 2 +- include/ksmedia.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 0cacce2..74796a2 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -81,7 +81,7 @@ typedef enum eConnTypeOtherAnalog, eConnTypeMultichannelAnalogDIN, eConnTypeXlrProfessional, - eConnTypeRj11Modem, + eConnTypeRJ11Modem, eConnTypeCombination } EPcxConnectionType; diff --git a/include/ksmedia.h b/include/ksmedia.h index dec2866..88c9fad 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -57,7 +57,7 @@ typedef enum eConnTypeOtherAnalog, eConnTypeMultichannelAnalogDIN, eConnTypeXlrProfessional, - eConnTypeRj11Modem, + eConnTypeRJ11Modem, eConnTypeCombination } EPcxConnectionType;

1 0

Stefan Dösinger : wined3d: Add a missing break.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: f1ac04f2a6aea5056d9e5a3a3f429d63f1ec9c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ac04f2a6aea5056d9e5a3a3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:13 2014 +0100 wined3d: Add a missing break. --- dlls/wined3d/surface.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 015478f..1b61cb5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -598,6 +598,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) case SFLAG_INDIB: if (!surface->dib.bitmap_data) ERR("Map binding is set to SFLAG_INDIB but surface->dib.bitmap_data is NULL.\n"); + break; case SFLAG_INSYSMEM: surface_prepare_system_memory(surface);

1 0

Stefan Dösinger : wined3d: Remove surface_ops->map.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: 00923cb50ce39c5917d0bb15c545ff7fd12d7d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00923cb50ce39c5917d0bb15c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:14 2014 +0100 wined3d: Remove surface_ops->map. --- dlls/wined3d/surface.c | 97 ++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 33 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1b61cb5..2317ce6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -810,45 +810,6 @@ static void surface_realize_palette(struct wined3d_surface *surface) surface_load_location(surface, surface->draw_binding); } -static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) -{ - struct wined3d_device *device = surface->resource.device; - BYTE *ret; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - TRACE("surface %p, rect %s, flags %#x.\n", - surface, wine_dbgstr_rect(rect), flags); - - switch (surface->map_binding) - { - case SFLAG_INUSERMEM: - return surface->user_memory; - - case SFLAG_INDIB: - return surface->dib.bitmap_data; - - case SFLAG_INBUFFER: - context = context_acquire(device, NULL); - gl_info = context->gl_info; - - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); - ret = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("map PBO"); - - context_release(context); - return ret; - - case SFLAG_INSYSMEM: - return surface->resource.heap_memory; - - default: - ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); - return NULL; - } -} - static void surface_unmap(struct wined3d_surface *surface) { struct wined3d_device *device = surface->resource.device; @@ -1381,7 +1342,6 @@ static const struct wined3d_surface_ops surface_ops = { surface_private_setup, surface_realize_palette, - surface_map, surface_unmap, }; @@ -1458,28 +1418,6 @@ static void gdi_surface_realize_palette(struct wined3d_surface *surface) x11_copy_to_screen(surface->swapchain, NULL); } -static BYTE *gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD flags) -{ - TRACE("surface %p, rect %s, flags %#x.\n", - surface, wine_dbgstr_rect(rect), flags); - - switch (surface->map_binding) - { - case SFLAG_INUSERMEM: - return surface->user_memory; - - case SFLAG_INDIB: - return surface->dib.bitmap_data; - - case SFLAG_INSYSMEM: - return surface->resource.heap_memory; - - default: - ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); - return NULL; - } -} - static void gdi_surface_unmap(struct wined3d_surface *surface) { TRACE("surface %p.\n", surface); @@ -1495,7 +1433,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = { gdi_surface_private_setup, gdi_surface_realize_palette, - gdi_surface_map, gdi_surface_unmap, }; @@ -3099,6 +3036,9 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_desc *map_desc, const RECT *rect, DWORD flags) { const struct wined3d_format *format = surface->resource.format; + struct wined3d_device *device = surface->resource.device; + struct wined3d_context *context; + const struct wined3d_gl_info *gl_info; BYTE *base_memory; TRACE("surface %p, map_desc %p, rect %s, flags %#x.\n", @@ -3156,7 +3096,36 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) surface_invalidate_location(surface, ~surface->map_binding); - base_memory = surface->surface_ops->surface_map(surface, rect, flags); + switch (surface->map_binding) + { + case SFLAG_INUSERMEM: + base_memory = surface->user_memory; + break; + + case SFLAG_INDIB: + base_memory = surface->dib.bitmap_data; + break; + + case SFLAG_INBUFFER: + context = context_acquire(device, NULL); + gl_info = context->gl_info; + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, surface->pbo)); + base_memory = GL_EXTCALL(glMapBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, GL_READ_WRITE_ARB)); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("map PBO"); + + context_release(context); + break; + + case SFLAG_INSYSMEM: + base_memory = surface->resource.heap_memory; + break; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + base_memory = NULL; + } if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH) map_desc->row_pitch = surface->resource.width * format->byte_count; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e23d284..dc7ba65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2180,7 +2180,6 @@ struct wined3d_surface_ops { HRESULT (*surface_private_setup)(struct wined3d_surface *surface); void (*surface_realize_palette)(struct wined3d_surface *surface); - BYTE *(*surface_map)(struct wined3d_surface *surface, const RECT *rect, DWORD flags); void (*surface_unmap)(struct wined3d_surface *surface); };

1 0

Stefan Dösinger : wined3d: Separate surface locations and flags.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: beb64c9998261976e799b969dcfc78abf1da3a97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb64c9998261976e799b969d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:15 2014 +0100 wined3d: Separate surface locations and flags. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 5 +- dlls/wined3d/surface.c | 116 ++++++++++++++++++------------------- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/wined3d_private.h | 11 +--- 6 files changed, 67 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=beb64c9998261976e799b…

1 0

Stefan Dösinger : wined3d: Migrate surfaces to the new location flags.
by Alexandre Julliard 17 Jan '14

17 Jan '14

Module: wine Branch: master Commit: b81e5605310754363b2275329eb042a94c9e1993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b81e5605310754363b2275329… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 17 13:27:16 2014 +0100 wined3d: Migrate surfaces to the new location flags. --- dlls/wined3d/arb_program_shader.c | 3 +- dlls/wined3d/context.c | 40 ++--- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 10 +- dlls/wined3d/drawprim.c | 4 +- dlls/wined3d/surface.c | 307 +++++++++++++++++++------------------ dlls/wined3d/swapchain.c | 40 ++--- dlls/wined3d/utils.c | 23 +-- dlls/wined3d/wined3d_private.h | 22 +-- 9 files changed, 221 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b81e5605310754363b227…

1 0