wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

Dmitry Timoshkov : mountmgr.sys: Add a missing entry for DEVICE_DVD to match mountmgr.h enumeration types.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: aa96c58db5628c6da93a05b4d796a4e64cccf5c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa96c58db5628c6da93a05b4d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 18 12:39:11 2013 +0900 mountmgr.sys: Add a missing entry for DEVICE_DVD to match mountmgr.h enumeration types. --- dlls/mountmgr.sys/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8367cba..005ec5e 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -48,6 +48,7 @@ static const WCHAR drive_types[][8] = {'h','d',0}, /* DEVICE_HARDDISK_VOL */ {'f','l','o','p','p','y',0}, /* DEVICE_FLOPPY */ {'c','d','r','o','m',0}, /* DEVICE_CDROM */ + {'c','d','r','o','m',0}, /* DEVICE_DVD */ {'n','e','t','w','o','r','k',0}, /* DEVICE_NETWORK */ {'r','a','m','d','i','s','k',0} /* DEVICE_RAMDISK */ };

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMDEVICE3.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 2c557b9b5f8bab5b50479ebd33383787a8cac2b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c557b9b5f8bab5b50479ebd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:15 2013 +0200 d3drm: Avoid LPDIRECT3DRMDEVICE3. --- dlls/d3drm/d3drm.c | 25 +++++++++---------------- dlls/d3drm/viewport.c | 19 ++++++------------- include/d3drm.h | 6 +++--- include/d3drmobj.h | 6 +++--- 4 files changed, 21 insertions(+), 35 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 719a438..94628b1 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1040,14 +1040,12 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateMaterial(IDirect3DRM3* iface, D3DVA return ret; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3* iface, DWORD width, DWORD height, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDevice(IDirect3DRM3 *iface, + DWORD width, DWORD height, IDirect3DRMDevice3 **device) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%d,%d,%p): partial stub\n", iface, This, width, height, device); + FIXME("iface %p, width %u, height %u, device %p partial stub!\n", iface, width, height, device); - return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); + return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown **)device); } static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromSurface(IDirect3DRM3 *iface, GUID *pGUID, @@ -1106,18 +1104,13 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateTextureFromSurface(IDirect3DRM3 *if return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateViewport(IDirect3DRM3* iface, - LPDIRECT3DRMDEVICE3 Device, - LPDIRECT3DRMFRAME3 frame, DWORD xpos, - DWORD ypos, DWORD width, DWORD height, - LPDIRECT3DRMVIEWPORT2* viewport) +static HRESULT WINAPI IDirect3DRM3Impl_CreateViewport(IDirect3DRM3 *iface, IDirect3DRMDevice3 *device, + IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p,%p,%d,%d,%d,%d,%p): stub\n", iface, This, Device, frame, xpos, ypos, width, - height, viewport); + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u, viewport %p partial stub!\n", + iface, device, camera, x, y, width, height, viewport); - return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown**)viewport); + return Direct3DRMViewport_create(&IID_IDirect3DRMViewport2, (IUnknown **)viewport); } static HRESULT WINAPI IDirect3DRM3Impl_CreateWrap(IDirect3DRM3* iface, D3DRMWRAPTYPE type, diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 007fd07..859edcc 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -607,15 +607,11 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetClassName(IDirect3DRMViewport2 } /*** IDirect3DRMViewport methods ***/ -static HRESULT WINAPI IDirect3DRMViewport2Impl_Init(IDirect3DRMViewport2* iface, - LPDIRECT3DRMDEVICE3 dev, LPDIRECT3DRMFRAME3 camera, - DWORD xpos, DWORD ypos, - DWORD width, DWORD height) +static HRESULT WINAPI IDirect3DRMViewport2Impl_Init(IDirect3DRMViewport2 *iface, IDirect3DRMDevice3 *device, + IDirect3DRMFrame3 *camera, DWORD x, DWORD y, DWORD width, DWORD height) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%p, %p, %u, %u, %u, %u): stub\n", iface, This, dev, camera, - xpos, ypos, width, height); + FIXME("iface %p, device %p, camera %p, x %u, y %u, width %u, height %u stub!\n", + iface, device, camera, x, y, width, height); return E_NOTIMPL; } @@ -764,12 +760,9 @@ static HRESULT WINAPI IDirect3DRMViewport2Impl_GetCamera(IDirect3DRMViewport2* i return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDevice(IDirect3DRMViewport2* iface, - LPDIRECT3DRMDEVICE3 * device) +static HRESULT WINAPI IDirect3DRMViewport2Impl_GetDevice(IDirect3DRMViewport2 *iface, IDirect3DRMDevice3 **device) { - IDirect3DRMViewportImpl *This = impl_from_IDirect3DRMViewport2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, device); + FIXME("iface %p, device %p stub!\n", iface, device); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index b140efb..da88dab 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -343,7 +343,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL2 *) PURE; - STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDevice)(THIS_ DWORD width, DWORD height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, @@ -354,8 +354,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) IDirect3DRMTexture3 **texture) PURE; STDMETHOD(CreateShadow)(THIS_ LPUNKNOWN, LPDIRECT3DRMLIGHT, D3DVALUE px, D3DVALUE py, D3DVALUE pz, D3DVALUE nx, D3DVALUE ny, D3DVALUE nz, LPDIRECT3DRMSHADOW2 *) PURE; - STDMETHOD(CreateViewport)(THIS_ LPDIRECT3DRMDEVICE3, LPDIRECT3DRMFRAME3, DWORD, DWORD, DWORD, DWORD, - LPDIRECT3DRMVIEWPORT2 *) PURE; + STDMETHOD(CreateViewport)(THIS_ IDirect3DRMDevice3 *device, IDirect3DRMFrame3 *camera, + DWORD x, DWORD y, DWORD width, DWORD height, IDirect3DRMViewport2 **viewport) PURE; STDMETHOD(CreateWrap)(THIS_ D3DRMWRAPTYPE, LPDIRECT3DRMFRAME3, D3DVALUE ox, D3DVALUE oy, D3DVALUE oz, D3DVALUE dx, D3DVALUE dy, D3DVALUE dz, D3DVALUE ux, D3DVALUE uy, D3DVALUE uz, D3DVALUE ou, D3DVALUE ov, D3DVALUE su, D3DVALUE sv, LPDIRECT3DRMWRAP *) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index a3676d3..fa3559e 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -948,8 +948,8 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMViewport2 methods ***/ - STDMETHOD(Init) (THIS_ LPDIRECT3DRMDEVICE3 dev, LPDIRECT3DRMFRAME3 camera, DWORD xpos, DWORD ypos, - DWORD width, DWORD height) PURE; + STDMETHOD(Init) (THIS_ IDirect3DRMDevice3 *device, struct IDirect3DRMFrame3 *camera, + DWORD x, DWORD y, DWORD width, DWORD height) PURE; STDMETHOD(Clear)(THIS_ DWORD flags) PURE; STDMETHOD(Render)(THIS_ LPDIRECT3DRMFRAME3) PURE; STDMETHOD(SetFront)(THIS_ D3DVALUE) PURE; @@ -964,7 +964,7 @@ DECLARE_INTERFACE_(IDirect3DRMViewport2,IDirect3DRMObject) STDMETHOD(ForceUpdate)(THIS_ DWORD x1, DWORD y1, DWORD x2, DWORD y2) PURE; STDMETHOD(SetPlane)(THIS_ D3DVALUE left, D3DVALUE right, D3DVALUE bottom, D3DVALUE top) PURE; STDMETHOD(GetCamera)(THIS_ LPDIRECT3DRMFRAME3 *) PURE; - STDMETHOD(GetDevice)(THIS_ LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(GetDevice)(THIS_ IDirect3DRMDevice3 **device) PURE; STDMETHOD(GetPlane)(THIS_ D3DVALUE *left, D3DVALUE *right, D3DVALUE *bottom, D3DVALUE *top) PURE; STDMETHOD(Pick)(THIS_ LONG x, LONG y, LPDIRECT3DRMPICKEDARRAY *return_visuals) PURE; STDMETHOD_(BOOL, GetUniformScaling)(THIS) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMDEVICE2.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 00393fd804f2a1afddcca9aeb1f3987ab35b29ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=00393fd804f2a1afddcca9aeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:14 2013 +0200 d3drm: Avoid LPDIRECT3DRMDEVICE2. --- dlls/d3drm/d3drm.c | 10 ++++------ include/d3drm.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 4356041..719a438 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -606,14 +606,12 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateMaterial(IDirect3DRM2* iface, D3DVA return IDirect3DRM3_CreateMaterial(&This->IDirect3DRM3_iface, power, (LPDIRECT3DRMMATERIAL2*)material); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2* iface, DWORD width, DWORD height, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDevice(IDirect3DRM2 *iface, + DWORD width, DWORD height, IDirect3DRMDevice2 **device) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%u,%u,%p): partial stub\n", iface, This, width, height, ppDevice); + FIXME("iface %p, width %u, height %u, device %p.\n", iface, width, height, device); - return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); + return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown **)device); } static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromSurface(IDirect3DRM2 *iface, GUID *pGUID, diff --git a/include/d3drm.h b/include/d3drm.h index b5e6815..b140efb 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -204,7 +204,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateLight)(THIS_ D3DRMLIGHTTYPE, D3DCOLOR, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateLightRGB)(THIS_ D3DRMLIGHTTYPE, D3DVALUE, D3DVALUE, D3DVALUE, LPDIRECT3DRMLIGHT *) PURE; STDMETHOD(CreateMaterial)(THIS_ D3DVALUE, LPDIRECT3DRMMATERIAL *) PURE; - STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDevice)(THIS_ DWORD width, DWORD height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device,

1 0

Henri Verbeet : wined3d: Simplify wined3d_check_device_format().
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 3004baeb62b576aab6580ad8c13b949169e52e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3004baeb62b576aab6580ad8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:13 2013 +0200 wined3d: Simplify wined3d_check_device_format(). --- dlls/wined3d/directx.c | 461 +++++++++++------------------------------------- 1 files changed, 102 insertions(+), 359 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3004baeb62b576aab6580…

1 0

Henri Verbeet : wined3d: Properly check if a format has a conversion function in wined3d_check_device_format ().
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: ff48c3ba588c8133265b5bdbe99462f03e0da95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff48c3ba588c8133265b5bdbe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:12 2013 +0200 wined3d: Properly check if a format has a conversion function in wined3d_check_device_format(). --- dlls/wined3d/directx.c | 45 +++++++++++---------------------------------- 1 files changed, 11 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3a97ae2..bb76fa6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3959,47 +3959,24 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad * it would be a big performance hit. Unless we hit an application * needing one of those formats, don't advertize them to avoid * leading applications into temptation. The windows drivers don't - * support most of those formats on volumes anyway, except for - * WINED3DFMT_R32_FLOAT. */ - switch (check_format_id) + * support most of those formats on volumes anyway. */ + if (format->convert) { - case WINED3DFMT_P8_UINT: - case WINED3DFMT_L4A4_UNORM: - case WINED3DFMT_R32_FLOAT: - case WINED3DFMT_R16_FLOAT: - case WINED3DFMT_R8G8_SNORM_L8X8_UNORM: - case WINED3DFMT_R5G5_SNORM_L6_UNORM: - case WINED3DFMT_R16G16_UNORM: - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - - case WINED3DFMT_R8G8B8A8_SNORM: - case WINED3DFMT_R16G16_SNORM: - if (!gl_info->supported[NV_TEXTURE_SHADER]) - { - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - } - break; - - case WINED3DFMT_R8G8_SNORM: - if (!gl_info->supported[NV_TEXTURE_SHADER]) - { - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - } - break; + TRACE("[FAILED] - No converted formats on volumes.\n"); + return WINED3DERR_NOTAVAILABLE; + } + /* The GL_EXT_texture_compression_s3tc spec requires that loading + * an s3tc compressed texture results in an error. While the D3D + * refrast does support s3tc volumes, at least the nvidia Windows + * driver does not, so we're free not to support this format. */ + switch (check_format_id) + { case WINED3DFMT_DXT1: case WINED3DFMT_DXT2: case WINED3DFMT_DXT3: case WINED3DFMT_DXT4: case WINED3DFMT_DXT5: - /* The GL_EXT_texture_compression_s3tc spec requires that - * loading an s3tc compressed texture results in an error. - * While the D3D refrast does support s3tc volumes, at - * least the nvidia windows driver does not, so we're free - * not to support this format. */ TRACE("[FAILED] - DXTn does not support 3D textures.\n"); return WINED3DERR_NOTAVAILABLE;

1 0

Henri Verbeet : wined3d: Add a performance warning for mapping a dynamic surface without WINED3D_MAP_DISCARD .
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 0e32c9a247d11c432a7360a185ce0734bfd6a08f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e32c9a247d11c432a7360a18… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 18 09:35:11 2013 +0200 wined3d: Add a performance warning for mapping a dynamic surface without WINED3D_MAP_DISCARD. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f7e99ab..e9c0b52 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -894,6 +894,9 @@ static void surface_map(struct wined3d_surface *surface, const RECT *rect, DWORD } else { + if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) + WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); + /* surface_load_location() does not check if the rectangle specifies * the full surface. Most callers don't need that, so do it here. */ if (rect && !rect->top && !rect->left

1 0

Detlef Riekenberg : gdiplus/tests: Add tests for GdipSetCustomLineCapWidthScale.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: fa5d09105124c122e52f96f0677371579e1d6a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5d09105124c122e52f96f06… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 17 22:41:42 2013 +0200 gdiplus/tests: Add tests for GdipSetCustomLineCapWidthScale. --- dlls/gdiplus/tests/customlinecap.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 218e46d..604589e 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -174,12 +174,45 @@ static void test_scale(void) expect(InvalidParameter, stat); stat = GdipGetCustomLineCapWidthScale(custom, NULL); expect(InvalidParameter, stat); - /* valid args */ + + stat = GdipSetCustomLineCapWidthScale(NULL, 2.0); + expect(InvalidParameter, stat); + + /* valid args: read default */ scale = (REAL)0xdeadbeef; stat = GdipGetCustomLineCapWidthScale(custom, &scale); expect(Ok, stat); expectf(1.0, scale); + /* set and read back some scale values: there is no limit for the scale */ + stat = GdipSetCustomLineCapWidthScale(custom, 2.5); + expect(Ok, stat); + scale = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapWidthScale(custom, &scale); + expect(Ok, stat); + expectf(2.5, scale); + + stat = GdipSetCustomLineCapWidthScale(custom, 42.0); + expect(Ok, stat); + scale = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapWidthScale(custom, &scale); + expect(Ok, stat); + expectf(42.0, scale); + + stat = GdipSetCustomLineCapWidthScale(custom, 3000.0); + expect(Ok, stat); + scale = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapWidthScale(custom, &scale); + expect(Ok, stat); + expectf(3000.0, scale); + + stat = GdipSetCustomLineCapWidthScale(custom, 0.0); + expect(Ok, stat); + scale = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapWidthScale(custom, &scale); + expect(Ok, stat); + expectf(0.0, scale); + GdipDeleteCustomLineCap(custom); GdipDeletePath(path); }

1 0

Detlef Riekenberg : gdiplus: Implement GdipSetCustomLineCapWidthScale.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: da7fe7ab5513a2db839aba413ebca07642c2b225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7fe7ab5513a2db839aba413… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 17 22:41:41 2013 +0200 gdiplus: Implement GdipSetCustomLineCapWidthScale. --- dlls/gdiplus/customlinecap.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 00c228b..597ac01 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -221,17 +221,16 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap* custom, return Ok; } -GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, - REAL width) +GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, REAL width) { - static int calls; - TRACE("(%p,%0.2f)\n", custom, width); - if(!(calls++)) - FIXME("not implemented\n"); + if(!custom) + return InvalidParameter; - return NotImplemented; + custom->scale = width; + + return Ok; } GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLineCap *baseCap)

