November 2012 - Wine-commits

Henri Verbeet : mmdevapi: Avoid a couple of dependencies on ddraw.h.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 5e93aa38ab788a671b0b64272702e422e608f9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e93aa38ab788a671b0b64272… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:29 2012 +0100 mmdevapi: Avoid a couple of dependencies on ddraw.h. --- dlls/mmdevapi/audiovolume.c | 2 +- dlls/mmdevapi/devenum.c | 1 + dlls/mmdevapi/main.c | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 84377a5..4cc3226 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -32,7 +32,7 @@ #include "ole2.h" #include "mmdeviceapi.h" -#include "dshow.h" +#include "mmsystem.h" #include "dsound.h" #include "audioclient.h" #include "endpointvolume.h" diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 40c8c6f..d7c5a44 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "wine/unicode.h" +#include "initguid.h" #include "ole2.h" #include "mmdeviceapi.h" #include "dshow.h" diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index bd2e461..1518b02 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -32,10 +32,9 @@ #include "olectl.h" #include "rpcproxy.h" #include "propsys.h" -#include "initguid.h" #include "propkeydef.h" #include "mmdeviceapi.h" -#include "dshow.h" +#include "mmsystem.h" #include "dsound.h" #include "audioclient.h" #include "endpointvolume.h"

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWSURFACE7.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 1216eb577b1a6f8f82ce96856af9503202cb7daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1216eb577b1a6f8f82ce96856… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:30 2012 +0100 ddraw: Avoid LPDIRECTDRAWSURFACE7. --- dlls/ddraw/tests/d3d.c | 4 ++-- dlls/ddraw/tests/dsurface.c | 2 +- include/d3d.h | 16 +++++++++------- include/ddraw.h | 32 +++++++++++++++++++------------- 4 files changed, 31 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1216eb577b1a6f8f82ce9…

1 0

