March 2010 - Wine-commits - list.winehq.org

Alexandre Julliard : wineboot: Use rundll32 to apply wine. inf instead of calling setupapi directly.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 2d08d3e08479c8f8d6d04ad42e78f5ed10c48b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d08d3e08479c8f8d6d04ad42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 16:38:58 2010 +0200 wineboot: Use rundll32 to apply wine.inf instead of calling setupapi directly. --- programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 57 +++++++++++++++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 0b8ec86..0b91263 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole IMPORTS = uuid advapi32 kernel32 ntdll -DELAYIMPORTS = setupapi shell32 shlwapi version user32 +DELAYIMPORTS = shell32 shlwapi version user32 C_SRCS = \ shutdown.c \ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 15dfe14..0277206 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -81,7 +81,6 @@ #include <shobjidl.h> #include <shlwapi.h> #include <shellapi.h> -#include <setupapi.h> WINE_DEFAULT_DEBUG_CHANNEL(wineboot); @@ -860,12 +859,49 @@ static BOOL start_services_process(void) return TRUE; } +static HANDLE start_rundll32( const char *inf_path ) +{ + static const WCHAR rundll[] = {'\\','r','u','n','d','l','l','3','2','.','e','x','e',0}; + static const WCHAR setupapi[] = {' ','s','e','t','u','p','a','p','i',',', + 'I','n','s','t','a','l','l','H','i','n','f','S','e','c','t','i','o','n',0}; + static const WCHAR definstall[] = {' ','D','e','f','a','u','l','t','I','n','s','t','a','l','l',0}; + static const WCHAR inf[] = {' ','1','2','8',' ','\\','\\','?','\\','u','n','i','x',0 }; + + WCHAR app[MAX_PATH + sizeof(rundll)/sizeof(WCHAR)]; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR *buffer; + DWORD inf_len, cmd_len; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + + GetSystemDirectoryW( app, MAX_PATH ); + strcatW( app, rundll ); + + cmd_len = strlenW(app) * sizeof(WCHAR) + sizeof(setupapi) + sizeof(definstall) + sizeof(inf); + inf_len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 ); + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, cmd_len + inf_len * sizeof(WCHAR) ))) return 0; + + strcpyW( buffer, app ); + strcatW( buffer, setupapi ); + strcatW( buffer, definstall ); + strcatW( buffer, inf ); + MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, buffer + strlenW(buffer), inf_len ); + + if (CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + CloseHandle( pi.hThread ); + else + pi.hProcess = 0; + + HeapFree( GetProcessHeap(), 0, buffer ); + return pi.hProcess; +} + /* execute rundll32 on the wine.inf file if necessary */ static void update_wineprefix( int force ) { - static const WCHAR cmdlineW[] = {'D','e','f','a','u','l','t','I','n','s','t','a','l','l',' ', - '1','2','8',' ','\\','\\','?','\\','u','n','i','x' }; - const char *config_dir = wine_get_config_dir(); char *inf_path = get_wine_inf_path(); int fd; @@ -887,14 +923,13 @@ static void update_wineprefix( int force ) if (update_timestamp( config_dir, st.st_mtime ) || force) { - WCHAR *buffer; - DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 ); - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(cmdlineW) + len*sizeof(WCHAR) ))) goto done; - memcpy( buffer, cmdlineW, sizeof(cmdlineW) ); - MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, buffer + sizeof(cmdlineW)/sizeof(WCHAR), len ); - - InstallHinfSectionW( 0, 0, buffer, 0 ); - HeapFree( GetProcessHeap(), 0, buffer ); + HANDLE process; + + if ((process = start_rundll32( inf_path ))) + { + WaitForSingleObject( process, INFINITE ); + CloseHandle( process ); + } WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", config_dir ); }

1 0

