November 2006 - Wine-Commits

Mike McCormack : msi: Split ACTION_CostFinalize into two functions.
by Alexandre Julliard Nov. 7, 2006

Nov. 7, 2006

Module: wine Branch: master Commit: c5c5521015fff843dd9273dc8f99945726d1c6c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c5521015fff843dd9273dc8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Nov 7 15:05:48 2006 +0900 msi: Split ACTION_CostFinalize into two functions. --- dlls/msi/action.c | 88 +++++++++++++++++++++++++++++------------------------ 1 files changed, 48 insertions(+), 40 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8e76413..c878636 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1939,48 +1939,10 @@ LPWSTR msi_get_disk_file_version( LPCWST return strdupW( filever ); } -/* - * A lot is done in this function aside from just the costing. - * The costing needs to be implemented at some point but for now I am going - * to focus on the directory building - * - */ -static UINT ACTION_CostFinalize(MSIPACKAGE *package) +static UINT msi_check_file_install_states( MSIPACKAGE *package ) { - static const WCHAR ExecSeqQuery[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','D','i','r','e','c','t','o','r','y','`',0}; - static const WCHAR ConditionQuery[] = - {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', - '`','C','o','n','d','i','t','i','o','n','`',0}; - static const WCHAR szCosting[] = - {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0 }; - static const WCHAR szlevel[] = - {'I','N','S','T','A','L','L','L','E','V','E','L',0}; - static const WCHAR szOne[] = { '1', 0 }; - MSICOMPONENT *comp; + LPWSTR file_version; MSIFILE *file; - UINT rc; - MSIQUERY * view; - LPWSTR level, file_version; - - if ( 1 == msi_get_property_int( package, szCosting, 0 ) ) - return ERROR_SUCCESS; - - TRACE("Building Directory properties\n"); - - rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); - if (rc == ERROR_SUCCESS) - { - rc = MSI_IterateRecords(view, NULL, ITERATE_CostFinalizeDirectories, - package); - msiobj_release(&view->hdr); - } - - /* read components states from the registry */ - ACTION_GetComponentInstallStates(package); - - TRACE("File calculations\n"); LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { @@ -2044,6 +2006,52 @@ static UINT ACTION_CostFinalize(MSIPACKA file->state = msifs_present; } + return ERROR_SUCCESS; +} + +/* + * A lot is done in this function aside from just the costing. + * The costing needs to be implemented at some point but for now I am going + * to focus on the directory building + * + */ +static UINT ACTION_CostFinalize(MSIPACKAGE *package) +{ + static const WCHAR ExecSeqQuery[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','D','i','r','e','c','t','o','r','y','`',0}; + static const WCHAR ConditionQuery[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','C','o','n','d','i','t','i','o','n','`',0}; + static const WCHAR szCosting[] = + {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0 }; + static const WCHAR szlevel[] = + {'I','N','S','T','A','L','L','L','E','V','E','L',0}; + static const WCHAR szOne[] = { '1', 0 }; + MSICOMPONENT *comp; + UINT rc; + MSIQUERY * view; + LPWSTR level; + + if ( 1 == msi_get_property_int( package, szCosting, 0 ) ) + return ERROR_SUCCESS; + + TRACE("Building Directory properties\n"); + + rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); + if (rc == ERROR_SUCCESS) + { + rc = MSI_IterateRecords(view, NULL, ITERATE_CostFinalizeDirectories, + package); + msiobj_release(&view->hdr); + } + + /* read components states from the registry */ + ACTION_GetComponentInstallStates(package); + + TRACE("File calculations\n"); + msi_check_file_install_states( package ); + TRACE("Evaluating Condition Table\n"); rc = MSI_DatabaseOpenViewW(package->db, ConditionQuery, &view);

1 0

Andrew Talbot : ole32: Cast-qual warnings fix.
by Alexandre Julliard Nov. 7, 2006

Nov. 7, 2006

Module: wine Branch: master Commit: 97ee9c782090de676e0187fbf158ffc9c092a67f URL: http://source.winehq.org/git/wine.git/?a=commit;h=97ee9c782090de676e0187fbf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Nov 6 23:26:38 2006 +0000 ole32: Cast-qual warnings fix. --- dlls/ole32/stg_prop.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 039d168..a4be7b7 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -393,16 +393,20 @@ static HRESULT PropertyStorage_StringCop } else { - LPWSTR wideStr; + LPCWSTR wideStr = NULL; + LPWSTR wideStr_tmp = NULL; if (srcCP == CP_UNICODE) - wideStr = (LPWSTR)src; + wideStr = (LPCWSTR)src; else { len = MultiByteToWideChar(srcCP, 0, src, -1, NULL, 0); - wideStr = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (wideStr) - MultiByteToWideChar(srcCP, 0, src, -1, wideStr, len); + wideStr_tmp = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (wideStr_tmp) + { + MultiByteToWideChar(srcCP, 0, src, -1, wideStr_tmp, len); + wideStr = wideStr_tmp; + } else hr = STG_E_INSUFFICIENTMEMORY; } @@ -426,8 +430,7 @@ static HRESULT PropertyStorage_StringCop } } } - if (wideStr != (LPWSTR)src) - HeapFree(GetProcessHeap(), 0, wideStr); + HeapFree(GetProcessHeap(), 0, wideStr_tmp); } } TRACE("returning 0x%08x (%s)\n", hr,

