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

Massimo Del Fedele : gdi32: PATH_ExtTextOut remove incorrect shift to DC origin.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: a11a450e338eef01fe61b6790324699139f81bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a11a450e338eef01fe61b6790… Author: Massimo Del Fedele <max(a)veneto.com> Date: Mon Mar 30 19:51:12 2009 +0200 gdi32: PATH_ExtTextOut remove incorrect shift to DC origin. --- dlls/gdi32/path.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 195f413..19d392f 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1429,7 +1429,6 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, unsigned int idx; double cosEsc, sinEsc; LOGFONTW lf; - POINT org; HDC hdc = dc->hSelf; INT offset = 0, xoff = 0, yoff = 0; @@ -1450,8 +1449,6 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, sinEsc = 0; } - GetDCOrgEx(hdc, &org); - for (idx = 0; idx < count; idx++) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; @@ -1470,7 +1467,7 @@ BOOL PATH_ExtTextOut(DC *dc, INT x, INT y, UINT flags, const RECT *lprc, GetGlyphOutlineW(hdc, str[idx], GGO_GLYPH_INDEX | GGO_NATIVE, &gm, dwSize, outline, &identity); - PATH_add_outline(dc, org.x + x + xoff, org.x + y + yoff, outline, dwSize); + PATH_add_outline(dc, x + xoff, y + yoff, outline, dwSize); HeapFree(GetProcessHeap(), 0, outline); }

1 0

