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

Paul Vriens : shell32/tests: Fix a test failure on Vista and higher.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 22a48d67407f7bf74c2ae4151f486d5ac6eecfe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22a48d67407f7bf74c2ae4151… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 2 14:47:03 2009 +0200 shell32/tests: Fix a test failure on Vista and higher. --- dlls/shell32/tests/shellpath.c | 37 ++++++++++++++++++++++++------------- 1 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index bf4e4ae..302448e 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -30,6 +30,7 @@ #include "shlguid.h" #include "shlobj.h" #include "shlwapi.h" +#include "initguid.h" #include "wine/test.h" /* CSIDL_MYDOCUMENTS is now the same as CSIDL_PERSONAL, but what we want @@ -537,7 +538,7 @@ static void matchSpecialFolderPathToEnv(int folder, const char *envVar) * fail if it isn't--that check should already have been done. * Fails if the returned PIDL is a GUID whose value does not match guid. */ -static void matchGUID(int folder, const GUID *guid) +static void matchGUID(int folder, const GUID *guid, const GUID *guid_alt) { LPITEMIDLIST pidl; HRESULT hr; @@ -555,11 +556,18 @@ static void matchGUID(int folder, const GUID *guid) pidlLast->mkid.abID[0] == PT_GUID)) { GUID *shellGuid = (GUID *)(pidlLast->mkid.abID + 2); - char shellGuidStr[39], guidStr[39]; - - ok(IsEqualIID(shellGuid, guid), - "%s: got GUID %s, expected %s\n", getFolderName(folder), - printGUID(shellGuid, shellGuidStr), printGUID(guid, guidStr)); + char shellGuidStr[39], guidStr[39], guid_altStr[39]; + + if (!guid_alt) + ok(IsEqualIID(shellGuid, guid), + "%s: got GUID %s, expected %s\n", getFolderName(folder), + printGUID(shellGuid, shellGuidStr), printGUID(guid, guidStr)); + else + ok(IsEqualIID(shellGuid, guid) || + IsEqualIID(shellGuid, guid_alt), + "%s: got GUID %s, expected %s or %s\n", getFolderName(folder), + printGUID(shellGuid, shellGuidStr), printGUID(guid, guidStr), + printGUID(guid_alt, guid_altStr)); } IMalloc_Free(pMalloc, pidl); } @@ -581,16 +589,19 @@ static void testPidlTypes(void) TRUE); } +/* FIXME: Should be in shobjidl.idl */ +DEFINE_GUID(CLSID_NetworkExplorerFolder, 0xF02C1A0D, 0xBE21, 0x4350, 0x88, 0xB0, 0x73, 0x67, 0xFC, 0x96, 0xEF, 0x3C); + /* Verifies various shell virtual folders have the correct well-known GUIDs. */ static void testGUIDs(void) { - matchGUID(CSIDL_BITBUCKET, &CLSID_RecycleBin); - matchGUID(CSIDL_CONTROLS, &CLSID_ControlPanel); - matchGUID(CSIDL_DRIVES, &CLSID_MyComputer); - matchGUID(CSIDL_INTERNET, &CLSID_Internet); - matchGUID(CSIDL_NETWORK, &CLSID_NetworkPlaces); - matchGUID(CSIDL_PERSONAL, &CLSID_MyDocuments); - matchGUID(CSIDL_COMMON_DOCUMENTS, &CLSID_CommonDocuments); + matchGUID(CSIDL_BITBUCKET, &CLSID_RecycleBin, NULL); + matchGUID(CSIDL_CONTROLS, &CLSID_ControlPanel, NULL); + matchGUID(CSIDL_DRIVES, &CLSID_MyComputer, NULL); + matchGUID(CSIDL_INTERNET, &CLSID_Internet, NULL); + matchGUID(CSIDL_NETWORK, &CLSID_NetworkPlaces, &CLSID_NetworkExplorerFolder); /* Vista and higher */ + matchGUID(CSIDL_PERSONAL, &CLSID_MyDocuments, NULL); + matchGUID(CSIDL_COMMON_DOCUMENTS, &CLSID_CommonDocuments, NULL); } /* Verifies various shell paths match the environment variables to which they

