October 2014 - Wine-commits

Amine Khaldi : kernel32: Remove some unused variables (Clang).
by Alexandre Julliard 23 Oct '14

23 Oct '14

Module: wine Branch: master Commit: 810ed5c85a0bccfe35dc7d4c3c7621216e13c9ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=810ed5c85a0bccfe35dc7d4c3… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Wed Oct 22 19:10:21 2014 +0100 kernel32: Remove some unused variables (Clang). --- dlls/kernel32/format_msg.c | 2 -- dlls/kernel32/locale.c | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index cdbc944..5741713 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -68,8 +68,6 @@ struct format_args * Yes, ANSI strings in win32 resources. Go figure. */ -static const WCHAR FMTWSTR[] = { '%','s',0 }; - /********************************************************************** * load_message (internal) */ diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 730574b..171f14c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3456,17 +3456,6 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz return bRet; } -/* Registry keys for NLS related information */ - -static const WCHAR szCountryListName[] = { - 'M','a','c','h','i','n','e','\\','S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'T','e','l','e','p','h','o','n','y','\\', - 'C','o','u','n','t','r','y',' ','L','i','s','t','\0' -}; - - /* Callback function ptrs for EnumSystemLanguageGroupsA/W */ typedef struct {

1 0

Stefan Dösinger : d3d8/tests: Skip unsupported resources in test_resource_type.
by Alexandre Julliard 23 Oct '14

23 Oct '14

Module: wine Branch: master Commit: 86168c4e908807fc23a33bb99bdd7f59f1312249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86168c4e908807fc23a33bb99… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 21:56:36 2014 +0200 d3d8/tests: Skip unsupported resources in test_resource_type. --- dlls/d3d8/tests/device.c | 138 ++++++++++++++++++++++++++--------------------- 1 file changed, 76 insertions(+), 62 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9ffac8b..5f8f52a 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -6070,6 +6070,7 @@ static void test_resource_type(void) ULONG refcount; HWND window; HRESULT hr; + D3DCAPS8 caps; window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL); @@ -6083,6 +6084,9 @@ static void test_resource_type(void) return; } + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateImageSurface(device, 4, 4, D3DFMT_X8R8G8B8, &surface); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); @@ -6130,68 +6134,78 @@ static void test_resource_type(void) IDirect3DSurface8_Release(surface); IDirect3DTexture8_Release(texture); - hr = IDirect3DDevice8_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, - D3DPOOL_SYSTEMMEM, &cube_texture); - ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); - type = IDirect3DCubeTexture8_GetType(cube_texture); - ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); - - hr = IDirect3DCubeTexture8_GetCubeMapSurface(cube_texture, - D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); - ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); - hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); - ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", - surface_desc.Type); - hr = IDirect3DCubeTexture8_GetLevelDesc(cube_texture, 0, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); - ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", - surface_desc.Type); - IDirect3DSurface8_Release(surface); - IDirect3DCubeTexture8_Release(cube_texture); - - hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, - D3DPOOL_SYSTEMMEM, &volume_texture); - type = IDirect3DVolumeTexture8_GetType(volume_texture); - ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); - - hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 0, &volume); - ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); - /* IDirect3DVolume8 is not an IDirect3DResource8 and has no GetType method. */ - hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); - hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 0, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); - IDirect3DVolume8_Release(volume); - - hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 2, &volume); - ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); - hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); - hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 2, &volume_desc); - ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); - ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", - volume_desc.Type); - ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); - ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); - ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); - IDirect3DVolume8_Release(volume); - IDirect3DVolumeTexture8_Release(volume_texture); + if (caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + hr = IDirect3DDevice8_CreateCubeTexture(device, 1, 1, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &cube_texture); + ok(SUCCEEDED(hr), "Failed to create cube texture, hr %#x.\n", hr); + type = IDirect3DCubeTexture8_GetType(cube_texture); + ok(type == D3DRTYPE_CUBETEXTURE, "Expected type D3DRTYPE_CUBETEXTURE, got %u.\n", type); + + hr = IDirect3DCubeTexture8_GetCubeMapSurface(cube_texture, + D3DCUBEMAP_FACE_NEGATIVE_X, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get cube map surface, hr %#x.\n", hr); + hr = IDirect3DSurface8_GetDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get surface description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + hr = IDirect3DCubeTexture8_GetLevelDesc(cube_texture, 0, &surface_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(surface_desc.Type == D3DRTYPE_SURFACE, "Expected type D3DRTYPE_SURFACE, got %u.\n", + surface_desc.Type); + IDirect3DSurface8_Release(surface); + IDirect3DCubeTexture8_Release(cube_texture); + } + else + skip("Cube maps not supported.\n"); + + if (caps.TextureCaps & D3DPTEXTURECAPS_MIPVOLUMEMAP) + { + hr = IDirect3DDevice8_CreateVolumeTexture(device, 2, 4, 8, 4, 0, D3DFMT_X8R8G8B8, + D3DPOOL_SYSTEMMEM, &volume_texture); + type = IDirect3DVolumeTexture8_GetType(volume_texture); + ok(type == D3DRTYPE_VOLUMETEXTURE, "Expected type D3DRTYPE_VOLUMETEXTURE, got %u.\n", type); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 0, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + /* IDirect3DVolume8 is not an IDirect3DResource8 and has no GetType method. */ + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 0, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 2, "Expected width 2, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 4, "Expected height 4, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 8, "Expected depth 8, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + + hr = IDirect3DVolumeTexture8_GetVolumeLevel(volume_texture, 2, &volume); + ok(SUCCEEDED(hr), "Failed to get volume level, hr %#x.\n", hr); + hr = IDirect3DVolume8_GetDesc(volume, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get volume description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + hr = IDirect3DVolumeTexture8_GetLevelDesc(volume_texture, 2, &volume_desc); + ok(SUCCEEDED(hr), "Failed to get level description, hr %#x.\n", hr); + ok(volume_desc.Type == D3DRTYPE_VOLUME, "Expected type D3DRTYPE_VOLUME, got %u.\n", + volume_desc.Type); + ok(volume_desc.Width == 1, "Expected width 1, got %u.\n", volume_desc.Width); + ok(volume_desc.Height == 1, "Expected height 1, got %u.\n", volume_desc.Height); + ok(volume_desc.Depth == 2, "Expected depth 2, got %u.\n", volume_desc.Depth); + IDirect3DVolume8_Release(volume); + IDirect3DVolumeTexture8_Release(volume_texture); + } + else + skip("Mipmapped volume maps not supported.\n"); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : d3d9/tests: Skip unsupported resources in test_resource_type.
by Alexandre Julliard 23 Oct '14

