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

André Hentschel : winemaker: Remove unnecessary quote filtering.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 925b1448bcd866977b7a3571d1c890618dfbe98e URL: http://source.winehq.org/git/wine.git/?a=commit;h=925b1448bcd866977b7a3571d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 1 11:37:13 2009 +0200 winemaker: Remove unnecessary quote filtering. --- tools/winemaker | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 55fc6f1..8170720 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1118,10 +1118,9 @@ sub source_scan_workspace_file($) s/\r\n$/\n/; # catch a project definition - if (/^Project:\s\"(.*)\"=\"?(.*)\s-/) { + if (/^Project:\s\"(.*)\"=(.*)\s-/) { $prj_name=$1; $prj_path=$2; - $prj_path=~s/\"$//; @components=split /[\/\\]+/, $prj_path; $prj_path=search_from($path, \@components); print "Name: $prj_name\nPath: $prj_path\n";

1 0

Rein Klazes : user32/tests: Fix a test in edit. c that was not testing what it was supposed to test.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 3e7f22698549515cdff8c40e77054b28bbd06121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e7f22698549515cdff8c40e7… Author: Rein Klazes <wijn(a)online.nl> Date: Fri May 1 10:57:32 2009 +0200 user32/tests: Fix a test in edit.c that was not testing what it was supposed to test. --- dlls/user32/tests/edit.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index ecc50ab..8bcd634 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1177,9 +1177,13 @@ static void test_edit_control_4(void) static void test_edit_control_5(void) { static const char *str = "test\r\ntest"; + HWND parentWnd; HWND hWnd; int len; + RECT rc1 = { 10, 10, 11, 11}; + RECT rc; + /* first show that a non-child won't do for this test */ hWnd = CreateWindowEx(0, "EDIT", str, @@ -1187,19 +1191,48 @@ static void test_edit_control_5(void) 10, 10, 1, 1, NULL, NULL, NULL, NULL); assert(hWnd); - + /* size of non-child edit control is (much) bigger then requested */ + GetWindowRect( hWnd, &rc); + ok( rc.right - rc.left > 20, "size of the window (%d) is smaller then expected\n", + rc.right - rc.left); + DestroyWindow(hWnd); + /* so create a parent, and give it edit controls children to test with */ + parentWnd = CreateWindowEx(0, + szEditTextPositionClass, + "Edit Test", WS_VISIBLE | + WS_OVERLAPPEDWINDOW, + CW_USEDEFAULT, CW_USEDEFAULT, + 250, 250, + NULL, NULL, hinst, NULL); + assert(parentWnd); + ShowWindow( parentWnd, SW_SHOW); + /* single line */ + hWnd = CreateWindowEx(0, + "EDIT", + str, WS_VISIBLE | WS_BORDER | + WS_CHILD, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); + assert(hWnd); + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size (%d,%d,%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom); len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); DestroyWindow(hWnd); - + /* multi line */ hWnd = CreateWindowEx(0, "EDIT", str, - ES_MULTILINE, - 10, 10, 1, 1, - NULL, NULL, NULL, NULL); + WS_CHILD | ES_MULTILINE, + rc1.left, rc1.top, rc1.right - rc1.left, rc1.bottom - rc1.top, + parentWnd, NULL, NULL, NULL); assert(hWnd); - + GetClientRect( hWnd, &rc); + ok( rc.right == rc1.right - rc1.left && rc.bottom == rc1.bottom - rc1.top, + "Client rectangle not the expected size (%d,%d,%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom); len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); DestroyWindow(hWnd);

1 0

Vincent Povirk : winex11.drv: Convert image/bmp X selections to Windows DIB .
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 272e2d2251c705ebed38692e888e84d0153613a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272e2d2251c705ebed38692e8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 24 17:19:38 2009 -0500 winex11.drv: Convert image/bmp X selections to Windows DIB. --- dlls/winex11.drv/clipboard.c | 53 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index bb29b82..5a042f6 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -151,6 +151,7 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *d, Window w, Atom pr static HANDLE X11DRV_CLIPBOARD_ImportEnhMetaFile(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportMetaFilePict(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *d, Window w, Atom prop); +static HANDLE X11DRV_CLIPBOARD_ImportImageBmp(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportXAString(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportUTF8(Display *d, Window w, Atom prop); static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *d, Window w, Atom prop); @@ -192,6 +193,7 @@ static const WCHAR wszCF_DIF[] = {'W','C','F','_','D','I','F',0}; static const WCHAR wszCF_TIFF[] = {'W','C','F','_','T','I','F','F',0}; static const WCHAR wszCF_OEMTEXT[] = {'W','C','F','_','O','E','M','T','E','X','T',0}; static const WCHAR wszCF_DIB[] = {'W','C','F','_','D','I','B',0}; +static const WCHAR wszIMAGEBMP[] = {'i','m','a','g','e','/','b','m','p',0}; static const WCHAR wszCF_PALETTE[] = {'W','C','F','_','P','A','L','E','T','T','E',0}; static const WCHAR wszCF_PENDATA[] = {'W','C','F','_','P','E','N','D','A','T','A',0}; static const WCHAR wszCF_RIFF[] = {'W','C','F','_','R','I','F','F',0}; @@ -278,7 +280,10 @@ static WINE_CLIPFORMAT ClipFormats[] = X11DRV_CLIPBOARD_ExportClipboardData, &ClipFormats[20], &ClipFormats[22]}, { CF_DSPENHMETAFILE, wszCF_DSPENHMETAFILE, 0, CF_FLAG_BUILTINFMT, X11DRV_CLIPBOARD_ImportClipboardData, - X11DRV_CLIPBOARD_ExportClipboardData, &ClipFormats[21], NULL} + X11DRV_CLIPBOARD_ExportClipboardData, &ClipFormats[21], &ClipFormats[23]}, + + { CF_DIB, wszIMAGEBMP, 0, CF_FLAG_BUILTINFMT, X11DRV_CLIPBOARD_ImportImageBmp, + NULL, &ClipFormats[22], NULL}, }; #define GET_ATOM(prop) (((prop) < FIRST_XATOM) ? (Atom)(prop) : X11DRV_Atoms[(prop) - FIRST_XATOM]) @@ -1318,6 +1323,52 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p /************************************************************************** + * X11DRV_CLIPBOARD_ImportImageBmp + * + * Import image/bmp, converting the image to CF_DIB. + */ +static HANDLE X11DRV_CLIPBOARD_ImportImageBmp(Display *display, Window w, Atom prop) +{ + LPBYTE lpdata; + unsigned long cbytes; + HANDLE hClipData = 0; + + if (X11DRV_CLIPBOARD_ReadProperty(display, w, prop, &lpdata, &cbytes)) + { + BITMAPFILEHEADER *bfh = (BITMAPFILEHEADER*)lpdata; + + if (cbytes >= sizeof(BITMAPFILEHEADER)+sizeof(BITMAPCOREHEADER) && + bfh->bfType == 0x4d42 /* "BM" */) + { + BITMAPINFO *bmi = (BITMAPINFO*)(bfh+1); + HBITMAP hbmp; + HDC hdc; + + hdc = GetDC(0); + hbmp = CreateDIBitmap( + hdc, + &(bmi->bmiHeader), + CBM_INIT, + lpdata+bfh->bfOffBits, + bmi, + DIB_RGB_COLORS + ); + + hClipData = X11DRV_DIB_CreateDIBFromBitmap(hdc, hbmp); + + DeleteObject(hbmp); + ReleaseDC(0, hdc); + } + + /* Free the retrieved property data */ + HeapFree(GetProcessHeap(), 0, lpdata); + } + + return hClipData; +} + + +/************************************************************************** * X11DRV_CLIPBOARD_ImportMetaFilePict * * Import MetaFilePict.

