wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Frédéric Delanoy : msvfw32: Fix a leak (coverity) .
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 86544ce98f90cbd8ef504ea63c0bf50063bf7364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86544ce98f90cbd8ef504ea63… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 2 23:49:29 2012 +0100 msvfw32: Fix a leak (coverity). --- dlls/msvfw32/msvideo_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index f27d3ec..f418481 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1512,7 +1512,10 @@ static BOOL GetFileNamePreview(LPVOID lpofn,BOOL bSave,BOOL bUnicode) fnGetFileName = (LPVOID)GetProcAddress(hComdlg32, szFunctionName); if (fnGetFileName == NULL) + { + FreeLibrary(hComdlg32); return FALSE; + } /* FIXME: need to add OFN_ENABLEHOOK and our own handler */ ret = fnGetFileName(lpofn);

1 0

Christian Costa : d3dxof/tests: Pass level by value in process_data rather than a pointer.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 6be32ec80c0a3561bb2705a6e3bc707de11adee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6be32ec80c0a3561bb2705a6e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:47:06 2012 +0100 d3dxof/tests: Pass level by value in process_data rather than a pointer. --- dlls/d3dxof/tests/d3dxof.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 9ff76b2..e25b4ab 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -613,7 +613,7 @@ static void test_syntax(void) * only one string in a sub-object (very common). Use with care, this may lead to a crash. */ #define EXPAND_STRING 0 -static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) +static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int level) { HRESULT hr; char name[100]; @@ -636,7 +636,7 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK, "IDirectXFileData_GetType: %x\n", hr); hr = IDirectXFileData_GetData(lpDirectXFileData, NULL, &size, (void**)&pData); ok(hr == DXFILE_OK, "IDirectXFileData_GetData: %x\n", hr); - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); debugstr_guid(str_clsid, &clsid); debugstr_guid(str_clsid_type, clsid_type); @@ -657,7 +657,9 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) } printf("\n"); } - (*plevel)++; + + level++; + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(lpDirectXFileData, &pChildObj))) { LPDIRECTXFILEDATA p1; @@ -668,17 +670,17 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileData, (void **) &p1); if (SUCCEEDED(hr)) { - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Data (%d)\n", j); - process_data(p1, plevel); + process_data(p1, level); IDirectXFileData_Release(p1); } hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileDataReference, (void **) &p2); if (SUCCEEDED(hr)) { LPDIRECTXFILEDATA pfdo; - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Data Reference (%d)\n", j); #if 0 @@ -688,21 +690,21 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); #endif IDirectXFileDataReference_Resolve(p2, &pfdo); - process_data(pfdo, plevel); + process_data(pfdo, level); IDirectXFileData_Release(pfdo); IDirectXFileDataReference_Release(p2); } hr = IDirectXFileObject_QueryInterface(pChildObj, &IID_IDirectXFileBinary, (void **) &p3); if (SUCCEEDED(hr)) { - for (i = 0; i < *plevel; i++) + for (i = 0; i < level; i++) printf(" "); printf("Found Binary (%d)\n", j); IDirectXFileBinary_Release(p3); } IDirectXFileObject_Release(pChildObj); } - (*plevel)--; + ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileData_GetNextObject: %x\n", hr); } @@ -761,9 +763,8 @@ static void test_dump(void) while (SUCCEEDED(hr = IDirectXFileEnumObject_GetNextDataObject(lpDirectXFileEnumObject, &lpDirectXFileData))) { - int level = 0; printf("\n"); - process_data(lpDirectXFileData, &level); + process_data(lpDirectXFileData, 0); IDirectXFileData_Release(lpDirectXFileData); } ok(hr == DXFILE_OK || hr == DXFILEERR_NOMOREOBJECTS, "IDirectXFileEnumObject_GetNextDataObject: %x\n", hr);

1 0

Christian Costa : dmusic: Init port caps dwSize member before calling GetPortCaps.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f3e883878d8bfb6efc128293a461df8aa089e228 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e883878d8bfb6efc128293a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:46:13 2012 +0100 dmusic: Init port caps dwSize member before calling GetPortCaps. --- dlls/dmusic/dmusic.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index d914ce4..bdefe3a 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -389,6 +389,7 @@ static void create_system_ports_list(IDirectMusic8Impl* object) hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); if (SUCCEEDED(hr)) { + port->caps.dwSize = sizeof(port->caps); hr = IDirectMusicSynth8_GetPortCaps(synth, &port->caps); IDirectMusicSynth8_Release(synth); }

1 0

Christian Costa : dmusic: Remove unused variables.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: f7a9df5ecbc9d398d43ebda68ef99991cf2da3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a9df5ecbc9d398d43ebda68… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Nov 5 09:46:45 2012 +0100 dmusic: Remove unused variables. --- dlls/dmusic/collection.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index c1545b2..e4ac798 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -489,7 +489,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; + DWORD StreamSize, StreamCount, ListSize[2], ListCount[2]; LARGE_INTEGER liMove; /* used when skipping chunks */ ULARGE_INTEGER dlibCollectionPosition, dlibInstrumentPosition, dlibWavePoolPosition; @@ -689,8 +689,6 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST case FOURCC_LIST: { IStream_Read(stream, &chunk.fccID, sizeof(FOURCC), NULL); TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(chunk.fccID)); - ListSize[2] = chunk.dwSize - sizeof(FOURCC); - ListCount[2] = 0; switch (chunk.fccID) { default: { TRACE_(dmfile)(": unknown (skipping)\n");

1 0

Ken Thomases : opengl32: Don't lose __wine_set_pixel_format() declaration during make_opengl.
by Alexandre Julliard 05 Nov '12

05 Nov '12

Module: wine Branch: master Commit: 26670de2107ebe2c59711b52e74426acf96c85c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26670de2107ebe2c59711b52e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Nov 4 17:28:51 2012 -0600 opengl32: Don't lose __wine_set_pixel_format() declaration during make_opengl. --- dlls/opengl32/make_opengl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 0651904..bd230b2 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -821,7 +821,8 @@ foreach (sort keys %norm_functions) } print HEADER "\n\n"; -print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n\n"; +print HEADER "extern struct opengl_funcs * CDECL __wine_get_wgl_driver( HDC hdc, UINT version );\n"; +print HEADER "extern BOOL CDECL __wine_set_pixel_format( HWND hwnd, int format );\n\n"; print HEADER "#endif /* __WINE_WGL_DRIVER_H */\n"; close HEADER;

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

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 : 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 : 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 : 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

← Newer
1
...
61
62
63
64
65
66
67
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012