23 Oct '14

Module: wine Branch: master Commit: 6334bf09b7850dc13dd197155a69659a9d2aa598 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6334bf09b7850dc13dd197155… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 21:56:37 2014 +0200 d3d9/tests: Skip unsupported resources in test_resource_type. --- dlls/d3d9/tests/device.c | 144 ++++++++++++++++++++++++++--------------------- 1 file changed, 79 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6334bf09b7850dc13dd19…

1 0

Stefan Dösinger : wined3d: Remove texture locations after downloading all subresources.
by Alexandre Julliard 23 Oct '14

23 Oct '14

Module: wine Branch: master Commit: aad1997dff990ceeba90ece0d535c7826044a5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad1997dff990ceeba90ece0d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 21:56:38 2014 +0200 wined3d: Remove texture locations after downloading all subresources. --- dlls/wined3d/surface.c | 1 - dlls/wined3d/texture.c | 1 + dlls/wined3d/volume.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 75f48de..092cbe6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1207,7 +1207,6 @@ static void surface_unload(struct wined3d_resource *resource) surface_load_location(surface, surface->resource.map_binding); surface_invalidate_location(surface, ~surface->resource.map_binding); } - wined3d_texture_force_reload(surface->container); context = context_acquire(device, NULL); gl_info = context->gl_info; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4f962f1..6ecd414 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -979,6 +979,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) sub_resource->resource_ops->resource_unload(sub_resource); } + wined3d_texture_force_reload(texture); wined3d_texture_unload_gl_texture(texture); } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 0cbc7d4..58d7321 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -451,7 +451,6 @@ static void volume_unload(struct wined3d_resource *resource) } /* The texture name is managed by the container. */ - wined3d_texture_force_reload(volume->container); volume->flags &= ~WINED3D_VFLAG_CLIENT_STORAGE; resource_unload(resource);