1 0

Nikolay Sivov : comctl32/listview: Remove wrong TODO entry.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: ebeabf11d39903bbecbcfbbcc6ce1479071832de URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebeabf11d39903bbecbcfbbcc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 1 16:26:21 2009 +0400 comctl32/listview: Remove wrong TODO entry. --- dlls/comctl32/listview.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 169c242..28dce02 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -142,7 +142,6 @@ * -- ListView_GetHoverTime, ListView_SetHoverTime * -- ListView_GetISearchString * -- ListView_GetNumberOfWorkAreas - * -- ListView_GetOrigin * -- ListView_GetUnicodeFormat, ListView_SetUnicodeFormat * -- ListView_GetWorkAreas, ListView_SetWorkAreas *

1 0

Rein Klazes : comdlg32: Implement OFN_ENABLESIZING flag for GetOpenFileName and friends.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: dd16b91a87c91de56a93d5e3dae4de78e3e6f411 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd16b91a87c91de56a93d5e3d… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 30 08:06:50 2009 +0200 comdlg32: Implement OFN_ENABLESIZING flag for GetOpenFileName and friends. --- dlls/comdlg32/filedlg.c | 161 +++++++++++++++++++++++++++++++++++++++- dlls/comdlg32/filedlgbrowser.h | 3 + 2 files changed, 162 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 8c8e230..b423942 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -37,7 +37,6 @@ * FIXME: add to recent docs * * FIXME: flags not implemented: OFN_DONTADDTORECENT, - * OFN_ENABLESIZING, * OFN_NODEREFERENCELINKS, OFN_NOREADONLYRETURN, * OFN_NOTESTFILECREATE, OFN_USEMONIKERS * @@ -82,7 +81,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #define UNIMPLEMENTED_FLAGS \ -(OFN_DONTADDTORECENT | OFN_ENABLESIZING |\ +(OFN_DONTADDTORECENT |\ OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\ OFN_NOTESTFILECREATE /*| OFN_USEMONIKERS*/) @@ -271,6 +270,13 @@ static BOOL GetFileName95(FileOpenDlgInfos *fodInfos) return FALSE; } + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { + ((LPDLGTEMPLATEW)template)->style |= WS_SIZEBOX; + fodInfos->sizedlg.cx = fodInfos->sizedlg.cy = 0; + fodInfos->initial_size.x = fodInfos->initial_size.y = 0; + } + /* old style hook messages */ if (IsHooked(fodInfos)) { @@ -979,6 +985,125 @@ static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM } /*********************************************************************** + * FILEDLG95_OnWMGetMMI + * + * WM_GETMINMAXINFO message handler for resizable dialogs + */ +static LRESULT FILEDLG95_OnWMGetMMI( HWND hwnd, LPMINMAXINFO mmiptr) +{ + FileOpenDlgInfos *fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); + if( !(fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)) return FALSE; + if( fodInfos->initial_size.x || fodInfos->initial_size.y) + { + mmiptr->ptMinTrackSize = fodInfos->initial_size; + } + return TRUE; +} + +/*********************************************************************** + * FILEDLG95_OnWMSize + * + * WM_SIZE message handler, resize the dialog. Re-arrange controls. + * + * FIXME: this could be made more elaborate. Now use a simple scheme + * where the file view is enlarged and the controls are either moved + * vertically or horizontally to get out of the way. Only the "grip" + * is moved in both directions to stay in the corner. + */ +static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) +{ + RECT rc, rcview; + int chgx, chgy; + HWND ctrl; + HDWP hdwp; + FileOpenDlgInfos *fodInfos; + + if( wParam != SIZE_RESTORED) return FALSE; + fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); + if( !(fodInfos->ofnInfos->Flags & OFN_ENABLESIZING)) return FALSE; + /* get the new dialog rectangle */ + GetWindowRect( hwnd, &rc); + /* not initialized yet */ + if( (fodInfos->sizedlg.cx == 0 && fodInfos->sizedlg.cy == 0) || + ((fodInfos->sizedlg.cx == rc.right -rc.left) && /* no change */ + (fodInfos->sizedlg.cy == rc.bottom -rc.top))) + return FALSE; + chgx = rc.right - rc.left - fodInfos->sizedlg.cx; + chgy = rc.bottom - rc.top - fodInfos->sizedlg.cy; + fodInfos->sizedlg.cx = rc.right - rc.left; + fodInfos->sizedlg.cy = rc.bottom - rc.top; + /* change the size of the view window */ + GetWindowRect( fodInfos->ShellInfos.hwndView, &rcview); + MapWindowPoints( NULL, hwnd, (LPPOINT) &rcview, 2); + hdwp = BeginDeferWindowPos( 10); + DeferWindowPos( hdwp, fodInfos->ShellInfos.hwndView, NULL, 0, 0, + rcview.right - rcview.left + chgx, + rcview.bottom - rcview.top + chgy, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + /* change position and sizes of the controls */ + for( ctrl = GetWindow( hwnd, GW_CHILD); ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT)) + { + GetWindowRect( ctrl, &rc); + MapWindowPoints( NULL, hwnd, (LPPOINT) &rc, 2); + if( ctrl == fodInfos->DlgInfos.hwndGrip) + { + DeferWindowPos( hdwp, ctrl, NULL, rc.left + chgx, rc.top + chgy, + 0, 0, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + else if( rc.top > rcview.bottom) + { + /* if it was below the shell view + * move to bottom */ + DeferWindowPos( hdwp, ctrl, NULL, rc.left, rc.top + chgy, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + else if( rc.left > rcview.right) + { + /* if it was to the right of the shell view + * move to right */ + DeferWindowPos( hdwp, ctrl, NULL, rc.left + chgx, rc.top, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + } + if(fodInfos->DlgInfos.hwndCustomDlg && + (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))) + { + GetClientRect(hwnd, &rc); + DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL, + 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); + for( ctrl = GetWindow( fodInfos->DlgInfos.hwndCustomDlg, GW_CHILD); + ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT)) + { + GetWindowRect( ctrl, &rc); + MapWindowPoints( NULL, hwnd, (LPPOINT) &rc, 2); + if( rc.top > rcview.bottom) + { + /* if it was below the shell view + * move to bottom */ + DeferWindowPos( hdwp, ctrl, NULL, rc.left, rc.top + chgy, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + else if( rc.left > rcview.right) + { + /* if it was to the right of the shell view + * move to right */ + DeferWindowPos( hdwp, ctrl, NULL, rc.left + chgx, rc.top, + rc.right - rc.left, rc.bottom - rc.top, + SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + } + } + EndDeferWindowPos( hdwp); + /* should not be needed */ + RedrawWindow( hwnd, NULL, 0, RDW_ALLCHILDREN | RDW_INVALIDATE ); + return TRUE; +} + +/*********************************************************************** * FileOpenDlgProc95 * * File open dialog procedure @@ -994,6 +1119,9 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l case WM_INITDIALOG: { FileOpenDlgInfos * fodInfos = (FileOpenDlgInfos *)lParam; + RECT rc; + int gripx = GetSystemMetrics( SM_CYHSCROLL); + int gripy = GetSystemMetrics( SM_CYVSCROLL); /* Adds the FileOpenDlgInfos in the property list of the dialog so it will be easily accessible through a GetPropA(...) */ @@ -1001,17 +1129,46 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l FILEDLG95_InitControls(hwnd); + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { + GetWindowRect( hwnd, &rc); + fodInfos->DlgInfos.hwndGrip = + CreateWindowExA( 0, "SCROLLBAR", NULL, + WS_CHILD | WS_GROUP | WS_VISIBLE | WS_CLIPSIBLINGS | + SBS_SIZEGRIP | SBS_SIZEBOXBOTTOMRIGHTALIGN, + rc.right - gripx, rc.bottom - gripy, + gripx, gripy, hwnd, (HMENU) -1, COMDLG32_hInstance, NULL); + } + fodInfos->DlgInfos.hwndCustomDlg = CreateTemplateDialog((FileOpenDlgInfos *)lParam, hwnd); FILEDLG95_ResizeControls(hwnd, wParam, lParam); FILEDLG95_FillControls(hwnd, wParam, lParam); + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + { + GetWindowRect( hwnd, &rc); + /* FIXME: should remember sizes of last invocation */ + fodInfos->sizedlg.cx = rc.right - rc.left; + fodInfos->sizedlg.cy = rc.bottom - rc.top; + fodInfos->initial_size.x = fodInfos->sizedlg.cx; + fodInfos->initial_size.y = fodInfos->sizedlg.cy; + GetClientRect( hwnd, &rc); + SetWindowPos( fodInfos->DlgInfos.hwndGrip, NULL, + rc.right - gripx, rc.bottom - gripy, + 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + } + SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); return 0; } + case WM_SIZE: + return FILEDLG95_OnWMSize(hwnd, wParam, lParam); + case WM_GETMINMAXINFO: + return FILEDLG95_OnWMGetMMI( hwnd, (LPMINMAXINFO)lParam); case WM_COMMAND: return FILEDLG95_OnWMCommand(hwnd, wParam, lParam); case WM_DRAWITEM: diff --git a/dlls/comdlg32/filedlgbrowser.h b/dlls/comdlg32/filedlgbrowser.h index f8da75e..ca332ec 100644 --- a/dlls/comdlg32/filedlgbrowser.h +++ b/dlls/comdlg32/filedlgbrowser.h @@ -58,6 +58,8 @@ typedef struct LPCWSTR defext; LPCWSTR filter; LPCWSTR customfilter; + SIZE sizedlg; /* remember the size of the dialog */ + POINT initial_size; /* remember the initial size of the dialog */ struct { IShellBrowser *FOIShellBrowser; IShellFolder *FOIShellFolder; @@ -78,6 +80,7 @@ typedef struct HWND hwndLookInCB; HWND hwndFileName; HWND hwndTB; + HWND hwndGrip; HWND hwndCustomDlg; DWORD dwDlgProp; } DlgInfos;

