November 2012 - Wine-Commits

Hans Leidekker : msi: Make sure either the REINSTALL or the REMOVE property is set when the product is already installed .
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: e2900c23c7f0b143078da780c9a0ff19a895bf45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2900c23c7f0b143078da780c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 7 15:56:14 2012 +0100 msi: Make sure either the REINSTALL or the REMOVE property is set when the product is already installed. --- dlls/msi/action.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 88de118..a180399 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7720,7 +7720,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; - WCHAR *reinstall = NULL; + WCHAR *reinstall, *remove; BOOL ui_exists; UINT rc; @@ -7771,9 +7771,11 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_apply_transforms( package ); msi_apply_patches( package ); - if (!szCommandLine && msi_get_property_int( package->db, szInstalled, 0 )) + remove = msi_dup_property( package->db, szRemove ); + reinstall = msi_dup_property( package->db, szReinstall ); + if (msi_get_property_int( package->db, szInstalled, 0 ) && !remove && !reinstall) { - TRACE("setting reinstall property\n"); + TRACE("setting REINSTALL property to ALL\n"); msi_set_property( package->db, szReinstall, szAll, -1 ); } @@ -7825,12 +7827,13 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, /* finish up running custom actions */ ACTION_FinishCustomActions(package); - if (package->need_rollback && !(reinstall = msi_dup_property( package->db, szReinstall ))) + if (package->need_rollback && !reinstall) { WARN("installation failed, running rollback script\n"); execute_script( package, SCRIPT_ROLLBACK ); } msi_free( reinstall ); + msi_free( remove ); if (rc == ERROR_SUCCESS && package->need_reboot_at_end) return ERROR_SUCCESS_REBOOT_REQUIRED;

1 0