1 0

Andrew Talbot : ntdll: Cast-qual warning fix.
by Alexandre Julliard Nov. 7, 2006

Nov. 7, 2006

Module: wine Branch: master Commit: fb28614a114c8633fd3823935cd2211a6b191d3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb28614a114c8633fd3823935… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Nov 6 21:36:23 2006 +0000 ntdll: Cast-qual warning fix. --- dlls/ntdll/server.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 2d6235c..dffd03b 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -869,15 +869,19 @@ static void create_config_dir(void) } if (!pid) { - const char *argv[6]; - - argv[0] = "tools/wineprefixcreate"; - argv[1] = "--quiet"; - argv[2] = "--wait"; - argv[3] = "--prefix"; + char *argv[6]; + static char argv0[] = "tools/wineprefixcreate", + argv1[] = "--quiet", + argv2[] = "--wait", + argv3[] = "--prefix"; + + argv[0] = argv0; + argv[1] = argv1; + argv[2] = argv2; + argv[3] = argv3; argv[4] = tmp_dir; argv[5] = NULL; - wine_exec_wine_binary( argv[0], (char **)argv, NULL ); + wine_exec_wine_binary( argv[0], argv, NULL ); rmdir( tmp_dir ); fatal_perror( "could not exec wineprefixcreate" ); }

1 0

Markus Amsler : wined3d: Use SURFACE_ALIGNMENT.
by Alexandre Julliard Nov. 7, 2006

Nov. 7, 2006

Module: wine Branch: master Commit: 5864d18c965fd2e94af86c38808481434a8565d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5864d18c965fd2e94af86c388… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 6 19:43:48 2006 +0100 wined3d: Use SURFACE_ALIGNMENT. --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d0f44cf..7fd300f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1842,7 +1842,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp /* Stick to the alignment for the converted surface too, makes it easier to load the surface */ outpitch = width * bpp; - outpitch = (outpitch + 3) & ~3; + outpitch = (outpitch + SURFACE_ALIGNMENT - 1) & ~(SURFACE_ALIGNMENT - 1); mem = HeapAlloc(GetProcessHeap(), 0, outpitch * height); if(!mem) { @@ -2126,7 +2126,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFo format == WINED3DFMT_DXT4 || format == WINED3DFMT_DXT5) { This->resource.size = ((max(This->pow2Width, 4) * formatEntry->bpp) * max(This->pow2Height, 4)); } else { - This->resource.size = ((This->pow2Width * formatEntry->bpp) + 3) & ~3; + This->resource.size = ((This->pow2Width * formatEntry->bpp) + SURFACE_ALIGNMENT - 1) & ~(SURFACE_ALIGNMENT - 1); This->resource.size *= This->pow2Height; }

1 0

Michael Stefaniuc : atl: Move the storage specifier to the beginning of the declaration.
by Alexandre Julliard Nov. 7, 2006

Nov. 7, 2006

