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

Alexandre Julliard : winex11: Give XInitThreads yet another chance.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: 07bc017ff13c43bc897de730715e8b07139268ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=07bc017ff13c43bc897de7307… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 5 12:13:38 2012 +0200 winex11: Give XInitThreads yet another chance. --- dlls/winex11.drv/x11drv_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 9e791e5..88e2114 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -539,6 +539,7 @@ static BOOL process_attach(void) /* Open display */ + if (!XInitThreads()) ERR( "XInitThreads failed, trouble ahead\n" ); if (!(display = XOpenDisplay( NULL ))) return FALSE; fcntl( ConnectionNumber(display), F_SETFD, 1 ); /* set close on exec flag */

1 0

Vincent Povirk : msvcm80: Add stub DoDllLanguageSupportValidation function.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: 01a1a5f80992f110cd7df34e01b18f6cc7756f48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01a1a5f80992f110cd7df34e0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 15:11:13 2012 -0500 msvcm80: Add stub DoDllLanguageSupportValidation function. --- dlls/msvcm80/msvcm80.spec | 2 +- dlls/msvcm80/msvcm80_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvcm80/msvcm80.spec b/dlls/msvcm80/msvcm80.spec index dd92996..04224cd 100644 --- a/dlls/msvcm80/msvcm80.spec +++ b/dlls/msvcm80/msvcm80.spec @@ -1,6 +1,6 @@ @ stub -arch=win32 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6GJPAX(a)Z0@Z @ stub -arch=win64 ?DoCallBackInDefaultDomain@<CrtImplementationDetails>@@YAXP6AJPEAX(a)Z0@Z -@ stub ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ +@ cdecl ?DoDllLanguageSupportValidation@<CrtImplementationDetails>@@YAXXZ() CrtImplementationDetails_DoDllLanguageSupportValidation @ stub -arch=win32 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXP$AAVEventHandler(a)System@@@Z @ stub -arch=win64 ?RegisterModuleUninitializer@<CrtImplementationDetails>@@YAXPE$AAVEventHandler(a)System@@@Z @ stub -arch=win32 ?ThrowModuleLoadException@<CrtImplementationDetails>@@YAXP$AAVString(a)System@@@Z diff --git a/dlls/msvcm80/msvcm80_main.c b/dlls/msvcm80/msvcm80_main.c index 44f7a56..29bfdc7 100644 --- a/dlls/msvcm80/msvcm80_main.c +++ b/dlls/msvcm80/msvcm80_main.c @@ -21,6 +21,10 @@ #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcm); + BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { switch (reason) @@ -33,3 +37,9 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) } return TRUE; } + +/* void __cdecl <CrtImplementationDetails>::DoDllLanguageSupportValidation(void) */ +void __cdecl CrtImplementationDetails_DoDllLanguageSupportValidation(void) +{ + FIXME("stub\n"); +}

1 0

Christian Costa : d3drm: Implement IDirect3DRMFrameX_GetParent and update tests.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: 722efadc8dc8560eb58a735e1abd1822d4c8402d URL: http://source.winehq.org/git/wine.git/?a=commit;h=722efadc8dc8560eb58a735e1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 3 09:40:17 2012 +0200 d3drm: Implement IDirect3DRMFrameX_GetParent and update tests. --- dlls/d3drm/frame.c | 79 ++++++++++++++++++++++++++++++++++++++------- dlls/d3drm/tests/d3drm.c | 58 +++++++++++++++++---------------- 2 files changed, 96 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=722efadc8dc8560eb58a7…

1 0

Vincent Povirk : msvcm80: Add stub dll.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: 7e8ce7badc4f2c6c83214000c25bddfff7b79cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8ce7badc4f2c6c83214000c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 2 14:15:32 2012 -0500 msvcm80: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/msvcm80/Makefile.in | 6 + dlls/msvcm80/msvcm80.spec | 306 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcm80/msvcm80_main.c | 35 +++++ 5 files changed, 349 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e8ce7badc4f2c6c83214…

1 0

