April 2014 - Wine-Commits - list.winehq.org

André Hentschel : wined3d: Add NVIDIA Geforce GTX 780 Ti to supported device list.
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: 84c63435b4370af16908b0c6a89c6b5fa56fe170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84c63435b4370af16908b0c6a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Apr 23 00:17:45 2014 +0200 wined3d: Add NVIDIA Geforce GTX 780 Ti to supported device list. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 95031f1..eb4b48e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1271,6 +1271,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE6, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE6, 3072}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1687,6 +1688,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl } cards[] = { + {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ @@ -2190,6 +2192,7 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i /* Maxwell */ {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ + {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 28673b6..7e67f1e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1496,6 +1496,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184, CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, + CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Nikolay Sivov : uxtheme/tests: No need to check last error when error code is explicitly returned.
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: 3ca67bc849343361ed5ef081e75eab34b38e7e38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca67bc849343361ed5ef081e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 23 18:28:17 2014 +0400 uxtheme/tests: No need to check last error when error code is explicitly returned. --- dlls/uxtheme/tests/system.c | 62 ++----------------------------------------- 1 file changed, 2 insertions(+), 60 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 303ff8d..eab7b34 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -132,26 +132,16 @@ static void test_SetWindowTheme(void) HWND hWnd; BOOL bDestroyed; - SetLastError(0xdeadbeef); hRes = pSetWindowTheme(NULL, NULL, NULL); - todo_wine - { - ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); - } +todo_wine + ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); /* Only do the bare minimum to get a valid hwnd */ hWnd = CreateWindowExA(0, "static", "", WS_POPUP, 0,0,100,100,0, 0, 0, NULL); if (!hWnd) return; - SetLastError(0xdeadbeef); hRes = pSetWindowTheme(hWnd, NULL, NULL); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); bDestroyed = DestroyWindow(hWnd); if (!bDestroyed) @@ -279,20 +269,12 @@ static void test_OpenThemeData(void) "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); - SetLastError(0xdeadbeef); hRes = pCloseThemeData(hTheme); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); /* Close a second time */ - SetLastError(0xdeadbeef); hRes = pCloseThemeData(hTheme); ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); /* See if closing makes a difference for GetWindowTheme */ SetLastError(0xdeadbeef); @@ -476,28 +458,19 @@ static void test_GetCurrentThemeName(void) bThemeActive = pIsThemeActive(); /* All NULLs */ - SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(NULL, 0, NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); /* Number of characters given is 0 */ - SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, 0, NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == S_OK || broken(hRes == E_FAIL /* WinXP SP1 */), "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); - SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, 2, NULL, 0, NULL, 0); if (bThemeActive) todo_wine @@ -506,12 +479,8 @@ static void test_GetCurrentThemeName(void) "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); /* The same is true if the number of characters is too small for Color and/or Size */ - SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), currentColor, 2, currentSize, sizeof(currentSize) / sizeof(WCHAR)); @@ -522,23 +491,15 @@ static void test_GetCurrentThemeName(void) "Expected HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); /* Given number of characters is correct */ - SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); /* Given number of characters for the theme name is too large */ - SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme), NULL, 0, NULL, 0); if (bThemeActive) ok( hRes == E_POINTER || hRes == S_OK, "Expected E_POINTER or S_OK, got 0x%08x\n", hRes); @@ -546,12 +507,8 @@ static void test_GetCurrentThemeName(void) ok( hRes == E_PROP_ID_UNSUPPORTED || hRes == E_POINTER, /* win2k3 */ "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); /* The too large case is only for the theme name, not for color name or size name */ - SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), currentColor, sizeof(currentTheme), currentSize, sizeof(currentSize) / sizeof(WCHAR)); @@ -559,11 +516,7 @@ static void test_GetCurrentThemeName(void) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); - SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), currentColor, sizeof(currentTheme) / sizeof(WCHAR), currentSize, sizeof(currentSize)); @@ -571,12 +524,8 @@ static void test_GetCurrentThemeName(void) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); /* Correct call */ - SetLastError(0xdeadbeef); hRes = pGetCurrentThemeName(currentTheme, sizeof(currentTheme) / sizeof(WCHAR), currentColor, sizeof(currentColor) / sizeof(WCHAR), currentSize, sizeof(currentSize) / sizeof(WCHAR)); @@ -584,21 +533,14 @@ static void test_GetCurrentThemeName(void) ok( hRes == S_OK, "Expected S_OK, got 0x%08x\n", hRes); else ok( hRes == E_PROP_ID_UNSUPPORTED, "Expected E_PROP_ID_UNSUPPORTED, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); } static void test_CloseThemeData(void) { HRESULT hRes; - SetLastError(0xdeadbeef); hRes = pCloseThemeData(NULL); ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08x\n", hRes); - ok( GetLastError() == 0xdeadbeef, - "Expected 0xdeadbeef, got 0x%08x\n", - GetLastError()); } START_TEST(system)

1 0

Henri Verbeet : wined3d: Get rid of surface_set_texture_target().
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: 5cf9fe1c6338de3dfc3a288939af57267b0b2c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf9fe1c6338de3dfc3a28893… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 23 14:35:22 2014 +0200 wined3d: Get rid of surface_set_texture_target(). --- dlls/wined3d/surface.c | 41 +++++++++++----------------------------- dlls/wined3d/texture.c | 9 ++++----- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0e85b08..680a815 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -671,8 +671,6 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - surface->texture_target = GL_TEXTURE_2D; - /* Non-power2 support */ if (gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] || gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE]) @@ -1436,26 +1434,6 @@ static const struct wined3d_surface_ops gdi_surface_ops = gdi_surface_unmap, }; -void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) -{ - TRACE("surface %p, target %#x.\n", surface, target); - - if (surface->texture_target != target) - { - if (target == GL_TEXTURE_RECTANGLE_ARB) - { - surface->flags &= ~SFLAG_NORMCOORD; - } - else if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) - { - surface->flags |= SFLAG_NORMCOORD; - } - } - surface->texture_target = target; - surface->texture_level = level; - surface_force_reload(surface); -} - /* This call just downloads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ @@ -6300,7 +6278,7 @@ cpu: } static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, - const struct wined3d_resource_desc *desc, DWORD flags) + const struct wined3d_resource_desc *desc, GLenum target, GLint level, DWORD flags) { struct wined3d_device *device = container->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -6370,7 +6348,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text list_init(&surface->overlays); /* Flags */ - surface->flags |= SFLAG_NORMCOORD; /* Default to normalized coords. */ + if (target != GL_TEXTURE_RECTANGLE_ARB) + surface->flags |= SFLAG_NORMCOORD; if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; if (flags & WINED3D_SURFACE_PIN_SYSMEM) @@ -6379,6 +6358,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; surface->map_binding = WINED3D_LOCATION_SYSMEM; + surface->texture_target = target; + surface->texture_level = level; /* Call the private setup routine */ hr = surface->surface_ops->surface_private_setup(surface); @@ -6407,8 +6388,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text return hr; } -HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, - const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) +HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, + GLenum target, GLint level, DWORD flags, struct wined3d_surface **surface) { struct wined3d_device_parent *device_parent = container->resource.device->device_parent; const struct wined3d_parent_ops *parent_ops; @@ -6416,16 +6397,16 @@ HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, void *parent; HRESULT hr; - TRACE("container %p, width %u, height %u, format %s, usage %s (%#x), " - "pool %s, multisample_type %#x, multisample_quality %u, flags %#x, surface %p.\n", + TRACE("container %p, width %u, height %u, format %s, usage %s (%#x), pool %s, " + "multisample_type %#x, multisample_quality %u, target %#x, level %d, flags %#x, surface %p.\n", container, desc->width, desc->height, debug_d3dformat(desc->format), debug_d3dusage(desc->usage), desc->usage, debug_d3dpool(desc->pool), - desc->multisample_type, desc->multisample_quality, flags, surface); + desc->multisample_type, desc->multisample_quality, target, level, flags, surface); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = surface_init(object, container, desc, flags))) + if (FAILED(hr = surface_init(object, container, desc, target, level, flags))) { WARN("Failed to initialize surface, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 897af19..4291fd0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -744,7 +744,6 @@ static void texture2d_sub_resource_cleanup(struct wined3d_resource *sub_resource { struct wined3d_surface *surface = surface_from_resource(sub_resource); - surface_set_texture_target(surface, 0, 0); surface_set_container(surface, NULL); wined3d_surface_decref(surface); } @@ -879,14 +878,14 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi UINT idx = j * texture->level_count + i; struct wined3d_surface *surface; - if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, surface_flags, &surface))) + if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, + cube_targets[j], i, surface_flags, &surface))) { WARN("Failed to create surface, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - surface_set_texture_target(surface, cube_targets[j], i); texture->sub_resources[idx] = &surface->resource; TRACE("Created surface level %u @ %p.\n", i, surface); } @@ -1033,14 +1032,14 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 { struct wined3d_surface *surface; - if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, surface_flags, &surface))) + if (FAILED(hr = wined3d_surface_create(texture, &surface_desc, + texture->target, i, surface_flags, &surface))) { WARN("Failed to create surface, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - surface_set_texture_target(surface, texture->target, i); texture->sub_resources[i] = &surface->resource; TRACE("Created surface level %u @ %p.\n", i, surface); /* Calculate the next mipmap level. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9d526fc..28673b6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2299,8 +2299,8 @@ void surface_update_draw_binding(struct wined3d_surface *surface) DECLSPEC_HIDDE HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN; void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; -HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, - const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; +HRESULT wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, + GLenum target, GLint level, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Implement support for per-stage texture stage constants.
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: 23eed88fdedbbb7be67c60db369a09fcc00a2602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23eed88fdedbbb7be67c60db3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 23 14:35:21 2014 +0200 wined3d: Implement support for per-stage texture stage constants. This patch is loosely based on an earlier patch by Christian Costa. --- dlls/d3d9/tests/visual.c | 141 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 49 +++++++++++---- 2 files changed, 179 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23eed88fdedbbb7be67c6…

1 0

Nikolay Sivov : oleaut32: Properly free record name (Valgrind).
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: 383686275aa57f0dbaf4b69046a58997715d6508 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383686275aa57f0dbaf4b6904… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 23 11:21:53 2014 +0400 oleaut32: Properly free record name (Valgrind). --- dlls/oleaut32/recinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index 02ba61f..d6da64a 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -180,7 +180,7 @@ static ULONG WINAPI IRecordInfoImpl_Release(IRecordInfo *iface) int i; for(i=0; i<This->n_vars; i++) SysFreeString(This->fields[i].name); - HeapFree(GetProcessHeap(), 0, This->name); + SysFreeString(This->name); HeapFree(GetProcessHeap(), 0, This->fields); ITypeInfo_Release(This->pTypeInfo); HeapFree(GetProcessHeap(), 0, This);

1 0

André Hentschel : winemenubuilder: Use boolean return values in boolean functions.
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: aa7185a098d248c9bc237b3a26c7b787086754a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7185a098d248c9bc237b3a2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 22 23:37:03 2014 +0200 winemenubuilder: Use boolean return values in boolean functions. --- programs/winemenubuilder/winemenubuilder.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 592487f..ca58a4a 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3216,14 +3216,14 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) if( !linkname[0] ) { WINE_ERR("link name missing\n"); - return 1; + return TRUE; } len=GetFullPathNameW( linkname, MAX_PATH, fullname, NULL ); if (len==0 || len>MAX_PATH) { WINE_ERR("couldn't get full path of link file\n"); - return 1; + return TRUE; } r = CoCreateInstance( &CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, @@ -3231,14 +3231,14 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) if( FAILED( r ) ) { WINE_ERR("No IID_IShellLink\n"); - return 1; + return TRUE; } r = IShellLinkW_QueryInterface( sl, &IID_IPersistFile, (LPVOID*) &pf ); if( FAILED( r ) ) { WINE_ERR("No IID_IPersistFile\n"); - return 1; + return TRUE; } r = IPersistFile_Load( pf, fullname, STGM_READ ); @@ -3277,14 +3277,14 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait ) if( !urlname[0] ) { WINE_ERR("URL name missing\n"); - return 1; + return TRUE; } len=GetFullPathNameW( urlname, MAX_PATH, fullname, NULL ); if (len==0 || len>MAX_PATH) { WINE_ERR("couldn't get full path of URL file\n"); - return 1; + return TRUE; } r = CoCreateInstance( &CLSID_InternetShortcut, NULL, CLSCTX_INPROC_SERVER, @@ -3292,14 +3292,14 @@ static BOOL Process_URL( LPCWSTR urlname, BOOL bWait ) if( FAILED( r ) ) { WINE_ERR("No IID_IUniformResourceLocatorW\n"); - return 1; + return TRUE; } r = url->lpVtbl->QueryInterface( url, &IID_IPersistFile, (LPVOID*) &pf ); if( FAILED( r ) ) { WINE_ERR("No IID_IPersistFile\n"); - return 1; + return TRUE; } r = IPersistFile_Load( pf, fullname, STGM_READ ); if( SUCCEEDED( r ) )

1 0

Henri Verbeet : wined3d: Introduce a separate function to calculate the pitch for a given format and width.
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: 81fb749ecf5a4d009d26df2609f3d62e4525d7f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fb749ecf5a4d009d26df260… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 23 14:35:19 2014 +0200 wined3d: Introduce a separate function to calculate the pitch for a given format and width. --- dlls/wined3d/surface.c | 18 ++++-------------- dlls/wined3d/utils.c | 16 +++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7c5f053..0e85b08 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2435,7 +2435,7 @@ struct wined3d_palette * CDECL wined3d_surface_get_palette(const struct wined3d_ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) { - const struct wined3d_format *format = surface->resource.format; + unsigned int alignment; DWORD pitch; TRACE("surface %p.\n", surface); @@ -2443,19 +2443,9 @@ DWORD CDECL wined3d_surface_get_pitch(const struct wined3d_surface *surface) if (surface->pitch) return surface->pitch; - if (format->flags & WINED3DFMT_FLAG_BLOCKS) - { - /* Since compressed formats are block based, pitch means the amount of - * bytes to the next row of block rather than the next row of pixels. */ - UINT row_block_count = (surface->resource.width + format->block_width - 1) / format->block_width; - pitch = row_block_count * format->block_byte_count; - } - else - { - unsigned char alignment = surface->resource.device->surface_alignment; - pitch = surface->resource.format->byte_count * surface->resource.width; /* Bytes / row */ - pitch = (pitch + alignment - 1) & ~(alignment - 1); - } + alignment = surface->resource.device->surface_alignment; + pitch = wined3d_format_calculate_pitch(surface->resource.format, surface->resource.width); + pitch = (pitch + alignment - 1) & ~(alignment - 1); TRACE("Returning %u.\n", pitch); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 32426d9..78060e2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2019,9 +2019,20 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl return &gl_info->formats[idx]; } +UINT wined3d_format_calculate_pitch(const struct wined3d_format *format, UINT width) +{ + /* For block based formats, pitch means the amount of bytes to the next + * row of blocks rather than the next row of pixels. */ + if (format->flags & WINED3DFMT_FLAG_BLOCKS) + return format->block_byte_count * ((width + format->block_width - 1) / format->block_width); + + return format->byte_count * width; +} + UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) { + UINT pitch = wined3d_format_calculate_pitch(format, width); UINT size; if (format->id == WINED3DFMT_UNKNOWN) @@ -2030,13 +2041,12 @@ UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT ali } else if (format->flags & WINED3DFMT_FLAG_BLOCKS) { - UINT row_block_count = (width + format->block_width - 1) / format->block_width; UINT row_count = (height + format->block_height - 1) / format->block_height; - size = row_count * (((row_block_count * format->block_byte_count) + alignment - 1) & ~(alignment - 1)); + size = row_count * ((pitch + alignment - 1) & ~(alignment - 1)); } else { - size = height * (((width * format->byte_count) + alignment - 1) & ~(alignment - 1)); + size = height * ((pitch + alignment - 1) & ~(alignment - 1)); } if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4ab45cc..9d526fc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3040,6 +3040,7 @@ struct wined3d_format const struct wined3d_format *wined3d_get_format(const struct wined3d_gl_info *gl_info, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; +UINT wined3d_format_calculate_pitch(const struct wined3d_format *format, UINT width) DECLSPEC_HIDDEN; UINT wined3d_format_calculate_size(const struct wined3d_format *format, UINT alignment, UINT width, UINT height, UINT depth) DECLSPEC_HIDDEN; DWORD wined3d_format_convert_from_float(const struct wined3d_surface *surface,

1 0

André Hentschel : advapi32: Add stub for GetTraceLoggerHandle.
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: 7e01e08939eb5aa3815edf1829d0a3f41a9f591c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e01e08939eb5aa3815edf182… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 22 23:36:12 2014 +0200 advapi32: Add stub for GetTraceLoggerHandle. --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 10 ++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- include/evntrace.h | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 46f37fa..9e2ab05 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -353,7 +353,7 @@ @ stdcall GetTokenInformation(long long ptr long ptr) @ stub GetTraceEnableFlags @ stub GetTraceEnableLevel -@ stub GetTraceLoggerHandle +@ stdcall -ret64 GetTraceLoggerHandle(ptr) @ stdcall GetTrusteeFormA(ptr) @ stdcall GetTrusteeFormW(ptr) @ stdcall GetTrusteeNameA(ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index a239960..828f23b 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -378,6 +378,16 @@ BOOL WINAPI GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord ) } /****************************************************************************** + * GetTraceLoggerHandle [ADVAPI32.@] + */ +TRACEHANDLE WINAPI GetTraceLoggerHandle( PVOID buf ) +{ + FIXME("(%p) stub\n", buf); + SetLastError(ERROR_ACCESS_DENIED); + return INVALID_PROCESSTRACE_HANDLE; +} + +/****************************************************************************** * NotifyChangeEventLog [ADVAPI32.@] * * Enables an application to receive notification when an event is written diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index fd37c8c..73f3207 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -68,7 +68,7 @@ @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation @ stub GetTraceEnableFlags @ stub GetTraceEnableLevel -@ stub GetTraceLoggerHandle +@ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle @ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl @ stdcall InitializeSecurityDescriptor(ptr long) advapi32.InitializeSecurityDescriptor @ stdcall InitializeSid(ptr ptr long) advapi32.InitializeSid diff --git a/include/evntrace.h b/include/evntrace.h index 1516485..418e437 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -221,6 +221,7 @@ ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define FlushTrace WINELIB_NAME_AW(FlushTrace) +TRACEHANDLE WINAPI GetTraceLoggerHandle(PVOID); ULONG WINAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); ULONG WINAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); #define QueryAllTraces WINELIB_NAME_AW(QueryAllTraces)

1 0

Henri Verbeet : wined3d: Simplify the driver version info lookup in init_driver_info().
by Alexandre Julliard April 23, 2014

April 23, 2014

Module: wine Branch: master Commit: a1c63c2781d2ff3d7eb0a5ec0041939f662a734d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c63c2781d2ff3d7eb0a5ec0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 23 14:35:18 2014 +0200 wined3d: Simplify the driver version info lookup in init_driver_info(). --- dlls/wined3d/directx.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 649b986..36a638d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1510,8 +1510,8 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, * - the gpu is not in our database (can happen when the user overrides the vendor_id / device_id) * This could be an indication that our database is not up to date, so this should be fixed. */ - version_info = get_driver_version_info(driver, driver_model); - if (version_info) + if ((version_info = get_driver_version_info(driver, driver_model)) + || (version_info = get_driver_version_info(driver, DRIVER_MODEL_NT5X))) { driver_info->name = version_info->driver_name; driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, version_info->version); @@ -1519,22 +1519,11 @@ static void init_driver_info(struct wined3d_driver_info *driver_info, } else { - version_info = get_driver_version_info(driver, DRIVER_MODEL_NT5X); - if (version_info) - { - driver_info->name = version_info->driver_name; - driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, version_info->version); - driver_info->version_low = MAKEDWORD_VERSION(version_info->subversion, version_info->build); - } - else - { - driver_info->name = "Display"; - driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15); - driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ - - FIXME("Unable to find a driver/device info for vendor_id=%#x device_id=%#x for driver_model=%d\n", - vendor, device, driver_model); - } + ERR("No driver version info found for device %04x:%04x, driver model %#x.\n", + vendor, device, driver_model); + driver_info->name = "Display"; + driver_info->version_high = MAKEDWORD_VERSION(driver_os_version, 15); + driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ } TRACE("Reporting (fake) driver version 0x%08x-0x%08x.\n",

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.17
by Jeremy Newman April 23, 2014

April 23, 2014

Module: website Branch: master Commit: f40a090b0c48c38b67a37cca1b3e3ece9e7d4e80 URL: http://source.winehq.org/git/website.git/?a=commit;h=f40a090b0c48c38b67a37c… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue Apr 22 20:51:28 2014 +0200 Polish translation for release 1.7.17 --- news/pl/2014041801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/pl/2014041801.xml b/news/pl/2014041801.xml new file mode 100644 index 0000000..b67ddb0 --- /dev/null +++ b/news/pl/2014041801.xml @@ -0,0 +1,15 @@ +<news> +<date>Kwiecień 18, 2014</date> +<title>Wydano Wine 1.7.17</title> +<body> + Wydanie rozwojowe Wine 1.7.17 jest już dostępne. + <a href="{$root}/announce/1.7.17">Co nowego</a> w tym wydaniu: +<ul> + <li>Więcej implementacji z Harmonogramu Zadań.</li> + <li>Biblioteka uruchomieniowa C bardziej zgodna poprzez współdzielenie plików źródłowych.</li> + <li>Poprawki do obsługi joysticków na OS X.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.17.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0