July 2006 - Wine-commits - list.winehq.org

Mike McCormack : winex11.drv: Avoid an uninitialized variable warning.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 6eb4bfe85f9e7970f3eee58c52cc3c5ecef3ce36 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6eb4bfe85f9e7970f3eee58… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 14:01:14 2006 +0900 winex11.drv: Avoid an uninitialized variable warning. --- dlls/winex11.drv/keyboard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index d9a1bf3..9c35aa2 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1446,7 +1446,7 @@ X11DRV_KEYBOARD_DetectLayout (void) Display *display = thread_display(); unsigned current, match, mismatch, seq, i, syms; int score, keyc, key, pkey, ok; - KeySym keysym; + KeySym keysym = 0; const char (*lkey)[MAIN_LEN][4]; unsigned max_seq = 0; int max_score = 0, ismatch = 0;

1 0

Mike McCormack : msi: Implement MsiGetFileHash.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: e8a7587bdb704b869f6366b4736423358f291522 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8a7587bdb704b869f6366b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 18:13:25 2006 +0900 msi: Implement MsiGetFileHash. --- dlls/msi/msi.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index baf27e1..f8bd963 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2102,14 +2102,66 @@ UINT WINAPI MsiReinstallFeatureA( LPCSTR return rc; } +typedef struct +{ + unsigned int i[2]; + unsigned int buf[4]; + unsigned char in[64]; + unsigned char digest[16]; +} MD5_CTX; + +extern VOID WINAPI MD5Init( MD5_CTX *); +extern VOID WINAPI MD5Update( MD5_CTX *, const unsigned char *, unsigned int ); +extern VOID WINAPI MD5Final( MD5_CTX *); + /*********************************************************************** * MsiGetFileHashW [MSI.@] */ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, PMSIFILEHASHINFO pHash ) { - FIXME("%s %08lx %p\n", debugstr_w(szFilePath), dwOptions, pHash ); - return ERROR_CALL_NOT_IMPLEMENTED; + HANDLE handle, mapping; + void *p; + DWORD length; + UINT r = ERROR_FUNCTION_FAILED; + + TRACE("%s %08lx %p\n", debugstr_w(szFilePath), dwOptions, pHash ); + + if (dwOptions) + return ERROR_INVALID_PARAMETER; + if (!pHash) + return ERROR_INVALID_PARAMETER; + if (pHash->dwFileHashInfoSize < sizeof *pHash) + return ERROR_INVALID_PARAMETER; + + handle = CreateFileW( szFilePath, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, NULL ); + if (handle == INVALID_HANDLE_VALUE) + return ERROR_FILE_NOT_FOUND; + + length = GetFileSize( handle, NULL ); + + mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL ); + if (mapping) + { + p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ); + if (p) + { + MD5_CTX ctx; + + MD5Init( &ctx ); + MD5Update( &ctx, p, length ); + MD5Final( &ctx ); + UnmapViewOfFile( p ); + + memcpy( pHash->dwData, &ctx.digest, sizeof pHash->dwData ); + r = ERROR_SUCCESS; + } + CloseHandle( mapping ); + } + CloseHandle( handle ); + + return r; } /*********************************************************************** @@ -2118,8 +2170,18 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szF UINT WINAPI MsiGetFileHashA( LPCSTR szFilePath, DWORD dwOptions, PMSIFILEHASHINFO pHash ) { - FIXME("%s %08lx %p\n", debugstr_a(szFilePath), dwOptions, pHash ); - return ERROR_CALL_NOT_IMPLEMENTED; + LPWSTR file; + UINT r; + + TRACE("%s %08lx %p\n", debugstr_a(szFilePath), dwOptions, pHash ); + + file = strdupAtoW( szFilePath ); + if (szFilePath && !file) + return ERROR_OUTOFMEMORY; + + r = MsiGetFileHashW( file, dwOptions, pHash ); + msi_free( file ); + return r; } /***********************************************************************

1 0

Alexandre Julliard : winevdm: Load sound.drv too.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 0b79d9245dfa67cfa9ec87d9086f5dc66a5f0bf8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0b79d9245dfa67cfa9ec87d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 24 12:57:12 2006 +0200 winevdm: Load sound.drv too. --- programs/winevdm/winevdm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 747ac6d..140efab 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -442,6 +442,7 @@ int main( int argc, char *argv[] ) LoadLibrary16( "display.drv" ); LoadLibrary16( "keyboard.drv" ); LoadLibrary16( "mouse.drv" ); + LoadLibrary16( "sound.drv" ); if ((instance = LoadModule16( appname, &params )) < 32) {

1 0

Stefan Dösinger : wined3d: Draw the cursor.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: a98ccb543d25cfe7047fe65d91609080ca2ede8b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a98ccb543d25cfe7047fe65… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jul 23 00:03:33 2006 +0200 wined3d: Draw the cursor. --- dlls/wined3d/device.c | 33 ++++++++++++++++++++++++--------- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/swapchain.c | 14 ++++++++++++++ dlls/wined3d/wined3d_private.h | 37 ++++++++++++++++++++----------------- 4 files changed, 60 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b274393..5928561 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7435,24 +7435,39 @@ static HRESULT WINAPI IWineD3DDeviceIm UINT YHotSpot, IWineD3DSurface *pCursorBitmap) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; /* TODO: the use of Impl is deprecated. */ - /* some basic validation checks */ IWineD3DSurfaceImpl * pSur = (IWineD3DSurfaceImpl *) pCursorBitmap; TRACE("(%p) : Spot Pos(%u,%u)\n", This, XHotSpot, YHotSpot); - if (WINED3DFMT_A8R8G8B8 != pSur->resource.format) { - ERR("(%p) : surface(%p) has an invalid format\n", This, pCursorBitmap); - return WINED3DERR_INVALIDCALL; - } - if (32 != pSur->currentDesc.Height || 32 != pSur->currentDesc.Width) { - ERR("(%p) : surface(%p) has an invalid size\n", This, pCursorBitmap); - return WINED3DERR_INVALIDCALL; + /* some basic validation checks */ + if(pCursorBitmap) { + /* MSDN: Cursor must be A8R8G8B8 */ + if (WINED3DFMT_A8R8G8B8 != pSur->resource.format) { + ERR("(%p) : surface(%p) has an invalid format\n", This, pCursorBitmap); + return WINED3DERR_INVALIDCALL; + } + + /* MSDN: Cursor must be smaller than the display mode */ + if(pSur->currentDesc.Width > This->ddraw_width || + pSur->currentDesc.Height > This->ddraw_height) { + ERR("(%p) : Surface(%p) is %dx%d pixels, but screen res is %ldx%ld\n", This, pSur, pSur->currentDesc.Width, pSur->currentDesc.Height, This->ddraw_width, This->ddraw_height); + return WINED3DERR_INVALIDCALL; + } + + /* TODO: MSDN: Cursor sizes must be a power of 2 */ + if(This->mouseCursor) { + ((IWineD3DSurfaceImpl *) This->mouseCursor)->Flags &= ~SFLAG_FORCELOAD; + } + /* This is to tell our texture code to load a SCRATCH surface. This allows us to use out + * Texture and Blitting code to draw the cursor + */ + pSur->Flags |= SFLAG_FORCELOAD; } - /* TODO: make the cursor 'real' */ This->xHotSpot = XHotSpot; This->yHotSpot = YHotSpot; + This->mouseCursor = pCursorBitmap; return WINED3D_OK; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0e90f13..9c2ed60 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1638,7 +1638,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp * these resources cannot be accessed by the Direct3D device nor set as textures or render targets. * However, these resources can always be created, locked, and copied. */ - if (This->resource.pool == WINED3DPOOL_SCRATCH) + if (This->resource.pool == WINED3DPOOL_SCRATCH && !(This->Flags & SFLAG_FORCELOAD) ) { FIXME("(%p) Operation not supported for scratch textures\n",This); return WINED3DERR_INVALIDCALL; @@ -2034,7 +2034,7 @@ extern HRESULT WINAPI IWineD3DSurfaceImp This->dirtyRect.right = This->currentDesc.Width; This->dirtyRect.bottom = This->currentDesc.Height; } - TRACE("(%p) : Dirty?%d, Rect:(%ld,%ld,%ld,%ld)\n", This, This->Flags & SFLAG_DIRTY, This->dirtyRect.left, + TRACE("(%p) : Dirty?%ld, Rect:(%ld,%ld,%ld,%ld)\n", This, This->Flags & SFLAG_DIRTY, This->dirtyRect.left, This->dirtyRect.top, This->dirtyRect.right, This->dirtyRect.bottom); /* if the container is a basetexture then mark it dirty. */ if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e4b385d..9dde987 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -141,6 +141,20 @@ static HRESULT WINAPI IWineD3DSwapChainI ENTER_GL(); + /* Render the cursor onto the back buffer, using our nifty directdraw blitting code :-) */ + if(This->wineD3DDevice->bCursorVisible && This->wineD3DDevice->mouseCursor) { + IWineD3DSurfaceImpl *cursor = (IWineD3DSurfaceImpl *) This->wineD3DDevice->mouseCursor; + RECT destRect = {This->wineD3DDevice->xScreenSpace - This->wineD3DDevice->xHotSpot, + This->wineD3DDevice->yScreenSpace - This->wineD3DDevice->yHotSpot, + This->wineD3DDevice->xScreenSpace + cursor->currentDesc.Width - This->wineD3DDevice->xHotSpot, + This->wineD3DDevice->yScreenSpace + cursor->currentDesc.Height - This->wineD3DDevice->yHotSpot}; + TRACE("Rendering the cursor\n"); + /* DDBLT_KEYSRC will cause BltOverride to enable the alpha test with GL_NOTEQUAL, 0.0, + * which is exactly what we want :-) + */ + IWineD3DSurface_Blt(This->backBuffer[0], &destRect, This->wineD3DDevice->mouseCursor, NULL, DDBLT_KEYSRC, NULL); + } + if (pSourceRect || pDestRect) FIXME("Unhandled present options %p/%p\n", pSourceRect, pDestRect); /* TODO: If only source rect or dest rect are supplied then clip the window to match */ TRACE("preseting display %p, drawable %ld\n", This->display, This->drawable); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d542086..c910c67 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -540,6 +540,7 @@ #define NEEDS_DI UINT yHotSpot; UINT xScreenSpace; UINT yScreenSpace; + IWineD3DSurface *mouseCursor; /* Textures for when no other textures are mapped */ UINT dummyTextureName[MAX_TEXTURES]; @@ -853,7 +854,7 @@ struct IWineD3DSurfaceImpl UINT bytesPerPixel; /* TODO: move this off into a management class(maybe!) */ - WORD Flags; + DWORD Flags; UINT pow2Width; UINT pow2Height; @@ -930,22 +931,24 @@ DWORD WINAPI IWineD3DSurfaceImpl_GetPitc HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface); /* Surface flags: */ -#define SFLAG_OVERSIZE 0x0001 /* Surface is bigger than gl size, blts only */ -#define SFLAG_CONVERTED 0x0002 /* Converted for color keying or Palettized */ -#define SFLAG_DIBSECTION 0x0004 /* Has a DIB section attached for getdc */ -#define SFLAG_DIRTY 0x0008 /* Surface was locked by the app */ -#define SFLAG_LOCKABLE 0x0010 /* Surface can be locked */ -#define SFLAG_DISCARD 0x0020 /* ??? */ -#define SFLAG_LOCKED 0x0040 /* Surface is locked atm */ -#define SFLAG_ACTIVELOCK 0x0080 /* Not locked, but surface memory is needed */ -#define SFLAG_INTEXTURE 0x0100 /* ??? */ -#define SFLAG_INPBUFFER 0x0200 /* ??? */ -#define SFLAG_NONPOW2 0x0400 /* Surface sizes are not a power of 2 */ -#define SFLAG_DYNLOCK 0x0800 /* Surface is often locked by the app */ -#define SFLAG_DYNCHANGE 0x1800 /* Surface contents are changed very often, implies DYNLOCK */ -#define SFLAG_DCINUSE 0x2000 /* Set between GetDC and ReleaseDC calls */ -#define SFLAG_GLDIRTY 0x4000 /* The opengl texture is more up to date than the surface mem */ -#define SFLAG_LOST 0x8000 /* Surface lost flag for DDraw */ +#define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ +#define SFLAG_CONVERTED 0x00000002 /* Converted for color keying or Palettized */ +#define SFLAG_DIBSECTION 0x00000004 /* Has a DIB section attached for getdc */ +#define SFLAG_DIRTY 0x00000008 /* Surface was locked by the app */ +#define SFLAG_LOCKABLE 0x00000010 /* Surface can be locked */ +#define SFLAG_DISCARD 0x00000020 /* ??? */ +#define SFLAG_LOCKED 0x00000040 /* Surface is locked atm */ +#define SFLAG_ACTIVELOCK 0x00000080 /* Not locked, but surface memory is needed */ +#define SFLAG_INTEXTURE 0x00000100 /* ??? */ +#define SFLAG_INPBUFFER 0x00000200 /* ??? */ +#define SFLAG_NONPOW2 0x00000400 /* Surface sizes are not a power of 2 */ +#define SFLAG_DYNLOCK 0x00000800 /* Surface is often locked by the app */ +#define SFLAG_DYNCHANGE 0x00001800 /* Surface contents are changed very often, implies DYNLOCK */ +#define SFLAG_DCINUSE 0x00002000 /* Set between GetDC and ReleaseDC calls */ +#define SFLAG_GLDIRTY 0x00004000 /* The opengl texture is more up to date than the surface mem */ +#define SFLAG_LOST 0x00008000 /* Surface lost flag for DDraw */ +#define SFLAG_FORCELOAD 0x00010000 /* To force PreLoading of a scratch cursor */ + /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL

1 0

Dan Hipschman : widl: Allow write_type to output full pointer types.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 82c11ce0025e386308623671f126646d0724051a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=82c11ce0025e38630862367… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Fri Jul 21 12:10:21 2006 -0700 widl: Allow write_type to output full pointer types. --- tools/widl/header.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index d6b42ef..2de2ca7 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -297,6 +297,10 @@ void write_type(FILE *h, type_t *t, cons } else fprintf(h, "union %s", t->name); break; + case RPC_FC_FP: + if (t->ref) write_type(h, t->ref, NULL, t->name); + fprintf(h, "*"); + break; default: fprintf(h, "(unknown-type:%d)", t->type); }

1 0

Stefan Dösinger : wined3d: Use the ddraw blitting code for IWineD3DDevice::ColorFill.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 14c2aa0ed654cc0a29071280c3c163eb43ae4b86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=14c2aa0ed654cc0a2907128… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jul 22 17:37:51 2006 +0200 wined3d: Use the ddraw blitting code for IWineD3DDevice::ColorFill. --- dlls/wined3d/device.c | 105 ++++--------------------------------------------- 1 files changed, 8 insertions(+), 97 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6a86132..b274393 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6820,17 +6820,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl } static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurface *pSurface, CONST D3DRECT* pRect, D3DCOLOR color) { - /* I couldn't find a 'really' quick way of doing this in openGl so here goes - fill a surface with a block of color! */ - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - /* TODO: get rid of the use of IWineD3DSurfaceImpl, move code into surface.c */ - IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *)pSurface; - IWineD3DSwapChainImpl *container = NULL; - BOOL isRenderTarget = FALSE; - unsigned int width, height; - unsigned int top, left; - unsigned int u, v; - DWORD *data; + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + IWineD3DSurfaceImpl *surface = (IWineD3DSurfaceImpl *) pSurface; + DDBLTFX BltFx; TRACE("(%p) Colour fill Surface: %p rect: %p color: %ld\n", This, pSurface, pRect, color); if (surface->resource.pool != WINED3DPOOL_DEFAULT && surface->resource.pool != WINED3DPOOL_SYSTEMMEM) { @@ -6838,92 +6830,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl return WINED3DERR_INVALIDCALL; } - /* TODO: get rid of IWineD3DSwapChainImpl reference, a 'context' manager may help with this */ - if (WINED3D_OK == IWineD3DSurface_GetContainer(pSurface, &IID_IWineD3DSwapChain, (void **)&container) || pSurface == This->renderTarget) { - if (WINED3DUSAGE_RENDERTARGET & surface->resource.usage) { - /* TODO: make sure we set everything back to the way it was, and context management! - glGetIntegerv(GL_READ_BUFFER, &prev_read); - vcheckGLcall("glIntegerv"); - glGetIntegerv(GL_PACK_SWAP_BYTES, &prev_store); - vcheckGLcall("glIntegerv"); - */ - TRACE("Color fill to render targets may cause some graphics issues\n"); - if (pSurface == container->frontBuffer) { - glDrawBuffer(GL_FRONT); - } else { - glDrawBuffer(GL_BACK); - } - } else { - if (WINED3DUSAGE_DEPTHSTENCIL & surface->resource.usage) { - FIXME("colouring of depth_stencil? %p buffers is not yet supported? %ld\n", surface, surface->resource.usage); - } else { - FIXME("(%p) : Regression %ld %p %p\n", This, surface->resource.usage, pSurface, This->renderTarget); - } - if (container != NULL) { - IWineD3DSwapChain_Release((IWineD3DSwapChain *)container); - } - /* we can use GL_STENCIL_INDEX etc...*/ - return WINED3D_OK; - } - if (container != NULL) { - IWineD3DSwapChain_Release((IWineD3DSwapChain *)container); - } - isRenderTarget = TRUE; - } - /* TODO: drawing to GL_FRONT and GL_BACK */ - /* TODO: see if things can be speeded up by using the correct - * colour model of the target texture from the start (16 bit graphics on 32 X are slow anyway!) */ - if (pRect == NULL) { - top = 0; - left = 0; - width = surface->currentDesc.Width; - height = surface->currentDesc.Height; - } else { - left = pRect->x1; - top = pRect->y1; - width = pRect->x2 - left; - height = pRect->y2 - top; - } - - data = HeapAlloc(GetProcessHeap(), 0, 4 * width); - /* Create a 'line' of color color, in the correct format for the surface */ - for (u = 0 ; u < width ; u ++) { - data[u] = color; - } - - ENTER_GL(); - if (isRenderTarget == FALSE) { - glDescriptor *glDesc; - IWineD3DSurface_PreLoad(pSurface); - - /* draw a block of the coloured line on the sufrace */ - IWineD3DSurface_GetGlDesc(pSurface, &glDesc); - for (v = 0 ; v< height;v++) { - glTexSubImage2D(glDesc->target - ,glDesc->level /* level */ - ,left - ,top + v - ,width - ,1 /* height */ - ,GL_RGBA - ,GL_UNSIGNED_BYTE - ,data - ); - } - checkGLcall("glTexSubImage2D"); - /* clean up */ - glDisable(glDesc->target); - } else { - /** FIXME: Using GLClear may be faster **/ - glRasterPos2i(left, top); - glPixelZoom((float)width ,(float)height); - glDrawPixels(1, 1, GL_RGBA, GL_UNSIGNED_BYTE, data); - checkGLcall("glDrawPixels"); - } - HeapFree(GetProcessHeap(), 0, data); - LEAVE_GL(); - return WINED3D_OK; - + /* Just forward this to the DirectDraw blitting engine */ + memset(&BltFx, 0, sizeof(BltFx)); + BltFx.dwSize = sizeof(BltFx); + BltFx.u5.dwFillColor = color; + return IWineD3DSurface_Blt(pSurface, (RECT *) pRect, NULL, NULL, DDBLT_COLORFILL, &BltFx); } /* rendertarget and deptth stencil functions */

