October 2012 - Wine-commits

Henri Verbeet : winealsa: Avoid depending on ddraw.h.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: fd06135d517f837596bbc0eb9d2e03124d542e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd06135d517f837596bbc0eb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:40 2012 +0200 winealsa: Avoid depending on ddraw.h. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6b2bed5..1c8b03a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -35,7 +35,7 @@ #include "ole2.h" #include "mmdeviceapi.h" #include "devpkey.h" -#include "dshow.h" +#include "mmsystem.h" #include "dsound.h" #include "initguid.h"

1 0

Henri Verbeet : winex11: Avoid depending on ddraw.h.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: f08854ac3d47dedcaaa3216248095df644d1b5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08854ac3d47dedcaaa321624… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:41 2012 +0200 winex11: Avoid depending on ddraw.h. --- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/x11drv.h | 7 +++++++ dlls/winex11.drv/xvidmode.c | 5 ++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index f03dd4d..d729fd0 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -27,7 +27,6 @@ #include "winbase.h" #include "winreg.h" #include "x11drv.h" -#include "ddrawi.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f4ccdd2..99f045f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -114,6 +114,13 @@ typedef struct int exposures; /* count of graphics exposures operations */ } X11DRV_PDEVICE; +struct x11drv_gamma_ramp +{ + WORD red[256]; + WORD green[256]; + WORD blue[256]; +}; + static inline X11DRV_PDEVICE *get_x11drv_dev( PHYSDEV dev ) { return (X11DRV_PDEVICE *)dev; diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 844560d..a4e20f3 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -36,7 +36,6 @@ #include "windef.h" #include "wingdi.h" -#include "ddrawi.h" #include "wine/debug.h" #include "wine/library.h" @@ -335,7 +334,7 @@ static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma) /* Hmm... should gamma control be available in desktop mode or not? * I'll assume that it should */ -static BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp) +static BOOL X11DRV_XF86VM_GetGammaRamp(struct x11drv_gamma_ramp *ramp) { #ifdef X_XF86VidModeSetGamma XF86VidModeGamma gamma; @@ -357,7 +356,7 @@ static BOOL X11DRV_XF86VM_GetGammaRamp(LPDDGAMMARAMP ramp) return FALSE; } -static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp) +static BOOL X11DRV_XF86VM_SetGammaRamp(struct x11drv_gamma_ramp *ramp) { #ifdef X_XF86VidModeSetGamma XF86VidModeGamma gamma;

1 0

André Hentschel : iphlpapi: Close socket on failed HeapAlloc (coverity).
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 6f8ac7cf1baa700dc4a83735925040f89d66f03d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8ac7cf1baa700dc4a837359… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:06 2012 +0200 iphlpapi: Close socket on failed HeapAlloc (coverity). --- dlls/iphlpapi/icmp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index fb87fe2..6d26bb4 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -168,6 +168,7 @@ HANDLE WINAPI IcmpCreateFile(VOID) icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); if (icp==NULL) { + close(sid); SetLastError(IP_NO_RESOURCES); return INVALID_HANDLE_VALUE; }

1 0

André Hentschel : cabinet: Reorder code to make sure str is freed (coverity).
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: a5a99047e4b6493fa1ac465d80fd4450f53a3c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a99047e4b6493fa1ac465d8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:13 2012 +0200 cabinet: Reorder code to make sure str is freed (coverity). --- dlls/cabinet/cabinet_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 1f0daf8..ef6698d 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -365,6 +365,7 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) if ((end = strrchr(str, '\\'))) { + path = str; end++; name = HeapAlloc( GetProcessHeap(), 0, strlen(end) + 1 ); if (!name) @@ -374,7 +375,6 @@ HRESULT WINAPI Extract(SESSION *dest, LPCSTR szCabName) } strcpy( name, end ); *end = 0; - path = str; } else {

1 0

André Hentschel : comdlg32: Free tmp_files after it' s used (coverity).
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: b302e1f2a5136bb99872cdf9a40f53483a9738c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b302e1f2a5136bb99872cdf9a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:16 2012 +0200 comdlg32: Free tmp_files after it's used (coverity). --- dlls/comdlg32/itemdlg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index a9cc6bf..e5c8927 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -417,6 +417,7 @@ static HRESULT on_default_action(FileDialogImpl *This) { UINT size_used; file_count = COMDLG32_SplitFileNames(tmp_files, len, &files, &size_used); + CoTaskMemFree(tmp_files); } if(!file_count) return E_FAIL;

1 0

André Hentschel : d3dcompiler_43: Free assignment on error (coverity).
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 3abc425267c9dbb2df6d2bb8ae3c0c33b11a15ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3abc425267c9dbb2df6d2bb8a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:21 2012 +0200 d3dcompiler_43: Free assignment on error (coverity). --- dlls/d3dcompiler_43/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 6d174f6..0f61f61 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1637,6 +1637,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig debug_hlsl_type(rhs->data_type), debug_hlsl_type(type)); free_instr(lhs); free_instr(rhs); + d3dcompiler_free(assign); return NULL; } if (lhs->data_type->dimx * lhs->data_type->dimy < rhs->data_type->dimx * rhs->data_type->dimy) @@ -1649,6 +1650,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig ERR("Couldn't implicitly convert expression to %s.\n", debug_hlsl_type(type)); free_instr(lhs); free_instr(rhs); + d3dcompiler_free(assign); return NULL; } rhs = converted_rhs;