1 0

Nikolay Sivov : dwrite/tests: Create separate isolated factory for each test.
by Alexandre Julliard 23 Oct '14

23 Oct '14

Module: wine Branch: master Commit: 272964666a9ab6decdc58fc6be4fc247504aad73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272964666a9ab6decdc58fc6b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 22 15:42:30 2014 +0400 dwrite/tests: Create separate isolated factory for each test. --- dlls/dwrite/tests/font.c | 91 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 81 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=272964666a9ab6decdc58…

1 0

Nikolay Sivov : dwrite/tests: Some tests for local font file loader.
by Alexandre Julliard 23 Oct '14

23 Oct '14

Module: wine Branch: master Commit: 561ac1d8296a8af90b39565f2c14e34b5792b62c URL: http://source.winehq.org/git/wine.git/?a=commit;h=561ac1d8296a8af90b39565f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 22 16:33:29 2014 +0400 dwrite/tests: Some tests for local font file loader. --- dlls/dwrite/tests/font.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e7827ef..77571f0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -859,8 +859,13 @@ todo_wine static void test_system_fontcollection(void) { IDWriteFontCollection *collection, *coll2; + IDWriteLocalFontFileLoader *localloader; IDWriteFactory *factory, *factory2; + IDWriteFontFileLoader *loader; IDWriteFontFamily *family; + IDWriteFontFace *fontface; + IDWriteFontFile *file; + IDWriteFont *font; HRESULT hr; UINT32 i; BOOL ret; @@ -904,6 +909,42 @@ static void test_system_fontcollection(void) ok(ret, "got %d\n", ret); ok(i != (UINT32)-1, "got %u\n", i); + /* get back local file loader */ + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFamily_Release(family); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + i = 1; + file = NULL; + hr = IDWriteFontFace_GetFiles(fontface, &i, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(file != NULL, "got %p\n", file); + +if (file) { + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void**)&localloader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteLocalFontFileLoader_Release(localloader); + + /* local loader is not registered by default */ + hr = IDWriteFactory_RegisterFontFileLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFactory_UnregisterFontFileLoader(factory, loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFileLoader_Release(loader); +} ret = TRUE; i = 0; hr = IDWriteFontCollection_FindFamilyName(collection, blahW, &i, &ret);

1 0

Jactry Zeng : prntvpt: Add stub dll.
by Alexandre Julliard 22 Oct '14

22 Oct '14

