April 2013 - Wine-commits - list.winehq.org

Michael Stefaniuc : dplayx: Merge dpinit.h into dplay_global.h.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 5e03836603db95347a75e4d7d7906bee606a93ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e03836603db95347a75e4d7d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:11:29 2013 +0100 dplayx: Merge dpinit.h into dplay_global.h. --- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dpinit.h | 37 ------------------------------------- dlls/dplayx/dplay.c | 1 - dlls/dplayx/dplay_global.h | 5 +++++ dlls/dplayx/dplaysp.c | 1 - dlls/dplayx/dplobby.c | 1 - dlls/dplayx/lobbysp.c | 1 - 7 files changed, 6 insertions(+), 42 deletions(-) diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index 438ad60..c64c5fc 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -31,7 +31,7 @@ #include "dplay.h" #include "dplobby.h" #include "initguid.h" -#include "dpinit.h" +#include "dplay_global.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/dlls/dplayx/dpinit.h b/dlls/dplayx/dpinit.h deleted file mode 100644 index 090b67a..0000000 --- a/dlls/dplayx/dpinit.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 1999, 2000 Peter Hunnisett - * - * 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 - */ - -#ifndef __WINE_DPINIT_H -#define __WINE_DPINIT_H - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wtypes.h" -#include "dplay_global.h" - -extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; -extern HRESULT DPL_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN; -extern HRESULT DPSP_CreateInterface( REFIID riid, LPVOID* ppvObj, - IDirectPlay2Impl* dp ) DECLSPEC_HIDDEN; -extern HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, - IDirectPlay2Impl* dp ) DECLSPEC_HIDDEN; - - -#endif diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index b7b9cdd..eb52cd2 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -35,7 +35,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#include "dpinit.h" #include "dplayx_global.h" #include "name_server.h" #include "dplayx_queue.h" diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index 18eb8077..0928c1a 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -209,4 +209,9 @@ extern HRESULT DP_SetSPPlayerData( IDirectPlay2Impl* lpDP, DPID idPlayer, LPVOID /* DP external interfaces to call into DPSP interface */ extern LPVOID DPSP_CreateSPPlayerData(void) DECLSPEC_HIDDEN; +extern HRESULT dplay_create( REFIID riid, void **ppv ) DECLSPEC_HIDDEN; +extern HRESULT DPL_CreateInterface( REFIID riid, LPVOID* ppvObj ) DECLSPEC_HIDDEN; +extern HRESULT DPSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; +extern HRESULT DPLSP_CreateInterface( REFIID riid, void **ppvObj, IDirectPlayImpl *dp ) DECLSPEC_HIDDEN; + #endif /* __WINE_DPLAY_GLOBAL_INCLUDED */ diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 9ce6910..4a8c4a5 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -22,7 +22,6 @@ #include "winerror.h" #include "wine/debug.h" -#include "dpinit.h" #include "wine/dplaysp.h" #include "dplay_global.h" #include "name_server.h" diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index cbdd128..46a2168 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -32,7 +32,6 @@ #include "dplayx_messages.h" #include "dplayx_queue.h" #include "dplobby.h" -#include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay); diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 737cb3f..18d9d00 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -23,7 +23,6 @@ #include "lobbysp.h" #include "dplay_global.h" -#include "dpinit.h" WINE_DEFAULT_DEBUG_CHANNEL(dplay);

1 0

Michael Stefaniuc : dplayx: Get rid of the IDirectPlayImpl aliases.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: f546609d09f9412b3fcc72a3a294ade29e98b375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f546609d09f9412b3fcc72a3a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:12:33 2013 +0100 dplayx: Get rid of the IDirectPlayImpl aliases. --- dlls/dplayx/dplay.c | 149 +++++++++++++++------------------------- dlls/dplayx/dplay_global.h | 18 ++---- dlls/dplayx/dplaysp.c | 8 +- dlls/dplayx/dplayx_messages.c | 31 ++++----- dlls/dplayx/dplayx_messages.h | 10 ++-- dlls/dplayx/lobbysp.c | 8 +- dlls/dplayx/name_server.c | 6 +- dlls/dplayx/name_server.h | 2 +- 8 files changed, 90 insertions(+), 142 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f546609d09f9412b3fcc7…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay2A.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: cf894d4c0d4a7acc30ef8d009db40e9b066ecd7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf894d4c0d4a7acc30ef8d009… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:13:11 2013 +0100 dplayx: Add a separate refcount for IDirectPlay2A. --- dlls/dplayx/dplay.c | 282 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 284 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf894d4c0d4a7acc30ef8…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay2.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 9378c4182f6b4f1f4db5e6538eb36e24e4728aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9378c4182f6b4f1f4db5e6538… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:14:07 2013 +0100 dplayx: Add a separate refcount for IDirectPlay2. --- dlls/dplayx/dplay.c | 282 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 284 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9378c4182f6b4f1f4db5e…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay3A.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 36dccf839a9432196da94be100e4ee15604ecd54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dccf839a9432196da94be10… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:15:01 2013 +0100 dplayx: Add a separate refcount for IDirectPlay3A. --- dlls/dplayx/dplay.c | 409 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 411 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36dccf839a9432196da94…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlay3.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: ac0368e800b2c96946ea991cd682693ead0f5037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0368e800b2c96946ea991cd… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Mar 29 17:15:57 2013 +0100 dplayx: Add a separate refcount for IDirectPlay3. --- dlls/dplayx/dplay.c | 409 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/dplay_global.h | 3 +- dlls/dplayx/tests/dplayx.c | 2 +- 3 files changed, 411 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ac0368e800b2c96946ea9…

