November 2009 - Wine-Commits

Vincent Povirk : ole32: Rename firstPropertyNode to storageDirEntry.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: de3ed0bb50cf4d06f6b6bc811370785ef1e24f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3ed0bb50cf4d06f6b6bc811… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:02:20 2009 -0600 ole32: Rename firstPropertyNode to storageDirEntry. --- dlls/ole32/storage32.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9040a97..1d05b7a 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -236,11 +236,11 @@ struct IEnumSTATSTGImpl LONG ref; /* Reference count */ StorageImpl* parentStorage; /* Reference to the parent storage */ - ULONG firstPropertyNode; /* Index of the root of the storage to enumerate */ + ULONG storageDirEntry; /* Directory entry of the storage to enumerate */ /* * The current implementation of the IEnumSTATSTGImpl class uses a stack - * to walk the property sets to get the content of a storage. This stack + * to walk the directory entries to get the content of a storage. This stack * is implemented by the following 3 data members */ ULONG stackSize; @@ -251,7 +251,7 @@ struct IEnumSTATSTGImpl }; -static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(StorageImpl* This, ULONG firstPropertyNode); +static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct(StorageImpl* This, ULONG storageDirEntry); static void IEnumSTATSTGImpl_Destroy(IEnumSTATSTGImpl* This); static void IEnumSTATSTGImpl_PushSearchNode(IEnumSTATSTGImpl* This, ULONG nodeToPush); static ULONG IEnumSTATSTGImpl_PopSearchNode(IEnumSTATSTGImpl* This, BOOL remove); @@ -3719,7 +3719,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Reset( */ readSuccessful = StorageImpl_ReadDirEntry( This->parentStorage, - This->firstPropertyNode, + This->storageDirEntry, &rootProperty); if (readSuccessful) @@ -3750,7 +3750,7 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( return E_INVALIDARG; newClone = IEnumSTATSTGImpl_Construct(This->parentStorage, - This->firstPropertyNode); + This->storageDirEntry); /* @@ -3864,7 +3864,7 @@ static const IEnumSTATSTGVtbl IEnumSTATSTGImpl_Vtbl = static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( StorageImpl* parentStorage, - ULONG firstPropertyNode) + ULONG storageDirEntry) { IEnumSTATSTGImpl* newEnumeration; @@ -3885,7 +3885,7 @@ static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( newEnumeration->parentStorage = parentStorage; IStorage_AddRef((IStorage*)newEnumeration->parentStorage); - newEnumeration->firstPropertyNode = firstPropertyNode; + newEnumeration->storageDirEntry = storageDirEntry; /* * Initialize the search stack

1 0

Alexandre Julliard : shell32: Fix setting of NULL arguments in IShellLink.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: 61a4200162a3943dea88e401d9bef6dae2a66285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a4200162a3943dea88e401d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 16 20:09:48 2009 +0100 shell32: Fix setting of NULL arguments in IShellLink. --- dlls/shell32/shelllink.c | 25 +++++++++++++++++-------- dlls/shell32/tests/shelllink.c | 14 ++++++++++++++ 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 414cc54..3b16170 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1497,9 +1497,13 @@ static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA * iface, LPCSTR psz TRACE("(%p)->(args=%s)\n",This, pszArgs); HeapFree(GetProcessHeap(), 0, This->sArgs); - This->sArgs = HEAP_strdupAtoW( GetProcessHeap(), 0, pszArgs); - if( !This->sArgs ) - return E_OUTOFMEMORY; + if (pszArgs) + { + This->sArgs = HEAP_strdupAtoW( GetProcessHeap(), 0, pszArgs); + if( !This->sArgs ) + return E_OUTOFMEMORY; + } + else This->sArgs = NULL; This->bDirty = TRUE; @@ -1877,11 +1881,16 @@ static HRESULT WINAPI IShellLinkW_fnSetArguments(IShellLinkW * iface, LPCWSTR ps TRACE("(%p)->(args=%s)\n",This, debugstr_w(pszArgs)); HeapFree(GetProcessHeap(), 0, This->sArgs); - This->sArgs = HeapAlloc( GetProcessHeap(), 0, - (lstrlenW( pszArgs )+1)*sizeof (WCHAR) ); - if ( !This->sArgs ) - return E_OUTOFMEMORY; - lstrcpyW( This->sArgs, pszArgs ); + if (pszArgs) + { + This->sArgs = HeapAlloc( GetProcessHeap(), 0, + (lstrlenW( pszArgs )+1)*sizeof (WCHAR) ); + if ( !This->sArgs ) + return E_OUTOFMEMORY; + lstrcpyW( This->sArgs, pszArgs ); + } + else This->sArgs = NULL; + This->bDirty = TRUE; return S_OK; diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 2f20200..2535471 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -275,6 +275,20 @@ static void test_get_set(void) ok(SUCCEEDED(r), "GetArguments failed (0x%08x)\n", r); ok(lstrcmp(buffer,str)==0, "GetArguments returned '%s'\n", buffer); + strcpy(buffer,"garbage"); + r = IShellLinkA_SetArguments(sl, NULL); + ok(SUCCEEDED(r), "SetArguments failed (0x%08x)\n", r); + r = IShellLinkA_GetArguments(sl, buffer, sizeof(buffer)); + ok(SUCCEEDED(r), "GetArguments failed (0x%08x)\n", r); + ok(!buffer[0] || lstrcmp(buffer,str)==0, "GetArguments returned '%s'\n", buffer); + + strcpy(buffer,"garbage"); + r = IShellLinkA_SetArguments(sl, ""); + ok(SUCCEEDED(r), "SetArguments failed (0x%08x)\n", r); + r = IShellLinkA_GetArguments(sl, buffer, sizeof(buffer)); + ok(SUCCEEDED(r), "GetArguments failed (0x%08x)\n", r); + ok(!buffer[0], "GetArguments returned '%s'\n", buffer); + /* Test Getting / Setting showcmd */ i=0xdeadbeef; r = IShellLinkA_GetShowCmd(sl, &i);

1 0

Vincent Povirk : ole32: Rename property variables in the StorageBaseImpl methods.
by Alexandre Julliard Nov. 17, 2009

Nov. 17, 2009

Module: wine Branch: master Commit: b984e46b867fc657c8db48ec5e37b404f918bc98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b984e46b867fc657c8db48ec5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Nov 12 14:32:35 2009 -0600 ole32: Rename property variables in the StorageBaseImpl methods. --- dlls/ole32/storage32.c | 211 ++++++++++++++++++++++++------------------------ 1 files changed, 104 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b984e46b867fc657c8db4…

1 0

Marcin Baczyński : gdiplus: Add missing declarations for graphics.c functions.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 2e3492f9517fe7bd44afd7a6b0a7ef0e2f2a6eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3492f9517fe7bd44afd7a6b… Author: Marcin Baczyński <marbacz(a)gmail.com> Date: Sun Nov 15 00:34:11 2009 +0100 gdiplus: Add missing declarations for graphics.c functions. --- include/gdiplusflat.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index bce1e21..27a7574 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -134,6 +134,7 @@ GpStatus WINGDIPAPI GdipCreateFromHDC(HDC,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC,HANDLE,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWND(HWND,GpGraphics**); GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND,GpGraphics**); +HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void); GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *); GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL); @@ -151,6 +152,8 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,RE GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,REAL); GpStatus WINGDIPAPI GdipDrawCurve3(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,INT,INT,REAL); GpStatus WINGDIPAPI GdipDrawCurve3I(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT,INT,INT,REAL); +GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics*,GDIPCONST UINT16*,INT, + GDIPCONST GpFont*,GDIPCONST GpBrush*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*); GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawImage(GpGraphics*,GpImage*,REAL,REAL); @@ -238,9 +241,13 @@ GpStatus WINGDIPAPI GdipIsVisibleRectI(GpGraphics*,INT,INT,INT,INT,BOOL*); GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics*, GDIPCONST WCHAR*, INT, GDIPCONST GpFont*, GDIPCONST RectF*, GDIPCONST GpStringFormat*, INT, GpRegion**); +GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics*,GDIPCONST UINT16*,INT, + GDIPCONST GpFont*,GDIPCONST PointF*,INT,GDIPCONST GpMatrix*,RectF*); GpStatus WINGDIPAPI GdipMeasureString(GpGraphics*,GDIPCONST WCHAR*,INT, GDIPCONST GpFont*,GDIPCONST RectF*,GDIPCONST GpStringFormat*,RectF*,INT*,INT*); GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics*,GDIPCONST GpMatrix*,GpMatrixOrder); +GpStatus WINGDIPAPI GdipRecordMetafileI(HDC,EmfType,GDIPCONST GpRect*, + MetafileFrameUnit,GDIPCONST WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipReleaseDC(GpGraphics*,HDC); GpStatus WINGDIPAPI GdipResetClip(GpGraphics*); GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics*); @@ -249,6 +256,7 @@ GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics*,GraphicsState*); GpStatus WINGDIPAPI GdipScaleWorldTransform(GpGraphics*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetClipHrgn(GpGraphics*,HRGN,CombineMode); +GpStatus WINGDIPAPI GdipSetClipGraphics(GpGraphics*,GpGraphics*,CombineMode); GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics*,GpPath*,CombineMode); GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode); GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode); @@ -259,6 +267,7 @@ GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode); GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL); GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); +GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics*,INT,INT); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipSetTextContrast(GpGraphics*,UINT); GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics*,TextRenderingHint);