1 0

André Hentschel : d3dx9_36: Free object on error ( coverity).
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 904cdc46ebad1c8e94e11da07a9031a71a067b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=904cdc46ebad1c8e94e11da07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:23 2012 +0200 d3dx9_36: Free object on error (coverity). --- dlls/d3dx9_36/mesh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index eec6692..cbdba68 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2559,6 +2559,7 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXMeshImpl)); if (object == NULL || attrib_buffer == NULL) { + HeapFree(GetProcessHeap(), 0, object); HeapFree(GetProcessHeap(), 0, attrib_buffer); IDirect3DIndexBuffer9_Release(index_buffer); IDirect3DVertexBuffer9_Release(vertex_buffer);

1 0

André Hentschel : winedbg: Cleanup if gdb startup fails (coverity).
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: addd324dbaaf984c0e51910d17a6e5b680d96be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addd324dbaaf984c0e51910d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 25 21:29:10 2012 +0200 winedbg: Cleanup if gdb startup fails (coverity). --- programs/winedbg/gdbproxy.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index b3978ae..8e01482 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -2292,6 +2292,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl unsigned int s_len = sizeof(s_addrs); struct pollfd pollfd; IMAGEHLP_MODULE64 imh_mod; + BOOL ret = FALSE; /* step 1: create socket for gdb connection request */ if ((sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) @@ -2301,15 +2302,15 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl return FALSE; } - if (listen(sock, 1) == -1 || - getsockname(sock, (struct sockaddr*)&s_addrs, &s_len) == -1) - return FALSE; + if (listen(sock, 1) == -1 || getsockname(sock, (struct sockaddr*)&s_addrs, &s_len) == -1) + goto cleanup; /* step 2: do the process internal creation */ handle_debug_event(gdbctx, de); /* step3: get the wine loader name */ - if (!dbg_get_debuggee_info(gdbctx->process->handle, &imh_mod)) return FALSE; + if (!dbg_get_debuggee_info(gdbctx->process->handle, &imh_mod)) + goto cleanup; /* step 4: fire up gdb (if requested) */ if (flags & FLAG_NO_START) @@ -2319,14 +2320,14 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl { case -1: /* error in parent... */ fprintf(stderr, "Cannot create gdb\n"); - return FALSE; + goto cleanup; default: /* in parent... success */ signal(SIGINT, SIG_IGN); break; case 0: /* in child... and alive */ gdb_exec(imh_mod.LoadedImageName, s_addrs.sin_port, flags); /* if we're here, exec failed, so report failure */ - return FALSE; + goto cleanup; } /* step 5: wait for gdb to connect actually */ @@ -2343,6 +2344,7 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl gdbctx->sock = accept(sock, (struct sockaddr*)&s_addrs, &s_len); if (gdbctx->sock == -1) break; + ret = TRUE; if (gdbctx->trace & GDBPXY_TRC_LOWLEVEL) fprintf(stderr, "Connected on %d\n", gdbctx->sock); /* don't keep our small packets too long: send them ASAP back to GDB @@ -2354,17 +2356,18 @@ static BOOL gdb_startup(struct gdb_context* gdbctx, DEBUG_EVENT* de, unsigned fl case 0: if (gdbctx->trace & GDBPXY_TRC_LOWLEVEL) fprintf(stderr, "Poll for cnx failed (timeout)\n"); - return FALSE; + break; case -1: if (gdbctx->trace & GDBPXY_TRC_LOWLEVEL) fprintf(stderr, "Poll for cnx failed (error)\n"); - return FALSE; + break; default: assert(0); } +cleanup: close(sock); - return TRUE; + return ret; } static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags)

1 0

Daniel Lehman : msvcp90: In istream::seekg, don' t use sentry and clear state.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 7fe93a5f75db2bdbebbe41db43f47fb9cb925830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe93a5f75db2bdbebbe41db4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Sep 14 16:45:52 2012 -0700 msvcp90: In istream::seekg, don't use sentry and clear state. --- dlls/msvcp90/ios.c | 107 +++++++++++++----------------- dlls/msvcp90/tests/ios.c | 166 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 209 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fe93a5f75db2bdbebbe4…

1 0

Nikolay Sivov : dwrite: Keep string length in text layout.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 1b449f459f96a4b64417afa1800d0ce13d3fd6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b449f459f96a4b64417afa18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 26 12:09:50 2012 -0400 dwrite: Keep string length in text layout. --- dlls/dwrite/layout.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8567c6a..153716b 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -50,6 +50,7 @@ struct dwrite_textlayout { LONG ref; WCHAR *str; + UINT32 len; struct dwrite_textformat_data format; }; @@ -676,6 +677,7 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma This->IDWriteTextLayout_iface.lpVtbl = &dwritetextlayoutvtbl; This->ref = 1; This->str = heap_strdupnW(str, len); + This->len = len; memset(&This->format, 0, sizeof(This->format)); /* reference is not kept here, instead copy all underlying data */

1 0