Henri Verbeet : ddraw: Avoid LPDIRECTDRAWSURFACE4.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 5190792b333738d176b9937bd8df6edb9d8e0902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5190792b333738d176b9937bd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:31 2012 +0100 ddraw: Avoid LPDIRECTDRAWSURFACE4. --- dlls/ddraw/tests/dsurface.c | 4 ++-- include/d3d.h | 11 ++++++----- include/ddraw.h | 32 +++++++++++++++++++------------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 4e7d505..513183f 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -901,8 +901,8 @@ static void GetDDInterface_2(void) static void GetDDInterface_4(void) { + IDirectDrawSurface4 *dsurface4; LPDIRECTDRAWSURFACE2 dsurface2; - LPDIRECTDRAWSURFACE4 dsurface4; DDSURFACEDESC2 surface; HRESULT ret; IDirectDraw2 *dd2; @@ -973,7 +973,7 @@ static void GetDDInterface_4(void) static void GetDDInterface_7(void) { IDirectDrawSurface7 *dsurface7; - LPDIRECTDRAWSURFACE4 dsurface4; + IDirectDrawSurface4 *dsurface4; DDSURFACEDESC2 surface; HRESULT ret; IDirectDraw2 *dd2; diff --git a/include/d3d.h b/include/d3d.h index 5677f6a..98a45ba 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -310,7 +310,8 @@ DECLARE_INTERFACE_(IDirect3D3,IUnknown) STDMETHOD(CreateMaterial)(THIS_ LPDIRECT3DMATERIAL3 *lplpDirect3DMaterial3, IUnknown *pUnkOuter) PURE; STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpD3DViewport3, IUnknown *pUnkOuter) PURE; STDMETHOD(FindDevice)(THIS_ LPD3DFINDDEVICESEARCH lpD3DDFS, LPD3DFINDDEVICERESULT lpD3DFDR) PURE; - STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid,LPDIRECTDRAWSURFACE4 lpDDS, LPDIRECT3DDEVICE3 *lplpD3DDevice3,LPUNKNOWN lpUnk) PURE; + STDMETHOD(CreateDevice)(THIS_ REFCLSID rclsid, IDirectDrawSurface4 *surface, + struct IDirect3DDevice3 **device, IUnknown *outer) PURE; STDMETHOD(CreateVertexBuffer)(THIS_ LPD3DVERTEXBUFFERDESC lpD3DVertBufDesc,LPDIRECT3DVERTEXBUFFER *lplpD3DVertBuf,DWORD dwFlags,LPUNKNOWN lpUnk) PURE; STDMETHOD(EnumZBufferFormats)(THIS_ REFCLSID riidDevice,LPD3DENUMPIXELFORMATSCALLBACK lpEnumCallback,LPVOID lpContext) PURE; STDMETHOD(EvictManagedTextures)(THIS) PURE; @@ -809,8 +810,8 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(GetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; STDMETHOD(SetViewport2)(THIS_ LPD3DVIEWPORT2 lpData) PURE; /*** IDirect3DViewport3 methods ***/ - STDMETHOD(SetBackgroundDepth2)(THIS_ LPDIRECTDRAWSURFACE4 lpDDS) PURE; - STDMETHOD(GetBackgroundDepth2)(THIS_ LPDIRECTDRAWSURFACE4 *lplpDDS,LPBOOL lpValid) PURE; + STDMETHOD(SetBackgroundDepth2)(THIS_ IDirectDrawSurface4 *surface) PURE; + STDMETHOD(GetBackgroundDepth2)(THIS_ IDirectDrawSurface4 **surface, BOOL *valid) PURE; STDMETHOD(Clear2)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,DWORD dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE; }; #undef INTERFACE @@ -1149,8 +1150,8 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) /*** DrawPrimitive API ***/ STDMETHOD(SetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT3 lpDirect3DViewport3) PURE; STDMETHOD(GetCurrentViewport)(THIS_ LPDIRECT3DVIEWPORT3 *lplpDirect3DViewport3) PURE; - STDMETHOD(SetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE4 lpNewRenderTarget, DWORD dwFlags) PURE; - STDMETHOD(GetRenderTarget)(THIS_ LPDIRECTDRAWSURFACE4 *lplpRenderTarget) PURE; + STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface4 *surface, DWORD flags) PURE; + STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface4 **surface) PURE; STDMETHOD(Begin)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD dwVertexTypeDesc, DWORD dwFlags) PURE; STDMETHOD(BeginIndexed)(THIS_ D3DPRIMITIVETYPE d3dptPrimitiveType,DWORD d3dvtVertexType, LPVOID lpvVertices, DWORD dwNumVertices, DWORD dwFlags) PURE; STDMETHOD(Vertex)(THIS_ LPVOID lpVertexType) PURE; diff --git a/include/ddraw.h b/include/ddraw.h index b6333c7..88660ba 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1061,7 +1061,8 @@ DECL_WINELIB_TYPE_AW(LPDDENUMCALLBACK) typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK)(LPDDSURFACEDESC, LPVOID); typedef HRESULT (CALLBACK *LPDDENUMMODESCALLBACK2)(LPDDSURFACEDESC2, LPVOID); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK)(LPDIRECTDRAWSURFACE, LPDDSURFACEDESC, LPVOID); -typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(LPDIRECTDRAWSURFACE4, LPDDSURFACEDESC2, LPVOID); +typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK2)(struct IDirectDrawSurface4 *surface, + DDSURFACEDESC2 *surface_desc, void *ctx); typedef HRESULT (CALLBACK *LPDDENUMSURFACESCALLBACK7)(struct IDirectDrawSurface7 *surface, DDSURFACEDESC2 *surface_desc, void *ctx); @@ -1625,15 +1626,17 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) /*0c*/ STDMETHOD(Compact)(THIS) PURE; /*10*/ STDMETHOD(CreateClipper)(THIS_ DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, IUnknown *pUnkOuter) PURE; /*14*/ STDMETHOD(CreatePalette)(THIS_ DWORD dwFlags, LPPALETTEENTRY lpColorTable, LPDIRECTDRAWPALETTE *lplpDDPalette, IUnknown *pUnkOuter) PURE; -/*18*/ STDMETHOD(CreateSurface)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc, LPDIRECTDRAWSURFACE4 *lplpDDSurface, IUnknown *pUnkOuter) PURE; -/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurface, LPDIRECTDRAWSURFACE4 *lplpDupDDSurface) PURE; +/*18*/ STDMETHOD(CreateSurface)(THIS_ DDSURFACEDESC2 *surface_desc, + struct IDirectDrawSurface4 **surface, IUnknown *outer) PURE; +/*1c*/ STDMETHOD(DuplicateSurface)(THIS_ struct IDirectDrawSurface4 *src_surface, + struct IDirectDrawSurface4 **dst_surface) PURE; /*20*/ STDMETHOD(EnumDisplayModes)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSurfaceDesc, LPVOID lpContext, LPDDENUMMODESCALLBACK2 lpEnumModesCallback) PURE; /*24*/ STDMETHOD(EnumSurfaces)(THIS_ DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; /*28*/ STDMETHOD(FlipToGDISurface)(THIS) PURE; /*2c*/ STDMETHOD(GetCaps)(THIS_ LPDDCAPS lpDDDriverCaps, LPDDCAPS lpDDHELCaps) PURE; /*30*/ STDMETHOD(GetDisplayMode)(THIS_ LPDDSURFACEDESC2 lpDDSurfaceDesc) PURE; /*34*/ STDMETHOD(GetFourCCCodes)(THIS_ LPDWORD lpNumCodes, LPDWORD lpCodes) PURE; -/*38*/ STDMETHOD(GetGDISurface)(THIS_ LPDIRECTDRAWSURFACE4 *lplpGDIDDSurface) PURE; +/*38*/ STDMETHOD(GetGDISurface)(THIS_ struct IDirectDrawSurface4 **surface) PURE; /*3c*/ STDMETHOD(GetMonitorFrequency)(THIS_ LPDWORD lpdwFrequency) PURE; /*40*/ STDMETHOD(GetScanLine)(THIS_ LPDWORD lpdwScanLine) PURE; /*44*/ STDMETHOD(GetVerticalBlankStatus)(THIS_ BOOL *lpbIsInVB) PURE; @@ -1645,7 +1648,7 @@ DECLARE_INTERFACE_(IDirectDraw4,IUnknown) /* added in v2 */ /*5c*/ STDMETHOD(GetAvailableVidMem)(THIS_ LPDDSCAPS2 lpDDCaps, LPDWORD lpdwTotal, LPDWORD lpdwFree) PURE; /* added in v4 */ -/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC hdc, LPDIRECTDRAWSURFACE4 *pSurf) PURE; +/*60*/ STDMETHOD(GetSurfaceFromDC)(THIS_ HDC dc, struct IDirectDrawSurface4 **surface) PURE; /*64*/ STDMETHOD(RestoreAllSurfaces)(THIS) PURE; /*68*/ STDMETHOD(TestCooperativeLevel)(THIS) PURE; /*6c*/ STDMETHOD(GetDeviceIdentifier)(THIS_ LPDDDEVICEIDENTIFIER pDDDI, DWORD dwFlags) PURE; @@ -2278,16 +2281,18 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirectDrawSurface4 methods ***/ - STDMETHOD(AddAttachedSurface)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; + STDMETHOD(AddAttachedSurface)(THIS_ IDirectDrawSurface4 *attachment) PURE; STDMETHOD(AddOverlayDirtyRect)(THIS_ LPRECT lpRect) PURE; - STDMETHOD(Blt)(THIS_ LPRECT lpDestRect, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwFlags, LPDDBLTFX lpDDBltFx) PURE; + STDMETHOD(Blt)(THIS_ RECT *dst_rect, IDirectDrawSurface4 *src_surface, RECT *src_rect, + DWORD flags, DDBLTFX *fx) PURE; STDMETHOD(BltBatch)(THIS_ LPDDBLTBATCH lpDDBltBatch, DWORD dwCount, DWORD dwFlags) PURE; - STDMETHOD(BltFast)(THIS_ DWORD dwX, DWORD dwY, LPDIRECTDRAWSURFACE4 lpDDSrcSurface, LPRECT lpSrcRect, DWORD dwTrans) PURE; - STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSAttachedSurface) PURE; + STDMETHOD(BltFast)(THIS_ DWORD x, DWORD y, IDirectDrawSurface4 *src_surface, + RECT *src_rect, DWORD flags) PURE; + STDMETHOD(DeleteAttachedSurface)(THIS_ DWORD flags, IDirectDrawSurface4 *attachment) PURE; STDMETHOD(EnumAttachedSurfaces)(THIS_ LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpEnumSurfacesCallback) PURE; STDMETHOD(EnumOverlayZOrders)(THIS_ DWORD dwFlags, LPVOID lpContext, LPDDENUMSURFACESCALLBACK2 lpfnCallback) PURE; - STDMETHOD(Flip)(THIS_ LPDIRECTDRAWSURFACE4 lpDDSurfaceTargetOverride, DWORD dwFlags) PURE; - STDMETHOD(GetAttachedSurface)(THIS_ LPDDSCAPS2 lpDDSCaps, LPDIRECTDRAWSURFACE4 *lplpDDAttachedSurface) PURE; + STDMETHOD(Flip)(THIS_ IDirectDrawSurface4 *dst_surface, DWORD flags) PURE; + STDMETHOD(GetAttachedSurface)(THIS_ DDSCAPS2 *caps, IDirectDrawSurface4 **attachment) PURE; STDMETHOD(GetBltStatus)(THIS_ DWORD dwFlags) PURE; STDMETHOD(GetCaps)(THIS_ LPDDSCAPS2 lpDDSCaps) PURE; STDMETHOD(GetClipper)(THIS_ LPDIRECTDRAWCLIPPER *lplpDDClipper) PURE; @@ -2308,9 +2313,10 @@ DECLARE_INTERFACE_(IDirectDrawSurface4,IUnknown) STDMETHOD(SetOverlayPosition)(THIS_ LONG lX, LONG lY) PURE; STDMETHOD(SetPalette)(THIS_ LPDIRECTDRAWPALETTE lpDDPalette) PURE; STDMETHOD(Unlock)(THIS_ LPRECT lpSurfaceData) PURE; - STDMETHOD(UpdateOverlay)(THIS_ LPRECT lpSrcRect, LPDIRECTDRAWSURFACE4 lpDDDestSurface, LPRECT lpDestRect, DWORD dwFlags, LPDDOVERLAYFX lpDDOverlayFx) PURE; + STDMETHOD(UpdateOverlay)(THIS_ RECT *src_rect, IDirectDrawSurface4 *dst_surface, RECT *dst_rect, + DWORD flags, DDOVERLAYFX *fx) PURE; STDMETHOD(UpdateOverlayDisplay)(THIS_ DWORD dwFlags) PURE; - STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD dwFlags, LPDIRECTDRAWSURFACE4 lpDDSReference) PURE; + STDMETHOD(UpdateOverlayZOrder)(THIS_ DWORD flags, IDirectDrawSurface4 *reference_surface) PURE; /* added in v2 */ STDMETHOD(GetDDInterface)(THIS_ LPVOID *lplpDD) PURE; STDMETHOD(PageLock)(THIS_ DWORD dwFlags) PURE;

