May 2010 - Wine-Commits - list.winehq.org

Luca Bennati : oledlg: Update Italian translation.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 0e1e826fcf72c56c1e65113c38ffb908b9bcdb1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e1e826fcf72c56c1e65113c3… Author: Luca Bennati <lucak3(a)gmail.com> Date: Sun May 30 00:06:12 2010 +0200 oledlg: Update Italian translation. --- dlls/oledlg/oledlg_It.rc | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/oledlg_It.rc b/dlls/oledlg/oledlg_It.rc index 91e43b2..fb5ea32 100644 --- a/dlls/oledlg/oledlg_It.rc +++ b/dlls/oledlg/oledlg_It.rc @@ -19,11 +19,14 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL UIINSERTOBJECT DIALOG DISCARDABLE 0, 0, 294, 151 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Insersci oggetto" +CAPTION "Inserisci oggetto" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OBJTYPELIST,82,19,131,66,LBS_SORT | @@ -53,6 +56,46 @@ STRINGTABLE DISCARDABLE IDS_RESULTOBJDESC "Inserisci un nuovo oggetto %s nel documento" IDS_RESULTFILEOBJDESC "Inserisci i contenuti del file come un oggetto nel documento in modo da poterlo attivare usando il programma che lo ha creato." IDS_BROWSE "Esplora" - IDS_NOTOLEMOD "Il file non sembra essere un module OLE valido. Impossibile registrare il controllo OLE." + IDS_NOTOLEMOD "Il file non sembra essere un modulo OLE valido. Impossibile registrare il controllo OLE." IDS_NOTOLEMODCAPTION "Aggiungi Controllo" } + +IDD_PASTESPECIAL4 DIALOG DISCARDABLE 3, 15, 293, 140 +STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Incolla Speciale" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sorgente:", -1, 6, 9, 30, 8, WS_VISIBLE | WS_GROUP + CONTROL "&Incolla", IDC_PS_PASTE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, + 6, 38, 55, 10 + CONTROL "Incolla &Collegamento", IDC_PS_PASTELINK, "Button", BS_AUTORADIOBUTTON | WS_VISIBLE, + 6, 63, 55, 10 + LTEXT "&Come:", -1, 65, 25, 16, 8, WS_VISIBLE | WS_GROUP + LISTBOX IDC_PS_PASTELIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_PASTELINKLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | NOT WS_VISIBLE + LISTBOX IDC_PS_DISPLAYLIST, 65, 36, 153, 57, LBS_NOTIFY | LBS_USETABSTOPS | WS_VSCROLL | WS_BORDER | WS_VISIBLE + CONTROL "OK", IDOK, "Button", BS_DEFPUSHBUTTON | WS_TABSTOP | WS_GROUP | WS_VISIBLE, 224, 6, 66, 14 + CONTROL "Annulla", IDCANCEL, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 23, 66, 14 + CONTROL "&Aiuto", IDC_OLEUIHELP, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 42, 66, 14 + CONTROL "&Mostra come icona", IDC_PS_DISPLAYASICON, "Button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_VISIBLE, 224, 59, 66, 14 + CONTROL "", IDC_PS_ICONDISPLAY, "Static", SS_ICON | WS_VISIBLE, 224, 75, 66, 44 + CONTROL "Cambia &icona...", IDC_PS_CHANGEICON, "Button", BS_PUSHBUTTON | WS_TABSTOP | WS_VISIBLE, 224, 123, 66, 14 + CONTROL "", IDC_PS_RESULTIMAGE, "Static", SS_ICON | WS_VISIBLE, 8, 101, 42, 34 + CONTROL "<< testo qua >>", IDC_PS_RESULTTEXT, "Static", SS_NOPREFIX | WS_VISIBLE, 54, 100, 159, 35 + CONTROL "Result", -1, "Button", BS_GROUPBOX | WS_GROUP | WS_VISIBLE, 6, 90, 212, 48 + CONTROL "", IDC_PS_SOURCETEXT, "Edit", ES_READONLY | ES_AUTOHSCROLL | WS_VISIBLE, 37, 9, 180, 8 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PS_PASTE_DATA "Inserisce i contenuti degli appunti nel tuo documento come %s." + IDS_PS_PASTE_OBJECT "Inserisce i contenuti degli appunti nel tuo documento permettendoti di attivarlo usando %s." + IDS_PS_PASTE_OBJECT_AS_ICON "Inserisce i contenuti degli appunti nel tuo documento permettendoti di attivarlo usando %s. Sarà mostrato come un'icona." + IDS_PS_PASTE_LINK_DATA "Inserisce i contenuti degli appunti nel tuo documento come %s. I dati sono collegati al file sorgente in modo che i cambiamenti in quello si riflettano sul tuo documento." + IDS_PS_PASTE_LINK_OBJECT "Inserisce un'immagine degli appunti nel tuo documento. L'immagine è collegata al file sorgente in modo che i cambiamenti in quello si riflettano sul tuo documento." + IDS_PS_PASTE_LINK_OBJECT_AS_ICON "Inserisce una scorciatoia che punta alla locazione dei contenuti degli appunti. La scorciatoia è collegata al file sorgente in modo che i cambiamenti in quello si riflettano sul tuo documento." + IDS_PS_NON_OLE "Inserisce i contenuti degli appunti nel tuo documento." + IDS_PS_UNKNOWN_TYPE "Tipo Sconosciuto" + IDS_PS_UNKNOWN_SRC "Sorgente Sconosciuta" + IDS_PS_UNKNOWN_APP "il programma che lo ha creato" +}

