May 2012 - Wine-commits - list.winehq.org

Francois Gouget : po: English (neutral / Great Britain) spelling fixes.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: efc865a05eff001bc25ff9dca811f2081751eb9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc865a05eff001bc25ff9dca… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 3 02:44:17 2012 +0200 po: English (neutral / Great Britain) spelling fixes. --- po/en.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/po/en.po b/po/en.po index f4dcf1b..e6ee170 100644 --- a/po/en.po +++ b/po/en.po @@ -2521,7 +2521,7 @@ msgstr "" #: cryptui.rc:82 msgid "The file format is not recognized. Please select another file." -msgstr "The file format is not recognized. Please select another file." +msgstr "The file format is not recognised. Please select another file." #: cryptui.rc:83 msgid "Could not open " @@ -8382,7 +8382,7 @@ msgstr "The device driver is not ready." #: winmm.rc:74 msgid "A problem occurred in initializing MCI. Try restarting Windows." -msgstr "A problem occurred in initializing MCI. Try restarting Windows." +msgstr "A problem occurred in initialising MCI. Try restarting Windows." #: winmm.rc:75 msgid "" @@ -8661,7 +8661,7 @@ msgid "" "The device you are trying to record from cannot recognize the current file " "format." msgstr "" -"The device you are trying to record from cannot recognize the current file " +"The device you are trying to record from cannot recognise the current file " "format." #: winmm.rc:122 @@ -9429,9 +9429,9 @@ msgstr "" "start [options] document_filename\n" "\n" "Options:\n" -"/M[inimized] Start the program minimized.\n" -"/MAX[imized] Start the program maximized.\n" -"/R[estored] Start the program normally (neither minimized nor maximized).\n" +"/M[inimized] Start the program minimised.\n" +"/MAX[imized] Start the program maximised.\n" +"/R[estored] Start the program normally (neither minimised nor maximised).\n" "/W[ait] Wait for started program to finish, then exit with its exit " "code.\n" "/Unix Use a Unix filename and start the file like windows explorer.\n" @@ -9618,7 +9618,7 @@ msgstr "" "DEL (ERASE)\tDelete a file or set of files\n" "DIR\t\tList the contents of a directory\n" "ECHO\t\tCopy text directly to the console output\n" -"ENDLOCAL\tEnd localization of environment changes in a batch file\n" +"ENDLOCAL\tEnd localisation of environment changes in a batch file\n" "FTYPE\t\tShow or modify open commands associated with file types\n" "HELP\t\tShow brief help details on a topic\n" "MD (MKDIR)\tCreate a subdirectory\n" @@ -9632,7 +9632,7 @@ msgstr "" "REN (RENAME)\tRename a file\n" "RD (RMDIR)\tDelete a subdirectory\n" "SET\t\tSet or show environment variables\n" -"SETLOCAL\tStart localization of environment changes in a batch file\n" +"SETLOCAL\tStart localisation of environment changes in a batch file\n" "START\t\tStart a program, or open a document in the associated program\n" "TIME\t\tSet or show the current system time\n" "TITLE\t\tSet the window title for the CMD session\n" @@ -10693,7 +10693,7 @@ msgstr "" #: progman.rc:176 progman.rc:212 msgid "&Minimize at launch" -msgstr "&Minimize at launch" +msgstr "&Minimise at launch" #: progman.rc:180 msgid "Change &icon..."

1 0