1 0

Henri Verbeet : wined3d: Simplify shader selection.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: d74cb4571b0d3301568efef3d4de3fb30e19625c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74cb4571b0d3301568efef3d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:32 2012 +0100 wined3d: Simplify shader selection. --- dlls/wined3d/arb_program_shader.c | 45 +++++------------------- dlls/wined3d/ati_fragment_shader.c | 12 +----- dlls/wined3d/context.c | 17 +++++++-- dlls/wined3d/state.c | 67 +++++++----------------------------- dlls/wined3d/wined3d_private.h | 32 +++++++++-------- 5 files changed, 56 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d74cb4571b0d3301568ef…

1 0

Henri Verbeet : wined3d: Enable or disable the fragment pipe in shader_select().
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 0e856abf6da1f9d4c40fd0d08ad395112525ff4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e856abf6da1f9d4c40fd0d08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 4 19:51:33 2012 +0100 wined3d: Enable or disable the fragment pipe in shader_select(). --- dlls/wined3d/arb_program_shader.c | 49 +++++++++++++++++++----------------- dlls/wined3d/context.c | 33 +++++++------------------ dlls/wined3d/glsl_shader.c | 17 ++++-------- dlls/wined3d/shader.c | 20 +++++++------- dlls/wined3d/wined3d_private.h | 11 +++++++- 5 files changed, 60 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e856abf6da1f9d4c40fd…

