June 2013 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : ole32/tests: Test remaining class, object and server reference counts at server exit.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: ac13aa28ad7e67330b26c163bc8e4190f50d196e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac13aa28ad7e67330b26c163b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 11 12:42:49 2013 +0900 ole32/tests: Test remaining class, object and server reference counts at server exit. --- dlls/ole32/tests/ole_server.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index 9cff693..9c901ee 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -61,6 +61,8 @@ static const struct #undef GUID_NAME }; +static LONG obj_ref, class_ref, server_locks; + static const char *debugstr_guid(const GUID *guid) { static char buf[50]; @@ -118,6 +120,8 @@ static ULONG WINAPI UnknownImpl_AddRef(IUnknown *iface) UnknownImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); + InterlockedIncrement(&obj_ref); + trace("server: unknown_AddRef: %p, ref %u\n", iface, ref); return ref; } @@ -127,6 +131,8 @@ static ULONG WINAPI UnknownImpl_Release(IUnknown *iface) UnknownImpl *This = impl_from_IUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); + InterlockedDecrement(&obj_ref); + trace("server: unknown_Release: %p, ref %u\n", iface, ref); if (ref == 0) HeapFree(GetProcessHeap(), 0, This); return ref; @@ -176,6 +182,8 @@ static ULONG WINAPI ClassFactoryImpl_AddRef(IClassFactory *iface) ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); + InterlockedIncrement(&class_ref); + trace("server: factory_AddRef: %p, ref %u\n", iface, ref); return ref; } @@ -185,6 +193,8 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface) ClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); + InterlockedDecrement(&class_ref); + trace("server: factory_Release: %p, ref %u\n", iface, ref); return ref; } @@ -203,7 +213,8 @@ static HRESULT WINAPI ClassFactoryImpl_CreateInstance(IClassFactory *iface, if (!unknown) return E_OUTOFMEMORY; unknown->IUnknown_iface.lpVtbl = &UnknownImpl_Vtbl; - unknown->ref = 1; + unknown->ref = 0; + IUnknown_AddRef(&unknown->IUnknown_iface); hr = IUnknown_QueryInterface(&unknown->IUnknown_iface, iid, ppv); IUnknown_Release(&unknown->IUnknown_iface); @@ -213,7 +224,6 @@ static HRESULT WINAPI ClassFactoryImpl_CreateInstance(IClassFactory *iface, static HRESULT WINAPI ClassFactoryImpl_LockServer(IClassFactory *iface, BOOL lock) { - static LONG server_locks; ULONG ref = lock ? InterlockedIncrement(&server_locks) : InterlockedDecrement(&server_locks); trace("server: factory_LockServer: %p,%d, ref %u\n", iface, lock, ref); @@ -258,6 +268,11 @@ static void ole_server(void) trace("server: waiting for requests\n"); WaitForSingleObject(done_event, INFINITE); + /* 1 remainining class ref is supposed to be cleared by CoRevokeClassObject */ + ok(class_ref == 1, "expected 1 class refs, got %d\n", class_ref); + ok(!obj_ref, "expected 0 object refs, got %d\n", obj_ref); + ok(!server_locks, "expected 0 server locks, got %d\n", server_locks); + CloseHandle(done_event); CloseHandle(init_done_event); if (0)

1 0

Dmitry Timoshkov : ole32/tests: Make sure that key "Software\\Classes" exists under HKEY_CURRENT_USER.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: b02951dfa7ff416f54205dab17ae3bb98e53ce7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02951dfa7ff416f54205dab1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 11 14:47:51 2013 +0900 ole32/tests: Make sure that key "Software\\Classes" exists under HKEY_CURRENT_USER. --- dlls/ole32/tests/compobj.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index f2cdf6d..470adbd 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -444,8 +444,9 @@ static void test_CoGetClassObject(void) { IUnknown_Release(pUnk); - res = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Classes", 0, KEY_ALL_ACCESS, &hkey); - ok(!res, "RegOpenKeyExA returned %d\n", res); + res = RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Classes", 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, hkey); ok(!res, "RegOverridePredefKey returned %d\n", res); @@ -780,8 +781,9 @@ static void test_CoGetPSClsid(void) hr = CoGetPSClsid(&IID_IClassFactory, &clsid); ok_ole_success(hr, "CoGetPSClsid"); - res = RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Classes", 0, KEY_ALL_ACCESS, &hkey); - ok(!res, "RegOpenKeyExA returned %d\n", res); + res = RegCreateKeyEx(HKEY_CURRENT_USER, "Software\\Classes", 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + ok(!res, "RegCreateKeyEx returned %d\n", res); res = pRegOverridePredefKey(HKEY_CLASSES_ROOT, hkey); ok(!res, "RegOverridePredefKey returned %d\n", res);

