wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Riccardo Bortolato : d3d9: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in d3d9_device_ColorFill.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: f3c69e40dce9dc764d370d18bc6d957308dba00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c69e40dce9dc764d370d18b… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 19 19:07:33 2015 +0200 d3d9: Replace wined3d_surface_get_resource with wined3d_texture_get_sub_resource in d3d9_device_ColorFill. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7d9f735..821aa4f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1378,7 +1378,11 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, wined3d_mutex_lock(); - wined3d_resource = wined3d_surface_get_resource(surface_impl->wined3d_surface); + if (!(wined3d_resource = wined3d_texture_get_sub_resource(surface_impl->wined3d_texture, surface_impl->sub_resource_idx))) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } wined3d_resource_get_desc(wined3d_resource, &desc); if (desc.pool != WINED3D_POOL_DEFAULT)

1 0

Riccardo Bortolato : d3d9: Replace wined3d_surface_preload with wined3d_texture_preload.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 8f03c4413bcb92c60dda9d347603330ccec9b23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f03c4413bcb92c60dda9d347… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 19 19:07:29 2015 +0200 d3d9: Replace wined3d_surface_preload with wined3d_texture_preload. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index ed00f7a..9a9c838 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -176,7 +176,7 @@ static void WINAPI d3d9_surface_PreLoad(IDirect3DSurface9 *iface) TRACE("iface %p.\n", iface); wined3d_mutex_lock(); - wined3d_surface_preload(surface->wined3d_surface); + wined3d_texture_preload(surface->wined3d_texture); wined3d_mutex_unlock(); }

1 0

Andrey Gusev : wined3d: Recognize Radeon HD 3850 AGP.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 9d7cc0768786a2235f3a80f32dd971080dd38706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7cc0768786a2235f3a80f32… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 19 15:30:29 2015 +0300 wined3d: Recognize Radeon HD 3850 AGP. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6d51432..a4ccceb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1291,6 +1291,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2600, "ATI Mobility Radeon HD 2600", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD2900, "ATI Radeon HD 2900 XT", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD3200, "ATI Radeon HD 3200 Graphics", DRIVER_AMD_R600, 128 }, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD3850, "ATI Radeon HD 3850 AGP", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4200M, "ATI Mobility Radeon HD 4200", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4350, "ATI Radeon HD 4350", DRIVER_AMD_R600, 256 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD4600, "ATI Radeon HD 4600 Series", DRIVER_AMD_R600, 512 }, @@ -2019,7 +2020,7 @@ cards_amd_mesa[] = /* R600 */ {"R680", CARD_AMD_RADEON_HD2900}, {"R600", CARD_AMD_RADEON_HD2900}, - {"RV670", CARD_AMD_RADEON_HD2900}, + {"RV670", CARD_AMD_RADEON_HD3850}, {"RV635", CARD_AMD_RADEON_HD2600}, {"RV630", CARD_AMD_RADEON_HD2600}, {"RV620", CARD_AMD_RADEON_HD2350}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f4a984..d75169c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1493,6 +1493,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD2600 = 0x9581, CARD_AMD_RADEON_HD2900 = 0x9400, CARD_AMD_RADEON_HD3200 = 0x9620, + CARD_AMD_RADEON_HD3850 = 0x9515, CARD_AMD_RADEON_HD4200M = 0x9712, CARD_AMD_RADEON_HD4350 = 0x954f, CARD_AMD_RADEON_HD4600 = 0x9495,

1 0

Michael Stefaniuc : ddraw/tests: Test the return of DrawPrimitive().
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: f8b306c3a89a6159d618bfbaaca1818aced41554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b306c3a89a6159d618bfbaa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 20 09:49:41 2015 +0200 ddraw/tests: Test the return of DrawPrimitive(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fc119f6..fe02396 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8690,6 +8690,7 @@ static void test_negative_fixedfunction_fog(void) ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, tests[i].pos_type | D3DFVF_DIFFUSE, tests[i].quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr);

1 0

Gerald Pfeifer : d3d8: Adjust D3DCOLOR_ARGB to avoid shift overflow.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: ef837a9c6f1272c58116d24a0460a8bace6c3e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef837a9c6f1272c58116d24a0… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Mon Oct 19 22:05:10 2015 +0200 d3d8: Adjust D3DCOLOR_ARGB to avoid shift overflow. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d8types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d3d8types.h b/include/d3d8types.h index 9592544..3506805 100644 --- a/include/d3d8types.h +++ b/include/d3d8types.h @@ -38,7 +38,7 @@ #define D3DCLIPPLANE4 (1 << 4) #define D3DCLIPPLANE5 (1 << 5) -#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xffu)<<24)|(((r)&0xffu)<<16)|(((g)&0xffu)<<8)|((b)&0xffu))) #define D3DCOLOR_COLORVALUE(r,g,b,a) D3DCOLOR_RGBA((DWORD)((r)*255.f),(DWORD)((g)*255.f),(DWORD)((b)*255.f),(DWORD)((a)*255.f)) #define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) #define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xff,r,g,b)