Module: wine Branch: master Commit: 02cd4c858496a51f1d977cd34026b2f21b437c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=02cd4c858496a51f1d977cd34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 6 13:37:54 2006 +0100 atl: Move the storage specifier to the beginning of the declaration. --- dlls/atl/atl_ax.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index bb393f1..6b9d9cb 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -44,7 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); /********************************************************************** * AtlAxWin class window procedure */ -LRESULT static CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) +static LRESULT CALLBACK AtlAxWin_wndproc( HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lParam ) { if ( wMsg == WM_CREATE ) {

1 0

Markus Amsler : wined3d: Use width while converting surfaces.
by Alexandre Julliard Nov. 7, 2006

Nov. 7, 2006

Module: wine Branch: master Commit: 5ec0ce5b38bd6cd16f3f62e8286c8dfae1568a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec0ce5b38bd6cd16f3f62e82… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Mon Nov 6 19:45:10 2006 +0100 wined3d: Use width while converting surfaces. This fixes also a heap corruption with 1x1 and 2x2 surfaces. --- dlls/wined3d/surface.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7fd300f..7aa72d4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -47,7 +47,7 @@ typedef enum { CONVERT_RGB32_888 } CONVERT_TYPES; -HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); +HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void surface_download_data(IWineD3DSurfaceImpl *This) { if (This->resource.format == WINED3DFMT_DXT1 || @@ -991,6 +991,7 @@ static void flush_to_framebuffer_drawpix d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, + pitch, height, pitch * 4, CONVERT_PALETTED, @@ -1572,8 +1573,8 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceI return WINED3D_OK; } -HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf) { - BYTE *dest; +HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf) { + BYTE *source, *dest; TRACE("(%p)->(%p),(%d,%d,%d,%d,%p)\n", src, dst, pitch, height, outpitch, convert, surf); switch (convert) { @@ -1636,10 +1637,11 @@ HRESULT d3dfmt_convert_surface(BYTE *src for (y = 0; y < height; y++) { + source = src + pitch * y; dest = dst + outpitch * y; - /* This is an 1 bpp format, using the pitch here is fine */ - for (x = 0; x < pitch; x++) { - BYTE color = *src++; + /* This is an 1 bpp format, using the width here is fine */ + for (x = 0; x < width; x++) { + BYTE color = *source++; *dest++ = table[color][0]; *dest++ = table[color][1]; *dest++ = table[color][2]; @@ -1670,7 +1672,7 @@ HRESULT d3dfmt_convert_surface(BYTE *src for (y = 0; y < height; y++) { Source = (WORD *) (src + y * pitch); Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < pitch / 2; x++ ) { + for (x = 0; x < width / 2; x++ ) { WORD color = *Source++; *Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1)); if ((color < surf->SrcBltCKey.dwColorSpaceLowValue) || @@ -1849,7 +1851,7 @@ static HRESULT WINAPI IWineD3DSurfaceImp ERR("Out of memory %d, %d!\n", outpitch, height); return WINED3DERR_OUTOFVIDEOMEMORY; } - d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, height, outpitch, convert, This); + d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This); This->Flags |= SFLAG_CONVERTED; } else if (This->resource.format == WINED3DFMT_P8 && GL_SUPPORT(EXT_PALETTED_TEXTURE)) {

1 0

Jeff Latimer : ntdll: Clarify the documentation for HandleTable.
by Alexandre Julliard Nov. 7, 2006

Nov. 7, 2006

Module: wine Branch: master Commit: 54421bf806491999e3f3225b1b19f914ab9257c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54421bf806491999e3f3225b1… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Mon Nov 6 22:49:51 2006 +1100 ntdll: Clarify the documentation for HandleTable. --- dlls/ntdll/handletable.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/handletable.c b/dlls/ntdll/handletable.c index 51eb6ce..5105716 100644 --- a/dlls/ntdll/handletable.c +++ b/dlls/ntdll/handletable.c @@ -186,6 +186,16 @@ static NTSTATUS RtlpAllocateSomeHandles( * Success: Pointer to allocated handle. * Failure: NULL. * + * NOTES + * A valid handle must have the bit set as indicated in the code below + * otherwise subsquent RtlIsValidHandle() calls will fail. + * + * static inline void RtlpMakeHandleAllocated(RTL_HANDLE * Handle) + * { + * ULONG_PTR *AllocatedBit = (ULONG_PTR *)(&Handle->Next); + * *AllocatedBit = *AllocatedBit | 1; + * } + * * SEE * RtlFreeHandle(). */

1 0

lostwages/templates/en download-deb.template d ...
by Jeremy Newman Nov. 6, 2006

Nov. 6, 2006

ChangeSet ID: 29553 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/11/06 11:03:17 Modified files: templates/en : download-deb.template download.template Log message: Scott Ritchie <scott(a)open-vote.org> Update download and download-deb to reflect Ubuntu Edgy Patch: http://cvs.winehq.org/patch.py?id=29553 Old revision New revision Changes Path 1.11 1.12 +8 -4 lostwages/templates/en/download-deb.template 1.87 1.88 +1 -1 lostwages/templates/en/download.template Index: lostwages/templates/en/download-deb.template diff -u -p lostwages/templates/en/download-deb.template:1.11 lostwages/templates/en/download-deb.template:1.12 --- lostwages/templates/en/download-deb.template:1.11 6 Nov 2006 17: 3:17 -0000 +++ lostwages/templates/en/download-deb.template 6 Nov 2006 17: 3:17 -0000 @@ -12,10 +12,10 @@ distributions have their own repositorie Wine, however we keep our own repository of the latest available packages here for download. -Packages here are designed to function on Ubuntu Dapper (6.06) and Ubuntu -Breezy (5.10). The Dapper packages may work on Debian unstable, however this is -not supported. None of these packages will work at this time for Debian stable -(sarge), however a backport could become available at a future date. +Packages here are designed to function on Ubuntu Edgy (6.10), Dapper (6.06), and +Breezy (5.10). Packages here used to also work for Debian unstable, however due +to changes in Debian this no longer works and our Ubuntu maintainer is unable to support them. +If you can help provide up-to-date Debian packages, please contact <a href=mailto:scott(a)open-vote.org>Scott Ritchie</a>. <h2>Installing from the WineHQ APT Repository with Synaptic:</h2> @@ -27,6 +27,8 @@ Synaptic (System->Administration->Synapt Settings->Repositories. Then click add, select custom, and enter one of the following: +For Ubuntu Edgy (6.10): +deb http://wine.budgetdedicated.com/apt edgy main For Ubuntu Dapper (6.06): deb http://wine.budgetdedicated.com/apt dapper main For Ubuntu Breezy (5.10): @@ -47,6 +49,8 @@ i386 architecture, or wish to compile th you can build the wine package using the source repository instead. To do this, add a source repository with one of the following: +For Ubuntu Edgy (6.10): +deb-src http://wine.budgetdedicated.com/apt edgy main For Ubuntu Dapper (6.06): deb-src http://wine.budgetdedicated.com/apt dapper main For Ubuntu Breezy (5.10): Index: lostwages/templates/en/download.template diff -u -p lostwages/templates/en/download.template:1.87 lostwages/templates/en/download.template:1.88 --- lostwages/templates/en/download.template:1.87 6 Nov 2006 17: 3:17 -0000 +++ lostwages/templates/en/download.template 6 Nov 2006 17: 3:17 -0000 @@ -66,7 +66,7 @@ for post-installation instructions.< <img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu linux" border="0"></a> </td> <td> <a href="{$root}/site/download-deb">Ubuntu</a> - binary and source .debs for Ubuntu Breezy Badger and Dapper Drake</td> + binary and source .debs for Ubuntu Edgy, Dapper, and Breezy</td> <td><a href="mailto:scott(a)open-vote.org">Scott Ritchie</a></td> </tr>

1 0

Kirill K. Smirnov : winhelp: Rewrite LookupHelpFile function.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: 4f2819f2e14eaeee90d6c6400c9f0f6bb47a54fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f2819f2e14eaeee90d6c6400… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Mon Nov 6 15:07:01 2006 +0300 winhelp: Rewrite LookupHelpFile function. Add ability for user to find file himself if winhelp cannot find it. Update resources. --- programs/winhelp/Bg.rc | 1 + programs/winhelp/Cs.rc | 1 + programs/winhelp/Da.rc | 1 + programs/winhelp/De.rc | 1 + programs/winhelp/En.rc | 1 + programs/winhelp/Eo.rc | 1 + programs/winhelp/Es.rc | 1 + programs/winhelp/Fi.rc | 1 + programs/winhelp/Fr.rc | 1 + programs/winhelp/Hu.rc | 1 + programs/winhelp/It.rc | 1 + programs/winhelp/Ko.rc | 1 + programs/winhelp/Nl.rc | 1 + programs/winhelp/No.rc | 1 + programs/winhelp/Pl.rc | 1 + programs/winhelp/Pt.rc | 2 + programs/winhelp/Ru.rc | 1 + programs/winhelp/Si.rc | 1 + programs/winhelp/Sk.rc | 1 + programs/winhelp/Sw.rc | 1 + programs/winhelp/Tr.rc | 1 + programs/winhelp/Va.rc | 1 + programs/winhelp/Wa.rc | 1 + programs/winhelp/Zh.rc | 1 + programs/winhelp/macro.c | 47 +---------------------- programs/winhelp/winhelp.c | 80 ++++++++++++++++++++++++++++++++-------- programs/winhelp/winhelp.h | 2 +- programs/winhelp/winhelp_res.h | 1 + 28 files changed, 94 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f2819f2e14eaeee90d6c…

1 0

Alexandre Julliard : winex11.drv: Fixed build without OpenGL headers.
by Alexandre Julliard Nov. 6, 2006

Nov. 6, 2006

Module: wine Branch: master Commit: 7dd0eaa904965541a53a1417c2b5d5e6878401e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dd0eaa904965541a53a1417c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 6 15:40:01 2006 +0100 winex11.drv: Fixed build without OpenGL headers. --- dlls/winex11.drv/opengl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index fcb39d4..537d7b2 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2841,7 +2841,7 @@ PROC X11DRV_wglGetProcAddress(LPCSTR lps return NULL; } -HDC X11DRV_wglGetPbufferDCARB(X11DRV_PDEVICE *hDevice, HPBUFFERARB hPbuffer) +HDC X11DRV_wglGetPbufferDCARB(X11DRV_PDEVICE *hDevice, void *hPbuffer) { ERR_(opengl)("No OpenGL support compiled in.\n"); return NULL;

1 0