October 2014 - Wine-Commits

Henri Verbeet : d3d9/tests: Allow a width and height to be passed to create_device().
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 2291c72caf14cd46d5533d9d2b2742510330e0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=2291c72caf14cd46d5533d9d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:48 2014 +0200 d3d9/tests: Allow a width and height to be passed to create_device(). --- dlls/d3d9/tests/device.c | 241 ++++++++++++++++++++++++++++------------------- 1 file changed, 143 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2291c72caf14cd46d5533…

1 0

Henri Verbeet : wined3d: Track texture coordinate normalization per-texture.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 180071229802f259fe1a1b099faad8e7154f4194 URL: http://source.winehq.org/git/wine.git/?a=commit;h=180071229802f259fe1a1b099… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:47 2014 +0200 wined3d: Track texture coordinate normalization per-texture. --- dlls/wined3d/surface.c | 4 +--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8019a11..75f48de 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3299,7 +3299,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st bottom = src_surface->resource.height - src_rect->top; } - if (src_surface->flags & SFLAG_NORMCOORD) + if (src_surface->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { left /= src_surface->pow2Width; right /= src_surface->pow2Width; @@ -5547,8 +5547,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text list_init(&surface->overlays); /* Flags */ - if (target != GL_TEXTURE_RECTANGLE_ARB) - surface->flags |= SFLAG_NORMCOORD; if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1eb2abb..25e2107 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -349,7 +349,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, context2 = context_acquire(device, backbuffer); context_apply_blit_state(context2, device); - if (backbuffer->flags & SFLAG_NORMCOORD) + if (backbuffer->container->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) { tex_left /= src_w; tex_right /= src_w; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 420355b..4f962f1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -81,7 +81,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->level_count = level_count; texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; - texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; if (surface_flags & WINED3D_SURFACE_PIN_SYSMEM) texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; @@ -1209,7 +1209,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->pow2_matrix[15] = 1.0f; texture->target = GL_TEXTURE_RECTANGLE_ARB; texture->flags |= WINED3D_TEXTURE_COND_NP2; - texture->flags &= ~WINED3D_TEXTURE_POW2_MAT_IDENT; + texture->flags &= ~(WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS); if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) texture->min_mip_lookup = minMipLookup_noMip; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7e8fb4..25d2406 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2131,6 +2131,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_CONVERTED 0x00000080 #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 #define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 +#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 struct wined3d_texture { @@ -2351,11 +2352,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DIBSECTION 0x00000001 /* Has a DIB section attached for GetDC. */ #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ -#define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ +#define SFLAG_LOST 0x00000008 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000010 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ -#define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ struct wined3d_sampler {

1 0