1 0

Ken Thomases : winemac: Drain the autorelease pool within loop in OnMainThread().
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 5dac8a90cc718548fab6455e6130157ca4024f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dac8a90cc718548fab6455e6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:11 2013 -0500 winemac: Drain the autorelease pool within loop in OnMainThread(). --- dlls/winemac.drv/cocoa_event.m | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index a1a6f9c..76fb543 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -314,7 +314,12 @@ void OnMainThread(dispatch_block_t block) } if (!finished) + { + [pool release]; + pool = [[NSAutoreleasePool alloc] init]; + kevent(queue->kq, NULL, 0, &kev, 1, NULL); + } } [pool release];

1 0

Ken Thomases : winemac: Constify some macdrv_event pointer parameters.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: b55d7aae1077f7628c16b97f924b6ce9b350e5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b55d7aae1077f7628c16b97f9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:25 2013 -0500 winemac: Constify some macdrv_event pointer parameters. --- dlls/winemac.drv/event.c | 4 ++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_cocoa.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c index 4f4d247..6f35d9d 100644 --- a/dlls/winemac.drv/event.c +++ b/dlls/winemac.drv/event.c @@ -111,7 +111,7 @@ static macdrv_event_mask get_event_mask(DWORD mask) * * Handler for QUERY_EVENT queries. */ -static void macdrv_query_event(HWND hwnd, macdrv_event *event) +static void macdrv_query_event(HWND hwnd, const macdrv_event *event) { BOOL success = FALSE; macdrv_query *query = event->query_event.query; @@ -148,7 +148,7 @@ static void macdrv_query_event(HWND hwnd, macdrv_event *event) /*********************************************************************** * macdrv_handle_event */ -void macdrv_handle_event(macdrv_event *event) +void macdrv_handle_event(const macdrv_event *event) { HWND hwnd = macdrv_get_window_hwnd(event->window); const macdrv_event *prev; diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index f8c45ab..f905359 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -142,7 +142,7 @@ extern struct window_surface *create_surface(macdrv_window window, const RECT *r extern void set_window_surface(macdrv_window window, struct window_surface *window_surface) DECLSPEC_HIDDEN; extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha) DECLSPEC_HIDDEN; -extern void macdrv_handle_event(macdrv_event *event) DECLSPEC_HIDDEN; +extern void macdrv_handle_event(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_window_close_requested(HWND hwnd) DECLSPEC_HIDDEN; extern void macdrv_window_frame_changed(HWND hwnd, CGRect frame) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 2d74969..67da3a3 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -266,7 +266,7 @@ static inline macdrv_event_mask event_mask_for_type(int type) return ((macdrv_event_mask)1 << type); } -typedef void (*macdrv_event_handler)(macdrv_event *event); +typedef void (*macdrv_event_handler)(const macdrv_event *event); extern macdrv_event_queue macdrv_create_event_queue(macdrv_event_handler handler) DECLSPEC_HIDDEN; extern void macdrv_destroy_event_queue(macdrv_event_queue queue) DECLSPEC_HIDDEN;

1 0

Ken Thomases : winemac: Make macdrv_event structs heap-allocated and reference-counted.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 1ee93853c2fff0917d43ad498f75f4608eb35238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ee93853c2fff0917d43ad498… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Apr 3 18:56:35 2013 -0500 winemac: Make macdrv_event structs heap-allocated and reference-counted. --- dlls/winemac.drv/cocoa_app.m | 56 ++++++------- dlls/winemac.drv/cocoa_event.h | 8 ++- dlls/winemac.drv/cocoa_event.m | 146 ++++++++++++++++++++-------------- dlls/winemac.drv/cocoa_status_item.m | 12 ++-- dlls/winemac.drv/cocoa_window.m | 141 +++++++++++++++++---------------- dlls/winemac.drv/event.c | 8 +- dlls/winemac.drv/macdrv_cocoa.h | 7 +- 7 files changed, 206 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ee93853c2fff0917d43a…

1 0

André Hentschel : winelib: Use winecfg to set a DllOverride.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: docs Branch: master Commit: 50b65515fd7f8c42bd046450413d66f9ec5ee8d1 URL: http://source.winehq.org/git/docs.git/?a=commit;h=50b65515fd7f8c42bd0464504… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 4 02:44:49 2013 +0200 winelib: Use winecfg to set a DllOverride. --- en/winelib-bindlls.sgml | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/en/winelib-bindlls.sgml b/en/winelib-bindlls.sgml index 54fb63a..f978780 100644 --- a/en/winelib-bindlls.sgml +++ b/en/winelib-bindlls.sgml @@ -255,13 +255,8 @@ signed short WINAPI MyProxyWinFunc (unsigned short a, void *b, void *c, If you have both a Windows DLL and a Linux DLL/proxy pair then you will have to ensure that the correct one gets called. The easiest way is probably simply to rename the windows version so that it doesn't get - detected. Alternatively you could specify in the DllOverrides section - (or the AppDefaults\\myprog.exe\\DllOverrides section) of the config - file (in your .wine directory) that the built-in version be used. Note - that if the Windows version Dll is present and is in the same - directory as the executable (as opposed to being in the Windows - directory) then you will currently need to specify the whole path to - the dll, not merely its name. + detected. Alternatively you could set a DLL override with winecfg, + so that the built-in version is used. </para> <para> Once you have done this you should be using the Linux Shared Object

1 0