1 0

Grazvydas Ignotas : include: Expose some more implemented math functions.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 6c63e9f5d2c5acc786df0fcfc1cd3df736beb3e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c63e9f5d2c5acc786df0fcfc… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Oct 18 02:31:05 2015 +0300 include: Expose some more implemented math functions. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index 4f69b88..c76fe0d 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -76,6 +76,25 @@ double __cdecl _y0(double); double __cdecl _y1(double); double __cdecl _yn(int, double); +double __cdecl cbrt(double); +double __cdecl exp2(double); +double __cdecl log2(double); +double __cdecl rint(double); +double __cdecl round(double); +double __cdecl trunc(double); + +float __cdecl cbrtf(float); +float __cdecl exp2f(float); +float __cdecl log2f(float); +float __cdecl rintf(float); +float __cdecl roundf(float); +float __cdecl truncf(float); + +long __cdecl lrint(double); +long __cdecl lrintf(float); +long __cdecl lround(double); +long __cdecl lroundf(float); + #if defined(__x86_64__) || defined(__arm__) float __cdecl sinf(float);

1 0

Grazvydas Ignotas : include: Use fabsf implementation when available.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: cc902bce5bddca44f2583a00a12541dfd0d89d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc902bce5bddca44f2583a00a… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Oct 18 02:31:04 2015 +0300 include: Use fabsf implementation when available. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index a7cbcc0..4f69b88 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -120,13 +120,13 @@ float __cdecl fmodf(float, float); #define sqrtf(x) ((float)sqrt((double)(x))) #define ceilf(x) ((float)ceil((double)(x))) #define floorf(x) ((float)floor((double)(x))) +#define fabsf(x) ((float)fabs((double)(x))) #define frexpf(x) ((float)frexp((double)(x))) #define modff(x,y) ((float)modf((double)(x), (double*)(y))) #define fmodf(x,y) ((float)fmod((double)(x), (double)(y))) #endif -#define fabsf(x) ((float)fabs((double)(x))) #define ldexpf(x,y) ((float)ldexp((double)(x),(y))) float __cdecl _hypotf(float, float);

1 0

Grazvydas Ignotas : include: Use float math functions on ARM.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: b3194e04e078d41a3090e6533c41d869957c149d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3194e04e078d41a3090e6533… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sun Oct 18 02:31:03 2015 +0300 include: Use float math functions on ARM. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index c1333d4..a7cbcc0 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -76,7 +76,7 @@ double __cdecl _y0(double); double __cdecl _y1(double); double __cdecl _yn(int, double); -#ifdef __x86_64__ +#if defined(__x86_64__) || defined(__arm__) float __cdecl sinf(float); float __cdecl cosf(float);

1 0

Nikolay Sivov : wintrust/tests: Use proper return types when calling provider funcs (PVS-Studio).
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 9b9dd19297e959f369f483f0118c37d44ba6f335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9dd19297e959f369f483f01… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 20 16:54:39 2015 +0300 wintrust/tests: Use proper return types when calling provider funcs (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index b1ac8a3..436de47 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -544,6 +544,7 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) CRYPT_PROVIDER_DATA data = { 0 }; CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } }; HRESULT ret; + BOOL b; if (!CertFreeCertificateChain_p) { @@ -563,8 +564,8 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] == TRUST_E_NOSIGNATURE, "Expected TRUST_E_NOSIGNATURE, got %08x\n", data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); - ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); - if (ret) + b = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); + if (b) { PCCERT_CONTEXT cert; @@ -577,8 +578,8 @@ static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { WINTRUST_DATA wintrust_data = { 0 }; - ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert); - ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret); + b = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert); + ok(b == TRUE, "Expected TRUE, got %d\n", b); /* If pWintrustData isn't set, crashes attempting to access * pWintrustData->fdwRevocationChecks

1 0

Nikolay Sivov : shell32: Properly handle SHGetPathFromIDListW failure ( PVS-Studio).
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 186bed3d168089b00c794ab5c32e808e15b6b742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186bed3d168089b00c794ab5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 20 16:44:49 2015 +0300 shell32: Properly handle SHGetPathFromIDListW failure (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/brsfolder.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 1a2716e..4040407 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -757,9 +757,10 @@ static HRESULT BrsFolder_NewFolder(browse_info *info) if(FAILED(hr)) return hr; - hr = SHGetPathFromIDListW(info->pidlRet, name); - if(FAILED(hr)) + if(!SHGetPathFromIDListW(info->pidlRet, name)) { + hr = E_FAIL; goto cleanup; + } len = strlenW(name); if(len<MAX_PATH)

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
75
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 October 2015