Christian Costa : include: Add definition of IKsControl interface in dmksctrl.h.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: b809a3fe17925eb6177edb111737598cbd776491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b809a3fe17925eb6177edb111… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 3 09:11:59 2012 +0200 include: Add definition of IKsControl interface in dmksctrl.h. --- include/dmksctrl.h | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 1 deletions(-) diff --git a/include/dmksctrl.h b/include/dmksctrl.h index 47142fd..a35afe3 100644 --- a/include/dmksctrl.h +++ b/include/dmksctrl.h @@ -21,10 +21,89 @@ #ifndef _DMKSCTRL_ #define _DMKSCTRL_ +#include <pshpack8.h> + +#include <objbase.h> + +#ifndef _KS_ +#define _KS_ + +typedef struct { + union { + struct { + GUID Set; + ULONG Id; + ULONG Flags; + } DUMMYSTRUCTNAME; + LONGLONG Alignment; + } DUMMYUNIONNAME; +} KSIDENTIFIER, *PKSIDENTIFIER; + +typedef KSIDENTIFIER KSPROPERTY, *PKSPROPERTY, KSMETHOD, *PKSMETHOD, KSEVENT, *PKSEVENT; + +#define KSMETHOD_TYPE_NONE 0x00000000 +#define KSMETHOD_TYPE_READ 0x00000001 +#define KSMETHOD_TYPE_WRITE 0x00000002 +#define KSMETHOD_TYPE_MODIFY 0x00000003 +#define KSMETHOD_TYPE_SOURCE 0x00000004 + +#define KSMETHOD_TYPE_SEND 0x00000001 +#define KSMETHOD_TYPE_SETSUPPORT 0x00000100 +#define KSMETHOD_TYPE_BASICSUPPORT 0x00000200 + +#define KSPROPERTY_TYPE_GET 0x00000001 +#define KSPROPERTY_TYPE_SET 0x00000002 +#define KSPROPERTY_TYPE_SETSUPPORT 0x00000100 +#define KSPROPERTY_TYPE_BASICSUPPORT 0x00000200 +#define KSPROPERTY_TYPE_RELATIONS 0x00000400 +#define KSPROPERTY_TYPE_SERIALIZESET 0x00000800 +#define KSPROPERTY_TYPE_UNSERIALIZESET 0x00001000 +#define KSPROPERTY_TYPE_SERIALIZERAW 0x00002000 +#define KSPROPERTY_TYPE_UNSERIALIZERAW 0x00004000 +#define KSPROPERTY_TYPE_SERIALIZESIZE 0x00008000 +#define KSPROPERTY_TYPE_DEFAULTVALUES 0x00010000 + +#define KSPROPERTY_TYPE_TOPOLOGY 0x10000000 + +#define INTERFACE IKsControl +DECLARE_INTERFACE_(IKsControl,IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IKsControl methods ***/ + STDMETHOD(KsProperty)(THIS_ PKSPROPERTY Property, ULONG PropertyLength, LPVOID PropertyData, + ULONG DataLength, ULONG* BytesReturned) PURE; + STDMETHOD(KsMethod)(THIS_ PKSMETHOD Method, ULONG MethodLength, LPVOID MethodData, + ULONG DataLength, ULONG* BytesReturned) PURE; + STDMETHOD(KsEvent)(THIS_ PKSEVENT Event, ULONG EventLength, LPVOID EventData, + ULONG DataLength, ULONG* BytesReturned) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IKsControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IKsControl_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IKsControl_Release(p) (p)->lpVtbl->Release(p) +/*** IKsControl methods ***/ +#define IKsControl_KsProperty(p,a,b,c,d,e) (p)->lpVtbl->KsProperty(p,a,b,c,d,e) +#define IKsControl_KsMethod(p,a,b,c,d,e) (p)->lpVtbl->KsMethod(p,a,b,c,d,e) +#define IKsControl_KsEvent(p,a,b,c,d,e) (p)->lpVtbl->KsEvent(p,a,b,c,d,e) +#endif + +#endif /* _KS_ */ + +#include <poppack.h> + + +DEFINE_GUID(IID_IKsControl, 0x28f54685, 0x06fd, 0x11d2, 0xb2, 0x7a, 0x00, 0xa0, 0xc9, 0x22, 0x31, 0x96); + #ifndef _KSMEDIA_ DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MIDI, 0x1d262760, 0xe957, 0x11cf, 0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00); -DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DIRECTMUSIC, 0x1a82f8bc, 0x3f8b, 0x11d2, 0xb7, 0x74, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1); +DEFINE_GUID(KSDATAFORMAT_SUBTYPE_DIRECTMUSIC, 0x1a82f8bc, 0x3f8b, 0x11d2, 0xb7, 0x74, 0x00, 0x60, 0x08, 0x33, 0x16, 0xc1); #endif

1 0