Alexandre Julliard : winex11: Use a standard Wine list for the OpenGL context list.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: 00bb726af89af3cd2257af074fbd19698401cb30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bb726af89af3cd2257af074… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 7 12:57:29 2012 +0200 winex11: Use a standard Wine list for the OpenGL context list. --- dlls/winex11.drv/opengl.c | 59 ++++++++++++++++----------------------------- 1 files changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7c1251d..0ab607f 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -123,8 +123,7 @@ typedef struct wine_glcontext { HDC read_hdc; Drawable drawables[2]; BOOL refresh_drawables; - struct wine_glcontext *next; - struct wine_glcontext *prev; + struct list entry; } Wine_GLContext; typedef struct wine_glpbuffer { @@ -146,7 +145,7 @@ typedef struct wine_glpbuffer { int texture_level; } Wine_GLPBuffer; -static Wine_GLContext *context_list; +static struct list context_list = LIST_INIT( context_list ); static struct WineGLInfo WineGLInfo = { 0 }; static int use_render_texture_emulation = 1; static int use_render_texture_ati = 0; @@ -611,34 +610,16 @@ failed: return FALSE; } -static inline Wine_GLContext *alloc_context(void) -{ - Wine_GLContext *ret; - - if ((ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Wine_GLContext)))) - { - ret->next = context_list; - if (context_list) context_list->prev = ret; - context_list = ret; - } - return ret; -} - static inline void free_context(Wine_GLContext *context) { - if (context->next != NULL) context->next->prev = context->prev; - if (context->prev != NULL) context->prev->next = context->next; - else context_list = context->next; - - if (context->vis) XFree(context->vis); - HeapFree(GetProcessHeap(), 0, context); } static inline BOOL is_valid_context( Wine_GLContext *ctx ) { Wine_GLContext *ptr; - for (ptr = context_list; ptr; ptr = ptr->next) if (ptr == ctx) break; - return (ptr != NULL); + LIST_FOR_EACH_ENTRY( ptr, &context_list, struct wine_glcontext, entry ) + if (ptr == ctx) return TRUE; + return FALSE; } static int describeContext(Wine_GLContext* ctx) { @@ -1124,7 +1105,8 @@ int pixelformat_from_fbconfig_id(XID fbconfig_id) void mark_drawable_dirty(Drawable old, Drawable new) { Wine_GLContext *ctx; - for (ctx = context_list; ctx; ctx = ctx->next) { + LIST_FOR_EACH_ENTRY( ctx, &context_list, struct wine_glcontext, entry ) + { if (old == ctx->drawables[0]) { ctx->drawables[0] = new; ctx->refresh_drawables = TRUE; @@ -1719,15 +1701,17 @@ HGLRC X11DRV_wglCreateContext(PHYSDEV dev) return NULL; } - wine_tsx11_lock(); - ret = alloc_context(); + if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) return 0; + ret->hdc = hdc; ret->fmt = fmt; ret->has_been_current = FALSE; ret->sharing = FALSE; + wine_tsx11_lock(); ret->vis = pglXGetVisualFromFBConfig(gdi_display, fmt->fbconfig); ret->ctx = create_glxcontext(gdi_display, ret, NULL); + list_add_head( &context_list, &ret->entry ); wine_tsx11_unlock(); TRACE(" creating context %p (GL context creation delayed)\n", ret); @@ -1766,14 +1750,13 @@ BOOL X11DRV_wglDeleteContext(HGLRC hglrc) if (ctx == NtCurrentTeb()->glContext) wglMakeCurrent(ctx->hdc, NULL); - if (ctx->ctx) - { - wine_tsx11_lock(); - pglXDestroyContext(gdi_display, ctx->ctx); - wine_tsx11_unlock(); - } + wine_tsx11_lock(); + list_remove( &ctx->entry ); + if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); + if (ctx->vis) XFree( ctx->vis ); + wine_tsx11_unlock(); - free_context(ctx); + HeapFree( GetProcessHeap(), 0, ctx ); return TRUE; } @@ -2280,9 +2263,8 @@ HGLRC X11DRV_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const return NULL; } - wine_tsx11_lock(); - ret = alloc_context(); - wine_tsx11_unlock(); + if (!(ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret)))) return 0; + ret->hdc = dev->hdc; ret->fmt = fmt; ret->vis = NULL; /* glXCreateContextAttribsARB requires a fbconfig instead of a visual */ @@ -2336,11 +2318,12 @@ HGLRC X11DRV_wglCreateContextAttribsARB(PHYSDEV dev, HGLRC hShareContext, const { /* In the future we should convert the GLX error to a win32 one here if needed */ ERR("Context creation failed\n"); - free_context(ret); + HeapFree( GetProcessHeap(), 0, ret ); wine_tsx11_unlock(); return NULL; } + list_add_head( &context_list, &ret->entry ); wine_tsx11_unlock(); TRACE(" creating context %p\n", ret); return (HGLRC) ret;

1 0

Thomas Faber : msvcrt: Fix malloc_func_t/free_func_t calling convention.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: bf5c7d4546b791e3e00f8501c3e74173266a07b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf5c7d4546b791e3e00f8501c… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat May 5 13:42:00 2012 +0200 msvcrt: Fix malloc_func_t/free_func_t calling convention. --- dlls/msvcrt/msvcrt.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0fd3410..e255a2e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -245,8 +245,8 @@ int __cdecl MSVCRT__set_new_mode(int mode); void* __cdecl MSVCRT_operator_new(MSVCRT_size_t); void __cdecl MSVCRT_operator_delete(void*); -typedef void* (*__cdecl malloc_func_t)(MSVCRT_size_t); -typedef void (*__cdecl free_func_t)(void*); +typedef void* (__cdecl *malloc_func_t)(MSVCRT_size_t); +typedef void (__cdecl *free_func_t)(void*); extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int);