1 0

Michael Stefaniuc : dplayx: Move the DirectPlayLobby data fields to the main object.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 2a63cf67abdf571be019408db8f09bb237398f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a63cf67abdf571be019408db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:14:38 2013 +0200 dplayx: Move the DirectPlayLobby data fields to the main object. --- dlls/dplayx/dplobby.c | 69 +++++++++++------------------------------------- 1 files changed, 16 insertions(+), 53 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 33509a6..7b0c57a 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -63,13 +63,6 @@ struct DPLMSG }; typedef struct DPLMSG* LPDPLMSG; -typedef struct tagDirectPlayLobbyData -{ - HKEY hkCallbackKeyHack; - DWORD dwMsgThread; - DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */ -} DirectPlayLobbyData; - typedef struct IDirectPlayLobbyImpl { IDirectPlayLobby IDirectPlayLobby_iface; @@ -81,7 +74,9 @@ typedef struct IDirectPlayLobbyImpl LONG numIfaces; /* "in use interfaces" refcount */ LONG ref, refA, ref2, ref2A, ref3, ref3A; CRITICAL_SECTION lock; - DirectPlayLobbyData* dpl; + HKEY cbkeyhack; + DWORD msgtid; + DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */ } IDirectPlayLobbyImpl; static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby( IDirectPlayLobby *iface ) @@ -114,41 +109,12 @@ static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLob return CONTAINING_RECORD( iface, IDirectPlayLobbyImpl, IDirectPlayLobby3A_iface ); } -static BOOL DPL_CreateLobby1( LPVOID lpDPL ) -{ - IDirectPlayLobbyImpl *This = lpDPL; - - This->dpl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl) ) ); - if ( This->dpl == NULL ) - { - return FALSE; - } - - DPQ_INIT( This->dpl->msgs ); - - return TRUE; -} - -static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) -{ - IDirectPlayLobbyImpl *This = lpDPL; - - if( This->dpl->dwMsgThread ) - { - FIXME( "Should kill the msg thread\n" ); - } - - DPQ_DELETEQ( This->dpl->msgs, msgs, LPDPLMSG, cbDeleteElemFromHeap ); - - /* Delete the contents */ - HeapFree( GetProcessHeap(), 0, This->dpl ); - - return TRUE; -} - static void dplobby_destroy(IDirectPlayLobbyImpl *obj) { - DPL_DestroyLobby1( obj ); + if ( obj->msgtid ) + FIXME( "Should kill the msg thread\n" ); + + DPQ_DELETEQ( obj->msgs, msgs, LPDPLMSG, cbDeleteElemFromHeap ); obj->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &obj->lock ); HeapFree( GetProcessHeap(), 0, obj ); @@ -995,7 +961,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL EnterCriticalSection( &This->lock ); - memcpy( &This->dpl->hkCallbackKeyHack, &hkServiceProvider, sizeof( hkServiceProvider ) ); + memcpy( &This->cbkeyhack, &hkServiceProvider, sizeof( hkServiceProvider ) ); if( !lpEnumLocalAppCallback( &dplAppInfo, lpContext, dwFlags ) ) { @@ -1182,7 +1148,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications sizeOfReturnBuffer = 200; /* Get all the appropriate data from the registry */ - if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, clSubKey, + if( RegQueryValueExA( lpData->This->cbkeyhack, clSubKey, NULL, &returnType, (LPBYTE)returnBuffer, &sizeOfReturnBuffer ) != ERROR_SUCCESS ) { @@ -1196,7 +1162,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications sizeOfReturnBuffer = 200; - if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, cdSubKey, + if( RegQueryValueExA( lpData->This->cbkeyhack, cdSubKey, NULL, &returnType, (LPBYTE)returnBuffer, &sizeOfReturnBuffer ) != ERROR_SUCCESS ) { @@ -1210,7 +1176,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications sizeOfReturnBuffer = 200; - if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, fileSubKey, + if( RegQueryValueExA( lpData->This->cbkeyhack, fileSubKey, NULL, &returnType, (LPBYTE)returnBuffer, &sizeOfReturnBuffer ) != ERROR_SUCCESS ) { @@ -1224,7 +1190,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications sizeOfReturnBuffer = 200; - if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, pathSubKey, + if( RegQueryValueExA( lpData->This->cbkeyhack, pathSubKey, NULL, &returnType, (LPBYTE)returnBuffer, &sizeOfReturnBuffer ) != ERROR_SUCCESS ) { @@ -1433,10 +1399,9 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A &hStart, &hDeath, &hSettingRead ); /* Setup the message thread ID */ - This->dpl->dwMsgThread = - CreateLobbyMessageReceptionThread( hReceiveEvent, hStart, hDeath, hSettingRead ); + This->msgtid = CreateLobbyMessageReceptionThread( hReceiveEvent, hStart, hDeath, hSettingRead ); - DPLAYX_SetLobbyMsgThreadId( newProcessInfo.dwProcessId, This->dpl->dwMsgThread ); + DPLAYX_SetLobbyMsgThreadId( newProcessInfo.dwProcessId, This->msgtid ); LeaveCriticalSection( &This->lock ); @@ -2088,11 +2053,9 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) InitializeCriticalSection( &obj->lock ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayLobbyImpl.lock"); + DPQ_INIT( obj->msgs ); - if ( DPL_CreateLobby1( obj ) ) - hr = IDirectPlayLobby_QueryInterface( &obj->IDirectPlayLobby3_iface, riid, ppv ); - else - hr = DPERR_NOMEMORY; + hr = IDirectPlayLobby_QueryInterface( &obj->IDirectPlayLobby3_iface, riid, ppv ); IDirectPlayLobby_Release( &obj->IDirectPlayLobby3_iface ); return hr;

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlayLobby2.
by Alexandre Julliard 18 Apr '13

18 Apr '13

Module: wine Branch: master Commit: 185dd369299acf319f051b5e3cafb0fd728bf318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185dd369299acf319f051b5e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:13:45 2013 +0200 dplayx: Add a separate refcount for IDirectPlayLobby2. --- dlls/dplayx/dplobby.c | 159 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/tests/dplayx.c | 2 +- 2 files changed, 158 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=185dd369299acf319f051…

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
58
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 April 2013