Massimo Del Fedele : gdi32: Fix PATH_add_outline when mapping mode != MM_TEXT.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: da6a94cd96c0593ae8aefda7d888354f7a8b07d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da6a94cd96c0593ae8aefda7d… Author: Massimo Del Fedele <max(a)veneto.com> Date: Mon Mar 30 19:52:02 2009 +0200 gdi32: Fix PATH_add_outline when mapping mode != MM_TEXT. --- dlls/gdi32/path.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 19d392f..88b7b0a 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1353,7 +1353,6 @@ static BOOL PATH_add_outline(DC *dc, INT x, INT y, TTPOLYGONHEADER *header, DWOR pt.x = x + int_from_fixed(header->pfxStart.x); pt.y = y - int_from_fixed(header->pfxStart.y); - LPtoDP(dc->hSelf, &pt, 1); PATH_AddEntry(pPath, &pt, PT_MOVETO); curve = (TTPOLYCURVE *)(header + 1); @@ -1372,7 +1371,6 @@ static BOOL PATH_add_outline(DC *dc, INT x, INT y, TTPOLYGONHEADER *header, DWOR { pt.x = x + int_from_fixed(curve->apfx[i].x); pt.y = y - int_from_fixed(curve->apfx[i].y); - LPtoDP(dc->hSelf, &pt, 1); PATH_AddEntry(pPath, &pt, PT_LINETO); } break; @@ -1391,13 +1389,11 @@ static BOOL PATH_add_outline(DC *dc, INT x, INT y, TTPOLYGONHEADER *header, DWOR pts[0].x = x + int_from_fixed(ptfx.x); pts[0].y = y - int_from_fixed(ptfx.y); - LPtoDP(dc->hSelf, &pts[0], 1); for(i = 0; i < curve->cpfx; i++) { pts[i + 1].x = x + int_from_fixed(curve->apfx[i].x); pts[i + 1].y = y - int_from_fixed(curve->apfx[i].y); - LPtoDP(dc->hSelf, &pts[i + 1], 1); } PATH_BezierTo(pPath, pts, curve->cpfx + 1);

1 0

Mikołaj Zalewski : kernel32: Implement QueryFullProcessImageFileNameW.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 9c9532265d6095e81ceb9c219ade9e101dff471e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9532265d6095e81ceb9c219… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Mar 29 23:36:33 2009 +0200 kernel32: Implement QueryFullProcessImageFileNameW. --- dlls/kernel32/kernel32.spec | 2 + dlls/kernel32/process.c | 53 +++++++++++++++++++++ dlls/kernel32/tests/process.c | 103 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/process.c | 2 + dlls/ntdll/tests/info.c | 1 + include/winbase.h | 5 ++ 6 files changed, 166 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c9532265d6095e81ceb9…

1 0

Igor Tarasov : comctl32: Correct handling of toolbar separators size.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 2d751ee56afced908d0788b936fa4aac1b29f1a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d751ee56afced908d0788b93… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Mon Mar 30 21:08:18 2009 +0500 comctl32: Correct handling of toolbar separators size. --- dlls/comctl32/toolbar.c | 48 +++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 92a1366..fe4c539 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1326,17 +1326,14 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) if (btnPtr[i].fsState & TBSTATE_HIDDEN) continue; - /* UNDOCUMENTED: If a separator has a non zero bitmap index, */ - /* it is the actual width of the separator. This is used for */ - /* custom controls in toolbars. */ - /* */ + if (btnPtr[i].cx > 0) + cx = btnPtr[i].cx; /* horizontal separators are treated as buttons for width */ - if ((btnPtr[i].fsStyle & BTNS_SEP) && + else if ((btnPtr[i].fsStyle & BTNS_SEP) && !(infoPtr->dwStyle & CCS_VERT)) - cx = (btnPtr[i].iBitmap > 0) ? - btnPtr[i].iBitmap : SEPARATOR_WIDTH; + cx = SEPARATOR_WIDTH; else - cx = (btnPtr[i].cx) ? btnPtr[i].cx : infoPtr->nButtonWidth; + cx = infoPtr->nButtonWidth; /* Two or more adjacent separators form a separator group. */ /* The first separator in a group should be wrapped to the */ @@ -1684,18 +1681,13 @@ TOOLBAR_LayoutToolbar(HWND hwnd) cy = infoPtr->nButtonHeight; - /* UNDOCUMENTED: If a separator has a non zero bitmap index, */ - /* it is the actual width of the separator. This is used for */ - /* custom controls in toolbars. */ if (btnPtr->fsStyle & BTNS_SEP) { if (infoPtr->dwStyle & CCS_VERT) { - cy = (btnPtr->iBitmap > 0) ? - btnPtr->iBitmap : SEPARATOR_WIDTH; - cx = infoPtr->nButtonWidth; + cy = SEPARATOR_WIDTH; + cx = (btnPtr->cx > 0) ? btnPtr->cx : infoPtr->nButtonWidth; } else - cx = (btnPtr->iBitmap > 0) ? - btnPtr->iBitmap : SEPARATOR_WIDTH; + cx = (btnPtr->cx > 0) ? btnPtr->cx : SEPARATOR_WIDTH; } else { @@ -1758,12 +1750,9 @@ TOOLBAR_LayoutToolbar(HWND hwnd) y += cy; else { - /* UNDOCUMENTED: If a separator has a non zero bitmap index, */ - /* it is the actual width of the separator. This is used for */ - /* custom controls in toolbars. */ if ( !(infoPtr->dwStyle & CCS_VERT)) - y += cy + ( (btnPtr->iBitmap > 0 ) ? - btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3; + y += cy + ( (btnPtr->cx > 0 ) ? + btnPtr->cx : SEPARATOR_WIDTH) * 2 /3; else y += cy; @@ -1845,7 +1834,12 @@ TOOLBAR_InternalInsertButtonsT(TOOLBAR_INFO *infoPtr, INT iIndex, UINT nAddButto TOOLBAR_DumpTBButton(lpTbb, fUnicode); ZeroMemory(btnPtr, sizeof(*btnPtr)); - btnPtr->iBitmap = lpTbb[iButton].iBitmap; + + /* When inserting separator, iBitmap controls it's size */ + if (lpTbb[iButton].fsStyle & BTNS_SEP) { + btnPtr->cx = lpTbb[iButton].iBitmap; + } else + btnPtr->iBitmap = lpTbb[iButton].iBitmap; btnPtr->idCommand = lpTbb[iButton].idCommand; btnPtr->fsState = lpTbb[iButton].fsState; btnPtr->fsStyle = lpTbb[iButton].fsStyle; @@ -3400,7 +3394,11 @@ TOOLBAR_GetButtonInfoT(HWND hwnd, WPARAM wParam, LPARAM lParam, BOOL bUnicode) if (lpTbInfo->dwMask & TBIF_LPARAM) lpTbInfo->lParam = btnPtr->dwData; if (lpTbInfo->dwMask & TBIF_SIZE) - lpTbInfo->cx = (WORD)(btnPtr->rect.right - btnPtr->rect.left); + /* tests show that for separators TBIF_SIZE returns not calculated width, + but cx property, that differs from 0 only if application have + specifically set it */ + lpTbInfo->cx = (btnPtr->fsStyle & BTNS_SEP) + ? btnPtr->cx : (WORD)(btnPtr->rect.right - btnPtr->rect.left); if (lpTbInfo->dwMask & TBIF_STATE) lpTbInfo->fsState = btnPtr->fsState; if (lpTbInfo->dwMask & TBIF_STYLE) @@ -4240,7 +4238,9 @@ TOOLBAR_Restore(TOOLBAR_INFO *infoPtr, const TBSAVEPARAMSW *lpSave) { /* separator */ nmtbr.tbButton.fsStyle = TBSTYLE_SEP; - nmtbr.tbButton.iBitmap = SEPARATOR_WIDTH; + /* when inserting separators, iBitmap controls it's size. + 0 sets default size (width) */ + nmtbr.tbButton.iBitmap = 0; } else if (*nmtbr.pCurrent == (DWORD)-2) /* hidden button */

1 0

Nikolay Sivov : rpcrt4: Implemented RpcEpRegisterW wrapping RpcEpRegisterA.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: fd3b57c53a3cd042e169eb627b6514e08389159b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3b57c53a3cd042e169eb627… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Mar 30 15:43:58 2009 -0400 rpcrt4: Implemented RpcEpRegisterW wrapping RpcEpRegisterA. --- dlls/rpcrt4/rpc_epmap.c | 15 +++++++++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 3035b21..c7eb222 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -281,6 +281,21 @@ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bind } /*********************************************************************** + * RpcEpRegisterW (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcEpRegisterW( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, + UUID_VECTOR *UuidVector, RPC_WSTR Annotation ) +{ + LPSTR annA = RPCRT4_strdupWtoA(Annotation); + RPC_STATUS status; + + status = RpcEpRegisterA(IfSpec, BindingVector, UuidVector, (RPC_CSTR)annA); + + HeapFree(GetProcessHeap(), 0, annA); + return status; +} + +/*********************************************************************** * RpcEpUnregister (RPCRT4.@) */ RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 8c01c84..b8349be 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -371,7 +371,7 @@ @ stdcall RpcEpRegisterA(ptr ptr ptr str) @ stub RpcEpRegisterNoReplaceA @ stub RpcEpRegisterNoReplaceW -@ stub RpcEpRegisterW +@ stdcall RpcEpRegisterW(ptr ptr ptr wstr) @ stdcall RpcEpResolveBinding(ptr ptr) @ stdcall RpcEpUnregister(ptr ptr ptr) @ stub RpcErrorAddRecord # wxp

1 0

Michael Stefaniuc : credui: Add the Romanian translation.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 9f3055e192901e31a6386777b2d3d3d49d2ca99e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3055e192901e31a6386777b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 31 00:17:47 2009 +0200 credui: Add the Romanian translation. --- dlls/credui/credui.rc | 1 + dlls/credui/credui_Ro.rc | 53 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index d144fd2..f66a942 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -38,6 +38,7 @@ IDB_BANNER BITMAP LOADONCALL DISCARDABLE banner.bmp #include "credui_No.rc" #include "credui_Pl.rc" #include "credui_Pt.rc" +#include "credui_Ro.rc" #include "credui_Ru.rc" #include "credui_Si.rc" #include "credui_Sv.rc" diff --git a/dlls/credui/credui_Ro.rc b/dlls/credui/credui_Ro.rc new file mode 100644 index 0000000..73a1140 --- /dev/null +++ b/dlls/credui/credui_Ro.rc @@ -0,0 +1,53 @@ +/* + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2009 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_CREDDIALOG DIALOG DISCARDABLE 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "Nume &utilizator:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&Parolă:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "Ține minte pa&rola",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "OK",IDOK,97,128,50,14 + PUSHBUTTON "Renunță",IDCANCEL,156,128,50,14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_TITLEFORMAT "Conectare la %s" + IDS_MESSAGEFORMAT "Conectez la %s" + IDS_INCORRECTPASSWORDTITLE "Autentificare eșuată" + IDS_INCORRECTPASSWORD "Verificați numele de utilizator și parola." + IDS_CAPSLOCKONTITLE "Tasta Caps Lock este activată" + IDS_CAPSLOCKON "Cu tasta Caps Lock activată este foarte probabil că veți introduce parola greșit. \n\nInainte de a introduce parola apăsați tasta Caps Lock pentru a dezactiva scrierea cu majuscule." +} + +#pragma code_page(default)

1 0

Jacek Caban : urlmon.idl: Added PROTOCOLFILTERDATA declaration.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 1929bfb98f08f27623ce4ebe259fca13c3c411cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1929bfb98f08f27623ce4ebe2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 31 02:42:46 2009 +0200 urlmon.idl: Added PROTOCOLFILTERDATA declaration. --- include/urlmon.idl | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index a3dd39a..3a31452 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1367,6 +1367,14 @@ typedef enum _tagINTERNETFEATURELIST FEATURE_ENTRY_COUNT } INTERNETFEATURELIST; +typedef struct _tagPROTOCOLFILTERDATA { + DWORD cbSize; + IInternetProtocolSink *pProtocolSink; + IInternetProtocol *pProtocol; + IUnknown *pUnk; + DWORD dwFilterFlags; +} PROTOCOLFILTERDATA; + /***************************************************************************** * IUri interface */

1 0

Damjan Jovanovic : winemenubuilder: Use the user-dirs desktop directory instead of hardcoding ~/Desktop.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 612d47d3b573d19b3d8f195a8e70d8b718d2addf URL: http://source.winehq.org/git/wine.git/?a=commit;h=612d47d3b573d19b3d8f195a8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Mar 30 20:06:31 2009 +0200 winemenubuilder: Use the user-dirs desktop directory instead of hardcoding ~/Desktop. --- programs/winemenubuilder/winemenubuilder.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0c42b30..96d3c0f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -146,6 +146,7 @@ typedef struct static char *xdg_config_dir; static char *xdg_data_dir; +static char *xdg_desktop_dir; /* Icon extraction routines * @@ -1382,7 +1383,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) lastEntry = link_name; else ++lastEntry; - location = heap_printf("%s/Desktop/%s.desktop", getenv("HOME"), lastEntry); + location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { r = !write_desktop_entry(location, lastEntry, escaped_path, escaped_args, escaped_description, work_dir, icon_name); @@ -1464,7 +1465,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link lastEntry = link_name; else ++lastEntry; - location = heap_printf("%s/Desktop/%s.desktop", getenv("HOME"), lastEntry); + location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { r = !write_desktop_entry(location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, NULL); @@ -1705,6 +1706,16 @@ static CHAR *next_token( LPSTR *p ) static BOOL init_xdg(void) { + WCHAR shellDesktopPath[MAX_PATH]; + HRESULT hr = SHGetFolderPathW(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, shellDesktopPath); + if (SUCCEEDED(hr)) + xdg_desktop_dir = wine_get_unix_file_name(shellDesktopPath); + if (xdg_desktop_dir == NULL) + { + WINE_ERR("error looking up the desktop directory\n"); + return FALSE; + } + if (getenv("XDG_CONFIG_HOME")) xdg_config_dir = heap_printf("%s/menus/applications-merged", getenv("XDG_CONFIG_HOME")); else @@ -1730,6 +1741,7 @@ static BOOL init_xdg(void) } HeapFree(GetProcessHeap(), 0, xdg_config_dir); } + WINE_ERR("out of memory\n"); return FALSE; } @@ -1744,7 +1756,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show BOOL bURL = FALSE; int ret = 0; - init_xdg(); + if (!init_xdg()) + return 1; for( p = cmdline; p && *p; ) {

1 0

Hans Leidekker : msi: Don' t publish package name as part of product properties.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: 965698cd28812178370546549edc97beb12e71e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965698cd28812178370546549… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 31 11:31:01 2009 +0200 msi: Don't publish package name as part of product properties. This value does not exist directly under the product key on Windows. --- dlls/msi/action.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 92b95df..948cf4a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3559,9 +3559,6 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) langid = msi_get_property_int(package, szProductLanguage, 0); msi_reg_set_val_dword(hkey, INSTALLPROPERTY_LANGUAGEW, langid); - ptr = strrchrW(package->PackagePath, '\\' ) + 1; - msi_reg_set_val_str(hkey, INSTALLPROPERTY_PACKAGENAMEW, ptr); - /* FIXME */ msi_reg_set_val_dword(hkey, INSTALLPROPERTY_AUTHORIZED_LUA_APPW, 0);

1 0

Hans Leidekker : msi: Build a proper source path in MsiConfigureProductExW.
by Alexandre Julliard 31 Mar '09

31 Mar '09

Module: wine Branch: master Commit: e3b558887d353ceadd952d148d59e98ae07127d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3b558887d353ceadd952d148… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 31 11:31:28 2009 +0200 msi: Build a proper source path in MsiConfigureProductExW. We were passing uninitialized data which would ultimately end up in the registry. --- dlls/msi/msi.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 445d135..90c7ba6 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -476,7 +476,7 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, MSIINSTALLCONTEXT context; UINT r; DWORD sz; - WCHAR sourcepath[MAX_PATH]; + WCHAR sourcepath[MAX_PATH], filename[MAX_PATH]; LPWSTR commandline; static const WCHAR szInstalled[] = { @@ -538,6 +538,16 @@ UINT WINAPI MsiConfigureProductExW(LPCWSTR szProduct, int iInstallLevel, if (context == MSIINSTALLCONTEXT_MACHINE) lstrcatW(commandline, szMachine); + sz = sizeof(sourcepath); + MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); + + sz = sizeof(filename); + MsiSourceListGetInfoW(szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); + + strcatW(sourcepath, filename); + r = MSI_InstallPackage( package, sourcepath, commandline ); msi_free(commandline);

1 0