Hans Leidekker : msi: Return correct length for the empty string from deformat_string.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 462ec1ba435eb4e5178f029efb836afdef9c9ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ec1ba435eb4e5178f029ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 7 15:55:26 2012 +0100 msi: Return correct length for the empty string from deformat_string. --- dlls/msi/format.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 033f69c..756c4d1 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -1023,24 +1023,23 @@ done: } /* wrapper to resist a need for a full rewrite right now */ -DWORD deformat_string( MSIPACKAGE *package, const WCHAR *ptr, WCHAR **data ) +DWORD deformat_string( MSIPACKAGE *package, const WCHAR *fmt, WCHAR **data ) { - if (ptr) - { - DWORD len = 0; - MSIRECORD *rec = MSI_CreateRecord( 1 ); - - MSI_RecordSetStringW( rec, 0, ptr ); - MSI_FormatRecordW( package, rec, NULL, &len ); + DWORD len; + MSIRECORD *rec; - len++; - *data = msi_alloc( len * sizeof(WCHAR) ); - if (len > 1) MSI_FormatRecordW( package, rec, *data, &len ); - else *data[0] = 0; + *data = NULL; + if (!fmt) return 0; + if (!(rec = MSI_CreateRecord( 1 ))) return 0; + MSI_RecordSetStringW( rec, 0, fmt ); + MSI_FormatRecordW( package, rec, NULL, &len ); + if (!(*data = msi_alloc( ++len * sizeof(WCHAR) ))) + { msiobj_release( &rec->hdr ); - return len; + return 0; } - *data = NULL; - return 0; + MSI_FormatRecordW( package, rec, *data, &len ); + msiobj_release( &rec->hdr ); + return len; }

1 0

Piotr Caban : msvcp90: Fixed long long printing in tests.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 9b0ce65bb68e003436efdba8c05ca8948e4c262b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b0ce65bb68e003436efdba8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:14:45 2012 +0100 msvcp90: Fixed long long printing in tests. --- dlls/msvcp90/tests/ios.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/tests/ios.c b/dlls/msvcp90/tests/ios.c index d7b7d1f..4370f0e 100644 --- a/dlls/msvcp90/tests/ios.c +++ b/dlls/msvcp90/tests/ios.c @@ -828,7 +828,8 @@ static void test_num_get_get_uint64(void) next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %llu found %llu\n", (unsigned long long)tests[i].val, (unsigned long long)val); + ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), + (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); ok(tests[i].next == next, "wrong next, expected = %c (%i) found = %c (%i)\n", tests[i].next, tests[i].next, next, next); if(tests[i].lcl) @@ -854,7 +855,8 @@ static void test_num_get_get_uint64(void) nextus = (unsigned short)(int)call_func1(p_basic_istream_wchar_get, &wss.base.base1); ok(tests[i].state == state, "wrong state, expected = %x found = %x\n", tests[i].state, state); - ok(tests[i].val == val, "wrong val, expected = %llu found %llu\n", (unsigned long long)tests[i].val, (unsigned long long)val); + ok(tests[i].val == val, "wrong val, expected = %lx%08lx found %lx%08lx\n", (unsigned long)(tests[i].val >> 32), + (unsigned long)tests[i].val, (unsigned long)(val >> 32), (unsigned long)val); testus = tests[i].next == EOF ? WEOF : (unsigned short)tests[i].next; ok(testus == nextus, "wrong next, expected = %c (%i) found = %c (%i)\n", testus, testus, nextus, nextus);

1 0

Alexandre Julliard : winex11: Avoid using the system GL headers.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: e5b18af9e8bf48a8371655b243698ea88c3fbd87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b18af9e8bf48a8371655b24… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 17:20:57 2012 +0100 winex11: Avoid using the system GL headers. --- dlls/winex11.drv/opengl.c | 217 ++++++++++++++++++++++++++++----------------- 1 files changed, 137 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5b18af9e8bf48a837165…

1 0

Alexandre Julliard : gdi32: Avoid using the system GL headers.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: af3f3cb1b29a7f926ea391f26ec4dfb626cea109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3f3cb1b29a7f926ea391f26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 14:43:02 2012 +0100 gdi32: Avoid using the system GL headers. --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/dibdrv/opengl.c | 34 ++++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 47fa96f..ea1b159 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 IMPORTS = advapi32 -EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@ @X_CFLAGS@ +EXTRAINCL = @FREETYPEINCL@ @FONTCONFIGINCL@ EXTRALIBS = @CARBONLIB@ DELAYIMPORTS = usp10 diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index a6b83f0..778fb0b 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -21,13 +21,6 @@ #include "config.h" #include "wine/port.h" -#ifdef HAVE_GL_OSMESA_H -#include <GL/osmesa.h> -#undef APIENTRY -#undef GLAPI -#undef WINGDIAPI -#endif - #include "gdi_private.h" #include "dibdrv.h" @@ -38,8 +31,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); #ifdef SONAME_LIBOSMESA +#include "wine/wgl.h" #include "wine/wgl_driver.h" +#define OSMESA_COLOR_INDEX GL_COLOR_INDEX +#define OSMESA_RGBA GL_RGBA +#define OSMESA_BGRA 0x1 +#define OSMESA_ARGB 0x2 +#define OSMESA_RGB GL_RGB +#define OSMESA_BGR 0x4 +#define OSMESA_RGB_565 0x5 +#define OSMESA_ROW_LENGTH 0x10 +#define OSMESA_Y_UP 0x11 + +typedef struct osmesa_context *OSMesaContext; + extern BOOL WINAPI GdiSetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ); struct wgl_context @@ -54,13 +60,13 @@ static struct opengl_funcs opengl_funcs; static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; #undef USE_GL_FUNC -#define MAKE_FUNCPTR(f) static typeof(f) * p##f; -MAKE_FUNCPTR(OSMesaCreateContextExt) -MAKE_FUNCPTR(OSMesaDestroyContext) -MAKE_FUNCPTR(OSMesaGetProcAddress) -MAKE_FUNCPTR(OSMesaMakeCurrent) -MAKE_FUNCPTR(OSMesaPixelStore) -#undef MAKE_FUNCPTR +static OSMesaContext (*pOSMesaCreateContextExt)( GLenum format, GLint depthBits, GLint stencilBits, + GLint accumBits, OSMesaContext sharelist ); +static void (*pOSMesaDestroyContext)( OSMesaContext ctx ); +static void * (*pOSMesaGetProcAddress)( const char *funcName ); +static GLboolean (*pOSMesaMakeCurrent)( OSMesaContext ctx, void *buffer, GLenum type, + GLsizei width, GLsizei height ); +static void (*pOSMesaPixelStore)( GLint pname, GLint value ); static const struct {

1 0

Frédéric Delanoy : msi: Fix some leaks (coverity) .
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 85bf1082ce68612abd79863d7d61f232efd0601c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85bf1082ce68612abd79863d7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 7 01:05:50 2012 +0100 msi: Fix some leaks (coverity). --- dlls/msi/msi.c | 3 +++ dlls/msi/package.c | 6 ++++-- dlls/msi/source.c | 3 +++ dlls/msi/where.c | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 4bcb5c5..92ef52c 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2215,7 +2215,10 @@ UINT WINAPI MsiQueryComponentStateW(LPCWSTR szProductCode, if (!(val = msi_alloc( sz ))) return ERROR_OUTOFMEMORY; if ((r = msi_comp_find_prodcode(squished_pc, dwContext, szComponent, val, &sz))) + { + msi_free(val); return r; + } if (lstrlenW(val) > 2 && val[0] >= '0' && val[0] <= '9' && val[1] >= '0' && val[1] <= '9' && val[2] != ':') diff --git a/dlls/msi/package.c b/dlls/msi/package.c index f398c10..015af00 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -638,10 +638,12 @@ static void set_msi_assembly_prop(MSIPACKAGE *package) return; size = GetFileVersionInfoSizeW(fusion, &handle); - if (!size) return; + if (!size) + goto done; version = msi_alloc(size); - if (!version) return; + if (!version) + goto done; if (!GetFileVersionInfoW(fusion, handle, size, version)) goto done; diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 881f3d2..ab8541c 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -763,7 +763,10 @@ UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, r = OpenSourceKey(product, &source, MSICODE_PRODUCT, context, FALSE); if (r != ERROR_SUCCESS) + { + msi_free(buffer); return r; + } sprintfW(buffer, format, typechar, index, value); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 45fda44..1bf7788 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -1253,6 +1253,8 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables, if (r != ERROR_SUCCESS) { ERR("can't get table dimensions\n"); + table->view->ops->delete(table->view); + msi_free(table); goto end; }

1 0

Frédéric Delanoy : iphlapi: Fix some leaks ( coverity).
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 82c97d954d443ee94c3782be38bbae5bece34b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c97d954d443ee94c3782be3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 7 10:36:46 2012 +0100 iphlapi: Fix some leaks (coverity). --- dlls/iphlpapi/ifenum.c | 4 ++++ dlls/iphlpapi/iphlpapi_main.c | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 4f76d87..aff88cd 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -741,6 +741,8 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ifp->ifa_addr); i++; } + if (ret) + HeapFree(GetProcessHeap(), 0, *ppIpAddrTable); } else ret = ERROR_OUTOFMEMORY; @@ -928,6 +930,8 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) &ifr->ifr_addr); i++; } + if (ret) + HeapFree(GetProcessHeap(), 0, *ppIpAddrTable); } else ret = ERROR_OUTOFMEMORY; diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index dae779c..16f138c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -784,6 +784,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } if (ret) { + HeapFree(GetProcessHeap(), 0, v4addrs); HeapFree(GetProcessHeap(), 0, routeTable); return ret; }