Alexandre Julliard : winex11: Remove support for the no longer used GET_GLX_DRAWABLE escape.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 54170fe8671b12df44a4dea8ffac7eed73300bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54170fe8671b12df44a4dea8f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 12:22:49 2012 +0200 winex11: Remove support for the no longer used GET_GLX_DRAWABLE escape. --- dlls/winex11.drv/init.c | 8 +------ dlls/winex11.drv/opengl.c | 49 ++++++++++++++++++++------------------------ dlls/winex11.drv/x11drv.h | 1 - 3 files changed, 23 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index ea0befa..b1b52c0 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -440,16 +440,10 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d case X11DRV_GET_FONT: case X11DRV_GET_DCE: case X11DRV_SET_DCE: + case X11DRV_GET_GLX_DRAWABLE: case X11DRV_SYNC_PIXMAP: FIXME( "%x escape no longer supported\n", *(const enum x11drv_escape_codes *)in_data ); break; - case X11DRV_GET_GLX_DRAWABLE: - if (out_count >= sizeof(Drawable)) - { - *(Drawable *)out_data = get_glxdrawable(physDev); - return TRUE; - } - break; case X11DRV_FLUSH_GL_DRAWABLE: flush_gl_drawable(physDev); return TRUE; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 566ee65..708825e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -641,6 +641,24 @@ static inline BOOL is_valid_context( Wine_GLContext *ctx ) return (ptr != NULL); } +static Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) +{ + Drawable ret; + + if(physDev->bitmap) + { + if (physDev->bitmap->hbitmap == BITMAP_stock_phys_bitmap.hbitmap) + ret = physDev->drawable; /* PBuffer */ + else + ret = physDev->bitmap->glxpixmap; + } + else if(physDev->gl_drawable) + ret = physDev->gl_drawable; + else + ret = physDev->drawable; + return ret; +} + static int describeContext(Wine_GLContext* ctx) { int tmp; int ctx_vis_id; @@ -663,7 +681,7 @@ static BOOL describeDrawable(X11DRV_PDEVICE *physDev) { TRACE(" HDC %p has:\n", physDev->dev.hdc); TRACE(" - iPixelFormat %d\n", fmt->iPixelFormat); - TRACE(" - Drawable %p\n", (void*) get_glxdrawable(physDev)); + TRACE(" - Drawable %lx\n", get_glxdrawable(physDev)); TRACE(" - FBCONFIG_ID 0x%x\n", fmt->fmt_id); pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &tmp); @@ -1931,7 +1949,7 @@ BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) describeContext(ctx); } - TRACE(" make current for dis %p, drawable %p, ctx %p\n", gdi_display, (void*) drawable, ctx->ctx); + TRACE(" make current for drawable %lx, ctx %p\n", drawable, ctx->ctx); ret = pglXMakeCurrent(gdi_display, drawable, ctx->ctx); if (ret) @@ -2620,7 +2638,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, wine_tsx11_lock(); object->drawable = pglXCreatePbuffer(gdi_display, fmt->fbconfig, attribs); wine_tsx11_unlock(); - TRACE("new Pbuffer drawable as %p\n", (void*) object->drawable); + TRACE("new Pbuffer drawable as %lx\n", object->drawable); if (!object->drawable) { SetLastError(ERROR_NO_SYSTEM_RESOURCES); goto create_failed; /* unexpected error */ @@ -3298,7 +3316,7 @@ static GLboolean WINAPI X11DRV_wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuf FIXME("partial stub!\n"); } - TRACE("drawable=%p, context=%p\n", (void*)object->drawable, prev_context); + TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); pglGetIntegerv(object->texture_bind_target, &prev_binded_texture); @@ -3772,24 +3790,6 @@ static void X11DRV_WineGL_LoadExtensions(void) } -Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) -{ - Drawable ret; - - if(physDev->bitmap) - { - if (physDev->bitmap->hbitmap == BITMAP_stock_phys_bitmap.hbitmap) - ret = physDev->drawable; /* PBuffer */ - else - ret = physDev->bitmap->glxpixmap; - } - else if(physDev->gl_drawable) - ret = physDev->gl_drawable; - else - ret = physDev->drawable; - return ret; -} - BOOL destroy_glxpixmap(Display *display, XID glxpixmap) { wine_tsx11_lock(); @@ -4087,11 +4087,6 @@ BOOL X11DRV_wglSetPixelFormatWINE(PHYSDEV dev, int iPixelFormat, const PIXELFORM return FALSE; } -Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) -{ - return 0; -} - BOOL destroy_glxpixmap(Display *display, XID glxpixmap) { return FALSE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2548155..e9985bb 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -270,7 +270,6 @@ extern int client_side_antialias_with_render DECLSPEC_HIDDEN; extern const struct gdi_dc_funcs *X11DRV_XRender_Init(void) DECLSPEC_HIDDEN; extern void X11DRV_XRender_Finalize(void) DECLSPEC_HIDDEN; -extern Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) DECLSPEC_HIDDEN; extern BOOL destroy_glxpixmap(Display *display, XID glxpixmap) DECLSPEC_HIDDEN; /* IME support */

1 0