1 0

Alexandre Rostovtsev : configure: In gnutls-3.2, gnutls_mac_get_key_size() moved to crypto.h.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: fee9cd3b243ed4eeb111417a472831bb364fc2fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fee9cd3b243ed4eeb111417a4… Author: Alexandre Rostovtsev <tetromino(a)gentoo.org> Date: Tue Jun 11 01:01:56 2013 -0400 configure: In gnutls-3.2, gnutls_mac_get_key_size() moved to crypto.h. Based on a patch by Ben Kohler <bkohler(a)gmail.com>. --- configure | 1 + configure.ac | 3 ++- dlls/secur32/schannel_gnutls.c | 1 + 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 3006070..86eab07 100755 --- a/configure +++ b/configure @@ -10200,6 +10200,7 @@ if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <gnutls/gnutls.h> +#include <gnutls/crypto.h> int main () { diff --git a/configure.ac b/configure.ac index 680432c..a01b44c 100644 --- a/configure.ac +++ b/configure.ac @@ -1344,7 +1344,8 @@ then ac_save_CPPFLAGS="$CPPFLAGS" WINE_PACKAGE_FLAGS(GNUTLS,[gnutls]) AC_CHECK_HEADER(gnutls/gnutls.h, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h> +#include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])], [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])], [GNUTLS_CFLAGS=""]) CPPFLAGS="$ac_save_CPPFLAGS" diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 70b8276..cbe64e8 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -25,6 +25,7 @@ #include <stdarg.h> #ifdef SONAME_LIBGNUTLS #include <gnutls/gnutls.h> +#include <gnutls/crypto.h> #endif #include "windef.h"

1 0

Alexandre Rostovtsev : configure: Always check for pkg-config.
by Alexandre Julliard June 11, 2013

June 11, 2013

