December 2005 - Wine-Commits

Alexandre Julliard : server: Set the context flags in get_thread_context to indicate which
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: bd298b511e5839c0915914b4569f587ef0c37df5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bd298b511e5839c0915914b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 21 20:06:42 2005 +0100 server: Set the context flags in get_thread_context to indicate which parts of the returned context are valid. --- server/context_alpha.c | 64 +++++++++++++++------------------------------- server/context_i386.c | 13 ++++++++- server/context_powerpc.c | 41 ++++++++++++++++------------- server/context_sparc.c | 5 +++- server/context_x86_64.c | 7 ++++- 5 files changed, 64 insertions(+), 66 deletions(-)

1 0

Hans Leidekker : wldap32: Added configure checks for some potentially missing functions.
by Alexandre Julliard Dec. 21, 2005

Dec. 21, 2005

Module: wine Branch: refs/heads/master Commit: b2c62c945550e5936574fb45ac2fd8eef7d2de7b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2c62c945550e5936574fb4… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Wed Dec 21 18:42:00 2005 +0100 wldap32: Added configure checks for some potentially missing functions. --- configure | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 8 ++++ dlls/wldap32/misc.c | 6 +-- dlls/wldap32/parse.c | 2 - include/config.h.in | 12 +++++ 5 files changed, 135 insertions(+), 4 deletions(-) diff --git a/configure b/configure index fd7a1d0..b994c8b 100755 --- a/configure +++ b/configure @@ -9755,6 +9755,117 @@ fi fi + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LDAPLIBS $LIBPTHREAD" + + + + +for ac_func in \ + ldap_count_references \ + ldap_first_reference \ + ldap_next_reference \ + ldap_parse_reference +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + LIBS="$ac_save_LIBS" fi FREETYPELIBS="" diff --git a/configure.ac b/configure.ac index e5c7311..b75844d 100644 --- a/configure.ac +++ b/configure.ac @@ -552,6 +552,14 @@ then LDAPLIBS="-lldap_r -llber"],, [$LIBPTHREAD])],, [$LIBPTHREAD]) + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LDAPLIBS $LIBPTHREAD" + AC_CHECK_FUNCS(\ + ldap_count_references \ + ldap_first_reference \ + ldap_next_reference \ + ldap_parse_reference) + LIBS="$ac_save_LIBS" fi dnl **** Check for FreeType 2 **** diff --git a/dlls/wldap32/misc.c b/dlls/wldap32/misc.c index 1f85cb6..dc47b5e 100644 --- a/dlls/wldap32/misc.c +++ b/dlls/wldap32/misc.c @@ -115,7 +115,7 @@ ULONG WLDAP32_ldap_count_entries( WLDAP3 ULONG WLDAP32_ldap_count_references( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res ) { ULONG ret = LDAP_NOT_SUPPORTED; -#ifdef HAVE_LDAP +#ifdef HAVE_LDAP_COUNT_REFERENCES TRACE( "(%p, %p)\n", ld, res ); @@ -250,7 +250,7 @@ WLDAP32_LDAPMessage *WLDAP32_ldap_first_ WLDAP32_LDAPMessage *WLDAP32_ldap_first_reference( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *res ) { -#ifdef HAVE_LDAP +#ifdef HAVE_LDAP_FIRST_REFERENCE TRACE( "(%p, %p)\n", ld, res ); @@ -367,7 +367,7 @@ WLDAP32_LDAPMessage *WLDAP32_ldap_next_e WLDAP32_LDAPMessage *WLDAP32_ldap_next_reference( WLDAP32_LDAP *ld, WLDAP32_LDAPMessage *entry ) { -#ifdef HAVE_LDAP +#ifdef HAVE_LDAP_NEXT_REFERENCE TRACE( "(%p, %p)\n", ld, entry ); diff --git a/dlls/wldap32/parse.c b/dlls/wldap32/parse.c index a54dd52..89e9c14 100644 --- a/dlls/wldap32/parse.c +++ b/dlls/wldap32/parse.c @@ -130,7 +130,7 @@ ULONG ldap_parse_referenceW( WLDAP32_LDA PWCHAR **referrals ) { ULONG ret = LDAP_NOT_SUPPORTED; -#ifdef HAVE_LDAP +#ifdef HAVE_LDAP_PARSE_REFERENCE char **referralsU = NULL; TRACE( "(%p, %p, %p)\n", ld, message, referrals ); diff --git a/include/config.h.in b/include/config.h.in index 04718d1..d3eedd7 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -239,9 +239,21 @@ /* Define if you have the OpenLDAP development environment */ #undef HAVE_LDAP +/* Define to 1 if you have the `ldap_count_references' function. */ +#undef HAVE_LDAP_COUNT_REFERENCES + +/* Define to 1 if you have the `ldap_first_reference' function. */ +#undef HAVE_LDAP_FIRST_REFERENCE + /* Define to 1 if you have the <ldap.h> header file. */ #undef HAVE_LDAP_H +/* Define to 1 if you have the `ldap_next_reference' function. */ +#undef HAVE_LDAP_NEXT_REFERENCE + +/* Define to 1 if you have the `ldap_parse_reference' function. */ +#undef HAVE_LDAP_PARSE_REFERENCE + /* Define if you have libaudioIO */ #undef HAVE_LIBAUDIOIO

1 0

Bill Medland : msi: Use a default dialog font if nothing is specified.
by Alexandre Julliard Dec. 20, 2005

Dec. 20, 2005

Module: wine Branch: refs/heads/master Commit: e0d4df6bb7c009c8cbfa579c22c8d9406025f65c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0d4df6bb7c009c8cbfa579… Author: Bill Medland <billmedland(a)mercuryspeed.com> Date: Tue Dec 20 11:59:23 2005 +0100 msi: Use a default dialog font if nothing is specified. --- dlls/msi/dialog.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 87e14e8..c4f9d2c 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -1618,6 +1618,8 @@ static LRESULT msi_dialog_oncreate( HWND { static const WCHAR df[] = { 'D','e','f','a','u','l','t','U','I','F','o','n','t',0 }; + static const WCHAR dfv[] = { + 'M','S',' ','S','h','e','l','l',' ','D','l','g',0 }; msi_dialog *dialog = (msi_dialog*) cs->lpCreateParams; MSIRECORD *rec = NULL; LPWSTR title = NULL; @@ -1644,6 +1646,11 @@ static LRESULT msi_dialog_oncreate( HWND dialog->attributes = MSI_RecordGetInteger( rec, 6 ); dialog->default_font = msi_dup_property( dialog->package, df ); + if (!dialog->default_font) + { + dialog->default_font = strdupW(dfv); + if (!dialog->default_font) return -1; + } title = msi_get_deformatted_field( dialog->package, rec, 7 ); SetWindowTextW( hwnd, title );

1 0

Michael Jung : shell32/tests: Fixed a test failing on WinXP.
by Alexandre Julliard Dec. 20, 2005

Dec. 20, 2005

Module: wine Branch: refs/heads/master Commit: 9a0369449e4a8f764103298b463a160108f41baa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a0369449e4a8f764103298… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Tue Dec 20 11:57:44 2005 +0100 shell32/tests: Fixed a test failing on WinXP. --- dlls/shell32/tests/shlfolder.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 2a09ea6..8c0d7f7 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -905,9 +905,18 @@ void test_FolderShortcut(void) { BOOL result; CLSID clsid; LPITEMIDLIST pidlCurrentFolder, pidlWineTestFolder, pidlSubFolder; + HKEY hShellExtKey; WCHAR wszWineTestFolder[] = { ':',':','{','9','B','3','5','2','E','B','F','-','2','7','6','5','-','4','5','C','1','-', 'B','4','C','6','-','8','5','C','C','7','F','7','A','B','C','6','4','}',0 }; + WCHAR wszShellExtKey[] = { 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'E','x','p','l','o','r','e','r','\\','D','e','s','k','t','o','p','\\', + 'N','a','m','e','S','p','a','c','e','\\', + '{','9','b','3','5','2','e','b','f','-','2','7','6','5','-','4','5','c','1','-', + 'b','4','c','6','-','8','5','c','c','7','f','7','a','b','c','6','4','}',0 }; + WCHAR wszSomeSubFolder[] = { 'S','u','b','F','o','l','d','e','r', 0}; static const GUID CLSID_UnixDosFolder = {0x9d20aae8, 0x0625, 0x44b0, {0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9}}; @@ -973,8 +982,13 @@ void test_FolderShortcut(void) { ok (SUCCEEDED(hr), "SHGetDesktopFolder failed! hr = %08lx\n", hr); if (FAILED(hr)) return; + /* Temporarily register WineTestFolder as a shell namespace extension at the Desktop. + * Otherwise ParseDisplayName fails on WinXP with E_INVALIDARG */ + RegCreateKeyW(HKEY_CURRENT_USER, wszShellExtKey, &hShellExtKey); + RegCloseKey(hShellExtKey); hr = IShellFolder_ParseDisplayName(pDesktopFolder, NULL, NULL, wszWineTestFolder, NULL, &pidlWineTestFolder, NULL); + RegDeleteKeyW(HKEY_CURRENT_USER, wszShellExtKey); IShellFolder_Release(pDesktopFolder); ok (SUCCEEDED(hr), "IShellFolder::ParseDisplayName failed! hr = %08lx\n", hr); if (FAILED(hr)) return;

1 0

Eric Pouech : dbghelp: Added a few extensions to make windbg happy.
by Alexandre Julliard Dec. 20, 2005

Dec. 20, 2005

Module: wine Branch: refs/heads/master Commit: 099cfeaac84566f83fb8919a37b7351eb78d3f1c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=099cfeaac84566f83fb8919… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 20 11:49:24 2005 +0100 dbghelp: Added a few extensions to make windbg happy. --- dlls/dbghelp/dbghelp.c | 18 +++++++++++++ dlls/dbghelp/dbghelp.spec | 8 ++++-- dlls/dbghelp/wdbgexts.h | 63 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 dlls/dbghelp/wdbgexts.h diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 3ebc7c3..94bb0e1 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -24,6 +24,7 @@ #include "winerror.h" #include "psapi.h" #include "wine/debug.h" +#include "wdbgexts.h" WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); @@ -371,3 +372,20 @@ LPAPI_VERSION WINAPI ImagehlpApiVersionE return AppVersion; } + +/****************************************************************** + * ExtensionApiVersion (DBGHELP.@) + */ +LPEXT_API_VERSION WINAPI ExtensionApiVersion(void) +{ + static EXT_API_VERSION eav = {5, 5, 5, 0}; + return &eav; +} + +/****************************************************************** + * WinDbgExtensionDllInit (DBGHELP.@) + */ +void WINAPI WinDbgExtensionDllInit(PWINDBG_EXTENSION_APIS lpExtensionApis, + unsigned short major, unsigned short minor) +{ +} diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 9a0820e..0d7106b 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -3,7 +3,7 @@ @ stdcall EnumDirTree(long str str ptr ptr ptr) @ stub EnumerateLoadedModules64 @ stdcall EnumerateLoadedModules(long ptr ptr) -@ stub ExtensionApiVersion +@ stdcall ExtensionApiVersion() @ stdcall FindDebugInfoFile(str str ptr) @ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) @ stdcall FindExecutableImage(str str str) @@ -98,12 +98,14 @@ @ stdcall SymUnloadModule(long long) @ stdcall UnDecorateSymbolName(str str long long) @ stdcall UnmapDebugInformation(ptr) -@ stub WinDbgExtensionDllInit -@ stub dbghelp +@ stdcall WinDbgExtensionDllInit(ptr long long) +#@ stub dbghelp #@ stub dh +#@ stub fptr #@ stub lm #@ stub lmi #@ stub omap #@ stub srcfiles #@ stub sym +#@ stub symsvr #@ stub vc7fpo diff --git a/dlls/dbghelp/wdbgexts.h b/dlls/dbghelp/wdbgexts.h new file mode 100644 index 0000000..d8168d7 --- /dev/null +++ b/dlls/dbghelp/wdbgexts.h @@ -0,0 +1,63 @@ +/* + * File wdbgexts.h: definition of windbg extensions + * (dbghelp.dll is seen as a windbg extension) + * + * Copyright (C) 2005, Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +typedef struct EXT_API_VERSION +{ + USHORT MajorVersion; + USHORT MinorVersion; + USHORT Revision; + USHORT Reserved; +} EXT_API_VERSION, *LPEXT_API_VERSION; + +typedef void (*PWINDBG_OUTPUT_ROUTINE)(PCSTR, ...); +typedef ULONG_PTR (WINAPI *PWINDBG_GET_EXPRESSION)(PCSTR); +typedef void (WINAPI *PWINDBG_GET_SYMBOL)(void*, char*, ULONG_PTR*); +typedef ULONG (WINAPI *PWINDBG_DISASM)(ULONG_PTR*, PCSTR, ULONG); +typedef ULONG (WINAPI *PWINDBG_CHECK_CONTROL_C)(void); +typedef ULONG (WINAPI *PWINDBG_READ_PROCESS_MEMORY_ROUTINE)(ULONG_PTR, void*, ULONG, PULONG); +typedef ULONG (WINAPI *PWINDBG_WRITE_PROCESS_MEMORY_ROUTINE)(ULONG_PTR, const void*, ULONG, PULONG); +typedef ULONG (WINAPI *PWINDBG_GET_THREAD_CONTEXT_ROUTINE)(ULONG, PCONTEXT, ULONG); +typedef ULONG (WINAPI *PWINDBG_SET_THREAD_CONTEXT_ROUTINE)(ULONG, PCONTEXT, ULONG); +typedef ULONG (WINAPI *PWINDBG_IOCTL_ROUTINE)(USHORT, void*); +typedef struct _EXTSTACKTRACE +{ + ULONG FramePointer; + ULONG ProgramCounter; + ULONG ReturnAddress; + ULONG Args[4]; +} EXTSTACKTRACE, *PEXTSTACKTRACE; +typedef ULONG (WINAPI *PWINDBG_STACKTRACE_ROUTINE)(ULONG, ULONG, ULONG, PEXTSTACKTRACE, ULONG); + +typedef struct _WINDBG_EXTENSION_APIS +{ + ULONG nSize; + PWINDBG_OUTPUT_ROUTINE lpOutputRoutine; + PWINDBG_GET_EXPRESSION lpGetExpressionRoutine; + PWINDBG_GET_SYMBOL lpGetSymbolRoutine; + PWINDBG_DISASM lpDisasmRoutine; + PWINDBG_CHECK_CONTROL_C lpCheckControlCRoutine; + PWINDBG_READ_PROCESS_MEMORY_ROUTINE lpReadProcessMemoryRoutine; + PWINDBG_WRITE_PROCESS_MEMORY_ROUTINE lpWriteProcessMemoryRoutine; + PWINDBG_GET_THREAD_CONTEXT_ROUTINE lpGetThreadContextRoutine; + PWINDBG_SET_THREAD_CONTEXT_ROUTINE lpSetThreadContextRoutine; + PWINDBG_IOCTL_ROUTINE lpIoctlRoutine; + PWINDBG_STACKTRACE_ROUTINE lpStackTraceRoutine; +} WINDBG_EXTENSION_APIS, *PWINDBG_EXTENSION_APIS;

1 0

Alex Villacís Lasso : msacm: Preserve value of cbStruct in acmDriverDetails.
by Alexandre Julliard Dec. 20, 2005

Dec. 20, 2005

Module: wine Branch: refs/heads/master Commit: 9a95aa7da20178737232bc8c99357943197e451c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9a95aa7da20178737232bc8… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Dec 20 11:48:01 2005 +0100 msacm: Preserve value of cbStruct in acmDriverDetails. Ensure that the cbStruct member of the ACMDRIVERDETAILS[AW] struct is filled with a valid value before returning. Fill the cbStruct member of the ACMDRIVERDETAILS[AW] before sending a ACMDM_DRIVER_DETAILS message to an installed codec that might be a native library: native ACM codecs expect cbStruct to be valid before filling the rest of the struct with any data. --- dlls/msacm/driver.c | 7 +++++-- dlls/msacm/tests/msacm.c | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msacm/driver.c b/dlls/msacm/driver.c index 808a36d..bfcc533 100644 --- a/dlls/msacm/driver.c +++ b/dlls/msacm/driver.c @@ -184,7 +184,8 @@ MMRESULT WINAPI acmDriverDetailsA(HACMDR sizeof(padda.szLicensing), NULL, NULL ); WideCharToMultiByte( CP_ACP, 0, addw.szFeatures, -1, padda.szFeatures, sizeof(padda.szFeatures), NULL, NULL ); - memcpy(padd, &padda, min(padd->cbStruct, sizeof(*padd))); + padda.cbStruct = min(padd->cbStruct, sizeof(*padd)); + memcpy(padd, &padda, padda.cbStruct); } return mmr; } @@ -217,10 +218,12 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDR mmr = acmDriverOpen(&acmDrvr, hadid, 0); if (mmr == MMSYSERR_NOERROR) { ACMDRIVERDETAILSW paddw; + paddw.cbStruct = sizeof(paddw); mmr = (MMRESULT)MSACM_Message(acmDrvr, ACMDM_DRIVER_DETAILS, (LPARAM)&paddw, 0); acmDriverClose(acmDrvr, 0); - memcpy(padd, &paddw, min(padd->cbStruct, sizeof(*padd))); + paddw.cbStruct = min(padd->cbStruct, sizeof(*padd)); + memcpy(padd, &paddw, paddw.cbStruct); } return mmr; diff --git a/dlls/msacm/tests/msacm.c b/dlls/msacm/tests/msacm.c index d3abae6..1d585fd 100644 --- a/dlls/msacm/tests/msacm.c +++ b/dlls/msacm/tests/msacm.c @@ -120,6 +120,15 @@ static BOOL CALLBACK DriverEnumProc(HACM "acmDriverDetails(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); + /* cbStruct should contain size of returned data (at most sizeof(dd)) + TODO: should it be *exactly* sizeof(dd), as tested here? + */ + if (rc == MMSYSERR_NOERROR) { + ok(dd.cbStruct == sizeof(dd), + "acmDriverDetails(): cbStruct = %08lx, should be %08lx\n", + dd.cbStruct, (unsigned long)sizeof(dd)); + } + if (rc == MMSYSERR_NOERROR && winetest_interactive) { trace(" Short name: %s\n", dd.szShortName); trace(" Long name: %s\n", dd.szLongName);

1 0

Jesse Allen : msvcrt: Ignore PadZero when LeftAlign is true in printf conversions.
by Alexandre Julliard Dec. 20, 2005

Dec. 20, 2005

Module: wine Branch: refs/heads/master Commit: 39b725b79993600b3925eaeca10dc34c1dbd6740 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=39b725b79993600b3925eae… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Tue Dec 20 11:49:05 2005 +0100 msvcrt: Ignore PadZero when LeftAlign is true in printf conversions. --- dlls/msvcrt/tests/printf.c | 5 +++++ dlls/msvcrt/wcs.c | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 72b12a4..3979a95 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -66,6 +66,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"0001"),"Character not zero-prefixed \"%s\"\n",buffer); ok( r==4, "return count wrong\n"); + format = "%-04c"; + r = sprintf(buffer,format,'1'); + ok(!strcmp(buffer,"1 "),"Character zero-padded and/or not left-adjusted \"%s\"\n",buffer); + ok( r==4, "return count wrong\n"); + format = "%p"; r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b8dc39e..efb93d8 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -286,12 +286,11 @@ static inline int pf_fill( pf_output *ou int i, r = 0; if( ( !left && flags->LeftAlign ) || - ( left && !flags->LeftAlign ) || - ( left && flags->PadZero ) ) + ( left && !flags->LeftAlign )) { for( i=0; (i<(flags->FieldLength-len)) && (r>=0); i++ ) { - if( flags->PadZero ) + if( left && flags->PadZero ) r = pf_output_stringA( out, "0", 1 ); else r = pf_output_stringA( out, " ", 1 );

1 0

Eric Pouech : ntdll: Made DBG_EXCEPTION_HANDLED a synonym of DBG_CONTINUE for exception handlers.
by Alexandre Julliard Dec. 20, 2005

Dec. 20, 2005

Module: wine Branch: refs/heads/master Commit: fe36b7baca253f1e95cc790b84308969bd6ecc60 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fe36b7baca253f1e95cc790… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Tue Dec 20 11:47:27 2005 +0100 ntdll: Made DBG_EXCEPTION_HANDLED a synonym of DBG_CONTINUE for exception handlers. --- dlls/ntdll/exception.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 972ba0a..ee1bf9c 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -185,7 +185,7 @@ void wait_suspend( CONTEXT *context ) * * Send an EXCEPTION_DEBUG_EVENT event to the debugger. */ -static int send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *context ) +static NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *context ) { int ret; HANDLE handle = 0; @@ -269,6 +269,7 @@ void WINAPI __regs_RtlRaiseException( EX EXCEPTION_REGISTRATION_RECORD *frame, *dispatch, *nested_frame; EXCEPTION_RECORD newrec; DWORD res, c; + NTSTATUS status; TRACE( "code=%lx flags=%lx addr=%p\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); for (c=0; c<rec->NumberParameters; c++) TRACE(" info[%ld]=%08lx\n", c, rec->ExceptionInformation[c]); @@ -295,7 +296,8 @@ void WINAPI __regs_RtlRaiseException( EX } #endif - if (send_debug_event( rec, TRUE, context ) == DBG_CONTINUE) return; /* continue execution */ + status = send_debug_event( rec, TRUE, context ); + if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) return; /* continue execution */ if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION) return;

1 0

Paul Vriens : winecfg: Dutch resources update.
by Alexandre Julliard Dec. 20, 2005

Dec. 20, 2005

Module: wine Branch: refs/heads/master Commit: ac4c85c35aa800c758e821ed5fe2c81eff42b757 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ac4c85c35aa800c758e821e… Author: Paul Vriens <paul.vriens(a)xs4all.nl> Date: Tue Dec 20 11:47:00 2005 +0100 winecfg: Dutch resources update. --- programs/winecfg/Nl.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index d30b079..fd29e29 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -159,9 +159,9 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 + GROUPBOX " Stuurprograma selectie ",IDC_STATIC,8,4,244,195 LTEXT "Geluidsbesturing: ",IDC_STATIC,15,20,227,30 - CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,50,150,160 + CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,50,79,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardwareversnelling: ",IDC_STATIC,15,215,90,10

1 0

H. Verbeet : wined3d: Cleanup shader constants code a little bit.
by Alexandre Julliard Dec. 20, 2005

Dec. 20, 2005

Module: wine Branch: refs/heads/master Commit: 4e7b2557b540ea8af1906133f244ec685cf047a6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4e7b2557b540ea8af190613… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Dec 20 11:46:52 2005 +0100 wined3d: Cleanup shader constants code a little bit. Improved bounds checking. --- dlls/wined3d/device.c | 387 +++++++++++++++++++------------------- include/wine/wined3d_interface.h | 8 + 2 files changed, 197 insertions(+), 198 deletions(-)

1 0

Jesse Allen : msvcrt: Require exact uppercase and lowercase format in printf routines.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 5c6311688c13a5557e4b05d06f2f9b6f6c341063 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5c6311688c13a5557e4b05d… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Dec 19 21:26:46 2005 +0100 msvcrt: Require exact uppercase and lowercase format in printf routines. --- dlls/msvcrt/tests/printf.c | 5 +++++ dlls/msvcrt/wcs.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 73b08b7..72b12a4 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -51,6 +51,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "1"), "Problem with \"ll\" interpretation\n"); ok( r==1, "return count wrong\n"); + format = "%I"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, "I"), "Problem with \"I\" interpretation\n"); + ok( r==1, "return count wrong\n"); + format = "%S"; r = sprintf(buffer,format,wide); ok(!strcmp(buffer,"wide"),"Problem with wide string format\n"); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 2e5d0a9..b8dc39e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -347,19 +347,17 @@ static inline int pf_output_format_A( pf static inline BOOL pf_is_double_format( char fmt ) { - char float_fmts[] = "aefg"; + static const char float_fmts[] = "aeEfgG"; if (!fmt) return FALSE; - fmt = tolower( fmt ); return strchr( float_fmts, fmt ) ? TRUE : FALSE; } static inline BOOL pf_is_valid_format( char fmt ) { - char float_fmts[] = "acdefginoux"; + static const char float_fmts[] = "acCdeEfgGinouxX"; if (!fmt) return FALSE; - fmt = tolower( fmt ); return strchr( float_fmts, fmt ) ? TRUE : FALSE; }

1 0

Bill Medland : winemenubuilder: Provide depth to the menus created.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: d5739ed88f916b53325a16fa08bf62990ff149bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d5739ed88f916b53325a16f… Author: Bill Medland <billmedland(a)mercuryspeed.com> Date: Mon Dec 19 21:25:52 2005 +0100 winemenubuilder: Provide depth to the menus created. --- programs/winemenubuilder/winemenubuilder.c | 102 ++++++++++++++++++---------- tools/wineshelllink | 7 ++ 2 files changed, 72 insertions(+), 37 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 589b208..3823142 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -5,6 +5,7 @@ * Copyright 1998 Juergen Schmied * Copyright 2003 Mike McCormack for CodeWeavers * Copyright 2004 Dmitry Timoshkov + * Copyright 2005 Bill Medland * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * + * This program is used to replicate the Windows desktop and start menu + * into the native desktop's copies. Desktop entries are merged directly + * into the native desktop. The Windows Start Menu corresponds to a Wine + * entry within the native "start" menu and replicates the whole tree + * structure of the Windows Start Menu. Currently it does not differentiate + * between the user's desktop/start menu and the "All Users" copies. + * * This program will read a Windows shortcut file using the IShellLink * interface, then invoke wineshelllink with the appropriate arguments * to create a KDE/Gnome menu entry for the shortcut. @@ -28,10 +36,21 @@ * winemenubuilder [ -r ] <shortcut.lnk> * * If the -r parameter is passed, and the shortcut cannot be created, - * this program will add RunOnce entry to invoke itself at the next + * this program will add a RunOnce entry to invoke itself at the next * reboot. This covers the case when a ShortCut is created before the * executable containing its icon. * + * TODO + * Handle data lnk files. There is no icon in the file; the icon is in + * the handler for the file type (or pointed to by the lnk file). Also it + * might be better to use a native handler (e.g. a native acroread for pdf + * files). + * Differentiate between the user's entries and the "All Users" entries. + * If it is possible to add the desktop files to the native system's + * shared location for an "All Users" entry then do so. As a suggestion the + * shared menu Wine base could be writable to the wine group, or a wineadm + * group. + * */ #include "config.h" @@ -650,32 +669,46 @@ static int fork_and_wait( const char *li return retcode; } -static char *cleanup_link( LPCWSTR link ) +/* Return a heap-allocated copy of the unix format difference between the two + * Windows-format paths. + * locn is the owning location + * link is within locn + */ +static char *relative_path( LPCWSTR link, LPCWSTR locn ) { - char *unix_file_name; - char *p, *link_name; + char *unix_locn, *unix_link; + char *relative = NULL; - unix_file_name = wine_get_unix_file_name(link); - if (!unix_file_name) - { - WINE_ERR("target link %s not found\n", wine_dbgstr_w(link)); - return NULL; + unix_locn = wine_get_unix_file_name(locn); + unix_link = wine_get_unix_file_name(link); + if (unix_locn && unix_link) + { + size_t len_unix_locn, len_unix_link; + len_unix_locn = strlen (unix_locn); + len_unix_link = strlen (unix_link); + if (len_unix_locn < len_unix_link && memcmp (unix_locn, unix_link, len_unix_locn) == 0 && unix_link[len_unix_locn] == '/') + { + size_t len_rel; + char *p = strrchr (unix_link + len_unix_locn, '/'); + p = strrchr (p, '.'); + if (p) + { + *p = '\0'; + len_unix_link = p - unix_link; + } + len_rel = len_unix_link - len_unix_locn; + relative = HeapAlloc(GetProcessHeap(), 0, len_rel); + if (relative) + { + memcpy (relative, unix_link + len_unix_locn + 1, len_rel); + } + } } - - link_name = unix_file_name; - p = strrchr( link_name, '/' ); - if (p) - link_name = p + 1; - - p = strrchr( link_name, '.' ); - if (p) - *p = 0; - - p = HeapAlloc(GetProcessHeap(), 0, strlen(link_name) + 1); - strcpy(p, link_name); - HeapFree(GetProcessHeap(), 0, unix_file_name); - - return p; + if (!relative) + WINE_WARN("Could not separate the relative link path of %s in %s\n", wine_dbgstr_w(link), wine_dbgstr_w(locn)); + HeapFree(GetProcessHeap(), 0, unix_locn); + HeapFree(GetProcessHeap(), 0, unix_link); + return relative; } /*********************************************************************** @@ -683,9 +716,11 @@ static char *cleanup_link( LPCWSTR link * GetLinkLocation * * returns TRUE if successful - * *loc will contain CS_DESKTOPDIRECTORY, CS_STARTMENU, CS_STARTUP + * *loc will contain CS_DESKTOPDIRECTORY, CS_STARTMENU, CS_STARTUP etc. + * *relative will contain the address of a heap-allocated copy of the portion + * of the filename that is within the specified location, in unix form */ -static BOOL GetLinkLocation( LPCWSTR linkfile, DWORD *loc ) +static BOOL GetLinkLocation( LPCWSTR linkfile, DWORD *loc, char **relative ) { WCHAR filename[MAX_PATH], buffer[MAX_PATH]; DWORD len, i, r, filelen; @@ -708,7 +743,7 @@ static BOOL GetLinkLocation( LPCWSTR lin len = lstrlenW(buffer); if (len >= MAX_PATH) - continue; + continue; /* We've just trashed memory! Hopefully we are OK */ if (len > filelen || filename[len]!='\\') continue; @@ -721,7 +756,8 @@ static BOOL GetLinkLocation( LPCWSTR lin /* return the remainder of the string and link type */ *loc = locations[i]; - return TRUE; + *relative = relative_path (filename, buffer); + return (*relative != NULL); } return FALSE; @@ -856,7 +892,7 @@ static BOOL InvokeShellLinker( IShellLin return FALSE; } - if( !GetLinkLocation( link, &csidl ) ) + if( !GetLinkLocation( link, &csidl, &link_name ) ) { WINE_WARN("Unknown link location '%s'. Ignoring.\n",wine_dbgstr_w(link)); return TRUE; @@ -866,6 +902,7 @@ static BOOL InvokeShellLinker( IShellLin WINE_WARN("Not under desktop or start menu. Ignoring.\n"); return TRUE; } + WINE_TRACE("Link : %s\n", wine_dbgstr_a(link_name)); szWorkDir[0] = 0; IShellLinkW_GetWorkingDirectory( sl, szWorkDir, MAX_PATH ); @@ -935,13 +972,6 @@ static BOOL InvokeShellLinker( IShellLin lstrcatW(szPath, startW); } - link_name = cleanup_link( link ); - if( !link_name ) - { - WINE_ERR("Couldn't clean up link name %s\n", wine_dbgstr_w(link)); - goto cleanup; - } - /* escape the path and parameters */ escaped_path = escape(szPath); escaped_args = escape(szArgs); diff --git a/tools/wineshelllink b/tools/wineshelllink index 722ede0..10fa80b 100755 --- a/tools/wineshelllink +++ b/tools/wineshelllink @@ -20,6 +20,11 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# Note that the link is a relative unix-style path name. Since the / character +# is not valid in Windows filenames it is an adequate separator to show the +# menu structure. (This program may need to split the menu structure out for +# implementing xdg-style menus) + mode="" args="" menu="" @@ -38,7 +43,7 @@ options: --desktop create a desktop link --menu create a menu entry --path xx path to the application - --link xx name of link to create + --link xx name of link to create, including path --args xx command-line arguments for the application --icon xx icon to display --workdir xx working directory for the application

1 0

Alexandre Julliard : kernel32: Check for tabs too when extracting the program name
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 68df9182825ee82793bc8fb76dd0ae7409fbd384 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=68df9182825ee82793bc8fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 21:25:23 2005 +0100 kernel32: Check for tabs too when extracting the program name (reported by Vitaliy Margolen). --- dlls/kernel/process.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index e75fccb..19d945b 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -1736,6 +1736,7 @@ static LPWSTR get_file_name( LPCWSTR app WCHAR *name, *pos, *ret = NULL; const WCHAR *p; + BOOL got_space; /* if we have an app name, everything is easy */ @@ -1780,26 +1781,27 @@ static LPWSTR get_file_name( LPCWSTR app return NULL; pos = name; p = cmdline; + got_space = FALSE; while (*p) { - do *pos++ = *p++; while (*p && *p != ' '); + do *pos++ = *p++; while (*p && *p != ' ' && *p != '\t'); *pos = 0; if (find_exe_file( name, buffer, buflen, handle )) { ret = cmdline; break; } + if (*p) got_space = TRUE; } - if (!ret || !strchrW( name, ' ' )) goto done; /* no change necessary */ - - /* now build a new command-line with quotes */ - - if (!(ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(cmdline) + 3) * sizeof(WCHAR) ))) - goto done; - sprintfW( ret, quotesW, name ); - strcatW( ret, p ); + if (ret && got_space) /* now build a new command-line with quotes */ + { + if (!(ret = HeapAlloc( GetProcessHeap(), 0, (strlenW(cmdline) + 3) * sizeof(WCHAR) ))) + goto done; + sprintfW( ret, quotesW, name ); + strcatW( ret, p ); + } done: HeapFree( GetProcessHeap(), 0, name );

1 0

Hans Leidekker : widl: Avoid lvalue casts in generated code.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 4f46232368fbfbac621bda169bb19a65622a6f78 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4f46232368fbfbac621bda1… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Dec 19 21:20:14 2005 +0100 widl: Avoid lvalue casts in generated code. --- tools/widl/client.c | 7 +++++-- tools/widl/proxy.c | 28 ++++++++++++++++++++-------- tools/widl/server.c | 7 +++++-- tools/widl/typegen.c | 14 ++++++++++---- 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index e0c4295..3fd5f5c 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -255,9 +255,12 @@ static void write_function_stubs(type_t indent -= 2; fprintf(client, "\n"); - print_client("_RetVal = *(("); + print_client("_RetVal = *("); write_type(client, def->type, def, def->tname); - fprintf(client, " *)_StubMsg.Buffer)++;\n"); + fprintf(client, " *)_StubMsg.Buffer;\n"); + fprintf(client, "_StubMsg.Buffer += sizeof("); + write_type(client, def->type, def, def->tname); + fprintf(client, ");\n"); } /* update proc_offset */ diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 936e1e7..c91d388 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -323,9 +323,12 @@ static void marshall_copy_arg( var_t *ar case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: - print_proxy( "*(("); + print_proxy( "*("); write_type(proxy, arg->type, arg, arg->tname); - fprintf(proxy,"*)_StubMsg.Buffer)++ = %s;\n", arg->name ); + fprintf(proxy, " *)_StubMsg.Buffer = %s;\n", arg->name ); + fprintf(proxy, "_StubMsg.Buffer += sizeof("); + write_type(proxy, arg->type, arg, arg->tname); + fprintf(proxy, ");\n"); break; case RPC_FC_STRUCT: @@ -419,9 +422,12 @@ static void unmarshall_copy_arg( var_t * case RPC_FC_LONG: case RPC_FC_ULONG: case RPC_FC_ENUM32: - print_proxy( "%s = *((", arg->name ); + print_proxy( "%s = *(", arg->name ); + write_type(proxy, arg->type, arg, arg->tname); + fprintf(proxy," *)_StubMsg.Buffer;\n"); + fprintf(proxy, "_StubMsg.Buffer += sizeof("); write_type(proxy, arg->type, arg, arg->tname); - fprintf(proxy,"*)_StubMsg.Buffer)++;\n"); + fprintf(proxy, ");\n"); break; case RPC_FC_STRUCT: @@ -595,9 +601,12 @@ static void gen_proxy(type_t *iface, fun */ print_proxy( "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + 3) & ~ 0x3);\n"); - print_proxy( "_RetVal = *((" ); + print_proxy( "_RetVal = *(" ); write_type(proxy, def->type, def, def->tname); - fprintf(proxy, "*)_StubMsg.Buffer)++;\n"); + fprintf(proxy, " *)_StubMsg.Buffer;\n"); + fprintf(proxy, "_StubMsg.Buffer += sizeof("); + write_type(proxy, def->type, def, def->tname); + fprintf(proxy, ");\n"); } indent--; @@ -798,9 +807,12 @@ static void gen_stub(type_t *iface, func */ print_proxy( "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + 3) & ~ 0x3);\n"); - print_proxy( "*((" ); + print_proxy( "*(" ); + write_type(proxy, def->type, def, def->tname); + fprintf(proxy, " *)_StubMsg.Buffer = _RetVal;\n"); + fprintf(proxy, "_StubMsg.Buffer += sizeof("); write_type(proxy, def->type, def, def->tname); - fprintf(proxy, "*)_StubMsg.Buffer)++ = _RetVal;\n"); + fprintf(proxy, ");\n"); } indent--; diff --git a/tools/widl/server.c b/tools/widl/server.c index cb10993..6022f5a 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -267,9 +267,12 @@ static void write_function_stubs(type_t print_server("_StubMsg.Buffer = (unsigned char *)_pRpcMessage->Buffer;\n"); fprintf(server, "\n"); - print_server("*(("); + print_server("*("); write_type(server, def->type, def, def->tname); - fprintf(server, " *)_StubMsg.Buffer)++ = _RetVal;\n"); + fprintf(server, " *)_StubMsg.Buffer = _RetVal;\n"); + fprintf(server, "_StubMsg.Buffer += sizeof("); + write_type(server, def->type, def, def->tname); + fprintf(server, ");\n"); } indent--; diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 32ac8e8..cb6e87b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -301,11 +301,14 @@ void marshall_arguments(FILE *file, int if (alignment != 0) print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - print_file(file, indent, "*(("); + print_file(file, indent, "*("); write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer)++ = "); + fprintf(file, " *)_StubMsg.Buffer = "); write_name(file, var); fprintf(file, ";\n"); + fprintf(file, "_StubMsg.Buffer += sizeof("); + write_type(file, var->type, var, var->tname); + fprintf(file, ");\n"); fprintf(file, "\n"); last_size = size; @@ -373,9 +376,12 @@ void unmarshall_arguments(FILE *file, in print_file(file, indent, ""); write_name(file, var); - fprintf(file, " = *(("); + fprintf(file, " = *("); + write_type(file, var->type, var, var->tname); + fprintf(file, " *)_StubMsg.Buffer;\n"); + fprintf(file, "_StubMsg.Buffer += sizeof("); write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer)++;\n"); + fprintf(file, ");\n"); fprintf(file, "\n"); last_size = size;

1 0

Kai Blin : secur32: Adding AcceptSecurityContext to the NTLM security provider.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 43b21b6e8649f26b348b58fd64262f242e308da4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43b21b6e8649f26b348b58f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Dec 19 21:20:03 2005 +0100 secur32: Adding AcceptSecurityContext to the NTLM security provider. --- dlls/secur32/ntlm.c | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 226 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 3de699f..feaef9b 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -741,7 +741,232 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac ptsExpiry); if (phCredential) { - ret = SEC_E_UNSUPPORTED_FUNCTION; + PNegoHelper helper = (PNegoHelper)phCredential->dwLower; + /* Max size of input data is 2010 byte, as that's the maximum size + * ntlm_auth will handle*/ + char *buffer = HeapAlloc(GetProcessHeap(), 0, + sizeof(char) * NTLM_MAX_BUF); + PBYTE bin = HeapAlloc(GetProcessHeap(),0, sizeof(BYTE) * NTLM_MAX_BUF); + int buffer_len, bin_len, max_len = NTLM_MAX_BUF; + ULONG ctxt_attr = 0; + + if(helper->mode != NTLM_SERVER) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_HANDLE; + } + + /* Handle all the flags */ + if(fContextReq & ISC_REQ_ALLOCATE_MEMORY) + { + FIXME("AcceptSecurityContext(): ISC_REQ_ALLOCATE_MEMORY stub\n"); + } + if(fContextReq & ISC_REQ_CONFIDENTIALITY) + { + FIXME("AcceptSecurityContext(): ISC_REQ_CONFIDENTIALITY stub\n"); + } + if(fContextReq & ISC_REQ_CONNECTION) + { + /* This is default, so we'll enable it */ + ctxt_attr |= ISC_RET_CONNECTION; + } + if(fContextReq & ISC_REQ_EXTENDED_ERROR) + { + FIXME("AcceptSecurityContext(): ISC_REQ_EXTENDED_ERROR stub\n"); + } + if(fContextReq & ISC_REQ_INTEGRITY) + { + FIXME("AcceptSecurityContext(): ISC_REQ_INTEGRITY stub\n"); + } + if(fContextReq & ISC_REQ_MUTUAL_AUTH) + { + FIXME("AcceptSecurityContext(): ISC_REQ_MUTUAL_AUTH stub\n"); + } + if(fContextReq & ISC_REQ_REPLAY_DETECT) + { + FIXME("AcceptSecurityContext(): ISC_REQ_REPLAY_DETECT stub\n"); + } + if(fContextReq & ISC_REQ_SEQUENCE_DETECT) + { + FIXME("AcceptSecurityContext(): ISC_REQ_SEQUENCE_DETECT stub\n"); + } + if(fContextReq & ISC_REQ_STREAM) + { + FIXME("AcceptSecurityContext(): ISC_REQ_STREAM stub\n"); + } + /* Done with the flags */ + if(TargetDataRep == SECURITY_NETWORK_DREP){ + FIXME("Don't know how to do SECURITY_NETWORK_DREP\n"); + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + + if(phContext == NULL) + { + /* This is the first call to AcceptSecurityHandle */ + if(pInput == NULL) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INCOMPLETE_MESSAGE; + } + + if(pInput->cBuffers < 1) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INCOMPLETE_MESSAGE; + } + + if(pInput->pBuffers[0].cbBuffer > max_len) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_TOKEN; + } + else + bin_len = pInput->pBuffers[0].cbBuffer; + + /* This is the YR request from the client, encode to base64 */ + + memcpy(bin, pInput->pBuffers[0].pvBuffer, bin_len); + + lstrcpynA(buffer, "YR ", max_len-1); + + if((ret = encodeBase64(bin, bin_len, buffer+3, max_len-3, + &buffer_len)) != SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + TRACE("Client sent: %s\n", debugstr_a(buffer)); + + if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != + SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + TRACE("Reply from ntlm_auth: %s\n", debugstr_a(buffer)); + /* The expected answer is TT <base64 blob> */ + + if(strncmp(buffer, "TT ", 3) != 0) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_TOKEN; + } + + if((ret = decodeBase64(buffer+3, buffer_len-3, bin, max_len, + &bin_len)) != SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + /* send this to the client */ + if(pOutput == NULL) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INSUFFICIENT_MEMORY; + } + + if(pOutput->cBuffers < 1) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INSUFFICIENT_MEMORY; + } + + pOutput->pBuffers[0].cbBuffer = bin_len; + pOutput->pBuffers[0].BufferType = SECBUFFER_DATA; + memcpy(pOutput->pBuffers[0].pvBuffer, bin, bin_len); + ret = SEC_I_CONTINUE_NEEDED; + + } + else + { + /* we expect a KK request from client */ + if(pInput == NULL) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INCOMPLETE_MESSAGE; + } + + if(pInput->cBuffers < 1) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INCOMPLETE_MESSAGE; + } + + if(pInput->pBuffers[0].cbBuffer > max_len) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_TOKEN; + } + else + bin_len = pInput->pBuffers[0].cbBuffer; + + memcpy(bin, pInput->pBuffers[0].pvBuffer, bin_len); + + lstrcpynA(buffer, "KK ", max_len-1); + + if((ret = encodeBase64(bin, bin_len, buffer+3, max_len-3, + &buffer_len)) != SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + TRACE("Client sent: %s\n", debugstr_a(buffer)); + + if((ret = run_helper(helper, buffer, max_len, &buffer_len)) != + SEC_E_OK) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return ret; + } + + TRACE("Reply from ntlm_auth: %s\n", debugstr_a(buffer)); + + if(strncmp(buffer, "AF ", 3) != 0) + { + if(strncmp(buffer, "NA ", 3) == 0) + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_LOGON_DENIED; + } + else + { + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + return SEC_E_INVALID_TOKEN; + } + } + + ret = SEC_E_OK; + } + + phNewContext->dwUpper = ctxt_attr; + phNewContext->dwLower = ret; + HeapFree(GetProcessHeap(), 0, buffer); + HeapFree(GetProcessHeap(), 0, bin); + } else {

1 0

Detlef Riekenberg : winspool: Filter additional failures.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 6035b93e455d4577ba1cb29602df5267048246ec URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6035b93e455d4577ba1cb29… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 19 21:19:47 2005 +0100 winspool: Filter additional failures. --- dlls/winspool/tests/info.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index 0401546..2218ef4 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -418,8 +418,10 @@ static void test_openprinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinter(default_printer, &hprinter, &defaults); - ok(res || (!res && GetLastError() == ERROR_INVALID_DATATYPE), - "returned %ld with %ld (expected '!=0' or '0' with ERROR_INVALID_DATATYPE)\n", + ok(res || (GetLastError() == ERROR_INVALID_DATATYPE || + GetLastError() == RPC_S_SERVER_UNAVAILABLE), + "returned %ld with %ld (expected '!=0' or '0' with: " \ + "ERROR_INVALID_DATATYPE or RPC_S_SERVER_UNAVAILABLE)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -430,8 +432,10 @@ static void test_openprinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinter(default_printer, &hprinter, &defaults); - ok(res || (!res && GetLastError() == ERROR_ACCESS_DENIED), - "returned %ld with %ld (expected '!=0' or '0' with ERROR_ACCESS_DENIED)\n", + ok(res || (GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == RPC_S_SERVER_UNAVAILABLE), + "returned %ld with %ld (expected '!=0' or '0' with: " \ + "ERROR_ACCESS_DENIED or RPC_S_SERVER_UNAVAILABLE)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); @@ -440,8 +444,10 @@ static void test_openprinter(void) hprinter = (HANDLE) MAGIC_DEAD; SetLastError(MAGIC_DEAD); res = OpenPrinter(default_printer, &hprinter, &defaults); - ok(res || (!res && GetLastError() == ERROR_ACCESS_DENIED), - "returned %ld with %ld (expected '!=0' or '0' with ERROR_ACCESS_DENIED)\n", + ok(res || (GetLastError() == ERROR_ACCESS_DENIED || + GetLastError() == RPC_S_SERVER_UNAVAILABLE), + "returned %ld with %ld (expected '!=0' or '0' with: " \ + "ERROR_ACCESS_DENIED or RPC_S_SERVER_UNAVAILABLE)\n", res, GetLastError()); if(res) ClosePrinter(hprinter); }

1 0

Eric Pouech : winhelp: Handle '> ' on command lines.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: e5b40ab56a6760b4132f00a84031c03f401f3c41 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e5b40ab56a6760b4132f00a… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:23:02 2005 +0100 winhelp: Handle '> ' on command lines. --- programs/winhelp/winhelp.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/programs/winhelp/winhelp.c b/programs/winhelp/winhelp.c index 5c4b9e2..f3abdd5 100644 --- a/programs/winhelp/winhelp.c +++ b/programs/winhelp/winhelp.c @@ -161,10 +161,10 @@ static HLPFILE_WINDOWINFO* WINHELP_G */ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) { - MSG msg; - LONG lHash = 0; - HLPFILE* hlpfile; - CHAR* quote; + MSG msg; + LONG lHash = 0; + HLPFILE* hlpfile; + char* wndname = "main"; WINHELP_DLL* dll; Globals.hInstance = hInstance; @@ -214,17 +214,23 @@ int PASCAL WinMain(HINSTANCE hInstance, if (*cmdline) { - if ((*cmdline == '"') && (quote = strchr(cmdline+1, '"'))) + char* ptr; + if ((*cmdline == '"') && (ptr = strchr(cmdline+1, '"'))) { cmdline++; - *quote = '\0'; + *ptr = '\0'; + } + if ((ptr = strchr(cmdline, '>'))) + { + *ptr = '\0'; + wndname = ptr + 1; } hlpfile = WINHELP_LookupHelpFile(cmdline); if (!hlpfile) return 0; } else hlpfile = NULL; WINHELP_CreateHelpWindowByHash(hlpfile, lHash, - WINHELP_GetWindowInfo(hlpfile, "main"), show); + WINHELP_GetWindowInfo(hlpfile, wndname), show); /* Message loop */ while (GetMessage(&msg, 0, 0, 0))

1 0

Eric Pouech : dbghelp: First stab at supporting calling convention in function signature.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: be849decf60eb49811995f9129d72808424b8d12 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=be849decf60eb49811995f9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:22:54 2005 +0100 dbghelp: First stab at supporting calling convention in function signature. --- dlls/dbghelp/dbghelp_private.h | 4 +++- dlls/dbghelp/dwarf.c | 23 ++++++++++++++++++++++- dlls/dbghelp/msc.c | 17 +++++++++++------ dlls/dbghelp/stabs.c | 8 ++++---- dlls/dbghelp/type.c | 18 ++++++++++++++++-- 5 files changed, 56 insertions(+), 14 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 1291162..8d8cb70 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -220,6 +220,7 @@ struct symt_function_signature struct symt symt; struct symt* rettype; struct vector vchildren; + enum CV_call_e call_conv; }; struct symt_function_arg_type @@ -472,7 +473,8 @@ extern struct symt_array* struct symt* base); extern struct symt_function_signature* symt_new_function_signature(struct module* module, - struct symt* ret_type); + struct symt* ret_type, + enum CV_call_e call_conv); extern BOOL symt_add_function_signature_parameter(struct module* module, struct symt_function_signature* sig, struct symt* param); diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index f16dd63..946852e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -443,6 +443,17 @@ typedef enum dwarf_operation_e { DW_OP_nop = 0x96 } dwarf_operation_t; +enum dwarf_calling_convention +{ + DW_CC_normal = 0x1, + DW_CC_program = 0x2, + DW_CC_nocall = 0x3 +}; + +#define DW_CC_lo_user 0x40 +#define DW_CC_hi_user 0xff + + /** * Parsers */ @@ -1876,6 +1887,8 @@ static struct symt_function* dwarf2_pars unsigned char decl_line = 0; dwarf2_abbrev_entry_attr_t* attr = NULL; unsigned long next_sibling = 0; + enum CV_call_e call_conv = CV_CALL_FAR_C; /* FIXME: assuming C source code */ + unsigned cc; TRACE("%s, for %lu\n", dwarf2_debug_ctx(ctx), entry->entry_code); @@ -1908,6 +1921,14 @@ static struct symt_function* dwarf2_pars case DW_AT_inline: inl_flags = dwarf2_parse_byte(ctx); break; + case DW_AT_calling_convention: + switch (cc = dwarf2_parse_byte(ctx)) + { + case DW_CC_normal: break; + case DW_CC_nocall: call_conv = -1; + default: FIXME("Unsupported calling convention %d\n", cc); + } + break; /* not work yet, need parsing .debug_line and using Compil Unit stmt_list case DW_AT_decl_file: decl_file = dwarf2_parse_byte(ctx); @@ -1921,7 +1942,7 @@ static struct symt_function* dwarf2_pars dwarf2_parse_attr(attr, ctx); } } - sig_type = symt_new_function_signature(module, ret_type); + sig_type = symt_new_function_signature(module, ret_type, call_conv); if (!is_decl) { func_type = symt_new_function(module, compiland, name, addr, size, &sig_type->symt); if (low_pc && high_pc) { diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 054f27b..93f0474 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -726,11 +726,12 @@ static int codeview_add_type_struct(stru } static int codeview_new_func_signature(struct module* module, unsigned typeno, - unsigned ret_type) + unsigned ret_type, enum CV_call_e call_conv) { struct symt* symt; symt = &symt_new_function_signature(module, - codeview_get_type(ret_type, FALSE))->symt; + codeview_get_type(ret_type, FALSE), + call_conv)->symt; return codeview_add_type(typeno, symt); } @@ -916,25 +917,29 @@ static int codeview_parse_type_table(str break; case LF_PROCEDURE_V1: retv = codeview_new_func_signature(module, curr_type, - type->procedure_v1.rvtype); + type->procedure_v1.rvtype, + type->procedure_v1.call); break; case LF_PROCEDURE_V2: retv = codeview_new_func_signature(module, curr_type, - type->procedure_v2.rvtype); + type->procedure_v2.rvtype, + type->procedure_v2.call); break; case LF_MFUNCTION_V1: /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ retv = codeview_new_func_signature(module, curr_type, - type->mfunction_v1.rvtype); + type->mfunction_v1.rvtype, + type->mfunction_v1.call); break; case LF_MFUNCTION_V2: /* FIXME: for C++, this is plain wrong, but as we don't use arg types * nor class information, this would just do for now */ retv = codeview_new_func_signature(module, curr_type, - type->mfunction_v2.rvtype); + type->mfunction_v2.rvtype, + type->mfunction_v2.call); break; case LF_ARGLIST_V1: case LF_ARGLIST_V2: diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index f29f552..76629b7 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -848,7 +848,7 @@ static int stabs_pts_read_type_def(struc break; case 'f': PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref_dt) == -1); - new_dt = &symt_new_function_signature(ptd->module, ref_dt)->symt; + new_dt = &symt_new_function_signature(ptd->module, ref_dt, -1)->symt; break; case 'e': new_dt = &symt_new_enum(ptd->module, typename)->symt; @@ -930,7 +930,7 @@ static int stabs_pts_read_type_def(struc { ptd->ptr++; PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref_dt) == -1); - new_dt = &symt_new_function_signature(ptd->module, ref_dt)->symt; + new_dt = &symt_new_function_signature(ptd->module, ref_dt, -1)->symt; } else { @@ -940,7 +940,7 @@ static int stabs_pts_read_type_def(struc PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &cls_dt) == -1); PTS_ABORTIF(ptd, *ptd->ptr++ != ','); PTS_ABORTIF(ptd, stabs_pts_read_type_def(ptd, NULL, &ref_dt) == -1); - new_dt = &symt_new_function_signature(ptd->module, ref_dt)->symt; + new_dt = &symt_new_function_signature(ptd->module, ref_dt, -1)->symt; while (*ptd->ptr == ',') { ptd->ptr++; @@ -1422,7 +1422,7 @@ BOOL stabs_parse(struct module* module, (load_offset + stab_ptr->n_value - curr_func->address) : 0); } func_type = symt_new_function_signature(module, - stabs_parse_type(ptr)); + stabs_parse_type(ptr), -1); curr_func = symt_new_function(module, compiland, symname, load_offset + stab_ptr->n_value, 0, &func_type->symt); diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index fba6942..a62d50a 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -298,7 +298,8 @@ struct symt_array* symt_new_array(struct } struct symt_function_signature* symt_new_function_signature(struct module* module, - struct symt* ret_type) + struct symt* ret_type, + enum CV_call_e call_conv) { struct symt_function_signature* sym; @@ -307,6 +308,7 @@ struct symt_function_signature* symt_new sym->symt.tag = SymTagFunctionType; sym->rettype = ret_type; vector_init(&sym->vchildren, sizeof(struct symt*), 4); + sym->call_conv = call_conv; symt_add_type(module, &sym->symt); } return sym; @@ -735,11 +737,20 @@ BOOL symt_get_info(const struct symt* ty X(VARIANT) = ((const struct symt_data*)type)->u.value; break; + case TI_GET_CALLING_CONVENTION: + if (type->tag != SymTagFunctionType) return FALSE; + if (((const struct symt_function_signature*)type)->call_conv == -1) + { + FIXME("No support for calling convention for this signature\n"); + X(DWORD) = CV_CALL_FAR_C; /* FIXME */ + } + else X(DWORD) = ((const struct symt_function_signature*)type)->call_conv; + break; + #undef X case TI_GET_ADDRESSOFFSET: case TI_GET_ARRAYINDEXTYPEID: - case TI_GET_CALLING_CONVENTION: case TI_GET_CLASSPARENTID: case TI_GET_SYMINDEX: case TI_GET_THISADJUST: @@ -749,6 +760,9 @@ BOOL symt_get_info(const struct symt* ty case TI_IS_EQUIV_TO: FIXME("Unsupported GetInfo request (%u)\n", req); return FALSE; + default: + FIXME("Unknown GetInfo request (%u)\n", req); + return FALSE; } return TRUE;

