December 2005 - Wine-commits

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

21 Dec '05

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

Alexandre Julliard : server: Set the context flags in get_thread_context to indicate which
by Alexandre Julliard 21 Dec '05

21 Dec '05

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

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

20 Dec '05

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

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

20 Dec '05

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

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

20 Dec '05

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

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

20 Dec '05

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

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

20 Dec '05

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 20 Dec '05

20 Dec '05

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

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

20 Dec '05

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

Paul Vriens : winecfg: Dutch resources update.
by Alexandre Julliard 20 Dec '05

20 Dec '05

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