November 2006 - Wine-Commits

Alexandre Julliard : gdi32: Moved the system palette flags to winex11.drv.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: ed4f22ab5f204742b6e8745c2354a0e3802bdf6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed4f22ab5f204742b6e8745c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 13:13:34 2006 +0100 gdi32: Moved the system palette flags to winex11.drv. --- dlls/gdi32/palette.c | 19 ------------------- dlls/winex11.drv/palette.c | 4 +++- include/gdi.h | 3 --- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 52893a0..c136656 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -130,16 +130,6 @@ HPALETTE PALETTE_Init(void) return hpalette; } -/*********************************************************************** - * PALETTE_ValidateFlags - */ -static void PALETTE_ValidateFlags(PALETTEENTRY* lpPalE, int size) -{ - int i = 0; - for( ; i<size ; i++ ) - lpPalE[i].peFlags = PC_SYS_USED | (lpPalE[i].peFlags & 0x07); -} - /*********************************************************************** * CreatePalette [GDI32.@] @@ -166,8 +156,6 @@ HPALETTE WINAPI CreatePalette( PALETTE_MAGIC, (HGDIOBJ *)&hpalette, &palette_funcs ))) return 0; memcpy( &palettePtr->logpalette, palette, size ); - PALETTE_ValidateFlags(palettePtr->logpalette.palPalEntry, - palettePtr->logpalette.palNumEntries); palettePtr->mapping = NULL; GDI_ReleaseObj( hpalette ); @@ -358,8 +346,6 @@ UINT WINAPI SetPaletteEntries( if (start+count > numEntries) count = numEntries - start; memcpy( &palPtr->logpalette.palPalEntry[start], entries, count * sizeof(PALETTEENTRY) ); - PALETTE_ValidateFlags(palPtr->logpalette.palPalEntry, - palPtr->logpalette.palNumEntries); UnrealizeObject( hpalette ); GDI_ReleaseObj( hpalette ); return count; @@ -413,8 +399,6 @@ BOOL WINAPI ResizePalette( if( mapping ) memset(palPtr->mapping + cPrevEnt, 0, (cEntries - cPrevEnt)*sizeof(int)); memset( (BYTE*)palPtr + prevsize, 0, size - prevsize ); - PALETTE_ValidateFlags((PALETTEENTRY*)((BYTE*)palPtr + prevsize), - cEntries - cPrevEnt ); } palPtr->logpalette.palNumEntries = cEntries; palPtr->logpalette.palVersion = prevVer; @@ -470,7 +454,6 @@ BOOL WINAPI AnimatePalette( pptr->peRed, pptr->peGreen, pptr->peBlue); memcpy( &palPtr->logpalette.palPalEntry[StartIndex], pptr, sizeof(PALETTEENTRY) ); - PALETTE_ValidateFlags(&palPtr->logpalette.palPalEntry[StartIndex], 1); } else { TRACE("Not animating entry %d -- not PC_RESERVED\n", StartIndex); } @@ -592,8 +575,6 @@ UINT WINAPI GetNearestPaletteIndex( for( i = 0; i < palObj->logpalette.palNumEntries && diff ; i++, entry++) { - if (!(entry->peFlags & PC_SYS_USED)) continue; - r = entry->peRed - GetRValue(color); g = entry->peGreen - GetGValue(color); b = entry->peBlue - GetBValue(color); diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index f7ec7ad..1bf3ec8 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -48,6 +48,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(palette); * http://premium.microsoft.com/msdn/library/techart/f30/f34/f40/d4d/sa942.htm */ +#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ +#define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ + static PALETTEENTRY *COLOR_sysPal; /* current system palette */ static int COLOR_gapStart = 256; @@ -1160,7 +1163,6 @@ static UINT X11DRV_PALETTE_SetMapping( P index = X11DRV_SysPaletteLookupPixel( *(COLORREF*)(palPtr->logpalette.palPalEntry + uStart), TRUE); } - palPtr->logpalette.palPalEntry[uStart].peFlags |= PC_SYS_USED; if( X11DRV_PALETTE_PaletteToXPixel ) index = X11DRV_PALETTE_PaletteToXPixel[index]; } diff --git a/include/gdi.h b/include/gdi.h index 190ddd1..49b231f 100644 --- a/include/gdi.h +++ b/include/gdi.h @@ -70,9 +70,6 @@ typedef struct tagGDIOBJHDR #define NB_RESERVED_COLORS 20 /* number of fixed colors in system palette */ -#define PC_SYS_USED 0x80 /* palentry is used (both system and logical) */ -#define PC_SYS_RESERVED 0x40 /* system palentry is not to be mapped to */ - typedef struct tagPALETTEOBJ { GDIOBJHDR header;

