June 2008 - Wine-commits - list.winehq.org

Vitaly Lipatov : user32: Add test for SPI_{GET/ SET}WHEELSCROLLCHARS for SystemParametersInfo.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: c36b6f888e304bb97019ea9f11f936cec908a1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36b6f888e304bb97019ea9f1… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Mon Jun 23 18:01:41 2008 +0400 user32: Add test for SPI_{GET/SET}WHEELSCROLLCHARS for SystemParametersInfo. --- dlls/user32/tests/sysparams.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d6bb30c..f899dab 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -137,6 +137,8 @@ static HDC hdc; #define SPI_SETMOUSEHOVERHEIGHT_VALNAME "MouseHoverHeight" #define SPI_SETMOUSEHOVERTIME_REGKEY "Control Panel\\Mouse" #define SPI_SETMOUSEHOVERTIME_VALNAME "MouseHoverTime" +#define SPI_SETMOUSESCROLLCHARS_REGKEY "Control Panel\\Desktop" +#define SPI_SETMOUSESCROLLCHARS_VALNAME "WheelScrollChars" #define SPI_SETMOUSESCROLLLINES_REGKEY "Control Panel\\Desktop" #define SPI_SETMOUSESCROLLLINES_VALNAME "WheelScrollLines" #define SPI_SETMENUSHOWDELAY_REGKEY "Control Panel\\Desktop" @@ -2199,6 +2201,44 @@ static void test_SPI_SETMENUSHOWDELAY( void ) /* 107 */ ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); } +static void test_SPI_SETWHEELSCROLLCHARS( void ) /* 108 */ +{ + BOOL rc; + UINT old_chars; + const UINT vals[]={0,32767}; + unsigned int i; + + trace("testing SPI_{GET,SET}WHEELSCROLLCHARS\n"); + SetLastError(0xdeadbeef); + rc=SystemParametersInfoA( SPI_GETWHEELSCROLLCHARS, 0, &old_chars, 0 ); + + /* SPI_{GET,SET}WHEELSCROLLCHARS not supported on Windows 95 */ + if (!test_error_msg(rc,"SPI_{GET,SET}WHEELSCROLLCHARS")) + return; + + for (i=0;i<sizeof(vals)/sizeof(*vals);i++) + { + UINT v; + char buf[10]; + + rc=SystemParametersInfoA( SPI_SETWHEELSCROLLCHARS, vals[i], 0, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); + ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); + test_change_message( SPI_SETWHEELSCROLLCHARS, 0 ); + sprintf( buf, "%d", vals[i] ); + test_reg_key( SPI_SETMOUSESCROLLCHARS_REGKEY, + SPI_SETMOUSESCROLLCHARS_VALNAME, buf ); + + SystemParametersInfoA( SPI_GETWHEELSCROLLCHARS, 0, &v, 0 ); + ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); + eq( v, vals[i], "SPI_{GET,SET}WHEELSCROLLCHARS", "%d" ); + } + + rc=SystemParametersInfoA( SPI_SETWHEELSCROLLCHARS, old_chars, 0, + SPIF_UPDATEINIFILE ); + ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); +} + static void test_SPI_SETWALLPAPER( void ) /* 115 */ { BOOL rc; @@ -2342,6 +2382,7 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ) test_SPI_SETMOUSEHOVERTIME(); /* 103 */ test_SPI_SETWHEELSCROLLLINES(); /* 105 */ test_SPI_SETMENUSHOWDELAY(); /* 107 */ + test_SPI_SETWHEELSCROLLCHARS(); /* 108 */ test_SPI_SETWALLPAPER(); /* 115 */ test_WM_DISPLAYCHANGE();

1 0

