October 2007 - Wine-Commits

Tag wine-0.9.48 : Alexandre Julliard : Release 0.9.48
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: refs/tags/wine-0.9.48 Tag: 193c2e4c5562e745f39f6b3db34c08f2a16d857a URL: http://source.winehq.org/git/wine.git/?a=tag;h=193c2e4c5562e745f39f6b3db34c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 19:21:15 2007 +0200 Release 0.9.48

1 0

Marcus Meissner : Updated AUTHORS file.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 438ca04607cb80a72a5cb85e779ce583b61138d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=438ca04607cb80a72a5cb85e7… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Oct 26 11:36:55 2007 +0200 Updated AUTHORS file. --- AUTHORS | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 125 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=438ca04607cb80a72a5cb…

1 0

Stefan Dösinger : wined3d: Move regular surface / texture downloading to LoadLocation.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 20f1f50b2a20b5d8b033babd2a14a0e43c2a00b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20f1f50b2a20b5d8b033babd2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 25 00:16:05 2007 +0200 wined3d: Move regular surface / texture downloading to LoadLocation. --- dlls/wined3d/surface.c | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b825683..4f891c8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -822,26 +822,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED } else { /* This path is for normal surfaces, offscreen render targets and everything else that is in a gl texture */ TRACE("locking an ordinary surface\n"); - - if (0 != This->glDescription.textureName) { - /* Now I have to copy thing bits back */ - - if(myDevice->createParms.BehaviorFlags & WINED3DCREATE_MULTITHREADED) { - ActivateContext(myDevice, myDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } - - ENTER_GL(); - /* Make sure that a proper texture unit is selected, bind the texture and dirtify the sampler to restore the texture on the next draw */ - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); - checkGLcall("glActiveTextureARB"); - } - IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); - IWineD3DSurface_PreLoad(iface); - - surface_download_data(This); - LEAVE_GL(); - } + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL /* no partial locking for textures yet */); } lock_end: @@ -2426,8 +2407,9 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch extern HRESULT WINAPI IWineD3DSurfaceImpl_AddDirtyRect(IWineD3DSurface *iface, CONST RECT* pDirtyRect) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DBaseTexture *baseTexture = NULL; + if (!(This->Flags & SFLAG_INSYSMEM) && (This->Flags & SFLAG_INTEXTURE)) - surface_download_data(This); + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL /* no partial locking for textures yet */); IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); if (NULL != pDirtyRect) { @@ -3551,6 +3533,8 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + IWineD3DDeviceImpl *myDevice; + TRACE("(%p)->(%s, %p)\n", iface, flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", rect); @@ -3569,11 +3553,30 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D This->Flags |= SFLAG_LOST; return WINED3DERR_DEVICELOST; } + myDevice = This->resource.wineD3DDevice; if(flag == SFLAG_INSYSMEM) { /* Download the surface to system memory */ if(This->Flags & SFLAG_INTEXTURE) { - /* Download texture to sysmem */ + if (0 == This->glDescription.textureName) { + ERR("Surface does not have a texture, but SFLAG_INTEXTURE is set\n"); + } + + if(myDevice->createParms.BehaviorFlags & WINED3DCREATE_MULTITHREADED) { + ActivateContext(myDevice, myDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } + + ENTER_GL(); + /* Make sure that a proper texture unit is selected, bind the texture and dirtify the sampler to restore the texture on the next draw */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); + checkGLcall("glActiveTextureARB"); + } + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); + IWineD3DSurface_PreLoad(iface); + + surface_download_data(This); + LEAVE_GL(); } else { /* Download drawable to sysmem */ }

1 0

Francois Gouget : cryptnet: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: ce9cc0ba5006140a293377cc85e48f3a3b76091e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9cc0ba5006140a293377cc8… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 26 15:08:40 2007 +0200 cryptnet: Fix compilation on systems that don't support nameless unions. --- dlls/cryptnet/cryptnet_main.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index d280ca4..b83adb8 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -21,13 +21,15 @@ #include "config.h" #include "wine/port.h" #include <stdio.h> + +#define NONAMELESSUNION + #include "windef.h" #include "wine/debug.h" #include "winbase.h" #include "winnt.h" #include "winnls.h" #include "wininet.h" -#define NONAMELESSUNION #define CERT_REVOCATION_PARA_HAS_EXTRA_FIELDS #include "wincrypt.h" @@ -158,17 +160,17 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid, { DWORD j; CERT_ALT_NAME_INFO *name = - &info->rgDistPoint[i].DistPointName.FullName; + &info->rgDistPoint[i].DistPointName.u.FullName; for (j = 0; j < name->cAltEntry; j++) if (name->rgAltEntry[j].dwAltNameChoice == CERT_ALT_NAME_URL) { - if (name->rgAltEntry[j].pwszURL) + if (name->rgAltEntry[j].u.pwszURL) { cUrl++; bytesNeeded += sizeof(LPWSTR) + - (lstrlenW(name->rgAltEntry[j].pwszURL) + 1) + (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1) * sizeof(WCHAR); } } @@ -202,20 +204,20 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid, { DWORD j; CERT_ALT_NAME_INFO *name = - &info->rgDistPoint[i].DistPointName.FullName; + &info->rgDistPoint[i].DistPointName.u.FullName; for (j = 0; j < name->cAltEntry; j++) if (name->rgAltEntry[j].dwAltNameChoice == CERT_ALT_NAME_URL) { - if (name->rgAltEntry[j].pwszURL) + if (name->rgAltEntry[j].u.pwszURL) { lstrcpyW(nextUrl, - name->rgAltEntry[j].pwszURL); + name->rgAltEntry[j].u.pwszURL); pUrlArray->rgwszUrl[pUrlArray->cUrl++] = nextUrl; nextUrl += - (lstrlenW(name->rgAltEntry[j].pwszURL) + 1) + (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1) * sizeof(WCHAR); } }

1 0

Stefan Dösinger : wined3d: Begin centralizing surface location management.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: dcff7dc213cfcc9541803dedd16ab2298837f416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcff7dc213cfcc9541803dedd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 9 22:17:59 2007 +0200 wined3d: Begin centralizing surface location management. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 10 +++----- dlls/wined3d/drawprim.c | 14 +++++------- dlls/wined3d/surface.c | 41 ++++++++++++++++++++++++++----------- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/surface_gdi.c | 16 +++++++++++++- dlls/wined3d/swapchain.c | 4 +- dlls/wined3d/wined3d_private.h | 3 ++ include/wine/wined3d_interface.h | 2 + 9 files changed, 63 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dcff7dc213cfcc9541803…

1 0

Louis Lenders : advapi32: Export RegOverridePredefKey.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 27e8b829a4cc56969836c0dbbb4db4b775d52a9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e8b829a4cc56969836c0dbb… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Oct 26 12:06:08 2007 +0100 advapi32: Export RegOverridePredefKey. --- dlls/advapi32/advapi32.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index deed87a..7b820ac 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -499,7 +499,7 @@ @ stdcall RegOpenKeyExW(long wstr long long ptr) @ stdcall RegOpenKeyW(long wstr ptr) @ stdcall RegOpenUserClassesRoot(ptr long long ptr) -# @ stub RegOverridePredefKey +@ stub RegOverridePredefKey @ stdcall RegQueryInfoKeyA(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RegQueryInfoKeyW(long ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall RegQueryMultipleValuesA(long ptr long ptr ptr)

1 0

Stefan Dösinger : wined3d: A point size fix.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: ee32ac575b8a16ae926f338531f1b5d1446cedfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee32ac575b8a16ae926f33853… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 22 12:15:03 2007 +0200 wined3d: A point size fix. --- dlls/wined3d/state.c | 78 +++++++++++++++++++++++++++----------------------- 1 files changed, 42 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5fe1cec..7e847c9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1248,19 +1248,6 @@ static void state_normalize(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } } -static void state_psize(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - union { - DWORD d; - float f; - } tmpvalue; - - /* FIXME: check that pointSize isn't outside glGetFloatv( GL_POINT_SIZE_MAX_ARB, &maxSize ); or -ve */ - tmpvalue.d = stateblock->renderState[WINED3DRS_POINTSIZE]; - TRACE("Set point size to %f\n", tmpvalue.f); - glPointSize(tmpvalue.f); - checkGLcall("glPointSize(...);"); -} - static void state_psizemin(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { union { DWORD d; @@ -1311,31 +1298,45 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3 /* Default values */ GLfloat att[3] = {1.0f, 0.0f, 0.0f}; + union { + DWORD d; + float f; + } pointSize, A, B, C; - /* - * Minimum valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. - * This means that OpenGL will clamp really small point sizes to 1.0f. - * To correct for this we need to multiply by the scale factor when sizes - * are less than 1.0f. scale_factor = 1.0f / point_size. - */ - GLfloat pointSize = *((float*)&stateblock->renderState[WINED3DRS_POINTSIZE]); - if(pointSize > 0.0f) { - GLfloat scaleFactor; + pointSize.d = stateblock->renderState[WINED3DRS_POINTSIZE]; + A.d = stateblock->renderState[WINED3DRS_POINTSCALE_A]; + B.d = stateblock->renderState[WINED3DRS_POINTSCALE_B]; + C.d = stateblock->renderState[WINED3DRS_POINTSCALE_C]; - if(pointSize < 1.0f) { - scaleFactor = pointSize * pointSize; + if(stateblock->renderState[WINED3DRS_POINTSCALEENABLE]) { + GLfloat scaleFactor; + float h = stateblock->viewport.Height; + + if(pointSize.f < 1.0f) { + /* + * Minimum valid point size for OpenGL is 1.0f. For Direct3D it is 0.0f. + * This means that OpenGL will clamp really small point sizes to 1.0f. + * To correct for this we need to multiply by the scale factor when sizes + * are less than 1.0f. scale_factor = 1.0f / point_size. + */ + scaleFactor = pointSize.f; + } else if(pointSize.f > GL_LIMITS(pointsize)) { + /* gl already scales the input to glPointSize, + * d3d scales the result after the point size scale. + * If the point size is bigger than the max size, use the + * scaling to scale it bigger, and set the gl point size to max + */ + scaleFactor = pointSize.f / GL_LIMITS(pointsize); + TRACE("scale: %f\n", scaleFactor); + pointSize.f = GL_LIMITS(pointsize); } else { scaleFactor = 1.0f; } + scaleFactor = pow(h * scaleFactor, 2); - if(stateblock->renderState[WINED3DRS_POINTSCALEENABLE]) { - att[0] = *((float*)&stateblock->renderState[WINED3DRS_POINTSCALE_A]) / - (stateblock->viewport.Height * stateblock->viewport.Height * scaleFactor); - att[1] = *((float*)&stateblock->renderState[WINED3DRS_POINTSCALE_B]) / - (stateblock->viewport.Height * stateblock->viewport.Height * scaleFactor); - att[2] = *((float*)&stateblock->renderState[WINED3DRS_POINTSCALE_C]) / - (stateblock->viewport.Height * stateblock->viewport.Height * scaleFactor); - } + att[0] = A.f / scaleFactor; + att[1] = B.f / scaleFactor; + att[2] = C.f / scaleFactor; } if(GL_SUPPORT(ARB_POINT_PARAMETERS)) { @@ -1345,9 +1346,12 @@ static void state_pscale(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3 else if(GL_SUPPORT(EXT_POINT_PARAMETERS)) { GL_EXTCALL(glPointParameterfvEXT)(GL_DISTANCE_ATTENUATION_EXT, att); checkGLcall("glPointParameterfvEXT(GL_DISTANCE_ATTENUATION_EXT, ..."); - } else { - TRACE("POINT_PARAMETERS not supported in this version of opengl\n"); + } else if(stateblock->renderState[WINED3DRS_POINTSCALEENABLE]) { + WARN("POINT_PARAMETERS not supported in this version of opengl\n"); } + + glPointSize(pointSize.f); + checkGLcall("glPointSize(...);"); } static void state_colorwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -3468,7 +3472,9 @@ static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCon if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock, context); } - + if(!isStateDirty(context, STATE_RENDER(WINED3DRS_POINTSCALEENABLE))) { + state_pscale(STATE_RENDER(WINED3DRS_POINTSCALEENABLE), stateblock, context); + } } static void light(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -3787,7 +3793,7 @@ const struct StateEntry StateTable[] = { /*151, WINED3DRS_VERTEXBLEND */ STATE_RENDER(WINED3DRS_VERTEXBLEND), state_vertexblend }, { /*152, WINED3DRS_CLIPPLANEENABLE */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, { /*153, WINED3DRS_SOFTWAREVERTEXPROCESSING */ 0, state_nogl }, - { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSIZE), state_psize }, + { /*154, WINED3DRS_POINTSIZE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale }, { /*155, WINED3DRS_POINTSIZE_MIN */ STATE_RENDER(WINED3DRS_POINTSIZE_MIN), state_psizemin }, { /*156, WINED3DRS_POINTSPRITEENABLE */ STATE_RENDER(WINED3DRS_POINTSPRITEENABLE), state_pointsprite }, { /*157, WINED3DRS_POINTSCALEENABLE */ STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale },

1 0

Stefan Dösinger : wined3d: Add a method for surface location updates.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 123744910f2e805055732f1626b0a91664ed5ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=123744910f2e805055732f162… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 25 00:02:14 2007 +0200 wined3d: Add a method for surface location updates. --- dlls/wined3d/surface.c | 48 +++++++++++++++++++++++++++++++++++++- dlls/wined3d/surface_gdi.c | 12 ++++++++- include/wine/wined3d_interface.h | 2 + 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5fc00a6..b825683 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3549,6 +3549,51 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW } } +static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + TRACE("(%p)->(%s, %p)\n", iface, + flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", + rect); + if(rect) { + TRACE("Rectangle: (%d,%d)-(%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); + } + + /* TODO: For fbo targets, texture == drawable */ + if(This->Flags & flag) { + TRACE("Location already up to date\n"); + return WINED3D_OK; + } + + if(!(This->Flags & SFLAG_LOCATIONS)) { + ERR("Surface does not have any up to date location\n"); + This->Flags |= SFLAG_LOST; + return WINED3DERR_DEVICELOST; + } + + if(flag == SFLAG_INSYSMEM) { + /* Download the surface to system memory */ + if(This->Flags & SFLAG_INTEXTURE) { + /* Download texture to sysmem */ + } else { + /* Download drawable to sysmem */ + } + } else if(flag == SFLAG_INDRAWABLE) { + if(This->Flags & SFLAG_INTEXTURE) { + /* Blit texture to drawable */ + } else { + /* Load drawable from sysmem */ + } + } else /* if(flag == SFLAG_INTEXTURE) */ { + if(This->Flags & SFLAG_INDRAWABLE) { + /* glCopyTexImage the drawable into the texture */ + } else { + /* Load the texture from sysmem */ + } + } + + return WINED3D_OK; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -3601,5 +3646,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_GetData, IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, - IWineD3DSurfaceImpl_ModifyLocation + IWineD3DSurfaceImpl_ModifyLocation, + IWineD3DSurfaceImpl_LoadLocation }; diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 19c7ea3..263c603 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -796,6 +796,15 @@ static void WINAPI IWineGDISurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW } } +static HRESULT WINAPI IWineGDISurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect) { + if(flag != SFLAG_INSYSMEM) { + ERR("GDI Surface requested to be copied to gl %s\n", flag == SFLAG_INTEXTURE ? "texture" : "drawable"); + } else { + TRACE("Surface requested in surface memory\n"); + } + return WINED3D_OK; +} + /* FIXME: This vtable should not use any IWineD3DSurface* implementation functions, * only IWineD3DBaseSurface and IWineGDISurface ones. */ @@ -851,5 +860,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, - IWineGDISurfaceImpl_ModifyLocation + IWineGDISurfaceImpl_ModifyLocation, + IWineGDISurfaceImpl_LoadLocation }; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 9203200..d77a18f 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1142,6 +1142,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) STDMETHOD(SetFormat)(THIS_ WINED3DFORMAT format) PURE; STDMETHOD(PrivateSetup)(THIS) PURE; STDMETHOD_(void,ModifyLocation)(THIS_ DWORD flag, BOOL persistent); + STDMETHOD(LoadLocation)(THIS_ DWORD flag, const RECT *rect); }; #undef INTERFACE @@ -1198,6 +1199,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) #define IWineD3DSurface_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a) #define IWineD3DSurface_PrivateSetup(p) (p)->lpVtbl->PrivateSetup(p) #define IWineD3DSurface_ModifyLocation(p,a,b) (p)->lpVtbl->ModifyLocation(p,a,b) +#define IWineD3DSurface_LoadLocation(p,a,b) (p)->lpVtbl->LoadLocation(p,a,b) #endif /*****************************************************************************