1 0

Eric Pouech : dbghelp: Return proper size for local & parameters in SYMBOL_INFO.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 750575ccf29c6ae1a478ef4f81f6d1054ef926c3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=750575ccf29c6ae1a478ef4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:20:47 2005 +0100 dbghelp: Return proper size for local & parameters in SYMBOL_INFO. --- dlls/dbghelp/dbghelp_private.h | 2 +- dlls/dbghelp/symbol.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index d2445cd..1291162 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -142,7 +142,7 @@ struct symt_data unsigned long address; /* DataIs{Global, FileStatic} */ struct { - long offset; /* DataIs{Member,Local,Param} in bits*/ + long offset; /* DataIs{Member,Local,Param} in bits */ unsigned long length; /* DataIs{Member} in bits */ unsigned long reg_id; /* DataIs{Local} (0 if frame relative) */ } s; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 29e7d1f..74634d1 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -448,7 +448,10 @@ static void symt_fill_sym_info(const str if (!symt_get_info(sym, TI_GET_TYPE, &sym_info->TypeIndex)) sym_info->TypeIndex = 0; sym_info->info = (DWORD)sym; - symt_get_info(sym, TI_GET_LENGTH, &size); + if (!symt_get_info(sym, TI_GET_LENGTH, &size) && + sym_info->TypeIndex && + !symt_get_info((struct symt*)sym_info->TypeIndex, TI_GET_LENGTH, &size)) + size = 0; sym_info->Size = (DWORD)size; sym_info->ModBase = module->module.BaseOfImage; sym_info->Flags = 0;

1 0

Jonathan Ernst : winecfg: Updated French resources.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: d3805c307acbb4e59a2bdc274f550ab096de2ac0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d3805c307acbb4e59a2bdc2… Author: Jonathan Ernst <jonathan(a)ernstfamily.ch> Date: Mon Dec 19 18:18:01 2005 +0100 winecfg: Updated French resources. --- programs/winecfg/Fr.rc | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index f71a70b..33e3142 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -47,7 +47,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Param�tres des applications ",IDC_STATIC, 8,4,244,240 LTEXT "Wine peut imiter diff�rentes versions de Windows pour chaque application. Cet onglet est li� aux onglets Biblioth�ques et Affichage pour vous permettre de changer des param�tres globaux ou par application dans ces onglets.", - IDC_STATIC,15,20,227,30 + IDC_STATIC,15,20,227,40 CONTROL "Applications",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS, 15,60,230,140 PUSHBUTTON "&Ajouter une application...",IDC_APP_ADDAPP, 70,204,85,14 @@ -82,8 +82,8 @@ BEGIN GROUPBOX " Direct3D ",IDC_STATIC,8,140,244,120 - LTEXT "Support du Vertex Shader: ",IDC_STATIC,15,150,80,30 - COMBOBOX IDC_D3D_VSHADER_MODE,100,148,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Support du Vertex Shader: ",IDC_STATIC,15,150,100,30 + COMBOBOX IDC_D3D_VSHADER_MODE,110,148,100,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Permettre le Pixel Shader (si support� par le mat�riel)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,230,10 END @@ -160,10 +160,10 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 - LTEXT "Pilote audio: ",IDC_STATIC,15,20,227,30 - CONTROL "Devices",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 - PUSHBUTTON "Panneau de configuration",IDC_AUDIO_CONTROL_PANEL,170,50,85,14 + GROUPBOX " S�lection du pilote ",IDC_STATIC,8,4,244,195 + LTEXT "S�lectionnez un pilote audio en cochant la case en regard du pilote d�sir�. D�sactivez le son en ne s�lectionnant aucun polote. La s�lection de pilotes multiples n'est pas recommand�. Configurez le pilote en effectuant un click droit dessus.",IDC_STATIC,15,20,227,60 + CONTROL "Mat�riel",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,60,140,130 + PUSHBUTTON "Panneau de configuration",IDC_AUDIO_CONTROL_PANEL,160,60,86,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Acc�l�ration mat�rielle: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP @@ -174,13 +174,13 @@ IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Th�mes ",IDC_STATIC,8,10,244,94 - LTEXT "Th�me:",IDC_STATIC,15,22,228,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,30,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Couleur:",IDC_THEME_COLORTEXT,15,48,228,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,56,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Taille:",IDC_THEME_SIZETEXT,15,74,228,8 - COMBOBOX IDC_THEME_SIZECOMBO,15,82,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Th�me:",IDC_STATIC,8,10,244,8 + COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Installer un th�me...",IDC_THEME_INSTALL,152,32,100,14 + LTEXT "Couleur:",IDC_THEME_COLORTEXT,8,48,244,8 + COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Taille:",IDC_THEME_SIZETEXT,8,74,244,8 + COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END STRINGTABLE DISCARDABLE @@ -198,4 +198,6 @@ BEGIN IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "A propos" IDS_WINECFG_TITLE "Configuration de Wine" + IDS_THEMEFILE "Fichiers de th�mes" + IDS_THEMEFILE_SELECT "S�lectionnez un fichier de th�me" END

1 0

Aric Stewart : user: Make the edit control IME aware and implement inline editing.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 314f45dcdb866a813800b315aadfb1a72bb6a9ff URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=314f45dcdb866a813800b31… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Dec 19 18:17:51 2005 +0100 user: Make the edit control IME aware and implement inline editing. Makes for a significantly better user experience for CJK users. --- dlls/user/Makefile.in | 1 dlls/user/edit.c | 222 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 217 insertions(+), 6 deletions(-) diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in index 2999fd3..fea90ac 100644 --- a/dlls/user/Makefile.in +++ b/dlls/user/Makefile.in @@ -6,6 +6,7 @@ VPATH = @srcdir@ MODULE = user32.dll IMPORTLIB = libuser32.$(IMPLIBEXT) IMPORTS = gdi32 advapi32 kernel32 ntdll +DELAYIMPORTS = imm32 EXTRALIBS = $(LIBUNICODE) SPEC_SRCS16 = \ diff --git a/dlls/user/edit.c b/dlls/user/edit.c index bc67e43..05575bd 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -53,6 +53,7 @@ #include "winnt.h" #include "wownt32.h" #include "win.h" +#include "imm.h" #include "wine/winbase16.h" #include "wine/winuser16.h" #include "wine/unicode.h" @@ -151,6 +152,11 @@ typedef struct or EM_SETHANDLE16 */ HLOCAL hloc32A; /* alias for ANSI control receiving EM_GETHANDLE or EM_SETHANDLE */ + /* + * IME Data + */ + UINT composition_len; /* lenght of composition, 0 == no composition */ + int composition_start; /* the character position for the composition */ } EDITSTATE; @@ -280,6 +286,7 @@ static void EDIT_WM_Timer(EDITSTATE *es) static LRESULT EDIT_WM_VScroll(EDITSTATE *es, INT action, INT pos); static void EDIT_UpdateText(EDITSTATE *es, LPRECT rc, BOOL bErase); static void EDIT_UpdateTextRegion(EDITSTATE *es, HRGN hrgn, BOOL bErase); +static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es); LRESULT WINAPI EditWndProcA(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -993,6 +1000,52 @@ static LRESULT WINAPI EditWndProc_common } } break; + + + /* IME messages to make the edit control IME aware */ + case WM_IME_SETCONTEXT: + break; + + case WM_IME_STARTCOMPOSITION: + /* + * FIXME in IME: This message is not always sent like it should be + */ + if (es->selection_start != es->selection_end) + { + static const WCHAR empty_stringW[] = {0}; + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + } + es->composition_start = es->selection_end; + es->composition_len = 0; + break; + + case WM_IME_COMPOSITION: + if (es->composition_len == 0) + { + if (es->selection_start != es->selection_end) + { + static const WCHAR empty_stringW[] = {0}; + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + } + + es->composition_start = es->selection_end; + } + EDIT_ImeComposition(hwnd,lParam,es); + break; + + case WM_IME_ENDCOMPOSITION: + es->composition_len= 0; + break; + + case WM_IME_COMPOSITIONFULL: + break; + + case WM_IME_SELECT: + break; + + case WM_IME_CONTROL: + break; + default: result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); break; @@ -2188,6 +2241,9 @@ static INT EDIT_PaintText(EDITSTATE *es, { COLORREF BkColor; COLORREF TextColor; + LOGFONTW underline_font; + HFONT hUnderline = 0; + HFONT old_font = 0; INT ret; INT li; INT BkMode; @@ -2199,9 +2255,20 @@ static INT EDIT_PaintText(EDITSTATE *es, BkColor = GetBkColor(dc); TextColor = GetTextColor(dc); if (rev) { - SetBkColor(dc, GetSysColor(COLOR_HIGHLIGHT)); - SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); - SetBkMode( dc, OPAQUE); + if (es->composition_len == 0) + { + SetBkColor(dc, GetSysColor(COLOR_HIGHLIGHT)); + SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); + SetBkMode( dc, OPAQUE); + } + else + { + HFONT current = GetCurrentObject(dc,OBJ_FONT); + GetObjectW(current,sizeof(LOGFONTW),&underline_font); + underline_font.lfUnderline = TRUE; + hUnderline = CreateFontIndirectW(&underline_font); + old_font = SelectObject(dc,hUnderline); + } } li = EDIT_EM_LineIndex(es, line); if (es->style & ES_MULTILINE) { @@ -2216,9 +2283,19 @@ static INT EDIT_PaintText(EDITSTATE *es, HeapFree(GetProcessHeap(), 0, text); } if (rev) { - SetBkColor(dc, BkColor); - SetTextColor(dc, TextColor); - SetBkMode( dc, BkMode); + if (es->composition_len == 0) + { + SetBkColor(dc, BkColor); + SetTextColor(dc, TextColor); + SetBkMode( dc, BkMode); + } + else + { + if (old_font) + SelectObject(dc,old_font); + if (hUnderline) + DeleteObject(hUnderline); + } } return ret; } @@ -5216,3 +5293,136 @@ static void EDIT_UpdateText(EDITSTATE *e } InvalidateRect(es->hwndSelf, rc, bErase); } + +/******************************************************************** + * + * The Following code is to handle inline editing from IMEs + */ + +static void EDIT_GetCompositionStr(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) +{ + DWORD dwBufLen; + LPWSTR lpCompStr = NULL; + HIMC hIMC; + LPSTR lpCompStrAttr = NULL; + DWORD dwBufLenAttr; + + if (!(hIMC = ImmGetContext(hwnd))) + return; + + dwBufLen = ImmGetCompositionStringW(hIMC, GCS_COMPSTR, NULL, 0); + + if (dwBufLen <= 0) + { + ImmReleaseContext(hwnd, hIMC); + return; + } + + lpCompStr = HeapAlloc(GetProcessHeap(),0,dwBufLen); + if (!lpCompStr) + { + ERR("Unable to allocate IME CompositionString\n"); + ImmReleaseContext(hwnd,hIMC); + return; + } + + ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, dwBufLen); + lpCompStr[dwBufLen/sizeof(WCHAR)] = 0; + + if (CompFlag & GCS_COMPATTR) + { + /* + * We do not use the attributes yet. it would tell us what characters + * are in transition and which are converted or decided upon + */ + dwBufLenAttr = ImmGetCompositionStringW(hIMC, GCS_COMPATTR, NULL, 0); + if (dwBufLenAttr) + { + dwBufLenAttr ++; + lpCompStrAttr = HeapAlloc(GetProcessHeap(),0,dwBufLenAttr); + if (!lpCompStrAttr) + { + ERR("Unable to allocate IME Attribute String\n"); + HeapFree(GetProcessHeap(),0,lpCompStr); + ImmReleaseContext(hwnd,hIMC); + return; + } + ImmGetCompositionStringW(hIMC,GCS_COMPATTR, lpCompStrAttr, + dwBufLenAttr); + lpCompStrAttr[dwBufLenAttr] = 0; + } + else + lpCompStrAttr = NULL; + } + + /* check for change in composition start */ + if (es->selection_end < es->composition_start) + es->composition_start = es->selection_end; + + /* replace existing selection string */ + es->selection_start = es->composition_start; + + if (es->composition_len > 0) + es->selection_end = es->composition_start + es->composition_len; + else + es->selection_end = es->selection_start; + + EDIT_EM_ReplaceSel(es, FALSE, lpCompStr, TRUE, TRUE); + es->composition_len = abs(es->composition_start - es->selection_end); + + es->selection_start = es->composition_start; + es->selection_end = es->selection_start + es->composition_len; + + HeapFree(GetProcessHeap(),0,lpCompStrAttr); + HeapFree(GetProcessHeap(),0,lpCompStr); + ImmReleaseContext(hwnd,hIMC); +} + +static void EDIT_GetResultStr(HWND hwnd, EDITSTATE *es) +{ + DWORD dwBufLen; + LPWSTR lpResultStr; + HIMC hIMC; + + if ( !(hIMC = ImmGetContext(hwnd))) + return; + + dwBufLen = ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, NULL, 0); + if (dwBufLen <= 0) + { + ImmReleaseContext(hwnd, hIMC); + return; + } + + lpResultStr = HeapAlloc(GetProcessHeap(),0, dwBufLen); + if (!lpResultStr) + { + ERR("Unable to alloc buffer for IME string\n"); + ImmReleaseContext(hwnd, hIMC); + return; + } + + ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, dwBufLen); + lpResultStr[dwBufLen/sizeof(WCHAR)] = 0; + + /* check for change in composition start */ + if (es->selection_end < es->composition_start) + es->composition_start = es->selection_end; + + es->selection_start = es->composition_start; + es->selection_end = es->composition_start + es->composition_len; + EDIT_EM_ReplaceSel(es, TRUE, lpResultStr, TRUE, TRUE); + es->composition_start = es->selection_end; + es->composition_len = 0; + + HeapFree(GetProcessHeap(),0,lpResultStr); + ImmReleaseContext(hwnd, hIMC); +} + +static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) +{ + if (CompFlag & GCS_RESULTSTR) + EDIT_GetResultStr(hwnd,es); + if (CompFlag & GCS_COMPSTR) + EDIT_GetCompositionStr(hwnd, CompFlag, es); +}

1 0

Magnus Olsen : msi: Fixed deformat_environment to not cut off string.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: a06aa5e9961016c4d7461e705afe00f324c1f5a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a06aa5e9961016c4d7461e7… Author: Magnus Olsen <magnus(a)itkonsult-olsen.com> Date: Mon Dec 19 18:17:28 2005 +0100 msi: Fixed deformat_environment to not cut off string. --- dlls/msi/format.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 2730433..c280541 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -151,7 +151,7 @@ static LPWSTR deformat_environment(MSIPA { sz++; value = msi_alloc(sz * sizeof(WCHAR)); - GetEnvironmentVariableW(&key[1],value,sz); + GetEnvironmentVariableW(key,value,sz); *chunk = (strlenW(value)) * sizeof(WCHAR); } else

1 0

Eric Pouech : taskmgr: Fix viewing of debug channels.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 2bee5ab04ecdd7c757aa0cde0f1da07df2e1edfa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2bee5ab04ecdd7c757aa0cd… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:16:57 2005 +0100 taskmgr: Fix viewing of debug channels. Various internal cleanups. --- programs/taskmgr/dbgchnl.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-) diff --git a/programs/taskmgr/dbgchnl.c b/programs/taskmgr/dbgchnl.c index b2335e4..a80aedf 100644 --- a/programs/taskmgr/dbgchnl.c +++ b/programs/taskmgr/dbgchnl.c @@ -180,14 +180,6 @@ static void* get_symbol(HANDLE hProcess, return ret; } -struct dll_option_layout -{ - void* next; - void* prev; - char* const* channels; - int nb_channels; -}; - typedef int (*EnumChannelCB)(HANDLE, void*, struct __wine_debug_channel*, void*); /****************************************************************** @@ -196,21 +188,13 @@ typedef int (*EnumChannelCB)(HANDLE, voi * Enumerates all known channels on process hProcess through callback * ce. */ -static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user, unsigned unique) +static int enum_channel(HANDLE hProcess, EnumChannelCB ce, void* user) { struct __wine_debug_channel channel; int ret = 1; - unsigned int j; void* addr; - const char** cache = NULL; - unsigned num_cache, used_cache; if (!(addr = get_symbol(hProcess, "debug_options", "libwine.so"))) return -1; - if (unique) - cache = HeapAlloc(GetProcessHeap(), 0, (num_cache = 32) * sizeof(char*)); - else - num_cache = 0; - used_cache = 0; while (ret && addr && ReadProcessMemory(hProcess, addr, &channel, sizeof(channel), NULL)) { @@ -218,11 +202,6 @@ static int enum_channel(HANDLE hProcess, ret = ce(hProcess, addr, &channel, user); addr = (struct __wine_debug_channel *)addr + 1; } - if (unique) - { - for (j = 0; j < used_cache; j++) HeapFree(GetProcessHeap(), 0, (char*)cache[j]); - HeapFree(GetProcessHeap(), 0, cache); - } return 0; } @@ -232,10 +211,10 @@ static void DebugChannels_FillList(HWND ListView_DeleteAllItems(hChannelLV); - hProcess = OpenProcess(PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); + hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_READ, FALSE, get_selected_pid()); if (!hProcess) return; /* FIXME messagebox */ SendMessage(hChannelLV, WM_SETREDRAW, FALSE, 0); - enum_channel(hProcess, list_channel_CB, (void*)hChannelLV, TRUE); + enum_channel(hProcess, list_channel_CB, (void*)hChannelLV); SendMessage(hChannelLV, WM_SETREDRAW, TRUE, 0); CloseHandle(hProcess); } @@ -310,14 +289,14 @@ static void DebugChannels_OnNotify(HWND user.value = (val[0] == 'x') ? 0 : bitmask; user.mask = bitmask; user.done = user.notdone = 0; - enum_channel(hProcess, change_channel_CB, &user, FALSE); + enum_channel(hProcess, change_channel_CB, &user); if (user.done) { val[0] ^= ('x' ^ ' '); ListView_SetItemText(hChannelLV, lhti.iItem, lhti.iSubItem, val); } if (user.notdone) - printf("Some channel instance weren't correctly set\n"); + printf("Some channel instances weren't correctly set\n"); } CloseHandle(hProcess); }