1 0

Mike McCormack : msi: Reimplement MsiGetUserInfo using awstrings.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: bb141641d3218f933ff9aed81a6a485ace00bc8c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bb141641d3218f933ff9aed… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jul 24 15:25:29 2006 +0900 msi: Reimplement MsiGetUserInfo using awstrings. --- dlls/msi/msi.c | 144 +++++++++++++++++++++++++++++++------------------------- 1 files changed, 79 insertions(+), 65 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 1b12cdf..baf27e1 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1672,90 +1672,104 @@ UINT WINAPI MsiProvideQualifiedComponent dwInstallMode, NULL, 0, 0, lpPathBuf, pcchPathBuf); } -USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR szProduct, LPWSTR lpUserNameBuf, - DWORD* pcchUserNameBuf, LPWSTR lpOrgNameBuf, - DWORD* pcchOrgNameBuf, LPWSTR lpSerialBuf, DWORD* pcchSerialBuf) +/*********************************************************************** + * MSI_GetUserInfo [internal] + */ +USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct, + awstring *lpUserNameBuf, DWORD* pcchUserNameBuf, + awstring *lpOrgNameBuf, DWORD* pcchOrgNameBuf, + awstring *lpSerialBuf, DWORD* pcchSerialBuf) { HKEY hkey; - DWORD sz; - UINT rc = ERROR_SUCCESS,rc2 = ERROR_SUCCESS; + LPWSTR user, org, serial; + UINT r; + USERINFOSTATE state; TRACE("%s %p %p %p %p %p %p\n",debugstr_w(szProduct), lpUserNameBuf, pcchUserNameBuf, lpOrgNameBuf, pcchOrgNameBuf, lpSerialBuf, pcchSerialBuf); - rc = MSIREG_OpenUninstallKey(szProduct, &hkey, FALSE); - if (rc != ERROR_SUCCESS) + if (!szProduct) + return USERINFOSTATE_INVALIDARG; + + r = MSIREG_OpenUninstallKey(szProduct, &hkey, FALSE); + if (r != ERROR_SUCCESS) return USERINFOSTATE_UNKNOWN; - if (lpUserNameBuf) - { - sz = *lpUserNameBuf * sizeof(WCHAR); - rc = RegQueryValueExW( hkey, INSTALLPROPERTY_REGOWNERW, NULL, - NULL, (LPBYTE)lpUserNameBuf, - &sz); - } - if (!lpUserNameBuf && pcchUserNameBuf) - { - sz = 0; - rc = RegQueryValueExW( hkey, INSTALLPROPERTY_REGOWNERW, NULL, - NULL, NULL, &sz); - } + user = msi_reg_get_val_str( hkey, INSTALLPROPERTY_REGOWNERW ); + org = msi_reg_get_val_str( hkey, INSTALLPROPERTY_REGCOMPANYW ); + serial = msi_reg_get_val_str( hkey, INSTALLPROPERTY_PRODUCTIDW ); - if (pcchUserNameBuf) - *pcchUserNameBuf = sz / sizeof(WCHAR); + RegCloseKey(hkey); - if (lpOrgNameBuf) - { - sz = *pcchOrgNameBuf * sizeof(WCHAR); - rc2 = RegQueryValueExW( hkey, INSTALLPROPERTY_REGCOMPANYW, NULL, - NULL, (LPBYTE)lpOrgNameBuf, &sz); - } - if (!lpOrgNameBuf && pcchOrgNameBuf) - { - sz = 0; - rc2 = RegQueryValueExW( hkey, INSTALLPROPERTY_REGCOMPANYW, NULL, - NULL, NULL, &sz); - } + state = USERINFOSTATE_PRESENT; - if (pcchOrgNameBuf) - *pcchOrgNameBuf = sz / sizeof(WCHAR); + r = msi_strcpy_to_awstring( user, lpUserNameBuf, pcchUserNameBuf ); + if (r == ERROR_MORE_DATA) + state = USERINFOSTATE_MOREDATA; + r = msi_strcpy_to_awstring( org, lpOrgNameBuf, pcchOrgNameBuf ); + if (r == ERROR_MORE_DATA) + state = USERINFOSTATE_MOREDATA; + r = msi_strcpy_to_awstring( serial, lpSerialBuf, pcchSerialBuf ); + if (r == ERROR_MORE_DATA) + state = USERINFOSTATE_MOREDATA; - if (rc != ERROR_SUCCESS && rc != ERROR_MORE_DATA && - rc2 != ERROR_SUCCESS && rc2 != ERROR_MORE_DATA) - { - RegCloseKey(hkey); - return USERINFOSTATE_ABSENT; - } + msi_free( user ); + msi_free( org ); + msi_free( serial ); - if (lpSerialBuf) - { - sz = *pcchSerialBuf * sizeof(WCHAR); - RegQueryValueExW( hkey, INSTALLPROPERTY_PRODUCTIDW, NULL, NULL, - (LPBYTE)lpSerialBuf, &sz); - } - if (!lpSerialBuf && pcchSerialBuf) - { - sz = 0; - rc = RegQueryValueExW( hkey, INSTALLPROPERTY_PRODUCTIDW, NULL, - NULL, NULL, &sz); - } - if (pcchSerialBuf) - *pcchSerialBuf = sz / sizeof(WCHAR); + return state; +} - RegCloseKey(hkey); - return USERINFOSTATE_PRESENT; +/*********************************************************************** + * MsiGetUserInfoW [MSI.@] + */ +USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR szProduct, + LPWSTR lpUserNameBuf, DWORD* pcchUserNameBuf, + LPWSTR lpOrgNameBuf, DWORD* pcchOrgNameBuf, + LPWSTR lpSerialBuf, DWORD* pcchSerialBuf) +{ + awstring user, org, serial; + + user.unicode = TRUE; + user.str.w = lpUserNameBuf; + org.unicode = TRUE; + org.str.w = lpOrgNameBuf; + serial.unicode = TRUE; + serial.str.w = lpSerialBuf; + + return MSI_GetUserInfo( szProduct, &user, pcchUserNameBuf, + &org, pcchOrgNameBuf, + &serial, pcchSerialBuf ); } -USERINFOSTATE WINAPI MsiGetUserInfoA(LPCSTR szProduct, LPSTR lpUserNameBuf, - DWORD* pcchUserNameBuf, LPSTR lpOrgNameBuf, - DWORD* pcchOrgNameBuf, LPSTR lpSerialBuf, DWORD* pcchSerialBuf) +USERINFOSTATE WINAPI MsiGetUserInfoA(LPCSTR szProduct, + LPSTR lpUserNameBuf, DWORD* pcchUserNameBuf, + LPSTR lpOrgNameBuf, DWORD* pcchOrgNameBuf, + LPSTR lpSerialBuf, DWORD* pcchSerialBuf) { - FIXME("%s %p %p %p %p %p %p\n",debugstr_a(szProduct), lpUserNameBuf, - pcchUserNameBuf, lpOrgNameBuf, pcchOrgNameBuf, lpSerialBuf, - pcchSerialBuf); + awstring user, org, serial; + LPWSTR prod; + UINT r; + + prod = strdupAtoW( szProduct ); + if (szProduct && !prod) + return ERROR_OUTOFMEMORY; - return USERINFOSTATE_UNKNOWN; + user.unicode = FALSE; + user.str.a = lpUserNameBuf; + org.unicode = FALSE; + org.str.a = lpOrgNameBuf; + serial.unicode = FALSE; + serial.str.a = lpSerialBuf; + + r = MSI_GetUserInfo( prod, &user, pcchUserNameBuf, + &org, pcchOrgNameBuf, + &serial, pcchSerialBuf ); + + msi_free( prod ); + + return r; } UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct)

