September 2013 - Wine-commits

Stefan Dösinger : d3d9/tests: Read the caps from the device.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: 708024f78649b087b8c97cae38bdf9a42f60129b URL: http://source.winehq.org/git/wine.git/?a=commit;h=708024f78649b087b8c97cae3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 19 11:02:53 2013 +0200 d3d9/tests: Read the caps from the device. --- dlls/d3d9/tests/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index f71f8be..02b4174 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7018,9 +7018,6 @@ static void test_volume_blocks(void) skip("Failed to create IDirect3D9 object, skipping tests.\n"); return; } - hr = IDirect3D9_GetDeviceCaps(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps); - ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); - pow2 = !!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2); window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); @@ -7031,6 +7028,9 @@ static void test_volume_blocks(void) DestroyWindow(window); return; } + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + pow2 = !!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2); for (i = 0; i < sizeof(formats) / sizeof(*formats); i++) {

1 0

Stefan Dösinger : wined3d: Don't use volume->resource. allocatedMemory.
by Alexandre Julliard 19 Sep '13

19 Sep '13

Module: wine Branch: master Commit: e9b4f154ddb61c7bf135348cf8a996814bea2420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9b4f154ddb61c7bf135348cf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 19 11:02:54 2013 +0200 wined3d: Don't use volume->resource.allocatedMemory. Depending on the location flags, the buffer or heap_memory should be used. --- dlls/wined3d/volume.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 2fa04c5..9251a55 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -168,7 +168,6 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, static void wined3d_volume_evict_sysmem(struct wined3d_volume *volume) { wined3d_resource_free_sysmem(&volume->resource); - volume->resource.allocatedMemory = NULL; wined3d_volume_invalidate_location(volume, WINED3D_LOCATION_SYSMEM); } @@ -202,7 +201,7 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, * implementing EXT_SRGB_DECODE in the driver or finding out why we * picked the wrong copy for the original upload and fixing that. * - * Also keep in mind that we want to avoid using resource.allocatedMemory + * Also keep in mind that we want to avoid using resource.heap_memory * for DEFAULT pool surfaces. */ WARN_(d3d_perf)("Performing slow rgb/srgb volume transfer.\n"); @@ -258,7 +257,7 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, } else if (volume->locations & WINED3D_LOCATION_SYSMEM) { - struct wined3d_bo_address data = {0, volume->resource.allocatedMemory}; + struct wined3d_bo_address data = {0, volume->resource.heap_memory}; wined3d_volume_upload_data(volume, context, &data); } else if (volume->locations & WINED3D_LOCATION_BUFFER) @@ -287,11 +286,8 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, break; case WINED3D_LOCATION_SYSMEM: - if (!volume->resource.allocatedMemory || !volume->resource.heap_memory) - { + if (!volume->resource.heap_memory) ERR("Trying to load WINED3D_LOCATION_SYSMEM without setting it up first.\n"); - return; - } if (volume->locations & WINED3D_LOCATION_DISCARDED) { @@ -300,7 +296,7 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, } else if (volume->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { - struct wined3d_bo_address data = {0, volume->resource.allocatedMemory}; + struct wined3d_bo_address data = {0, volume->resource.heap_memory}; if (volume->locations & WINED3D_LOCATION_TEXTURE_RGB) volume_bind_and_dirtify(volume, context, FALSE); @@ -412,7 +408,7 @@ static void wined3d_volume_free_pbo(struct wined3d_volume *volume) static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) { - if (volume->resource.allocatedMemory) + if (volume->resource.heap_memory) return TRUE; if (!wined3d_resource_allocate_sysmem(&volume->resource)) @@ -420,7 +416,6 @@ static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) ERR("Failed to allocate system memory.\n"); return FALSE; } - volume->resource.allocatedMemory = volume->resource.heap_memory; return TRUE; } @@ -674,7 +669,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM); context_release(context); } - base_memory = volume->resource.allocatedMemory; + base_memory = volume->resource.heap_memory; } TRACE("Base memory pointer %p.\n", base_memory); @@ -815,7 +810,6 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) { wined3d_resource_free_sysmem(&volume->resource); - volume->resource.allocatedMemory = NULL; volume->flags |= WINED3D_VFLAG_PBO; }

