February 2007 - Wine-Commits

Steven Stein : msi: ValidateProductID action stub.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: ee3ac7a8fba5a003c8ebe692b11fca0b851bb6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3ac7a8fba5a003c8ebe692b… Author: Steven Stein <frosty522(a)wourld.com> Date: Sun Feb 11 19:51:03 2007 -0500 msi: ValidateProductID action stub. --- dlls/msi/action.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1a8fa5a..b328e5d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4503,6 +4503,12 @@ static UINT ACTION_DeleteServices( MSIPACKAGE *package ) 'S','e','r','v','i','c','e','C','o','n','t','r','o','l',0 }; return msi_unimplemented_action_stub( package, "DeleteServices", table ); } +static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) +{ + static const WCHAR table[] = { + 'P','r','o','d','u','c','t','I','D',0 }; + return msi_unimplemented_action_stub( package, "ValidateProductID", table ); +} static UINT ACTION_WriteEnvironmentStrings( MSIPACKAGE *package ) { @@ -4634,7 +4640,7 @@ static const struct _actions StandardActions[] = { { szUnregisterMIMEInfo, NULL}, { szUnregisterProgIdInfo, NULL}, { szUnregisterTypeLibraries, NULL}, - { szValidateProductID, NULL}, + { szValidateProductID, ACTION_ValidateProductID}, { szWriteEnvironmentStrings, ACTION_WriteEnvironmentStrings }, { szWriteIniValues, ACTION_WriteIniValues }, { szWriteRegistryValues, ACTION_WriteRegistryValues},

1 0

Steven Stein : msi: Added "Default" control condition to msi_dialog_set_control_condition.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 378928f2df9303c9ba8fdd2e84e0e187c27fe673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=378928f2df9303c9ba8fdd2e8… Author: Steven Stein <frosty522(a)wourld.com> Date: Sun Feb 11 13:44:54 2007 -0500 msi: Added "Default" control condition to msi_dialog_set_control_condition. --- dlls/msi/dialog.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 34adf9c..a542546 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2622,6 +2622,7 @@ static UINT msi_dialog_set_control_condition( MSIRECORD *rec, LPVOID param ) static const WCHAR szShow[] = { 'S','h','o','w',0 }; static const WCHAR szDisable[] = { 'D','i','s','a','b','l','e',0 }; static const WCHAR szEnable[] = { 'E','n','a','b','l','e',0 }; + static const WCHAR szDefault[] = { 'D','e','f','a','u','l','t',0 }; msi_dialog *dialog = param; msi_control *control; LPCWSTR name, action, condition; @@ -2645,6 +2646,8 @@ static UINT msi_dialog_set_control_condition( MSIRECORD *rec, LPVOID param ) EnableWindow(control->hwnd, FALSE); else if(!strcmpW(action, szEnable)) EnableWindow(control->hwnd, TRUE); + else if(!strcmpW(action, szDefault)) + SetFocus(control->hwnd); else FIXME("Unhandled action %s\n", debugstr_w(action)); }

1 0

Ivan Sinitsin : comdlg32: Set the right background color of the dialog window "Choose color".
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: a4ff5c550bdf761d9125d6ac21b5256180d13f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ff5c550bdf761d9125d6ac2… Author: Ivan Sinitsin <ivan(a)etersoft.ru> Date: Mon Feb 12 11:42:19 2007 +0300 comdlg32: Set the right background color of the dialog window "Choose color". --- dlls/comdlg32/colordlg.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 86926f5..ac49e76 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -463,6 +463,7 @@ void CC_PaintTriangle( HWND hDlg, int y) int height; int oben; RECT rect; + HBRUSH hbr; HWND hwnd = GetDlgItem(hDlg, 0x2be); LCCPRIV lpp = (LCCPRIV) GetPropW( hDlg, szColourDialogProp ); @@ -483,7 +484,9 @@ void CC_PaintTriangle( HWND hDlg, int y) points[2].y = points[0].y - w; points[2].x = points[1].x = points[0].x + w; - FillRect(hDC, &lpp->old3angle, (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND)); + hbr = (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND); + if (!hbr) hbr = GetSysColorBrush(COLOR_BTNFACE); + FillRect(hDC, &lpp->old3angle, hbr); lpp->old3angle.left = points[0].x; lpp->old3angle.right = points[1].x + 1; lpp->old3angle.top = points[2].y - 1; @@ -740,7 +743,9 @@ static void CC_PaintPredefColorArray( HWND hDlg, int rows, int cols) hdc = GetDC(hwnd); GetClientRect(hwnd, &rect); - FillRect(hdc, &rect, (HBRUSH)GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND)); + hBrush = (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND); + if (!hBrush) hBrush = GetSysColorBrush(COLOR_BTNFACE); + FillRect(hdc, &rect, hBrush); for ( j = 0; j < rows; j++ ) { for ( i = 0; i < cols; i++ ) @@ -784,7 +789,9 @@ void CC_PaintUserColorArray( HWND hDlg, int rows, int cols, COLORREF* lpcr ) hdc = GetDC(hwnd); if (hdc) { - FillRect(hdc, &rect, (HBRUSH)GetClassLongPtrW(hwnd, GCLP_HBRBACKGROUND) ); + hBrush = (HBRUSH)GetClassLongPtrW( hwnd, GCLP_HBRBACKGROUND); + if (!hBrush) hBrush = GetSysColorBrush(COLOR_BTNFACE); + FillRect( hdc, &rect, hBrush ); for (j = 0; j < rows; j++) { for (i = 0; i < cols; i++)

1 0

Misha Koshelev : wineboot: Start items in StartUp folder on boot.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: a00af0d288f300ebfa195e0138e148881cc22b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00af0d288f300ebfa195e013… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sun Feb 11 21:09:45 2007 -0600 wineboot: Start items in StartUp folder on boot. --- programs/wineboot/Makefile.in | 3 +- programs/wineboot/wineboot.c | 96 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 95 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 08c27a5..b11b280 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -4,7 +4,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = version user32 advapi32 kernel32 +IMPORTS = shell32 shlwapi version user32 advapi32 kernel32 +EXTRALIBS = -luuid C_SRCS = \ shutdown.c \ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 1434003..27babc7 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -37,9 +37,9 @@ * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\RunOnce (all, synch) * - HKEY_LOCAL_MACHINE\Software\Microsoft\Windows\CurrentVersion\Run (all, asynch) * - HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Run (all, asynch) - * - Startup folders (all, ?asynch?, no imp) + * - Startup folders (all, ?asynch?) * - HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\RunOnce (all, asynch) - * + * * Somewhere in there is processing the RunOnceEx entries (also no imp) * * Bugs: @@ -63,6 +63,12 @@ #include <windows.h> #include <wine/debug.h> +#define COBJMACROS +#include <shlobj.h> +#include <shobjidl.h> +#include <shlwapi.h> +#include <shellapi.h> + WINE_DEFAULT_DEBUG_CHANNEL(wineboot); #define MAX_LINE_LENGTH (2*MAX_PATH+2) @@ -616,6 +622,88 @@ static int ProcessWindowsFileProtection(void) return 1; } +/* Process items in the StartUp group of the user's Programs under the Start Menu. Some installers put + * shell links here to restart themselves after boot. */ +static BOOL ProcessStartupItems(void) +{ + BOOL ret = FALSE; + HRESULT hr; + int iRet; + IMalloc *ppM = NULL; + IShellFolder *psfDesktop = NULL, *psfStartup = NULL; + LPITEMIDLIST pidlStartup = NULL, pidlItem; + ULONG NumPIDLs; + IEnumIDList *iEnumList = NULL; + STRRET strret; + WCHAR wszCommand[MAX_PATH]; + + WINE_TRACE("Processing items in the StartUp folder.\n"); + + hr = SHGetMalloc(&ppM); + if (FAILED(hr)) + { + WINE_ERR("Couldn't get IMalloc object.\n"); + goto done; + } + + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + { + WINE_ERR("Couldn't get desktop folder.\n"); + goto done; + } + + hr = SHGetSpecialFolderLocation(NULL, CSIDL_STARTUP, &pidlStartup); + if (FAILED(hr)) + { + WINE_TRACE("Couldn't get StartUp folder location.\n"); + goto done; + } + + hr = IShellFolder_BindToObject(psfDesktop, pidlStartup, NULL, &IID_IShellFolder, (LPVOID*)&psfStartup); + if (FAILED(hr)) + { + WINE_TRACE("Couldn't bind IShellFolder to StartUp folder.\n"); + goto done; + } + + hr = IShellFolder_EnumObjects(psfStartup, NULL, SHCONTF_NONFOLDERS | SHCONTF_INCLUDEHIDDEN, &iEnumList); + if (FAILED(hr)) + { + WINE_TRACE("Unable to enumerate StartUp objects.\n"); + goto done; + } + + while (IEnumIDList_Next(iEnumList, 1, &pidlItem, &NumPIDLs) == S_OK && + (NumPIDLs) == 1) + { + hr = IShellFolder_GetDisplayNameOf(psfStartup, pidlItem, SHGDN_FORPARSING, &strret); + if (FAILED(hr)) + WINE_TRACE("Unable to get display name of enumeration item.\n"); + else + { + hr = StrRetToBufW(&strret, pidlItem, wszCommand, MAX_PATH); + if (FAILED(hr)) + WINE_TRACE("Unable to parse display name.\n"); + else + if ((iRet = (int)ShellExecuteW(NULL, NULL, wszCommand, NULL, NULL, SW_SHOWNORMAL)) <= 32) + WINE_ERR("Error %d executing command %s.\n", iRet, wine_dbgstr_w(wszCommand)); + } + + IMalloc_Free(ppM, pidlItem); + } + + /* Return success */ + ret = TRUE; + +done: + if (iEnumList) IEnumIDList_Release(iEnumList); + if (psfStartup) IShellFolder_Release(psfStartup); + if (pidlStartup) IMalloc_Free(ppM, pidlStartup); + + return ret; +} + static void usage(void) { WINE_MESSAGE( "Usage: wineboot [options]\n" ); @@ -732,7 +820,9 @@ int main( int argc, char *argv[] ) FALSE, FALSE )) && (!ops.postlogin || !ops.startup || ProcessRunKeys( HKEY_CURRENT_USER, runkeys_names[RUNKEY_RUN], - FALSE, FALSE )); + FALSE, FALSE )) && + (!ops.postlogin || !ops.startup || + ProcessStartupItems( )); WINE_TRACE("Operation done\n");

1 0

Misha Koshelev : shell32/tests: Test creating shell links for commands on path.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 28b68dad8e762f4b6d4b4325029721a5da001cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b68dad8e762f4b6d4b43250… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sat Feb 10 23:08:22 2007 -0600 shell32/tests: Test creating shell links for commands on path. --- dlls/shell32/tests/shelllink.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 62bd3b0..473aae7 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -487,6 +487,7 @@ static void test_load_save(void) lnk_desc_t desc; char mypath[MAX_PATH]; char mydir[MAX_PATH]; + char realpath[MAX_PATH]; char* p; DWORD r; @@ -535,6 +536,22 @@ static void test_load_save(void) create_lnk(lnkfile, &desc, 0); check_lnk(lnkfile, &desc); + /* Overwrite the existing lnk file and test link to a command on the path */ + desc.description="command on path"; + desc.workdir=mypath; + desc.path="rundll32.exe"; + desc.pidl=NULL; + desc.arguments="/option1 /option2 \"Some string\""; + desc.showcmd=SW_SHOWNORMAL; + desc.icon=mypath; + desc.icon_id=0; + desc.hotkey=0x1234; + create_lnk(lnkfile, &desc, 0); + /* Check that link is created to proper location */ + SearchPathA( NULL, desc.path, NULL, MAX_PATH, realpath, NULL); + desc.path=realpath; + check_lnk(lnkfile, &desc); + /* FIXME: Also test saving a .lnk pointing to a pidl that cannot be * represented as a path. */

1 0

Misha Koshelev : shell32: Properly create shell links for commands on path.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 67cd59b892776ed0a4d595a3ca4e31d2d1fd9ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67cd59b892776ed0a4d595a3c… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Sat Feb 10 23:08:57 2007 -0600 shell32: Properly create shell links for commands on path. --- dlls/shell32/shelllink.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 62d015b..25f0753 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2191,8 +2191,9 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile *buffer = '\0'; else if (!GetFullPathNameW(pszFile, MAX_PATH, buffer, &fname)) return E_FAIL; - else if(!PathFileExistsW(buffer)) - hr = S_FALSE; + else if(!PathFileExistsW(buffer) && + !SearchPathW(NULL, pszFile, NULL, MAX_PATH, buffer, NULL)) + hr = S_FALSE; This->pPidl = SHSimpleIDListFromPathW(pszFile); ShellLink_GetVolumeInfo(buffer, &This->volume);

1 0

Aric Stewart : user32: Scroll window fix.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 1b6d127aee1210f8f9436b85bb34a9c416d0aaac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b6d127aee1210f8f9436b85b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 13 07:38:06 2007 -0600 user32: Scroll window fix. Fix the case where the scrolling amount exceeds the window but still falls within the clipping rect. This generates an additional update region that needs to be invalidated. --- dlls/user32/painting.c | 19 +++++++++++++++++++ dlls/user32/tests/win.c | 9 +++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index dbc8cfe..9fe6764 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -870,6 +870,25 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy, CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); RedrawWindow( hwnd, NULL, hrgnTemp, rdw_flags); DeleteObject( hrgnClip ); + + /* Catch the case where the scolling amount exceeds the size of the + * original window. This generated a second update area that is the + * location where the original scrolled content would end up. + * This second region is not returned by the ScrollDC and sets + * ScrollWindowEx apart from just a ScrollDC. + * + * This has been verified with testing on windows. + */ + if (abs(dx) > abs(rc.right - rc.left) || + abs(dy) > abs(rc.bottom - rc.top)) + { + SetRectRgn( hrgnTemp, rc.left + dx, rc.top + dy, rc.right+dx, rc.bottom + dy); + CombineRgn( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND ); + CombineRgn( hrgnUpdate, hrgnUpdate, hrgnTemp, RGN_OR ); + + if( !bOwnRgn) + CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); + } } DeleteObject( hrgnTemp ); } else { diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ef456ca..9d07306 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2991,6 +2991,15 @@ static void test_scrollvalidate( HWND parent) CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); + SetRect( &rc, 0,40, 100,60); + SetRect( &cliprc, 0,0, 100,100); + ScrollWindowEx( hwnd1, 0, -25, &rc, &cliprc, hrgn, &rcu, SW_INVALIDATE); + SetRectRgn( tmprgn, 0,15,98,35); + CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); + SetRectRgn( tmprgn, 0, 40, 98, 60); + CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); + ok( EqualRgn( exprgn, hrgn), "wrong update region in excessive scroll\n"); + /* now test ScrollWindowEx with a combination of * WS_CLIPCHILDREN style and SW_SCROLLCHILDREN flag */ /* make hwnd2 the child of hwnd1 */