Owen Rudge : shell32/tests: Rename shfldr_netplaces test to shfldr_special, for all special folders.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 4d70c59b01c2c670136ce1a9266282ae34e21482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d70c59b01c2c670136ce1a92… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jun 23 20:08:01 2008 +0100 shell32/tests: Rename shfldr_netplaces test to shfldr_special, for all special folders. --- dlls/shell32/tests/Makefile.in | 2 +- .../tests/{shfldr_netplaces.c => shfldr_special.c} | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index dd77c7c..088499f 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -9,7 +9,7 @@ CTESTS = \ generated.c \ shelllink.c \ shellpath.c \ - shfldr_netplaces.c \ + shfldr_special.c \ shlexec.c \ shlfileop.c \ shlfolder.c \ diff --git a/dlls/shell32/tests/shfldr_netplaces.c b/dlls/shell32/tests/shfldr_special.c similarity index 95% rename from dlls/shell32/tests/shfldr_netplaces.c rename to dlls/shell32/tests/shfldr_special.c index a2619f0..a1e5bc1 100644 --- a/dlls/shell32/tests/shfldr_netplaces.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -1,5 +1,5 @@ /* - * Tests for My Network Places shell folder + * Tests for special shell folders * * Copyright 2008 Robert Shearman for CodeWeavers * @@ -29,6 +29,7 @@ #include "wine/test.h" +/* Tests for My Network Places */ static void test_parse_for_entire_network(void) { static const WCHAR entire_network_path[] = { @@ -57,7 +58,7 @@ static void test_parse_for_entire_network(void) } -START_TEST(shfldr_netplaces) +START_TEST(shfldr_special) { test_parse_for_entire_network(); }

1 0

Owen Rudge : shell32/tests: Add basic ParseDisplayName test for control panel.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: d384c410814c6f7e51c4426fed85ff532381eb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d384c410814c6f7e51c4426fe… Author: Owen Rudge <owen(a)owenrudge.net> Date: Mon Jun 23 20:08:15 2008 +0100 shell32/tests: Add basic ParseDisplayName test for control panel. --- dlls/shell32/tests/shfldr_special.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index a1e5bc1..9e64d30 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -2,6 +2,7 @@ * Tests for special shell folders * * Copyright 2008 Robert Shearman for CodeWeavers + * Copyright 2008 Owen Rudge * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,8 +58,36 @@ static void test_parse_for_entire_network(void) ILFree(pidl); } +/* Tests for Control Panel */ +static void test_parse_for_control_panel(void) +{ + /* path of My Computer\Control Panel */ + static const WCHAR control_panel_path[] = { + ':',':','{','2','0','D','0','4','F','E','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','8','-','0','8','0','0','2','B','3','0','3','0','9','D','}','\\', + ':',':','{','2','1','E','C','2','0','2','0','-','3','A','E','A','-','1','0','6','9','-','A','2','D','D','-','0','8','0','0','2','B','3','0','3','0','9','D','}', 0 }; + IShellFolder *psfDesktop; + HRESULT hr; + DWORD eaten = 0xdeadbeef; + LPITEMIDLIST pidl; + DWORD attr = ~0; + DWORD expected_attr; + + hr = SHGetDesktopFolder(&psfDesktop); + ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%x\n", hr); + + hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, (LPWSTR)control_panel_path, &eaten, &pidl, &attr); + ok(hr == S_OK, "IShellFolder_ParseDisplayName failed with error 0x%x\n", hr); + todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %u\n", eaten); + + expected_attr = SFGAO_CANLINK | SFGAO_FOLDER | SFGAO_HASSUBFOLDER; + todo_wine ok(attr == expected_attr, "attr should be 0x%x, not 0x%x\n", expected_attr, attr); + + ILFree(pidl); +} + START_TEST(shfldr_special) { test_parse_for_entire_network(); + test_parse_for_control_panel(); }

1 0