1 0

Hans Leidekker : msi: Implement MsiApplyMultiplePatchesA/W.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: b4b8bc830f7b9cb370f2d0e0c2ff04e4c70315d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4b8bc830f7b9cb370f2d0e0c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 1 15:06:53 2009 +0200 msi: Implement MsiApplyMultiplePatchesA/W. --- dlls/msi/msi.c | 150 ++++++++++++++++++++++++++++++++++++---------- dlls/msi/msi.spec | 4 +- dlls/msi/tests/package.c | 33 ++++++++++ include/msi.h | 4 + 4 files changed, 158 insertions(+), 33 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index bee45b0..43436bd 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -301,13 +301,13 @@ done: return r; } -UINT WINAPI MsiApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szInstallPackage, - INSTALLTYPE eInstallType, LPCWSTR szCommandLine) +static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWSTR szCommandLine) { MSIHANDLE patch, info; UINT r, type; DWORD size = 0; LPCWSTR cmd_ptr = szCommandLine; + LPCWSTR product_code = szProductCode; LPWSTR beg, end; LPWSTR cmd = NULL, codes = NULL; @@ -315,41 +315,36 @@ UINT WINAPI MsiApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szInstallPackage, static const WCHAR patcheq[] = {'P','A','T','C','H','=',0}; static WCHAR empty[] = {0}; - TRACE("%s %s %d %s\n", debugstr_w(szPatchPackage), debugstr_w(szInstallPackage), - eInstallType, debugstr_w(szCommandLine)); - - if (szInstallPackage || eInstallType == INSTALLTYPE_NETWORK_IMAGE || - eInstallType == INSTALLTYPE_SINGLE_INSTANCE) + if (!szProductCode) { - FIXME("Only reading target products from patch\n"); - return ERROR_CALL_NOT_IMPLEMENTED; - } + r = MsiOpenDatabaseW(szPatchPackage, MSIDBOPEN_READONLY, &patch); + if (r != ERROR_SUCCESS) + return r; - r = MsiOpenDatabaseW(szPatchPackage, MSIDBOPEN_READONLY, &patch); - if (r != ERROR_SUCCESS) - return r; + r = MsiGetSummaryInformationW(patch, NULL, 0, &info); + if (r != ERROR_SUCCESS) + goto done; - r = MsiGetSummaryInformationW(patch, NULL, 0, &info); - if (r != ERROR_SUCCESS) - goto done; + r = MsiSummaryInfoGetPropertyW(info, PID_TEMPLATE, &type, NULL, NULL, empty, &size); + if (r != ERROR_MORE_DATA || !size || type != VT_LPSTR) + { + ERR("Failed to read product codes from patch\n"); + goto done; + } - r = MsiSummaryInfoGetPropertyW(info, PID_TEMPLATE, &type, NULL, NULL, empty, &size); - if (r != ERROR_MORE_DATA || !size || type != VT_LPSTR) - { - ERR("Failed to read product codes from patch\n"); - goto done; - } + codes = msi_alloc(++size * sizeof(WCHAR)); + if (!codes) + { + r = ERROR_OUTOFMEMORY; + goto done; + } - codes = msi_alloc(++size * sizeof(WCHAR)); - if (!codes) - { - r = ERROR_OUTOFMEMORY; - goto done; - } + r = MsiSummaryInfoGetPropertyW(info, PID_TEMPLATE, &type, NULL, NULL, codes, &size); + if (r != ERROR_SUCCESS) + goto done; - r = MsiSummaryInfoGetPropertyW(info, PID_TEMPLATE, &type, NULL, NULL, codes, &size); - if (r != ERROR_SUCCESS) - goto done; + product_code = codes; + } if (!szCommandLine) cmd_ptr = empty; @@ -389,6 +384,99 @@ done: return r; } +UINT WINAPI MsiApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szInstallPackage, + INSTALLTYPE eInstallType, LPCWSTR szCommandLine) +{ + TRACE("%s %s %d %s\n", debugstr_w(szPatchPackage), debugstr_w(szInstallPackage), + eInstallType, debugstr_w(szCommandLine)); + + if (szInstallPackage || eInstallType == INSTALLTYPE_NETWORK_IMAGE || + eInstallType == INSTALLTYPE_SINGLE_INSTANCE) + { + FIXME("Only reading target products from patch\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + return MSI_ApplyPatchW(szPatchPackage, NULL, szCommandLine); +} + +UINT WINAPI MsiApplyMultiplePatchesA(LPCSTR szPatchPackages, + LPCSTR szProductCode, LPCSTR szPropertiesList) +{ + LPWSTR patch_packages = NULL; + LPWSTR product_code = NULL; + LPWSTR properties_list = NULL; + UINT r = ERROR_OUTOFMEMORY; + + TRACE("%s %s %s\n", debugstr_a(szPatchPackages), debugstr_a(szProductCode), + debugstr_a(szPropertiesList)); + + if (!szPatchPackages || !szPatchPackages[0]) + return ERROR_INVALID_PARAMETER; + + if (!(patch_packages = strdupAtoW(szPatchPackages))) + return ERROR_OUTOFMEMORY; + + if (szProductCode && !(product_code = strdupAtoW(szProductCode))) + goto done; + + if (szPropertiesList && !(properties_list = strdupAtoW(szPropertiesList))) + goto done; + + r = MsiApplyMultiplePatchesW(patch_packages, product_code, properties_list); + +done: + msi_free(patch_packages); + msi_free(product_code); + msi_free(properties_list); + + return r; +} + +UINT WINAPI MsiApplyMultiplePatchesW(LPCWSTR szPatchPackages, + LPCWSTR szProductCode, LPCWSTR szPropertiesList) +{ + UINT r = ERROR_SUCCESS; + LPCWSTR beg, end; + + TRACE("%s %s %s\n", debugstr_w(szPatchPackages), debugstr_w(szProductCode), + debugstr_w(szPropertiesList)); + + if (!szPatchPackages || !szPatchPackages[0]) + return ERROR_INVALID_PARAMETER; + + beg = end = szPatchPackages; + while (*beg) + { + DWORD len; + LPWSTR patch; + + while (*beg == ' ') beg++; + while (*end && *end != ';') end++; + + len = end - beg; + while (len && beg[len - 1] == ' ') len--; + + if (!len) return ERROR_INVALID_NAME; + + patch = msi_alloc((len + 1) * sizeof(WCHAR)); + if (!patch) + return ERROR_OUTOFMEMORY; + + memcpy(patch, beg, len * sizeof(WCHAR)); + patch[len] = '\0'; + + r = MSI_ApplyPatchW(patch, szProductCode, szPropertiesList); + msi_free(patch); + + if (r != ERROR_SUCCESS) + break; + + beg = ++end; + } + return r; +} + UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR szProductPackagePath, DWORD cPatchInfo, PMSIPATCHSEQUENCEINFOA pPatchInfo) { diff --git a/dlls/msi/msi.spec b/dlls/msi/msi.spec index 14178e8..1475028 100644 --- a/dlls/msi/msi.spec +++ b/dlls/msi/msi.spec @@ -232,8 +232,8 @@ 236 stub Migrate10CachedPackagesW 237 stub MsiRemovePatchesA 238 stub MsiRemovePatchesW -239 stub MsiApplyMultiplePatchesA -240 stub MsiApplyMultiplePatchesW +239 stdcall MsiApplyMultiplePatchesA(str str str) +240 stdcall MsiApplyMultiplePatchesW(wstr wstr wstr) 241 stub MsiExtractPatchXMLDataA 242 stub MsiExtractPatchXMLDataW 243 stdcall MsiGetPatchInfoExA(str str str long str ptr ptr) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index ccc9208..35a22de 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -11533,6 +11533,38 @@ static void test_MsiSetProperty(void) DeleteFileA(msifile); } +static void test_MsiApplyMultiplePatches(void) +{ + UINT r; + + r = MsiApplyMultiplePatchesA(NULL, NULL, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); + + r = MsiApplyMultiplePatchesA("", NULL, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); + + r = MsiApplyMultiplePatchesA(";", NULL, NULL); + ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); + + r = MsiApplyMultiplePatchesA(" ;", NULL, NULL); + ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); + + r = MsiApplyMultiplePatchesA(";;", NULL, NULL); + ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); + + r = MsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); + todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); + + r = MsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); + ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); + + r = MsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); + todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); + + r = MsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); + todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); +} + START_TEST(package) { GetCurrentDirectoryA(MAX_PATH, CURR_DIR); @@ -11566,4 +11598,5 @@ START_TEST(package) test_emptypackage(); test_MsiGetProductProperty(); test_MsiSetProperty(); + test_MsiApplyMultiplePatches(); } diff --git a/include/msi.h b/include/msi.h index a6a5f3d..5e68fdc 100644 --- a/include/msi.h +++ b/include/msi.h @@ -649,6 +649,10 @@ UINT WINAPI MsiDetermineApplicablePatchesA(LPCSTR, DWORD, PMSIPATCHSEQUENCEINFOA UINT WINAPI MsiDetermineApplicablePatchesW(LPCWSTR, DWORD, PMSIPATCHSEQUENCEINFOW); #define MsiDetermineApplicablePatches WINELIB_NAME_AW(MsiDetermineApplicablePatches) +UINT WINAPI MsiApplyMultiplePatchesA(LPCSTR, LPCSTR, LPCSTR); +UINT WINAPI MsiApplyMultiplePatchesW(LPCWSTR, LPCWSTR, LPCWSTR); +#define MsiApplyMultiplePatches WINELIB_NAME_AW(MsiApplyMultiplePatches) + /* Non Unicode */ UINT WINAPI MsiCloseHandle(MSIHANDLE); UINT WINAPI MsiCloseAllHandles(void);

1 0

Nikolay Sivov : comctl32/listview: Fix wrong function description.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 3d7eb3d4141ef58089d7f0a2bd2a26defebb90f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7eb3d4141ef58089d7f0a2b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri May 1 17:23:23 2009 +0400 comctl32/listview: Fix wrong function description. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 28dce02..967b867 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7855,7 +7855,7 @@ static BOOL LISTVIEW_SetTextColor (LISTVIEW_INFO *infoPtr, COLORREF clrText) /*** * DESCRIPTION: - * Determines which listview item is located at the specified position. + * Sets new ToolTip window to ListView control. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure

1 0

Scott Ritchie : wine.desktop: Reduce MIME types to application/ x-ms-dos-executable and application/x-msi.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 859fe2a7cb93a96eb19f86ff87b76faf3f7df6d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=859fe2a7cb93a96eb19f86ff8… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu Apr 30 15:26:27 2009 -0700 wine.desktop: Reduce MIME types to application/x-ms-dos-executable and application/x-msi. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 0d69cc8..52f91c6 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -16,6 +16,6 @@ Name[da]=Wine, Programstarter til Windows-programmer Name[nb]=Wine Programlaster for Windowsapplikasjoner Name[nn]=Wine Programlaster for Windowsapplikasjoner Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msdos-program;application/x-msdownload;application/exe;application/x-exe;application/dos-exe;vms/exe;application/x-winexe;application/msdos-windows;application/x-zip-compressed;application/x-executable;application/x-msi; +MimeType=application/x-ms-dos-executable;application/x-msi; NoDisplay=true StartupNotify=true

1 0

Damjan Jovanovic : wine.inf: Add more file type descriptions.
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 6144104f24700862c05b616efca9da2f38102368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6144104f24700862c05b616ef… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri May 1 10:11:07 2009 +0200 wine.inf: Add more file type descriptions. --- tools/wine.inf.in | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index fb7c68c..f42dea8 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -121,21 +121,27 @@ HKCR,.wav,"Content Type",2,"audio/wav" HKCR,.xml,,2,"xmlfile" HKCR,.xml,"Content Type",2,"text/xml" HKCR,.xsl,"Content Type",2,"text/xsl" +HKCR,chm.file,,2,"Compiled HTML Help File" HKCR,chm.file\shell\open\command,,2,"%11%\hh.exe %1" +HKCR,cplfile,,2,"Control Panel Item" HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" +HKCR,exefile,,2,"Application" HKCR,exefile\DefaultIcon,,2,"%1" HKCR,exefile\shell\open\command,,2,"""%1"" %*" HKCR,folder\shell\open\ddeexec,,2,"[ViewFolder("%l", %I, %S)]" HKCR,folder\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,folder\shell\open\ddeexec\application,,2,"Folders" +HKCR,hlpfile,,2,"Help File" HKCR,hlpfile\shell\open\command,,2,"%11%\winhlp32.exe %1" HKCR,htmlfile\shell\open\command,,2,"%11%\winebrowser.exe -nohome" HKCR,htmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,htmlfile\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,htmlfile\shell\open\ddeexec\Application,,2,"IExplore" HKCR,htmlfile\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" +HKCR,inffile,,2,"Setup Information" HKCR,inffile\shell\install\command,,2,"%11%\rundll32.exe setupapi,InstallHinfSection DefaultInstall 132 %1" +HKCR,inifile,,2,"Configuration Settings" HKCR,inifile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,inifile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,lnkfile,,2,"Shortcut" @@ -144,16 +150,20 @@ HKCR,lnkfile,"IsShortcut",2,"yes" HKCR,lnkfile\CLSID,,2,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\IconHandler,,2,"{00021401-0000-0000-C000-000000000046}" HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046},,0x10, +HKCR,Msi.Package,,2,"Windows Installer Package" HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" HKCR,Msi.Package\shell\Open\command,,2,"msiexec /i ""%1""" HKCR,Msi.Package\shell\Repair\command,,2,"msiexec /f ""%1""" HKCR,Msi.Package\shell\Uninstall\command,,2,"msiexec /x ""%1""" +HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,txtfile,,2,"Text Document" HKCR,txtfile\shell\open\command,,2,"%11%\notepad.exe %1" HKCR,txtfile\shell\print\command,,2,"%11%\notepad.exe /p %1" HKCR,wrifile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,wrifile\shell\print\command,,2,"%11%\wordpad.exe /p %1" +HKCR,xmlfile,,2,"XML Document" HKCR,xmlfile\shell\open\command,,2,"%11%\winebrowser.exe -nohome" HKCR,xmlfile\shell\open\ddeexec,,2,"""%1"",,-1,0,,,," HKCR,xmlfile\shell\open\ddeexec,"NoActivateHandler",2,""

1 0

Henri Verbeet : wined3d: Merge shader_dump_arr_entry() into shader_dump_register().
by Alexandre Julliard 01 May '09

01 May '09

Module: wine Branch: master Commit: 752d80400d66614c0d5ecc24fbc7486ed6cdd0cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=752d80400d66614c0d5ecc24f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri May 1 09:13:53 2009 +0200 wined3d: Merge shader_dump_arr_entry() into shader_dump_register(). --- dlls/wined3d/baseshader.c | 56 ++++++++++++++++++-------------------------- 1 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index acc4b71..cc7bf88 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -911,34 +911,21 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti } } -static void shader_dump_arr_entry(const struct wined3d_shader_src_param *rel_addr, - UINT register_idx, DWORD shader_version) -{ - if (rel_addr) - { - TRACE("["); - shader_dump_src_param(rel_addr, shader_version); - TRACE(" + "); - } - TRACE("%u", register_idx); - if (rel_addr) TRACE("]"); -} - static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx, const struct wined3d_shader_src_param *rel_addr, DWORD shader_version) { static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; + UINT offset = register_idx; switch (register_type) { case WINED3DSPR_TEMP: - TRACE("r%u", register_idx); + TRACE("r"); break; case WINED3DSPR_INPUT: TRACE("v"); - shader_dump_arr_entry(rel_addr, register_idx, shader_version); break; case WINED3DSPR_CONST: @@ -946,11 +933,11 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type case WINED3DSPR_CONST3: case WINED3DSPR_CONST4: TRACE("c"); - shader_dump_arr_entry(rel_addr, shader_get_float_offset(register_type, register_idx), shader_version); + offset = shader_get_float_offset(register_type, register_idx); break; case WINED3DSPR_TEXTURE: /* vs: case WINED3DSPR_ADDR */ - TRACE("%c%u", (shader_is_pshader_version(shader_version) ? 't' : 'a'), register_idx); + TRACE("%c", shader_is_pshader_version(shader_version) ? 't' : 'a'); break; case WINED3DSPR_RASTOUT: @@ -958,7 +945,7 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_COLOROUT: - TRACE("oC%u", register_idx); + TRACE("oC"); break; case WINED3DSPR_DEPTHOUT: @@ -966,35 +953,26 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_ATTROUT: - TRACE("oD%u", register_idx); + TRACE("oD"); break; case WINED3DSPR_TEXCRDOUT: /* Vertex shaders >= 3.0 use general purpose output registers * (WINED3DSPR_OUTPUT), which can include an address token */ - if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) - { - TRACE("o"); - shader_dump_arr_entry(rel_addr, register_idx, shader_version); - } - else - { - TRACE("oT%u", register_idx); - } + if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) TRACE("o"); + else TRACE("oT"); break; case WINED3DSPR_CONSTINT: TRACE("i"); - shader_dump_arr_entry(rel_addr, register_idx, shader_version); break; case WINED3DSPR_CONSTBOOL: TRACE("b"); - shader_dump_arr_entry(rel_addr, register_idx, shader_version); break; case WINED3DSPR_LABEL: - TRACE("l%u", register_idx); + TRACE("l"); break; case WINED3DSPR_LOOP: @@ -1002,7 +980,7 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_SAMPLER: - TRACE("s%u", register_idx); + TRACE("s"); break; case WINED3DSPR_MISCTYPE: @@ -1011,13 +989,25 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_PREDICATE: - TRACE("p%u", register_idx); + TRACE("p"); break; default: TRACE("unhandled_rtype(%#x)", register_type); break; } + + if (register_type != WINED3DSPR_RASTOUT && register_type != WINED3DSPR_MISCTYPE) + { + if (rel_addr) + { + TRACE("["); + shader_dump_src_param(rel_addr, shader_version); + TRACE(" + "); + } + TRACE("%u", offset); + if (rel_addr) TRACE("]"); + } } static void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, DWORD shader_version)

1 0