1 0

Aric Stewart : winmm: Properly cleanup in return from proc_PlaySound if system sound is not found .
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: c08b0a0a9d99393930f1869663e97b14b755dd2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08b0a0a9d99393930f186966… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 2 08:21:16 2009 -0500 winmm: Properly cleanup in return from proc_PlaySound if system sound is not found. Prevents hanging in Outlook 2000 on sound cleanup. --- dlls/winmm/playsound.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 143f4a9..bdd12fd 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -338,7 +338,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) wps->pszSound = wszSystemStart; else if (wps->pszSound == (LPCWSTR)SND_ALIAS_SYSTEMWELCOME) wps->pszSound = wszSystemWelcome; - else return FALSE; + else goto errCleanUp; } hmmio = get_mmioFromProfile(wps->fdwSound, wps->pszSound); }

1 0

Aric Stewart : winmm: SND_ALIAS and SND_ALIAS_ID overlap so when checking for SND_ALIAS_ID make sure it is SND_ALIAS_ID and not SND_ALIAS .
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 7e8e9c41e9b566c0a4045ec54425800cbc375132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8e9c41e9b566c0a4045ec54… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Apr 2 08:32:59 2009 -0500 winmm: SND_ALIAS and SND_ALIAS_ID overlap so when checking for SND_ALIAS_ID make sure it is SND_ALIAS_ID and not SND_ALIAS. --- dlls/winmm/playsound.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index bdd12fd..b8d1b71 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -310,7 +310,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) } else if (wps->fdwSound & SND_ALIAS) { - if (wps->fdwSound & SND_ALIAS_ID) + if ((wps->fdwSound & SND_ALIAS_ID) == SND_ALIAS_ID) { static const WCHAR wszSystemAsterisk[] = {'S','y','s','t','e','m','A','s','t','e','r','i','s','k',0}; static const WCHAR wszSystemDefault[] = {'S','y','s','t','e','m','D','e','f','a','u','l','t',0};

1 0

Nikolay Sivov : comctl32: Additional tests for ListView header creation.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 6b6d18d766893ff10a38a4efbbe5ef4ef8e9828b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6d18d766893ff10a38a4efb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 2 07:56:30 2009 -0400 comctl32: Additional tests for ListView header creation. --- dlls/comctl32/tests/listview.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 9157ec0..84db3d2 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -820,11 +820,11 @@ static void test_create(void) hList = CreateWindow("SysListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), 0); ret = SetWindowLongPtr(hList, GWL_STYLE, GetWindowLongPtr(hList, GWL_STYLE) | LVS_REPORT); - ok(ret = WS_VISIBLE, "Style wrong, should be WS_VISIBLE|LVS_ICON\n"); + ok(ret & WS_VISIBLE, "Style wrong, should have WS_VISIBLE\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader), "Header should be created\n"); ret = SetWindowLongPtr(hList, GWL_STYLE, GetWindowLong(hList, GWL_STYLE) & ~LVS_REPORT); - ok(ret = WS_VISIBLE|LVS_REPORT, "Style wrong, should be WS_VISIBLE|LVS_REPORT\n"); + ok((ret & WS_VISIBLE) && (ret & LVS_REPORT), "Style wrong, should have WS_VISIBLE|LVS_REPORT\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader), "Header should be created\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); @@ -835,13 +835,13 @@ static void test_create(void) GetModuleHandle(NULL), 0); ret = SetWindowLongPtr(hList, GWL_STYLE, (GetWindowLongPtr(hList, GWL_STYLE) & ~LVS_LIST) | LVS_REPORT); - ok(ret = WS_VISIBLE|LVS_LIST, "Style wrong, should be WS_VISIBLE|LVS_ICON\n"); + ok(((ret & WS_VISIBLE) && (ret & LVS_LIST)), "Style wrong, should have WS_VISIBLE|LVS_LIST\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader), "Header shouldn't be created\n"); ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); ret = SetWindowLongPtr(hList, GWL_STYLE, (GetWindowLongPtr(hList, GWL_STYLE) & ~LVS_REPORT) | LVS_LIST); - ok(ret = WS_VISIBLE|LVS_REPORT, "Style wrong, should be WS_VISIBLE|LVS_REPORT\n"); + ok(((ret & WS_VISIBLE) && (ret & LVS_REPORT)), "Style wrong, should have WS_VISIBLE|LVS_REPORT\n"); hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); ok(IsWindow(hHeader), "Header shouldn't be created\n"); ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); @@ -863,6 +863,18 @@ static void test_create(void) ok(IsWindow(hHeader), "Header should be created\n"); ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + + /* LVS_REPORT without WS_VISIBLE, try to show it */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + todo_wine ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + todo_wine ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + ShowWindow(hList, SW_SHOW); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader), "Header shouldn't be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + DestroyWindow(hList); } static void test_redraw(void)

1 0

Rein Klazes : user32/tests: In sysparams fix another case where a test changes a users desktop setting .
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: ebbf99abce391fb08467616cf07d91c2256be780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebbf99abce391fb08467616cf… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 2 11:37:13 2009 +0200 user32/tests: In sysparams fix another case where a test changes a users desktop setting. Made several tests pass on NT4 (no SP), Vista and Win2k8. --- dlls/user32/tests/sysparams.c | 53 ++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index d7adfa4..165226a 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -709,11 +709,15 @@ static void test_SPI_SETBORDER( void ) /* 6 */ BOOL rc; UINT old_border; NONCLIENTMETRICSA ncmsave; - INT CaptionWidth; + INT CaptionWidth, + PaddedBorderWidth; ncmsave.cbSize = sizeof( ncmsave); rc=SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncmsave, 0); - ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); + if( !rc) { + win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); + return; + } /* CaptionWidth from the registry may have different value of iCaptionWidth * from the non client metrics (observed on WinXP). * Fix this so we can safely restore settings with the nonclientmetrics */ @@ -735,8 +739,10 @@ static void test_SPI_SETBORDER( void ) /* 6 */ if (!test_error_msg(rc,"SPI_{GET,SET}BORDER")) return; /* FIXME: include new PaddedBorderWidth parameter */ - if( old_border != ncmsave.iBorderWidth){ - win_skip( "Can not reliable restore border width yet\n"); + PaddedBorderWidth = ncmsave.iBorderWidth - old_border; + if( PaddedBorderWidth){ + win_skip( "Can not reliable restore border width yet (PaddedBorderWidth = %d)\n", + PaddedBorderWidth); return; } /* This will restore sane values if the test hang previous run. */ @@ -1395,6 +1401,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ Ncmstart.cbSize = sizeof(NONCLIENTMETRICSA); trace("testing SPI_{GET,SET}NONCLIENTMETRICS\n"); + change_counter = 0; SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmorig, FALSE ); if (!test_error_msg(rc,"SPI_{GET,SET}NONCLIENTMETRICS")) @@ -1448,7 +1455,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ ok(rc!=0,"SystemParametersInfoA: rc=%d err=%d\n",rc,GetLastError()); /* test registry entries */ TEST_NONCLIENTMETRICS_REG( Ncmcur) - /* test the systemm metrics with these settings */ + /* test the system metrics with these settings */ test_GetSystemMetrics(); /* now for something invalid: increase the {menu|caption|smcaption} fonts by a large amount will increase the {menu|caption|smcaption} height*/ @@ -1483,19 +1490,22 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ "SmCaptionHeight: %d expected %d\n", Ncmcur.iSmCaptionHeight, expect); ok( Ncmcur.iCaptionWidth == 8 || + Ncmcur.iCaptionWidth == 12 || /* Vista, W7b */ Ncmcur.iCaptionWidth == Ncmstart.iCaptionWidth, /* with windows XP theme, the value never changes */ - "CaptionWidth: %d expected 8\n", Ncmcur.iCaptionWidth); + "CaptionWidth: %d expected 8, 12 or %d\n", Ncmcur.iCaptionWidth, Ncmstart.iCaptionWidth); ok( Ncmcur.iScrollWidth == 8, "ScrollWidth: %d expected 8\n", Ncmcur.iScrollWidth); ok( Ncmcur.iScrollHeight == 8, "ScrollHeight: %d expected 8\n", Ncmcur.iScrollHeight); - /* test the systemm metrics with these settings */ + /* test the system metrics with these settings */ test_GetSystemMetrics(); /* restore */ rc=SystemParametersInfoA( SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &Ncmorig, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); test_change_message( SPI_SETNONCLIENTMETRICS, 0 ); ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%d\n",rc,GetLastError()); + /* test the system metrics with these settings */ + test_GetSystemMetrics(); } static void test_SPI_SETMINIMIZEDMETRICS( void ) /* 44 */ @@ -2414,6 +2424,14 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ) test_SPI_SETMOUSEBUTTONSWAP(); /* 33 */ test_SPI_SETFASTTASKSWITCH(); /* 36 */ test_SPI_SETDRAGFULLWINDOWS(); /* 37 */ + /* test_WM_DISPLAYCHANGE seems to be somewhat buggy on + * some versions of Windows (Vista, Win2k8, Win7B) in that + * not all metrics are properly restored. Problems are + * SM_CXMAXTRACK, SM_CYMAXTRACK + * Fortunately setting the Non-Client metrics like in + * test_SPI_SETNONCLIENTMETRICS will corect this. That is why + * we do the DISPLAY change now... */ + test_WM_DISPLAYCHANGE(); test_SPI_SETNONCLIENTMETRICS(); /* 42 */ test_SPI_SETMINIMIZEDMETRICS(); /* 44 */ test_SPI_SETICONMETRICS(); /* 46 */ @@ -2433,7 +2451,6 @@ static DWORD WINAPI SysParamsThreadFunc( LPVOID lpParam ) test_SPI_SETWHEELSCROLLCHARS(); /* 108 */ test_SPI_SETWALLPAPER(); /* 115 */ - test_WM_DISPLAYCHANGE(); SendMessageA( ghTestWnd, WM_DESTROY, 0, 0 ); return 0; @@ -2514,10 +2531,11 @@ static void test_GetSystemMetrics( void) { TEXTMETRICA tmMenuFont; UINT IconSpacing, IconVerticalSpacing; + BOOL rc; HDC hdc = CreateIC( "Display", 0, 0, 0); UINT avcwCaption; - INT CaptionWidth; + INT CaptionWidthfromreg; MINIMIZEDMETRICS minim; NONCLIENTMETRICS ncm; SIZE screen; @@ -2525,11 +2543,14 @@ static void test_GetSystemMetrics( void) minim.cbSize = sizeof( minim); ncm.cbSize = sizeof( ncm); SystemParametersInfo( SPI_GETMINIMIZEDMETRICS, 0, &minim, 0); - SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); - + rc = SystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); + if( !rc) { + win_skip("SPI_GETNONCLIENTMETRICS is not available\n"); + return; + } /* CaptionWidth from the registry may have different value of iCaptionWidth * from the non client metrics (observed on WinXP) */ - CaptionWidth = metricfromreg( + CaptionWidthfromreg = metricfromreg( "Control Panel\\Desktop\\WindowMetrics","CaptionWidth", dpi); get_text_metr_size( hdc, &ncm.lfMenuFont, &tmMenuFont, NULL); get_text_metr_size( hdc, &ncm.lfCaptionFont, NULL, &avcwCaption); @@ -2573,8 +2594,8 @@ static void test_GetSystemMetrics( void) /* SM_RESERVED2 */ /* SM_RESERVED3 */ /* SM_RESERVED4 */ - ok_gsm( SM_CXMIN, 3 * max( CaptionWidth, 8) + GetSystemMetrics( SM_CYSIZE) + - 4 + 4 * avcwCaption + 2 * GetSystemMetrics( SM_CXFRAME)); + ok_gsm( SM_CXMIN, 3 * max( CaptionWidthfromreg >= 0 ? CaptionWidthfromreg : ncm.iCaptionWidth, 8) + + GetSystemMetrics( SM_CYSIZE) + 4 + 4 * avcwCaption + 2 * GetSystemMetrics( SM_CXFRAME)); ok_gsm( SM_CYMIN, GetSystemMetrics( SM_CYCAPTION) + 2 * GetSystemMetrics( SM_CYFRAME)); ok_gsm_2( SM_CXSIZE, @@ -2661,8 +2682,8 @@ static void test_GetSystemMetrics( void) ncm.iBorderWidth, ncm.iCaptionWidth, ncm.iCaptionHeight, IconSpacing, IconVerticalSpacing); trace( "MenuHeight %d MenuWidth %d ScrollHeight %d ScrollWidth %d SmCaptionHeight %d SmCaptionWidth %d\n", ncm.iMenuHeight, ncm.iMenuWidth, ncm.iScrollHeight, ncm.iScrollWidth, ncm.iSmCaptionHeight, ncm.iSmCaptionWidth); - trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d\n", - avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidth); + trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d screen %d,%d\n", + avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidthfromreg, screen.cx, screen.cy); } ReleaseDC( 0, hdc); }