1 0

Eric Pouech : dbghelp: Implemented SymMatchString.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 17d93f9855380196c0d34f4fedea801aa6a153ea URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=17d93f9855380196c0d34f4… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 18:16:35 2005 +0100 dbghelp: Implemented SymMatchString. --- dlls/dbghelp/dbghelp.spec | 2 +- dlls/dbghelp/symbol.c | 32 ++++++++++++++++++++++++++------ include/dbghelp.h | 2 ++ 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 0b41cc6..9a0820e 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -81,7 +81,7 @@ @ stdcall SymLoadModule(long long str str long long) @ stdcall SymLoadModuleEx(long long str str double long ptr long) @ stdcall SymMatchFileName(str str ptr ptr) -@ stub SymMatchString +@ stdcall SymMatchString(str str long) @ stdcall SymRegisterCallback64(long ptr double) @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c47c04c..29e7d1f 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -81,11 +81,12 @@ static inline void re_append(char** mask * + 1 or more of preceding char * escapes \ on #, ?, [, ], *, +. don't work on - */ -static void compile_regex(const char* str, int numchar, regex_t* re) +static void compile_regex(const char* str, int numchar, regex_t* re, BOOL _case) { char* mask = HeapAlloc(GetProcessHeap(), 0, 1); unsigned len = 1; BOOL in_escape = FALSE; + unsigned flags = REG_NOSUB; re_append(&mask, &len, '^'); @@ -118,7 +119,8 @@ static void compile_regex(const char* st } re_append(&mask, &len, '$'); mask[len - 1] = '\0'; - if (regcomp(re, mask, REG_NOSUB)) FIXME("Couldn't compile %s\n", mask); + if (_case) flags |= REG_ICASE; + if (regcomp(re, mask, flags)) FIXME("Couldn't compile %s\n", mask); HeapFree(GetProcessHeap(), 0, mask); } @@ -733,7 +735,7 @@ static BOOL symt_enum_locals(struct proc BOOL ret; regex_t preg; - compile_regex(mask ? mask : "*", -1, &preg); + compile_regex(mask ? mask : "*", -1, &preg, FALSE); ret = symt_enum_locals_helper(pcs, module, &preg, EnumSymbolsCallback, UserContext, sym_info, &((struct symt_function*)sym)->vchildren); @@ -780,8 +782,8 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce if (bang == Mask) return FALSE; - compile_regex(Mask, bang - Mask, &mod_regex); - compile_regex(bang + 1, -1, &sym_regex); + compile_regex(Mask, bang - Mask, &mod_regex, FALSE); + compile_regex(bang + 1, -1, &sym_regex, FALSE); for (module = pcs->lmodules; module; module = module->next) { @@ -824,7 +826,7 @@ BOOL WINAPI SymEnumSymbols(HANDLE hProce Mask = bang + 1; } - compile_regex(Mask ? Mask : "*", -1, &sym_regex); + compile_regex(Mask ? Mask : "*", -1, &sym_regex, FALSE); symt_enum_module(module, &sym_regex, EnumSymbolsCallback, UserContext); regfree(&sym_regex); @@ -1288,3 +1290,21 @@ DWORD WINAPI UnDecorateSymbolName(LPCSTR return 0; return strlen(UnDecoratedName); } + +/****************************************************************** + * SymMatchString (DBGHELP.@) + * + */ +BOOL WINAPI SymMatchString(PCSTR string, PCSTR re, BOOL _case) +{ + regex_t preg; + BOOL ret; + + TRACE("%s %s %c\n", string, re, _case ? 'Y' : 'N'); + + compile_regex(re, -1, &preg, _case); + ret = regexec(&preg, string, 0, NULL, 0) == 0; + regfree(&preg); + return ret; +} + diff --git a/include/dbghelp.h b/include/dbghelp.h index 5cb25c7..c08e214 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -820,6 +820,8 @@ typedef BOOL (CALLBACK *PSYMBOL_REGISTER BOOL WINAPI SymRegisterCallback64(HANDLE, PSYMBOL_REGISTERED_CALLBACK64, ULONG64); BOOL WINAPI SymUnDName(PIMAGEHLP_SYMBOL, PSTR, DWORD); DWORD WINAPI UnDecorateSymbolName(LPCSTR, LPSTR, DWORD, DWORD); +BOOL WINAPI SymMatchString(PCSTR string, PCSTR re, BOOL _case); +BOOL WINAPI SymMatchStringW(PCWSTR string, PCWSTR re, BOOL _case); /************************* * Source Files *

1 0

Vitaliy Margolen : user: Fix LB_GETTEXT unmapping for A<->W.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: a80d93c5e9f022a38ef41e4a1f96bf974f3392a4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a80d93c5e9f022a38ef41e4… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Mon Dec 19 18:16:18 2005 +0100 user: Fix LB_GETTEXT unmapping for A<->W. --- dlls/user/winproc.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user/winproc.c b/dlls/user/winproc.c index ff5ceaf..7cfc077 100644 --- a/dlls/user/winproc.c +++ b/dlls/user/winproc.c @@ -956,8 +956,9 @@ LRESULT WINPROC_UnmapMsg32ATo32W( HWND h if ( WINPROC_TestLBForStr( hwnd )) { LPARAM *ptr = (LPARAM *)lParam - 1; - result = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, - (LPSTR)*ptr, 0x7fffffff, NULL, NULL ) - 1; + if (result >= 0) + result = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, + (LPSTR)*ptr, 0x7fffffff, NULL, NULL ) - 1; HeapFree( GetProcessHeap(), 0, ptr ); } break; @@ -1224,7 +1225,8 @@ static LRESULT WINPROC_UnmapMsg32WTo32A( if ( WINPROC_TestLBForStr( hwnd )) { LPARAM *ptr = (LPARAM *)lParam - 1; - result = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, (LPWSTR)*ptr, 0x7fffffff ) - 1; + if (result >= 0) + result = MultiByteToWideChar( CP_ACP, 0, (LPSTR)lParam, -1, (LPWSTR)*ptr, 0x7fffffff ) - 1; HeapFree( GetProcessHeap(), 0, ptr ); } break;