Alexandre Julliard : wineboot: Start an additional 32-bit instance of rundll32 on 64-bit platforms to do the Wow64-specific setup .
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 39e5f448836a4585d0e47a7329801c442bfff56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e5f448836a4585d0e47a732… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 16:43:52 2010 +0200 wineboot: Start an additional 32-bit instance of rundll32 on 64-bit platforms to do the Wow64-specific setup. --- programs/wineboot/wineboot.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0277206..ac403b9 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -859,12 +859,13 @@ static BOOL start_services_process(void) return TRUE; } -static HANDLE start_rundll32( const char *inf_path ) +static HANDLE start_rundll32( const char *inf_path, BOOL wow64 ) { static const WCHAR rundll[] = {'\\','r','u','n','d','l','l','3','2','.','e','x','e',0}; static const WCHAR setupapi[] = {' ','s','e','t','u','p','a','p','i',',', 'I','n','s','t','a','l','l','H','i','n','f','S','e','c','t','i','o','n',0}; static const WCHAR definstall[] = {' ','D','e','f','a','u','l','t','I','n','s','t','a','l','l',0}; + static const WCHAR wowinstall[] = {' ','W','o','w','6','4','I','n','s','t','a','l','l',0}; static const WCHAR inf[] = {' ','1','2','8',' ','\\','\\','?','\\','u','n','i','x',0 }; WCHAR app[MAX_PATH + sizeof(rundll)/sizeof(WCHAR)]; @@ -876,7 +877,12 @@ static HANDLE start_rundll32( const char *inf_path ) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetSystemDirectoryW( app, MAX_PATH ); + if (wow64) + { + if (!GetSystemWow64DirectoryW( app, MAX_PATH )) return 0; /* not on 64-bit */ + } + else GetSystemDirectoryW( app, MAX_PATH ); + strcatW( app, rundll ); cmd_len = strlenW(app) * sizeof(WCHAR) + sizeof(setupapi) + sizeof(definstall) + sizeof(inf); @@ -886,7 +892,7 @@ static HANDLE start_rundll32( const char *inf_path ) strcpyW( buffer, app ); strcatW( buffer, setupapi ); - strcatW( buffer, definstall ); + strcatW( buffer, wow64 ? wowinstall : definstall ); strcatW( buffer, inf ); MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, buffer + strlenW(buffer), inf_len ); @@ -925,7 +931,12 @@ static void update_wineprefix( int force ) { HANDLE process; - if ((process = start_rundll32( inf_path ))) + if ((process = start_rundll32( inf_path, FALSE ))) + { + WaitForSingleObject( process, INFINITE ); + CloseHandle( process ); + } + if ((process = start_rundll32( inf_path, TRUE ))) { WaitForSingleObject( process, INFINITE ); CloseHandle( process );

1 0

Henri Verbeet : wined3d: Add more general support for partial updates of compressed surfaces to IWineD3DDeviceImpl_UpdateSurface ().
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: bb94bc382329f4c9950aad1aa6f32fe0514f1dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb94bc382329f4c9950aad1aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 30 11:24:46 2010 +0200 wined3d: Add more general support for partial updates of compressed surfaces to IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 48 ++++++++++++++++++------------------------------ 1 files changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index caa9568..09946c6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5159,13 +5159,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DSurfaceImpl *pSrcSurface = (IWineD3DSurfaceImpl *)pSourceSurface; IWineD3DSurfaceImpl *dst_impl = (IWineD3DSurfaceImpl *)pDestinationSurface; int srcWidth, srcHeight; - unsigned int srcSurfaceWidth, srcSurfaceHeight, destSurfaceWidth, destSurfaceHeight; + unsigned int srcSurfaceWidth, srcSurfaceHeight; WINED3DFORMAT destFormat, srcFormat; - UINT destSize; int srcLeft, destLeft, destTop; WINED3DPOOL srcPool, destPool; int offset = 0; - int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ GLenum dummy; DWORD sampler; int bpp; @@ -5183,11 +5181,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, srcFormat = winedesc.format; IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc); - destSurfaceWidth = winedesc.width; - destSurfaceHeight = winedesc.height; destPool = winedesc.pool; destFormat = winedesc.format; - destSize = winedesc.size; if(srcPool != WINED3DPOOL_SYSTEMMEM || destPool != WINED3DPOOL_DEFAULT){ WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning WINED3DERR_INVALIDCALL\n", pSourceSurface, pDestinationSurface); @@ -5233,15 +5228,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, destLeft = pDestPoint ? pDestPoint->x : 0; destTop = pDestPoint ? pDestPoint->y : 0; - - /* This function doesn't support compressed textures - the pitch is just bytesPerPixel * width */ if(srcWidth != srcSurfaceWidth || srcLeft ){ - rowoffset = srcSurfaceWidth * src_format_desc->byte_count; offset += srcLeft * src_format_desc->byte_count; /* TODO: do we ever get 3bpp?, would a shift and an add be quicker than a mul (well maybe a cycle or two) */ } - /* TODO DXT formats */ if(pSourceRect != NULL && pSourceRect->top != 0){ offset += pSourceRect->top * srcSurfaceWidth * src_format_desc->byte_count; @@ -5262,19 +5252,28 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, if (dst_format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) { const unsigned char *data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)); + UINT row_length = (srcWidth / src_format_desc->block_width) * src_format_desc->block_byte_count; + UINT row_count = srcHeight / src_format_desc->block_height; + UINT src_pitch = IWineD3DSurface_GetPitch(pSourceSurface); - if (rowoffset) + if (pSourceRect) { - UINT row_length = (srcWidth / src_format_desc->block_width) * src_format_desc->block_byte_count; - UINT row_count = srcHeight / src_format_desc->block_height; - UINT src_pitch = IWineD3DSurface_GetPitch(pSourceSurface); - UINT y = destTop; - UINT row; - data += (pSourceRect->top / src_format_desc->block_height) * src_pitch; data += (pSourceRect->left / src_format_desc->block_width) * src_format_desc->block_byte_count; + } + + if (row_length == src_pitch) + { + GL_EXTCALL(glCompressedTexSubImage2DARB(dst_impl->texture_target, dst_impl->texture_level, + destLeft, destTop, srcWidth, srcHeight, dst_format_desc->glInternal, row_count * row_length, data)); + } + else + { + UINT row, y; - for (row = 0; row < row_count; ++row) + /* glCompressedTexSubImage2DARB() ignores pixel store state, so we + * can't use the unpack row length like below. */ + for (row = 0, y = destTop; row < row_count; ++row) { GL_EXTCALL(glCompressedTexSubImage2DARB(dst_impl->texture_target, dst_impl->texture_level, destLeft, y, srcWidth, src_format_desc->block_height, @@ -5283,17 +5282,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, data += src_pitch; } } - else - { - if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) - { - /* FIXME: The easy way to do this is to lock the destination, and copy the bits across. */ - FIXME("Updating part of a compressed texture is not supported.\n"); - } - - GL_EXTCALL(glCompressedTexImage2DARB(dst_impl->texture_target, dst_impl->texture_level, - dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); - } checkGLcall("glCompressedTexSubImage2DARB"); } else

1 0

Henri Verbeet : wined3d: Calculate "offset" in the appropriate path in IWineD3DDeviceImpl_UpdateSurface().
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: eced5fe8ec16c9bc502f293754774d1763eef004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eced5fe8ec16c9bc502f29375… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 30 11:24:47 2010 +0200 wined3d: Calculate "offset" in the appropriate path in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 40 +++++++++++++++++----------------------- 1 files changed, 17 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 09946c6..4f6e54e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5161,14 +5161,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, int srcWidth, srcHeight; unsigned int srcSurfaceWidth, srcSurfaceHeight; WINED3DFORMAT destFormat, srcFormat; - int srcLeft, destLeft, destTop; + int destLeft, destTop; WINED3DPOOL srcPool, destPool; - int offset = 0; GLenum dummy; DWORD sampler; int bpp; CONVERT_TYPES convert = NO_CONVERSION; struct wined3d_context *context; + const unsigned char *data; WINED3DSURFACE_DESC winedesc; @@ -5224,34 +5224,16 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, /* this needs to be done in lines if the sourceRect != the sourceWidth */ srcWidth = pSourceRect ? pSourceRect->right - pSourceRect->left : srcSurfaceWidth; srcHeight = pSourceRect ? pSourceRect->bottom - pSourceRect->top : srcSurfaceHeight; - srcLeft = pSourceRect ? pSourceRect->left : 0; destLeft = pDestPoint ? pDestPoint->x : 0; destTop = pDestPoint ? pDestPoint->y : 0; - if(srcWidth != srcSurfaceWidth || srcLeft ){ - offset += srcLeft * src_format_desc->byte_count; - /* TODO: do we ever get 3bpp?, would a shift and an add be quicker than a mul (well maybe a cycle or two) */ - } - - if(pSourceRect != NULL && pSourceRect->top != 0){ - offset += pSourceRect->top * srcSurfaceWidth * src_format_desc->byte_count; - } - TRACE("(%p) glTexSubImage2D, level %d, left %d, top %d, width %d, height %d, fmt %#x, type %#x, memory %p+%#x\n", - This, dst_impl->texture_level, destLeft, destTop, srcWidth, srcHeight, dst_format_desc->glFormat, - dst_format_desc->glType, IWineD3DSurface_GetData(pSourceSurface), offset); - - /* Sanity check */ - if (IWineD3DSurface_GetData(pSourceSurface) == NULL) { - - /* need to lock the surface to get the data */ - FIXME("Surfaces has no allocated memory, but should be an in memory only surface\n"); - } + data = IWineD3DSurface_GetData(pSourceSurface); + if (!data) ERR("Source surface has no allocated memory, but should be a sysmem surface.\n"); ENTER_GL(); if (dst_format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) { - const unsigned char *data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)); UINT row_length = (srcWidth / src_format_desc->block_width) * src_format_desc->block_byte_count; UINT row_count = srcHeight / src_format_desc->block_height; UINT src_pitch = IWineD3DSurface_GetPitch(pSourceSurface); @@ -5262,6 +5244,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, data += (pSourceRect->left / src_format_desc->block_width) * src_format_desc->block_byte_count; } + TRACE("glCompressedTexSubImage2DARB, target %#x, level %d, x %d, y %d, w %d, h %d, " + "format %#x, image_size %#x, data %p.\n", dst_impl->texture_target, dst_impl->texture_level, + destLeft, destTop, srcWidth, srcHeight, dst_format_desc->glFormat, row_count * row_length, data); + if (row_length == src_pitch) { GL_EXTCALL(glCompressedTexSubImage2DARB(dst_impl->texture_target, dst_impl->texture_level, @@ -5286,7 +5272,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, } else { - const unsigned char *data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; + if (pSourceRect) + { + data += pSourceRect->top * srcSurfaceWidth * src_format_desc->byte_count; + data += pSourceRect->left * src_format_desc->byte_count; + } + + TRACE("glTexSubImage2D, target %#x, level %d, x %d, y %d, w %d, h %d, format %#x, type %#x, data %p.\n", + dst_impl->texture_target, dst_impl->texture_level, destLeft, destTop, + srcWidth, srcHeight, dst_format_desc->glFormat, dst_format_desc->glType, data); glPixelStorei(GL_UNPACK_ROW_LENGTH, srcSurfaceWidth); glTexSubImage2D(dst_impl->texture_target, dst_impl->texture_level, destLeft, destTop,

1 0

Henri Verbeet : wined3d: Get rid of destFormat and srcFormat in IWineD3DDeviceImpl_UpdateSurface().
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 72be7fe3a57e3431bedecc7d2212a28f6f33031a URL: http://source.winehq.org/git/wine.git/?a=commit;h=72be7fe3a57e3431bedecc7d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 30 11:24:48 2010 +0200 wined3d: Get rid of destFormat and srcFormat in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 42 ++++++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4f6e54e..0c67849 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5151,8 +5151,9 @@ static float WINAPI IWineD3DDeviceImpl_GetNPatchMode(IWineD3DDevice *iface) } static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DSurface *pSourceSurface, CONST RECT* pSourceRect, IWineD3DSurface *pDestinationSurface, CONST POINT* pDestPoint) { - const struct wined3d_format_desc *src_format_desc, *dst_format_desc; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + const struct wined3d_format_desc *src_format; + const struct wined3d_format_desc *dst_format; /** TODO: remove casts to IWineD3DSurfaceImpl * NOTE: move code to surface to accomplish this ****************************************/ @@ -5160,7 +5161,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DSurfaceImpl *dst_impl = (IWineD3DSurfaceImpl *)pDestinationSurface; int srcWidth, srcHeight; unsigned int srcSurfaceWidth, srcSurfaceHeight; - WINED3DFORMAT destFormat, srcFormat; int destLeft, destTop; WINED3DPOOL srcPool, destPool; GLenum dummy; @@ -5178,18 +5178,19 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, srcSurfaceWidth = winedesc.width; srcSurfaceHeight = winedesc.height; srcPool = winedesc.pool; - srcFormat = winedesc.format; IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc); destPool = winedesc.pool; - destFormat = winedesc.format; if(srcPool != WINED3DPOOL_SYSTEMMEM || destPool != WINED3DPOOL_DEFAULT){ WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning WINED3DERR_INVALIDCALL\n", pSourceSurface, pDestinationSurface); return WINED3DERR_INVALIDCALL; } - if (srcFormat != destFormat) + src_format = pSrcSurface->resource.format_desc; + dst_format = dst_impl->resource.format_desc; + + if (src_format->format != dst_format->format) { WARN("Source and destination surfaces should have the same format.\n"); return WINED3DERR_INVALIDCALL; @@ -5218,9 +5219,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, surface_internal_preload(pDestinationSurface, SRGB_RGB); IWineD3DSurface_BindTexture(pDestinationSurface, FALSE); - src_format_desc = ((IWineD3DSurfaceImpl *)pSrcSurface)->resource.format_desc; - dst_format_desc = dst_impl->resource.format_desc; - /* this needs to be done in lines if the sourceRect != the sourceWidth */ srcWidth = pSourceRect ? pSourceRect->right - pSourceRect->left : srcSurfaceWidth; srcHeight = pSourceRect ? pSourceRect->bottom - pSourceRect->top : srcSurfaceHeight; @@ -5232,26 +5230,26 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, ENTER_GL(); - if (dst_format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + if (dst_format->Flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT row_length = (srcWidth / src_format_desc->block_width) * src_format_desc->block_byte_count; - UINT row_count = srcHeight / src_format_desc->block_height; + UINT row_length = (srcWidth / src_format->block_width) * src_format->block_byte_count; + UINT row_count = srcHeight / src_format->block_height; UINT src_pitch = IWineD3DSurface_GetPitch(pSourceSurface); if (pSourceRect) { - data += (pSourceRect->top / src_format_desc->block_height) * src_pitch; - data += (pSourceRect->left / src_format_desc->block_width) * src_format_desc->block_byte_count; + data += (pSourceRect->top / src_format->block_height) * src_pitch; + data += (pSourceRect->left / src_format->block_width) * src_format->block_byte_count; } TRACE("glCompressedTexSubImage2DARB, target %#x, level %d, x %d, y %d, w %d, h %d, " "format %#x, image_size %#x, data %p.\n", dst_impl->texture_target, dst_impl->texture_level, - destLeft, destTop, srcWidth, srcHeight, dst_format_desc->glFormat, row_count * row_length, data); + destLeft, destTop, srcWidth, srcHeight, dst_format->glFormat, row_count * row_length, data); if (row_length == src_pitch) { GL_EXTCALL(glCompressedTexSubImage2DARB(dst_impl->texture_target, dst_impl->texture_level, - destLeft, destTop, srcWidth, srcHeight, dst_format_desc->glInternal, row_count * row_length, data)); + destLeft, destTop, srcWidth, srcHeight, dst_format->glInternal, row_count * row_length, data)); } else { @@ -5262,9 +5260,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, for (row = 0, y = destTop; row < row_count; ++row) { GL_EXTCALL(glCompressedTexSubImage2DARB(dst_impl->texture_target, dst_impl->texture_level, - destLeft, y, srcWidth, src_format_desc->block_height, - dst_format_desc->glInternal, row_length, data)); - y += src_format_desc->block_height; + destLeft, y, srcWidth, src_format->block_height, + dst_format->glInternal, row_length, data)); + y += src_format->block_height; data += src_pitch; } } @@ -5274,17 +5272,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, { if (pSourceRect) { - data += pSourceRect->top * srcSurfaceWidth * src_format_desc->byte_count; - data += pSourceRect->left * src_format_desc->byte_count; + data += pSourceRect->top * srcSurfaceWidth * src_format->byte_count; + data += pSourceRect->left * src_format->byte_count; } TRACE("glTexSubImage2D, target %#x, level %d, x %d, y %d, w %d, h %d, format %#x, type %#x, data %p.\n", dst_impl->texture_target, dst_impl->texture_level, destLeft, destTop, - srcWidth, srcHeight, dst_format_desc->glFormat, dst_format_desc->glType, data); + srcWidth, srcHeight, dst_format->glFormat, dst_format->glType, data); glPixelStorei(GL_UNPACK_ROW_LENGTH, srcSurfaceWidth); glTexSubImage2D(dst_impl->texture_target, dst_impl->texture_level, destLeft, destTop, - srcWidth, srcHeight, dst_format_desc->glFormat, dst_format_desc->glType, data); + srcWidth, srcHeight, dst_format->glFormat, dst_format->glType, data); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); checkGLcall("glTexSubImage2D"); }

1 0

Jörg Höhle : winmm/tests: Use cpp' s __LINE__ to print meaningful line numbers.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 74ad854e4101c96558f03f9bfc119b8dc500c351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ad854e4101c96558f03f9bf… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Mar 29 10:15:16 2010 +0200 winmm/tests: Use cpp's __LINE__ to print meaningful line numbers. --- dlls/winmm/tests/mci.c | 13 +++++++------ dlls/winmm/tests/midi.c | 21 +++++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index bbc21dd..0e7ce9d 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -136,7 +136,8 @@ static BOOL spurious_message(LPMSG msg) } /* A single ok() in each code path allows to prefix this with todo_wine */ -static void test_notification(HWND hwnd, const char* command, WPARAM type) +#define test_notification(hwnd, command, type) test_notification_dbg(hwnd, command, type, __LINE__) +static void test_notification_dbg(HWND hwnd, const char* command, WPARAM type, int line) { /* Use type 0 as meaning no message */ MSG msg; BOOL seen; @@ -145,17 +146,17 @@ static void test_notification(HWND hwnd, const char* command, WPARAM type) if(type && !seen) { /* We observe transient delayed notification, mostly on native. * Notification is not always present right when mciSend returns. */ - trace("Waiting for delayed notification from %s\n", command); + trace_(__FILE__,line)("Waiting for delayed notification from %s\n", command); MsgWaitForMultipleObjects(0, NULL, FALSE, 3000, QS_POSTMESSAGE); seen = PeekMessageA(&msg, hwnd, MM_MCINOTIFY, MM_MCINOTIFY, PM_REMOVE); } if(!seen) - ok(type==0, "Expect message %04lx from %s\n", type, command); + ok_(__FILE__,line)(type==0, "Expect message %04lx from %s\n", type, command); else if(msg.hwnd != hwnd) - ok(msg.hwnd == hwnd, "Didn't get the handle to our test window\n"); + ok_(__FILE__,line)(msg.hwnd == hwnd, "Didn't get the handle to our test window\n"); else if(msg.message != MM_MCINOTIFY) - ok(msg.message == MM_MCINOTIFY, "got %04x instead of MM_MCINOTIFY from command %s\n", msg.message, command); - else ok(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); + ok_(__FILE__,line)(msg.message == MM_MCINOTIFY, "got %04x instead of MM_MCINOTIFY from command %s\n", msg.message, command); + else ok_(__FILE__,line)(msg.wParam == type, "got %04lx instead of MCI_NOTIFY_xyz %04lx from command %s\n", msg.wParam, type, command); } static void test_openCloseWAVE(HWND hwnd) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index e531d04..3abdb1d 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -61,7 +61,8 @@ static void CALLBACK callback_func(HWAVEOUT hwo, UINT uMsg, cbinst = dwInstance; /* MYCBINST, see midiOut/StreamOpen */ } -static void test_notification(HWND hwnd, const char* command, UINT m1, DWORD_PTR p2) +#define test_notification(hwnd, command, m1, p2) test_notification_dbg(hwnd, command, m1, p2, __LINE__) +static void test_notification_dbg(HWND hwnd, const char* command, UINT m1, DWORD_PTR p2, int line) { /* Use message type 0 as meaning no message */ MSG msg; if (hwnd) { @@ -74,29 +75,29 @@ static void test_notification(HWND hwnd, const char* command, UINT m1, DWORD_PTR * Perhaps the OS preempts the player thread after setting MHDR_DONE * or clearing MHDR_INQUEUE, before calling DriverCallback. */ DWORD rc; - trace("Waiting for delayed message %x from %s\n", m1, command); + trace_(__FILE__,line)("Waiting for delayed message %x from %s\n", m1, command); SetLastError(0xDEADBEEF); rc = MsgWaitForMultipleObjects(0, NULL, FALSE, 3000, QS_POSTMESSAGE); - ok(rc==WAIT_OBJECT_0, "Wait failed: %04x %d\n", rc, GetLastError()); + ok_(__FILE__,line)(rc==WAIT_OBJECT_0, "Wait failed: %04x %d\n", rc, GetLastError()); seen = PeekMessageA(&msg, hwnd, 0, 0, PM_REMOVE); } if (seen) { - trace("Message %x, wParam=%lx, lParam=%lx from %s\n", + trace_(__FILE__,line)("Message %x, wParam=%lx, lParam=%lx from %s\n", msg.message, msg.wParam, msg.lParam, command); - ok(msg.hwnd==hwnd, "Didn't get the handle to our test window\n"); - ok(msg.message==m1 && msg.lParam==p2, "bad message %x/%lx from %s, expect %x/%lx\n", msg.message, msg.lParam, command, m1, p2); + ok_(__FILE__,line)(msg.hwnd==hwnd, "Didn't get the handle to our test window\n"); + ok_(__FILE__,line)(msg.message==m1 && msg.lParam==p2, "bad message %x/%lx from %s, expect %x/%lx\n", msg.message, msg.lParam, command, m1, p2); } - else ok(m1==0, "Expect message %x from %s\n", m1, command); + else ok_(__FILE__,line)(m1==0, "Expect message %x from %s\n", m1, command); } else { /* FIXME: MOM_POSITIONCB and MOM_DONE are so close that a queue is needed. */ if (cbmsg) { - ok(cbmsg==m1 && cbval1==p2 && cbval2==0, "bad callback %x/%lx/%lx from %s, expect %x/%lx\n", cbmsg, cbval1, cbval2, command, m1, p2); + ok_(__FILE__,line)(cbmsg==m1 && cbval1==p2 && cbval2==0, "bad callback %x/%lx/%lx from %s, expect %x/%lx\n", cbmsg, cbval1, cbval2, command, m1, p2); cbmsg = 0; /* Mark as read */ cbval1 = cbval2 = WHATEVER; - ok(cbinst==MYCBINST, "callback dwInstance changed to %lx\n", cbinst); + ok_(__FILE__,line)(cbinst==MYCBINST, "callback dwInstance changed to %lx\n", cbinst); } - else ok(m1==0, "Expect callback %x from %s\n", m1, command); + else ok_(__FILE__,line)(m1==0, "Expect callback %x from %s\n", m1, command); } }

1 0

Alexandre Julliard : wrc: Move temp file management from wpp directly into the load_file function.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: cb9be96437a82639e61b712721bf89ec6b62a2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb9be96437a82639e61b71272… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 15:33:54 2010 +0200 wrc: Move temp file management from wpp directly into the load_file function. --- tools/wrc/wrc.c | 52 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 21 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 931af46..2919d38 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -256,40 +256,50 @@ static int load_file( const char *input_name, const char *output_name ) /* Run the preprocessor on the input */ if(!no_preprocess) { + FILE *output; + int ret, fd; + char *name; + /* * Preprocess the input to a temp-file, or stdout if * no output was given. */ - chat("Starting preprocess\n"); - - if (!preprocess_only) - { - ret = wpp_parse_temp( input_name, output_name, &temp_name ); - } - else if (output_name) + if (preprocess_only) { - FILE *output; + if (output_name) + { + if (!(output = fopen( output_name, "w" ))) + fatal_perror( "Could not open %s for writing", output_name ); + ret = wpp_parse( input_name, output ); + fclose( output ); + } + else ret = wpp_parse( input_name, stdout ); - if (!(output = fopen( output_name, "w" ))) - fatal_perror( "Could not open %s for writing", output_name ); - ret = wpp_parse( input_name, output ); - fclose( output ); + if (ret) return ret; + output_name = NULL; + exit(0); } - else + + if (output_name && output_name[0]) { - ret = wpp_parse( input_name, stdout ); + name = xmalloc( strlen(output_name) + 8 ); + strcpy( name, output_name ); + strcat( name, ".XXXXXX" ); } + else name = xstrdup( "wrc.XXXXXX" ); - if (ret) return ret; + if ((fd = mkstemps( name, 0 )) == -1) + error("Could not generate a temp name from %s\n", name); - if(preprocess_only) - { - output_name = NULL; - exit(0); - } + temp_name = name; + if (!(output = fdopen(fd, "wt"))) + error("Could not open fd %s for writing\n", name); - input_name = temp_name; + ret = wpp_parse( input_name, output ); + fclose( output ); + if (ret) return ret; + input_name = name; } /* Reset the language */

1 0

Alexandre Julliard : widl: Move temp file management from wpp to widl.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 4d55592540c7cd1e8f6e0e449402930fbf6d38fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d55592540c7cd1e8f6e0e449… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 15:34:12 2010 +0200 widl: Move temp file management from wpp to widl. --- tools/widl/parser.l | 18 ++++++++++++++---- tools/widl/widl.c | 17 ++++++++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 5db9560..e7673d1 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -42,6 +42,7 @@ double [0-9]+\.[0-9]+([eE][+-]?[0-9]+)* %{ #include "config.h" +#include "wine/port.h" #include <stdio.h> #include <stdlib.h> @@ -442,10 +443,10 @@ struct imports { int do_import(char *fname) { FILE *f; - char *path; + char *path, *name; struct imports *import; int ptr = import_stack_ptr; - int ret; + int ret, fd; import = first_import; while (import && strcmp(import->name, fname)) @@ -460,7 +461,7 @@ int do_import(char *fname) /* don't search for a file name with a path in the include directories, * for compatibility with MIDL */ if (strchr( fname, '/' ) || strchr( fname, '\\' )) - path = strdup( fname ); + path = xstrdup( fname ); else if (!(path = wpp_find_include( fname, input_name ))) error_loc("Unable to open include file %s\n", fname); @@ -471,7 +472,16 @@ int do_import(char *fname) input_name = path; line_number = 1; - ret = wpp_parse_temp( path, NULL, &temp_name ); + name = xstrdup( "widl.XXXXXX" ); + if((fd = mkstemps( name, 0 )) == -1) + error("Could not generate a temp name from %s\n", name); + + temp_name = name; + if (!(f = fdopen(fd, "wt"))) + error("Could not open fd %s for writing\n", name); + + ret = wpp_parse( path, f ); + fclose( f ); if (ret) exit(1); if((f = fopen(temp_name, "r")) == NULL) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 8c76c24..8c0d0c9 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -701,7 +701,22 @@ int main(int argc,char *argv[]) if (!preprocess_only) { - ret = wpp_parse_temp( input_name, header_name, &temp_name ); + FILE *output; + int fd; + char *name = xmalloc( strlen(header_name) + 8 ); + + strcpy( name, header_name ); + strcat( name, ".XXXXXX" ); + + if ((fd = mkstemps( name, 0 )) == -1) + error("Could not generate a temp name from %s\n", name); + + temp_name = name; + if (!(output = fdopen(fd, "wt"))) + error("Could not open fd %s for writing\n", name); + + ret = wpp_parse( input_name, output ); + fclose( output ); } else {

1 0

Alexandre Julliard : wpp: Get rid of wpp_parse_temp, temp file management is better left to callers.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: bd94f959388d6027dc72210a56f14d6400b74a11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd94f959388d6027dc72210a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 15:34:29 2010 +0200 wpp: Get rid of wpp_parse_temp, temp file management is better left to callers. --- include/wine/wpp.h | 1 - libs/wpp/wpp.c | 37 ------------------------------------- 2 files changed, 0 insertions(+), 38 deletions(-) diff --git a/include/wine/wpp.h b/include/wine/wpp.h index daba277..2d284f1 100644 --- a/include/wine/wpp.h +++ b/include/wine/wpp.h @@ -57,7 +57,6 @@ extern void wpp_set_pedantic( int on ); extern int wpp_add_include_path( const char *path ); extern char *wpp_find_include( const char *name, const char *parent_name ); extern int wpp_parse( const char *input, FILE *output ); -extern int wpp_parse_temp( const char *input, const char *output_base, char **output_name ); extern void wpp_set_callbacks( const struct wpp_callbacks *callbacks ); #endif /* __WINE_WPP_H */ diff --git a/libs/wpp/wpp.c b/libs/wpp/wpp.c index de4286f..582ad6f 100644 --- a/libs/wpp/wpp.c +++ b/libs/wpp/wpp.c @@ -203,43 +203,6 @@ int wpp_parse( const char *input, FILE *output ) } -/* parse into a temporary file */ -int wpp_parse_temp( const char *input, const char *output_base, char **output_name ) -{ - FILE *output; - int ret, fd; - char *temp_name; - - if (!output_base || !output_base[0]) output_base = "wpptmp"; - - temp_name = pp_xmalloc( strlen(output_base) + 8 ); - if(!temp_name) - return 1; - strcpy( temp_name, output_base ); - strcat( temp_name, ".XXXXXX" ); - - if((fd = mkstemps( temp_name, 0 )) == -1) - { - ppy_error("Could not generate a temp name from %s\n", temp_name); - free( temp_name ); - return 2; - } - - if (!(output = fdopen(fd, "wt"))) - { - ppy_error("Could not open fd %s for writing\n", temp_name); - close( fd ); - unlink( temp_name ); - free( temp_name ); - return 2; - } - - *output_name = temp_name; - ret = wpp_parse( input, output ); - fclose( output ); - return ret; -} - void wpp_set_callbacks( const struct wpp_callbacks *callbacks ) { wpp_callbacks = callbacks;

1 0

Alexandre Julliard : wpp: Build with -fPIC to allow libwpp to be used from dlls.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: ced7d134c75cb0337e65de9fc5efcb556fe60a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced7d134c75cb0337e65de9fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 15:52:53 2010 +0200 wpp: Build with -fPIC to allow libwpp to be used from dlls. --- libs/wpp/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 950712f..acd74b6 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -2,6 +2,7 @@ TOPSRCDIR = @top_srcdir@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ +DLLFLAGS = @DLLFLAGS@ MODULE = libwpp.a C_SRCS = \

1 0