1 0

Henri Verbeet : ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_set_render_target ().
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 2cc421f59d0e25a69dd876fd0438af2b2aba4a03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc421f59d0e25a69dd876fd0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:11 2013 +0200 ddraw: Verify that surfaces with an indexed format have a palette attached in d3d_device_set_render_target(). --- dlls/ddraw/device.c | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9f537c1..3f3cb18 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1796,6 +1796,15 @@ static HRESULT WINAPI d3d_device2_GetCurrentViewport(IDirect3DDevice2 *iface, ID (IDirect3DViewport3 **)viewport); } +static BOOL validate_surface_palette(struct ddraw_surface *surface) +{ + return !(surface->surface_desc.u4.ddpfPixelFormat.dwFlags + & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 + | DDPF_PALETTEINDEXEDTO8)) + || wined3d_surface_get_palette(surface->wined3d_surface); +} + static HRESULT d3d_device_set_render_target(struct d3d_device *device, struct ddraw_surface *target, IUnknown *rt_iface) { @@ -1803,6 +1812,13 @@ static HRESULT d3d_device_set_render_target(struct d3d_device *device, wined3d_mutex_lock(); + if (!validate_surface_palette(target)) + { + WARN("Surface %p has an indexed pixel format, but no palette.\n", target); + wined3d_mutex_unlock(); + return DDERR_INVALIDCAPS; + } + if (device->rt_iface == rt_iface) { TRACE("No-op SetRenderTarget operation, not doing anything\n"); @@ -6752,11 +6768,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_INVALIDCAPS; } - if ((target->surface_desc.u4.ddpfPixelFormat.dwFlags - & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 - | DDPF_PALETTEINDEXEDTO8)) - && !wined3d_surface_get_palette(target->wined3d_surface)) + if (!validate_surface_palette(target)) { WARN("Surface %p has an indexed pixel format, but no palette.\n", target); return DDERR_NOPALETTEATTACHED;

1 0

Henri Verbeet : d3d10: Avoid LPCSTR.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 708615056ceca237cab1301cf385b720ec602e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=708615056ceca237cab1301cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:12 2013 +0200 d3d10: Avoid LPCSTR. --- dlls/d3d10/d3d10_main.c | 6 +- dlls/d3d10/effect.c | 111 +++++++++++++++++++++--------------------- dlls/d3d10/shader.c | 4 +- include/d3d10.idl | 10 ++-- include/d3d10_1shader.h | 6 +- include/d3d10effect.h | 122 +++++++++++++++++++++++----------------------- include/d3d10shader.h | 30 ++++++------ include/d3dcommon.idl | 4 +- 8 files changed, 148 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=708615056ceca237cab13…

1 0

Henri Verbeet : d3d10: Avoid LPVOID.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 69fe799c25eaf9780aee28d96798e9960194943c URL: http://source.winehq.org/git/wine.git/?a=commit;h=69fe799c25eaf9780aee28d96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 18 10:57:13 2013 +0200 d3d10: Avoid LPVOID. --- dlls/d3d10/d3d10_main.c | 13 ++++++------- include/d3d10_1shader.h | 2 +- include/d3d10effect.h | 4 ++-- include/d3d10shader.h | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index ac3eee5..01fefba 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,16 +27,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -/* At process attach */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { - TRACE("fdwReason=%d\n", fdwReason); - switch(fdwReason) + switch (reason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hInstDLL ); - break; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(inst); + break; } + return TRUE; } diff --git a/include/d3d10_1shader.h b/include/d3d10_1shader.h index 92f5ebf..06dded7 100644 --- a/include/d3d10_1shader.h +++ b/include/d3d10_1shader.h @@ -27,7 +27,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection1, 0xc3457783, 0xa846, 0x47ce, 0x95, 0x20, DECLARE_INTERFACE_(ID3D10ShaderReflection1, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10ShaderReflection1 methods */ diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 5af2ef5..1494894 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -755,7 +755,7 @@ DEFINE_GUID(IID_ID3D10Effect, 0x51b0ca8b, 0xec0b, 0x4519, 0x87, 0x0d, 0x8e, 0xe1 DECLARE_INTERFACE_(ID3D10Effect, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10Effect methods */ @@ -781,7 +781,7 @@ DEFINE_GUID(IID_ID3D10EffectPool, 0x9537ab04, 0x3250, 0x412e, 0x82, 0x13, 0xfc, DECLARE_INTERFACE_(ID3D10EffectPool, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10EffectPool methods */ diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 894b833..4a2fef9 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -140,7 +140,7 @@ typedef struct _D3D10_SHADER_VARIABLE_DESC UINT StartOffset; UINT Size; UINT uFlags; - LPVOID DefaultValue; + void *DefaultValue; } D3D10_SHADER_VARIABLE_DESC; typedef struct _D3D10_SHADER_TYPE_DESC @@ -193,7 +193,7 @@ DEFINE_GUID(IID_ID3D10ShaderReflection, 0xd40e20b6, 0xf8f7, 0x42ad, 0xab, 0x20, DECLARE_INTERFACE_(ID3D10ShaderReflection, IUnknown) { /* IUnknown methods */ - STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *object) PURE; + STDMETHOD(QueryInterface)(THIS_ REFIID riid, void **out) PURE; STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* ID3D10ShaderReflection methods */

1 0

Jacek Caban : d3d11sdklayers.idl: Added new file.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 515af78f6b4b33dfd11c4d0f9d9c0427e3712c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=515af78f6b4b33dfd11c4d0f9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 18 11:36:13 2013 +0200 d3d11sdklayers.idl: Added new file. --- .gitignore | 1 + include/Makefile.in | 1 + include/d3d11.idl | 2 +- include/d3d11sdklayers.idl | 1259 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1262 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=515af78f6b4b33dfd11c4…

1 0

Andrew Eikum : oleaut32: Implement VarDecRound.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 87c459ab2359784f238c30073b1adc0111876987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c459ab2359784f238c30073… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 17 13:01:45 2013 -0500 oleaut32: Implement VarDecRound. --- dlls/oleaut32/tests/vartype.c | 35 +++++++++++++++++ dlls/oleaut32/vartype.c | 86 ++++++++++++++++++++++++++++++----------- 2 files changed, 98 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 4c823c6..e296e77 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -455,6 +455,7 @@ static HRESULT (WINAPI *pVarDecDiv)(const DECIMAL*,const DECIMAL*,DECIMAL*); static HRESULT (WINAPI *pVarDecCmp)(const DECIMAL*,const DECIMAL*); static HRESULT (WINAPI *pVarDecCmpR8)(const DECIMAL*,double); static HRESULT (WINAPI *pVarDecNeg)(const DECIMAL*,DECIMAL*); +static HRESULT (WINAPI *pVarDecRound)(const DECIMAL*,int,DECIMAL*); static HRESULT (WINAPI *pVarBoolFromUI1)(BYTE,VARIANT_BOOL*); static HRESULT (WINAPI *pVarBoolFromI2)(SHORT,VARIANT_BOOL*); @@ -4545,6 +4546,39 @@ static void test_VarDecCmpR8(void) SETDEC(l,0,DECIMAL_NEG,-1,-1); r = DECIMAL_NEG; MATH3(VarDecCmpR8); EXPECT_LT; } +#define CLEAR(x) memset(&(x), 0xBB, sizeof(x)) + +static void test_VarDecRound(void) +{ + HRESULT hres; + DECIMAL l, out; + + CHECKPTR(VarDecRound); + + CLEAR(out); SETDEC(l, 0, 0, 0, 1); hres = pVarDecRound(&l, 3, &out); EXPECTDEC(0, 0, 0, 1); + + CLEAR(out); SETDEC(l, 0, 0, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, 0, 0, 1); + CLEAR(out); SETDEC(l, 1, 0, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, 0, 0, 0); + CLEAR(out); SETDEC(l, 1, 0, 0, 1); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 1); + CLEAR(out); SETDEC(l, 2, 0, 0, 11); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 1); + CLEAR(out); SETDEC(l, 2, 0, 0, 15); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 2); + CLEAR(out); SETDEC(l, 6, 0, 0, 550001); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 6); + + CLEAR(out); SETDEC(l, 0, DECIMAL_NEG, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, DECIMAL_NEG, 0, 1); + CLEAR(out); SETDEC(l, 1, DECIMAL_NEG, 0, 1); hres = pVarDecRound(&l, 0, &out); EXPECTDEC(0, DECIMAL_NEG, 0, 0); + CLEAR(out); SETDEC(l, 1, DECIMAL_NEG, 0, 1); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 1); + CLEAR(out); SETDEC(l, 2, DECIMAL_NEG, 0, 11); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 1); + CLEAR(out); SETDEC(l, 2, DECIMAL_NEG, 0, 15); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 2); + CLEAR(out); SETDEC(l, 6, DECIMAL_NEG, 0, 550001); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, DECIMAL_NEG, 0, 6); + + CLEAR(out); SETDEC64(l, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, 0, 0xffffffff, 0xffffffff, 0xffffffff); + CLEAR(out); SETDEC64(l, 28, 0, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, 0, 0, 0, 8); + CLEAR(out); SETDEC64(l, 0, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); + CLEAR(out); SETDEC64(l, 28, DECIMAL_NEG, 0xffffffff, 0xffffffff, 0xffffffff); hres = pVarDecRound(&l, 0, &out); EXPECTDEC64(0, DECIMAL_NEG, 0, 0, 8); + + CLEAR(out); SETDEC(l, 2, 0, 0, 0); hres = pVarDecRound(&l, 1, &out); EXPECTDEC(1, 0, 0, 0); +} + /* * VT_BOOL */ @@ -6334,6 +6368,7 @@ START_TEST(vartype) test_VarDecCmpR8(); test_VarDecMul(); test_VarDecDiv(); + test_VarDecRound(); test_VarBoolFromI1(); test_VarBoolFromUI1(); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 74f66de..e1672a1 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -5137,7 +5137,7 @@ static int VARIANT_int_addlossy( in case of quotient overflow. */ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * divisor, - VARIANT_DI * quotient) + VARIANT_DI * quotient, BOOL round_remainder) { HRESULT r_overflow = S_OK; @@ -5180,8 +5180,21 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di underflow = VARIANT_int_addlossy( quotient->bitsnum, &quotientscale, sizeof(quotient->bitsnum) / sizeof(DWORD), remainderplusquotient, &tempquotientscale, 4); - VARIANT_int_mulbychar(remainderplusquotient + 4, 4, 10); - memcpy(remainderplusquotient, remainderplusquotient + 4, 4 * sizeof(DWORD)); + if (round_remainder) { + if(remainderplusquotient[4] >= 5){ + unsigned int i; + unsigned char remainder = 1; + for (i = 0; i < sizeof(quotient->bitsnum) / sizeof(DWORD) && remainder; i++) { + ULONGLONG digit = quotient->bitsnum[i] + 1; + remainder = (digit > 0xFFFFFFFF) ? 1 : 0; + quotient->bitsnum[i] = digit & 0xFFFFFFFF; + } + } + memset(remainderplusquotient, 0, sizeof(remainderplusquotient)); + } else { + VARIANT_int_mulbychar(remainderplusquotient + 4, 4, 10); + memcpy(remainderplusquotient, remainderplusquotient + 4, 4 * sizeof(DWORD)); + } tempquotientscale = ++remainderscale; } while (!underflow && !VARIANT_int_iszero(remainderplusquotient + 4, 4)); @@ -5485,31 +5498,16 @@ static HRESULT VARIANT_DI_FromR8(double source, VARIANT_DI * dest) return hres; } -/************************************************************************ - * VarDecDiv (OLEAUT32.178) - * - * Divide one DECIMAL by another. - * - * PARAMS - * pDecLeft [I] Source - * pDecRight [I] Value to divide by - * pDecOut [O] Destination - * - * RETURNS - * Success: S_OK. - * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination - */ -HRESULT WINAPI VarDecDiv(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECIMAL* pDecOut) +static HRESULT VARIANT_do_division(const DECIMAL *pDecLeft, const DECIMAL *pDecRight, DECIMAL *pDecOut, + BOOL round) { HRESULT hRet = S_OK; VARIANT_DI di_left, di_right, di_result; HRESULT divresult; - if (!pDecLeft || !pDecRight || !pDecOut) return E_INVALIDARG; - VARIANT_DIFromDec(pDecLeft, &di_left); VARIANT_DIFromDec(pDecRight, &di_right); - divresult = VARIANT_DI_div(&di_left, &di_right, &di_result); + divresult = VARIANT_DI_div(&di_left, &di_right, &di_result, round); if (divresult != S_OK) { /* division actually overflowed */ @@ -5557,6 +5555,27 @@ HRESULT WINAPI VarDecDiv(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI } /************************************************************************ + * VarDecDiv (OLEAUT32.178) + * + * Divide one DECIMAL by another. + * + * PARAMS + * pDecLeft [I] Source + * pDecRight [I] Value to divide by + * pDecOut [O] Destination + * + * RETURNS + * Success: S_OK. + * Failure: DISP_E_OVERFLOW, if the value will not fit in the destination + */ +HRESULT WINAPI VarDecDiv(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECIMAL* pDecOut) +{ + if (!pDecLeft || !pDecRight || !pDecOut) return E_INVALIDARG; + + return VARIANT_do_division(pDecLeft, pDecRight, pDecOut, FALSE); +} + +/************************************************************************ * VarDecMul (OLEAUT32.179) * * Multiply one DECIMAL by another. @@ -5765,6 +5784,10 @@ HRESULT WINAPI VarDecNeg(const DECIMAL* pDecIn, DECIMAL* pDecOut) */ HRESULT WINAPI VarDecRound(const DECIMAL* pDecIn, int cDecimals, DECIMAL* pDecOut) { + DECIMAL divisor, tmp; + HRESULT hr; + unsigned int i; + if (cDecimals < 0 || (DEC_SIGN(pDecIn) & ~DECIMAL_NEG) || DEC_SCALE(pDecIn) > DEC_MAX_SCALE) return E_INVALIDARG; @@ -5774,9 +5797,26 @@ HRESULT WINAPI VarDecRound(const DECIMAL* pDecIn, int cDecimals, DECIMAL* pDecOu return S_OK; } - FIXME("semi-stub!\n"); + /* truncate significant digits and rescale */ + memset(&divisor, 0, sizeof(divisor)); + DEC_LO64(&divisor) = 1; - return DISP_E_OVERFLOW; + memset(&tmp, 0, sizeof(tmp)); + DEC_LO64(&tmp) = 10; + for (i = 0; i < DEC_SCALE(pDecIn) - cDecimals; ++i) + { + hr = VarDecMul(&divisor, &tmp, &divisor); + if (FAILED(hr)) + return hr; + } + + hr = VARIANT_do_division(pDecIn, &divisor, pDecOut, TRUE); + if (FAILED(hr)) + return hr; + + DEC_SCALE(pDecOut) = cDecimals; + + return S_OK; } /************************************************************************

1 0

Roderick Colenbrander : winex11: Support GLX_MESA_swap_control for WGL_EXT_swap_control.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: af58ccebbaeaa732a678a42081afb5d2bad47148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af58ccebbaeaa732a678a4208… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Sep 14 19:57:39 2013 -0700 winex11: Support GLX_MESA_swap_control for WGL_EXT_swap_control. --- dlls/winex11.drv/opengl.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5ec33c8..e28302e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -258,7 +258,8 @@ enum glx_swap_control_method { GLX_SWAP_CONTROL_NONE, GLX_SWAP_CONTROL_EXT, - GLX_SWAP_CONTROL_SGI + GLX_SWAP_CONTROL_SGI, + GLX_SWAP_CONTROL_MESA }; /* X context to associate a struct gl_drawable to an hwnd */ @@ -404,6 +405,7 @@ static void (*pglXFreeMemoryNV)(GLvoid *pointer); /* MESA GLX Extensions */ static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); +static int (*pglXSwapIntervalMESA)(unsigned int interval); /* Standard OpenGL */ static void (*pglFinish)(void); @@ -650,6 +652,8 @@ static BOOL has_opengl(void) LOAD_FUNCPTR(glXCreateContextAttribsARB); /* EXT GLX Extension */ LOAD_FUNCPTR(glXSwapIntervalEXT); + /* MESA GLX Extension */ + LOAD_FUNCPTR(glXSwapIntervalMESA); /* SGI GLX Extension */ LOAD_FUNCPTR(glXSwapIntervalSGI); /* NV GLX Extension */ @@ -2963,6 +2967,10 @@ static BOOL X11DRV_wglSwapIntervalEXT(int interval) ret = !X11DRV_check_error(); break; + case GLX_SWAP_CONTROL_MESA: + ret = !pglXSwapIntervalMESA(interval); + break; + case GLX_SWAP_CONTROL_SGI: /* wglSwapIntervalEXT considers an interval value of zero to mean that * vsync should be disabled, but glXSwapIntervalSGI considers such a @@ -3146,6 +3154,10 @@ static void X11DRV_WineGL_LoadExtensions(void) has_swap_control_tear = TRUE; } } + else if (has_extension( WineGLInfo.glxExtensions, "GLX_MESA_swap_control")) + { + swap_control_method = GLX_SWAP_CONTROL_MESA; + } else if (has_extension( WineGLInfo.glxExtensions, "GLX_SGI_swap_control")) { swap_control_method = GLX_SWAP_CONTROL_SGI;

1 0

Alistair Leslie-Hughes : dbs.idl: Add type DB_NUMERIC.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 16f99ce6623d404b20b55f8b73ae40a1fae81d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f99ce6623d404b20b55f8b7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Sep 16 11:38:16 2013 +1000 dbs.idl: Add type DB_NUMERIC. --- include/dbs.idl | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index ceb9773..1e0ac6c 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -50,6 +50,13 @@ typedef struct tagDBID { } uName; } DBID; +typedef struct tagDB_NUMERIC { + BYTE precision; + BYTE scale; + BYTE sign; + BYTE val[16]; +} DB_NUMERIC; + typedef DWORD DBPROPID; typedef struct tagDBPROPIDSET {

1 0

Stefan Dösinger : wined3d: Mapping a mapped volume is an error.
by Alexandre Julliard 18 Sep '13

18 Sep '13

Module: wine Branch: master Commit: 83b404879c091e192b770f73e0065abea5eb7856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83b404879c091e192b770f73e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 18 12:24:55 2013 +0200 wined3d: Mapping a mapped volume is an error. --- dlls/wined3d/volume.c | 15 ++++++++++----- dlls/wined3d/wined3d_private.h | 7 +++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 540db93..508b1df 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -524,10 +524,15 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, TRACE("volume %p, map_desc %p, box %p, flags %#x.\n", volume, map_desc, box, flags); + map_desc->data = NULL; if (!(volume->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) { WARN("Volume %p is not CPU accessible.\n", volume); - map_desc->data = NULL; + return WINED3DERR_INVALIDCALL; + } + if (volume->resource.map_count) + { + WARN("Volume is already mapped.\n"); return WINED3DERR_INVALIDCALL; } flags = wined3d_resource_sanitize_map_flags(&volume->resource, flags); @@ -614,7 +619,7 @@ HRESULT CDECL wined3d_volume_map(struct wined3d_volume *volume, wined3d_volume_invalidate_location(volume, ~WINED3D_LOCATION_SYSMEM); } - volume->flags |= WINED3D_VFLAG_LOCKED; + volume->resource.map_count++; TRACE("Returning memory %p, row pitch %d, slice pitch %d.\n", map_desc->data, map_desc->row_pitch, map_desc->slice_pitch); @@ -631,9 +636,9 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); - if (!(volume->flags & WINED3D_VFLAG_LOCKED)) + if (!volume->resource.map_count) { - WARN("Trying to unlock unlocked volume %p.\n", volume); + WARN("Trying to unlock an unlocked volume %p.\n", volume); return WINED3DERR_INVALIDCALL; } @@ -651,7 +656,7 @@ HRESULT CDECL wined3d_volume_unmap(struct wined3d_volume *volume) context_release(context); } - volume->flags &= ~WINED3D_VFLAG_LOCKED; + volume->resource.map_count--; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4928f92..f85bfec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2110,10 +2110,9 @@ void wined3d_texture_apply_state_changes(struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; -#define WINED3D_VFLAG_LOCKED 0x00000001 -#define WINED3D_VFLAG_ALLOCATED 0x00000002 -#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000004 -#define WINED3D_VFLAG_PBO 0x00000008 +#define WINED3D_VFLAG_ALLOCATED 0x00000001 +#define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 +#define WINED3D_VFLAG_PBO 0x00000004 #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002

1 0