1 0

Alexandre Julliard : winex11.drv: Avoid some direct accesses to the PALETTEOBJ structure.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 385ceeb8bcb0250ac04b586440c7577b840c2a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=385ceeb8bcb0250ac04b58644… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 13:47:39 2006 +0100 winex11.drv: Avoid some direct accesses to the PALETTEOBJ structure. --- dlls/winex11.drv/palette.c | 79 ++++++++++++++++++++++++------------------- 1 files changed, 44 insertions(+), 35 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 1bf3ec8..519dfe9 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -855,8 +855,9 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PD break; case 1: /* PALETTEINDEX */ - - if( idx >= palPtr->logpalette.palNumEntries) + { + PALETTEENTRY entry; + if (!GetPaletteEntries( hPal, idx, 1, &entry )) { WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx); GDI_ReleaseObj( hPal ); @@ -869,8 +870,9 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PD GDI_ReleaseObj( hPal ); return ret; } - color = *(COLORREF*)(palPtr->logpalette.palPalEntry + idx); + color = RGB( entry.peRed, entry.peGreen, entry.peBlue ); break; + } default: color &= 0xffffff; @@ -1048,10 +1050,9 @@ static BOOL X11DRV_PALETTE_CheckSysColor /*********************************************************************** * X11DRV_LookupSysPaletteExact */ -static int X11DRV_LookupSysPaletteExact( COLORREF col ) +static int X11DRV_LookupSysPaletteExact( BYTE r, BYTE g, BYTE b ) { int i; - BYTE r = GetRValue(col), g = GetGValue(col), b = GetBValue(col); for( i = 0; i < palette_size; i++ ) { if( COLOR_sysPal[i].peFlags & PC_SYS_USED ) /* skips gap */ @@ -1070,13 +1071,17 @@ static int X11DRV_LookupSysPaletteExact( * Set the color-mapping table for selected palette. * Return number of entries which mapping has changed. */ -static UINT X11DRV_PALETTE_SetMapping( PALETTEOBJ* palPtr, UINT uStart, UINT uNum, BOOL mapOnly ) +static UINT X11DRV_PALETTE_SetMapping( HPALETTE hpal, PALETTEOBJ* palPtr, BOOL mapOnly ) { char flag; int prevMapping = (palPtr->mapping) ? 1 : 0; int index; - UINT iRemapped = 0; + UINT i, iRemapped = 0; int* mapping; + PALETTEENTRY entries[256]; + WORD num_entries; + + if (!GetObjectW( hpal, sizeof(num_entries), &num_entries )) return 0; /* reset dynamic system palette entries */ @@ -1085,11 +1090,9 @@ static UINT X11DRV_PALETTE_SetMapping( P /* initialize palette mapping table */ if (palPtr->mapping) - mapping = HeapReAlloc( GetProcessHeap(), 0, palPtr->mapping, - sizeof(int)*palPtr->logpalette.palNumEntries); + mapping = HeapReAlloc( GetProcessHeap(), 0, palPtr->mapping, sizeof(int)*num_entries); else - mapping = HeapAlloc( GetProcessHeap(), 0, - sizeof(int)*palPtr->logpalette.palNumEntries); + mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(int)*num_entries); if(mapping == NULL) { ERR("Unable to allocate new mapping -- memory exhausted!\n"); @@ -1097,12 +1100,14 @@ static UINT X11DRV_PALETTE_SetMapping( P } palPtr->mapping = mapping; - if (uStart >= palPtr->logpalette.palNumEntries) return 0; - - if (uStart + uNum > palPtr->logpalette.palNumEntries) - uNum = palPtr->logpalette.palNumEntries - uStart; + if (num_entries > 256) + { + FIXME( "more than 256 entries not supported\n" ); + num_entries = 256; + } + if (!(num_entries = GetPaletteEntries( hpal, 0, num_entries, entries ))) return 0; - for( uNum += uStart; uStart < uNum; uStart++ ) + for (i = 0; i < num_entries; i++) { index = -1; flag = PC_SYS_USED; @@ -1110,9 +1115,9 @@ static UINT X11DRV_PALETTE_SetMapping( P /* Even though the docs say that only one flag is to be set, * they are a bitmask. At least one app sets more than one at * the same time. */ - if ( palPtr->logpalette.palPalEntry[uStart].peFlags & PC_EXPLICIT ) { + if ( entries[i].peFlags & PC_EXPLICIT ) { /* palette entries are indices into system palette */ - index = *(WORD*)(palPtr->logpalette.palPalEntry + uStart); + index = *(WORD*)&entries[i]; if( index > 255 || (index >= COLOR_gapStart && index <= COLOR_gapEnd) ) { WARN("PC_EXPLICIT: idx %d out of system palette, assuming black.\n", index); @@ -1120,14 +1125,14 @@ static UINT X11DRV_PALETTE_SetMapping( P } if( X11DRV_PALETTE_PaletteToXPixel ) index = X11DRV_PALETTE_PaletteToXPixel[index]; } else { - if ( palPtr->logpalette.palPalEntry[uStart].peFlags & PC_RESERVED ) { + if ( entries[i].peFlags & PC_RESERVED ) { /* forbid future mappings to this entry */ flag |= PC_SYS_RESERVED; } - if (! (palPtr->logpalette.palPalEntry[uStart].peFlags & PC_NOCOLLAPSE) ) { + if (! (entries[i].peFlags & PC_NOCOLLAPSE) ) { /* try to collapse identical colors */ - index = X11DRV_LookupSysPaletteExact(*(COLORREF*)(palPtr->logpalette.palPalEntry + uStart)); + index = X11DRV_LookupSysPaletteExact( entries[i].peRed, entries[i].peGreen, entries[i].peBlue ); } if( index < 0 ) @@ -1139,15 +1144,15 @@ static UINT X11DRV_PALETTE_SetMapping( P X11DRV_PALETTE_firstFree = X11DRV_PALETTE_freeList[index]; color.pixel = (X11DRV_PALETTE_PaletteToXPixel) ? X11DRV_PALETTE_PaletteToXPixel[index] : index; - color.red = palPtr->logpalette.palPalEntry[uStart].peRed << 8; - color.green = palPtr->logpalette.palPalEntry[uStart].peGreen << 8; - color.blue = palPtr->logpalette.palPalEntry[uStart].peBlue << 8; + color.red = entries[i].peRed << 8; + color.green = entries[i].peGreen << 8; + color.blue = entries[i].peBlue << 8; color.flags = DoRed | DoGreen | DoBlue; wine_tsx11_lock(); XStoreColor(gdi_display, X11DRV_PALETTE_PaletteXColormap, &color); wine_tsx11_unlock(); - COLOR_sysPal[index] = palPtr->logpalette.palPalEntry[uStart]; + COLOR_sysPal[index] = entries[i]; COLOR_sysPal[index].peFlags = flag; X11DRV_PALETTE_freeList[index] = 0; @@ -1155,23 +1160,23 @@ static UINT X11DRV_PALETTE_SetMapping( P } else if ( X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL ) { - index = X11DRV_PALETTE_ToPhysical( NULL, 0x00ffffff & - *(COLORREF*)(palPtr->logpalette.palPalEntry + uStart)); + index = X11DRV_PALETTE_ToPhysical( NULL, + RGB( entries[i].peRed, entries[i].peGreen, entries[i].peBlue )); } /* we have to map to existing entry in the system palette */ - index = X11DRV_SysPaletteLookupPixel( *(COLORREF*)(palPtr->logpalette.palPalEntry + uStart), TRUE); + index = X11DRV_SysPaletteLookupPixel( RGB( entries[i].peRed, entries[i].peGreen, entries[i].peBlue ), + TRUE ); } if( X11DRV_PALETTE_PaletteToXPixel ) index = X11DRV_PALETTE_PaletteToXPixel[index]; } - if( !prevMapping || palPtr->mapping[uStart] != index ) iRemapped++; - palPtr->mapping[uStart] = index; + if( !prevMapping || palPtr->mapping[i] != index ) iRemapped++; + palPtr->mapping[i] = index; - TRACE("entry %i (%x) -> pixel %i\n", uStart, - *(COLORREF*)(palPtr->logpalette.palPalEntry + uStart), index); + TRACE("entry %i (%x) -> pixel %i\n", i, *(COLORREF*)&entries[i], index); } return iRemapped; @@ -1252,7 +1257,7 @@ UINT X11DRV_RealizePalette( X11DRV_PDEVI if (X11DRV_PALETTE_PaletteFlags & X11DRV_PALETTE_VIRTUAL) return 0; if (!(palPtr = GDI_GetObjPtr( hpal, PALETTE_MAGIC ))) return 0; - ret = X11DRV_PALETTE_SetMapping( palPtr, 0, palPtr->logpalette.palNumEntries, !primary ); + ret = X11DRV_PALETTE_SetMapping( hpal, palPtr, !primary ); GDI_ReleaseObj( hpal ); return ret; } @@ -1272,10 +1277,14 @@ UINT X11DRV_RealizeDefaultPalette( X11DR { /* lookup is needed to account for SetSystemPaletteUse() stuff */ int i, index; + PALETTEENTRY entries[NB_RESERVED_COLORS]; - for( i = 0; i < 20; i++ ) + GetPaletteEntries( GetStockObject(DEFAULT_PALETTE), 0, NB_RESERVED_COLORS, entries ); + for( i = 0; i < NB_RESERVED_COLORS; i++ ) { - index = X11DRV_PALETTE_LookupSystemXPixel(*(COLORREF*)(palPtr->logpalette.palPalEntry + i)); + index = X11DRV_PALETTE_LookupSystemXPixel( RGB(entries[i].peRed, + entries[i].peGreen, + entries[i].peBlue) ); /* mapping is allocated in COLOR_InitPalette() */ if( index != palPtr->mapping[i] ) {

1 0

Alexandre Julliard : gdi32: Avoid accessing the internal palette object from dib.c.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: c60757b7d8b57f4e6b697e9c93cdc275075445a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60757b7d8b57f4e6b697e9c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 14:34:20 2006 +0100 gdi32: Avoid accessing the internal palette object from dib.c. --- dlls/gdi32/dib.c | 44 ++++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index a3d559c..c23e861 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -638,33 +638,33 @@ INT WINAPI GetDIBits( else { if(bpp >= bmp->bitmap.bmBitsPixel) { /* Generate the color map from the selected palette */ - PALETTEENTRY * palEntry; - PALETTEOBJ * palette; - if (!(palette = (PALETTEOBJ*)GDI_GetObjPtr( dc->hPalette, PALETTE_MAGIC ))) { + PALETTEENTRY palEntry[256]; + + memset( palEntry, 0, sizeof(palEntry) ); + if (!GetPaletteEntries( dc->hPalette, 0, 1 << bmp->bitmap.bmBitsPixel, palEntry )) + { GDI_ReleaseObj( hdc ); GDI_ReleaseObj( hbitmap ); return 0; } - palEntry = palette->logpalette.palPalEntry; - for (i = 0; i < (1 << bmp->bitmap.bmBitsPixel); i++, palEntry++) { + for (i = 0; i < (1 << bmp->bitmap.bmBitsPixel); i++) { if (coloruse == DIB_RGB_COLORS) { if (core_header) { - rgbTriples[i].rgbtRed = palEntry->peRed; - rgbTriples[i].rgbtGreen = palEntry->peGreen; - rgbTriples[i].rgbtBlue = palEntry->peBlue; + rgbTriples[i].rgbtRed = palEntry[i].peRed; + rgbTriples[i].rgbtGreen = palEntry[i].peGreen; + rgbTriples[i].rgbtBlue = palEntry[i].peBlue; } else { - rgbQuads[i].rgbRed = palEntry->peRed; - rgbQuads[i].rgbGreen = palEntry->peGreen; - rgbQuads[i].rgbBlue = palEntry->peBlue; + rgbQuads[i].rgbRed = palEntry[i].peRed; + rgbQuads[i].rgbGreen = palEntry[i].peGreen; + rgbQuads[i].rgbBlue = palEntry[i].peBlue; rgbQuads[i].rgbReserved = 0; } } else ((WORD *)colorPtr)[i] = (WORD)i; } - GDI_ReleaseObj( dc->hPalette ); } else { switch (bpp) { case 1: @@ -1189,21 +1189,17 @@ static void DIB_CopyColorTable( DC *dc, } else { - PALETTEOBJ *palette; + PALETTEENTRY entries[256]; const WORD *index = (const WORD*) ((const BYTE*) info + (WORD) info->bmiHeader.biSize); + UINT count = GetPaletteEntries( dc->hPalette, 0, colors, entries ); - if ((palette = GDI_GetObjPtr( dc->hPalette, PALETTE_MAGIC ))) + for (i = 0; i < colors; i++, index++) { - UINT entries = palette->logpalette.palNumEntries; - for (i = 0; i < colors; i++, index++) - { - PALETTEENTRY *entry = &palette->logpalette.palPalEntry[*index % entries]; - colorTable[i].rgbRed = entry->peRed; - colorTable[i].rgbGreen = entry->peGreen; - colorTable[i].rgbBlue = entry->peBlue; - colorTable[i].rgbReserved = 0; - } - GDI_ReleaseObj( dc->hPalette ); + PALETTEENTRY *entry = &entries[*index % count]; + colorTable[i].rgbRed = entry->peRed; + colorTable[i].rgbGreen = entry->peGreen; + colorTable[i].rgbBlue = entry->peBlue; + colorTable[i].rgbReserved = 0; } } bmp->color_table = colorTable;

1 0

Alexandre Julliard : d3d9: Include wingdi.h, not gdi.h.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 46dd467941b42ace897938d3abfee5db82d9b84e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46dd467941b42ace897938d3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 17 12:46:15 2006 +0100 d3d9: Include wingdi.h, not gdi.h. --- dlls/d3d9/d3d9_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 2d6397e..9f8329d 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -30,11 +30,11 @@ #define COBJMACROS #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "gdi.h" #include "d3d9.h" #include "ddraw.h" #include "wine/wined3d_interface.h"

1 0

Andrew Talbot : urlmon: Cast-qual warnings fix.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 60cafb5e952c4bb5c24bd0ad68a28f7937e03361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cafb5e952c4bb5c24bd0ad6… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Nov 16 21:55:05 2006 +0000 urlmon: Cast-qual warnings fix. --- dlls/urlmon/urlmon_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index d0d8f2c..d36803c 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -452,7 +452,7 @@ static BOOL image_bmp_filter(const BYTE { return size >= 14 && b[0] == 0x42 && b[1] == 0x4d - && *(DWORD*)(b+6) == 0; + && *(const DWORD *)(b+6) == 0; } static BOOL video_avi_filter(const BYTE const *b, DWORD size)

1 0

Vitaliy Margolen : winecfg: Allow editing of broken drive links.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 161a53f254887b5a0b52cb37b8f15e20daafa5ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=161a53f254887b5a0b52cb37b… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Nov 16 12:28:49 2006 -0700 winecfg: Allow editing of broken drive links. --- programs/winecfg/drive.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 files changed, 36 insertions(+), 5 deletions(-) diff --git a/programs/winecfg/drive.c b/programs/winecfg/drive.c index 36d7a1d..9e81ab2 100644 --- a/programs/winecfg/drive.c +++ b/programs/winecfg/drive.c @@ -21,6 +21,9 @@ * */ +#include "config.h" +#include "wine/port.h" + #include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -35,6 +38,7 @@ #include <shlguid.h> #include <shlwapi.h> #include <shlobj.h> +#include <wine/library.h> #include "winecfg.h" #include "resource.h" @@ -263,12 +267,11 @@ void load_drives() int drivecount = 0, i; int retval; static const int arraysize = 512; + const char *config_dir = wine_get_config_dir(); + char *path; WINE_TRACE("\n"); - /* FIXME: broken symlinks in $WINEPREFIX/dosdevices will not be - returned by this API, so we need to handle that */ - /* setup the drives array */ dev = devices = HeapAlloc(GetProcessHeap(), 0, arraysize); len = GetLogicalDriveStrings(arraysize, devices); @@ -360,8 +363,37 @@ void load_drives() drivecount++; } + /* Find all the broken symlinks we might have and add them as well. */ + + len = strlen(config_dir) + sizeof("/dosdevices/a:"); + if (!(path = HeapAlloc(GetProcessHeap(), 0, len))) + return; + + strcpy(path, config_dir); + strcat(path, "/dosdevices/a:"); + + for (i = 0; i < 26; i++) + { + char buff[MAX_PATH]; + struct stat st; + int cnt; + + if (drives[i].in_use) continue; + path[len - 3] = 'a' + i; + + if (lstat(path, &st) == -1 || !S_ISLNK(st.st_mode)) continue; + if ((cnt = readlink(path, buff, sizeof(buff))) == -1) continue; + buff[cnt] = '\0'; + + WINE_TRACE("found broken symlink %s -> %s\n", path, buff); + add_drive('A' + i, buff, "", "0", DRIVE_UNKNOWN); + + drivecount++; + } + WINE_TRACE("found %d drives\n", drivecount); + HeapFree(GetProcessHeap(), 0, path); HeapFree(GetProcessHeap(), 0, dev); } @@ -421,9 +453,8 @@ void apply_drive_changes(void) if(!retval) { WINE_TRACE(" GetVolumeInformation() for '%s' failed\n", devicename); - WINE_TRACE(" Skipping this drive\n"); PRINTERROR(); - continue; /* skip this drive */ + volumeNameBuffer[0] = '\0'; } WINE_TRACE(" current path: '%s', new path: '%s'\n",

1 0

Louis Lenders : msvcrt: Add _fstat64 and _stat64 to msvcrt.spec.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: fa47970e6c24f51c57023e4596d364bef37f794d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa47970e6c24f51c57023e459… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Thu Nov 16 11:49:47 2006 +0000 msvcrt: Add _fstat64 and _stat64 to msvcrt.spec. --- dlls/msvcrt/msvcrt.spec | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index eaf9312..0b27bed 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -242,6 +242,7 @@ @ cdecl _fputwchar(long) @ cdecl _fsopen(str str long) MSVCRT__fsopen @ cdecl _fstat(long ptr) MSVCRT__fstat +@ stub _fstat64 @ cdecl _fstati64(long ptr) MSVCRT__fstati64 @ cdecl _ftime(ptr) @ cdecl -ret64 _ftol() ntdll._ftol @@ -449,6 +450,7 @@ @ cdecl _spawnvpe(long str ptr ptr) @ cdecl _splitpath(str ptr ptr ptr ptr) ntdll._splitpath @ cdecl _stat(str ptr) MSVCRT__stat +@ stub _stat64 @ cdecl _stati64(str ptr) MSVCRT__stati64 @ cdecl _statusfp() @ cdecl _strcmpi(str str) ntdll._strcmpi

1 0

Mike McCormack : msi: Remove unnecessary includes.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: cf370a8d395d6d93f77546f8768e53f4e4a0aa97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf370a8d395d6d93f77546f87… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 17 15:16:13 2006 +0900 msi: Remove unnecessary includes. --- dlls/msi/custom.c | 22 ++-------------------- 1 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 14e9918..bbc56a8 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -18,35 +18,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * Pages I need - * -http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/summary_list_of_all_custom_action_types.asp - */ - -#include <stdarg.h> -#include <stdio.h> - #define COBJMACROS +#include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "winreg.h" -#include "wine/debug.h" -#include "fdi.h" -#include "msi.h" #include "msidefs.h" -#include "msiquery.h" -#include "msvcrt/fcntl.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "winuser.h" -#include "shlobj.h" +#include "wine/debug.h" #include "wine/unicode.h" -#include "winver.h" WINE_DEFAULT_DEBUG_CHANNEL(msi);

1 0

Mike McCormack : msi: Remove a level of indent in resolve_folder().
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 6b38139e6268e82ec3269497f3a38b0080c13578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b38139e6268e82ec3269497f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 17 15:15:56 2006 +0900 msi: Remove a level of indent in resolve_folder(). --- dlls/msi/helpers.c | 87 ++++++++++++++++++++++++++------------------------- 1 files changed, 44 insertions(+), 43 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 82f98b6..ebd0301 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -201,7 +201,7 @@ LPWSTR resolve_folder(MSIPACKAGE *packag BOOL set_prop, MSIFOLDER **folder) { MSIFOLDER *f; - LPWSTR p, path = NULL; + LPWSTR p, path = NULL, parent; TRACE("Working to resolve %s\n",debugstr_w(name)); @@ -267,60 +267,61 @@ LPWSTR resolve_folder(MSIPACKAGE *packag return path; } - if (f->Parent) - { - LPWSTR parent = f->Parent->Directory; + if (!f->Parent) + return path; - TRACE(" ! Parent is %s\n", debugstr_w(parent)); + parent = f->Parent->Directory; - p = resolve_folder(package, parent, source, set_prop, NULL); - if (!source) - { - TRACE(" TargetDefault = %s\n", debugstr_w(f->TargetDefault)); + TRACE(" ! Parent is %s\n", debugstr_w(parent)); - path = build_directory_name( 3, p, f->TargetDefault, NULL ); - clean_spaces_from_path( path ); - f->ResolvedTarget = strdupW( path ); - TRACE("target -> %s\n", debugstr_w(path)); - if (set_prop) - MSI_SetPropertyW(package,name,path); - } - else - { - /* source may be in a few different places ... check each of them */ - path = NULL; + p = resolve_folder(package, parent, source, set_prop, NULL); + if (!source) + { + TRACE(" TargetDefault = %s\n", debugstr_w(f->TargetDefault)); - /* try the long path directory */ - if (f->SourceLongPath) + path = build_directory_name( 3, p, f->TargetDefault, NULL ); + clean_spaces_from_path( path ); + f->ResolvedTarget = strdupW( path ); + TRACE("target -> %s\n", debugstr_w(path)); + if (set_prop) + MSI_SetPropertyW(package,name,path); + } + else + { + /* source may be in a few different places ... check each of them */ + path = NULL; + + /* try the long path directory */ + if (f->SourceLongPath) + { + path = build_directory_name( 3, p, f->SourceLongPath, NULL ); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) { - path = build_directory_name( 3, p, f->SourceLongPath, NULL ); - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) - { - msi_free( path ); - path = NULL; - } + msi_free( path ); + path = NULL; } + } - /* try the short path directory */ - if (!path && f->SourceShortPath) + /* try the short path directory */ + if (!path && f->SourceShortPath) + { + path = build_directory_name( 3, p, f->SourceShortPath, NULL ); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) { - path = build_directory_name( 3, p, f->SourceShortPath, NULL ); - if (INVALID_FILE_ATTRIBUTES == GetFileAttributesW( path )) - { - msi_free( path ); - path = NULL; - } + msi_free( path ); + path = NULL; } + } - /* try the root of the install */ - if (!path) - path = get_source_root( package ); + /* try the root of the install */ + if (!path) + path = get_source_root( package ); - TRACE("source -> %s\n", debugstr_w(path)); - f->ResolvedSource = strdupW( path ); - } - msi_free(p); + TRACE("source -> %s\n", debugstr_w(path)); + f->ResolvedSource = strdupW( path ); } + msi_free(p); + return path; }

1 0

Mike McCormack : msi: Add a test showing the _Properties table is a bit strange.
by Alexandre Julliard Nov. 17, 2006

Nov. 17, 2006

Module: wine Branch: master Commit: 4052b8be05eaf33807e20247f7329b0461765e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4052b8be05eaf33807e20247f… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Nov 17 15:15:42 2006 +0900 msi: Add a test showing the _Properties table is a bit strange. --- dlls/msi/tests/package.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 1faa751..4aaa001 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -1344,6 +1344,50 @@ static void test_props(void) DeleteFile(msifile); } +static void test_properties_table(void) +{ + const char *query; + UINT r; + MSIHANDLE hpkg, hdb; + char buffer[0x10]; + DWORD sz; + + hdb = create_package_db(); + ok( hdb, "failed to create package\n"); + + hpkg = package_from_db(hdb); + ok( hpkg, "failed to create package\n"); + + query = "CREATE TABLE `_Properties` ( " + "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; + r = run_query(hdb, query); + ok(r == ERROR_INVALID_HANDLE, "failed to create table\n"); + + MsiCloseHandle( hpkg ); + DeleteFile(msifile); + + hdb = create_package_db(); + ok( hdb, "failed to create package\n"); + + query = "CREATE TABLE `_Properties` ( " + "`foo` INT NOT NULL, `bar` INT LOCALIZABLE PRIMARY KEY `foo`)"; + r = run_query(hdb, query); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + hpkg = package_from_db(hdb); + ok( hpkg, "failed to create package\n"); + + r = MsiSetProperty( hpkg, "foo", "bar"); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + sz = sizeof buffer; + r = MsiGetProperty( hpkg, "foo", buffer, &sz); + ok(r == ERROR_SUCCESS, "failed to create table\n"); + + MsiCloseHandle( hpkg ); + DeleteFile(msifile); +} + static UINT try_query_param( MSIHANDLE hdb, LPCSTR szQuery, MSIHANDLE hrec ) { MSIHANDLE htab = 0; @@ -2858,6 +2902,7 @@ START_TEST(package) test_gettargetpath_bad(); test_settargetpath(); test_props(); + test_properties_table(); test_condition(); test_msipackage(); test_formatrecord2();

1 0