Module: wine Branch: master Commit: 21f2c0e6e709cccadf2db4dd45fedc478fc91e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=21f2c0e6e709cccadf2db4dd4… Author: Alexandre Rostovtsev <tetromino(a)gentoo.org> Date: Tue Jun 11 01:05:42 2013 -0400 configure: Always check for pkg-config. --- configure | 188 +++++++++++++++++++++++++++++----------------------------- configure.ac | 1 + 2 files changed, 95 insertions(+), 94 deletions(-) diff --git a/configure b/configure index 86eab07..606305f 100755 --- a/configure +++ b/configure @@ -672,7 +672,6 @@ XSLT_LIBS XSLT_CFLAGS XML2_LIBS XML2_CFLAGS -PKG_CONFIG X_EXTRA_LIBS X_LIBS X_PRE_LIBS @@ -711,6 +710,7 @@ CPP OPENGL_LIBS XLIB MAINTAINER_MODE +PKG_CONFIG MSGFMT ICOTOOL CONVERT @@ -5152,6 +5152,98 @@ fi done test -n "$MSGFMT" || MSGFMT="false" +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$PKG_CONFIG"; then + ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +PKG_CONFIG=$ac_cv_prog_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_PKG_CONFIG"; then + ac_ct_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_PKG_CONFIG"; then + ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG +if test -n "$ac_ct_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 +$as_echo "$ac_ct_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_ct_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" +fi + if test "x$enable_maintainer_mode" != "xyes" then @@ -9500,99 +9592,7 @@ test "x$ac_cv_lib_OpenCL_clGetPlatformInfo" != xyes && enable_opencl=${enable_op if test "x$with_xml" != "xno" then ac_save_CPPFLAGS="$CPPFLAGS" - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$PKG_CONFIG"; then - ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_PKG_CONFIG="${ac_tool_prefix}pkg-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -PKG_CONFIG=$ac_cv_prog_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_PKG_CONFIG"; then - ac_ct_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_PKG_CONFIG"; then - ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_PKG_CONFIG="pkg-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG -if test -n "$ac_ct_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_PKG_CONFIG" >&5 -$as_echo "$ac_ct_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_ct_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" -fi - -if test -n "$XML2_CFLAGS"; then : + if test -n "$XML2_CFLAGS"; then : elif test -n "$PKG_CONFIG"; then : XML2_CFLAGS=`$PKG_CONFIG --cflags libxml-2.0 2>/dev/null` diff --git a/configure.ac b/configure.ac index a01b44c..74fd134 100644 --- a/configure.ac +++ b/configure.ac @@ -288,6 +288,7 @@ AC_CHECK_PROGS(RSVG, rsvg, false) AC_CHECK_PROGS(CONVERT, convert, false) AC_CHECK_PROGS(ICOTOOL, icotool, false) AC_CHECK_PROGS(MSGFMT, msgfmt, false) +WINE_PATH_PKG_CONFIG if test "x$enable_maintainer_mode" != "xyes" then

1 0

Alexandre Julliard : oleaut32: Remove redundant declaration of CLSID_PSFactoryBuffer.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 699eb85ce0128f12ca0e0cf26f755f03a6dc8e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=699eb85ce0128f12ca0e0cf26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 14:24:11 2013 +0200 oleaut32: Remove redundant declaration of CLSID_PSFactoryBuffer. --- dlls/oleaut32/oleaut.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 56eea1a..5af6d18 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -739,7 +739,6 @@ extern HRESULT WINAPI OLEAUTPS_DllGetClassObject(REFCLSID, REFIID, LPVOID *) DEC extern BOOL WINAPI OLEAUTPS_DllMain(HINSTANCE, DWORD, LPVOID) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEAUTPS_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI OLEAUTPS_DllUnregisterServer(void) DECLSPEC_HIDDEN; -extern GUID const CLSID_PSFactoryBuffer DECLSPEC_HIDDEN; extern void _get_STDFONT_CF(LPVOID *); extern void _get_STDPIC_CF(LPVOID *);

1 0

Marcus Meissner : user32/tests: Remove side effects from assert()s.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: b853ddc40b342e02d7cab7ade2c2c7e544b9935d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b853ddc40b342e02d7cab7ade… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 22:39:54 2013 +0200 user32/tests: Remove side effects from assert()s. --- dlls/user32/tests/win.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2d9faaa..abd7f8d 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1523,10 +1523,14 @@ static void test_MDI_child_stack(HWND mdi_client) cs.style = 0; cs.lParam = (LPARAM)mdi_lParam_test_message; - assert(child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); - assert(child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); - assert(child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); - assert(child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs)); + child_1 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_1 != 0, "expected child_1 to be non NULL"); + child_2 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_2 != 0, "expected child_2 to be non NULL"); + child_3 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_3 != 0, "expected child_3 to be non NULL"); + child_4 = (HWND)SendMessageA(mdi_client, WM_MDICREATE, 0, (LPARAM)&cs); + ok(child_4 != 0, "expected child_4 to be non NULL"); stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); stack[1] = GetWindow(stack[0], GW_HWNDNEXT);

1 0