Lei Zhang : comctl32: Use the system variable pitch font for ip address controls.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 011bad8ddf0322e6909a166a505225cf62459d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=011bad8ddf0322e6909a166a5… Author: Lei Zhang <thestig(a)google.com> Date: Mon Jun 23 13:34:16 2008 -0700 comctl32: Use the system variable pitch font for ip address controls. --- dlls/comctl32/ipaddress.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index a9e980b..c29406f 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -170,6 +170,8 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) IPADDRESS_INFO *infoPtr; RECT rcClient, edit; int i, fieldsize; + HFONT hFont, hSysFont; + LOGFONTW logFont, logSysFont; TRACE("\n"); @@ -191,6 +193,12 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) infoPtr->Enabled = TRUE; infoPtr->Notify = lpCreate->hwndParent; + hSysFont = (HFONT) GetStockObject(ANSI_VAR_FONT); + GetObjectW(hSysFont, sizeof(LOGFONTW), &logSysFont); + SystemParametersInfoW(SPI_GETICONTITLELOGFONT, 0, &logFont, 0); + strcpyW(logFont.lfFaceName, logSysFont.lfFaceName); + hFont = CreateFontIndirectW(&logFont); + for (i = 0; i < 4; i++) { IPPART_INFO* part = &infoPtr->Part[i]; @@ -203,6 +211,7 @@ static LRESULT IPADDRESS_Create (HWND hwnd, const CREATESTRUCTA *lpCreate) edit.left, edit.top, edit.right - edit.left, edit.bottom - edit.top, hwnd, (HMENU) 1, (HINSTANCE)GetWindowLongPtrW(hwnd, GWLP_HINSTANCE), NULL); + SendMessageW(part->EditHwnd, WM_SETFONT, (WPARAM) hFont, FALSE); SetPropW(part->EditHwnd, IP_SUBCLASS_PROP, hwnd); part->OrigProc = (WNDPROC) SetWindowLongPtrW (part->EditHwnd, GWLP_WNDPROC,

1 0

Nikolay Sivov : gdiplus: GdipPathIterGetCount implementation.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 143ebd60bb3d5a50d6d53fd42e139efd71fe9d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=143ebd60bb3d5a50d6d53fd42… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jun 24 01:57:15 2008 +0400 gdiplus: GdipPathIterGetCount implementation. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pathiterator.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index dd98c50..9fb0e9d 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -452,7 +452,7 @@ @ stub GdipNewPrivateFontCollection @ stdcall GdipPathIterCopyData(ptr ptr ptr ptr long long) @ stub GdipPathIterEnumerate -@ stub GdipPathIterGetCount +@ stdcall GdipPathIterGetCount(ptr ptr) @ stub GdipPathIterGetSubpathCount @ stub GdipPathIterHasCurve @ stub GdipPathIterIsValid diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index d1e4e88..67d83a4 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -131,3 +131,13 @@ GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator *iterator) return Ok; } + +GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator* iterator, INT* count) +{ + if(!iterator || !count) + return InvalidParameter; + + *count = iterator->pathdata.Count; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b615094..a0dd2ed 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -269,6 +269,7 @@ GpStatus WINGDIPAPI GdipPathIterCopyData(GpPathIterator*,INT*,GpPointF*,BYTE*, INT,INT); GpStatus WINGDIPAPI GdipPathIterNextSubpath(GpPathIterator*,INT*,INT*,INT*,BOOL*); GpStatus WINGDIPAPI GdipPathIterRewind(GpPathIterator*); +GpStatus WINGDIPAPI GdipPathIterGetCount(GpPathIterator*,INT*); GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap*,GpCustomLineCap**); GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL,

1 0