1 0

Daniel Lehman : msvcp90: Use streambuf sgetc/snextc in std::getline(istream <> &).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 89cde281d46dbdd54eeef913b82b0dff3ebc6d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89cde281d46dbdd54eeef913b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Oct 1 11:00:59 2012 -0700 msvcp90: Use streambuf sgetc/snextc in std::getline(istream<> &). --- dlls/msvcp90/ios.c | 40 ++++++++-------- dlls/msvcp90/tests/ios.c | 112 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 131 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89cde281d46dbdd54eeef…

1 0

Daniel Lehman : msvcp: Sync std::getline(istream<> &) implementations.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 22c254c3ec4c88719c51834251e61945cc3dd5d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c254c3ec4c88719c5183425… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Nov 2 11:27:12 2012 -0700 msvcp: Sync std::getline(istream<> &) implementations. --- dlls/msvcp60/ios.c | 40 ++++++++++++++++++++-------------------- dlls/msvcp71/ios.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index bd3eb7d..946afa5 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7767,27 +7767,27 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char *istream, basic_string_char *str, char delim) { - IOSB_iostate state = IOSTATE_failbit; + basic_ios_char *base = basic_istream_char_get_basic_ios(istream); + IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; TRACE("(%p %p %c)\n", istream, str, delim); if(basic_istream_char_sentry_create(istream, TRUE)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); basic_string_char_clear(str); - c = basic_istream_char_get(istream); - if(c != EOF) - state = IOSTATE_goodbit; - - for(; c!=(unsigned char)delim && c!=EOF; c = basic_istream_char_get(istream)) { - state = IOSTATE_goodbit; + c = basic_streambuf_char_sgetc(strbuf); + for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf)) basic_string_char_append_ch(str, c); - } + if(c==EOF) state |= IOSTATE_eofbit; + else if(c==(unsigned char)delim) basic_streambuf_char_sbumpc(strbuf); + + if(!basic_string_char_length(str) && c!=(unsigned char)delim) state |= IOSTATE_failbit; } basic_istream_char_sentry_destroy(istream); - basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), - state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state); return istream; } @@ -9078,27 +9078,27 @@ basic_istream_wchar* __thiscall basic_istream_short_read_bool(basic_istream_wcha basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( basic_istream_wchar *istream, basic_string_wchar *str, wchar_t delim) { - IOSB_iostate state = IOSTATE_failbit; + basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); + IOSB_iostate state = IOSTATE_goodbit; int c = delim; TRACE("(%p %p %c)\n", istream, str, delim); if(basic_istream_wchar_sentry_create(istream, TRUE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); basic_string_wchar_clear(str); - c = basic_istream_wchar_get(istream); - if(c != WEOF) - state = IOSTATE_goodbit; - - for(; c!=delim && c!=WEOF; c = basic_istream_wchar_get(istream)) { - state = IOSTATE_goodbit; + c = basic_streambuf_wchar_sgetc(strbuf); + for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf)) basic_string_wchar_append_ch(str, c); - } + if(c==delim) basic_streambuf_wchar_sbumpc(strbuf); + else if(c==WEOF) state |= IOSTATE_eofbit; + + if(!basic_string_wchar_length(str) && c!=delim) state |= IOSTATE_failbit; } basic_istream_wchar_sentry_destroy(istream); - basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), - state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), state); return istream; } diff --git a/dlls/msvcp71/ios.c b/dlls/msvcp71/ios.c index fff2abc..95037e9 100644 --- a/dlls/msvcp71/ios.c +++ b/dlls/msvcp71/ios.c @@ -8108,27 +8108,27 @@ basic_istream_char* __thiscall basic_istream_char_read_bool(basic_istream_char * basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( basic_istream_char *istream, basic_string_char *str, char delim) { - IOSB_iostate state = IOSTATE_failbit; + basic_ios_char *base = basic_istream_char_get_basic_ios(istream); + IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; TRACE("(%p %p %c)\n", istream, str, delim); if(basic_istream_char_sentry_create(istream, TRUE)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); MSVCP_basic_string_char_clear(str); - c = basic_istream_char_get(istream); - if(c != EOF) - state = IOSTATE_goodbit; - - for(; c!=(unsigned char)delim && c!=EOF; c = basic_istream_char_get(istream)) { - state = IOSTATE_goodbit; + c = basic_streambuf_char_sgetc(strbuf); + for(; c!=(unsigned char)delim && c!=EOF; c = basic_streambuf_char_snextc(strbuf)) MSVCP_basic_string_char_append_ch(str, c); - } + if(c==EOF) state |= IOSTATE_eofbit; + else if(c==(unsigned char)delim) basic_streambuf_char_sbumpc(strbuf); + + if(!MSVCP_basic_string_char_length(str) && c!=(unsigned char)delim) state |= IOSTATE_failbit; } basic_istream_char_sentry_destroy(istream); - basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), - state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + basic_ios_char_setstate(basic_istream_char_get_basic_ios(istream), state); return istream; } @@ -9573,27 +9573,27 @@ basic_istream_wchar* __thiscall basic_istream_short_read_bool(basic_istream_wcha basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( basic_istream_wchar *istream, basic_string_wchar *str, wchar_t delim) { - IOSB_iostate state = IOSTATE_failbit; + basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(istream); + IOSB_iostate state = IOSTATE_goodbit; int c = delim; TRACE("(%p %p %c)\n", istream, str, delim); if(basic_istream_wchar_sentry_create(istream, TRUE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); MSVCP_basic_string_wchar_clear(str); - c = basic_istream_wchar_get(istream); - if(c != WEOF) - state = IOSTATE_goodbit; - - for(; c!=delim && c!=WEOF; c = basic_istream_wchar_get(istream)) { - state = IOSTATE_goodbit; + c = basic_streambuf_wchar_sgetc(strbuf); + for(; c!=delim && c!=WEOF; c = basic_streambuf_wchar_snextc(strbuf)) MSVCP_basic_string_wchar_append_ch(str, c); - } + if(c==delim) basic_streambuf_wchar_sbumpc(strbuf); + else if(c==WEOF) state |= IOSTATE_eofbit; + + if(!MSVCP_basic_string_wchar_length(str) && c!=delim) state |= IOSTATE_failbit; } basic_istream_wchar_sentry_destroy(istream); - basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), - state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); + basic_ios_wchar_setstate(basic_istream_wchar_get_basic_ios(istream), state); return istream; }