Alexandre Julliard : winex11: Remove obsolete escapes.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 416240b781bc303983562b84ef08eb279d69311e URL: http://source.winehq.org/git/wine.git/?a=commit;h=416240b781bc303983562b84e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 12:50:52 2012 +0200 winex11: Remove obsolete escapes. --- dlls/winex11.drv/init.c | 21 --------------------- dlls/winex11.drv/x11drv.h | 7 ------- 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index b1b52c0..051b293 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -343,20 +343,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d { switch(*(const enum x11drv_escape_codes *)in_data) { - case X11DRV_GET_DISPLAY: - if (out_count >= sizeof(Display *)) - { - *(Display **)out_data = gdi_display; - return TRUE; - } - break; - case X11DRV_GET_DRAWABLE: - if (out_count >= sizeof(Drawable)) - { - *(Drawable *)out_data = physDev->drawable; - return TRUE; - } - break; case X11DRV_SET_DRAWABLE: if (in_count >= sizeof(struct x11drv_escape_set_drawable)) { @@ -437,13 +423,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d return TRUE; } break; - case X11DRV_GET_FONT: - case X11DRV_GET_DCE: - case X11DRV_SET_DCE: - case X11DRV_GET_GLX_DRAWABLE: - case X11DRV_SYNC_PIXMAP: - FIXME( "%x escape no longer supported\n", *(const enum x11drv_escape_codes *)in_data ); - break; case X11DRV_FLUSH_GL_DRAWABLE: flush_gl_drawable(physDev); return TRUE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e9985bb..58ecf59 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -329,16 +329,9 @@ extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long #define X11DRV_ESCAPE 6789 enum x11drv_escape_codes { - X11DRV_GET_DISPLAY, /* get X11 display for a DC */ - X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ - X11DRV_GET_FONT, /* get current X font for a DC */ X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ X11DRV_START_EXPOSURES, /* start graphics exposures */ X11DRV_END_EXPOSURES, /* end graphics exposures */ - X11DRV_GET_DCE, /* no longer used */ - X11DRV_SET_DCE, /* no longer used */ - X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ - X11DRV_SYNC_PIXMAP, /* sync the dibsection to its pixmap */ X11DRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */ };

1 0