1 0

Vincent Povirk : ole32: When renaming a storage element, delete from the current iface.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 9c02fda4a920887ca1e2148f45808abbbd62c834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c02fda4a920887ca1e2148f4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 1 10:22:43 2009 -0500 ole32: When renaming a storage element, delete from the current iface. --- dlls/ole32/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9f3148b..2111b90 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -912,7 +912,7 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( * Invoke Destroy to get rid of the ole property and automatically redo * the linking of its previous and next members... */ - IStorage_DestroyElement((IStorage*)This->ancestorStorage, pwcsOldName); + IStorage_DestroyElement(iface, pwcsOldName); } else

1 0

Michael Stefaniuc : comctl32/tests: Use LONG instead of long.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 1513dd2073576508935de88767d752b10010bdf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1513dd2073576508935de8876… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Apr 2 12:04:50 2009 +0200 comctl32/tests: Use LONG instead of long. --- dlls/comctl32/tests/datetime.c | 2 +- dlls/comctl32/tests/header.c | 4 ++-- dlls/comctl32/tests/listview.c | 6 +++--- dlls/comctl32/tests/monthcal.c | 4 ++-- dlls/comctl32/tests/tab.c | 4 ++-- dlls/comctl32/tests/trackbar.c | 4 ++-- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/tests/updown.c | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index caef276..8fdbbe5 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -140,7 +140,7 @@ struct subclass_info static LRESULT WINAPI datetime_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index ec73803..7661253 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -404,7 +404,7 @@ struct subclass_info static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -425,7 +425,7 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index f7b34af..9157ec0 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -153,7 +153,7 @@ struct subclass_info static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -217,7 +217,7 @@ static HWND create_parent_window(void) static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -300,7 +300,7 @@ static HWND create_custom_listview_control(DWORD style) static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index f116da5..1ca1997 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -378,7 +378,7 @@ static void test_monthcal(void) static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -456,7 +456,7 @@ static HWND create_parent_window(void) static LRESULT WINAPI monthcal_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 7cee79d..3bf6894 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -310,7 +310,7 @@ create_tabcontrol (DWORD style, DWORD mask) static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -378,7 +378,7 @@ struct subclass_info static LRESULT WINAPI tabSubclassProcess(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index e2a3c76..d94ffe9 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -392,7 +392,7 @@ struct subclass_info }; static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam){ - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -453,7 +453,7 @@ static HWND create_parent_window(void){ static LRESULT WINAPI trackbar_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam){ struct subclass_info *info = (struct subclass_info *) GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 9ef6a99..5f310b5 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -665,7 +665,7 @@ static void TestGetSet(void) /* This function hooks in and records all messages to the treeview control */ static LRESULT WINAPI TreeviewWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; WNDPROC lpOldProc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 2d6d437..433c190 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -193,7 +193,7 @@ static const struct message test_updown_destroy_seq[] = { static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -262,7 +262,7 @@ struct subclass_info static LRESULT WINAPI edit_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg; @@ -310,7 +310,7 @@ static HWND create_edit_control(void) static LRESULT WINAPI updown_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct subclass_info *info = (struct subclass_info *)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - static long defwndproc_counter = 0; + static LONG defwndproc_counter = 0; LRESULT ret; struct message msg;

1 0

Rob Shearman : include: Add defines for NI_MAXHOST and NI_MAXSERV to ws2tcpip.h.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 9993b0a079903368224b3f889075bdc773cfae28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9993b0a079903368224b3f889… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Apr 1 17:13:38 2009 +0100 include: Add defines for NI_MAXHOST and NI_MAXSERV to ws2tcpip.h. --- include/ws2tcpip.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 8084170..fc9f258 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -92,6 +92,14 @@ typedef ADDRINFOA ADDRINFO, *LPADDRINFO; # define WS_EAI_SOCKTYPE WSAESOCKTNOSUPPORT #endif +#ifndef USE_WS_PREFIX +# define NI_MAXHOST 1025 +# define NI_MAXSERV 32 +#else +# define WS_NI_MAXHOST 1025 +# define WS_NI_MAXSERV 32 +#endif + /* Possible Windows flags for getnameinfo() */ #ifndef USE_WS_PREFIX # define NI_NOFQDN 0x01

1 0

Vincent Povirk : gdiplus: GdipDrawString: Handle either a width or height of 0 sanely.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: 0879b767aef1d295083dcb448fcc63ef2c00364b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0879b767aef1d295083dcb448… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 1 14:08:12 2009 -0500 gdiplus: GdipDrawString: Handle either a width or height of 0 sanely. Based on Aric's recent patch. --- dlls/gdiplus/graphics.c | 27 ++++++++++++++++---- dlls/gdiplus/tests/graphics.c | 52 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5d1cbd6..2a98ee5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2011,20 +2011,35 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string rectcpy[3].Y = rectcpy[2].Y = rect->Y + rect->Height; transform_and_round_points(graphics, corners, rectcpy, 4); - if(roundr(rect->Width) == 0 && roundr(rect->Height) == 0){ - rel_width = rel_height = 1.0; - nwidth = nheight = INT_MAX; + if (roundr(rect->Width) == 0) + { + rel_width = 1.0; + nwidth = INT_MAX; } - else{ + else + { rel_width = sqrt((corners[1].x - corners[0].x) * (corners[1].x - corners[0].x) + (corners[1].y - corners[0].y) * (corners[1].y - corners[0].y)) / rect->Width; + nwidth = roundr(rel_width * rect->Width); + } + + if (roundr(rect->Height) == 0) + { + rel_height = 1.0; + nheight = INT_MAX; + } + else + { rel_height = sqrt((corners[2].x - corners[1].x) * (corners[2].x - corners[1].x) + (corners[2].y - corners[1].y) * (corners[2].y - corners[1].y)) / rect->Height; - - nwidth = roundr(rel_width * rect->Width); nheight = roundr(rel_height * rect->Height); + } + + if (roundr(rect->Width) != 0 && roundr(rect->Height) != 0) + { + /* FIXME: If only the width or only the height is 0, we should probably still clip */ rgn = CreatePolygonRgn(corners, 4, ALTERNATE); SelectClipRgn(graphics->hdc, rgn); } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 8091a9a..7199151 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -935,6 +935,57 @@ static void test_textcontrast(void) ReleaseDC(0, hdc); } +static void test_GdipDrawString(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpFont *fnt = NULL; + RectF rect; + GpStringFormat *format; + GpBrush *brush; + LOGFONTA logfont; + HDC hdc = GetDC(0); + static const WCHAR string[] = {'T','e','s','t',0}; + + memset(&logfont,0,sizeof(logfont)); + strcpy(logfont.lfFaceName,"Arial"); + logfont.lfHeight = 12; + logfont.lfCharSet = DEFAULT_CHARSET; + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipCreateFontFromLogfontA(hdc, &logfont, &fnt); + if (status == FileNotFound) + { + skip("Arial not installed.\n"); + return; + } + expect(Ok, status); + + status = GdipCreateSolidFill((ARGB)0xdeadbeef, (GpSolidFill**)&brush); + expect(Ok, status); + + status = GdipCreateStringFormat(0,0,&format); + expect(Ok, status); + + rect.X = 0; + rect.Y = 0; + rect.Width = 0; + rect.Height = 12; + + status = GdipDrawString(graphics, string, 4, fnt, &rect, format, brush); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + GdipDeleteBrush(brush); + GdipDeleteFont(fnt); + GdipDeleteStringFormat(format); + + ReleaseDC(0, hdc); +} + + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -954,6 +1005,7 @@ START_TEST(graphics) test_GdipDrawArcI(); test_GdipDrawLineI(); test_GdipDrawLinesI(); + test_GdipDrawString(); test_Get_Release_DC(); test_transformpoints(); test_get_set_clip();

1 0

Jacek Caban : urlmon: Register CLSID_DeCompMimeFilter.
by Alexandre Julliard 02 Apr '09

02 Apr '09

Module: wine Branch: master Commit: eb32e9ec1a1da37a81c99ca162251ade3408abf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb32e9ec1a1da37a81c99ca16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 2 00:16:31 2009 +0200 urlmon: Register CLSID_DeCompMimeFilter. --- dlls/urlmon/regsvr.c | 23 ++++++++++++----------- dlls/urlmon/urlmon.inf | 21 ++++++++++++++++++--- include/urlmon.idl | 1 + 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c index 2728ced..9561a23 100644 --- a/dlls/urlmon/regsvr.c +++ b/dlls/urlmon/regsvr.c @@ -513,10 +513,10 @@ static struct regsvr_interface const interface_list[] = { #define INF_SET_CLSID(clsid) \ do \ { \ - static CHAR name[] = "CLSID_" #clsid; \ + static CHAR name[] = #clsid; \ \ pse[i].pszName = name; \ - clsids[i++] = &CLSID_ ## clsid; \ + clsids[i++] = &clsid; \ } while (0) static HRESULT register_inf(BOOL doregister) @@ -525,19 +525,20 @@ static HRESULT register_inf(BOOL doregister) HMODULE hAdvpack; HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); STRTABLEA strtable; - STRENTRYA pse[7]; - static CLSID const *clsids[34]; + STRENTRYA pse[8]; + static CLSID const *clsids[8]; unsigned int i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; - INF_SET_CLSID(CdlProtocol); - INF_SET_CLSID(FileProtocol); - INF_SET_CLSID(FtpProtocol); - INF_SET_CLSID(GopherProtocol); - INF_SET_CLSID(HttpProtocol); - INF_SET_CLSID(HttpSProtocol); - INF_SET_CLSID(MkProtocol); + INF_SET_CLSID(CLSID_CdlProtocol); + INF_SET_CLSID(CLSID_FileProtocol); + INF_SET_CLSID(CLSID_FtpProtocol); + INF_SET_CLSID(CLSID_GopherProtocol); + INF_SET_CLSID(CLSID_HttpProtocol); + INF_SET_CLSID(CLSID_HttpSProtocol); + INF_SET_CLSID(CLSID_MkProtocol); + INF_SET_CLSID(CLSID_DeCompMimeFilter); for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { pse[i].pszValue = heap_alloc(39); diff --git a/dlls/urlmon/urlmon.inf b/dlls/urlmon/urlmon.inf index efdf4ef..63d88c4 100644 --- a/dlls/urlmon/urlmon.inf +++ b/dlls/urlmon/urlmon.inf @@ -3,11 +3,19 @@ Signature="$CHICAGO$" [RegisterDll] -AddReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg +AddReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg [UnregisterDll] -DelReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg +DelReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg + + +[Classes.Reg] + +;; CLSID_DeCompMimeFilter +HKCR,"CLSID\%CLSID_DeCompMimeFilter%",,,"AP lzdhtml encoding/decoding Filter" +HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32",,,"%MODULE%" +HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32","ThreadingModel",,"Apartment" [Protocols.Reg] @@ -26,7 +34,12 @@ HKCR,"PROTOCOLS\Handler\http","CLSID",,"%CLSID_HttpProtocol%" HKCR,"PROTOCOLS\Handler\https",,,"https: Asynchronous Pluggable Protocol Handler" HKCR,"PROTOCOLS\Handler\https","CLSID",,"%CLSID_HttpsProtocol%" HKCR,"PROTOCOLS\Handler\mk",,,"mk: Asynchronous Pluggable Protocol Handler" -HKCR,"PROTOCOLS\Handler\mk","CLSID",,"%CLSID_MkProtocol%" +HKCR,"PROTOCOLS\Filter\deflate",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\deflate","CLSID",,"%CLSID_DeCompMimeFilter%" +HKCR,"PROTOCOLS\Filter\gzip",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\gzip","CLSID",,"%CLSID_DeCompMimeFilter%" +HKCR,"PROTOCOLS\Filter\lzdhtml",,,"AP Deflate Encoding/Decoding Filter" +HKCR,"PROTOCOLS\Filter\lzdhtml","CLSID",,"%CLSID_DeCompMimeFilter%" [ZoneMap.Reg] @@ -448,6 +461,8 @@ HKLM,"%ZONES_UNTRUSTED%","1E05",0x10003,0x10000 [Strings] +MODULE="urlmon.dll" + PATH_ZONEMAP="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap" PATH_ZONEMAP_PROTOCOLS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\ProtocolDefaults" PATH_ZONEMAP_DOMAINS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\Domains" diff --git a/include/urlmon.idl b/include/urlmon.idl index 1244ca4..93bdd0f 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1521,6 +1521,7 @@ cpp_quote("DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") cpp_quote("DEFINE_GUID(IID_IAsyncBindCtx, 0x79EAC9D4, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") cpp_quote("DEFINE_GUID(CLSID_StdURLMoniker, 0x79EAC9E0, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);") +cpp_quote("DEFINE_GUID(CLSID_DeCompMimeFilter, 0x8f6b0360, 0xb80d, 0x11d0, 0xa9,0xb3, 0x00,0x60,0x97,0x94,0x23,0x11);") cpp_quote("DEFINE_GUID(CLSID_CdlProtocol, 0x3dd53d40, 0x7b8b, 0x11D0, 0xb0,0x13, 0x00,0xaa,0x00,0x59,0xce,0x02);") cpp_quote("DEFINE_GUID(CLSID_FileProtocol, 0x79EAC9E7, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B);")

1 0