1 0

Jeremy Newman : credui: Add a Wine-themed banner for the credentials dialog .
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 2da76a04a330cc612bd673790724520842ba82ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da76a04a330cc612bd673790… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 25 17:11:52 2007 +0100 credui: Add a Wine-themed banner for the credentials dialog. --- dlls/credui/banner.bmp | Bin 9718 -> 57654 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dlls/credui/banner.bmp b/dlls/credui/banner.bmp index ac1a4a8..3841bb2 100644 Binary files a/dlls/credui/banner.bmp and b/dlls/credui/banner.bmp differ

1 0

Detlef Riekenberg : comdlg32/tests: Initial tests for PrintDlgExW.
by Alexandre Julliard Oct. 26, 2007

Oct. 26, 2007

Module: wine Branch: master Commit: 23d78ff2b89ee8831a9edc2765138289aa581815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d78ff2b89ee8831a9edc276… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Oct 26 00:33:48 2007 +0200 comdlg32/tests: Initial tests for PrintDlgExW. --- dlls/comdlg32/tests/printdlg.c | 100 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index e458a2f..9842b17 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -33,12 +33,40 @@ #include "wine/test.h" -/* ######## */ +/* ########################### */ + +static HMODULE hcomdlg32; +static HRESULT (WINAPI * pPrintDlgExA)(LPPRINTDLGEXA); +static HRESULT (WINAPI * pPrintDlgExW)(LPPRINTDLGEXW); + +/* ########################### */ static const CHAR emptyA[] = ""; static const CHAR PrinterPortsA[] = "PrinterPorts"; -/* ######## */ +/* ########################### */ + +static LPCSTR load_functions(void) +{ + LPCSTR ptr; + + ptr = "comdlg32.dll"; + hcomdlg32 = LoadLibraryA(ptr); + if (!hcomdlg32) return ptr; + + ptr = "PrintDlgExA"; + pPrintDlgExA = (void *) GetProcAddress(hcomdlg32, ptr); + if (!pPrintDlgExA) return ptr; + + ptr = "PrintDlgExW"; + pPrintDlgExW = (void *) GetProcAddress(hcomdlg32, ptr); + if (!pPrintDlgExW) return ptr; + + return NULL; + +} + +/* ########################### */ static void test_PageSetupDlgA(void) { @@ -98,7 +126,7 @@ static void test_PageSetupDlgA(void) } -/* ##### */ +/* ########################### */ static void test_PrintDlgA(void) { @@ -210,10 +238,76 @@ static void test_PrintDlgA(void) } +/* ########################### */ + +static void test_PrintDlgExW(void) +{ + LPPRINTDLGEXW pDlg; + HRESULT res; + + /* Set CommDlgExtendedError != 0 */ + PrintDlg(NULL); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(NULL); + ok( (res == E_INVALIDARG), + "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", + res, GetLastError(), CommDlgExtendedError()); + + + pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGEXW)) + 8); + if (!pDlg) return; + + /* lStructSize must be exact */ + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW) - 1; + PrintDlg(NULL); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(pDlg); + ok( (res == E_INVALIDARG), + "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", + res, GetLastError(), CommDlgExtendedError()); + + + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW) + 1; + PrintDlg(NULL); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(pDlg); + ok( (res == E_INVALIDARG), + "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", + res, GetLastError(), CommDlgExtendedError()); + + + ZeroMemory(pDlg, sizeof(PRINTDLGEXW)); + pDlg->lStructSize = sizeof(PRINTDLGEXW); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(pDlg); + ok( (res == E_HANDLE), + "got 0x%x with %u and %u (expected 'E_HANDLE')\n", + res, GetLastError(), CommDlgExtendedError()); + + + HeapFree(GetProcessHeap(), 0, pDlg); + return; + +} + +/* ########################### */ START_TEST(printdlg) { + LPCSTR ptr; + + ptr = load_functions(); + test_PageSetupDlgA(); test_PrintDlgA(); + /* PrintDlgEx not present before w2k */ + if (ptr) { + skip("%s\n", ptr); + return; + } + + test_PrintDlgExW(); }

1 0