November 2012 - Wine-commits

Hans Leidekker : msi: Register dlls in a separate process.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: b036ee63096679bcfc7c284076735891eaf02661 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b036ee63096679bcfc7c28407… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 7 15:56:37 2012 +0100 msi: Register dlls in a separate process. --- dlls/msi/action.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a180399..f9ab550 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4720,27 +4720,27 @@ static UINT ACTION_RemoveIniValues( MSIPACKAGE *package ) static void register_dll( const WCHAR *dll, BOOL unregister ) { - HMODULE hmod; + static const WCHAR regW[] = + {'r','e','g','s','v','r','3','2','.','e','x','e',' ','\"','%','s','\"',0}; + static const WCHAR unregW[] = + {'r','e','g','s','v','r','3','2','.','e','x','e',' ','/','u',' ','\"','%','s','\"',0}; + PROCESS_INFORMATION pi; + STARTUPINFOW si; + WCHAR *cmd; - hmod = LoadLibraryExW( dll, 0, LOAD_WITH_ALTERED_SEARCH_PATH ); - if (hmod) - { - HRESULT (WINAPI *func_ptr)( void ); - const char *func = unregister ? "DllUnregisterServer" : "DllRegisterServer"; + if (!(cmd = msi_alloc( strlenW(dll) * sizeof(WCHAR) + sizeof(unregW) ))) return; - func_ptr = (void *)GetProcAddress( hmod, func ); - if (func_ptr) - { - HRESULT hr = func_ptr(); - if (FAILED( hr )) - WARN("failed to register dll 0x%08x\n", hr); - } - else - WARN("entry point %s not found\n", func); - FreeLibrary( hmod ); - return; + if (unregister) sprintfW( cmd, unregW, dll ); + else sprintfW( cmd, regW, dll ); + + memset( &si, 0, sizeof(STARTUPINFOW) ); + if (CreateProcessW( NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + { + CloseHandle( pi.hThread ); + msi_dialog_check_messages( pi.hProcess ); + CloseHandle( pi.hProcess ); } - WARN("failed to load library %u\n", GetLastError()); + msi_free( cmd ); } static UINT ITERATE_SelfRegModules(MSIRECORD *row, LPVOID param)

1 0

Frédéric Delanoy : iphlapi: Fix some leaks ( coverity).
by Alexandre Julliard 07 Nov '12

07 Nov '12

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

Frédéric Delanoy : msi: Fix some leaks (coverity) .
by Alexandre Julliard 07 Nov '12

07 Nov '12

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

Alexandre Julliard : opengl32: Update to the current OpenGL spec.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 00628bb6460e68a2bb2832005c5cb26658649f64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00628bb6460e68a2bb2832005… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 12:15:09 2012 +0100 opengl32: Update to the current OpenGL spec. --- dlls/opengl32/opengl_ext.c | 250 ++++++++++++++++++++++++------------------- dlls/opengl32/opengl_norm.c | 12 ++- include/wine/wgl_driver.h | 10 ++- 3 files changed, 156 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00628bb6460e68a2bb283…

1 0

Alexandre Julliard : opengl32: Generate our own wgl. h header from the OpenGL registry data.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: 70e536f46b2b1e505b10074fb69c053a1809d8b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e536f46b2b1e505b10074fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:14:58 2012 +0100 opengl32: Generate our own wgl.h header from the OpenGL registry data. --- dlls/opengl32/make_opengl | 122 +- include/wine/wgl.h | 5081 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 5173 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70e536f46b2b1e505b100…

1 0

Alexandre Julliard : opengl32: Avoid using the system GL headers.
by Alexandre Julliard 07 Nov '12

07 Nov '12

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

Alexandre Julliard : gdi32: Avoid using the system GL headers.
by Alexandre Julliard 07 Nov '12

07 Nov '12

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

Alexandre Julliard : winex11: Avoid using the system GL headers.
by Alexandre Julliard 07 Nov '12

07 Nov '12

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 : wined3d: Make use of the generated wgl.h header.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: cf2b981ce09ec355cebae075afa6a9dbd247617f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2b981ce09ec355cebae075a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 13:54:32 2012 +0100 wined3d: Make use of the generated wgl.h header. --- dlls/wined3d/utils.c | 6 +- dlls/wined3d/wined3d_gl.h | 2257 +-------------------------------------------- 2 files changed, 5 insertions(+), 2258 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf2b981ce09ec355cebae…

1 0

Alexandre Julliard : opengl32: Don' t substitute OpenGL types that are already defined in wgl.h.
by Alexandre Julliard 07 Nov '12

07 Nov '12

Module: wine Branch: master Commit: a56c5b185e1817232f3edd3469ff885d26b91b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56c5b185e1817232f3edd346… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 7 18:06:42 2012 +0100 opengl32: Don't substitute OpenGL types that are already defined in wgl.h. --- dlls/opengl32/make_opengl | 11 +-- dlls/opengl32/opengl_ext.c | 334 +++++++++++++++++++++--------------------- dlls/opengl32/opengl_norm.c | 334 +++++++++++++++++++++--------------------- include/wine/wgl_driver.h | 336 +++++++++++++++++++++--------------------- 4 files changed, 503 insertions(+), 512 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a56c5b185e1817232f3ed…

1 0