November 2008 - Wine-commits

Kusanagi Kouichi : winex11: Implement large data transfers.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: fcaeffb7b494acc5acd5af165b7f5cf1a6080986 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcaeffb7b494acc5acd5af165… Author: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> Date: Fri Oct 31 12:18:00 2008 +0900 winex11: Implement large data transfers. --- dlls/winex11.drv/clipboard.c | 105 ++++++++++++++++++++++++++++++++++----- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 93 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 8a35a0b..ec7d5ab 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -325,7 +325,7 @@ static Window thread_selection_wnd(void) XSetWindowAttributes attr; attr.event_mask = (ExposureMask | KeyPressMask | KeyReleaseMask | PointerMotionMask | - ButtonPressMask | ButtonReleaseMask | EnterWindowMask); + ButtonPressMask | ButtonReleaseMask | EnterWindowMask | PropertyChangeMask); wine_tsx11_lock(); w = XCreateWindow(thread_data->display, root_window, 0, 0, 1, 1, 0, screen_depth, @@ -1231,15 +1231,17 @@ static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, At HANDLE hUnicodeText; XTextProperty txtprop; - wine_tsx11_lock(); - if (!XGetTextProperty(display, w, &txtprop, prop)) + if (!X11DRV_CLIPBOARD_ReadProperty(display, w, prop, &txtprop.value, &txtprop.nitems)) { - wine_tsx11_unlock(); return 0; } + txtprop.encoding = x11drv_atom(COMPOUND_TEXT); + txtprop.format = 8; + wine_tsx11_lock(); XmbTextPropertyToTextList(display, &txtprop, &srcstr, &count); wine_tsx11_unlock(); + HeapFree(GetProcessHeap(), 0, txtprop.value); TRACE("Importing %d line(s)\n", count); @@ -1276,7 +1278,6 @@ static HANDLE X11DRV_CLIPBOARD_ImportCompoundText(Display *display, Window w, At wine_tsx11_lock(); XFreeStringList(srcstr); - XFree(txtprop.value); wine_tsx11_unlock(); return hUnicodeText; @@ -2017,27 +2018,23 @@ static BOOL X11DRV_CLIPBOARD_ReadSelectionData(Display *display, LPWINE_CLIPDATA /************************************************************************** - * X11DRV_CLIPBOARD_ReadProperty - * Reads the contents of the X selection property. + * X11DRV_CLIPBOARD_GetProperty + * Gets type, data and size. */ -static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, - unsigned char** data, unsigned long* datasize) +static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, + Atom *atype, unsigned char** data, unsigned long* datasize) { - Atom atype = AnyPropertyType; int aformat; unsigned long pos = 0, nitems, remain, count; unsigned char *val = NULL, *buffer; - if (prop == None) - return FALSE; - TRACE("Reading property %lu from X window %lx\n", prop, w); for (;;) { wine_tsx11_lock(); if (XGetWindowProperty(display, w, prop, pos, INT_MAX / 4, False, - AnyPropertyType, &atype, &aformat, &nitems, &remain, &buffer) != Success) + AnyPropertyType, atype, &aformat, &nitems, &remain, &buffer) != Success) { wine_tsx11_unlock(); WARN("Failed to read property\n"); @@ -2079,6 +2076,86 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, /************************************************************************** + * X11DRV_CLIPBOARD_ReadProperty + * Reads the contents of the X selection property. + */ +static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, + unsigned char** data, unsigned long* datasize) +{ + Atom atype; + XEvent xe; + + if (prop == None) + return FALSE; + + if (!X11DRV_CLIPBOARD_GetProperty(display, w, prop, &atype, data, datasize)) + return FALSE; + + wine_tsx11_lock(); + while (XCheckTypedWindowEvent(display, w, PropertyNotify, &xe)) + ; + wine_tsx11_unlock(); + + if (atype == x11drv_atom(INCR)) + { + unsigned char *buf = *data; + unsigned long bufsize = 0; + + for (;;) + { + int i; + unsigned char *prop_data, *tmp; + unsigned long prop_size; + + /* Wait until PropertyNotify is received */ + for (i = 0; i < SELECTION_RETRIES; i++) + { + Bool res; + + wine_tsx11_lock(); + res = XCheckTypedWindowEvent(display, w, PropertyNotify, &xe); + wine_tsx11_unlock(); + if (res && xe.xproperty.atom == prop && + xe.xproperty.state == PropertyNewValue) + break; + usleep(SELECTION_WAIT); + } + + if (i >= SELECTION_RETRIES || + !X11DRV_CLIPBOARD_GetProperty(display, w, prop, &atype, &prop_data, &prop_size)) + { + HeapFree(GetProcessHeap(), 0, buf); + return FALSE; + } + + /* Retrieved entire data. */ + if (prop_size == 0) + { + HeapFree(GetProcessHeap(), 0, prop_data); + *data = buf; + *datasize = bufsize; + return TRUE; + } + + tmp = HeapReAlloc(GetProcessHeap(), 0, buf, bufsize + prop_size + 1); + if (!tmp) + { + HeapFree(GetProcessHeap(), 0, buf); + return FALSE; + } + + buf = tmp; + memcpy(buf + bufsize, prop_data, prop_size + 1); + bufsize += prop_size; + HeapFree(GetProcessHeap(), 0, prop_data); + } + } + + return TRUE; +} + + +/************************************************************************** * CLIPBOARD_SerializeMetafile */ static HANDLE X11DRV_CLIPBOARD_SerializeMetafile(INT wformat, HANDLE hdata, LPDWORD lpcbytes, BOOL out) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 90ec95a..8a5a4b5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -580,6 +580,7 @@ enum x11drv_atoms FIRST_XATOM = XA_LAST_PREDEFINED + 1, XATOM_CLIPBOARD = FIRST_XATOM, XATOM_COMPOUND_TEXT, + XATOM_INCR, XATOM_MULTIPLE, XATOM_SELECTION_DATA, XATOM_TARGETS, diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 1569481..c0c07c5 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -115,6 +115,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = { "CLIPBOARD", "COMPOUND_TEXT", + "INCR", "MULTIPLE", "SELECTION_DATA", "TARGETS",

1 0

Alexandre Julliard : ntdll/tests: Fix a couple of tests on NT4.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: 0f9283437c98df89f91ec7a49342a4c88c7ef3f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f9283437c98df89f91ec7a49… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 5 19:58:21 2008 +0100 ntdll/tests: Fix a couple of tests on NT4. --- dlls/ntdll/tests/path.c | 36 +++++++++++++----------------------- 1 files changed, 13 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index fd6e40f..9d39cdc 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -231,6 +231,8 @@ static void test_RtlGetFullPathName_U(void) const char *path; const char *rname; const char *rfile; + const char *alt_rname; + const char *alt_rfile; }; static const struct test tests[] = @@ -251,8 +253,11 @@ static void test_RtlGetFullPathName_U(void) { "c:/test/\\.\\.\\file", "c:\\test\\file", "file"}, { "c:/test\\\\.\\.\\file", "c:\\test\\file", "file"}, { "c:/test\\test1\\..\\.\\file", "c:\\test\\file", "file"}, - { "c:///test\\.\\.\\file//", "c:\\test\\file\\", NULL}, + { "c:///test\\.\\.\\file//", "c:\\test\\file\\", NULL, + "c:\\test\\file", "file"}, /* nt4 */ { "c:///test\\..\\file\\..\\//", "c:\\", NULL}, + { "c:/test../file", "c:\\test.\\file", "file", + "c:\\test..\\file", "file"}, /* vista */ { NULL, NULL, NULL} }; @@ -260,7 +265,6 @@ static void test_RtlGetFullPathName_U(void) WCHAR pathbufW[2*MAX_PATH], rbufferW[MAX_PATH]; CHAR rbufferA[MAX_PATH], rfileA[MAX_PATH]; ULONG ret; - NTSTATUS status; WCHAR *file_part; DWORD reslen; UINT len; @@ -270,39 +274,25 @@ static void test_RtlGetFullPathName_U(void) len= strlen(test->rname) * sizeof(WCHAR); pRtlMultiByteToUnicodeN(pathbufW , sizeof(pathbufW), NULL, test->path, strlen(test->path)+1 ); ret = pRtlGetFullPathName_U( pathbufW,MAX_PATH, rbufferW, &file_part); - ok( ret == len, "Wrong result %d/%d for \"%s\"\n", ret, len, test->path ); + ok( ret == len || (test->alt_rname && ret == strlen(test->alt_rname)*sizeof(WCHAR)), + "Wrong result %d/%d for \"%s\"\n", ret, len, test->path ); ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok(lstrcmpiA(rbufferA,test->rname) == 0, "Got \"%s\" expected \"%s\"\n",rbufferA,test->rname); + ok(!lstrcmpiA(rbufferA,test->rname) || (test->alt_rname && !lstrcmpiA(rbufferA,test->alt_rname)), + "Got \"%s\" expected \"%s\"\n",rbufferA,test->rname); if (file_part) { ok(pRtlUnicodeToMultiByteN(rfileA,MAX_PATH,&reslen,file_part,(lstrlenW(file_part) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok(test->rfile && !lstrcmpiA(rfileA,test->rfile), "Got \"%s\" expected \"%s\"\n",rfileA,test->rfile); + ok((test->rfile && !lstrcmpiA(rfileA,test->rfile)) || + (test->alt_rfile && !lstrcmpiA(rfileA,test->alt_rfile)), + "Got \"%s\" expected \"%s\"\n",rfileA,test->rfile); } else { ok( !test->rfile, "Got NULL expected \"%s\"\n", test->rfile ); } } - - /* "c:/test../file", "c:\\test.\\file", "file"}, */ - pRtlMultiByteToUnicodeN(pathbufW, sizeof(pathbufW), NULL, - "c:/test../file", strlen("c:/test../file") + 1); - ret = pRtlGetFullPathName_U(pathbufW, MAX_PATH, rbufferW, &file_part); - ok(ret == strlen("c:\\test.\\file") * sizeof(WCHAR) || - ret == strlen("c:\\test..\\file") * sizeof(WCHAR), /* Vista */ - "Expected 26 or 28, got %d\n", ret); - status = pRtlUnicodeToMultiByteN(rbufferA, MAX_PATH, &reslen, rbufferW, - (lstrlenW(rbufferW) + 1) * sizeof(WCHAR)); - ok(status == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok(!lstrcmpiA(rbufferA, "c:\\test.\\file") || - !lstrcmpiA(rbufferA, "c:\\test..\\file"), - "Expected \"c:\\test.\\file\" or \"c:\\test..\\file\", got \"%s\"\n", rbufferA); - status = pRtlUnicodeToMultiByteN(rfileA, MAX_PATH, &reslen, file_part, - (lstrlenW(file_part) + 1) * sizeof(WCHAR)); - ok(status == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); - ok(!lstrcmpiA(rfileA, "file"), "Got \"%s\" expected \"file\"\n", rfileA); } START_TEST(path)

1 0

Alexandre Julliard : ntdll,server: Fixed access checks for OpenFileMapping and MapViewOfFile.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: 5e2ed6bfe94eb322efe891c07aa8e58b125f36c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2ed6bfe94eb322efe891c07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 5 20:32:32 2008 +0100 ntdll,server: Fixed access checks for OpenFileMapping and MapViewOfFile. --- dlls/kernel32/tests/virtual.c | 4 +- dlls/kernel32/virtual.c | 19 ++++++++---- dlls/ntdll/virtual.c | 65 +++++++++++++++++---------------------- include/wine/server_protocol.h | 3 +- server/mapping.c | 2 +- server/protocol.def | 1 + server/trace.c | 3 +- 7 files changed, 49 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e2ed6bfe94eb322efe89…

1 0

Alexandre Julliard : include: Add extern "C" to the exported Wine headers.
by Alexandre Julliard 06 Nov '08

06 Nov '08

Module: wine Branch: master Commit: e21cbfe7e81c1d8d0bffdefaed8f73f7d0309d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e21cbfe7e81c1d8d0bffdefae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 6 10:43:31 2008 +0100 include: Add extern "C" to the exported Wine headers. --- include/wine/exception.h | 8 ++++++++ include/wine/library.h | 8 ++++++++ include/wine/unicode.h | 8 ++++++++ 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index de2f95c..ccace07 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -25,6 +25,10 @@ #include <windef.h> #include <excpt.h> +#ifdef __cplusplus +extern "C" { +#endif + /* The following definitions allow using exceptions in Wine and Winelib code * * They should be used like this: @@ -329,4 +333,8 @@ static inline DWORD __wine_finally_handler( EXCEPTION_RECORD *record, #endif /* USE_COMPILER_EXCEPTIONS */ +#ifdef __cplusplus +} +#endif + #endif /* __WINE_WINE_EXCEPTION_H */ diff --git a/include/wine/library.h b/include/wine/library.h index 0c60378..5843fe2 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -31,6 +31,10 @@ #error This file should not be used in Wine tests #endif +#ifdef __cplusplus +extern "C" { +#endif + /* configuration */ extern const char *wine_get_build_dir(void); @@ -212,4 +216,8 @@ __DEFINE_SET_SEG(gs) #undef __DEFINE_GET_SEG #undef __DEFINE_SET_SEG +#ifdef __cplusplus +} +#endif + #endif /* __WINE_WINE_LIBRARY_H */ diff --git a/include/wine/unicode.h b/include/wine/unicode.h index 49f9062..780665a 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -31,6 +31,10 @@ #error This file should not be used in Wine tests #endif +#ifdef __cplusplus +extern "C" { +#endif + #ifndef WINE_UNICODE_API # if defined(_MSC_VER) || defined(__MINGW32__) # define WINE_UNICODE_API DECLSPEC_IMPORT @@ -331,4 +335,8 @@ WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) #undef WINE_UNICODE_INLINE +#ifdef __cplusplus +} +#endif + #endif /* __WINE_WINE_UNICODE_H */

1 0

Vincent Povirk : setupapi: Implement ProfileItems directive.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: 6c380468d955d74dd24e9d35e9b38fdf29d685db URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c380468d955d74dd24e9d35e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 31 10:34:16 2008 -0500 setupapi: Implement ProfileItems directive. --- dlls/setupapi/Makefile.in | 2 +- dlls/setupapi/install.c | 108 ++++++++++++++++++++++++++++++++++++++++- dlls/setupapi/tests/install.c | 6 +- 3 files changed, 111 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 1f633a4..91bc87b 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid user32 version advapi32 rpcrt4 kernel32 ntdll -DELAYIMPORTS = shell32 wintrust +DELAYIMPORTS = shell32 wintrust ole32 C_SRCS = \ devinst.c \ diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 321d4d4..0a4db4f 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -29,6 +31,9 @@ #include "winuser.h" #include "winnls.h" #include "winsvc.h" +#include "shlobj.h" +#include "objidl.h" +#include "objbase.h" #include "setupapi.h" #include "setupapi_private.h" #include "wine/unicode.h" @@ -79,6 +84,9 @@ static const WCHAR UpdateIniFields[] = {'U','p','d','a','t','e','I','n','i','F', static const WCHAR RegisterDlls[] = {'R','e','g','i','s','t','e','r','D','l','l','s',0}; static const WCHAR UnregisterDlls[] = {'U','n','r','e','g','i','s','t','e','r','D','l','l','s',0}; static const WCHAR ProfileItems[] = {'P','r','o','f','i','l','e','I','t','e','m','s',0}; +static const WCHAR Name[] = {'N','a','m','e',0}; +static const WCHAR CmdLine[] = {'C','m','d','L','i','n','e',0}; +static const WCHAR SubDir[] = {'S','u','b','D','i','r',0}; static const WCHAR WineFakeDlls[] = {'W','i','n','e','F','a','k','e','D','l','l','s',0}; static const WCHAR DisplayName[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR Description[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; @@ -775,7 +783,105 @@ static BOOL bitreg_callback( HINF hinf, PCWSTR field, void *arg ) static BOOL profile_items_callback( HINF hinf, PCWSTR field, void *arg ) { - FIXME( "should do profile items %s\n", debugstr_w(field) ); + WCHAR lnkpath[MAX_PATH]; + LPWSTR cmdline=NULL, lnkpath_end; + unsigned int name_size; + INFCONTEXT name_context, context; + IShellLinkW* shelllink=NULL; + IPersistFile* persistfile=NULL; + int attrs=0; + + static const WCHAR dotlnk[] = {'.','l','n','k',0}; + + TRACE( "(%s)\n", debugstr_w(field) ); + + if (SetupFindFirstLineW( hinf, field, Name, &name_context )) + { + SetupGetIntField( &name_context, 2, &attrs ); + if (attrs) FIXME( "unhandled attributes: %x\n", attrs ); + } + else return TRUE; + + /* calculate filename */ + SHGetFolderPathW( NULL, CSIDL_COMMON_PROGRAMS, NULL, SHGFP_TYPE_CURRENT, lnkpath ); + lnkpath_end = lnkpath + strlenW(lnkpath); + if (lnkpath_end[-1] != '\\') *lnkpath_end++ = '\\'; + + if (SetupFindFirstLineW( hinf, field, SubDir, &context )) + { + unsigned int subdir_size; + + if (!SetupGetStringFieldW( &context, 1, lnkpath_end, (lnkpath+MAX_PATH)-lnkpath_end, &subdir_size )) + return TRUE; + + lnkpath_end += subdir_size - 1; + if (lnkpath_end[-1] != '\\') *lnkpath_end++ = '\\'; + } + + if (!SetupGetStringFieldW( &name_context, 1, lnkpath_end, (lnkpath+MAX_PATH)-lnkpath_end, &name_size )) + return TRUE; + + lnkpath_end += name_size - 1; + if (lnkpath+MAX_PATH < lnkpath_end + 5) return TRUE; + strcpyW( lnkpath_end, dotlnk ); + + TRACE( "link path: %s\n", debugstr_w(lnkpath) ); + + /* calculate command line */ + if (SetupFindFirstLineW( hinf, field, CmdLine, &context )) + { + unsigned int dir_len=0, subdir_size=0, filename_size=0; + int dirid=0; + LPCWSTR dir; + LPWSTR cmdline_end; + + SetupGetIntField( &context, 1, &dirid ); + dir = DIRID_get_string( dirid ); + + if (dir) dir_len = strlenW(dir); + + SetupGetStringFieldW( &context, 2, NULL, 0, &subdir_size ); + SetupGetStringFieldW( &context, 3, NULL, 0, &filename_size ); + + if (dir_len && filename_size) + { + cmdline = cmdline_end = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * (dir_len+subdir_size+filename_size+1) ); + + strcpyW( cmdline_end, dir ); + cmdline_end += dir_len; + if (cmdline_end[-1] != '\\') *cmdline_end++ = '\\'; + + if (subdir_size) + { + SetupGetStringFieldW( &context, 2, cmdline_end, subdir_size, NULL ); + cmdline_end += subdir_size-1; + if (cmdline_end[-1] != '\\') *cmdline_end++ = '\\'; + } + SetupGetStringFieldW( &context, 3, cmdline_end, filename_size, NULL ); + TRACE( "cmdline: %s\n", debugstr_w(cmdline)); + } + } + + if (!cmdline) return TRUE; + + CoInitialize(NULL); + + if (!SUCCEEDED(CoCreateInstance( &CLSID_ShellLink, NULL, + CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (LPVOID*)&shelllink))) + goto done; + + IShellLinkW_SetPath( shelllink, cmdline ); + SHPathPrepareForWriteW( NULL, NULL, lnkpath, SHPPFW_DIRCREATE|SHPPFW_IGNOREFILENAME ); + if (SUCCEEDED(IShellLinkW_QueryInterface( shelllink, &IID_IPersistFile, (LPVOID*)&persistfile))) + { + TRACE( "writing link: %s\n", debugstr_w(lnkpath) ); + IPersistFile_Save( persistfile, lnkpath, FALSE ); + IPersistFile_Release( persistfile ); + } + IShellLinkW_Release( shelllink ); + +done: + HeapFree( GetProcessHeap(), 0, cmdline ); return TRUE; } diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index a340562..9be46fe 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -424,14 +424,14 @@ static void test_profile_items(void) snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); if (INVALID_FILE_ATTRIBUTES == GetFileAttributes(path)) { - todo_wine win_skip("ProfileItems not implemented on this system\n"); + win_skip("ProfileItems not implemented on this system\n"); } else { snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); - todo_wine ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "directory not created\n"); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "directory not created\n"); snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); - todo_wine ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "link not created\n"); + ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "link not created\n"); } snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs);

1 0

Vincent Povirk : setupapi/tests: Add test for ProfileItems directive.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: 35d0a7a051d44967e97fc75632f16116a5487b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35d0a7a051d44967e97fc7563… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 15 16:46:04 2008 -0500 setupapi/tests: Add test for ProfileItems directive. --- dlls/setupapi/tests/install.c | 70 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index ff3be6d..a340562 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -30,6 +30,7 @@ #include "winreg.h" #include "winsvc.h" #include "setupapi.h" +#include "shlobj.h" #include "wine/test.h" @@ -382,6 +383,71 @@ static void test_driver_install(void) DeleteFile(driver); } +static void test_profile_items(void) +{ + char path[MAX_PATH], commonprogs[MAX_PATH]; + HMODULE hShell32; + BOOL (WINAPI *pSHGetFolderPathA)(HWND hwnd, int nFolder, HANDLE hToken, DWORD dwFlags, LPSTR pszPath); + + static const char *inf = + "[Version]\n" + "Signature=\"$Chicago$\"\n" + "[DefaultInstall]\n" + "ProfileItems=TestItem,TestItem2\n" + "[TestItem]\n" + "Name=TestItem\n" + "CmdLine=11,,notepad.exe\n" + "[TestItem2]\n" + "Name=TestItem2\n" + "CmdLine=11,,notepad.exe\n" + "SubDir=TestDir\n" + ; + + hShell32 = LoadLibraryA("shell32"); + pSHGetFolderPathA = (void*)GetProcAddress(hShell32, "SHGetFolderPathA"); + if (!pSHGetFolderPathA) + { + skip("SHGetFolderPathA is not available\n"); + goto cleanup; + } + + if (S_OK != pSHGetFolderPathA(NULL, CSIDL_COMMON_PROGRAMS, NULL, SHGFP_TYPE_CURRENT, commonprogs)) + { + skip("No common program files directory exists\n"); + goto cleanup; + } + + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + run_cmdline("DefaultInstall", 128, path); + + snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); + if (INVALID_FILE_ATTRIBUTES == GetFileAttributes(path)) + { + todo_wine win_skip("ProfileItems not implemented on this system\n"); + } + else + { + snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); + todo_wine ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "directory not created\n"); + snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); + todo_wine ok(INVALID_FILE_ATTRIBUTES != GetFileAttributes(path), "link not created\n"); + } + + snprintf(path, MAX_PATH, "%s\\TestItem.lnk", commonprogs); + DeleteFile(path); + snprintf(path, MAX_PATH, "%s\\TestDir\\TestItem2.lnk", commonprogs); + DeleteFile(path); + snprintf(path, MAX_PATH, "%s\\TestItem2.lnk", commonprogs); + DeleteFile(path); + snprintf(path, MAX_PATH, "%s\\TestDir", commonprogs); + RemoveDirectory(path); + +cleanup: + if (hShell32) FreeLibrary(hShell32); + DeleteFile(inffile); +} + START_TEST(install) { HMODULE hsetupapi = GetModuleHandle("setupapi.dll"); @@ -429,6 +495,10 @@ START_TEST(install) test_driver_install(); UnhookWindowsHookEx(hhook); + + /* We have to run this test after the CBT hook is disabled because + ProfileItems needs to create a window on Windows XP. */ + test_profile_items(); } SetCurrentDirectory(prev_path);

1 0

Reece Dunn : comctl32: Support themed check boxes and radio buttons.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: 5c76b4da73254c5fb9a3ec1ade7872a746f046c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c76b4da73254c5fb9a3ec1ad… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Wed Nov 5 08:53:05 2008 +0000 comctl32: Support themed check boxes and radio buttons. --- dlls/comctl32/theme_button.c | 65 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 59 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index ebe62eb..a6e80d1 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -124,6 +124,59 @@ static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN if (hPrevFont) SelectObject(hDC, hPrevFont); } +static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +{ + static const int cb_states[3][5] = + { + { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL }, + { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, + { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } + }; + + static const int rb_states[2][5] = + { + { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, + { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } + }; + + static const int cb_size = 13; + + RECT bgRect, textRect; + HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); + DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + int part = ((dwStyle & BUTTON_TYPE) == BS_RADIOBUTTON) || ((dwStyle & BUTTON_TYPE) == BS_AUTORADIOBUTTON) + ? BP_RADIOBUTTON + : BP_CHECKBOX; + int state = (part == BP_CHECKBOX) + ? cb_states[ checkState ][ drawState ] + : rb_states[ checkState ][ drawState ]; + WCHAR *text = get_button_text(hwnd); + + GetClientRect(hwnd, &bgRect); + GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); + + if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ + bgRect.top = bgRect.top + (textRect.bottom - textRect.top - cb_size) / 2; + + /* adjust for the check/radio marker */ + bgRect.bottom = bgRect.top + cb_size; + bgRect.right = bgRect.left + cb_size; + textRect.left = bgRect.right + 6; + + if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeBackground(theme, hDC, part, state, &bgRect, NULL); + if (text) + { + DrawThemeText(theme, hDC, part, state, text, lstrlenW(text), dtFlags, 0, &textRect); + HeapFree(GetProcessHeap(), 0, text); + } + + if (hPrevFont) SelectObject(hDC, hPrevFont); +} + static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) { static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; @@ -170,14 +223,14 @@ static const pfThemedPaint btnThemedPaintFunc[BUTTON_TYPE + 1] = { PB_draw, /* BS_PUSHBUTTON */ PB_draw, /* BS_DEFPUSHBUTTON */ - NULL, /* BS_CHECKBOX */ - NULL, /* BS_AUTOCHECKBOX */ - NULL, /* BS_RADIOBUTTON */ - NULL, /* BS_3STATE */ - NULL, /* BS_AUTO3STATE */ + CB_draw, /* BS_CHECKBOX */ + CB_draw, /* BS_AUTOCHECKBOX */ + CB_draw, /* BS_RADIOBUTTON */ + CB_draw, /* BS_3STATE */ + CB_draw, /* BS_AUTO3STATE */ GB_draw, /* BS_GROUPBOX */ NULL, /* BS_USERBUTTON */ - NULL, /* BS_AUTORADIOBUTTON */ + CB_draw, /* BS_AUTORADIOBUTTON */ NULL, /* Not defined */ NULL, /* BS_OWNERDRAW */ NULL, /* Not defined */

1 0

Roderick Colenbrander : wnaspi32: Fix a buffer size regression.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: fff24b061c7c7090c097408636a6941545ccf76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff24b061c7c7090c09740863… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Wed Nov 5 14:50:54 2008 +0100 wnaspi32: Fix a buffer size regression. --- dlls/wnaspi32/aspi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index c511524..2505a25 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -122,7 +122,7 @@ int ASPI_GetNumControllers(void) { HKEY hkeyScsi, hkeyPort; DWORD i = 0, numPorts, num_ha = 0; - WCHAR wPortName[11]; + WCHAR wPortName[15]; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wDevicemapScsi, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hkeyScsi) != ERROR_SUCCESS )

1 0

Alexandre Julliard : ntdll: Don' t force anonymous file mappings to always be fully committed.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: f21096ad01c1ac75410916a4eee4626ce1bc2201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21096ad01c1ac75410916a4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 5 12:31:49 2008 +0100 ntdll: Don't force anonymous file mappings to always be fully committed. --- dlls/kernel32/tests/virtual.c | 5 ----- dlls/ntdll/virtual.c | 27 +++++++-------------------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 925f753..032af2b 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -531,9 +531,7 @@ static void test_MapViewOfFile(void) ok(info.AllocationBase == ptr, "AllocationBase should have been %p but was %p instead\n", ptr, info.AllocationBase); ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); ok(info.RegionSize == MAPPING_SIZE, "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); -todo_wine ok(info.State == MEM_RESERVE, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); -todo_wine ok(info.Protect == 0, "Protect should have been 0 instead of 0x%x\n", info.Protect); ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); @@ -543,9 +541,7 @@ todo_wine ok(info.AllocationBase == ptr2, "AllocationBase should have been %p but was %p instead\n", ptr2, info.AllocationBase); ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); ok(info.RegionSize == MAPPING_SIZE, "RegionSize should have been 0x%x but was 0x%x\n", MAPPING_SIZE, (unsigned int)info.RegionSize); -todo_wine ok(info.State == MEM_RESERVE, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); -todo_wine ok(info.Protect == 0, "Protect should have been 0 instead of 0x%x\n", info.Protect); ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); @@ -570,7 +566,6 @@ todo_wine ok(info.BaseAddress == ptr2, "BaseAddress should have been %p but was %p instead\n", ptr2, info.BaseAddress); ok(info.AllocationBase == ptr2, "AllocationBase should have been %p but was %p instead\n", ptr2, info.AllocationBase); ok(info.AllocationProtect == PAGE_READWRITE, "AllocationProtect should have been PAGE_READWRITE but was 0x%x\n", info.AllocationProtect); -todo_wine ok(info.RegionSize == 0x10000, "RegionSize should have been 0x10000 but was 0x%x\n", (unsigned int)info.RegionSize); ok(info.State == MEM_COMMIT, "State should have been MEM_RESERVE instead of 0x%x\n", info.State); ok(info.Protect == PAGE_READWRITE, "Protect should have been 0 instead of 0x%x\n", info.Protect); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 17fe711..a7ea2b3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -824,7 +824,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start off_t offset, unsigned int vprot, BOOL removable ) { void *ptr; - int prot = VIRTUAL_GetUnixProt( vprot ); + int prot = VIRTUAL_GetUnixProt( vprot | VPROT_COMMITTED /* make sure it is accessible */ ); BOOL shared_write = (vprot & VPROT_WRITE) != 0; assert( start < view->size ); @@ -1422,15 +1422,15 @@ void VIRTUAL_SetForceExec( BOOL enable ) LIST_FOR_EACH_ENTRY( view, &views_list, struct file_view, entry ) { UINT i, count; - int unix_prot; char *addr = view->base; - BYTE prot = view->prot[0]; + BYTE commit = view->mapping ? VPROT_COMMITTED : 0; /* file mappings are always accessible */ + int unix_prot = VIRTUAL_GetUnixProt( view->prot[0] | commit ); if (view->protect & VPROT_NOEXEC) continue; for (count = i = 1; i < view->size >> page_shift; i++, count++) { - if (view->prot[i] == prot) continue; - unix_prot = VIRTUAL_GetUnixProt( prot ); + int prot = VIRTUAL_GetUnixProt( view->prot[i] | commit ); + if (prot == unix_prot) continue; if ((unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { TRACE( "%s exec prot for %p-%p\n", @@ -1440,12 +1440,11 @@ void VIRTUAL_SetForceExec( BOOL enable ) unix_prot | (force_exec_prot ? PROT_EXEC : 0) ); } addr += (count << page_shift); - prot = view->prot[i]; + unix_prot = prot; count = 0; } if (count) { - unix_prot = VIRTUAL_GetUnixProt( prot ); if ((unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { TRACE( "%s exec prot for %p-%p\n", @@ -2012,11 +2011,7 @@ NTSTATUS WINAPI NtCreateSection( HANDLE *handle, ACCESS_MASK access, const OBJEC } vprot = VIRTUAL_GetProt( protect ); - if (sec_flags & SEC_RESERVE) - { - if (file) return STATUS_INVALID_PARAMETER; - } - else vprot |= VPROT_COMMITTED; + if (!(sec_flags & SEC_RESERVE)) vprot |= VPROT_COMMITTED; if (sec_flags & SEC_NOCACHE) vprot |= VPROT_NOCACHE; if (sec_flags & SEC_IMAGE) vprot |= VPROT_IMAGE; @@ -2200,14 +2195,6 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p goto done; } - /* FIXME: If a mapping is created with SEC_RESERVE and a process, - * which has a view of this mapping commits some pages, they will - * appear committed in all other processes, which have the same - * view created. Since we don't support this yet, we create the - * whole mapping committed. - */ - prot |= VPROT_COMMITTED; - /* Reserve a properly aligned area */ server_enter_uninterrupted_section( &csVirtual, &sigset );

1 0

Reece Dunn : comctl32: Support themed push buttons.
by Alexandre Julliard 05 Nov '08

05 Nov '08

Module: wine Branch: master Commit: 1f9cc2046623b13373d66f09f22a6b295949260d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f9cc2046623b13373d66f09f… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Wed Nov 5 08:39:18 2008 +0000 comctl32: Support themed push buttons. --- dlls/comctl32/theme_button.c | 134 ++++++++++++++++++++++++++++++++++++------ 1 files changed, 115 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 54955fa..ebe62eb 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -36,47 +36,140 @@ WINE_DEFAULT_DEBUG_CHANNEL(themingbutton); #define BUTTON_TYPE 0x0f /* bit mask for the available button types */ -typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc); +/* These are indices into a states array to determine the theme state for a given theme part. */ +typedef enum +{ + STATE_NORMAL, + STATE_DISABLED, + STATE_HOT, + STATE_PRESSED, + STATE_DEFAULTED +} ButtonState; + +typedef void (*pfThemedPaint)(HTHEME theme, HWND hwnd, HDC hdc, ButtonState drawState, UINT dtFlags); + +static UINT get_drawtext_flags(DWORD style, DWORD ex_style) +{ + UINT flags = 0; + + if (style & BS_PUSHLIKE) + style &= ~BUTTON_TYPE; + + if (!(style & BS_MULTILINE)) + flags |= DT_SINGLELINE; + else + flags |= DT_WORDBREAK; + + switch (style & BS_CENTER) + { + case BS_LEFT: flags |= DT_LEFT; break; + case BS_RIGHT: flags |= DT_RIGHT; break; + case BS_CENTER: flags |= DT_CENTER; break; + default: + flags |= ((style & BUTTON_TYPE) <= BS_DEFPUSHBUTTON) + ? DT_CENTER : DT_LEFT; + } + + if (ex_style & WS_EX_RIGHT) + flags = DT_RIGHT | (flags & ~(DT_LEFT | DT_CENTER)); + + if ((style & BUTTON_TYPE) != BS_GROUPBOX) + { + switch (style & BS_VCENTER) + { + case BS_TOP: flags |= DT_TOP; break; + case BS_BOTTOM: flags |= DT_BOTTOM; break; + case BS_VCENTER: /* fall through */ + default: flags |= DT_VCENTER; break; + } + } + else + /* GroupBox's text is always single line and is top aligned. */ + flags |= DT_SINGLELINE | DT_TOP; + + return flags; +} + +static inline WCHAR *get_button_text(HWND hwnd) +{ + INT len = 512; + WCHAR *text; + text = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); + if (text) InternalGetWindowText(hwnd, text, len + 1); + return text; +} -static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC) +static void PB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) { + static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; + RECT bgRect, textRect; - SIZE textExtent; HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; - int state = IsWindowEnabled(hwnd) ? GBS_NORMAL : GBS_DISABLED; - WCHAR text[MAX_PATH]; - int len = MAX_PATH; + int state = states[ drawState ]; + WCHAR *text = get_button_text(hwnd); GetClientRect(hwnd, &bgRect); - textRect = bgRect; + GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); - len = GetWindowTextW(hwnd, text, len); + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); + DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &bgRect, NULL); + if (text) + { + DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &textRect); + HeapFree(GetProcessHeap(), 0, text); + } - GetTextExtentPoint32W(hDC, text, len, &textExtent); + if (hPrevFont) SelectObject(hDC, hPrevFont); +} - bgRect.top += (textExtent.cy / 2); - textRect.left += 10; - textRect.bottom = textRect.top + textExtent.cy; - textRect.right = textRect.left + textExtent.cx + 4; +static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UINT dtFlags) +{ + static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; + + RECT bgRect, textRect; + HFONT font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0); + HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; + int state = states[ drawState ]; + WCHAR *text = get_button_text(hwnd); + + GetClientRect(hwnd, &bgRect); + textRect = bgRect; + + if (text) + { + SIZE textExtent; + GetTextExtentPoint32W(hDC, text, lstrlenW(text), &textExtent); + bgRect.top += (textExtent.cy / 2); + textRect.left += 10; + textRect.bottom = textRect.top + textExtent.cy; + textRect.right = textRect.left + textExtent.cx + 4; + } ExcludeClipRect(hDC, textRect.left, textRect.top, textRect.right, textRect.bottom); + if (IsThemeBackgroundPartiallyTransparent(theme, BP_GROUPBOX, state)) + DrawThemeParentBackground(hwnd, hDC, NULL); DrawThemeBackground(theme, hDC, BP_GROUPBOX, state, &bgRect, NULL); SelectClipRgn(hDC, NULL); - textRect.left += 2; - textRect.right -= 2; - DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, len, 0, 0, &textRect); + if (text) + { + textRect.left += 2; + textRect.right -= 2; + DrawThemeText(theme, hDC, BP_GROUPBOX, state, text, lstrlenW(text), 0, 0, &textRect); + HeapFree(GetProcessHeap(), 0, text); + } if (hPrevFont) SelectObject(hDC, hPrevFont); } static const pfThemedPaint btnThemedPaintFunc[BUTTON_TYPE + 1] = { - NULL, /* BS_PUSHBUTTON */ - NULL, /* BS_DEFPUSHBUTTON */ + PB_draw, /* BS_PUSHBUTTON */ + PB_draw, /* BS_DEFPUSHBUTTON */ NULL, /* BS_CHECKBOX */ NULL, /* BS_AUTOCHECKBOX */ NULL, /* BS_RADIOBUTTON */ @@ -98,12 +191,15 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) PAINTSTRUCT ps; HDC hDC; DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE); + DWORD dwStyleEx = GetWindowLongW(hwnd, GWL_EXSTYLE); + UINT dtFlags = get_drawtext_flags(dwStyle, dwStyleEx); + ButtonState drawState = IsWindowEnabled(hwnd) ? STATE_NORMAL : STATE_DISABLED; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; if (paint) { hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC); + paint(theme, hwnd, hDC, drawState, dtFlags); if (!hParamDC) EndPaint(hwnd, &ps); return TRUE; }

1 0