1 0

Daniel Jelinski : oleaut32: Added support for loading cursors in OLEPicture .
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: 971a66e912ab5d1ee6255cbff9a29cacb5a62c7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=971a66e912ab5d1ee6255cbff… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Sun May 6 21:35:57 2012 +0200 oleaut32: Added support for loading cursors in OLEPicture. --- dlls/oleaut32/olepicture.c | 42 ++++++++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 2195ba5..348529e 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1228,16 +1228,34 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x } if (i==cifd->idCount) i=0; } - - hicon = CreateIconFromResourceEx( - xbuf+cifd->idEntries[i].dwDIBOffset, - cifd->idEntries[i].dwDIBSize, - TRUE, /* is icon */ - 0x00030000, - cifd->idEntries[i].bWidth, - cifd->idEntries[i].bHeight, - 0 - ); + if (cifd->idType == 2) + { + LPBYTE buf = HeapAlloc(GetProcessHeap(), 0, cifd->idEntries[i].dwDIBSize + 4); + memcpy(buf, &cifd->idEntries[i].xHotspot, 4); + memcpy(buf + 4, xbuf+cifd->idEntries[i].dwDIBOffset, cifd->idEntries[i].dwDIBSize); + hicon = CreateIconFromResourceEx( + buf, + cifd->idEntries[i].dwDIBSize + 4, + FALSE, /* is cursor */ + 0x00030000, + cifd->idEntries[i].bWidth, + cifd->idEntries[i].bHeight, + 0 + ); + HeapFree(GetProcessHeap(), 0, buf); + } + else + { + hicon = CreateIconFromResourceEx( + xbuf+cifd->idEntries[i].dwDIBOffset, + cifd->idEntries[i].dwDIBSize, + TRUE, /* is icon */ + 0x00030000, + cifd->idEntries[i].bWidth, + cifd->idEntries[i].bHeight, + 0 + ); + } if (!hicon) { ERR("CreateIcon failed.\n"); return E_FAIL; @@ -1322,7 +1340,7 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, * DWORD magic; * DWORD len; * - * Currently implemented: BITMAP, ICON, JPEG, GIF, WMF, EMF + * Currently implemented: BITMAP, ICON, CURSOR, JPEG, GIF, WMF, EMF */ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) { HRESULT hr; @@ -1477,7 +1495,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface, IStream *pStm) case BITMAP_FORMAT_APM: /* APM */ hr = OLEPictureImpl_LoadAPM(This, xbuf, xread); break; - case 0x0000: { /* ICON , first word is dwReserved */ + case 0x0000: { /* ICON or CURSOR, first word is dwReserved */ hr = OLEPictureImpl_LoadIcon(This, xbuf, xread); break; }

1 0

Alexandre Julliard : winex11: Define an enum to manage the various types of GL device contexts.
by Alexandre Julliard May 7, 2012

May 7, 2012

Module: wine Branch: master Commit: a7084487250937bfe5386e5facb1a1eaff1c6865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7084487250937bfe5386e5fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 7 12:48:30 2012 +0200 winex11: Define an enum to manage the various types of GL device contexts. --- dlls/winex11.drv/init.c | 7 ++++--- dlls/winex11.drv/opengl.c | 40 +++++++++++++++++++++++----------------- dlls/winex11.drv/window.c | 6 ++++-- dlls/winex11.drv/x11drv.h | 14 ++++++++++++-- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 051b293..b9de826 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -353,13 +353,14 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d physDev->current_pf = pixelformat_from_fbconfig_id( data->fbconfig_id ); physDev->gl_drawable = data->gl_drawable; physDev->pixmap = data->pixmap; - physDev->gl_copy = data->gl_copy; + physDev->gl_type = data->gl_type; wine_tsx11_lock(); XSetSubwindowMode( gdi_display, physDev->gc, data->mode ); wine_tsx11_unlock(); - TRACE( "SET_DRAWABLE hdc %p drawable %lx gl_drawable %lx pf %u dc_rect %s drawable_rect %s\n", + TRACE( "SET_DRAWABLE hdc %p drawable %lx gl_drawable %lx pf %u gl %u dc_rect %s drawable_rect %s\n", dev->hdc, physDev->drawable, physDev->gl_drawable, physDev->current_pf, - wine_dbgstr_rect(&physDev->dc_rect), wine_dbgstr_rect(&physDev->drawable_rect) ); + physDev->gl_type, wine_dbgstr_rect(&physDev->dc_rect), + wine_dbgstr_rect(&physDev->drawable_rect) ); return TRUE; } break; diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8f85023..7c1251d 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1624,6 +1624,7 @@ static BOOL internal_SetPixelFormat(X11DRV_PDEVICE *physDev, return FALSE; } physDev->current_pf = iPixelFormat; + physDev->gl_type = DC_GL_BITMAP; } else { FIXME("called on a non-window, non-bitmap object?\n"); @@ -1839,7 +1840,6 @@ BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); BOOL ret; HDC hdc = dev->hdc; - DWORD type = GetObjectType(hdc); Wine_GLContext *ctx = (Wine_GLContext *) hglrc; TRACE("(%p,%p)\n", hdc, hglrc); @@ -1894,7 +1894,7 @@ BOOL X11DRV_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) ctx->drawables[1] = physDev->gl_drawable; ctx->refresh_drawables = FALSE; - if (type == OBJ_MEMDC) pglDrawBuffer(GL_FRONT_LEFT); + if (physDev->gl_type == DC_GL_BITMAP) pglDrawBuffer(GL_FRONT_LEFT); } else SetLastError(ERROR_INVALID_HANDLE); @@ -2200,19 +2200,19 @@ static void WINAPI X11DRV_wglGetIntegerv(GLenum pname, GLint* params) void flush_gl_drawable(X11DRV_PDEVICE *physDev) { - int w, h; RECT rect; + int w = physDev->dc_rect.right - physDev->dc_rect.left; + int h = physDev->dc_rect.bottom - physDev->dc_rect.top; + Drawable src = physDev->gl_drawable; - if (!physDev->gl_copy || !physDev->gl_drawable) - return; - - w = physDev->dc_rect.right - physDev->dc_rect.left; - h = physDev->dc_rect.bottom - physDev->dc_rect.top; - - if(w > 0 && h > 0) { - Drawable src = physDev->pixmap; - if(!src) src = physDev->gl_drawable; + if (w <= 0 || h <= 0) return; + switch (physDev->gl_type) + { + case DC_GL_PIXMAP_WIN: + src = physDev->pixmap; + /* fall through */ + case DC_GL_CHILD_WIN: /* The GL drawable may be lagged behind if we don't flush first, so * flush the display make sure we copy up-to-date data */ wine_tsx11_lock(); @@ -2223,6 +2223,8 @@ void flush_gl_drawable(X11DRV_PDEVICE *physDev) wine_tsx11_unlock(); SetRect( &rect, 0, 0, w, h ); add_device_bounds( physDev, &rect ); + default: + break; } } @@ -2622,6 +2624,7 @@ HDC X11DRV_wglGetPbufferDCARB(PHYSDEV dev, HPBUFFERARB hPbuffer) physDev->current_pf = object->fmt->iPixelFormat; physDev->drawable = object->drawable; physDev->gl_drawable = object->drawable; + physDev->gl_type = DC_GL_PBUFFER; SetRect( &physDev->drawable_rect, 0, 0, object->width, object->height ); physDev->dc_rect = physDev->drawable_rect; @@ -3756,7 +3759,9 @@ BOOL X11DRV_SwapBuffers(PHYSDEV dev) wine_tsx11_lock(); sync_context(ctx); - if(physDev->pixmap) { + switch (physDev->gl_type) + { + case DC_GL_PIXMAP_WIN: if(pglXCopySubBufferMESA) { int w = physDev->dc_rect.right - physDev->dc_rect.left; int h = physDev->dc_rect.bottom - physDev->dc_rect.top; @@ -3767,12 +3772,13 @@ BOOL X11DRV_SwapBuffers(PHYSDEV dev) pglFlush(); if(w > 0 && h > 0) pglXCopySubBufferMESA(gdi_display, physDev->gl_drawable, 0, 0, w, h); + break; } - else - pglXSwapBuffers(gdi_display, physDev->gl_drawable); - } - else + /* fall through */ + default: pglXSwapBuffers(gdi_display, physDev->gl_drawable); + break; + } flush_gl_drawable(physDev); wine_tsx11_unlock(); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 30593a9..193a165 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2267,7 +2267,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, escape.fbconfig_id = 0; escape.gl_drawable = 0; escape.pixmap = 0; - escape.gl_copy = FALSE; + escape.gl_type = DC_GL_NONE; escape.dc_rect.left = win_rect->left - top_rect->left; escape.dc_rect.top = win_rect->top - top_rect->top; @@ -2289,6 +2289,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, else escape.drawable = escape.gl_drawable; + if (escape.gl_drawable) escape.gl_type = DC_GL_WINDOW; /* special case: when repainting the root window, clip out top-level windows */ if (data && data->whole_window == root_window) escape.mode = ClipByChildren; } @@ -2310,7 +2311,7 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, escape.fbconfig_id = data ? data->fbconfig_id : (XID)GetPropA( hwnd, fbconfig_id_prop ); escape.gl_drawable = data ? data->gl_drawable : (Drawable)GetPropA( hwnd, gl_drawable_prop ); escape.pixmap = data ? data->pixmap : (Pixmap)GetPropA( hwnd, pixmap_prop ); - escape.gl_copy = (escape.gl_drawable != 0); + if (escape.gl_drawable) escape.gl_type = escape.pixmap ? DC_GL_PIXMAP_WIN : DC_GL_CHILD_WIN; if (flags & DCX_CLIPCHILDREN) escape.mode = ClipByChildren; } @@ -2335,6 +2336,7 @@ void CDECL X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) escape.fbconfig_id = 0; escape.gl_drawable = 0; escape.pixmap = 0; + escape.gl_type = DC_GL_NONE; ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 58ecf59..6496d0f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -115,6 +115,16 @@ typedef struct BOOL trueColor; } X_PHYSBITMAP; +enum dc_gl_type +{ + DC_GL_NONE, /* no GL support (pixel format not set yet) */ + DC_GL_WINDOW, /* normal top-level window */ + DC_GL_CHILD_WIN, /* child window using XComposite */ + DC_GL_PIXMAP_WIN, /* child window using intermediate pixmap */ + DC_GL_BITMAP, /* memory DC with a standard bitmap */ + DC_GL_PBUFFER /* pseudo memory DC using a PBuffer */ +}; + /* X physical device */ typedef struct { @@ -134,7 +144,7 @@ typedef struct int current_pf; Drawable gl_drawable; Pixmap pixmap; /* Pixmap for a GLXPixmap gl_drawable */ - int gl_copy; + enum dc_gl_type gl_type; /* type of GL device context */ } X11DRV_PDEVICE; static inline X11DRV_PDEVICE *get_x11drv_dev( PHYSDEV dev ) @@ -345,7 +355,7 @@ struct x11drv_escape_set_drawable XID fbconfig_id; /* fbconfig id used by the GL drawable */ Drawable gl_drawable; /* GL drawable */ Pixmap pixmap; /* Pixmap for a GLXPixmap gl_drawable */ - int gl_copy; /* whether the GL contents need explicit copying */ + enum dc_gl_type gl_type; /* type of GL device context */ }; /**************************************************************************

1 0

Francois Gouget : mscoree: Make assembly_rva_to_va() and parse_headers() static.
by Alexandre Julliard May 4, 2012

May 4, 2012

Module: wine Branch: master Commit: bde73d8dfc7e65a080a0a250deb65295969e4538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde73d8dfc7e65a080a0a250d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 4 16:25:58 2012 +0200 mscoree: Make assembly_rva_to_va() and parse_headers() static. --- dlls/mscoree/assembly.c | 4 ++-- dlls/mscoree/mscoree_private.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/assembly.c b/dlls/mscoree/assembly.c index a1e3dc7..13e7f03 100644 --- a/dlls/mscoree/assembly.c +++ b/dlls/mscoree/assembly.c @@ -92,7 +92,7 @@ static inline LPWSTR strdupW(LPCWSTR src) return dest; } -void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) +static void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) { if (assembly->is_mapped_file) return ImageRvaToVa(assembly->nthdr, assembly->data, rva, NULL); @@ -190,7 +190,7 @@ static HRESULT parse_pe_header(ASSEMBLY *assembly) return S_OK; } -HRESULT parse_headers(ASSEMBLY *assembly) +static HRESULT parse_headers(ASSEMBLY *assembly) { HRESULT hr; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 357914f..69f285c 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -35,7 +35,6 @@ typedef struct _VTableFixup { typedef struct tagASSEMBLY ASSEMBLY; -extern void* assembly_rva_to_va(ASSEMBLY *assembly, ULONG rva) DECLSPEC_HIDDEN; extern HRESULT assembly_create(ASSEMBLY **out, LPCWSTR file) DECLSPEC_HIDDEN; extern HRESULT assembly_from_hmodule(ASSEMBLY **out, HMODULE hmodule) DECLSPEC_HIDDEN; extern HRESULT assembly_release(ASSEMBLY *assembly) DECLSPEC_HIDDEN;

1 0

Christian Costa : amstream: Add checks to GetFormat.
by Alexandre Julliard May 4, 2012

May 4, 2012

Module: wine Branch: master Commit: 49762b1679c498ccd46ad79e941ab44623295fc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49762b1679c498ccd46ad79e9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 1 10:21:20 2012 +0200 amstream: Add checks to GetFormat. --- dlls/amstream/mediastream.c | 15 +++++++++------ dlls/amstream/tests/amstream.c | 14 ++++++++++++++ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 2aeaaa4..6656bf7 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -159,13 +159,13 @@ static HRESULT WINAPI IDirectDrawMediaStreamImpl_SendEndOfStream(IDirectDrawMedi /*** IDirectDrawMediaStream methods ***/ static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream *iface, - DDSURFACEDESC *pDDSDCurrent, IDirectDrawPalette **ppDirectDrawPalette, - DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) + DDSURFACEDESC *current_format, IDirectDrawPalette **palette, + DDSURFACEDESC *desired_format, DWORD *flags) { - FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, pDDSDCurrent, ppDirectDrawPalette, pDDSDDesired, - pdwFlags); + FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, current_format, palette, desired_format, + flags); - return E_NOTIMPL; + return MS_E_NOSTREAM; } @@ -390,7 +390,10 @@ static HRESULT WINAPI IAudioMediaStreamImpl_GetFormat(IAudioMediaStream *iface, FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); - return E_NOTIMPL; + if (!wave_format_current) + return E_POINTER; + + return MS_E_NOSTREAM; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f613c8c..c62e83d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -248,6 +248,13 @@ static void test_media_streams(void) if (SUCCEEDED(hr)) { + DDSURFACEDESC current_format, desired_format; + IDirectDrawPalette *palette; + DWORD flags; + + hr = IDirectDrawMediaStream_GetFormat(ddraw_stream, &current_format, &palette, &desired_format, &flags); + ok(hr == MS_E_NOSTREAM, "IDirectDrawoMediaStream_GetFormat returned: %x\n", hr); + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &ddraw_sample); ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); } @@ -333,9 +340,16 @@ static void test_media_streams(void) if (SUCCEEDED(hr)) { IAudioData* audio_data = NULL; + WAVEFORMATEX format; + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + hr = IAudioMediaStream_GetFormat(audio_media_stream, NULL); + ok(hr == E_POINTER, "IAudioMediaStream_GetFormat returned: %x\n", hr); + hr = IAudioMediaStream_GetFormat(audio_media_stream, &format); + ok(hr == MS_E_NOSTREAM, "IAudioMediaStream_GetFormat returned: %x\n", hr); + hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample);

1 0