1 0

Keith Stevens : comctl32: Add trackbar tests.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: ec57871f4fc6ad31503157921e829b382c224e3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec57871f4fc6ad31503157921… Author: Keith Stevens <fozziethebeat(a)gmail.com> Date: Mon Feb 12 15:31:23 2007 -0800 comctl32: Add trackbar tests. --- dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/trackbar.c | 416 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 417 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec57871f4fc6ad3150315…

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 536e7385529685b1679e38ffba551a602803323f URL: http://source.winehq.org/git/wine.git/?a=commit;h=536e7385529685b1679e38ffb… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 14 16:22:07 2007 +0100 Assorted spelling fixes. --- dlls/atl/atl_main.c | 4 ++-- dlls/comctl32/string.c | 2 +- dlls/comdlg32/printdlg.c | 8 ++++---- dlls/mapi32/tests/imalloc.c | 4 ++-- dlls/mshtml/tests/htmldoc.c | 2 +- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/shell32/shelllink.c | 4 ++-- dlls/shell32/shellord.c | 4 ++-- dlls/shell32/tests/shlfolder.c | 4 ++-- dlls/shlwapi/string.c | 6 +++--- dlls/winealsa.drv/dsoutput.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/winspool.drv/tests/info.c | 2 +- dlls/ws2_32/socket.c | 2 +- include/ddraw.h | 16 ++++++++-------- include/wine/mmsystem16.h | 2 +- programs/uninstaller/main.c | 2 +- 18 files changed, 36 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=536e7385529685b1679e3…