Nikolay Sivov : gdiplus: GdipSetPathMarker implementation.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: f8826a852512f2c326abcb109919fe8addcc50c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8826a852512f2c326abcb109… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jun 24 01:57:22 2008 +0400 gdiplus: GdipSetPathMarker implementation. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 16 ++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 9fb0e9d..112e0b8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -561,7 +561,7 @@ @ stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipSetPathGradientTransform @ stdcall GdipSetPathGradientWrapMode(ptr long) -@ stub GdipSetPathMarker +@ stdcall GdipSetPathMarker(ptr) @ stdcall GdipSetPenBrushFill(ptr ptr) @ stdcall GdipSetPenColor(ptr long) @ stub GdipSetPenCompoundArray diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index d17b392..11374ad 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -833,3 +833,19 @@ GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath *path, GDIPCONST GpRect *rects return retstat; } + +GpStatus WINGDIPAPI GdipSetPathMarker(GpPath* path) +{ + INT count; + + if(!path) + return InvalidParameter; + + count = path->pathdata.Count; + + /* set marker flag */ + if(count > 0) + path->pathdata.Types[count-1] |= PathPointTypePathMarker; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index a0dd2ed..96ee322 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -146,6 +146,7 @@ GpStatus WINGDIPAPI GdipSetCompositingQuality(GpGraphics*,CompositingQuality); GpStatus WINGDIPAPI GdipSetInterpolationMode(GpGraphics*,InterpolationMode); GpStatus WINGDIPAPI GdipSetPageScale(GpGraphics*,REAL); GpStatus WINGDIPAPI GdipSetPageUnit(GpGraphics*,GpUnit); +GpStatus WINGDIPAPI GdipSetPathMarker(GpPath*); GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics*,PixelOffsetMode); GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics*,SmoothingMode); GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics*,TextRenderingHint);

1 0