1 0

Rob Shearman : rpcrt4: Implement comm_status and fault_status handling for stubless procedures.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 438f2a52a6ee10974f5c5443f32211cb6c6575fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=438f2a52a6ee10974f5c5443f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 14:42:11 2009 +0000 rpcrt4: Implement comm_status and fault_status handling for stubless procedures. --- dlls/rpcrt4/ndr_stubless.c | 84 ++++++++++++++++++++++++++++++++++++++++---- include/wine/rpcfc.h | 1 + 2 files changed, 78 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 8150238..bf6a7be 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -686,7 +686,8 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma * 4. PROXY_SENDRECEIVE - send/receive buffer * 5. PROXY_UNMARHSAL - unmarshal [out] params from buffer */ - if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + if ((pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) || + (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_HAS_COMM_OR_FAULT)) { __TRY { @@ -696,13 +697,56 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma switch (phase) { case PROXY_GETBUFFER: - /* allocate the buffer */ - NdrProxyGetBuffer(This, &stubMsg); + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + /* allocate the buffer */ + NdrProxyGetBuffer(This, &stubMsg); + } + else + { + /* allocate the buffer */ + if (Oif_flags.HasPipes) + /* NdrGetPipeBuffer(...) */ + FIXME("pipes not supported yet\n"); + else + { + if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) +#if 0 + NdrNsGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); +#else + FIXME("using auto handle - call NdrNsGetBuffer when it gets implemented\n"); +#endif + else + NdrGetBuffer(&stubMsg, stubMsg.BufferLength, hBinding); + } + } break; case PROXY_SENDRECEIVE: - /* send the [in] params and receive the [out] and [retval] - * params */ - NdrProxySendReceive(This, &stubMsg); + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + { + /* send the [in] params and receive the [out] and [retval] + * params */ + NdrProxySendReceive(This, &stubMsg); + } + else + { + /* send the [in] params and receive the [out] and [retval] + * params */ + if (Oif_flags.HasPipes) + /* NdrPipesSendReceive(...) */ + FIXME("pipes not supported yet\n"); + else + { + if (pProcHeader->handle_type == RPC_FC_AUTO_HANDLE) +#if 0 + NdrNsSendReceive(&stubMsg, stubMsg.Buffer, pStubDesc->IMPLICIT_HANDLE_INFO.pAutoHandle); +#else + FIXME("using auto handle - call NdrNsSendReceive when it gets implemented\n"); +#endif + else + NdrSendReceive(&stubMsg, stubMsg.Buffer); + } + } /* convert strings, floating point values and endianess into our * preferred format */ @@ -729,7 +773,33 @@ LONG_PTR WINAPIV NdrClientCall2(PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma } __EXCEPT_ALL { - RetVal = NdrProxyErrorHandler(GetExceptionCode()); + if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) + RetVal = NdrProxyErrorHandler(GetExceptionCode()); + else + { + const COMM_FAULT_OFFSETS *comm_fault_offsets = &pStubDesc->CommFaultOffsets[procedure_number]; + ULONG *comm_status; + ULONG *fault_status; + + TRACE("comm_fault_offsets = {0x%hx, 0x%hx}\n", comm_fault_offsets->CommOffset, comm_fault_offsets->FaultOffset); + + if (comm_fault_offsets->CommOffset == -1) + comm_status = (ULONG *)&RetVal; + else if (comm_fault_offsets->CommOffset >= 0) + comm_status = *(ULONG **)ARG_FROM_OFFSET(stubMsg.StackTop, comm_fault_offsets->CommOffset); + else + comm_status = NULL; + + if (comm_fault_offsets->FaultOffset == -1) + fault_status = (ULONG *)&RetVal; + else if (comm_fault_offsets->FaultOffset >= 0) + fault_status = *(ULONG **)ARG_FROM_OFFSET(stubMsg.StackTop, comm_fault_offsets->CommOffset); + else + fault_status = NULL; + + NdrMapCommAndFaultStatus(&stubMsg, comm_status, fault_status, + GetExceptionCode()); + } } __ENDTRY } diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index ee7ba7f..53dd163 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -167,6 +167,7 @@ #define RPC_FC_PROC_OIF_OBJECT 0x04 #define RPC_FC_PROC_OIF_RPCFLAGS 0x08 #define RPC_FC_PROC_OIF_OBJ_V2 0x20 +#define RPC_FC_PROC_OIF_HAS_COMM_OR_FAULT 0x20 #define RPC_FC_PROC_OIF_NEWINIT 0x40 #define RPC_FC_PROC_PF_MUSTSIZE 0x0001

1 0

Roderick Colenbrander : wgl: Get rid of delayed GLX context creation. Instead attempt to re-create a context when wglShareLists is called.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: f4b88e34ec5fa9c05dd803b517ff345aa8b87801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b88e34ec5fa9c05dd803b51… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Nov 15 12:09:08 2009 +0100 wgl: Get rid of delayed GLX context creation. Instead attempt to re-create a context when wglShareLists is called. --- dlls/gdi32/opengl.c | 2 +- dlls/winex11.drv/opengl.c | 89 ++++++++++++++++++++++++++------------------- 2 files changed, 52 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 63ba433..2317afa 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -279,7 +279,7 @@ BOOL WINAPI wglShareLists(HGLRC hglrc1, HGLRC hglrc2) OPENGL_Context ctx = (OPENGL_Context)hglrc1; TRACE("hglrc1: (%p); hglrc: (%p)\n", hglrc1, hglrc2); - if(ctx == NULL) + if(ctx == NULL || hglrc2 == NULL) return FALSE; /* Retrieve the HDC associated with the context to access the display driver */ diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 45da479..395e2a4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -103,6 +103,8 @@ typedef struct wine_glpixelformat { typedef struct wine_glcontext { HDC hdc; BOOL do_escape; + BOOL has_been_current; + BOOL sharing; XVisualInfo *vis; WineGLPixelFormat *fmt; GLXContext ctx; @@ -1698,15 +1700,16 @@ HGLRC CDECL X11DRV_wglCreateContext(X11DRV_PDEVICE *physDev) return NULL; } - /* The context will be allocated in the wglMakeCurrent call */ wine_tsx11_lock(); ret = alloc_context(); - wine_tsx11_unlock(); ret->hdc = hdc; ret->fmt = fmt; + ret->has_been_current = FALSE; + ret->sharing = FALSE; - /*ret->vis = vis;*/ ret->vis = pglXGetVisualFromFBConfig(gdi_display, fmt->fbconfig); + ret->ctx = create_glxcontext(gdi_display, ret, NULL); + wine_tsx11_unlock(); TRACE(" creating context %p (GL context creation delayed)\n", ret); return (HGLRC) ret; @@ -1824,25 +1827,20 @@ BOOL CDECL X11DRV_wglMakeCurrent(X11DRV_PDEVICE *physDev, HGLRC hglrc) { ret = FALSE; } else { Drawable drawable = get_glxdrawable(physDev); - if (ctx->ctx == NULL) { - /* The describe lines below are for debugging purposes only */ - if (TRACE_ON(wgl)) { - describeDrawable(physDev); - describeContext(ctx); - } - /* Create a GLX context using the same visual as chosen earlier in wglCreateContext. - * We are certain that the drawable and context are compatible as we only allow compatible formats. - */ - TRACE(" Creating GLX Context\n"); - ctx->ctx = create_glxcontext(gdi_display, ctx, NULL); - TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); + /* The describe lines below are for debugging purposes only */ + if (TRACE_ON(wgl)) { + describeDrawable(physDev); + describeContext(ctx); } + TRACE(" make current for dis %p, drawable %p, ctx %p\n", gdi_display, (void*) drawable, ctx->ctx); ret = pglXMakeCurrent(gdi_display, drawable, ctx->ctx); NtCurrentTeb()->glContext = ctx; + if(ret) { + ctx->has_been_current = TRUE; ctx->hdc = hdc; ctx->read_hdc = hdc; ctx->drawables[0] = drawable; @@ -1886,10 +1884,7 @@ BOOL CDECL X11DRV_wglMakeContextCurrentARB(X11DRV_PDEVICE* pDrawDev, X11DRV_PDEV Drawable d_draw = get_glxdrawable(pDrawDev); Drawable d_read = get_glxdrawable(pReadDev); - if (ctx->ctx == NULL) { - ctx->ctx = create_glxcontext(gdi_display, ctx, NULL); - TRACE(" created a delayed OpenGL context (%p)\n", ctx->ctx); - } + ctx->has_been_current = TRUE; ctx->hdc = pDrawDev->hdc; ctx->read_hdc = pReadDev->hdc; ctx->drawables[0] = d_draw; @@ -1918,30 +1913,48 @@ BOOL CDECL X11DRV_wglShareLists(HGLRC hglrc1, HGLRC hglrc2) { if (!has_opengl()) return FALSE; - if (NULL != dest && dest->ctx != NULL) { - ERR("Could not share display lists, context already created !\n"); + /* Sharing of display lists works differently in GLX and WGL. In case of GLX it is done + * at context creation time but in case of WGL it is done using wglShareLists. + * In the past we tried to emulate wglShareLists by delaying GLX context creation until + * either a wglMakeCurrent or wglShareLists. This worked fine for most apps but it causes + * issues for OpenGL 3 because there wglCreateContextAttribsARB can fail in a lot of cases, + * so there delaying context creation doesn't work. + * + * The new approach is to create a GLX context in wglCreateContext / wglCreateContextAttribsARB + * and when a program requests sharing we recreate the destination context if it hasn't been made + * current or when it hasn't shared display lists before. + */ + + if((org->has_been_current && dest->has_been_current) || dest->has_been_current) + { + ERR("Could not share display lists, one of the contexts has been current already !\n"); return FALSE; - } else { - if(org && dest && (GetObjectType(org->hdc) == OBJ_MEMDC) ^ (GetObjectType(dest->hdc) == OBJ_MEMDC)) { + } + else if(dest->sharing) + { + ERR("Could not share display lists because hglrc2 has already shared lists before\n"); + return FALSE; + } + else + { + if((GetObjectType(org->hdc) == OBJ_MEMDC) ^ (GetObjectType(dest->hdc) == OBJ_MEMDC)) + { WARN("Attempting to share a context between a direct and indirect rendering context, expect issues!\n"); } - if (org->ctx == NULL) { - wine_tsx11_lock(); - describeContext(org); + wine_tsx11_lock(); + describeContext(org); + describeContext(dest); - org->ctx = create_glxcontext(gdi_display, org, NULL); - wine_tsx11_unlock(); - TRACE(" created a delayed OpenGL context (%p) for Wine context %p\n", org->ctx, org); - } - if (NULL != dest) { - wine_tsx11_lock(); - describeContext(dest); - dest->ctx = create_glxcontext(gdi_display, dest, org->ctx); - wine_tsx11_unlock(); - TRACE(" created a delayed OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); - return TRUE; - } + /* Re-create the GLX context and share display lists */ + pglXDestroyContext(gdi_display, dest->ctx); + dest->ctx = create_glxcontext(gdi_display, dest, org->ctx); + wine_tsx11_unlock(); + TRACE(" re-created an OpenGL context (%p) for Wine context %p sharing lists with OpenGL ctx %p\n", dest->ctx, dest, org->ctx); + + org->sharing = TRUE; + dest->sharing = TRUE; + return TRUE; } return FALSE; }

1 0

Mikey Alexander : shell32/tests: Fix Program Manager DDE conformance test failures.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: d51b4e19fb99e30eadd6207d8dba7b0d36363c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51b4e19fb99e30eadd6207d8… Author: Mikey Alexander <firesword14(a)yahoo.com> Date: Sat Nov 14 08:23:14 2009 -0800 shell32/tests: Fix Program Manager DDE conformance test failures. --- dlls/shell32/tests/progman_dde.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index e4867e1..c2ff934 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -26,6 +26,13 @@ * as documented * Better AddItem Tests (Lots of parameters to test) * Tests for Invalid Characters in Names / Invalid Parameters + * - Technically, calling as an administrator creates groups in the CSIDL_COMMON_PROGRAMS + * directory. Win 9x and non-administrator calls us CSIDL_PROGRAMS directory. + * Original plans were to check that items/groups were created in appropriate + * places. As of this writing and in order to simplify the test code, it now + * checks for existence in either place. From web searches, it is not at all + * obvious or trivial to detect if the call is coming from an administrator or + * non-administrator. IsUserAnAdmin */ #include <stdio.h> @@ -39,9 +46,9 @@ /* Timeout on DdeClientTransaction Call */ #define MS_TIMEOUT_VAL 1000 /* # of times to poll for window creation */ -#define PDDE_POLL_NUM 50 +#define PDDE_POLL_NUM 150 /* time to sleep between polls */ -#define PDDE_POLL_TIME 200 +#define PDDE_POLL_TIME 300 /* Call Info */ #define DDE_TEST_MISC 0x00010000 @@ -121,7 +128,6 @@ static const char * GetStringFromTestParams(int testParams) #define DMLERR_TO_STR(x) case x: return#x; static const char * GetStringFromError(UINT err) { - const char * retstr; switch (err) { DMLERR_TO_STR(DMLERR_NO_ERROR); @@ -144,11 +150,8 @@ static const char * GetStringFromError(UINT err) DMLERR_TO_STR(DMLERR_UNADVACKTIMEOUT); DMLERR_TO_STR(DMLERR_UNFOUND_QUEUE_ID); default: - retstr = "Unknown DML Error"; - break; + return "Unknown DML Error"; } - - return retstr; } /* Helper Function to Transfer DdeGetLastError into a String */ @@ -196,6 +199,7 @@ static void DdeExecuteCommand(DWORD instance, HCONV hConv, const char *strCmd, H *hData, GetStringFromTestParams(testParams)); } } + DdeFreeDataHandle(command); } /* @@ -553,8 +557,13 @@ START_TEST(progman_dde) hszProgman = DdeCreateStringHandle(instance, "PROGMAN", CP_WINANSI); ok (hszProgman != NULL, "DdeCreateStringHandle Error %s\n", GetDdeLastErrorStr(instance)); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); - ok (hConv != NULL, "DdeConnect Error %s\n", GetDdeLastErrorStr(instance)); ok (DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle failure\n"); + /* Seeing failures on early versions of Windows Connecting to progman, exit if connection fails */ + if (hConv == NULL) + { + ok (DdeUninitialize(instance), "DdeUninitialize failed\n"); + return; + } /* Run Tests */ testnum = DdeTestProgman(instance, hConv);

1 0

Rob Shearman : rpcrt4: Don' t crash with a NULL binding handle in RpcBindingFree.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: cdc10a8d3b262f5010c0f78ce4053c363ff151a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc10a8d3b262f5010c0f78ce… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 14:40:26 2009 +0000 rpcrt4: Don't crash with a NULL binding handle in RpcBindingFree. --- dlls/rpcrt4/rpc_binding.c | 7 +++++-- dlls/rpcrt4/tests/rpc.c | 12 ++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index b264b9a..212e201 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -785,8 +785,11 @@ RPC_STATUS WINAPI RpcBindingFree( RPC_BINDING_HANDLE* Binding ) { RPC_STATUS status; TRACE("(%p) = %p\n", Binding, *Binding); - status = RPCRT4_ReleaseBinding(*Binding); - if (status == RPC_S_OK) *Binding = 0; + if (*Binding) + status = RPCRT4_ReleaseBinding(*Binding); + else + status = RPC_S_INVALID_BINDING; + if (status == RPC_S_OK) *Binding = NULL; return status; } diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 01d7392..0f742b2 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -800,6 +800,17 @@ static void test_UuidCreate(void) } } +static void test_RpcBindingFree(void) +{ + RPC_BINDING_HANDLE binding = NULL; + RPC_STATUS status; + + status = RpcBindingFree(&binding); + ok(status == RPC_S_INVALID_BINDING, + "RpcBindingFree should have retured RPC_S_INVALID_BINDING instead of %d\n", + status); +} + START_TEST( rpc ) { UuidConversionAndComparison(); @@ -811,4 +822,5 @@ START_TEST( rpc ) test_I_RpcExceptionFilter(); test_RpcStringBindingFromBinding(); test_UuidCreate(); + test_RpcBindingFree(); }

1 0

Rob Shearman : msdaps: Clear *pcPropertySets value in IDBProperties_GetProperties_Stub to fix a test .
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 36dae82a68de27eb61310247e03c10da6efa49ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dae82a68de27eb61310247e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Nov 16 14:37:14 2009 +0000 msdaps: Clear *pcPropertySets value in IDBProperties_GetProperties_Stub to fix a test. --- dlls/msdaps/usrmarshal.c | 1 + dlls/oledb32/tests/marshal.c | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 8e15862..0624c3a 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -122,6 +122,7 @@ HRESULT __RPC_STUB IDBProperties_GetProperties_Stub(IDBProperties* This, ULONG c TRACE("(%p, %d, %p, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets, ppErrorInfoRem); + *pcPropertySets = 0; *ppErrorInfoRem = NULL; hr = IDBProperties_GetProperties(This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); diff --git a/dlls/oledb32/tests/marshal.c b/dlls/oledb32/tests/marshal.c index 587b8b6..39d8448 100644 --- a/dlls/oledb32/tests/marshal.c +++ b/dlls/oledb32/tests/marshal.c @@ -165,7 +165,6 @@ static HRESULT WINAPI Test_DBProperties_GetProperties( DBPROPSET **prgPropertySets) { ok(cPropertyIDSets == 0, "Expected cPropertyIDSets to be 0 instead of %d\n", cPropertyIDSets); - todo_wine ok(*pcPropertySets == 0, "Expected *pcPropertySets to be 0 instead of %d\n", *pcPropertySets); *pcPropertySets = 1; *prgPropertySets = CoTaskMemAlloc(sizeof(DBPROPSET));

1 0

Andrew Nguyen : dbghelp: Stub SymRefreshModuleList.
by Alexandre Julliard Nov. 16, 2009

Nov. 16, 2009

Module: wine Branch: master Commit: 44ac91d78dc19787f454685ea27ed34571b5332a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44ac91d78dc19787f454685ea… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sun Nov 15 19:02:48 2009 -0600 dbghelp: Stub SymRefreshModuleList. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/module.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 63a107c..825493a 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -144,7 +144,7 @@ @ stub SymNextW @ stub SymPrev @ stub SymPrevW -@ stub SymRefreshModuleList +@ stdcall SymRefreshModuleList(long) @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterCallback64(long ptr double) @ stdcall SymRegisterCallbackW64(long ptr double) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6199b58..7d2ad7f 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1052,3 +1052,12 @@ void module_reset_debug_info(struct module* module) module->sources_used = module->sources_alloc = 0; module->sources = NULL; } + +/****************************************************************** + * SymRefreshModuleList (DBGHELP.@) + */ +BOOL WINAPI SymRefreshModuleList(HANDLE hProcess) +{ + FIXME("(%p) stub\n", hProcess); + return FALSE; +}

1 0