1 0

Andrew Talbot : imaadp32.acm: Constify some variables.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: ce84a4381c550922030ded8ce207b6f7c4de3e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce84a4381c550922030ded8ce… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Feb 14 18:11:34 2007 +0000 imaadp32.acm: Constify some variables. --- dlls/imaadp32.acm/imaadp32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index a5f2493..ca788e7 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -73,7 +73,7 @@ typedef struct int rate; } Format; -static Format PCM_Formats[] = +static const Format PCM_Formats[] = { {1, 8, 8000}, {2, 8, 8000}, {1, 16, 8000}, {2, 16, 8000}, {1, 8, 11025}, {2, 8, 11025}, {1, 16, 11025}, {2, 16, 11025}, @@ -81,7 +81,7 @@ static Format PCM_Formats[] = {1, 8, 44100}, {2, 8, 44100}, {1, 16, 44100}, {2, 16, 44100}, }; -static Format ADPCM_Formats[] = +static const Format ADPCM_Formats[] = { {1, 4, 8000}, {2, 4, 8000}, {1, 4, 11025}, {2, 4, 11025}, {1, 4, 22050}, {2, 4, 22050}, {1, 4, 44100}, {2, 4, 44100}, @@ -95,8 +95,8 @@ static Format ADPCM_Formats[] = */ static DWORD ADPCM_GetFormatIndex(LPWAVEFORMATEX wfx) { - int i, hi; - Format* fmts; + int i, hi; + const Format* fmts; switch (wfx->wFormatTag) {

1 0