Module: wine Branch: master Commit: 16ab1bdd5f408e7dd4abe76ca841a89d70232d2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ab1bdd5f408e7dd4abe76ca… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Oct 22 18:48:44 2014 +0800 prntvpt: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/prntvpt/Makefile.in | 4 ++++ dlls/prntvpt/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/prntvpt/prntvpt.spec | 27 +++++++++++++++++++++++++++ 5 files changed, 77 insertions(+) diff --git a/configure b/configure index a11c3d7..d2bada5 100755 --- a/configure +++ b/configure @@ -1180,6 +1180,7 @@ enable_photometadatahandler enable_pidgen enable_powrprof enable_printui +enable_prntvpt enable_propsys enable_psapi enable_pstorec @@ -17224,6 +17225,7 @@ wine_fn_config_dll photometadatahandler enable_photometadatahandler wine_fn_config_dll pidgen enable_pidgen wine_fn_config_dll powrprof enable_powrprof implib wine_fn_config_dll printui enable_printui +wine_fn_config_dll prntvpt enable_prntvpt wine_fn_config_dll propsys enable_propsys clean,implib wine_fn_config_test dlls/propsys/tests propsys_test wine_fn_config_dll psapi enable_psapi implib diff --git a/configure.ac b/configure.ac index 5ebc2c3..ea016b1 100644 --- a/configure.ac +++ b/configure.ac @@ -3108,6 +3108,7 @@ WINE_CONFIG_DLL(photometadatahandler) WINE_CONFIG_DLL(pidgen) WINE_CONFIG_DLL(powrprof,,[implib]) WINE_CONFIG_DLL(printui) +WINE_CONFIG_DLL(prntvpt) WINE_CONFIG_DLL(propsys,,[clean,implib]) WINE_CONFIG_TEST(dlls/propsys/tests) WINE_CONFIG_DLL(psapi,,[implib]) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in new file mode 100644 index 0000000..ce05f50 --- /dev/null +++ b/dlls/prntvpt/Makefile.in @@ -0,0 +1,4 @@ +MODULE = prntvpt.dll + +C_SRCS = \ + main.c diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c new file mode 100644 index 0000000..f5abde9 --- /dev/null +++ b/dlls/prntvpt/main.c @@ -0,0 +1,43 @@ +/* + * Print Ticket Services Module + * + * Copyright 2014 Jactry Zeng for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(prntvpt); + +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID reserved) +{ + TRACE("(%p, %d, %p)\n", hinst, reason, reserved); + + switch(reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + break; + } + return TRUE; +} diff --git a/dlls/prntvpt/prntvpt.spec b/dlls/prntvpt/prntvpt.spec new file mode 100644 index 0000000..3f5e329 --- /dev/null +++ b/dlls/prntvpt/prntvpt.spec @@ -0,0 +1,27 @@ +1 stub PTQuerySchemaVersionSupport +2 stub PTOpenProvider +3 stub PTOpenProviderEx +4 stub PTCloseProvider +5 stub BindPTProviderThunk +6 stub PTGetPrintCapabilities +7 stub PTMergeAndValidatePrintTicket +8 stub PTConvertPrintTicketToDevMode +9 stub PTConvertDevModeToPrintTicket +10 stub PTReleaseMemory +11 stub ConvertDevModeToPrintTicketThunk2 +12 stub ConvertDevModeToPrintTicketThunk +13 stub ConvertPrintTicketToDevModeThunk2 +14 stub ConvertPrintTicketToDevModeThunk +15 stub DllCanUnloadNow +16 stub DllGetClassObject +17 stdcall -private DllMain(long long ptr) +18 stub DllRegisterServer +19 stub DllUnregisterServer +20 stub GetDeviceDefaultPrintTicketThunk +21 stub GetDeviceNamespacesThunk +22 stub GetPrintCapabilitiesThunk2 +23 stub GetPrintCapabilitiesThunk +24 stub GetSchemaVersionThunk +25 stub MergeAndValidatePrintTicketThunk2 +26 stub MergeAndValidatePrintTicketThunk +27 stub UnbindPTProviderThunk

1 0

André Hentschel : bcrypt: Add stub for BCryptGetProperty.
by Alexandre Julliard 22 Oct '14

22 Oct '14

Module: wine Branch: master Commit: 574b30b685260278093e2f5d1032d78a04f64480 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574b30b685260278093e2f5d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 21 22:53:49 2014 +0200 bcrypt: Add stub for BCryptGetProperty. --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_main.c | 7 +++++++ include/bcrypt.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 83cdbea..18d4d48 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -28,7 +28,7 @@ @ stub BCryptGenerateKeyPair @ stub BCryptGenerateSymmetricKey @ stdcall BCryptGetFipsAlgorithmMode(ptr) -@ stub BCryptGetProperty +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) @ stub BCryptHashData @ stub BCryptImportKey @ stub BCryptImportKeyPair diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 35a640a..4663e0f 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -108,3 +108,10 @@ NTSTATUS WINAPI BCryptGetFipsAlgorithmMode(BOOLEAN *enabled) *enabled = FALSE; return STATUS_SUCCESS; } + +NTSTATUS WINAPI BCryptGetProperty(BCRYPT_HANDLE obj, LPCWSTR prop, UCHAR *buffer, ULONG count, ULONG *res, ULONG flags) +{ + FIXME("%p, %s, %p, %u, %p, %08x - stub\n", obj, wine_dbgstr_w(prop), buffer, count, res, flags); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/bcrypt.h b/include/bcrypt.h index e7e7a59..d9b8cc6 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -48,6 +48,7 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER } BCRYPT_ALGORITHM_IDENTIFIER; typedef PVOID BCRYPT_ALG_HANDLE; +typedef PVOID BCRYPT_HANDLE; #define BCRYPT_RNG_USE_ENTROPY_IN_BUFFER 0x00000001 #define BCRYPT_USE_SYSTEM_PREFERRED_RNG 0x00000002

1 0

Stefan Dösinger : d3d9/tests: Use create_device in test_fpu_setup (v2).
by Alexandre Julliard 22 Oct '14

22 Oct '14

Module: wine Branch: master Commit: d5b2e8af394df3abfefd47c3574d9ce953cf3490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b2e8af394df3abfefd47c35… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:04 2014 +0200 d3d9/tests: Use create_device in test_fpu_setup (v2). --- dlls/d3d9/tests/device.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index a86582b..acba77f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -33,6 +33,7 @@ struct vec3 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 +#define CREATE_DEVICE_FPU_PRESERVE 0x04 struct device_desc { @@ -151,6 +152,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; + if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) + behavior_flags |= D3DCREATE_FPU_PRESERVE; } if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -3586,11 +3589,10 @@ static inline WORD get_fpu_cw(void) static void test_fpu_setup(void) { #if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) - D3DPRESENT_PARAMETERS present_parameters; + struct device_desc device_desc; IDirect3DDevice9 *device; HWND window = NULL; IDirect3D9 *d3d9; - HRESULT hr; WORD cw; window = CreateWindowA("d3d9_test_wc", "d3d9_test", WS_CAPTION, 0, 0, screen_width, screen_height, 0, 0, 0, 0); @@ -3598,20 +3600,18 @@ static void test_fpu_setup(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); - memset(&present_parameters, 0, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = 0; set_fpu_cw(0xf60); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) + if (!(device = create_device(d3d9, window, &device_desc))) { - skip("Failed to create a device, hr %#x.\n", hr); + skip("Failed to create a 3D device, skipping test.\n"); set_fpu_cw(0x37f); goto done; } @@ -3627,9 +3627,9 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_FPU_PRESERVE, &present_parameters, &device); - ok(SUCCEEDED(hr), "CreateDevice failed, hr %#x.\n", hr); + device_desc.flags = CREATE_DEVICE_FPU_PRESERVE; + device = create_device(d3d9, window, &device_desc); + ok(device != NULL, "CreateDevice failed.\n"); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw);

1 0

Stefan Dösinger : d3d9/tests: Use create_device for test_swvp_buffer.
by Alexandre Julliard 22 Oct '14

22 Oct '14

Module: wine Branch: master Commit: 8633f7f1233f40ea053d8623178e648b0c6db169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8633f7f1233f40ea053d86231… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:05 2014 +0200 d3d9/tests: Use create_device for test_swvp_buffer. --- dlls/d3d9/tests/device.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index acba77f..9690d41 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -34,6 +34,7 @@ struct vec3 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_NOWINDOWCHANGES 0x02 #define CREATE_DEVICE_FPU_PRESERVE 0x04 +#define CREATE_DEVICE_SWVP_ONLY 0x08 struct device_desc { @@ -150,6 +151,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons present_parameters.BackBufferHeight = desc->height; present_parameters.hDeviceWindow = desc->device_window; present_parameters.Windowed = !(desc->flags & CREATE_DEVICE_FULLSCREEN); + if (desc->flags & CREATE_DEVICE_SWVP_ONLY) + behavior_flags = D3DCREATE_SOFTWARE_VERTEXPROCESSING; if (desc->flags & CREATE_DEVICE_NOWINDOWCHANGES) behavior_flags |= D3DCREATE_NOWINDOWCHANGES; if (desc->flags & CREATE_DEVICE_FPU_PRESERVE) @@ -165,6 +168,8 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, cons behavior_flags, &present_parameters, &device))) return device; + if (desc && desc->flags & CREATE_DEVICE_SWVP_ONLY) + return NULL; behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -7239,7 +7244,7 @@ static void test_swvp_buffer(void) IDirect3DVertexBuffer9 *buffer; static const unsigned int bufsize = 1024; D3DVERTEXBUFFER_DESC desc; - D3DPRESENT_PARAMETERS present_parameters = {0}; + struct device_desc device_desc; struct { float x, y, z; @@ -7250,15 +7255,11 @@ static void test_swvp_buffer(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferWidth = screen_width; - present_parameters.BackBufferHeight = screen_height; - present_parameters.BackBufferFormat = D3DFMT_A8R8G8B8; - present_parameters.EnableAutoDepthStencil = FALSE; - if (FAILED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + device_desc.flags = CREATE_DEVICE_SWVP_ONLY; + if (!(device = create_device(d3d9, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); DestroyWindow(window);

1 0