Alexandre Julliard : winex11: Update the pixel format through the DCE hook for window DCs to avoid races .
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 70f776d3b8758ff4bbc609b9a900fd49f75065ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f776d3b8758ff4bbc609b9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 20:43:09 2012 +0200 winex11: Update the pixel format through the DCE hook for window DCs to avoid races. --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 708825e..b750d59 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1680,6 +1680,7 @@ static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev, ERR("Couldn't set format of the window, returning failure\n"); return FALSE; } + /* physDev->current_pf will be set by the DCE update */ } else if(physDev->bitmap) { if(!(value&GLX_PIXMAP_BIT)) { @@ -1692,13 +1693,12 @@ static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev, WARN("Couldn't create glxpixmap for pixel format %d\n", iPixelFormat); return FALSE; } + physDev->current_pf = iPixelFormat; } else { FIXME("called on a non-window, non-bitmap object?\n"); } - physDev->current_pf = iPixelFormat; - if (TRACE_ON(wgl)) { int gl_test = 0;

1 0

Alexandre Julliard : winex11: Always store the GL drawable in the device context.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 416e79f3e6082b6050bd3b82db99ac0e457c9196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416e79f3e6082b6050bd3b82d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 13:54:29 2012 +0200 winex11: Always store the GL drawable in the device context. --- dlls/winex11.drv/bitmap.c | 1 + dlls/winex11.drv/opengl.c | 53 ++++++++++++-------------------------------- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 883deba..8b2297e 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -100,6 +100,7 @@ HBITMAP X11DRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) physDev->bitmap = physBitmap; physDev->drawable = physBitmap->pixmap; + physDev->gl_drawable = physBitmap->glxpixmap; physDev->color_shifts = physBitmap->trueColor ? &physBitmap->color_shifts : NULL; SetRect( &physDev->drawable_rect, 0, 0, bitmap.bmWidth, bitmap.bmHeight ); physDev->dc_rect = physDev->drawable_rect; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b750d59..20f9911 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -641,24 +641,6 @@ static inline BOOL is_valid_context( Wine_GLContext *ctx ) return (ptr != NULL); } -static Drawable get_glxdrawable(X11DRV_PDEVICE *physDev) -{ - Drawable ret; - - if(physDev->bitmap) - { - if (physDev->bitmap->hbitmap == BITMAP_stock_phys_bitmap.hbitmap) - ret = physDev->drawable; /* PBuffer */ - else - ret = physDev->bitmap->glxpixmap; - } - else if(physDev->gl_drawable) - ret = physDev->gl_drawable; - else - ret = physDev->drawable; - return ret; -} - static int describeContext(Wine_GLContext* ctx) { int tmp; int ctx_vis_id; @@ -681,7 +663,7 @@ static BOOL describeDrawable(X11DRV_PDEVICE *physDev) { TRACE(" HDC %p has:\n", physDev->dev.hdc); TRACE(" - iPixelFormat %d\n", fmt->iPixelFormat); - TRACE(" - Drawable %lx\n", get_glxdrawable(physDev)); + TRACE(" - Drawable %lx\n", physDev->gl_drawable); TRACE(" - FBCONFIG_ID 0x%x\n", fmt->fmt_id); pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &tmp); @@ -1652,7 +1634,7 @@ static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev, HWND hwnd; /* SetPixelFormat is not allowed on the X root_window e.g. GetDC(0) */ - if(get_glxdrawable(physDev) == root_window) + if(physDev->drawable == root_window) { ERR("Invalid operation on root_window\n"); return FALSE; @@ -1940,7 +1922,6 @@ BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) } else { - Drawable drawable = get_glxdrawable(physDev); Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; /* The describe lines below are for debugging purposes only */ @@ -1949,8 +1930,8 @@ BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) describeContext(ctx); } - TRACE(" make current for drawable %lx, ctx %p\n", drawable, ctx->ctx); - ret = pglXMakeCurrent(gdi_display, drawable, ctx->ctx); + TRACE(" make current for drawable %lx, ctx %p\n", physDev->gl_drawable, ctx->ctx); + ret = pglXMakeCurrent(gdi_display, physDev->gl_drawable, ctx->ctx); if (ret) { @@ -1961,8 +1942,8 @@ BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) ctx->tid = GetCurrentThreadId(); ctx->hdc = hdc; ctx->read_hdc = hdc; - ctx->drawables[0] = drawable; - ctx->drawables[1] = drawable; + ctx->drawables[0] = physDev->gl_drawable; + ctx->drawables[1] = physDev->gl_drawable; ctx->refresh_drawables = FALSE; if (type == OBJ_MEMDC) pglDrawBuffer(GL_FRONT_LEFT); @@ -2011,10 +1992,8 @@ BOOL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC ret = FALSE; } else { Wine_GLContext *ctx = (Wine_GLContext *) hglrc; - Drawable d_draw = get_glxdrawable(pDrawDev); - Drawable d_read = get_glxdrawable(pReadDev); - ret = pglXMakeContextCurrent(gdi_display, d_draw, d_read, ctx->ctx); + ret = pglXMakeContextCurrent(gdi_display, pDrawDev->gl_drawable, pReadDev->gl_drawable, ctx->ctx); if (ret) { Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; @@ -2024,8 +2003,8 @@ BOOL X11DRV_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, HGLRC ctx->tid = GetCurrentThreadId(); ctx->hdc = draw_dev->hdc; ctx->read_hdc = read_dev->hdc; - ctx->drawables[0] = d_draw; - ctx->drawables[1] = d_read; + ctx->drawables[0] = pDrawDev->gl_drawable; + ctx->drawables[1] = pReadDev->gl_drawable; ctx->refresh_drawables = FALSE; NtCurrentTeb()->glContext = ctx; } @@ -2276,7 +2255,7 @@ void flush_gl_drawable(X11DRV_PDEVICE *physDev) int w, h; RECT rect; - if (!physDev->gl_copy || !physDev->current_pf) + if (!physDev->gl_copy || !physDev->gl_drawable) return; w = physDev->dc_rect.right - physDev->dc_rect.left; @@ -2694,6 +2673,7 @@ HDC X11DRV_wglGetPbufferDCARB(PHYSDEV dev, HPBUFFERARB hPbuffer) * All formats in our pixelformat list are compatible with each other and the main drawable. */ physDev->current_pf = object->fmt->iPixelFormat; physDev->drawable = object->drawable; + physDev->gl_drawable = object->drawable; SetRect( &physDev->drawable_rect, 0, 0, object->width, object->height ); physDev->dc_rect = physDev->drawable_rect; @@ -3806,7 +3786,6 @@ BOOL destroy_glxpixmap(Display *display, XID glxpixmap) BOOL X11DRV_SwapBuffers(PHYSDEV dev) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); - GLXDrawable drawable; Wine_GLContext *ctx = NtCurrentTeb()->glContext; if (!has_opengl()) return FALSE; @@ -3820,15 +3799,13 @@ BOOL X11DRV_SwapBuffers(PHYSDEV dev) return FALSE; } - if (!physDev->current_pf) + if (!physDev->gl_drawable) { WARN("Using an invalid drawable, skipping\n"); SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - drawable = get_glxdrawable(physDev); - wine_tsx11_lock(); sync_context(ctx); if(physDev->pixmap) { @@ -3841,13 +3818,13 @@ BOOL X11DRV_SwapBuffers(PHYSDEV dev) * copying */ pglFlush(); if(w > 0 && h > 0) - pglXCopySubBufferMESA(gdi_display, drawable, 0, 0, w, h); + pglXCopySubBufferMESA(gdi_display, physDev->gl_drawable, 0, 0, w, h); } else - pglXSwapBuffers(gdi_display, drawable); + pglXSwapBuffers(gdi_display, physDev->gl_drawable); } else - pglXSwapBuffers(gdi_display, drawable); + pglXSwapBuffers(gdi_display, physDev->gl_drawable); flush_gl_drawable(physDev); wine_tsx11_unlock();

1 0