1 0

Vincent Povirk : windowscodecs: Fix the tile coordinate translation in the TIFF decoder.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: e390839732f7314f0ad9330df8493612b63d8e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e390839732f7314f0ad9330df… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 29 10:07:17 2010 -0500 windowscodecs: Fix the tile coordinate translation in the TIFF decoder. --- dlls/windowscodecs/tiffformat.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index fe87ddd..d069fd1 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -756,16 +756,20 @@ static HRESULT WINAPI TiffFrameDecode_CopyPixels(IWICBitmapFrameDecode *iface, if (prc->X+prc->Width > (tile_x+1) * This->decode_info.tile_width) rc.Width = This->decode_info.tile_width - rc.X; + else if (prc->X < tile_x * This->decode_info.tile_width) + rc.Width = prc->Width + prc->X - tile_x * This->decode_info.tile_width; else - rc.Width = prc->Width + rc.X - prc->X; + rc.Width = prc->Width; if (prc->Y+prc->Height > (tile_y+1) * This->decode_info.tile_height) rc.Height = This->decode_info.tile_height - rc.Y; + else if (prc->Y < tile_y * This->decode_info.tile_height) + rc.Height = prc->Height + prc->Y - tile_y * This->decode_info.tile_height; else - rc.Height = prc->Height + rc.Y - prc->Y; + rc.Height = prc->Height; - dst_tilepos = pbBuffer + (cbStride * (rc.Y - prc->Y)) + - ((This->decode_info.bpp * (rc.X - prc->X) + 7) / 8); + dst_tilepos = pbBuffer + (cbStride * ((rc.Y + tile_y * This->decode_info.tile_height) - prc->Y)) + + ((This->decode_info.bpp * ((rc.X + tile_x * This->decode_info.tile_width) - prc->X) + 7) / 8); hr = copy_pixels(This->decode_info.bpp, This->cached_tile, This->decode_info.tile_width, This->decode_info.tile_height, This->decode_info.tile_stride,

1 0

André Hentschel : winapi: Allow multiple flags.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 86f67209bb27f150ecd6692299cae471887ef1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f67209bb27f150ecd669229… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 28 21:31:31 2010 +0200 winapi: Allow multiple flags. --- tools/winapi/winapi.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 4d0c43d..dcd9268 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -391,7 +391,7 @@ sub parse_spec_file($$) { } } } - } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-private))?\s+(\S+)$/) { + } elsif(/^(\d+|@)\s+stub(?:\s+(-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-private))*\s+(\S+)$/) { $ordinal = $1; my $flags = $2; @@ -440,7 +440,7 @@ sub parse_spec_file($$) { } else { # if($$function_external_module{$external_name} !~ /$module/) { $$function_external_module{$external_name} .= " & $module"; } - } elsif(/^(\d+|@)\s+extern(?:\s+(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-norelay|-i386|-ret16|-ret64))?\s+(\S+)\s*(\S*)$/) { + } elsif(/^(\d+|@)\s+extern(?:\s+(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-norelay|-i386|-ret16|-ret64))*\s+(\S+)\s*(\S*)$/) { $ordinal = $1; my $external_name = $2;

1 0

André Hentschel : winapi: Add ordinal flag.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: f181a48e6a4e768994a72babaa6634966c98f740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f181a48e6a4e768994a72baba… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 28 21:31:06 2010 +0200 winapi: Add ordinal flag. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index db0b06a..4d0c43d 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -282,7 +282,7 @@ sub parse_spec_file($$) { my $ARCHES="alpha|i386|powerpc|sparc|win32|win64|x86_64"; if(/^(\d+|@)\s+ (cdecl|pascal|stdcall|varargs)\s+ - ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) + ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x) { my $calling_convention = $2; my $flags = $3;

1 0

Alexandre Julliard : configure: Remove some dead code.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 271f5fbd97dfa29f0ef0a06565d9de389c47a98d URL: http://source.winehq.org/git/wine.git/?a=commit;h=271f5fbd97dfa29f0ef0a0656… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 20:32:47 2010 +0200 configure: Remove some dead code. --- configure | 6 ------ configure.ac | 6 ------ 2 files changed, 0 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 82d8cb8..82d969b 100755 --- a/configure +++ b/configure @@ -6544,12 +6544,6 @@ fi then COREAUDIO="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI" - ac_save_LIBS="$LIBS" - if test "$ac_cv_header_AudioToolbox_AudioConverter_h" = "yes" - then - LIBS="$LIBS $COREAUDIO" - LIBS="$ac_save_LIBS" - fi fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/configure.ac b/configure.ac index a338d8c..21c0203 100644 --- a/configure.ac +++ b/configure.ac @@ -704,12 +704,6 @@ case $host_os in then dnl CoreServices needed by AudioUnit AC_SUBST(COREAUDIO,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") - ac_save_LIBS="$LIBS" - if test "$ac_cv_header_AudioToolbox_AudioConverter_h" = "yes" - then - LIBS="$LIBS $COREAUDIO" - LIBS="$ac_save_LIBS" - fi fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then

1 0

Alexandre Julliard : msvcrt: Make sure msvcrt doesn't get unloaded.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 14b3db99c1b552c3a0d5dc8e2003122677575a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b3db99c1b552c3a0d5dc8e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 28 20:33:27 2010 +0200 msvcrt: Make sure msvcrt doesn't get unloaded. We can't initialize file handles properly a second time. --- dlls/msvcrt/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index a5b0961..323f8b7 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "msvcrt.h" +#include "winternl.h" #include "wine/debug.h" @@ -100,6 +101,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) msvcrt_init_args(); msvcrt_init_signals(); _setmbcp(_MB_CP_LOCALE); + /* don't allow unloading msvcrt, we can't setup file handles twice */ + LdrAddRefDll( 0, hinstDLL ); TRACE("finished process init\n"); break; case DLL_THREAD_ATTACH:

1 0

Alexandre Julliard : user32: Fallback to normal icon drawing if AlphaBlend fails.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: f5f3426c878238545393ce4e95be2c75217f55ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f3426c878238545393ce4e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 29 10:47:28 2010 +0200 user32: Fallback to normal icon drawing if AlphaBlend fails. --- dlls/user32/cursoricon.c | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index e4973e3..b54d9fd 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2030,11 +2030,11 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, r.right = cxWidth; r.bottom = cxWidth; - if (!(hdc_dest = CreateCompatibleDC(hdc))) goto done; + if (!(hdc_dest = CreateCompatibleDC(hdc))) goto failed; if (!(hB_off = CreateCompatibleBitmap(hdc, cxWidth, cyWidth))) { DeleteDC( hdc_dest ); - goto done; + goto failed; } SelectObject(hdc_dest, hB_off); FillRect(hdc_dest, &r, hbr); @@ -2052,7 +2052,16 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, oldFg = SetTextColor( hdc, RGB(0,0,0) ); oldBg = SetBkColor( hdc, RGB(255,255,255) ); - if ((flags & DI_MASK) && (!ptr->alpha || !(flags & DI_IMAGE))) + if (ptr->alpha && (flags & DI_IMAGE)) + { + BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; + + SelectObject( hMemDC, ptr->alpha ); + if (GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, + 0, 0, ptr->width, ptr->height, pixelblend )) goto done; + } + + if (flags & DI_MASK) { SelectObject( hMemDC, ptr->mask ); StretchBlt( hdc_dest, x, y, cxWidth, cyWidth, @@ -2061,15 +2070,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (flags & DI_IMAGE) { - if (ptr->alpha) - { - BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; - - SelectObject( hMemDC, ptr->alpha ); - GdiAlphaBlend( hdc_dest, x, y, cxWidth, cyWidth, hMemDC, - 0, 0, ptr->width, ptr->height, pixelblend ); - } - else if (ptr->color) + if (ptr->color) { DWORD rop = (flags & DI_MASK) ? SRCINVERT : SRCCOPY; SelectObject( hMemDC, ptr->color ); @@ -2085,6 +2086,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, } } +done: if (DoOffscreen) BitBlt( hdc, x0, y0, cxWidth, cyWidth, hdc_dest, 0, 0, SRCCOPY ); SetTextColor( hdc, oldFg ); @@ -2093,7 +2095,7 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, result = TRUE; if (hdc_dest != hdc) DeleteDC( hdc_dest ); if (hB_off) DeleteObject(hB_off); -done: +failed: DeleteDC( hMemDC ); release_icon_ptr( hIcon, ptr ); return result;

1 0

Kristofer Henriksson : winemp3.acm: Update mpegl3.c copyright notice.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 39ea772ac4ececf106a82ce4af4eae1da9084fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39ea772ac4ececf106a82ce4a… Author: Kristofer Henriksson <kthenriksson(a)gmail.com> Date: Fri May 28 15:56:57 2010 -0400 winemp3.acm: Update mpegl3.c copyright notice. --- dlls/winemp3.acm/mpegl3.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 92a3afc..3c60fff 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -3,6 +3,7 @@ * * Copyright (C) 2002 Eric Pouech * Copyright (C) 2009 CodeWeavers, Aric Stewart + * Copyright (C) 2010 Kristofer Henriksson * * * This library is free software; you can redistribute it and/or

1 0

Andrew Eikum : msi: Publish icons into the correct directory.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: beb0b2bc050faeee5b6afba0bc7829d1cbbc8603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb0b2bc050faeee5b6afba0b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 28 14:52:52 2010 -0500 msi: Publish icons into the correct directory. --- dlls/msi/helpers.c | 18 +++++-- dlls/msi/tests/install.c | 129 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 139 insertions(+), 8 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 54d2199..d3f2d90 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -41,13 +41,23 @@ LPWSTR build_icon_path(MSIPACKAGE *package, LPCWSTR icon_name ) { LPWSTR SystemFolder, dest, FilePath; + static const WCHAR szMicrosoft[] = + {'M','i','c','r','o','s','o','f','t','\\',0}; static const WCHAR szInstaller[] = - {'M','i','c','r','o','s','o','f','t','\\', - 'I','n','s','t','a','l','l','e','r','\\',0}; - static const WCHAR szFolder[] = + {'I','n','s','t','a','l','l','e','r','\\',0}; + static const WCHAR szADFolder[] = {'A','p','p','D','a','t','a','F','o','l','d','e','r',0}; + static const WCHAR szWFolder[] = + {'W','i','n','d','o','w','s','F','o','l','d','e','r',0}; - SystemFolder = msi_dup_property( package->db, szFolder ); + if(package->Context == MSIINSTALLCONTEXT_MACHINE) + SystemFolder = msi_dup_property( package->db, szWFolder ); + else + { + LPWSTR ADTgt = msi_dup_property( package->db, szADFolder ); + SystemFolder = build_directory_name(2, ADTgt, szMicrosoft); + msi_free(ADTgt); + } dest = build_directory_name(3, SystemFolder, szInstaller, package->ProductCode); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f3410f6..22309c2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -30,6 +30,7 @@ #include <fci.h> #include <objidl.h> #include <srrestoreptapi.h> +#include <shlobj.h> #include "wine/test.h" @@ -56,6 +57,8 @@ static const char *mstfile = "winetest.mst"; static CHAR CURR_DIR[MAX_PATH]; static CHAR PROG_FILES_DIR[MAX_PATH]; static CHAR COMMON_FILES_DIR[MAX_PATH]; +static CHAR APP_DATA_DIR[MAX_PATH]; +static CHAR WINDOWS_DIR[MAX_PATH]; /* msi database data */ @@ -209,6 +212,28 @@ static const CHAR aup2_property_dat[] = "Property\tValue\n" "SERVNAME\tTestService\n" "SERVDISP\tTestServiceDisp\n"; +static const CHAR icon_property_dat[] = "Property\tValue\n" + "s72\tl0\n" + "Property\tProperty\n" + "DefaultUIFont\tDlgFont8\n" + "HASUIRUN\t0\n" + "INSTALLLEVEL\t3\n" + "InstallMode\tTypical\n" + "Manufacturer\tWine\n" + "PIDTemplate\t12345<###-%%%%%%%>@@@@@\n" + "ProductCode\t{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}\n" + "ProductID\tnone\n" + "ProductLanguage\t1033\n" + "ProductName\tMSITEST\n" + "ProductVersion\t1.1.1\n" + "PROMPTROLLBACKCOST\tP\n" + "Setup\tSetup\n" + "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" + "AdminProperties\tPOSTADMIN\n" + "ROOTDRIVE\tC:\\\n" + "SERVNAME\tTestService\n" + "SERVDISP\tTestServiceDisp\n"; + static const CHAR shortcut_dat[] = "Shortcut\tDirectory_\tName\tComponent_\tTarget\tArguments\tDescription\tHotkey\tIcon_\tIconIndex\tShowCmd\tWkDir\n" "s72\ts72\tl128\ts72\ts72\tS255\tL255\tI2\tS72\tI2\tI2\tS72\n" "Shortcut\tShortcut\n" @@ -2893,6 +2918,18 @@ static const msi_table fo_tables[] = ADD_TABLE(property) }; +static const msi_table icon_base_tables[] = +{ + ADD_TABLE(ci_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(pp_install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(icon_property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -3179,7 +3216,18 @@ static void create_cab_file(const CHAR *name, DWORD max_size, const CHAR *files) ok(res, "Failed to destroy the cabinet\n"); } -static BOOL get_program_files_dir(LPSTR buf, LPSTR buf2) +static BOOL get_user_dirs(void) +{ + HRESULT hres; + + hres = SHGetFolderPathA(NULL, CSIDL_APPDATA, NULL, 0, APP_DATA_DIR); + if(FAILED(hres)) + return FALSE; + + return TRUE; +} + +static BOOL get_system_dirs(void) { HKEY hkey; DWORD type, size; @@ -3189,18 +3237,22 @@ static BOOL get_program_files_dir(LPSTR buf, LPSTR buf2) return FALSE; size = MAX_PATH; - if (RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)buf, &size)) { + if (RegQueryValueExA(hkey, "ProgramFilesDir", 0, &type, (LPBYTE)PROG_FILES_DIR, &size)) { RegCloseKey(hkey); return FALSE; } size = MAX_PATH; - if (RegQueryValueExA(hkey, "CommonFilesDir", 0, &type, (LPBYTE)buf2, &size)) { + if (RegQueryValueExA(hkey, "CommonFilesDir", 0, &type, (LPBYTE)COMMON_FILES_DIR, &size)) { RegCloseKey(hkey); return FALSE; } RegCloseKey(hkey); + + if(GetWindowsDirectoryA(WINDOWS_DIR, MAX_PATH) != ERROR_SUCCESS) + return FALSE; + return TRUE; } @@ -9369,6 +9421,73 @@ static void test_register_mime_info(void) delete_test_files(); } +static void test_icon_table(void) +{ + MSIHANDLE hdb = 0, record; + LPCSTR query; + UINT res; + CHAR path[MAX_PATH]; + static const char prodcode[] = "{7DF88A49-996F-4EC8-A022-BF956F9B2CBB}"; + + create_database(msifile, icon_base_tables, sizeof(icon_base_tables) / sizeof(msi_table)); + + res = MsiOpenDatabase(msifile, MSIDBOPEN_TRANSACT, &hdb); + ok(res == ERROR_SUCCESS, "failed to open db: %d\n", res); + + query = "CREATE TABLE `Icon` (`Name` CHAR(72) NOT NULL, `Data` OBJECT NOT NULL PRIMARY KEY `Name`)"; + res = run_query( hdb, 0, query ); + ok(res == ERROR_SUCCESS, "Can't create Icon table: %d\n", res); + + create_file("icon.ico", 100); + record = MsiCreateRecord(1); + res = MsiRecordSetStream(record, 1, "icon.ico"); + ok(res == ERROR_SUCCESS, "Failed to add stream data to record: %d\n", res); + DeleteFile("icon.ico"); + + query = "INSERT INTO `Icon` (`Name`, `Data`) VALUES ('testicon', ?)"; + res = run_query(hdb, record, query); + ok(res == ERROR_SUCCESS, "Insert into Icon table failed: %d\n", res); + + res = MsiCloseHandle(record); + ok(res == ERROR_SUCCESS, "Failed to close record handle: %d\n", res); + res = MsiDatabaseCommit(hdb); + ok(res == ERROR_SUCCESS, "Failed to commit database: %d\n", res); + res = MsiCloseHandle(hdb); + ok(res == ERROR_SUCCESS, "Failed to close database: %d\n", res); + + /* per-user */ + res = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1"); + ok(res == ERROR_SUCCESS, "Failed to do per-user install: %d\n", res); + + lstrcpyA(path, APP_DATA_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, "Microsoft\\Installer\\"); + lstrcatA(path, prodcode); + lstrcatA(path, "\\testicon"); + ok(file_exists(path), "Per-user icon file isn't where it's expected (%s)\n", path); + + res = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(res == ERROR_SUCCESS, "Failed to uninstall per-user\n"); + + /* system-wide */ + res = MsiInstallProductA(msifile, "PUBLISH_PRODUCT=1 ALLUSERS=1"); + ok(res == ERROR_SUCCESS, "Failed to system-wide install: %d\n", res); + + lstrcpyA(path, WINDOWS_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, "Installer\\"); + lstrcatA(path, prodcode); + lstrcatA(path, "\\testicon"); + ok(file_exists(path), "System-wide icon file isn't where it's expected (%s)\n", path); + + res = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(res == ERROR_SUCCESS, "Failed to uninstall system-wide\n"); + + delete_pfmsitest_files(); + + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -9390,7 +9509,8 @@ START_TEST(install) if(len && (CURR_DIR[len - 1] == '\\')) CURR_DIR[len - 1] = 0; - get_program_files_dir(PROG_FILES_DIR, COMMON_FILES_DIR); + get_system_dirs(); + get_user_dirs(); /* Create a restore point ourselves so we circumvent the multitude of restore points * that would have been created by all the installation and removal tests. @@ -9479,6 +9599,7 @@ START_TEST(install) test_register_class_info(); test_register_extension_info(); test_register_mime_info(); + test_icon_table(); DeleteFileA(log_file);

1 0

Alexandre Julliard : winex11: Disable sub-pixel antialiasing if Xrender isn 't supported.
by Alexandre Julliard May 31, 2010

May 31, 2010

Module: wine Branch: master Commit: 7e23f9ce0891e006a82fafd9f172cde53f11965e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e23f9ce0891e006a82fafd9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 29 10:42:29 2010 +0200 winex11: Disable sub-pixel antialiasing if Xrender isn't supported. --- dlls/winex11.drv/xrender.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index b13f2e4..cca3321 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -988,6 +988,9 @@ static int GetCacheEntry(X11DRV_PDEVICE *physDev, LFANDSIZE *plfsz) } wine_tsx11_unlock(); } + + /* we can't support subpixel without xrender */ + if (!X11DRV_XRender_Installed && entry->aa_default > AA_Grey) entry->aa_default = AA_Grey; } else entry->aa_default = AA_None;

1 0