1 0

Piotr Caban : msvcrt: Fixed __p___mb_cur_max tests.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: 9c319baa6670219e4ea6c6ae35f238c087ef2094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c319baa6670219e4ea6c6ae3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 12:51:51 2012 +0100 msvcrt: Fixed __p___mb_cur_max tests. --- dlls/msvcrt/tests/locale.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 73eeb91..6b09cdf 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -745,6 +745,10 @@ static void test__Gettnames(void) static void test___mb_cur_max_func(void) { int mb_cur_max; + CPINFO cp; + + setlocale(LC_ALL, "C"); + GetCPInfo(CP_ACP, &cp); /* for newer Windows */ if(!p___mb_cur_max_func) @@ -768,7 +772,13 @@ static void test___mb_cur_max_func(void) win_skip("Skipping __p___mb_cur_max tests\n"); else { mb_cur_max = *p__p___mb_cur_max(); - ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + if (cp.MaxCharSize != 1) { + todo_wine ok(mb_cur_max == cp.MaxCharSize, "mb_cur_max = %d, expected %d\n", + mb_cur_max, cp.MaxCharSize); + } + else { + ok(mb_cur_max == 1, "mb_cur_max = %d, expected 1\n", mb_cur_max); + } /* some old Windows don't set chinese */ if (!setlocale(LC_ALL, "chinese"))

1 0

Alexandre Julliard : opengl32: Avoid using the system GL headers.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: fdc1f2d43257fe304c192ec70f5a0305368c9b09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdc1f2d43257fe304c192ec70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:15:24 2012 +0100 opengl32: Avoid using the system GL headers. --- dlls/opengl32/Makefile.in | 1 - dlls/opengl32/make_opengl | 3 ++- dlls/opengl32/opengl_ext.c | 1 + dlls/opengl32/opengl_ext.h | 16 +--------------- dlls/opengl32/opengl_norm.c | 2 +- 5 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index ff26507..ced0252 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -1,7 +1,6 @@ MODULE = opengl32.dll IMPORTLIB = opengl32 IMPORTS = user32 gdi32 advapi32 -EXTRAINCL = @X_CFLAGS@ C_SRCS = \ opengl_ext.c \ diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 7bcc34c..7d96653 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -945,9 +945,9 @@ print NORM " #include \"config.h\" #include <stdarg.h> -#include \"opengl_ext.h\" #include \"winternl.h\" #include \"wingdi.h\" +#include \"wine/wgl.h\" #include \"wine/wgl_driver.h\" #include \"wine/debug.h\" @@ -991,6 +991,7 @@ print EXT " #include \"opengl_ext.h\" #include \"winternl.h\" #include \"wingdi.h\" +#include \"wine/wgl.h\" #define WGL_WGLEXT_PROTOTYPES #include \"wine/wglext.h\" #include \"wine/wgl_driver.h\" diff --git a/dlls/opengl32/opengl_ext.c b/dlls/opengl32/opengl_ext.c index 49ff332..f7e258a 100644 --- a/dlls/opengl32/opengl_ext.c +++ b/dlls/opengl32/opengl_ext.c @@ -6,6 +6,7 @@ #include "opengl_ext.h" #include "winternl.h" #include "wingdi.h" +#include "wine/wgl.h" #define WGL_WGLEXT_PROTOTYPES #include "wine/wglext.h" #include "wine/wgl_driver.h" diff --git a/dlls/opengl32/opengl_ext.h b/dlls/opengl32/opengl_ext.h index eb35e54..5748e0c 100644 --- a/dlls/opengl32/opengl_ext.h +++ b/dlls/opengl32/opengl_ext.h @@ -19,22 +19,8 @@ #ifndef __DLLS_OPENGL32_OPENGL_EXT_H #define __DLLS_OPENGL32_OPENGL_EXT_H -#define XMD_H /* This is to prevent the Xmd.h inclusion bug :-/ */ -#include <GL/gl.h> -#undef XMD_H - -#undef APIENTRY -#undef CALLBACK -#undef GLAPI -#undef WINAPI -#undef WINGDIAPI - -/* Redefines the constants */ -#define CALLBACK __stdcall -#define WINAPI __stdcall -#define APIENTRY WINAPI - #include "windef.h" +#include "wine/wgl.h" typedef struct { const char *name; /* name of the extension */ diff --git a/dlls/opengl32/opengl_norm.c b/dlls/opengl32/opengl_norm.c index ada172b..9e6e363 100644 --- a/dlls/opengl32/opengl_norm.c +++ b/dlls/opengl32/opengl_norm.c @@ -3,9 +3,9 @@ #include "config.h" #include <stdarg.h> -#include "opengl_ext.h" #include "winternl.h" #include "wingdi.h" +#include "wine/wgl.h" #include "wine/wgl_driver.h" #include "wine/debug.h"

1 0

Piotr Caban : msvcp60: Fixed basic_streambuf class structure.
by Alexandre Julliard Nov. 7, 2012

Nov. 7, 2012

Module: wine Branch: master Commit: f6542bbb96587e179a25f3991c25a3410acef7b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6542bbb96587e179a25f3991… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 7 15:15:42 2012 +0100 msvcp60: Fixed basic_streambuf class structure. --- dlls/msvcp60/ios.c | 142 ++++++++++++++++++++++++-------------------------- dlls/msvcp60/msvcp.h | 4 +- 2 files changed, 71 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f6542bbb96587e179a25f…

1 0