Alexandre Julliard : winex11: Remove redundant code in ChoosePixelFormat.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 096757c3dd96a2afa81fbcad3150b0f55fc45a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096757c3dd96a2afa81fbcad3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 16:10:17 2012 +0200 winex11: Remove redundant code in ChoosePixelFormat. --- dlls/winex11.drv/opengl.c | 112 ++++++++++++--------------------------------- 1 files changed, 30 insertions(+), 82 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 20f9911..8f85023 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1291,17 +1291,8 @@ int X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd) if( !(ppfd->dwFlags & PFD_DOUBLEBUFFER_DONTCARE) ) { if( ((ppfd->dwFlags & PFD_DOUBLEBUFFER) != bestDBuffer) && ((dwFlags & PFD_DOUBLEBUFFER) == (ppfd->dwFlags & PFD_DOUBLEBUFFER)) ) - { - bestDBuffer = dwFlags & PFD_DOUBLEBUFFER; - bestStereo = dwFlags & PFD_STEREO; - bestAlpha = alpha; - bestColor = color; - bestDepth = depth; - bestStencil = stencil; - bestAux = aux; - bestFormat = i; - continue; - } + goto found; + if(bestDBuffer != -1 && (dwFlags & PFD_DOUBLEBUFFER) != bestDBuffer) continue; } @@ -1310,17 +1301,8 @@ int X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd) if( !(ppfd->dwFlags & PFD_STEREO_DONTCARE) ) { if( ((ppfd->dwFlags & PFD_STEREO) != bestStereo) && ((dwFlags & PFD_STEREO) == (ppfd->dwFlags & PFD_STEREO)) ) - { - bestDBuffer = dwFlags & PFD_DOUBLEBUFFER; - bestStereo = dwFlags & PFD_STEREO; - bestAlpha = alpha; - bestColor = color; - bestDepth = depth; - bestStencil = stencil; - bestAux = aux; - bestFormat = i; - continue; - } + goto found; + if(bestStereo != -1 && (dwFlags & PFD_STEREO) != bestStereo) continue; } @@ -1333,105 +1315,71 @@ int X11DRV_ChoosePixelFormat(PHYSDEV dev, const PIXELFORMATDESCRIPTOR *ppfd) * like cColorBits, cAlphaBits and friends if they are set to 0, so they are considered * as DONTCARE. At least Serious Sam TSE relies on this behavior. */ - /* Color bits */ if(ppfd->cColorBits) { if( ((ppfd->cColorBits > bestColor) && (color > bestColor)) || ((color >= ppfd->cColorBits) && (color < bestColor)) ) - { - bestDBuffer = dwFlags & PFD_DOUBLEBUFFER; - bestStereo = dwFlags & PFD_STEREO; - bestAlpha = alpha; - bestColor = color; - bestDepth = depth; - bestStencil = stencil; - bestAux = aux; - bestFormat = i; - continue; - } else if(bestColor != color) { /* Do further checks if the format is compatible */ + goto found; + + if(bestColor != color) { /* Do further checks if the format is compatible */ TRACE("color mismatch for iPixelFormat=%d\n", i+1); continue; } } - /* Alpha bits */ if(ppfd->cAlphaBits) { if( ((ppfd->cAlphaBits > bestAlpha) && (alpha > bestAlpha)) || ((alpha >= ppfd->cAlphaBits) && (alpha < bestAlpha)) ) - { - bestDBuffer = dwFlags & PFD_DOUBLEBUFFER; - bestStereo = dwFlags & PFD_STEREO; - bestAlpha = alpha; - bestColor = color; - bestDepth = depth; - bestStencil = stencil; - bestAux = aux; - bestFormat = i; - continue; - } else if(bestAlpha != alpha) { + goto found; + + if(bestAlpha != alpha) { TRACE("alpha mismatch for iPixelFormat=%d\n", i+1); continue; } } - /* Depth bits */ if(ppfd->cDepthBits) { if( ((ppfd->cDepthBits > bestDepth) && (depth > bestDepth)) || ((depth >= ppfd->cDepthBits) && (depth < bestDepth)) ) - { - bestDBuffer = dwFlags & PFD_DOUBLEBUFFER; - bestStereo = dwFlags & PFD_STEREO; - bestAlpha = alpha; - bestColor = color; - bestDepth = depth; - bestStencil = stencil; - bestAux = aux; - bestFormat = i; - continue; - } else if(bestDepth != depth) { + goto found; + + if(bestDepth != depth) { TRACE("depth mismatch for iPixelFormat=%d\n", i+1); continue; } } - /* Stencil bits */ if(ppfd->cStencilBits) { if( ((ppfd->cStencilBits > bestStencil) && (stencil > bestStencil)) || ((stencil >= ppfd->cStencilBits) && (stencil < bestStencil)) ) - { - bestDBuffer = dwFlags & PFD_DOUBLEBUFFER; - bestStereo = dwFlags & PFD_STEREO; - bestAlpha = alpha; - bestColor = color; - bestDepth = depth; - bestStencil = stencil; - bestAux = aux; - bestFormat = i; - continue; - } else if(bestStencil != stencil) { + goto found; + + if(bestStencil != stencil) { TRACE("stencil mismatch for iPixelFormat=%d\n", i+1); continue; } } - /* Aux buffers */ if(ppfd->cAuxBuffers) { if( ((ppfd->cAuxBuffers > bestAux) && (aux > bestAux)) || ((aux >= ppfd->cAuxBuffers) && (aux < bestAux)) ) - { - bestDBuffer = dwFlags & PFD_DOUBLEBUFFER; - bestStereo = dwFlags & PFD_STEREO; - bestAlpha = alpha; - bestColor = color; - bestDepth = depth; - bestStencil = stencil; - bestAux = aux; - bestFormat = i; - continue; - } else if(bestAux != aux) { + goto found; + + if(bestAux != aux) { TRACE("aux mismatch for iPixelFormat=%d\n", i+1); continue; } } + continue; + + found: + bestDBuffer = dwFlags & PFD_DOUBLEBUFFER; + bestStereo = dwFlags & PFD_STEREO; + bestAlpha = alpha; + bestColor = color; + bestDepth = depth; + bestStencil = stencil; + bestAux = aux; + bestFormat = i; } if(bestFormat == -1) {

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in d3d9_texture_3d_UnlockBox().
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 6b9f151c9e1e206949087e3435cc6064b73e95a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9f151c9e1e206949087e343… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 2 21:47:55 2012 +0200 d3d9: Properly retrieve an interface pointer in d3d9_texture_3d_UnlockBox(). --- dlls/d3d9/texture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 6544edc..f453f90 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1207,6 +1207,7 @@ static HRESULT WINAPI d3d9_texture_3d_UnlockBox(IDirect3DVolumeTexture9 *iface, { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); struct wined3d_resource *sub_resource; + IDirect3DVolume9Impl *volume_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); @@ -1215,7 +1216,10 @@ static HRESULT WINAPI d3d9_texture_3d_UnlockBox(IDirect3DVolumeTexture9 *iface, if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DVolume9_UnlockBox((IDirect3DVolume9 *)wined3d_resource_get_parent(sub_resource)); + { + volume_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DVolume9_UnlockBox(&volume_impl->IDirect3DVolume9_iface); + } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : ddraw: Get rid of the flag_info typedef.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 5b680d60238a571404ec9a52acb8bbb529124f4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b680d60238a571404ec9a52a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 2 21:47:56 2012 +0200 ddraw: Get rid of the flag_info typedef. --- dlls/ddraw/ddraw_private.h | 6 +- dlls/ddraw/utils.c | 339 ++++++++++++++++++++++---------------------- 2 files changed, 173 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b680d60238a571404ec9…

1 0

Henri Verbeet : wined3d: The wined3d object doesn't need a parent.
by Alexandre Julliard 03 May '12

03 May '12

Module: wine Branch: master Commit: 92671487050dfe0d377eb0248b9d458e7156e3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=92671487050dfe0d377eb0248… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 2 21:47:57 2012 +0200 wined3d: The wined3d object doesn't need a parent. --- dlls/d3d8/d3d8_main.c | 2 +- dlls/d3d9/d3d9_main.c | 2 +- dlls/ddraw/ddraw.c | 3 +-- dlls/dxgi/factory.c | 2 +- dlls/wined3d/directx.c | 10 +--------- dlls/wined3d/wined3d.spec | 3 +-- dlls/wined3d/wined3d_main.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 +-- include/wine/wined3d.h | 3 +-- 9 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 7e7da43..46f6a5c 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -45,7 +45,7 @@ IDirect3D8* WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT SDKVersion) { object->IDirect3D8_iface.lpVtbl = &Direct3D8_Vtbl; object->ref = 1; - object->WineD3D = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS, &object->IDirect3D8_iface); + object->WineD3D = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS); TRACE("Created Direct3D object @ %p, WineObj @ %p\n", object, object->WineD3D); diff --git a/dlls/d3d9/d3d9_main.c b/dlls/d3d9/d3d9_main.c index abb98f3..6eed9b7 100644 --- a/dlls/d3d9/d3d9_main.c +++ b/dlls/d3d9/d3d9_main.c @@ -40,7 +40,7 @@ IDirect3D9* WINAPI DECLSPEC_HOTPATCH Direct3DCreate9(UINT SDKVersion) { object->ref = 1; wined3d_mutex_lock(); - object->WineD3D = wined3d_create(9, 0, object); + object->WineD3D = wined3d_create(9, 0); wined3d_mutex_unlock(); TRACE("SDKVersion = %x, Created Direct3D object @ %p, WineObj @ %p\n", SDKVersion, object, object->WineD3D); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4da67ef..057e6e1 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5559,8 +5559,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS, - &ddraw->IDirectDraw7_iface); + ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS); if (!ddraw->wined3d) { WARN("Failed to create a wined3d object.\n"); diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index d898c08..045baf8 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -300,7 +300,7 @@ HRESULT dxgi_factory_init(struct dxgi_factory *factory) factory->refcount = 1; EnterCriticalSection(&dxgi_cs); - factory->wined3d = wined3d_create(10, 0, factory); + factory->wined3d = wined3d_create(10, 0); if (!factory->wined3d) { LeaveCriticalSection(&dxgi_cs); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3ae0945..9e3a86b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5031,13 +5031,6 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, UINT adapter_idx, e return WINED3D_OK; } -void * CDECL wined3d_get_parent(const struct wined3d *wined3d) -{ - TRACE("wined3d %p.\n", wined3d); - - return wined3d->parent; -} - static void WINE_GLAPI invalid_func(const void *data) { ERR("Invalid vertex attribute function called\n"); @@ -5506,11 +5499,10 @@ const struct wined3d_parent_ops wined3d_null_parent_ops = }; /* Do not call while under the GL lock. */ -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags, void *parent) +HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) { wined3d->dxVersion = version; wined3d->ref = 1; - wined3d->parent = parent; wined3d->flags = flags; if (!InitAdapters(wined3d)) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index f0821fb..679754f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -6,7 +6,7 @@ @ cdecl wined3d_check_device_format_conversion(ptr long long long long) @ cdecl wined3d_check_device_multisample_type(ptr long long long long long ptr) @ cdecl wined3d_check_device_type(ptr long long long long long) -@ cdecl wined3d_create(long long ptr) +@ cdecl wined3d_create(long long) @ cdecl wined3d_decref(ptr) @ cdecl wined3d_enum_adapter_modes(ptr long long long ptr) @ cdecl wined3d_get_adapter_count(ptr) @@ -15,7 +15,6 @@ @ cdecl wined3d_get_adapter_mode_count(ptr long long) @ cdecl wined3d_get_adapter_monitor(ptr long) @ cdecl wined3d_get_device_caps(ptr long long ptr) -@ cdecl wined3d_get_parent(ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ad7a5fc..4e2226e 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -90,7 +90,7 @@ struct wined3d_settings wined3d_settings = }; /* Do not call while under the GL lock. */ -struct wined3d * CDECL wined3d_create(UINT version, DWORD flags, void *parent) +struct wined3d * CDECL wined3d_create(UINT version, DWORD flags) { struct wined3d *object; HRESULT hr; @@ -102,7 +102,7 @@ struct wined3d * CDECL wined3d_create(UINT version, DWORD flags, void *parent) return NULL; } - hr = wined3d_init(object, version, flags, parent); + hr = wined3d_init(object, version, flags); if (FAILED(hr)) { WARN("Failed to initialize wined3d object, hr %#x.\n", hr); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 94da438..976c4f4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1656,14 +1656,13 @@ void wined3d_get_draw_rect(const struct wined3d_state *state, RECT *rect) DECLSP struct wined3d { LONG ref; - void *parent; DWORD flags; UINT dxVersion; UINT adapter_count; struct wined3d_adapter adapters[1]; }; -HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags, void *parent) DECLSPEC_HIDDEN; +HRESULT wined3d_init(struct wined3d *wined3d, UINT version, DWORD flags) DECLSPEC_HIDDEN; BOOL wined3d_register_window(HWND window, struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_unregister_window(HWND window) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9f32a8f..2006c92 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2009,7 +2009,7 @@ HRESULT __cdecl wined3d_check_device_multisample_type(const struct wined3d *wine HRESULT __cdecl wined3d_check_device_type(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id display_format_id, enum wined3d_format_id backbuffer_format_id, BOOL windowed); -struct wined3d * __cdecl wined3d_create(UINT dxVersion, DWORD flags, void *parent); +struct wined3d * __cdecl wined3d_create(UINT version, DWORD flags); ULONG __cdecl wined3d_decref(struct wined3d *wined3d); HRESULT __cdecl wined3d_enum_adapter_modes(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, UINT mode_idx, struct wined3d_display_mode *mode); @@ -2023,7 +2023,6 @@ UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, HMONITOR __cdecl wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT adapter_idx); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, WINED3DCAPS *caps); -void * __cdecl wined3d_get_parent(const struct wined3d *wined3d); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function);

1 0