1 0

Thomas Weidenmueller : setupapi: Fix comparing the group SIDs in IsUserAdmin.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 278bd29b8d48c0713aae5f48da13111791db11bd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=278bd29b8d48c0713aae5f4… Author: Thomas Weidenmueller <w3seek(a)reactos.com> Date: Mon Dec 19 18:15:58 2005 +0100 setupapi: Fix comparing the group SIDs in IsUserAdmin. --- dlls/setupapi/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 5a04d7b..f7bd6cf 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -248,7 +248,7 @@ BOOL WINAPI IsUserAdmin(VOID) for (i = 0; i < lpGroups->GroupCount; i++) { - if (EqualSid(lpSid, &lpGroups->Groups[i].Sid)) + if (EqualSid(lpSid, lpGroups->Groups[i].Sid)) { bResult = TRUE; break;

1 0

Huw Davies : opengl: Add support for rendering on bitmaps.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 412cb77d511fc370932e21e7945d6f902c6992fc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=412cb77d511fc370932e21e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 19 17:45:13 2005 +0100 opengl: Add support for rendering on bitmaps. --- dlls/opengl32/wgl.c | 24 ++++++++++++++++-------- dlls/x11drv/init.c | 1 + dlls/x11drv/opengl.c | 6 ------ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 30ff1d0..55e8242 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -43,10 +43,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(opengl); #define X11DRV_ESCAPE 6789 enum x11drv_escape_codes { - X11DRV_GET_DISPLAY, /* get X11 display for a DC */ - X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ - X11DRV_GET_FONT, /* get current X font for a DC */ - X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ + X11DRV_GET_DISPLAY, /* get X11 display for a DC */ + X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ + X11DRV_GET_FONT, /* get current X font for a DC */ + X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ + X11DRV_START_EXPOSURES, /* start graphics exposures */ + X11DRV_END_EXPOSURES, /* end graphics exposures */ + X11DRV_GET_DCE, /* get the DCE pointer */ + X11DRV_SET_DCE, /* set the DCE pointer */ + X11DRV_GET_GLX_DRAWABLE /* get current glx drawable for a DC */ }; void (*wine_tsx11_lock_ptr)(void) = NULL; @@ -121,11 +126,11 @@ inline static Display *get_display( HDC } -/* retrieve the X drawable to use on a given DC */ +/* retrieve the GLX drawable to use on a given DC */ inline static Drawable get_drawable( HDC hdc ) { - Drawable drawable; - enum x11drv_escape_codes escape = X11DRV_GET_DRAWABLE; + GLXDrawable drawable; + enum x11drv_escape_codes escape = X11DRV_GET_GLX_DRAWABLE; if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape, sizeof(drawable), (LPSTR)&drawable )) drawable = 0; @@ -144,7 +149,7 @@ inline static HDC get_hdc_from_Drawable( return NULL; } -/* retrieve the X drawable to use on a given DC */ +/* retrieve the X font to use on a given DC */ inline static Font get_font( HDC hdc ) { Font font; @@ -469,6 +474,7 @@ PROC WINAPI wglGetProcAddress(LPCSTR lp BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) { BOOL ret; + DWORD type = GetObjectType(hdc); TRACE("(%p,%p)\n", hdc, hglrc); @@ -523,6 +529,8 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, } TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx); ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx); + if(ret && type == OBJ_MEMDC) + glDrawBuffer(GL_FRONT_LEFT); } LEAVE_GL(); TRACE(" returning %s\n", (ret ? "True" : "False")); diff --git a/dlls/x11drv/init.c b/dlls/x11drv/init.c index 69cfa02..c2729b4 100644 --- a/dlls/x11drv/init.c +++ b/dlls/x11drv/init.c @@ -415,6 +415,7 @@ INT X11DRV_ExtEscape( X11DRV_PDEVICE *ph if(!physDev->bitmap->glxpixmap) physDev->bitmap->glxpixmap = create_glxpixmap(physDev); + X11DRV_CoerceDIBSection(physDev, DIB_Status_GdiMod, FALSE); *(Drawable *)out_data = physDev->bitmap->glxpixmap; } else diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c index c119e7c..a2a591e 100644 --- a/dlls/x11drv/opengl.c +++ b/dlls/x11drv/opengl.c @@ -199,12 +199,6 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV dump_PIXELFORMATDESCRIPTOR((const PIXELFORMATDESCRIPTOR *) ppfd); } - if (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) { - ERR("Flag not supported !\n"); - /* Should SetError here... */ - return 0; - } - /* Now, build the request to GLX */ if (ppfd->iPixelType == PFD_TYPE_COLORINDEX) {

1 0

Alexandre Julliard : ole32: Revert exception handler change.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: dbc14a5cb58db344b7472ca81d497f579795ed2e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dbc14a5cb58db344b7472ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 17:44:56 2005 +0100 ole32: Revert exception handler change. The handler does the opposite of normal page fault handlers. --- dlls/ole32/rpc.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 8c34aa8..c57bab5 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -110,6 +110,13 @@ struct dispatch_params HRESULT hr; /* hresult (out) */ }; +static WINE_EXCEPTION_FILTER(ole_filter) +{ + if (GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) + return EXCEPTION_CONTINUE_SEARCH; + return EXCEPTION_EXECUTE_HANDLER; +} + static HRESULT WINAPI RpcChannelBuffer_QueryInterface(LPRPCCHANNELBUFFER iface, REFIID riid, LPVOID *ppv) { *ppv = NULL; @@ -446,7 +453,7 @@ void RPC_ExecuteCall(struct dispatch_par { params->hr = IRpcStubBuffer_Invoke(params->stub, params->msg, params->chan); } - __EXCEPT_PAGE_FAULT + __EXCEPT(ole_filter) { params->hr = GetExceptionCode(); }

1 0

Rein Klazes : user: Fix hrgn leaks in win.c test.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: d076748e22e7c7d4932612b41f8fa954ba27fb3d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d076748e22e7c7d4932612b… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Dec 19 17:43:34 2005 +0100 user: Fix hrgn leaks in win.c test. --- dlls/user/tests/win.c | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 6cef7a9..64525c4 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2769,6 +2769,9 @@ static void test_scrollvalidate( HWND pa * hwnd2 because of the WS_CLIPSIBLING style */ HWND hwnd1, hwnd2; + clipping = CreateRectRgn(0,0,0,0); + tmprgn = CreateRectRgn(0,0,0,0); + exprgn = CreateRectRgn(0,0,0,0); hwnd2 = CreateWindowExA(0, "static", NULL, WS_CHILD| WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER , 75, 30, 100, 100, parent, 0, 0, NULL); @@ -2779,17 +2782,17 @@ static void test_scrollvalidate( HWND pa UpdateWindow( parent); GetClientRect( hwnd1, &rc); cliprc=rc; - clipping = CreateRectRgn( 10, 10, 90, 90); + SetRectRgn( clipping, 10, 10, 90, 90); hdc = GetDC( hwnd1); /* for a visual touch */ TextOut( hdc, 0,10, "0123456789", 10); ScrollDC( hdc, -10, -5, &rc, &cliprc, hrgn, &rcu); if (winetest_debug > 0) dump_region(hrgn); /* create a region with what is expected */ - exprgn = CreateRectRgn( 39,0,49,74); - tmprgn = CreateRectRgn( 88,79,98,93); + SetRectRgn( exprgn, 39,0,49,74); + SetRectRgn( tmprgn, 88,79,98,93); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); - tmprgn = CreateRectRgn( 0,93,98,98); + SetRectRgn( tmprgn, 0,93,98,98); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); trace("update rect is %ld,%ld - %ld,%ld\n", @@ -2799,10 +2802,10 @@ static void test_scrollvalidate( HWND pa ScrollDC( hdc, -10, -5, &rc, &cliprc, hrgn, &rcu); if (winetest_debug > 0) dump_region(hrgn); /* create a region with what is expected */ - exprgn = CreateRectRgn( 39,10,49,74); - tmprgn = CreateRectRgn( 80,79,90,85); + SetRectRgn( exprgn, 39,10,49,74); + SetRectRgn( tmprgn, 80,79,90,85); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); - tmprgn = CreateRectRgn( 10,85,90,90); + SetRectRgn( tmprgn, 10,85,90,90); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); trace("update rect is %ld,%ld - %ld,%ld\n", @@ -2819,8 +2822,8 @@ static void test_scrollvalidate( HWND pa ScrollWindowEx( hwnd1, -10, 0, &rc, &cliprc, hrgn, &rcu, SW_SCROLLCHILDREN | SW_INVALIDATE); if (winetest_debug > 0) dump_region(hrgn); - exprgn = CreateRectRgn( 88,0,98,98); - tmprgn = CreateRectRgn( 30, 40, 50, 50); + SetRectRgn( exprgn, 88,0,98,98); + SetRectRgn( tmprgn, 30, 40, 50, 50); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); @@ -2841,8 +2844,8 @@ static void test_scrollvalidate( HWND pa ScrollWindowEx( hwnd1, -10, -10, &rc, &cliprc, hrgn, &rcu, SW_SCROLLCHILDREN | SW_INVALIDATE); if (winetest_debug > 0) dump_region(hrgn); - exprgn = CreateRectRgn( 88,0,98,88); - tmprgn = CreateRectRgn( 0,88,98,98); + SetRectRgn( exprgn, 88,0,98,88); + SetRectRgn( tmprgn, 0,88,98,98); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); @@ -2870,12 +2873,12 @@ static void test_scrollvalidate( HWND pa ValidateRect( hwnd2, NULL); ScrollWindowEx( hwnd1, -10, -10, &rc, &cliprc, hrgn, &rcu, SW_INVALIDATE); if (winetest_debug > 0) dump_region(hrgn); - exprgn = CreateRectRgn( 88,0,98,20); - tmprgn = CreateRectRgn( 20,20,98,30); + SetRectRgn( exprgn, 88,0,98,20); + SetRectRgn( tmprgn, 20,20,98,30); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); - tmprgn = CreateRectRgn( 20,30,30,88); + SetRectRgn( tmprgn, 20,30,30,88); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); - tmprgn = CreateRectRgn( 0,88,30,98); + SetRectRgn( tmprgn, 0,88,30,98); CombineRgn( exprgn, exprgn, tmprgn, RGN_OR); ok( EqualRgn( exprgn, hrgn), "wrong update region\n"); @@ -2932,6 +2935,8 @@ static void test_scrolldc( HWND parent) COLORREF colr; hrgn = CreateRectRgn(0,0,0,0); + tmprgn = CreateRectRgn(0,0,0,0); + exprgn = CreateRectRgn(0,0,0,0); hwnd1 = CreateWindowExA(0, "static", NULL, WS_CHILD| WS_VISIBLE, @@ -2964,8 +2969,8 @@ static void test_scrolldc( HWND parent) ok(EqualRect(&rcu, &rc2), "rects do not match (%ld,%ld-%ld,%ld) / (%ld,%ld-%ld,%ld)\n", rcu.left, rcu.top, rcu.right, rcu.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); - exprgn = CreateRectRgn(0, 0, 20, 80); - tmprgn = CreateRectRgn(0, 80, 100, 100); + SetRectRgn( exprgn, 0, 0, 20, 80); + SetRectRgn( tmprgn, 0, 80, 100, 100); CombineRgn(exprgn, exprgn, tmprgn, RGN_OR); if (winetest_debug > 0) dump_region(exprgn); ok(EqualRgn(exprgn, hrgn), "wrong update region\n");

1 0

Dmitry Timoshkov : comctl32: Add a test for the initial tooltip window style settings,
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: f15abf08ac0f9b04b55b23ef556e4cbbf3f6f984 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f15abf08ac0f9b04b55b23e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 19 17:43:10 2005 +0100 comctl32: Add a test for the initial tooltip window style settings, make it pass under Wine. --- dlls/comctl32/tests/.gitignore | 1 + dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/tooltips.c | 68 +++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 2 + 4 files changed, 71 insertions(+), 1 deletions(-) create mode 100644 dlls/comctl32/tests/tooltips.c diff --git a/dlls/comctl32/tests/.gitignore b/dlls/comctl32/tests/.gitignore index 207da2c..5ed31bc 100644 --- a/dlls/comctl32/tests/.gitignore +++ b/dlls/comctl32/tests/.gitignore @@ -9,5 +9,6 @@ subclass.ok tab.ok testlist.c toolbar.ok +tooltips.ok treeview.ok updown.ok diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index fc9881d..1528964 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -15,6 +15,7 @@ CTESTS = \ subclass.c \ tab.c \ toolbar.c \ + tooltips.c \ treeview.c \ updown.c diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c new file mode 100644 index 0000000..ee935b4 --- /dev/null +++ b/dlls/comctl32/tests/tooltips.c @@ -0,0 +1,68 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <assert.h> +#include <windows.h> +#include <commctrl.h> + +#include "wine/test.h" + +static void test_create_tooltip(void) +{ + HWND parent, hwnd; + DWORD style, exp_style; + + parent = CreateWindowEx(0, "static", NULL, WS_POPUP, + 0, 0, 0, 0, + NULL, NULL, NULL, 0); + assert(parent); + + hwnd = CreateWindowEx(0, TOOLTIPS_CLASS, NULL, 0x7fffffff | WS_POPUP, + 10, 10, 300, 100, + parent, NULL, NULL, 0); + assert(hwnd); + + style = GetWindowLong(hwnd, GWL_STYLE); + trace("style = %08lx\n", style); + exp_style = 0x7fffffff | WS_POPUP; + exp_style &= ~(WS_CHILD | WS_MAXIMIZE | WS_BORDER | WS_DLGFRAME); + ok(style == exp_style,"wrong style %08lx/%08lx\n", style, exp_style); + + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, TOOLTIPS_CLASS, NULL, 0, + 10, 10, 300, 100, + parent, NULL, NULL, 0); + assert(hwnd); + + style = GetWindowLong(hwnd, GWL_STYLE); + trace("style = %08lx\n", style); + ok(style == (WS_POPUP | WS_CLIPSIBLINGS | WS_BORDER), + "wrong style %08lx\n", style); + + DestroyWindow(hwnd); + + DestroyWindow(parent); +} + +START_TEST(tooltips) +{ + InitCommonControls(); + + test_create_tooltip(); +} diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 39d981b..c16fd7e 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -2400,7 +2400,7 @@ TOOLTIPS_NCCreate (HWND hwnd, WPARAM wPa DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE); DWORD dwExStyle = GetWindowLongW (hwnd, GWL_EXSTYLE); - dwStyle &= 0x0000FFFF; + dwStyle &= ~(WS_CHILD | /*WS_MAXIMIZE |*/ WS_BORDER | WS_DLGFRAME); dwStyle |= (WS_POPUP | WS_BORDER | WS_CLIPSIBLINGS); /* WS_BORDER only draws a border round the window rect, not the

1 0

Henning Gerhardt : winecfg: Update German resource.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: ba76275e1606b90e4cf95b8eeeb63add1a427f81 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ba76275e1606b90e4cf95b8… Author: Henning Gerhardt <henning.gerhardt(a)web.de> Date: Mon Dec 19 17:42:30 2005 +0100 winecfg: Update German resource. --- programs/winecfg/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index d078963..c0e665c 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -159,13 +159,13 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 + GROUPBOX " Treiber Auswahl ",IDC_STATIC,8,4,244,195 LTEXT "Audio Treiber: ",IDC_STATIC,15,20,227,30 CONTROL "Ger�te",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,50,140,140 PUSHBUTTON "Kontrollschirm",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 LTEXT "Hardware Beschleunigung: ", IDC_STATIC,15,215,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_DSOUND_HW_ACCEL,105,213,140,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Treiber Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END

1 0

Rein Klazes : wcmd: Increase maximum length of commands.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 80e695a6a46f40b7e99011620d4a20a61e7b9911 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=80e695a6a46f40b7e990116… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Dec 19 17:42:11 2005 +0100 wcmd: Increase maximum length of commands. Increase maximum length of commands to 8192 bytes as on Windows XP. Add needed braces to a multi line "if" statement. --- programs/wcmd/batch.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/wcmd/batch.c b/programs/wcmd/batch.c index 89d50aa..4751076 100644 --- a/programs/wcmd/batch.c +++ b/programs/wcmd/batch.c @@ -27,7 +27,8 @@ extern char quals[MAX_PATH], param1[MAX_ extern BATCH_CONTEXT *context; extern DWORD errorlevel; -#define MAXSTRING 1024 +/* msdn specified max for Win XP */ +#define MAXSTRING 8192 /**************************************************************************** * WCMD_batch @@ -93,13 +94,14 @@ BATCH_CONTEXT *prev_context; */ while (WCMD_fgets (string, sizeof(string), h)) { - if (strlen(string) == MAXSTRING -1) - WCMD_output_asis( "Line in Batch processing possible truncated. Using:\n"); - WCMD_output_asis( string); - WCMD_output_asis( "\n"); - if (string[0] != ':') { /* Skip over labels */ - WCMD_batch_command (string); - } + if (strlen(string) == MAXSTRING -1) { + WCMD_output_asis( "Line in Batch processing possibly truncated. Using:\n"); + WCMD_output_asis( string); + WCMD_output_asis( "\n"); + } + if (string[0] != ':') { /* Skip over labels */ + WCMD_batch_command (string); + } } CloseHandle (h);

1 0

Eric Pouech : dbghelp: New stubs (needed for windbg startup).
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: a229618ef11da18f56c4212a70ce0b96154400bf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a229618ef11da18f56c4212… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 17:41:52 2005 +0100 dbghelp: New stubs (needed for windbg startup). --- dlls/dbghelp/dbghelp.spec | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 0c08921..0b41cc6 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -25,11 +25,13 @@ @ stdcall SearchTreeForFile(str str str) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) +@ stub SymAddSymbol @ stdcall SymCleanup(long) @ stdcall SymEnumLines(ptr double str str ptr ptr) @ stdcall SymEnumSourceFiles(ptr double str ptr ptr) @ stub SymEnumSym @ stdcall SymEnumSymbols(ptr double str ptr ptr) +@ stub SymEnumSymbolsForAddr @ stdcall SymEnumTypes(ptr double ptr ptr) @ stub SymEnumerateModules64 @ stdcall SymEnumerateModules(long ptr ptr) @@ -40,9 +42,11 @@ @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) @ stdcall SymFromAddr(ptr double ptr ptr) @ stdcall SymFromName(long str ptr) +@ stub SymFromToken @ stub SymFunctionTableAccess64 @ stdcall SymFunctionTableAccess(long long) @ stub SymGetFileLineOffsets64 +@ stub SymGetHomeDirectory @ stdcall SymGetLineFromAddr64(long double ptr ptr) @ stdcall SymGetLineFromAddr(long long ptr ptr) @ stub SymGetLineFromName64 @@ -59,6 +63,9 @@ @ stub SymGetModuleInfoW @ stdcall SymGetOptions() @ stdcall SymGetSearchPath(long str long) +@ stub SymGetSourceFileFromToken +@ stub SymGetSourceFileToken +@ stub SymGetSourceVarFromToken @ stub SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) @ stub SymGetSymFromName64 @@ -79,6 +86,7 @@ @ stdcall SymRegisterCallback(long ptr ptr) @ stdcall SymRegisterFunctionEntryCallback64(ptr ptr double) @ stdcall SymRegisterFunctionEntryCallback(ptr ptr ptr) +@ stub SymSearch @ stdcall SymSetContext(long ptr ptr) @ stdcall SymSetOptions(long) @ stdcall SymSetParentWindow(long) @@ -91,7 +99,7 @@ @ stdcall UnDecorateSymbolName(str str long long) @ stdcall UnmapDebugInformation(ptr) @ stub WinDbgExtensionDllInit -#@ stub dbghelp +@ stub dbghelp #@ stub dh #@ stub lm #@ stub lmi

1 0

Eric Pouech : dbghelp: Fixed loading .so modules from a living target.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 177bf4c1a64b5a3a15b1b173543af27e18264aa2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=177bf4c1a64b5a3a15b1b17… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 17:41:43 2005 +0100 dbghelp: Fixed loading .so modules from a living target. --- dlls/dbghelp/elf_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 153e63a..1c8a983 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -1381,7 +1381,7 @@ static BOOL elf_load_cb(const char* name if (!p++) p = name; if (!memcmp(p, el->name, strlen(el->name))) { - elf_search_and_load_file(el->pcs, name, addr, &el->elf_info); + el->ret = elf_search_and_load_file(el->pcs, name, addr, &el->elf_info); return FALSE; } return TRUE;

1 0

Eric Pouech : dbghelp: Fixed missing parameters info in StackWalk64.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: df7be14ce2ff962d5c63dae408a14e4f3ba2ce86 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=df7be14ce2ff962d5c63dae… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 19 17:41:32 2005 +0100 dbghelp: Fixed missing parameters info in StackWalk64. --- dlls/dbghelp/stack.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 3719542..69e9c1f 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -518,6 +518,11 @@ BOOL WINAPI StackWalk64(DWORD MachineTyp addr_32to64(&frame32.AddrStack, &frame64->AddrStack); addr_32to64(&frame32.AddrBStore, &frame64->AddrBStore); frame64->FuncTableEntry = frame32.FuncTableEntry; /* FIXME */ + frame64->Params[0] = (ULONG)frame32.Params[0]; + frame64->Params[1] = (ULONG)frame32.Params[1]; + frame64->Params[2] = (ULONG)frame32.Params[2]; + frame64->Params[3] = (ULONG)frame32.Params[3]; + frame64->Params[4] = (ULONG)frame32.Params[4]; frame64->Far = frame32.Far; frame64->Virtual = frame32.Virtual; frame64->Reserved[0] = (ULONG)frame32.Reserved[0];

1 0

Paul Vriens : d3d9: Don't crash on NULL device_ptr.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 636cb19ad072e8618f4e4ce414eb10160a3b0049 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=636cb19ad072e8618f4e4ce… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 19 10:00:08 2005 +0100 d3d9: Don't crash on NULL device_ptr. --- dlls/d3d9/tests/stateblock.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index 61b5be5..a5b1938 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -90,5 +90,7 @@ START_TEST(stateblock) } device_ptr = init_d3d9(); + if (!device_ptr) return; + test_begin_end_state_block(device_ptr); }

1 0

Alexandre Julliard : ntdll: Make __wine_call_from_32_restore_regs take a context pointer.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 8651ceb18e5bfff69421c2c85c323fff84ef6a82 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8651ceb18e5bfff69421c2c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 19 09:59:50 2005 +0100 ntdll: Make __wine_call_from_32_restore_regs take a context pointer. Changed exception raise functions to call it explicitly. --- dlls/ntdll/signal_i386.c | 55 +++++++++++++++++++++++++++++++--------------- tools/winebuild/relay.c | 2 +- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 4c0529f..d11e37d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -452,7 +452,7 @@ static size_t signal_stack_size; static wine_signal_handler handlers[256]; -extern void DECLSPEC_NORETURN __wine_call_from_32_restore_regs( CONTEXT context ); +extern void DECLSPEC_NORETURN __wine_call_from_32_restore_regs( const CONTEXT *context ); /*********************************************************************** @@ -703,6 +703,7 @@ inline static void *init_handler( const */ inline static void save_fpu( CONTEXT *context, const SIGCONTEXT *sigcontext ) { + context->ContextFlags |= CONTEXT86_FLOATING_POINT; #ifdef FPU_sig if (FPU_sig(sigcontext)) { @@ -794,6 +795,20 @@ inline static void restore_context( cons /*********************************************************************** + * set_cpu_context + * + * Set the new CPU context. + */ +inline static void DECLSPEC_NORETURN set_cpu_context( CONTEXT *context ) +{ + DWORD flags = context->ContextFlags & ~CONTEXT_i386; + + if (flags & CONTEXT_FLOATING_POINT) restore_fpu( context ); + __wine_call_from_32_restore_regs( context ); +} + + +/*********************************************************************** * is_privileged_instr * * Check if the fault location is a privileged instruction. @@ -872,7 +887,6 @@ static EXCEPTION_RECORD *setup_exception void *ret_addr; /* return address from raise_func */ EXCEPTION_RECORD *rec_ptr; /* first arg for raise_func */ CONTEXT *context_ptr; /* second arg for raise_func */ - void *dummy; /* dummy ret addr for __wine_call_from_32_restore_regs */ CONTEXT context; EXCEPTION_RECORD rec; DWORD ebp; @@ -912,7 +926,7 @@ static EXCEPTION_RECORD *setup_exception } stack--; /* push the stack_layout structure */ - stack->ret_addr = __wine_call_from_32_restore_regs; + stack->ret_addr = (void *)0xdeadbabe; /* raise_func must not return */ stack->rec_ptr = &stack->rec; stack->context_ptr = &stack->context; @@ -977,16 +991,13 @@ static inline DWORD get_fpu_code( const /********************************************************************** * raise_segv_exception */ -static void WINAPI raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +static void WINAPI DECLSPEC_NORETURN raise_segv_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { switch(rec->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: if (rec->NumberParameters == 2) - { - if (!(rec->ExceptionCode = VIRTUAL_HandleFault( (void *)rec->ExceptionInformation[1] ))) - return; - } + rec->ExceptionCode = VIRTUAL_HandleFault( (void *)rec->ExceptionInformation[1] ); break; case EXCEPTION_DATATYPE_MISALIGNMENT: /* FIXME: pass through exception handler first? */ @@ -994,18 +1005,20 @@ static void WINAPI raise_segv_exception( { /* Disable AC flag, return */ context->EFlags &= ~0x00040000; - return; + goto done; } break; } __regs_RtlRaiseException( rec, context ); +done: + set_cpu_context( context ); } /********************************************************************** * raise_trap_exception */ -static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +static void WINAPI DECLSPEC_NORETURN raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { DWORD dr0, dr1, dr2, dr3, dr6, dr7; @@ -1043,16 +1056,20 @@ static void WINAPI raise_trap_exception( context->ContextFlags = CONTEXT_DEBUG_REGISTERS; NtSetContextThread(GetCurrentThread(), context); } + context->ContextFlags = CONTEXT_FULL; /* restore flags */ + set_cpu_context( context ); } /********************************************************************** - * raise_fpu_exception + * raise_exception + * + * Generic raise function for exceptions that don't need special treatment. */ -static void WINAPI raise_fpu_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +static void WINAPI DECLSPEC_NORETURN raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { __regs_RtlRaiseException( rec, context ); - restore_fpu( context ); + set_cpu_context( context ); } @@ -1060,7 +1077,7 @@ static void WINAPI raise_fpu_exception( /********************************************************************** * raise_vm86_sti_exception */ -static void WINAPI raise_vm86_sti_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) +static void WINAPI DECLSPEC_NORETURN raise_vm86_sti_exception( EXCEPTION_RECORD *rec, CONTEXT *context ) { /* merge_vm86_pending_flags merges the vm86_pending flag in safely */ NtCurrentTeb()->vm86_pending |= VIP_MASK; @@ -1071,7 +1088,7 @@ static void WINAPI raise_vm86_sti_except ((char*)context->Eip <= (char*)vm86_return_end) && (VM86_TYPE(context->Eax) != VM86_SIGNAL)) { /* exiting from VM86, can't throw */ - return; + goto done; } merge_vm86_pending_flags( rec ); } @@ -1083,6 +1100,8 @@ static void WINAPI raise_vm86_sti_except NtCurrentTeb()->vm86_pending = 0; __regs_RtlRaiseException( rec, context ); } +done: + set_cpu_context( context ); } @@ -1200,7 +1219,7 @@ static HANDLER_DEF(trap_handler) */ static HANDLER_DEF(fpe_handler) { - EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, raise_fpu_exception ); + EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, raise_exception ); CONTEXT *context; context = get_exception_context( rec ); @@ -1239,7 +1258,7 @@ static HANDLER_DEF(int_handler) init_handler( HANDLER_CONTEXT, &fs, &gs ); if (!dispatch_signal(SIGINT)) { - EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, __regs_RtlRaiseException ); + EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, raise_exception ); rec->ExceptionCode = CONTROL_C_EXIT; } } @@ -1251,7 +1270,7 @@ static HANDLER_DEF(int_handler) */ static HANDLER_DEF(abrt_handler) { - EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, __regs_RtlRaiseException ); + EXCEPTION_RECORD *rec = setup_exception( HANDLER_CONTEXT, raise_exception ); rec->ExceptionCode = EXCEPTION_WINE_ASSERTION; rec->ExceptionFlags = EH_NONCONTINUABLE; } diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index de8dd60..60ed6cc 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -850,7 +850,7 @@ static void BuildCallFrom32Regs( FILE *o output_function_size( outfile, "__wine_call_from_32_regs" ); function_header( outfile, "__wine_call_from_32_restore_regs" ); - fprintf( outfile, "\tleal 4(%%esp),%%ecx\n" ); + fprintf( outfile, "\tmovl 4(%%esp),%%ecx\n" ); fprintf( outfile, "\tjmp 2b\n" ); output_function_size( outfile, "__wine_call_from_32_restore_regs" ); }

1 0

Jacek Caban : urlmon: Added handling of BINDF_FROMURLMON in file protocol.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: ed7aa80765036a0185bc1b8b3a9c6c0a3c5072d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed7aa80765036a0185bc1b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 09:57:25 2005 +0100 urlmon: Added handling of BINDF_FROMURLMON in file protocol. --- dlls/urlmon/file.c | 7 +- dlls/urlmon/tests/protocol.c | 173 +++++++++++++++++++++++++++--------------- 2 files changed, 116 insertions(+), 64 deletions(-)

1 0

Jacek Caban : Fix typo in urlmon.idl.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: dd2d59818d6cd90608927ae1be370f0fd52328cf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dd2d59818d6cd90608927ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 09:53:30 2005 +0100 Fix typo in urlmon.idl. --- dlls/mshtml/tests/protocol.c | 2 +- include/urlmon.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index accac0e..9624b37 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -71,7 +71,7 @@ static HRESULT WINAPI ProtocolSink_Repor ok(expect_ReportProgress, "unexpected call\n"); ok(ulStatusCode == BINDSTATUS_MIMETYPEAVAILABLE - || ulStatusCode == BINDSTATUS_VERFIEDMIMETYPEAVAILABLE, "ulStatusCode=%ld\n", ulStatusCode); + || ulStatusCode == BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, "ulStatusCode=%ld\n", ulStatusCode); ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); expect_ReportProgress = FALSE; called_ReportProgress = TRUE; diff --git a/include/urlmon.idl b/include/urlmon.idl index 97ab839..85a9277 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -193,7 +193,7 @@ interface IBindStatusCallback : IUnknown BINDSTATUS_ENDUPLOADINGDATA, BINDSTATUS_PROTOCOLCLASSID, BINDSTATUS_ENCODING, - BINDSTATUS_VERFIEDMIMETYPEAVAILABLE, + BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE, BINDSTATUS_CLASSINSTALLLOCATION, BINDSTATUS_DECODING, BINDSTATUS_LOADINGMIMEHANDLER,

1 0

Lauri Tulmin : user32: Don't truncate text when creating edit control.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 86f45494b6fb92cf1151317921cad23fe8e81667 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86f45494b6fb92cf1151317… Author: Lauri Tulmin <tulmin(a)gmail.com> Date: Mon Dec 19 09:53:19 2005 +0100 user32: Don't truncate text when creating edit control. --- dlls/user/edit.c | 2 +- dlls/user/tests/edit.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/user/edit.c b/dlls/user/edit.c index 47f317d..bc67e43 100644 --- a/dlls/user/edit.c +++ b/dlls/user/edit.c @@ -4061,7 +4061,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE EDIT_SetRectNP(es, &clientRect); if (name && *name) { - EDIT_EM_ReplaceSel(es, FALSE, name, FALSE, TRUE); + EDIT_EM_ReplaceSel(es, FALSE, name, FALSE, FALSE); /* if we insert text to the editline, the text scrolls out * of the window, as the caret is placed after the insert * pos normally; thus we reset es->selection... to 0 and diff --git a/dlls/user/tests/edit.c b/dlls/user/tests/edit.c index 846ed2d..0bd521b 100644 --- a/dlls/user/tests/edit.c +++ b/dlls/user/tests/edit.c @@ -671,6 +671,40 @@ static void test_edit_control_4(void) DestroyWindow(hwEdit); } +/* Test if creating edit control without ES_AUTOHSCROLL and ES_AUTOVSCROLL + * truncates text that doesn't fit. + */ +static void test_edit_control_5(void) +{ + static const char *str = "test\r\ntest"; + HWND hWnd; + int len; + + hWnd = CreateWindowEx(0, + "EDIT", + str, + 0, + 10, 10, 1, 1, + NULL, NULL, NULL, NULL); + assert(hWnd); + + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); + + hWnd = CreateWindowEx(0, + "EDIT", + str, + ES_MULTILINE, + 10, 10, 1, 1, + NULL, NULL, NULL, NULL); + assert(hWnd); + + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); + DestroyWindow(hWnd); +} + static void test_margins(void) { HWND hwEdit; @@ -931,6 +965,7 @@ START_TEST(edit) test_edit_control_2(); test_edit_control_3(); test_edit_control_4(); + test_edit_control_5(); test_margins(); test_text_position();

1 0

Rein Klazes : x11drv: Do not use the scroll rectangle for clipping in ScrollDC.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 3df678a5afcb54bcd6b92ba14227c7a5b44bef73 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3df678a5afcb54bcd6b92ba… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Dec 19 09:53:04 2005 +0100 x11drv: Do not use the scroll rectangle for clipping in ScrollDC. With a conformance test. --- dlls/user/tests/win.c | 17 ++++++++++++++++- dlls/x11drv/scroll.c | 44 +++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index 447ca34..6cef7a9 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2954,7 +2954,7 @@ static void test_scrolldc( HWND parent) ScrollDC( hdc, 5, -20, &rc, &cliprc, hrgn, &rcu); colr = GetPixel( hdc, (rc.left+rc.right)/2, ( rc.top + rc.bottom) /2 - 1); ok ( colr == 0, "pixel should be black, color is %08lx\n", colr); - + /* test with NULL clip rect */ ScrollDC( hdc, 20, -20, &rc, NULL, hrgn, &rcu); /*FillRgn(hdc, hrgn, GetStockObject(WHITE_BRUSH));*/ trace("update rect: %ld,%ld - %ld,%ld\n", @@ -2969,6 +2969,21 @@ static void test_scrolldc( HWND parent) CombineRgn(exprgn, exprgn, tmprgn, RGN_OR); if (winetest_debug > 0) dump_region(exprgn); ok(EqualRgn(exprgn, hrgn), "wrong update region\n"); + /* test clip rect > scroll rect */ + FillRect( hdc, &rc, GetStockObject(WHITE_BRUSH)); + rc2=rc; + InflateRect( &rc2, -(rc.right-rc.left)/4, -(rc.bottom-rc.top)/4); + FillRect( hdc, &rc2, GetStockObject(BLACK_BRUSH)); + ScrollDC( hdc, 10, 10, &rc2, &rc, hrgn, &rcu); + SetRectRgn( exprgn, 25, 25, 75, 35); + SetRectRgn( tmprgn, 25, 35, 35, 75); + CombineRgn(exprgn, exprgn, tmprgn, RGN_OR); + ok(EqualRgn(exprgn, hrgn), "wrong update region\n"); + colr = GetPixel( hdc, 80, 80); + ok ( colr == 0, "pixel should be black, color is %08lx\n", colr); + trace("update rect: %ld,%ld - %ld,%ld\n", + rcu.left, rcu.top, rcu.right, rcu.bottom); + if (winetest_debug > 0) dump_region(hrgn); /* clean up */ DeleteObject(hrgn); diff --git a/dlls/x11drv/scroll.c b/dlls/x11drv/scroll.c index e0c2f83..cf80870 100644 --- a/dlls/x11drv/scroll.c +++ b/dlls/x11drv/scroll.c @@ -91,34 +91,21 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I } else CombineRgn( visrgn, visrgn, clipRgn, RGN_AND); /* only those pixels in the scroll rectangle that remain in the clipping - * rect are scrolled. So first combine Scroll and Clipping rectangles, - * if available */ - if( lprcScroll) - { - if( lprcClip) - IntersectRect( &rcClip, lprcClip, lprcScroll); - else - rcClip = *lprcScroll; - } + * rect are scrolled. */ + if( lprcClip) + rcClip = *lprcClip; else - { - if( lprcClip) - rcClip = *lprcClip; - else - GetClipBox( hdc, &rcClip); - } - /* Then clip again to get the source rectangle that will remain in the - * clipping rect */ + GetClipBox( hdc, &rcClip); rcSrc = rcClip; - if (lprcClip) - { - OffsetRect( &rcSrc, -dx, -dy); - IntersectRect( &rcSrc, &rcSrc, &rcClip); - } + OffsetRect( &rcClip, -dx, -dy); + IntersectRect( &rcSrc, &rcSrc, &rcClip); + /* if an scroll rectangle is specified, only the pixels within that + * rectangle are scrolled */ + if( lprcScroll) + IntersectRect( &rcSrc, &rcSrc, lprcScroll); /* now convert to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcSrc, 2); TRACE("source rect: %s\n", wine_dbgstr_rect(&rcSrc)); - /* also dx and dy */ SetRect(&offset, 0, 0, dx, dy); LPtoDP(hdc, (LPPOINT)&offset, 2); @@ -160,6 +147,17 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I code = X11DRV_END_EXPOSURES; ExtEscape( hdc, X11DRV_ESCAPE, sizeof(code), (LPSTR)&code, sizeof(ExpRgn), (LPSTR)&ExpRgn ); + /* Intersect clip and scroll rectangles, allowing NULL values */ + if( lprcScroll) + if( lprcClip) + IntersectRect( &rcClip, lprcClip, lprcScroll); + else + rcClip = *lprcScroll; + else + if( lprcClip) + rcClip = *lprcClip; + else + GetClipBox( hdc, &rcClip); /* Convert the combined clip rectangle to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcClip, 2); if( hrgn )

1 0

Jacek Caban : urlmon: Added some tests and fixes of file protocol.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 7458d7416986a8e0680c4e40866393ebdecd6a51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7458d7416986a8e0680c4e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 19 09:52:30 2005 +0100 urlmon: Added some tests and fixes of file protocol. --- dlls/urlmon/file.c | 35 +++++++++++++++++++++++------------ dlls/urlmon/tests/protocol.c | 24 +++++++++++++++++++----- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c index 61c312c..b76bb4a 100644 --- a/dlls/urlmon/file.c +++ b/dlls/urlmon/file.c @@ -110,7 +110,9 @@ static HRESULT WINAPI FileProtocol_Start LARGE_INTEGER size; DWORD len; LPWSTR url, mime = NULL; + LPCWSTR file_name; WCHAR null_char = 0; + BOOL first_call = FALSE; HRESULT hres; static const WCHAR wszFile[] = {'f','i','l','e',':'}; @@ -134,33 +136,39 @@ static HRESULT WINAPI FileProtocol_Start return hres; } - hres = FindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); - if(SUCCEEDED(hres)) - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, mime); + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_DIRECTBIND, NULL); if(!This->file) { + first_call = TRUE; + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_SENDINGREQUEST, &null_char); - This->file = CreateFileW(url+sizeof(wszFile)/sizeof(WCHAR), GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + file_name = url+sizeof(wszFile)/sizeof(WCHAR); + if(file_name[0] == '/' && file_name[1] == '/' && file_name[2] == '/') + file_name += 3; + + This->file = CreateFileW(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(This->file == INVALID_HANDLE_VALUE) { This->file = NULL; IInternetProtocolSink_ReportResult(pOIProtSink, INET_E_RESOURCE_NOT_FOUND, GetLastError(), NULL); HeapFree(GetProcessHeap(), 0, url); - CoTaskMemFree(mime); return INET_E_RESOURCE_NOT_FOUND; } - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_CACHEFILENAMEAVAILABLE, - url+sizeof(wszFile)/sizeof(WCHAR)); - if(mime) - IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_MIMETYPEAVAILABLE, mime); - IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); + IInternetProtocolSink_ReportProgress(pOIProtSink, + BINDSTATUS_CACHEFILENAMEAVAILABLE, file_name); + + hres = FindMimeFromData(NULL, url, NULL, 0, NULL, 0, &mime, 0); + if(SUCCEEDED(hres)) { + IInternetProtocolSink_ReportProgress(pOIProtSink, + BINDSTATUS_MIMETYPEAVAILABLE, mime); + CoTaskMemFree(mime); + } } - CoTaskMemFree(mime); HeapFree(GetProcessHeap(), 0, url); if(GetFileSizeEx(This->file, &size)) @@ -168,6 +176,9 @@ static HRESULT WINAPI FileProtocol_Start BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION, size.u.LowPart, size.u.LowPart); + if(first_call) + IInternetProtocolSink_ReportResult(pOIProtSink, S_OK, 0, NULL); + return S_OK; } diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 42b5e56..382e5f0 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -91,15 +91,17 @@ static HRESULT WINAPI ProtocolSink_Repor switch(ulStatusCode) { case BINDSTATUS_MIMETYPEAVAILABLE: CHECK_EXPECT(ReportProgress_MIMETYPEAVAILABLE); + ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); + break; case BINDSTATUS_DIRECTBIND: - CHECK_EXPECT2(ReportProgress_DIRECTBIND); - if(szStatusText) - ok(!lstrcmpW(szStatusText, text_html), "szStatusText != text/html\n"); + CHECK_EXPECT(ReportProgress_DIRECTBIND); + ok(szStatusText == NULL, "szStatucText != NULL\n"); break; case BINDSTATUS_CACHEFILENAMEAVAILABLE: CHECK_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); + ok(szStatusText != NULL, "szStatusText == NULL\n"); if(szStatusText) ok(!lstrcmpW(szStatusText, file_name), "szStatusText != file_name\n"); break; @@ -241,9 +243,10 @@ static void file_protocol_start(IInterne SET_EXPECT(ReportProgress_SENDINGREQUEST); SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); - SET_EXPECT(ReportResult); } SET_EXPECT(ReportData); + if(is_first) + SET_EXPECT(ReportResult); expect_hrResult = S_OK; @@ -256,9 +259,10 @@ static void file_protocol_start(IInterne CHECK_CALLED(ReportProgress_SENDINGREQUEST); CHECK_CALLED(ReportProgress_CACHEFILENAMEAVAILABLE); CHECK_CALLED(ReportProgress_MIMETYPEAVAILABLE); - CHECK_CALLED(ReportResult); } CHECK_CALLED(ReportData); + if(is_first) + CHECK_CALLED(ReportResult); } static void test_file_protocol_url(LPCWSTR url) @@ -365,6 +369,7 @@ static void test_file_protocol(void) { static const WCHAR index_url2[] = {'f','i','l','e',':','/','/','i','n','d','e','x','.','h','t','m','l',0}; static const WCHAR wszFile[] = {'f','i','l','e',':',0}; + static const WCHAR wszFile2[] = {'f','i','l','e',':','/','/','/',0}; static const WCHAR wszIndexHtml[] = {'i','n','d','e','x','.','h','t','m','l',0}; static const char html_doc[] = "<HTML></HTML>"; @@ -388,6 +393,15 @@ static void test_file_protocol(void) { file_name = buf + sizeof(wszFile)/sizeof(WCHAR)-1; test_file_protocol_url(buf); + memcpy(buf, wszFile2, sizeof(wszFile2)); + len = sizeof(wszFile2)/sizeof(WCHAR)-1; + len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len); + buf[len++] = '\\'; + memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); + + file_name = buf + sizeof(wszFile2)/sizeof(WCHAR)-1; + test_file_protocol_url(buf); + DeleteFileW(wszIndexHtml); hres = CoCreateInstance(&CLSID_FileProtocol, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,

1 0

Alexander N. Sørnes : winecfg: Updated Norwegian Bokmaal resources.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 97c6c634d5bbb5147f8ee2e432cc2288026eeab2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=97c6c634d5bbb5147f8ee2e… Author: Alexander N. Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 19 09:52:20 2005 +0100 winecfg: Updated Norwegian Bokmaal resources. --- programs/winecfg/No.rc | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index cef2a52..d92dd09 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -21,12 +21,12 @@ */ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL - + IDR_WINECFG MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "Configure", IDC_AUDIO_CONFIGURE + MENUITEM "Oppsett", IDC_AUDIO_CONFIGURE END END @@ -67,12 +67,12 @@ BEGIN CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,35,230,8 CONTROL "Aktiver dobbelt hurtigminne for skrivebordet",IDC_DOUBLE_BUFFER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,230,8 - + LTEXT "Du kan velge � emulere et Windows-skrivebord, der alle vinduene er bundet i en virtuell skjerm, eller du kan f� vinduene til � oppf�re seg som andre programmer p� skrivebordet.", IDC_STATIC,15,73,228,28 LTEXT "Skrivebordsstrrelse:",IDC_DESKTOP_SIZE,15,115,44,8,WS_DISABLED LTEXT "X",IDC_DESKTOP_BY,108,115,8,8,WS_DISABLED - CONTROL "Virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", + CONTROL "Emuler et virtuelt skrivebord",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 EDITTEXT IDC_DESKTOP_WIDTH,64,115,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED @@ -132,12 +132,12 @@ BEGIN LTEXT "&Sti:",IDC_STATIC,15,123,20,9 EDITTEXT IDC_EDIT_PATH,41,120,160,13,ES_AUTOHSCROLL | WS_TABSTOP PUSHBUTTON "&Bla . . .",IDC_BUTTON_BROWSE_PATH,206,120,40,13 - + LTEXT "&Type:",IDC_STATIC_TYPE,15,138,21,10 COMBOBOX IDC_COMBO_TYPE,41,135,77,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - + LTEXT "Volumnavn og serienummer",IDC_LABELSERIAL_STATIC,15,155,95,10 - + PUSHBUTTON "Avan&sert visning",IDC_BUTTON_SHOW_HIDE_ADVANCED,186,136,60,13 CONTROL "&Finn automatisk fra enhet:",IDC_RADIO_AUTODETECT,"Button", BS_AUTORADIOBUTTON,15,166,93,10 @@ -158,12 +158,12 @@ IDD_AUDIOCFG DIALOG DISCARDABLE 0, 0, 2 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Selection ",IDC_STATIC,8,4,244,195 - LTEXT "Lyddriver: ",IDC_STATIC,15,20,227,30 + GROUPBOX " Valg av driver ",IDC_STATIC,8,4,244,195 + LTEXT "Velg en lyddriver ved � krysse av i boksen ved siden av den du vil bruke. Deaktiver lyd ved � ikke velge noen. Det anbefales ikke � velge flere drivere. Driverens oppsett kan endres ved � h�yreklikke p� den.",IDC_STATIC,15,20,227,30 CONTROL "Enheter",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,15,50,140,140 PUSHBUTTON "Kontrollpanel",IDC_AUDIO_CONTROL_PANEL,170,50,59,14 GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 - LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10 + LTEXT "Maskinvareakselerasjon: ",IDC_STATIC,15,215,90,10 COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END

1 0

Alexandre Julliard : ntdll: New implementation of relay thunks.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: 5dc6d959526bc4854361c240408edc7a7075e81c URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5dc6d959526bc4854361c24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 18 10:45:01 2005 +0100 ntdll: New implementation of relay thunks. New implementation of relay thunks that doesn't require modifying code on the fly, so that the thunks can be put in the text section. Some performance improvements. --- dlls/ntdll/loader.c | 4 dlls/ntdll/ntdll_misc.h | 2 dlls/ntdll/relay.c | 505 ++++++++++++++++++++-------------------------- tools/winebuild/build.h | 2 tools/winebuild/import.c | 3 tools/winebuild/spec32.c | 179 ++++++++++++---- tools/winebuild/utils.c | 9 + 7 files changed, 366 insertions(+), 338 deletions(-)

1 0

Alexandre Julliard : ntdll: Don't use a real guard page at the bottom of the stack.
by Alexandre Julliard Dec. 19, 2005

Dec. 19, 2005

Module: wine Branch: refs/heads/master Commit: efffa663308a9c2338dd1ed577fd40414e982f10 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=efffa663308a9c2338dd1ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 17 18:47:03 2005 +0100 ntdll: Don't use a real guard page at the bottom of the stack. A no-access page is enough, we can't properly raise an overflow exception anyway. --- dlls/kernel/process.c | 2 +- dlls/ntdll/thread.c | 3 +-- dlls/ntdll/virtual.c | 8 ++------ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 42c4033..e75fccb 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -994,7 +994,7 @@ static void *init_stack(void) NtCurrentTeb()->Tib.StackLimit = (char *)base + page_size; /* setup guard page */ - VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, NULL ); + VirtualProtect( base, page_size, PAGE_NOACCESS, NULL ); return NtCurrentTeb()->Tib.StackBase; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 07cd08d..9896703 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -223,8 +223,7 @@ static void start_thread( struct wine_pt /* setup the guard page */ size = page_size; - NtProtectVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, &size, - PAGE_READWRITE | PAGE_GUARD, NULL ); + NtProtectVirtualMemory( NtCurrentProcess(), &teb->DeallocationStack, &size, PAGE_NOACCESS, NULL ); RtlFreeHeap( GetProcessHeap(), 0, info ); RtlAcquirePebLock(); diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 3cd9fff..922c1b3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1178,17 +1178,13 @@ NTSTATUS VIRTUAL_HandleFault( LPCVOID ad RtlEnterCriticalSection( &csVirtual ); if ((view = VIRTUAL_FindView( addr ))) { - BYTE vprot = view->prot[((const char *)addr - (const char *)view->base) >> page_shift]; - void *page = (void *)((UINT_PTR)addr & ~page_mask); - char *stack = NtCurrentTeb()->Tib.StackLimit; + void *page = ROUND_ADDR( addr, page_mask ); + BYTE vprot = view->prot[((const char *)page - (const char *)view->base) >> page_shift]; if (vprot & VPROT_GUARD) { VIRTUAL_SetProt( view, page, page_mask + 1, vprot & ~VPROT_GUARD ); ret = STATUS_GUARD_PAGE_VIOLATION; } - /* is it inside the stack guard page? */ - if (((const char *)addr >= stack - (page_mask + 1)) && ((const char *)addr < stack)) - ret = STATUS_STACK_OVERFLOW; } RtlLeaveCriticalSection( &csVirtual ); return ret;

1 0

Robert Reif : winecfg: Use sound tree view for driver selection.
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: f0c55e7d52a25285837b0907f682391ee95a27a5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f0c55e7d52a25285837b090… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Dec 17 12:30:06 2005 +0100 winecfg: Use sound tree view for driver selection. - Move driver selection and configuration into tree view. - Only show loadable drivers. --- programs/winecfg/.gitignore | 1 programs/winecfg/Bg.rc | 28 +- programs/winecfg/De.rc | 26 +- programs/winecfg/En.rc | 26 +- programs/winecfg/Es.rc | 26 +- programs/winecfg/Fi.rc | 27 +- programs/winecfg/Fr.rc | 27 +- programs/winecfg/Ja.rc | 28 +- programs/winecfg/Ko.rc | 26 +- programs/winecfg/Makefile.in | 6 - programs/winecfg/Nl.rc | 26 +- programs/winecfg/No.rc | 26 +- programs/winecfg/Ru.rc | 28 +- programs/winecfg/audio.c | 475 +++++++++++++++++++++++++++--------------- programs/winecfg/main.c | 2 programs/winecfg/resource.h | 15 + programs/winecfg/winecfg.c | 9 + programs/winecfg/winecfg.h | 4 programs/winecfg/winecfg.rc | 37 +++ 19 files changed, 546 insertions(+), 297 deletions(-)

1 0

Robert Reif : wineoss: Shorten MIDI names.
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: 8accfc1defe49ba86c1f935a374b87bc337e67ed URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8accfc1defe49ba86c1f935… Author: Robert Reif <reif(a)earthlink.net> Date: Sat Dec 17 12:25:19 2005 +0100 wineoss: Shorten MIDI names. Shorten MIDI names to fit into 32 byte array without overflow. --- dlls/winmm/wineoss/midi.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c index 4ea5090..03b982f 100644 --- a/dlls/winmm/wineoss/midi.c +++ b/dlls/winmm/wineoss/midi.c @@ -230,7 +230,7 @@ LRESULT OSS_MidiInit(void) sinfo.device = i; status = ioctl(midiSeqFD, SNDCTL_SYNTH_INFO, &sinfo); if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','-',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; ERR("ioctl for synth info failed on %d, disabling it.\n", i); wsprintfW(MidiOutDev[i].caps.szPname, fmt, i); @@ -310,7 +310,7 @@ LRESULT OSS_MidiInit(void) /* Product Version. We simply say "1" */ MidiOutDev[numsynthdevs + i].caps.vDriverVersion = 0x001; if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','-',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','O','u','t',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; wsprintfW(MidiOutDev[numsynthdevs + i].caps.szPname, fmt, numsynthdevs + i); MidiOutDev[numsynthdevs + i].bEnabled = FALSE; } else { @@ -341,7 +341,7 @@ LRESULT OSS_MidiInit(void) /* Product Version. We simply say "1" */ MidiInDev[i].caps.vDriverVersion = 0x001; if (status == -1) { - static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','I','n',' ','(','#','%','d',')',' ','-',' ','d','i','s','a','b','l','e','d',0}; + static const WCHAR fmt[] = {'W','i','n','e',' ','O','S','S',' ','M','i','d','i',' ','I','n',' ','(','#','%','d',')',' ','d','i','s','a','b','l','e','d',0}; wsprintfW(MidiInDev[i].caps.szPname, fmt, numsynthdevs + i); MidiInDev[i].state = -1; } else {

1 0

Juan Lang : crypt32: Implement more implicit properties, with tests.
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: a67b6f49ecc8beefe91f91ce9e2b26e8414d93f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a67b6f49ecc8beefe91f91c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Sat Dec 17 12:24:59 2005 +0100 crypt32: Implement more implicit properties, with tests. --- dlls/crypt32/cert.c | 49 ++++++++++++++++++++++++++-------- dlls/crypt32/tests/cert.c | 65 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 92 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 4911090..4f822d1 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1877,6 +1877,22 @@ DWORD WINAPI CertEnumCertificateContextP return ret; } +static BOOL CRYPT_GetCertHashProp(PWINE_CERT_CONTEXT context, DWORD dwPropId, + ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData, + DWORD *pcbData) +{ + BOOL ret = CryptHashCertificate(0, algID, 0, toHash, toHashLen, pvData, + pcbData); + if (ret) + { + CRYPT_DATA_BLOB blob = { *pcbData, pvData }; + + ret = CRYPT_SetCertificateContextProperty(context, dwPropId, + 0, &blob); + } + return ret; +} + static BOOL WINAPI CRYPT_GetCertificateContextProperty( PWINE_CERT_CONTEXT context, DWORD dwPropId, void *pvData, DWORD *pcbData) { @@ -1919,26 +1935,34 @@ static BOOL WINAPI CRYPT_GetCertificateC switch (dwPropId) { case CERT_SHA1_HASH_PROP_ID: - ret = CryptHashCertificate(0, CALG_SHA1, 0, + ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_SHA1, context->cert.pbCertEncoded, context->cert.cbCertEncoded, pvData, pcbData); - if (ret) - { - CRYPT_DATA_BLOB blob = { *pcbData, pvData }; - - ret = CRYPT_SetCertificateContextProperty(context, dwPropId, - 0, &blob); - } break; - case CERT_KEY_PROV_INFO_PROP_ID: case CERT_MD5_HASH_PROP_ID: - case CERT_SIGNATURE_HASH_PROP_ID: - case CERT_KEY_IDENTIFIER_PROP_ID: + ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5, + context->cert.pbCertEncoded, context->cert.cbCertEncoded, pvData, + pcbData); + break; + case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: + ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5, + context->cert.pCertInfo->Subject.pbData, + context->cert.pCertInfo->Subject.cbData, + pvData, pcbData); + break; case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: + ret = CRYPT_GetCertHashProp(context, dwPropId, CALG_MD5, + context->cert.pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData, + context->cert.pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData, + pvData, pcbData); + break; + case CERT_SIGNATURE_HASH_PROP_ID: case CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID: - case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: FIXME("implicit property %ld\n", dwPropId); + SetLastError(CRYPT_E_NOT_FOUND); break; + default: + SetLastError(CRYPT_E_NOT_FOUND); } } LeaveCriticalSection(&context->cs); @@ -2100,6 +2124,7 @@ static BOOL WINAPI CRYPT_SetCertificateC case CERT_PVK_FILE_PROP_ID: case CERT_SIGNATURE_HASH_PROP_ID: case CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID: + case CERT_SUBJECT_NAME_MD5_HASH_PROP_ID: case CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID: case CERT_ENROLLMENT_PROP_ID: case CERT_CROSS_CERT_DIST_POINTS_PROP_ID: diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a2c2b15..3ce36fb 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1100,6 +1100,26 @@ static void testCertOpenSystemStore(void RegDeleteKeyW(HKEY_CURRENT_USER, BogusPathW); } +static void checkHash(const BYTE *data, DWORD dataLen, ALG_ID algID, + PCCERT_CONTEXT context, DWORD propID) +{ + BYTE hash[20] = { 0 }, hashProperty[20]; + BOOL ret; + DWORD size; + + memset(hash, 0, sizeof(hash)); + memset(hashProperty, 0, sizeof(hashProperty)); + size = sizeof(hash); + ret = CryptHashCertificate(0, algID, 0, data, dataLen, hash, &size); + ok(ret, "CryptHashCertificate failed: %08lx\n", GetLastError()); + ret = CertGetCertificateContextProperty(context, propID, hashProperty, + &size); + ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", + GetLastError()); + ok(!memcmp(hash, hashProperty, size), "Unexpected hash for property %ld\n", + propID); +} + static void testCertProperties(void) { PCCERT_CONTEXT context = CertCreateCertificateContext(X509_ASN_ENCODING, @@ -1148,10 +1168,21 @@ static void testCertProperties(void) CERT_CERT_PROP_ID, 0, bigCert2); */ - /* This crashes. + /* These all crash. ret = CertGetCertificateContextProperty(context, CERT_ACCESS_STATE_PROP_ID, 0, NULL); + ret = CertGetCertificateContextProperty(context, CERT_HASH_PROP_ID, + NULL, NULL); + ret = CertGetCertificateContextProperty(context, CERT_HASH_PROP_ID, + hashProperty, NULL); */ + /* A missing prop */ + size = 0; + ret = CertGetCertificateContextProperty(context, + CERT_KEY_PROV_INFO_PROP_ID, NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08lx\n", GetLastError()); + /* And, an implicit property */ size = sizeof(access); ret = CertGetCertificateContextProperty(context, CERT_ACCESS_STATE_PROP_ID, &access, &size); @@ -1181,15 +1212,8 @@ static void testCertProperties(void) NULL); ok(ret, "CertSetCertificateContextProperty failed: %08lx\n", GetLastError()); - size = sizeof(hash); - ret = CryptHashCertificate(0, 0, 0, bigCert, sizeof(bigCert) - 1, - hash, &size); - ok(ret, "CryptHashCertificate failed: %08lx\n", GetLastError()); - ret = CertGetCertificateContextProperty(context, CERT_HASH_PROP_ID, - hashProperty, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08lx\n", - GetLastError()); - ok(!memcmp(hash, hashProperty, sizeof(hash)), "Unexpected hash\n"); + checkHash(bigCert, sizeof(bigCert) - 1, CALG_SHA1, context, + CERT_HASH_PROP_ID); /* Now that the hash property is set, we should get one property when * enumerating. @@ -1203,6 +1227,27 @@ static void testCertProperties(void) } while (propID != 0); ok(numProps == 1, "Expected 1 properties, got %ld\n", numProps); + /* Check a few other implicit properties */ + checkHash(bigCert, sizeof(bigCert) - 1, CALG_MD5, context, + CERT_MD5_HASH_PROP_ID); + checkHash( + context->pCertInfo->Subject.pbData, + context->pCertInfo->Subject.cbData, + CALG_MD5, context, CERT_SUBJECT_NAME_MD5_HASH_PROP_ID); + checkHash( + context->pCertInfo->SubjectPublicKeyInfo.PublicKey.pbData, + context->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData, + CALG_MD5, context, CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID); + + /* Odd: this doesn't fail on other certificates, so there must be + * something weird about this cert that causes it to fail. + */ + size = 0; + ret = CertGetCertificateContextProperty(context, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + todo_wine ok(!ret && GetLastError() == ERROR_INVALID_DATA, + "Expected ERROR_INVALID_DATA, got %08lx\n", GetLastError()); + CertFreeCertificateContext(context); } }

1 0

Vitaliy Margolen : imagehlp: Forward StackWalk64 to dbghelp.StackWalk64.
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: 33832c95d837df4e8669d6678cb1d54045eba75f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33832c95d837df4e8669d66… Author: Vitaliy Margolen <wine-patch(a)kievinfo.com> Date: Sat Dec 17 12:24:46 2005 +0100 imagehlp: Forward StackWalk64 to dbghelp.StackWalk64. --- dlls/imagehlp/imagehlp.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index ac5a2ae..9ca6c89 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -41,7 +41,7 @@ @ stdcall SearchTreeForFile(str str str) dbghelp.SearchTreeForFile @ stdcall SetImageConfigInformation(ptr ptr) @ stdcall SplitSymbols(str str str long) -@ stub StackWalk64 +@ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk64 @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk @ stdcall SymCleanup(long) dbghelp.SymCleanup @ stdcall SymEnumSourceFiles(long long str ptr ptr) dbghelp.SymEnumSourceFiles

1 0

Dmitry Timoshkov : x11drv: ScrollDC should not clip output if a clipping rect is not specified.
by Alexandre Julliard Dec. 17, 2005

Dec. 17, 2005

Module: wine Branch: refs/heads/master Commit: 8d9fb6331e86c8ecea4ca16e12a1121c4cb6559a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d9fb6331e86c8ecea4ca16… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sat Dec 17 12:24:37 2005 +0100 x11drv: ScrollDC should not clip output if a clipping rect is not specified. Add a ScrollDC test with NULL clipping rect. Add another set of ScrollDC tests written by Rein Klazes. --- dlls/user/tests/win.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/x11drv/scroll.c | 9 ++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/dlls/user/tests/win.c b/dlls/user/tests/win.c index e1f787b..447ca34 100644 --- a/dlls/user/tests/win.c +++ b/dlls/user/tests/win.c @@ -2923,6 +2923,60 @@ static void test_scroll(void) DestroyWindow( hwnd); } +static void test_scrolldc( HWND parent) +{ + HDC hdc; + HRGN exprgn, tmprgn, hrgn; + RECT rc, rc2, rcu, cliprc; + HWND hwnd1; + COLORREF colr; + + hrgn = CreateRectRgn(0,0,0,0); + + hwnd1 = CreateWindowExA(0, "static", NULL, + WS_CHILD| WS_VISIBLE, + 25, 50, 100, 100, parent, 0, 0, NULL); + ShowWindow( parent, SW_SHOW); + UpdateWindow( parent); + GetClientRect( hwnd1, &rc); + hdc = GetDC( hwnd1); + /* paint the upper half of the window black */ + rc2 = rc; + rc2.bottom = ( rc.top + rc.bottom) /2; + FillRect( hdc, &rc2, GetStockObject(BLACK_BRUSH)); + /* clip region is the lower half */ + cliprc=rc; + cliprc.top = (rc.top + rc.bottom) /2; + /* test whether scrolled pixels are properly clipped */ + colr = GetPixel( hdc, (rc.left+rc.right)/2, ( rc.top + rc.bottom) /2 - 1); + ok ( colr == 0, "pixel should be black, color is %08lx\n", colr); + /* this scroll should not cause any visible changes */ + ScrollDC( hdc, 5, -20, &rc, &cliprc, hrgn, &rcu); + colr = GetPixel( hdc, (rc.left+rc.right)/2, ( rc.top + rc.bottom) /2 - 1); + ok ( colr == 0, "pixel should be black, color is %08lx\n", colr); + + ScrollDC( hdc, 20, -20, &rc, NULL, hrgn, &rcu); + /*FillRgn(hdc, hrgn, GetStockObject(WHITE_BRUSH));*/ + trace("update rect: %ld,%ld - %ld,%ld\n", + rcu.left, rcu.top, rcu.right, rcu.bottom); + if (winetest_debug > 0) dump_region(hrgn); + SetRect(&rc2, 0, 0, 100, 100); + ok(EqualRect(&rcu, &rc2), "rects do not match (%ld,%ld-%ld,%ld) / (%ld,%ld-%ld,%ld)\n", + rcu.left, rcu.top, rcu.right, rcu.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); + + exprgn = CreateRectRgn(0, 0, 20, 80); + tmprgn = CreateRectRgn(0, 80, 100, 100); + CombineRgn(exprgn, exprgn, tmprgn, RGN_OR); + if (winetest_debug > 0) dump_region(exprgn); + ok(EqualRgn(exprgn, hrgn), "wrong update region\n"); + + /* clean up */ + DeleteObject(hrgn); + DeleteObject(exprgn); + DeleteObject(tmprgn); + DestroyWindow(hwnd1); +} + static void test_params(void) { HWND hwnd; @@ -3533,6 +3587,7 @@ START_TEST(win) test_validatergn(hwndMain); test_nccalcscroll( hwndMain); test_scrollvalidate( hwndMain); + test_scrolldc( hwndMain); test_scroll(); test_IsWindowUnicode(); test_vis_rgn(hwndMain); diff --git a/dlls/x11drv/scroll.c b/dlls/x11drv/scroll.c index 78144da..e0c2f83 100644 --- a/dlls/x11drv/scroll.c +++ b/dlls/x11drv/scroll.c @@ -110,7 +110,11 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I /* Then clip again to get the source rectangle that will remain in the * clipping rect */ rcSrc = rcClip; - IntersectRect( &rcSrc, &rcSrc, &rcClip); + if (lprcClip) + { + OffsetRect( &rcSrc, -dx, -dy); + IntersectRect( &rcSrc, &rcSrc, &rcClip); + } /* now convert to device coordinates */ LPtoDP(hdc, (LPPOINT)&rcSrc, 2); TRACE("source rect: %s\n", wine_dbgstr_rect(&rcSrc)); @@ -141,7 +145,7 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I TRACE("destination rect: %s\n", wine_dbgstr_rect(&rect)); BitBlt( hdc, rect.left, rect.top, - rect.right - rect.left, rect.bottom -rect.top, + rect.right - rect.left, rect.bottom - rect.top, hdc, rect.left - dx, rect.top - dy, SRCCOPY); } /* compute the update areas. This is the combined clip rectangle @@ -181,6 +185,7 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, I if( !hrgnUpdate) DeleteObject( hrgn); } + /* restore original clipping region */ SelectClipRgn( hdc, clipRgn); DeleteObject( visrgn); DeleteObject( DstRgn);

1 0