Marcus Meissner : oleaut32: Fixed incorrect pointer deref (Coverity).
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: b22dade1d634c9a3843780af9755617fa6409430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b22dade1d634c9a3843780af9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 20:44:19 2013 +0200 oleaut32: Fixed incorrect pointer deref (Coverity). --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ad0b4ae..c2c3a63 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3506,7 +3506,7 @@ static WORD SLTG_ReadString(const char *ptr, const TLBString **pStr, ITypeLibImp len = MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, NULL, 0); tmp_str = SysAllocStringLen(NULL, len); - if (*tmp_str) { + if (tmp_str) { MultiByteToWideChar(CP_ACP, 0, ptr + 2, bytelen, tmp_str, len); *pStr = TLB_append_str(&lib->string_list, tmp_str); SysFreeString(tmp_str);

1 0

Marcus Meissner : oleaut32: Avoid memory leaking junk (Coverity).
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 0bd04d40cfcf1e2ce628285fd15d4881284f5fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bd04d40cfcf1e2ce628285fd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jun 9 20:47:00 2013 +0200 oleaut32: Avoid memory leaking junk (Coverity). --- dlls/oleaut32/typelib.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c2c3a63..024df0d 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9771,6 +9771,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) FILE_ATTRIBUTE_NORMAL, 0); if (outfile == INVALID_HANDLE_VALUE){ WMSFT_free_file(&file); + heap_free(junk); return TYPE_E_IOERROR; } @@ -9778,10 +9779,12 @@ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 *iface) if (!br) { WMSFT_free_file(&file); CloseHandle(outfile); + heap_free(junk); return TYPE_E_IOERROR; } br = WriteFile(outfile, junk, junk_size, &written, NULL); + heap_free(junk); if (!br) { WMSFT_free_file(&file); CloseHandle(outfile);

1 0

Dmitry Timoshkov : ole32/tests: Remove redundant code.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 289437dc4d79ce2433fda4547dd58a7bf644eeae URL: http://source.winehq.org/git/wine.git/?a=commit;h=289437dc4d79ce2433fda4547… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 10 17:52:10 2013 +0900 ole32/tests: Remove redundant code. --- dlls/ole32/tests/ole_server.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/tests/ole_server.c b/dlls/ole32/tests/ole_server.c index 303ec35..d6c5ccc 100644 --- a/dlls/ole32/tests/ole_server.c +++ b/dlls/ole32/tests/ole_server.c @@ -329,7 +329,7 @@ static HANDLE start_server(const char *argv0) PROCESS_INFORMATION pi; STARTUPINFO si; SECURITY_ATTRIBUTES sa; - char **argv, cmdline[MAX_PATH * 2]; + char cmdline[MAX_PATH * 2]; BOOL ret; memset(&si, 0, sizeof(si)); @@ -343,7 +343,6 @@ static HANDLE start_server(const char *argv0) sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; - winetest_get_mainargs(&argv); sprintf(cmdline, "\"%s\" ole_server -server", argv0); ret = CreateProcess(argv0, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); @@ -364,20 +363,13 @@ START_TEST(ole_server) HANDLE mapping, done_event, init_done_event, process; struct winetest_info *info; int argc; - char **argv, *argv0, *ext; + char **argv; mapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 4096, "winetest_ole_server"); ok(mapping != 0, "CreateFileMapping failed\n"); info = MapViewOfFile(mapping, FILE_MAP_READ|FILE_MAP_WRITE, 0, 0, 4096); argc = winetest_get_mainargs(&argv); - argv0 = strrchr(argv[0], '\\'); - if (!argv0) argv0 = strrchr(argv[0], '/'); - if (!argv0) argv0 = argv[0]; - else argv0++; - argv0 = strdup(argv0); - ext = strrchr(argv0, '.'); - if (ext && !lstrcmpi(ext, ".so")) *ext = 0; done_event = CreateEvent(NULL, TRUE, FALSE, "ole_server_done_event"); ok(done_event != 0, "CreateEvent error %d\n", GetLastError());

1 0

Alexandre Julliard : winegcc: Pass the C compiler name to winebuild.
by Alexandre Julliard June 10, 2013

June 10, 2013

Module: wine Branch: master Commit: 3987913453fc8c723068997f8af7c6a66f72f0c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3987913453fc8c723068997f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 10 12:30:21 2013 +0200 winegcc: Pass the C compiler name to winebuild. --- tools/winegcc/winegcc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 65f066c..89ea310 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -940,6 +940,7 @@ static void build(struct options* opts) /* run winebuild to generate the .spec.o file */ spec_args = get_winebuild_args( opts ); + strarray_add( spec_args, strmake( "--cc-cmd=%s", build_tool_name( opts, "gcc", CC ))); spec_o_name = get_temp_file(output_name, ".spec.o"); if (opts->force_pointer_size) strarray_add(spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));

1 0