1 0

Jason Green : wined3d: Replace memset/memcpy routines on stateblock ( fixes dynamic shader constants regression).
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 75950b5bf83313ef33ba86acd400613b22e57beb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75950b5bf83313ef33ba86a… Author: Jason Green <jave27(a)gmail.com> Date: Sun Jul 23 15:08:27 2006 -0400 wined3d: Replace memset/memcpy routines on stateblock (fixes dynamic shader constants regression). --- dlls/wined3d/device.c | 16 ++--- dlls/wined3d/directx.c | 50 +++++++++++---- dlls/wined3d/stateblock.c | 136 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 14 ++++ 4 files changed, 196 insertions(+), 20 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=75950b5bf83313ef33b…

1 0

Dan Kegel : winedos: Limit reported disk space to 1GB.
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 91f9746d2f8f564a508351490205b7c7a64b718e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=91f9746d2f8f564a5083514… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jul 23 17:29:31 2006 -0700 winedos: Limit reported disk space to 1GB. --- dlls/winedos/int21.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index a1b4767..b7aa3b4 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -3475,16 +3475,65 @@ static int INT21_GetFreeDiskSpace( CONTE { DWORD cluster_sectors, sector_bytes, free_clusters, total_clusters; WCHAR root[] = {'A',':','\\',0}; + const DWORD max_clusters = 0x3d83; + const DWORD max_sectors_per_cluster = 0x7f; + const DWORD max_bytes_per_sector = 0x200; root[0] += INT21_MapDrive(DL_reg(context)); if (!GetDiskFreeSpaceW( root, &cluster_sectors, &sector_bytes, &free_clusters, &total_clusters )) return 0; - /* make sure that the number of clusters fits in a 16 bits value */ - while( total_clusters & 0xffff0000) { + + /* Some old win31 apps (Lotus SmartSuite 5.1) crap out if there's too + * much disk space, so Windows XP seems to apply the following limits: + * cluster_sectors <= 0x7f + * sector size <= 0x200 + * clusters <= 0x3D83 + * This means total reported space is limited to about 1GB. + */ + + /* Make sure bytes-per-sector is in [, max] */ + while (sector_bytes > max_bytes_per_sector) { + sector_bytes >>= 1; + free_clusters <<= 1; + total_clusters <<= 1; + } + /* Then make sure sectors-per-cluster is in [max/2, max]. */ + while (cluster_sectors <= max_sectors_per_cluster/2) { cluster_sectors <<= 1; free_clusters >>= 1; total_clusters >>= 1; } + while (cluster_sectors > max_sectors_per_cluster) { + cluster_sectors >>= 1; + free_clusters <<= 1; + total_clusters <<= 1; + } + + /* scale up sectors_per_cluster to exactly max_sectors_per_cluster. + * We could skip this, but that would impose an artificially low + * limit on reported disk space. + * To avoid overflow, first apply a preliminary cap on sector count; + * this will not affect the correctness of the final result, + * because if the preliminary cap hits, the final one will, too. + */ + if (total_clusters > 4 * max_clusters) + total_clusters = 4 * max_clusters; + if (free_clusters > 4 * max_clusters) + free_clusters = 4 * max_clusters; + if (cluster_sectors < max_sectors_per_cluster) { + free_clusters *= cluster_sectors; + free_clusters /= max_sectors_per_cluster; + total_clusters *= cluster_sectors; + total_clusters /= max_sectors_per_cluster; + cluster_sectors = max_sectors_per_cluster; + } + + /* Finally, apply real cluster count cap. */ + if (total_clusters > max_clusters) + total_clusters = max_clusters; + if (free_clusters > max_clusters) + free_clusters = max_clusters; + SET_AX( context, cluster_sectors ); SET_BX( context, free_clusters ); SET_CX( context, sector_bytes ); @@ -4625,7 +4674,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT8 break; case 0x36: /* GET FREE DISK SPACE */ - TRACE("GET FREE DISK SPACE FOR DRIVE %s\n", + TRACE("GET FREE DISK SPACE FOR DRIVE %s (limited to about 1GB)\n", INT21_DriveName( DL_reg(context) )); if (!INT21_GetFreeDiskSpace(context)) SET_AX( context, 0xffff ); break;

1 0

Detlef Riekenberg : comdlg32/tests: PrintDlg with PD_RETURNDEFAULT can fail .
by Alexandre Julliard 24 Jul '06

24 Jul '06

Module: wine Branch: refs/heads/master Commit: 75dce501ef2752adedf7d27c6b514f4a6768aca0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75dce501ef2752adedf7d27… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Jul 23 20:39:18 2006 +0200 comdlg32/tests: PrintDlg with PD_RETURNDEFAULT can fail. --- dlls/comdlg32/tests/printdlg.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 934391a..ce78415 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -70,7 +70,9 @@ #endif pDlg->Flags = PD_RETURNDEFAULT; SetLastError(0xdeadbeef); res = PrintDlgA(pDlg); - ok(res, "returned %ld with 0x%lx and 0x%lx (expected '!= 0')\n", res, GetLastError(), CommDlgExtendedError()); + ok( res || (CommDlgExtendedError() == PDERR_NODEFAULTPRN), + "returned %ld with 0x%lx and 0x%lx (expected '!= 0' or '0' and " \ + "PDERR_NODEFAULTPRN)\n", res, GetLastError(), CommDlgExtendedError()); HeapFree(GetProcessHeap(), 0, pDlg);

1 0