Vitaly Lipatov : user32: Implemented processing SPI_{GET/ SET}WHEELSCROLLCHARS for SystemParametersInfo.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 7b1765c1cc3489b143d03cfee4043953ee218e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b1765c1cc3489b143d03cfee… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Mon Jun 23 16:57:32 2008 +0400 user32: Implemented processing SPI_{GET/SET}WHEELSCROLLCHARS for SystemParametersInfo. --- dlls/user32/sysparams.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index d346941..6e260ea 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -73,6 +73,7 @@ enum spi_index SPI_SETMOUSEHOVERWIDTH_IDX, SPI_SETMOUSEHOVERHEIGHT_IDX, SPI_SETMOUSEHOVERTIME_IDX, + SPI_SETMOUSESCROLLCHARS_IDX, SPI_SETMOUSESCROLLLINES_IDX, SPI_SETMENUSHOWDELAY_IDX, SPI_SETICONTITLELOGFONT_IDX, @@ -209,6 +210,8 @@ static const WCHAR SPI_SETMOUSEHOVERHEIGHT_REGKEY[]= {'C','o','n','t',' static const WCHAR SPI_SETMOUSEHOVERHEIGHT_VALNAME[]= {'M','o','u','s','e','H','o','v','e','r','H','e','i','g','h','t',0}; static const WCHAR SPI_SETMOUSEHOVERTIME_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0}; static const WCHAR SPI_SETMOUSEHOVERTIME_VALNAME[]= {'M','o','u','s','e','H','o','v','e','r','T','i','m','e',0}; +static const WCHAR SPI_SETMOUSESCROLLCHARS_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; +static const WCHAR SPI_SETMOUSESCROLLCHARS_VALNAME[]= {'W','h','e','e','l','S','c','r','o','l','l','C','h','a','r','s',0}; static const WCHAR SPI_SETMOUSESCROLLLINES_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; static const WCHAR SPI_SETMOUSESCROLLLINES_VALNAME[]= {'W','h','e','e','l','S','c','r','o','l','l','L','i','n','e','s',0}; static const WCHAR SPI_SETMENUSHOWDELAY_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; @@ -293,6 +296,7 @@ static BOOL screen_reader = FALSE; static UINT mouse_hover_width = 4; static UINT mouse_hover_height = 4; static UINT mouse_hover_time = 400; +static UINT mouse_scroll_chars = 3; static UINT mouse_scroll_lines = 3; static UINT menu_show_delay = 400; static UINT menu_drop_alignment = 0; @@ -2112,6 +2116,20 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, &menu_show_delay, uiParam, fWinIni ); break; + case SPI_GETWHEELSCROLLCHARS: /* 108 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ + ret = get_uint_param( SPI_SETMOUSESCROLLCHARS_IDX, + SPI_SETMOUSESCROLLCHARS_REGKEY, + SPI_SETMOUSESCROLLCHARS_VALNAME, + &mouse_scroll_chars, pvParam ); + break; + + case SPI_SETWHEELSCROLLCHARS: /* 109 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ + ret = set_uint_param( SPI_SETMOUSESCROLLCHARS_IDX, + SPI_SETMOUSESCROLLCHARS_REGKEY, + SPI_SETMOUSESCROLLCHARS_VALNAME, + &mouse_scroll_chars, uiParam, fWinIni ); + break; + WINE_SPI_FIXME(SPI_GETSHOWIMEUI); /* 110 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */ WINE_SPI_FIXME(SPI_SETSHOWIMEUI); /* 111 _WIN32_WINNT >= 0x400 || _WIN32_WINDOW > 0x400 */

1 0

Vitaly Lipatov : user32: Implemented processing SPI_{GET/ SET}SNAPTODEFBUTTON for SystemParametersInfo.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: dfdb64c121b633f23ded21576921253a06f08dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfdb64c121b633f23ded21576… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Tue May 27 19:03:44 2008 +0400 user32: Implemented processing SPI_{GET/SET}SNAPTODEFBUTTON for SystemParametersInfo. --- dlls/user32/sysparams.c | 20 ++++++++++++++++++-- dlls/user32/tests/sysparams.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index b2fe627..d346941 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -77,6 +77,7 @@ enum spi_index SPI_SETMENUSHOWDELAY_IDX, SPI_SETICONTITLELOGFONT_IDX, SPI_SETLOWPOWERACTIVE_IDX, + SPI_SETSNAPTODEFBUTTON_IDX, SPI_SETPOWEROFFACTIVE_IDX, SPI_USERPREFERENCEMASK_IDX, SPI_NONCLIENTMETRICS_IDX, @@ -166,6 +167,8 @@ static const WCHAR SPI_SETMENUDROPALIGNMENT_REGKEY1[]= {'S','o','f','t',' 'W','i','n','d','o','w','s',0}; static const WCHAR SPI_SETMENUDROPALIGNMENT_REGKEY2[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; static const WCHAR SPI_SETMENUDROPALIGNMENT_VALNAME[]= {'M','e','n','u','D','r','o','p','A','l','i','g','n','m','e','n','t',0}; +static const WCHAR SPI_SETSNAPTODEFBUTTON_REGKEY[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0}; +static const WCHAR SPI_SETSNAPTODEFBUTTON_VALNAME[]= {'S','n','a','p','T','o','D','e','f','a','u','l','t','B','u','t','t','o','n',0}; static const WCHAR SPI_SETDOUBLECLKWIDTH_REGKEY1[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','M','o','u','s','e',0}; static const WCHAR SPI_SETDOUBLECLKWIDTH_REGKEY2[]= {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p',0}; static const WCHAR SPI_SETDOUBLECLKWIDTH_VALNAME[]= {'D','o','u','b','l','e','C','l','i','c','k','W','i','d','t','h',0}; @@ -298,6 +301,7 @@ static UINT font_smoothing = 0; /* 0x01 for 95/98/NT, 0x02 for 98/ME/2k/XP */ static BOOL lowpoweractive = FALSE; static BOOL poweroffactive = FALSE; static BOOL show_sounds = FALSE; +static BOOL snap_to_default_button = FALSE; static BOOL swap_buttons = FALSE; static UINT caret_width = 1; static BYTE user_prefs[4]; @@ -2016,8 +2020,20 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, WINE_SPI_FIXME(SPI_SETMOUSETRAILS); /* 93 WINVER >= 0x400 */ WINE_SPI_FIXME(SPI_GETMOUSETRAILS); /* 94 WINVER >= 0x400 */ - WINE_SPI_FIXME(SPI_GETSNAPTODEFBUTTON); /* 95 WINVER >= 0x400 */ - WINE_SPI_FIXME(SPI_SETSNAPTODEFBUTTON); /* 96 WINVER >= 0x400 */ + + case SPI_GETSNAPTODEFBUTTON: /* 95 WINVER >= 0x400 */ + ret = get_bool_param( SPI_SETSNAPTODEFBUTTON_IDX, + SPI_SETSNAPTODEFBUTTON_REGKEY, + SPI_SETSNAPTODEFBUTTON_VALNAME, + &snap_to_default_button, pvParam ); + break; + + case SPI_SETSNAPTODEFBUTTON: /* 96 WINVER >= 0x400 */ + ret = set_bool_param( SPI_SETSNAPTODEFBUTTON_IDX, + SPI_SETSNAPTODEFBUTTON_REGKEY, + SPI_SETSNAPTODEFBUTTON_VALNAME, + &snap_to_default_button, uiParam, fWinIni ); + break; case SPI_SETSCREENSAVERRUNNING: ret = set_bool_param( SPI_SETSCREENSAVERRUNNING_IDX, diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index af6c731..d6bb30c 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -129,6 +129,8 @@ static HDC hdc; #define SPI_SETPOWEROFFACTIVE_VALNAME "PowerOffActive" #define SPI_SETDRAGFULLWINDOWS_REGKEY "Control Panel\\Desktop" #define SPI_SETDRAGFULLWINDOWS_VALNAME "DragFullWindows" +#define SPI_SETSNAPTODEFBUTTON_REGKEY "Control Panel\\Mouse" +#define SPI_SETSNAPTODEFBUTTON_VALNAME "SnapToDefaultButton" #define SPI_SETMOUSEHOVERWIDTH_REGKEY "Control Panel\\Mouse" #define SPI_SETMOUSEHOVERWIDTH_VALNAME "MouseHoverWidth" #define SPI_SETMOUSEHOVERHEIGHT_REGKEY "Control Panel\\Mouse" @@ -1966,6 +1968,40 @@ static void test_SPI_SETPOWEROFFACTIVE( void ) /* 86 */ ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); } +static void test_SPI_SETSNAPTODEFBUTTON( void ) /* 95 */ +{ + BOOL rc; + BOOL old_b; + const UINT vals[]={TRUE,FALSE}; + unsigned int i; + + trace("testing SPI_{GET,SET}SNAPTODEFBUTTON\n"); + SetLastError(0xdeadbeef); + rc=SystemParametersInfoA( SPI_GETSNAPTODEFBUTTON, 0, &old_b, 0 ); + if (!test_error_msg(rc,"SPI_GETSNAPTODEFBUTTON")) + return; + + for (i=0;i<sizeof(vals)/sizeof(*vals);i++) + { + UINT v; + + rc=SystemParametersInfoA( SPI_SETSNAPTODEFBUTTON, vals[i], 0, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); + ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); + test_change_message( SPI_SETSNAPTODEFBUTTON, 0 ); + test_reg_key( SPI_SETSNAPTODEFBUTTON_REGKEY, + SPI_SETSNAPTODEFBUTTON_VALNAME, + vals[i] ? "1" : "0" ); + + rc=SystemParametersInfoA( SPI_GETSNAPTODEFBUTTON, 0, &v, 0 ); + ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); + eq( v, vals[i], "SPI_GETSNAPTODEFBUTTON", "%d" ); + } + + rc=SystemParametersInfoA( SPI_SETSNAPTODEFBUTTON, old_b, 0, SPIF_UPDATEINIFILE ); + ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); +} + static void test_SPI_SETMOUSEHOVERWIDTH( void ) /* 99 */ { BOOL rc; @@ -2300,6 +2336,7 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ) test_SPI_SETFONTSMOOTHING(); /* 75 */ test_SPI_SETLOWPOWERACTIVE(); /* 85 */ test_SPI_SETPOWEROFFACTIVE(); /* 86 */ + test_SPI_SETSNAPTODEFBUTTON(); /* 95 */ test_SPI_SETMOUSEHOVERWIDTH(); /* 99 */ test_SPI_SETMOUSEHOVERHEIGHT(); /* 101 */ test_SPI_SETMOUSEHOVERTIME(); /* 103 */

1 0

Scott Ritchie : wine.desktop: Add application/x-msi and change "emulator" to "program loader".
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: f16e49baf2016348f4a1dfea3f09e72f9085135b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f16e49baf2016348f4a1dfea3… Author: Scott Ritchie <scott(a)open-vote.org> Date: Sun Jun 22 15:11:39 2008 -0700 wine.desktop: Add application/x-msi and change "emulator" to "program loader". --- tools/wine.desktop | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 2be9b53..fe8f1e3 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -1,12 +1,20 @@ [Desktop Entry] Type=Application -Name=Wine Windows Emulator -Name[de]=Wine Windows-Emulator -Name[es]=Emulador Windows de Wine -Name[nl]=Wine Windows-emulator -Name[sv]=Windows-emulatorn Wine -Name[ru]=Wine Эмулятор Windows -Name[fr]=Émulateur Windows Wine +Name=Wine Windows Program Loader +Name[de]=Wine Windows-Programmstarter +Name[es]=Wine Cargador de programas de Windows +Name[nl]=Wine Windows programmalader +Name[sv]=Wine Windows Programstartare +Name[ru]=Wine - загрузчик Windows программ +Name[uk]=Wine - завантажувач Windows програм +Name[fr]=Wine Exécuter des programmes Windows +Name[ca]=Wine - Carregador d'aplicacions del Windows +Name[pt]=Carregador de aplicativos Windows Wine +Name[pt_br]=Carregador de aplicativos Windows Wine +Name[it]=Wine Carica Programmi Windows +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; +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; NoDisplay=true

1 0

Nikolay Sivov : gdiplus: Fix GdipGetPathData implementation and test.
by Alexandre Julliard 26 Jun '08

26 Jun '08

Module: wine Branch: master Commit: 991e785f507c13d6ebe648e650ff1ae3346ca2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=991e785f507c13d6ebe648e65… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 25 21:56:27 2008 +0400 gdiplus: Fix GdipGetPathData implementation and test. Previous version (commit 3bacdaf664593b720afeb55a94225aab5aa04c80) was totally incorrect. Thanks to Paul Vriens for pointing this out. --- dlls/gdiplus/graphicspath.c | 13 ++----------- dlls/gdiplus/tests/graphicspath.c | 10 +++++++++- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 24f25e1..d17b392 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -484,17 +484,8 @@ GpStatus WINGDIPAPI GdipGetPathData(GpPath *path, GpPathData* pathData) if(!path || !pathData) return InvalidParameter; - pathData->Count = path->pathdata.Count; - - pathData->Points = GdipAlloc(sizeof(PointF) * pathData->Count); - if(!pathData->Points) - return OutOfMemory; - - pathData->Types = GdipAlloc(pathData->Count); - if(!pathData->Points) - return OutOfMemory; - - /* copy data */ + /* Only copy data. pathData allocation/freeing controlled by wrapper class. + Assumed that pathData is enough wide to get all data - controlled by wrapper too. */ memcpy(pathData->Points, path->pathdata.Points, sizeof(PointF) * pathData->Count); memcpy(pathData->Types , path->pathdata.Types , pathData->Count); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 672f6da..262a527 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -154,14 +154,22 @@ static void test_getpathdata(void) GpPath *path; GpPathData data; GpStatus status; + INT count; GdipCreatePath(FillModeAlternate, &path); status = GdipAddPathLine(path, 5.0, 5.0, 100.0, 50.0); expect(Ok, status); + /* Prepare storage. Made by wrapper class. */ + status = GdipGetPointCount(path, &count); + expect(Ok, status); + + data.Count = 2; + data.Types = GdipAlloc(sizeof(BYTE) * count); + data.Points = GdipAlloc(sizeof(PointF) * count); + status = GdipGetPathData(path, &data); expect(Ok, status); - expect((data.Count == 2), TRUE); expect((data.Points[0].X == 5.0) && (data.Points[0].Y == 5.0) && (data.Points[1].X == 100.0) && (data.Points[1].Y == 50.0), TRUE); expect((data.Types[0] == PathPointTypeStart) && (data.Types[1] == PathPointTypeLine), TRUE);

1 0