Henri Verbeet : wined3d: Track SFLAG_DYNLOCK per-texture.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: c5459881a30c8e7d4d6c9bb8fd2d73e040c54e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5459881a30c8e7d4d6c9bb8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:46 2014 +0200 wined3d: Track SFLAG_DYNLOCK per-texture. --- dlls/wined3d/surface.c | 20 +++++++++++--------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3339c5b..8019a11 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -589,11 +589,11 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) { /* In some conditions the surface memory must not be freed: * WINED3D_TEXTURE_CONVERTED: Converting the data back would take too long - * SFLAG_DYNLOCK: Avoid freeing the data for performance + * WINED3D_TEXTURE_DYNAMIC_MAP: Avoid freeing the data for performance * SFLAG_CLIENT: OpenGL uses our memory as backup */ - if (surface->resource.map_count - || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT) - || surface->container->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM)) + if (surface->resource.map_count || surface->flags & SFLAG_CLIENT + || surface->container->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM + | WINED3D_TEXTURE_DYNAMIC_MAP)) return; wined3d_resource_free_sysmem(&surface->resource); @@ -1450,8 +1450,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * get a boxed texture with width pow2width and not a texture of width resource.width. * * Performance should not be an issue, because applications normally do not lock the surfaces when - * rendering. If an app does, the SFLAG_DYNLOCK flag will kick in and the memory copy won't be released, - * and doesn't have to be re-read. */ + * rendering. If an app does, the WINED3D_TEXTURE_DYNAMIC_MAP flag will kick in and the memory copy + * won't be released, and doesn't have to be re-read. */ src_data = mem; dst_data = data.addr; TRACE("(%p) : Repacking the surface data from pitch %d to pitch %d\n", surface, src_pitch, dst_pitch); @@ -2617,13 +2617,15 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, /* Performance optimization: Count how often a surface is mapped, if it is * mapped regularly do not throw away the system memory copy. This avoids * the need to download the surface from OpenGL all the time. The surface - * is still downloaded if the OpenGL texture is changed. */ - if (!(surface->flags & SFLAG_DYNLOCK) && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) + * is still downloaded if the OpenGL texture is changed. Note that this + * only really makes sense for managed textures.*/ + if (!(surface->container->flags & WINED3D_TEXTURE_DYNAMIC_MAP) + && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) { if (++surface->lockCount > MAXLOCKCOUNT) { TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); - surface->flags |= SFLAG_DYNLOCK; + surface->container->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd4668e..d7e8fb4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2130,6 +2130,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_VALID 0x00000040 #define WINED3D_TEXTURE_CONVERTED 0x00000080 #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 +#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000200 struct wined3d_texture { @@ -2351,11 +2352,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DISCARD 0x00000002 /* ??? */ #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ -#define SFLAG_DYNLOCK 0x00000010 /* Surface is often locked by the application. */ +#define SFLAG_GLCKEY 0x00000010 /* The GL texture was created with a color key. */ #define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ -#define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ struct wined3d_sampler {

1 0

Henri Verbeet : wined3d: Track system memory pinning per-texture.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: d6a511e0220c5cb2c2b1c18d9698d46d342affb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a511e0220c5cb2c2b1c18d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 9 11:50:45 2014 +0200 wined3d: Track system memory pinning per-texture. --- dlls/wined3d/surface.c | 23 ++++++++++++----------- dlls/wined3d/texture.c | 23 +++++++++++++---------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 527601f..3339c5b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -592,8 +592,8 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_CLIENT: OpenGL uses our memory as backup */ if (surface->resource.map_count - || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT | SFLAG_PIN_SYSMEM) - || surface->container->flags & WINED3D_TEXTURE_CONVERTED) + || surface->flags & (SFLAG_DYNLOCK | SFLAG_CLIENT) + || surface->container->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM)) return; wined3d_resource_free_sysmem(&surface->resource); @@ -625,12 +625,14 @@ static void surface_release_client_storage(struct wined3d_surface *surface) static BOOL surface_use_pbo(const struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + struct wined3d_texture *texture = surface->container; - return surface->resource.pool == WINED3D_POOL_DEFAULT + return texture->resource.pool == WINED3D_POOL_DEFAULT && surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] - && !surface->resource.format->convert - && !(surface->flags & (SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)); + && !texture->resource.format->convert + && !(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM) + && !(surface->flags & SFLAG_NONPOW2); } static HRESULT surface_private_setup(struct wined3d_surface *surface) @@ -1481,8 +1483,8 @@ static void surface_upload_data(struct wined3d_surface *surface, const struct wi if (surface->resource.map_count) { - WARN("Uploading a surface that is currently mapped, setting SFLAG_PIN_SYSMEM.\n"); - surface->flags |= SFLAG_PIN_SYSMEM; + WARN("Uploading a surface that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); + surface->container->flags |= WINED3D_TEXTURE_PIN_SYSMEM; } if (format->flags & WINED3DFMT_FLAG_HEIGHT_SCALE) @@ -2742,7 +2744,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (FAILED(hr)) return WINED3DERR_INVALIDCALL; if (!(surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY - || surface->flags & SFLAG_PIN_SYSMEM + || surface->container->flags & WINED3D_TEXTURE_PIN_SYSMEM || surface->pbo)) surface->resource.map_binding = WINED3D_LOCATION_DIB; } @@ -2776,7 +2778,8 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) surface->resource.map_count--; surface->flags &= ~SFLAG_DCINUSE; - if (surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY || (surface->flags & SFLAG_PIN_SYSMEM + if (surface->resource.map_binding == WINED3D_LOCATION_USER_MEMORY + || (surface->container->flags & WINED3D_TEXTURE_PIN_SYSMEM && surface->resource.map_binding != WINED3D_LOCATION_DIB)) { /* The game Salammbo modifies the surface contents without mapping the surface between @@ -5546,8 +5549,6 @@ static HRESULT surface_init(struct wined3d_surface *surface, struct wined3d_text surface->flags |= SFLAG_NORMCOORD; if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; - if (flags & WINED3D_SURFACE_PIN_SYSMEM) - surface->flags |= SFLAG_PIN_SYSMEM; if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fb0f0e8..420355b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -28,19 +28,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_texture); WINE_DECLARE_DEBUG_CHANNEL(winediag); static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struct wined3d_texture_ops *texture_ops, - UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, struct wined3d_device *device, - void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) + UINT layer_count, UINT level_count, const struct wined3d_resource_desc *desc, DWORD surface_flags, + struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops, + const struct wined3d_resource_ops *resource_ops) { const struct wined3d_format *format = wined3d_get_format(&device->adapter->gl_info, desc->format); HRESULT hr; TRACE("texture %p, texture_ops %p, layer_count %u, level_count %u, resource_type %s, format %s, " "multisample_type %#x, multisample_quality %#x, usage %s, pool %s, width %u, height %u, depth %u, " - "device %p, parent %p, parent_ops %p, resource_ops %p.\n", + "surface_flags %#x, device %p, parent %p, parent_ops %p, resource_ops %p.\n", texture, texture_ops, layer_count, level_count, debug_d3dresourcetype(desc->resource_type), debug_d3dformat(desc->format), desc->multisample_type, desc->multisample_quality, debug_d3dusage(desc->usage), debug_d3dpool(desc->pool), desc->width, desc->height, desc->depth, - device, parent, parent_ops, resource_ops); + surface_flags, device, parent, parent_ops, resource_ops); if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY)) == WINED3DFMT_FLAG_BLOCKS) { @@ -81,6 +82,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->filter_type = (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) ? WINED3D_TEXF_LINEAR : WINED3D_TEXF_NONE; texture->lod = 0; texture->flags = WINED3D_TEXTURE_POW2_MAT_IDENT; + if (surface_flags & WINED3D_SURFACE_PIN_SYSMEM) + texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; if (texture->resource.format->flags & WINED3DFMT_FLAG_FILTERING) { @@ -1053,8 +1056,8 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi } } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, - desc, device, parent, parent_ops, &texture_resource_ops))) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 6, levels, desc, + surface_flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x\n", hr); return hr; @@ -1178,8 +1181,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 TRACE("Calculated levels = %u.\n", levels); } - if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, - desc, device, parent, parent_ops, &texture_resource_ops))) + if (FAILED(hr = wined3d_texture_init(texture, &texture2d_ops, 1, levels, desc, + surface_flags, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; @@ -1404,8 +1407,8 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } } - if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, - desc, device, parent, parent_ops, &texture_resource_ops))) + if (FAILED(hr = wined3d_texture_init(texture, &texture3d_ops, 1, levels, desc, + 0, device, parent, parent_ops, &texture_resource_ops))) { WARN("Failed to initialize texture, returning %#x.\n", hr); return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 810da0f..dd4668e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2129,6 +2129,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_ALLOCATED 0x00000020 #define WINED3D_TEXTURE_SRGB_VALID 0x00000040 #define WINED3D_TEXTURE_CONVERTED 0x00000080 +#define WINED3D_TEXTURE_PIN_SYSMEM 0x00000100 struct wined3d_texture { @@ -2351,11 +2352,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_NONPOW2 0x00000004 /* Surface sizes are not a power of 2 */ #define SFLAG_NORMCOORD 0x00000008 /* Set if GL texture coordinates are normalized (non-texture rectangle). */ #define SFLAG_DYNLOCK 0x00000010 /* Surface is often locked by the application. */ -#define SFLAG_PIN_SYSMEM 0x00000020 /* Keep the surface in sysmem, at the same address. */ +#define SFLAG_CLIENT 0x00000020 /* GL_APPLE_client_storage is used with this surface. */ #define SFLAG_DCINUSE 0x00000040 /* Set between GetDC and ReleaseDC calls. */ #define SFLAG_LOST 0x00000080 /* Surface lost flag for ddraw. */ #define SFLAG_GLCKEY 0x00000100 /* The GL texture was created with a color key. */ -#define SFLAG_CLIENT 0x00000200 /* GL_APPLE_client_storage is used with this surface. */ struct wined3d_sampler {

1 0

André Hentschel : kernel32/tests: Skip on faked version values.
by Alexandre Julliard Oct. 9, 2014

Oct. 9, 2014

Module: wine Branch: master Commit: 8e917352e1aaf4734b2175ee04b90c55ed7b6964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e917352e1aaf4734b2175ee0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Oct 6 22:31:43 2014 +0200 kernel32/tests: Skip on faked version values. --- dlls/kernel32/tests/version.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index e27ea4c..a47e52c 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -23,23 +23,29 @@ #include "wine/test.h" #include "winbase.h" +#include "winternl.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); static BOOL (WINAPI * pVerifyVersionInfoA)(LPOSVERSIONINFOEXA, DWORD, DWORDLONG); static ULONGLONG (WINAPI * pVerSetConditionMask)(ULONGLONG, DWORD, BYTE); +static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); -#define KERNEL32_GET_PROC(func) \ - p##func = (void *)GetProcAddress(hKernel32, #func); +#define GET_PROC(func) \ + p##func = (void *)GetProcAddress(hmod, #func); static void init_function_pointers(void) { - HMODULE hKernel32; + HMODULE hmod; - hKernel32 = GetModuleHandleA("kernel32.dll"); + hmod = GetModuleHandleA("kernel32.dll"); - KERNEL32_GET_PROC(GetProductInfo); - KERNEL32_GET_PROC(VerifyVersionInfoA); - KERNEL32_GET_PROC(VerSetConditionMask); + GET_PROC(GetProductInfo); + GET_PROC(VerifyVersionInfoA); + GET_PROC(VerSetConditionMask); + + hmod = GetModuleHandleA("ntdll.dll"); + + GET_PROC(RtlGetVersion); } static void test_GetProductInfo(void) @@ -170,6 +176,21 @@ static void test_VerifyVersionInfo(void) info.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA); GetVersionExA((OSVERSIONINFOA *)&info); servicepack = info.wServicePackMajor; + + /* Win8.1+ returns Win8 version in GetVersionEx when there's no app manifest targeting 8.1 */ + if (info.dwMajorVersion == 6 && info.dwMinorVersion == 2) + { + RTL_OSVERSIONINFOEXW rtlinfo; + rtlinfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + ok(SUCCEEDED(pRtlGetVersion(&rtlinfo)), "RtlGetVersion failed\n"); + + if (rtlinfo.dwMajorVersion != 6 || rtlinfo.dwMinorVersion != 2) + { + win_skip("GetVersionEx and VerifyVersionInfo are faking values\n"); + return; + } + } + memset(&info, 0, sizeof(info)); ret = pVerifyVersionInfoA(&info, VER_MAJORVERSION | VER_MINORVERSION,

1 0

André Hentschel : winetest: Detect real version values.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 6d498018cc8d85a7126fe72ef4192cd3480f8405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d498018cc8d85a7126fe72ef… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 19:52:59 2014 +0200 winetest: Detect real version values. --- programs/winetest/main.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index cde618f..2afa813 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -32,6 +32,7 @@ #include <stdio.h> #include <assert.h> #include <windows.h> +#include <winternl.h> #include <mshtml.h> #include "winetest.h" @@ -323,11 +324,14 @@ static void print_version (void) # error CPU unknown #endif OSVERSIONINFOEXA ver; + RTL_OSVERSIONINFOEXW rtlver; BOOL ext; int is_win2k3_r2, is_admin, is_elevated; const char *(CDECL *wine_get_build_id)(void); + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); void (CDECL *wine_get_host_version)( const char **sysname, const char **release ); BOOL (WINAPI *pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); + NTSTATUS (WINAPI *pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); ver.dwOSVersionInfoSize = sizeof(ver); if (!(ext = GetVersionExA ((OSVERSIONINFOA *) &ver))) @@ -336,6 +340,27 @@ static void print_version (void) if (!GetVersionExA ((OSVERSIONINFOA *) &ver)) report (R_FATAL, "Can't get OS version."); } + + /* try to get non-faked values */ + if (ver.dwMajorVersion == 6 && ver.dwMinorVersion == 2) + { + rtlver.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW); + + pRtlGetVersion = (void *)GetProcAddress(hntdll, "RtlGetVersion"); + pRtlGetVersion(&rtlver); + + ver.dwMajorVersion = rtlver.dwMajorVersion; + ver.dwMinorVersion = rtlver.dwMinorVersion; + ver.dwBuildNumber = rtlver.dwBuildNumber; + ver.dwPlatformId = rtlver.dwPlatformId; + ver.wServicePackMajor = rtlver.wServicePackMajor; + ver.wServicePackMinor = rtlver.wServicePackMinor; + ver.wSuiteMask = rtlver.wSuiteMask; + ver.wProductType = rtlver.wProductType; + + WideCharToMultiByte(CP_ACP, 0, rtlver.szCSDVersion, -1, ver.szCSDVersion, sizeof(ver.szCSDVersion), NULL, NULL); + } + xprintf (" Platform=%s%s\n", platform, is_wow64 ? " (WOW64)" : ""); xprintf (" bRunningUnderWine=%d\n", running_under_wine ()); xprintf (" bRunningOnVisibleDesktop=%d\n", running_on_visible_desktop ()); @@ -358,8 +383,8 @@ static void print_version (void) ver.dwMajorVersion, ver.dwMinorVersion, ver.dwBuildNumber, ver.dwPlatformId, ver.szCSDVersion); - wine_get_build_id = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_build_id"); - wine_get_host_version = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "wine_get_host_version"); + wine_get_build_id = (void *)GetProcAddress(hntdll, "wine_get_build_id"); + wine_get_host_version = (void *)GetProcAddress(hntdll, "wine_get_host_version"); if (wine_get_build_id) xprintf( " WineBuild=%s\n", wine_get_build_id() ); if (wine_get_host_version) {

1 0

André Hentschel : ntdll: Add support for Win 8.1.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 778c2ab6f9c7dc1d5ff0d340d8e4571a888cdb8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=778c2ab6f9c7dc1d5ff0d340d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:27:45 2014 +0200 ntdll: Add support for Win 8.1. --- dlls/ntdll/version.c | 8 ++++++++ programs/winecfg/appdefaults.c | 1 + 2 files changed, 9 insertions(+) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 57e586a..a6340eb 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -57,6 +57,7 @@ typedef enum WIN2K8R2,/* Windows 2008 R2 */ WIN7, /* Windows 7 */ WIN8, /* Windows 8 */ + WIN81, /* Windows 8.1 */ NB_WINDOWS_VERSIONS } WINDOWS_VERSION; @@ -177,6 +178,12 @@ static const RTL_OSVERSIONINFOEXW VersionData[NB_WINDOWS_VERSIONS] = {' ',0}, 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 }, + /* WIN81 */ + { + sizeof(RTL_OSVERSIONINFOEXW), 6, 3, 0x2580, VER_PLATFORM_WIN32_NT, + {' ',0}, + 0, 0, VER_SUITE_SINGLEUSERTS, VER_NT_WORKSTATION, 0 + }, }; @@ -199,6 +206,7 @@ static const char * const WinVersionNames[NB_WINDOWS_VERSIONS] = "win2008r2,win2k8r2", /* WIN2K8R2 */ "win7", /* WIN7 */ "win8", /* WIN8 */ + "win81", /* WIN81 */ }; diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 3b83860..6106b23 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -49,6 +49,7 @@ static const struct const char *szProductType; } win_versions[] = { + { "win81", "Windows 8.1", 6, 3, 0x2580,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win8", "Windows 8", 6, 2, 0x23F0,VER_PLATFORM_WIN32_NT, " ", 0, 0, "WinNT"}, { "win2008r2", "Windows 2008 R2", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "ServerNT"}, { "win7", "Windows 7", 6, 1, 0x1DB1,VER_PLATFORM_WIN32_NT, "Service Pack 1", 1, 0, "WinNT"},

1 0

André Hentschel : slc: Add stub for SLGetWindowsInformation.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: e97746a538467835db2a278e442d67116dda853b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97746a538467835db2a278e4… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 7 21:27:30 2014 +0200 slc: Add stub for SLGetWindowsInformation. --- dlls/slc/slc.c | 9 ++++++++- dlls/slc/slc.spec | 2 +- include/slpublic.h | 13 ++++++++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index e7416f1..1b02c9b 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -28,7 +28,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(slc); -DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) +HRESULT WINAPI SLGetWindowsInformation(LPCWSTR name, SLDATATYPE *type, UINT *val, LPBYTE *size) +{ + FIXME("(%s %p %p %p) stub\n", debugstr_w(name), type, val, size ); + + return SL_E_RIGHT_NOT_GRANTED; +} + +HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue) { FIXME("(%s) stub\n", debugstr_w(lpszValueName) ); diff --git a/dlls/slc/slc.spec b/dlls/slc/slc.spec index 45cd1ba..af5545c 100644 --- a/dlls/slc/slc.spec +++ b/dlls/slc/slc.spec @@ -25,7 +25,7 @@ @ stub SLGetSAMLicense @ stub SLGetSLIDList @ stub SLGetServiceInformation -@ stub SLGetWindowsInformation +@ stdcall SLGetWindowsInformation(wstr ptr ptr ptr) @ stdcall SLGetWindowsInformationDWORD(wstr ptr) @ stub SLInstallLicense @ stub SLInstallProofOfPurchase diff --git a/include/slpublic.h b/include/slpublic.h index a2c6d42..c8bb559 100644 --- a/include/slpublic.h +++ b/include/slpublic.h @@ -29,7 +29,18 @@ extern "C" { #define SLCAPI DECLSPEC_IMPORT #endif -SLCAPI DWORD WINAPI SLGetWindowsInformationDWORD(LPCWSTR lpszValueName, LPDWORD pdwValue); +typedef enum _tagSLDATATYPE +{ + SL_DATA_NONE = REG_NONE, + SL_DATA_SZ = REG_SZ, + SL_DATA_DWORD = REG_DWORD, + SL_DATA_BINARY = REG_BINARY, + SL_DATA_MULTI_SZ = REG_MULTI_SZ, + SL_DATA_SUM = 100, +} SLDATATYPE; + +SLCAPI HRESULT WINAPI SLGetWindowsInformation(LPCWSTR, SLDATATYPE*, UINT*, LPBYTE*); +SLCAPI HRESULT WINAPI SLGetWindowsInformationDWORD(LPCWSTR, LPDWORD); #ifdef __cplusplus

1 0

Austin English : wsnmp32: Add stub for SnmpOpen.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 80c3a8f8bc58fff8725f52e23a4f9860af0f95e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c3a8f8bc58fff8725f52e23… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 11:12:16 2014 -0500 wsnmp32: Add stub for SnmpOpen. --- dlls/wsnmp32/wsnmp32.c | 6 ++++++ dlls/wsnmp32/wsnmp32.spec | 2 +- include/winsnmp.h | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wsnmp32/wsnmp32.c b/dlls/wsnmp32/wsnmp32.c index 721842f..3dc54cb 100644 --- a/dlls/wsnmp32/wsnmp32.c +++ b/dlls/wsnmp32/wsnmp32.c @@ -45,6 +45,12 @@ SNMPAPI_STATUS WINAPI SnmpCleanup( void ) return SNMPAPI_SUCCESS; } +HSNMP_SESSION WINAPI SnmpOpen( HWND hwnd, UINT msg ) +{ + FIXME( "%p %u\n", hwnd, msg ); + return SNMPAPI_FAILURE; +} + SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode( smiUINT32 retransmit_mode ) { FIXME( "%u\n", retransmit_mode ); diff --git a/dlls/wsnmp32/wsnmp32.spec b/dlls/wsnmp32/wsnmp32.spec index 197092a..61e48ba 100644 --- a/dlls/wsnmp32/wsnmp32.spec +++ b/dlls/wsnmp32/wsnmp32.spec @@ -11,7 +11,7 @@ 120 stub SnmpGetVendorInfo 200 stdcall SnmpStartup(ptr ptr ptr ptr ptr) 201 stdcall SnmpCleanup() -202 stub SnmpOpen +202 stdcall SnmpOpen(ptr long) 203 stub SnmpClose 204 stub SnmpSendMsg 205 stub SnmpRecvMsg diff --git a/include/winsnmp.h b/include/winsnmp.h index 64765de..79a5e88 100644 --- a/include/winsnmp.h +++ b/include/winsnmp.h @@ -27,6 +27,7 @@ typedef int smiINT, *smiLPINT; typedef smiINT smiINT32, *smiLPINT32; typedef unsigned int smiUINT32, *smiLPUINT32; typedef smiUINT32 SNMPAPI_STATUS; +typedef HANDLE HSNMP_SESSION; #define SNMPAPI_NO_SUPPORT 0 #define SNMPAPI_V1_SUPPORT 1 @@ -44,6 +45,7 @@ typedef smiUINT32 SNMPAPI_STATUS; #define SNMPAPI_SUCCESS 1 SNMPAPI_STATUS WINAPI SnmpCleanup(void); +HSNMP_SESSION WINAPI SnmpOpen(HWND,UINT); SNMPAPI_STATUS WINAPI SnmpSetRetransmitMode(smiUINT32); SNMPAPI_STATUS WINAPI SnmpSetTranslateMode(smiUINT32); SNMPAPI_STATUS WINAPI SnmpStartup(smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32,smiLPUINT32);

1 0

Austin English : ntdsapi: Add stubs for DsBindA/W.
by Alexandre Julliard Oct. 8, 2014

Oct. 8, 2014

Module: wine Branch: master Commit: 35b90ece93aeaec2affc571b1420a9ec569125f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35b90ece93aeaec2affc571b1… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 7 11:46:05 2014 -0500 ntdsapi: Add stubs for DsBindA/W. --- dlls/ntdsapi/ntdsapi.c | 18 ++++++++++++++++++ dlls/ntdsapi/ntdsapi.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 1ffbd9d..4ca3b09 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -48,6 +48,24 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) } /*********************************************************************** + * DsBindA (NTDSAPI.@) + */ +DWORD WINAPI DsBindA(LPCSTR controller, LPCSTR domain, HANDLE *handle) + { + FIXME("(%s,%s, %p): stub!\n", debugstr_a(controller), debugstr_a(domain), handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DsBindW (NTDSAPI.@) + */ +DWORD WINAPI DsBindW(LPCWSTR controller, LPCWSTR domain, HANDLE *handle) + { + FIXME("(%s,%s, %p): stub!\n", debugstr_w(controller), debugstr_w(domain), handle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * DsMakeSpnW (NTDSAPI.@) */ DWORD WINAPI DsMakeSpnW(LPCWSTR svc_class, LPCWSTR svc_name, diff --git a/dlls/ntdsapi/ntdsapi.spec b/dlls/ntdsapi/ntdsapi.spec index f4ae6f8..b3ed8be 100644 --- a/dlls/ntdsapi/ntdsapi.spec +++ b/dlls/ntdsapi/ntdsapi.spec @@ -1,7 +1,7 @@ @ stub DsAddSidHistoryA @ stub DsAddSidHistoryW -@ stub DsBindA -@ stub DsBindW +@ stdcall DsBindA(str str ptr) +@ stdcall DsBindW(wstr wstr ptr) @ stub DsBindWithCredA @ stub DsBindWithCredW @ stub DsBindWithSpnA

1 0