1 0

André Hentschel : winex11: Avoid memory leaks ( coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 574cf27f2afd676fb90087be1c0bd6967c1ca160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574cf27f2afd676fb90087be1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:25:45 2012 +0100 winex11: Avoid memory leaks (coverity). --- dlls/winex11.drv/clipboard.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index bd3ef7b..e2f5b12 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1370,6 +1370,8 @@ static HANDLE X11DRV_CLIPBOARD_ImportXAPIXMAP(Display *display, Window w, Atom p } if (bits.free) bits.free( &bits ); } + + HeapFree(GetProcessHeap(), 0, lpdata); } return hClipData; @@ -1489,7 +1491,10 @@ static HANDLE X11DRV_CLIPBOARD_ImportClipboardData(Display *display, Window w, A /* Turn on the DDESHARE flag to enable shared 32 bit memory */ hClipData = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbytes); if (hClipData == 0) + { + HeapFree(GetProcessHeap(), 0, lpdata); return NULL; + } if ((lpClipData = GlobalLock(hClipData))) {

1 0

André Hentschel : riched20: Remove duplicate operand in expression (coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 34f74fdc7182006d69e5971b1f8ca0f7b78f571f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f74fdc7182006d69e5971b1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:25:52 2012 +0100 riched20: Remove duplicate operand in expression (coverity). --- dlls/riched20/writer.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index a5e5d50..653eab6 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -251,11 +251,8 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, } while (item); item = ME_GetParagraph(pFirstRun); do { - if (item->member.para.pCell && item->member.para.pCell) + if ((pCell = item->member.para.pCell)) { - pCell = item->member.para.pCell; - if (pCell) - { ME_Border* borders[4] = { &pCell->member.cell.border.top, &pCell->member.cell.border.left, &pCell->member.cell.border.bottom, @@ -275,7 +272,6 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, } } } - } } if (item == pLastPara) break;

1 0

André Hentschel : urlmon: Fix copy and paste error ( coverity).
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 93936c4f9986eb411168402288f072632a469c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=93936c4f9986eb41116840228… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Nov 3 17:26:03 2012 +0100 urlmon: Fix copy and paste error (coverity). --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 18e2ebb..0a68b43 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -272,7 +272,7 @@ static inline BOOL is_drive_path(const WCHAR *str) { } static inline BOOL is_unc_path(const WCHAR *str) { - return (str[0] == '\\' && str[0] == '\\'); + return (str[0] == '\\' && str[1] == '\\'); } static inline BOOL is_forbidden_dos_path_char(WCHAR val) {

1 0