October 2009 - Wine-Commits

Alexandre Julliard : user32: Add a helper to retrieve the dimensions of an icon.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: 62ac036bc6148dffc53543a0184f6248bfbcc390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ac036bc6148dffc53543a01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 19:44:45 2009 +0200 user32: Add a helper to retrieve the dimensions of an icon. --- dlls/user32/cursoricon.c | 14 ++++++++++++++ dlls/user32/static.c | 32 ++++++++++++++++---------------- dlls/user32/uitools.c | 9 ++------- dlls/user32/user_private.h | 1 + 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1ae33aa..3872c8a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -473,6 +473,20 @@ void CURSORICON_FreeModuleIcons( HMODULE16 hMod16 ) LeaveCriticalSection( &IconCrst ); } +/********************************************************************** + * get_icon_size + */ +BOOL get_icon_size( HICON handle, SIZE *size ) +{ + CURSORICONINFO *info; + + if (!(info = GlobalLock16( HICON_16(handle) ))) return FALSE; + size->cx = info->nWidth; + size->cy = info->nHeight; + GlobalUnlock16( HICON_16(handle) ); + return TRUE; +} + /* * The following macro functions account for the irregularities of * accessing cursor and icon resources in files and resource entries. diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 69acbc5..6c61db2 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -148,12 +148,12 @@ static void restore_clipping(HDC hdc, HRGN hrgn) static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) { HICON prevIcon; - CURSORICONINFO * info; + SIZE size; if ((style & SS_TYPEMASK) != SS_ICON) return 0; - info = hicon ? GlobalLock16(HICON_16(hicon)) : NULL; - if (hicon && !info) { - WARN("hicon != 0, but info == 0\n"); + if (hicon && !get_icon_size( hicon, &size )) + { + WARN("hicon != 0, but invalid\n"); return 0; } prevIcon = (HICON)SetWindowLongPtrW( hwnd, HICON_GWL_OFFSET, (LONG_PTR)hicon ); @@ -170,11 +170,9 @@ static HICON STATIC_SetIcon( HWND hwnd, HICON hicon, DWORD style ) } else */ { - SetWindowPos( hwnd, 0, 0, 0, info->nWidth, info->nHeight, - SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); + SetWindowPos( hwnd, 0, 0, 0, size.cx, size.cy, SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER ); } } - if (info) GlobalUnlock16(HICON_16(hicon)); return prevIcon; } @@ -573,8 +571,10 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, case STM_GETIMAGE: return (LRESULT)STATIC_GetImage( hwnd, wParam, full_style ); - + case STM_GETICON16: + return HICON_16(STATIC_GetImage( hwnd, IMAGE_ICON, full_style )); + case STM_GETICON: return (LRESULT)STATIC_GetImage( hwnd, IMAGE_ICON, full_style ); @@ -598,6 +598,8 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, break; case STM_SETICON16: + wParam = (WPARAM)HICON_32( (HICON16)wParam ); + /* fall through */ case STM_SETICON: lResult = (LRESULT)STATIC_SetIcon( hwnd, (HICON)wParam, full_style ); STATIC_TryPaintFcn( hwnd, full_style ); @@ -800,13 +802,12 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) RECT rc, iconRect; HBRUSH hbrush; HICON hIcon; - CURSORICONINFO * info; + SIZE size; GetClientRect( hwnd, &rc ); hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc); hIcon = (HICON)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET ); - info = hIcon ? GlobalLock16(HICON_16(hIcon)) : NULL; - if (!hIcon || !info) + if (!hIcon || !get_icon_size( hIcon, &size )) { FillRect(hdc, &rc, hbrush); } @@ -814,10 +815,10 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) { if (style & SS_CENTERIMAGE) { - iconRect.left = (rc.right - rc.left) / 2 - info->nWidth / 2; - iconRect.top = (rc.bottom - rc.top) / 2 - info->nHeight / 2; - iconRect.right = iconRect.left + info->nWidth; - iconRect.bottom = iconRect.top + info->nHeight; + iconRect.left = (rc.right - rc.left) / 2 - size.cx / 2; + iconRect.top = (rc.bottom - rc.top) / 2 - size.cy / 2; + iconRect.right = iconRect.left + size.cx; + iconRect.bottom = iconRect.top + size.cy; } else iconRect = rc; @@ -825,7 +826,6 @@ static void STATIC_PaintIconfn( HWND hwnd, HDC hdc, DWORD style ) DrawIconEx( hdc, iconRect.left, iconRect.top, hIcon, iconRect.right - iconRect.left, iconRect.bottom - iconRect.top, 0, NULL, DI_NORMAL ); } - if (info) GlobalUnlock16(HICON_16(hIcon)); } static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style ) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index a401fc3..c8e9580 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -22,8 +22,8 @@ #include <stdarg.h> #include "windef.h" +#include "winbase.h" #include "wingdi.h" -#include "wine/winuser16.h" #include "winuser.h" #include "user_private.h" #include "wine/unicode.h" @@ -1597,7 +1597,6 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp if(!cx || !cy) { SIZE s; - CURSORICONINFO *ici; BITMAP bm; switch(opcode) @@ -1612,11 +1611,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp break; case DST_ICON: - ici = GlobalLock16((HGLOBAL16)lp); - if(!ici) return FALSE; - s.cx = ici->nWidth; - s.cy = ici->nHeight; - GlobalUnlock16((HGLOBAL16)lp); + if (!get_icon_size( (HICON)lp, &s )) return FALSE; break; case DST_BITMAP: diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 8c49ad3..67fdbb6 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -328,6 +328,7 @@ typedef struct #include "poppack.h" extern void CURSORICON_FreeModuleIcons( HMODULE16 hModule ) DECLSPEC_HIDDEN; +extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; /* Mingw's assert() imports MessageBoxA and gets confused by user32 exporting it */ #ifdef __MINGW32__

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_host.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: 7cb9fe1064f68629cc41901d49a169629d532756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb9fe1064f68629cc41901d4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 15 16:17:28 2009 -0500 mshtml: Implement IHTMLLocation::get_host. --- dlls/mshtml/htmllocation.c | 32 ++++++++++++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index e991cf3..badf111 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -228,12 +228,40 @@ static HRESULT WINAPI HTMLLocation_put_host(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwHostNameLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwHostNameLength){ + *p = NULL; + return S_OK; + } + + if(url.nPort) { + /* <hostname>:<port> */ + const WCHAR format[] = {'%','d',0}; + DWORD len = url.dwHostNameLength + 1 + 5 + 1; + WCHAR buf[len]; + + memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); + buf[url.dwHostNameLength] = ':'; + snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); + *p = SysAllocString(buf); + }else + *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); + + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_hostname(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index 57b6bcf..aaf8ecf 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -58,7 +58,7 @@ static const struct location_test http_test = { http_url, "http://www.winehq.org/?search#hash", FALSE, "http:", TRUE, - "www.winehq.org:80", FALSE, + "www.winehq.org:80", TRUE, "www.winehq.org", FALSE, "80", TRUE, "", FALSE, @@ -72,7 +72,7 @@ static const struct location_test http_file_test = { http_file_url, "http://www.winehq.org/file?search#hash", TRUE, "http:", TRUE, - "www.winehq.org:80", FALSE, + "www.winehq.org:80", TRUE, "www.winehq.org", FALSE, "80", TRUE, "file", FALSE, @@ -86,7 +86,7 @@ static const struct location_test ftp_test = { ftp_url, "ftp://ftp.winehq.org/", TRUE, "ftp:", TRUE, - "ftp.winehq.org:21", FALSE, + "ftp.winehq.org:21", TRUE, "ftp.winehq.org", FALSE, "21", TRUE, "", FALSE, @@ -100,7 +100,7 @@ static const struct location_test ftp_file_test = { ftp_file_url, "ftp://ftp.winehq.org/file", TRUE, "ftp:", TRUE, - "ftp.winehq.org:21", FALSE, + "ftp.winehq.org:21", TRUE, "ftp.winehq.org", FALSE, "21", TRUE, "file", FALSE, @@ -114,7 +114,7 @@ static const struct location_test file_test = { file_url, "file:///C:/windows/win.ini", FALSE, "file:", TRUE, - NULL, FALSE, + NULL, TRUE, NULL, FALSE, "", TRUE, "C:\\windows\\win.ini", TRUE, @@ -195,7 +195,7 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_host(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->host_ok) ok(str_eq_wa(str, test->host),

1 0

Andrew Eikum : mshtml: Implement IHTMLLocation::get_protocol.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: c9adc4149c2dabfeac8b7068cf48d003d51905c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9adc4149c2dabfeac8b7068c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 15 16:17:17 2009 -0500 mshtml: Implement IHTMLLocation::get_protocol. --- dlls/mshtml/htmllocation.c | 23 +++++++++++++++++++++-- dlls/mshtml/tests/htmllocation.c | 12 ++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index e86cee6..e991cf3 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -191,12 +191,31 @@ static HRESULT WINAPI HTMLLocation_put_protocol(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_protocol(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = HTMLLOCATION_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); + URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); if(!p) return E_POINTER; - return E_NOTIMPL; + url.dwSchemeLength = 1; + hres = get_url_components(This, &url); + if(FAILED(hres)) + return hres; + + if(!url.dwSchemeLength) { + FIXME("Unexpected blank protocol\n"); + return E_NOTIMPL; + }else { + WCHAR buf[url.dwSchemeLength + 1]; + memcpy(buf, url.lpszScheme, url.dwSchemeLength * sizeof(WCHAR)); + buf[url.dwSchemeLength] = ':'; + *p = SysAllocStringLen(buf, url.dwSchemeLength + 1); + } + if(!*p) + return E_OUTOFMEMORY; + return S_OK; } static HRESULT WINAPI HTMLLocation_put_host(IHTMLLocation *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index e271f00..57b6bcf 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -57,7 +57,7 @@ static const struct location_test http_test = { "HTTP", http_url, "http://www.winehq.org/?search#hash", FALSE, - "http:", FALSE, + "http:", TRUE, "www.winehq.org:80", FALSE, "www.winehq.org", FALSE, "80", TRUE, @@ -71,7 +71,7 @@ static const struct location_test http_file_test = { "HTTP with file", http_file_url, "http://www.winehq.org/file?search#hash", TRUE, - "http:", FALSE, + "http:", TRUE, "www.winehq.org:80", FALSE, "www.winehq.org", FALSE, "80", TRUE, @@ -85,7 +85,7 @@ static const struct location_test ftp_test = { "FTP", ftp_url, "ftp://ftp.winehq.org/", TRUE, - "ftp:", FALSE, + "ftp:", TRUE, "ftp.winehq.org:21", FALSE, "ftp.winehq.org", FALSE, "21", TRUE, @@ -99,7 +99,7 @@ static const struct location_test ftp_file_test = { "FTP with file", ftp_file_url, "ftp://ftp.winehq.org/file", TRUE, - "ftp:", FALSE, + "ftp:", TRUE, "ftp.winehq.org:21", FALSE, "ftp.winehq.org", FALSE, "21", TRUE, @@ -113,7 +113,7 @@ static const struct location_test file_test = { "FILE", file_url, "file:///C:/windows/win.ini", FALSE, - "file:", FALSE, + "file:", TRUE, NULL, FALSE, NULL, FALSE, "", TRUE, @@ -171,7 +171,7 @@ static void test_protocol(IHTMLLocation *loc, const struct location_test *test) test->name, E_POINTER, hres); hres = IHTMLLocation_get_protocol(loc, &str); - todo_wine ok(hres == S_OK, "%s: get_protocol failed: 0x%08x\n", test->name, hres); + ok(hres == S_OK, "%s: get_protocol failed: 0x%08x\n", test->name, hres); if(hres == S_OK){ if(test->protocol_ok) ok(str_eq_wa(str, test->protocol),

1 0

Alexandre Julliard : user32: Reimplement accelerator functions to use 32-bit user handles instead of 16-bit functions .
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: a7adbf784988c6eb60fdc9a82ed12db726af08e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7adbf784988c6eb60fdc9a82… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 17:35:06 2009 +0200 user32: Reimplement accelerator functions to use 32-bit user handles instead of 16-bit functions. --- dlls/user32/menu.c | 83 ++++--------- dlls/user32/resource.c | 299 ++++++++++++++++++-------------------------- dlls/user32/user_private.h | 1 + 3 files changed, 149 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a7adbf784988c6eb60fdc…

1 0

Alexandre Julliard : user32: Move 16-bit resource functions to user16.c.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: 09d1c52fa09e65ae57589c1be7b74c4032e9e233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d1c52fa09e65ae57589c1be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 15 17:55:46 2009 +0200 user32: Move 16-bit resource functions to user16.c. --- dlls/user32/resource.c | 66 ---------------------------------------- dlls/user32/user16.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 66 deletions(-) diff --git a/dlls/user32/resource.c b/dlls/user32/resource.c index 1085dfa..82ec05b 100644 --- a/dlls/user32/resource.c +++ b/dlls/user32/resource.c @@ -26,9 +26,6 @@ #include "winerror.h" #include "winternl.h" #include "winnls.h" -#include "wine/winbase16.h" -#include "wine/winuser16.h" -#include "wownt32.h" #include "wine/debug.h" #include "user_private.h" @@ -53,24 +50,6 @@ struct accelerator }; /********************************************************************** - * LoadAccelerators [USER.177] - */ -HACCEL16 WINAPI LoadAccelerators16(HINSTANCE16 instance, LPCSTR lpTableName) -{ - HRSRC16 hRsrc; - - TRACE_(accel)("%04x %s\n", instance, debugstr_a(lpTableName) ); - - if (!(hRsrc = FindResource16( instance, lpTableName, (LPSTR)RT_ACCELERATOR ))) { - WARN_(accel)("couldn't find accelerator table resource\n"); - return 0; - } - - TRACE_(accel)("returning HACCEL 0x%x\n", hRsrc); - return LoadResource16(instance,hRsrc); -} - -/********************************************************************** * LoadAcceleratorsW (USER32.@) */ HACCEL WINAPI LoadAcceleratorsW(HINSTANCE instance, LPCWSTR name) @@ -254,51 +233,6 @@ BOOL WINAPI DestroyAcceleratorTable( HACCEL handle ) } /********************************************************************** - * LoadString (USER.176) - */ -INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id, - LPSTR buffer, INT16 buflen ) -{ - HGLOBAL16 hmem; - HRSRC16 hrsrc; - unsigned char *p; - int string_num; - int i; - - TRACE("inst=%04x id=%04x buff=%p len=%d\n", - instance, resource_id, buffer, buflen); - - hrsrc = FindResource16( instance, MAKEINTRESOURCEA((resource_id>>4)+1), (LPSTR)RT_STRING ); - if (!hrsrc) return 0; - hmem = LoadResource16( instance, hrsrc ); - if (!hmem) return 0; - - p = LockResource16(hmem); - string_num = resource_id & 0x000f; - for (i = 0; i < string_num; i++) - p += *p + 1; - - TRACE("strlen = %d\n", (int)*p ); - - if (buffer == NULL) return *p; - i = min(buflen - 1, *p); - if (i > 0) { - memcpy(buffer, p + 1, i); - buffer[i] = '\0'; - } else { - if (buflen > 1) { - buffer[0] = '\0'; - return 0; - } - WARN("Don't know why caller gave buflen=%d *p=%d trying to obtain string '%s'\n", buflen, *p, p + 1); - } - FreeResource16( hmem ); - - TRACE("'%s' loaded !\n", buffer); - return i; -} - -/********************************************************************** * LoadStringW (USER32.@) */ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id, diff --git a/dlls/user32/user16.c b/dlls/user32/user16.c index 5ca8837..f34ae57 100644 --- a/dlls/user32/user16.c +++ b/dlls/user32/user16.c @@ -612,6 +612,85 @@ HBITMAP16 WINAPI LoadBitmap16(HINSTANCE16 hInstance, LPCSTR name) return HBITMAP_16(LoadBitmapA(HINSTANCE_32(hInstance), name)); } +/********************************************************************** + * LoadString (USER.176) + */ +INT16 WINAPI LoadString16( HINSTANCE16 instance, UINT16 resource_id, LPSTR buffer, INT16 buflen ) +{ + HGLOBAL16 hmem; + HRSRC16 hrsrc; + unsigned char *p; + int string_num; + int ret; + + TRACE("inst=%04x id=%04x buff=%p len=%d\n", instance, resource_id, buffer, buflen); + + hrsrc = FindResource16( instance, MAKEINTRESOURCEA((resource_id>>4)+1), (LPSTR)RT_STRING ); + if (!hrsrc) return 0; + hmem = LoadResource16( instance, hrsrc ); + if (!hmem) return 0; + + p = LockResource16(hmem); + string_num = resource_id & 0x000f; + while (string_num--) p += *p + 1; + + if (buffer == NULL) ret = *p; + else + { + ret = min(buflen - 1, *p); + if (ret > 0) + { + memcpy(buffer, p + 1, ret); + buffer[ret] = '\0'; + } + else if (buflen > 1) + { + buffer[0] = '\0'; + ret = 0; + } + TRACE( "%s loaded\n", debugstr_a(buffer)); + } + FreeResource16( hmem ); + return ret; +} + +/********************************************************************** + * LoadAccelerators (USER.177) + */ +HACCEL16 WINAPI LoadAccelerators16(HINSTANCE16 instance, LPCSTR lpTableName) +{ + HRSRC16 hRsrc; + HGLOBAL16 hMem; + ACCEL16 *table16; + HACCEL ret = 0; + + TRACE("%04x %s\n", instance, debugstr_a(lpTableName) ); + + if (!(hRsrc = FindResource16( instance, lpTableName, (LPSTR)RT_ACCELERATOR )) || + !(hMem = LoadResource16(instance,hRsrc))) + { + WARN("couldn't find %04x %s\n", instance, debugstr_a(lpTableName)); + return 0; + } + if ((table16 = LockResource16( hMem ))) + { + DWORD i, count = SizeofResource16( instance, hRsrc ) / sizeof(*table16); + ACCEL *table = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*table) ); + if (table) + { + for (i = 0; i < count; i++) + { + table[i].fVirt = table16[i].fVirt & 0x7f; + table[i].key = table16[i].key; + table[i].cmd = table16[i].cmd; + } + ret = CreateAcceleratorTableA( table, count ); + HeapFree( GetProcessHeap(), 0, table ); + } + } + FreeResource16( hMem ); + return HACCEL_16(ret); +} /*********************************************************************** * GetSystemMetrics (USER.179)

1 0

Jörg Höhle : runtest: -i sets WINETEST_INTERACTIVE=1 and enables even more tests.
by Alexandre Julliard Oct. 16, 2009

Oct. 16, 2009

Module: wine Branch: master Commit: baac2a6c59577e2a385d5a86c399c872a389e16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=baac2a6c59577e2a385d5a86c… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 10 05:54:16 2009 +0200 runtest: -i sets WINETEST_INTERACTIVE=1 and enables even more tests. --- tools/runtest | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/runtest b/tools/runtest index ad8ef72..86f8680 100755 --- a/tools/runtest +++ b/tools/runtest @@ -33,6 +33,7 @@ input_file: the source code for the test program Options: -q quiet mode -v verbose mode (can be specified multiple times) + -i interactive mode (runs even more tests) -s announce successful tests -p prog name of the program to run for C tests -P name set the current platform name @@ -62,6 +63,10 @@ while [ "$#" -gt 0 ]; do -v) WINETEST_DEBUG=`expr $WINETEST_DEBUG + 1` ;; + -i) + WINETEST_INTERACTIVE=1 + export WINETEST_INTERACTIVE + ;; -s) WINETEST_REPORT_SUCCESS=1 export WINETEST_REPORT_SUCCESS

1 0

Hans Leidekker : msi: Eliminate the last parameter from ACTION_PerformActionSequence.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: a187b43ddd79c01040ad6d2e5cff6d3dd7c53c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a187b43ddd79c01040ad6d2e5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 15 12:49:10 2009 +0200 msi: Eliminate the last parameter from ACTION_PerformActionSequence. --- dlls/msi/action.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 1a06600..e08f25a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6323,10 +6323,10 @@ UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UINT scrip return rc; } -static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) +static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) { UINT rc = ERROR_SUCCESS; - MSIRECORD *row = 0; + MSIRECORD *row; static const WCHAR ExecSeqQuery[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', @@ -6339,7 +6339,7 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) '`', ' ', 'W','H','E','R','E',' ','`','S','e','q','u','e','n','c','e','`', ' ', '=',' ','%','i',0}; - if (UI) + if (needs_ui_sequence(package)) row = MSI_QueryGetRecord(package->db, UISeqQuery, seq); else row = MSI_QueryGetRecord(package->db, ExecSeqQuery, seq); @@ -6355,25 +6355,26 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI) /* this is a hack to skip errors in the condition code */ if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE) - goto end; + { + msiobj_release(&row->hdr); + return ERROR_SUCCESS; + } action = MSI_RecordGetString(row, 1); if (!action) { ERR("failed to fetch action\n"); - rc = ERROR_FUNCTION_FAILED; - goto end; + msiobj_release(&row->hdr); + return ERROR_FUNCTION_FAILED; } - if (UI) + if (needs_ui_sequence(package)) rc = ACTION_PerformUIAction(package, action, -1); else rc = ACTION_PerformAction(package, action, -1, FALSE); -end: + msiobj_release(&row->hdr); } - else - rc = ERROR_SUCCESS; return rc; } @@ -6386,7 +6387,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, LPCWSTR szCommandLine ) { UINT rc; - BOOL ui = FALSE, ui_exists; + BOOL ui_exists; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; @@ -6451,7 +6452,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, { package->script->InWhatSequence |= SEQUENCE_UI; rc = ACTION_ProcessUISequence(package); - ui = TRUE; ui_exists = ui_sequence_exists(package); if (rc == ERROR_SUCCESS || !ui_exists) { @@ -6466,13 +6466,13 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, /* process the ending type action */ if (rc == ERROR_SUCCESS) - ACTION_PerformActionSequence(package, -1, ui); + ACTION_PerformActionSequence(package, -1); else if (rc == ERROR_INSTALL_USEREXIT) - ACTION_PerformActionSequence(package, -2, ui); + ACTION_PerformActionSequence(package, -2); else if (rc == ERROR_INSTALL_SUSPEND) - ACTION_PerformActionSequence(package, -4, ui); + ACTION_PerformActionSequence(package, -4); else /* failed */ - ACTION_PerformActionSequence(package, -3, ui); + ACTION_PerformActionSequence(package, -3); /* finish up running custom actions */ ACTION_FinishCustomActions(package);

1 0

Hans Leidekker : msi: Use a function to test the UI level instead of passing a boolean around.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: e3aa2f33d93e1f9cc1ab19b87ad7fd34f490a887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3aa2f33d93e1f9cc1ab19b87… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 15 12:48:26 2009 +0200 msi: Use a function to test the UI level instead of passing a boolean around. --- dlls/msi/action.c | 55 +++++++++++++++++----------------------------------- 1 files changed, 18 insertions(+), 37 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b75cadc..1a06600 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -693,6 +693,12 @@ static UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) return ERROR_SUCCESS; } +static BOOL needs_ui_sequence(MSIPACKAGE *package) +{ + INT level = msi_get_property_int(package, szUILevel, 0); + return (level & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; +} + static UINT msi_set_context(MSIPACKAGE *package) { WCHAR val[10]; @@ -714,16 +720,11 @@ static UINT msi_set_context(MSIPACKAGE *package) return ERROR_SUCCESS; } -typedef struct { - MSIPACKAGE* package; - BOOL UI; -} iterate_action_param; - static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) { - iterate_action_param *iap = param; UINT rc; LPCWSTR cond, action; + MSIPACKAGE *package = param; action = MSI_RecordGetString(row,1); if (!action) @@ -736,21 +737,21 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param) cond = MSI_RecordGetString(row,2); /* this is a hack to skip errors in the condition code */ - if (MSI_EvaluateConditionW(iap->package, cond) == MSICONDITION_FALSE) + if (MSI_EvaluateConditionW(package, cond) == MSICONDITION_FALSE) { TRACE("Skipping action: %s (condition is false)\n", debugstr_w(action)); return ERROR_SUCCESS; } - if (iap->UI) - rc = ACTION_PerformUIAction(iap->package,action,-1); + if (needs_ui_sequence(package)) + rc = ACTION_PerformUIAction(package, action, -1); else - rc = ACTION_PerformAction(iap->package,action,-1,FALSE); + rc = ACTION_PerformAction(package, action, -1, FALSE); msi_dialog_check_messages( NULL ); - if (iap->package->CurrentInstallState != ERROR_SUCCESS ) - rc = iap->package->CurrentInstallState; + if (package->CurrentInstallState != ERROR_SUCCESS) + rc = package->CurrentInstallState; if (rc == ERROR_FUNCTION_NOT_CALLED) rc = ERROR_SUCCESS; @@ -772,23 +773,13 @@ UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR szTable, INT iSequenceMode ) '`','S','e','q','u','e','n','c','e','`',' ', '>',' ','0',' ','O','R','D','E','R',' ','B','Y',' ', '`','S','e','q','u','e','n','c','e','`',0}; - iterate_action_param iap; - - /* - * FIXME: probably should be checking UILevel in the - * ACTION_PerformUIAction/ACTION_PerformAction - * rather than saving the UI level here. Those - * two functions can be merged too. - */ - iap.package = package; - iap.UI = TRUE; TRACE("%p %s %i\n", package, debugstr_w(szTable), iSequenceMode ); r = MSI_OpenQuery( package->db, &view, query, szTable ); if (r == ERROR_SUCCESS) { - r = MSI_IterateRecords( view, NULL, ITERATE_Actions, &iap ); + r = MSI_IterateRecords( view, NULL, ITERATE_Actions, package ); msiobj_release(&view->hdr); } @@ -806,7 +797,6 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) '`','S','e','q','u','e','n','c','e','`',' ', '>',' ','%','i',' ', 'O','R','D','E','R',' ', 'B','Y',' ', '`','S','e','q','u','e','n','c','e','`',0 }; - MSIRECORD * row = 0; static const WCHAR IVQuery[] = {'S','E','L','E','C','T',' ','`','S','e','q','u','e','n','c','e','`', ' ', 'F','R','O','M',' ','`','I','n','s','t','a','l','l', @@ -815,10 +805,6 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) ' ','\'', 'I','n','s','t','a','l','l', 'V','a','l','i','d','a','t','e','\'', 0}; INT seq = 0; - iterate_action_param iap; - - iap.package = package; - iap.UI = FALSE; if (package->script->ExecuteSequenceRun) { @@ -831,7 +817,7 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) /* get the sequence number */ if (UIran) { - row = MSI_QueryGetRecord(package->db, IVQuery); + MSIRECORD *row = MSI_QueryGetRecord(package->db, IVQuery); if( !row ) return ERROR_FUNCTION_FAILED; seq = MSI_RecordGetInteger(row,1); @@ -843,7 +829,7 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) { TRACE("Running the actions\n"); - rc = MSI_IterateRecords(view, NULL, ITERATE_Actions, &iap); + rc = MSI_IterateRecords(view, NULL, ITERATE_Actions, package); msiobj_release(&view->hdr); } @@ -862,18 +848,13 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) '`','S','e','q','u','e','n','c','e','`',' ', '>',' ','0',' ','O','R','D','E','R',' ','B','Y',' ', '`','S','e','q','u','e','n','c','e','`',0}; - iterate_action_param iap; - - iap.package = package; - iap.UI = TRUE; rc = MSI_DatabaseOpenViewW(package->db, ExecSeqQuery, &view); - if (rc == ERROR_SUCCESS) { TRACE("Running the actions\n"); - rc = MSI_IterateRecords(view, NULL, ITERATE_Actions, &iap); + rc = MSI_IterateRecords(view, NULL, ITERATE_Actions, package); msiobj_release(&view->hdr); } @@ -6466,7 +6447,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_clone_properties( package ); msi_set_context( package ); - if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED ) + if (needs_ui_sequence( package)) { package->script->InWhatSequence |= SEQUENCE_UI; rc = ACTION_ProcessUISequence(package);

1 0

Hans Leidekker : msi: Define common strings only once.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: 843382f28472a312c9a5beefa4298f7c4b4a5ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=843382f28472a312c9a5beefa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 15 12:46:27 2009 +0200 msi: Define common strings only once. --- dlls/msi/action.c | 162 +++++++++++++------------------------------------- dlls/msi/appsearch.c | 20 ++---- dlls/msi/classes.c | 13 ---- dlls/msi/cond.y | 1 - dlls/msi/custom.c | 37 +++-------- dlls/msi/database.c | 11 +-- dlls/msi/dialog.c | 19 ++---- dlls/msi/events.c | 4 - dlls/msi/files.c | 11 +--- dlls/msi/helpers.c | 8 +-- dlls/msi/media.c | 5 +- dlls/msi/msi.c | 26 ++------ dlls/msi/msipriv.h | 44 ++++++++++++-- dlls/msi/package.c | 64 ++++++++------------ dlls/msi/registry.c | 10 +--- dlls/msi/source.c | 11 +--- dlls/msi/string.c | 3 +- dlls/msi/table.c | 3 - dlls/msi/upgrade.c | 7 +-- 19 files changed, 145 insertions(+), 314 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=843382f28472a312c9a5b…

1 0

Nikolay Sivov : comctl32/tooltips: Remove unneeded helper parameter.
by Alexandre Julliard Oct. 15, 2009

Oct. 15, 2009

Module: wine Branch: master Commit: f84a6bdf3ae8b11e9ca40c6e0b38d876f6ea7342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f84a6bdf3ae8b11e9ca40c6e0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 15 14:54:23 2009 +0400 comctl32/tooltips: Remove unneeded helper parameter. --- dlls/comctl32/tooltips.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index b6412a8..dba5b3f 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -213,15 +213,12 @@ TOOLTIPS_InitSystemSettings (TOOLTIPS_INFO *infoPtr) /* Custom draw routines */ static void -TOOLTIPS_customdraw_fill(NMTTCUSTOMDRAW *lpnmttcd, - const HWND hwnd, +TOOLTIPS_customdraw_fill(const TOOLTIPS_INFO *infoPtr, NMTTCUSTOMDRAW *lpnmttcd, HDC hdc, const RECT *rcBounds, UINT uFlags) { - TOOLTIPS_INFO *infoPtr = TOOLTIPS_GetInfoPtr(hwnd); - ZeroMemory(lpnmttcd, sizeof(NMTTCUSTOMDRAW)); lpnmttcd->uDrawFlags = uFlags; - lpnmttcd->nmcd.hdr.hwndFrom = hwnd; + lpnmttcd->nmcd.hdr.hwndFrom = infoPtr->hwndSelf; lpnmttcd->nmcd.hdr.code = NM_CUSTOMDRAW; if (infoPtr->nCurrentTool != -1) { TTTOOL_INFO *toolPtr = &infoPtr->tools[infoPtr->nCurrentTool]; @@ -276,7 +273,7 @@ TOOLTIPS_Refresh (const TOOLTIPS_INFO *infoPtr, HDC hdc) /* Custom draw - Call PrePaint once initial properties set up */ /* Note: Contrary to MSDN, CDRF_SKIPDEFAULT still draws a tooltip */ - TOOLTIPS_customdraw_fill(&nmttcd, infoPtr->hwndSelf, hdc, &rc, uFlags); + TOOLTIPS_customdraw_fill(infoPtr, &nmttcd, hdc, &rc, uFlags); cdmode = TOOLTIPS_notify_customdraw(CDDS_PREPAINT, &nmttcd); uFlags = nmttcd.uDrawFlags;

1 0