October 2014 - Wine-commits

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

22 Oct '14

Module: wine Branch: master Commit: 1ae02b92e099ff10d6f3eaa7c26438922b48c550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae02b92e099ff10d6f3eaa7c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:06 2014 +0200 d3d8/tests: Use create_device for test_fpu_setup. --- dlls/d3d8/tests/device.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2278c06..6caf8b4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -32,6 +32,7 @@ struct vec3 }; #define CREATE_DEVICE_FULLSCREEN 0x01 +#define CREATE_DEVICE_FPU_PRESERVE 0x02 struct device_desc { @@ -92,6 +93,7 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, HWND focus_window, cons { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice8 *device; + DWORD behavior_flags = D3DCREATE_HARDWARE_VERTEXPROCESSING; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -108,17 +110,24 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, 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_FPU_PRESERVE) + behavior_flags |= D3DCREATE_FPU_PRESERVE; } if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + behavior_flags, &present_parameters, &device))) + return device; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + behavior_flags, &present_parameters, &device))) + return device; + + behavior_flags ^= (D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_SOFTWARE_VERTEXPROCESSING); if (SUCCEEDED(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, - D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; + behavior_flags, &present_parameters, &device))) + return device; return NULL; } @@ -2578,7 +2587,7 @@ static inline WORD get_fpu_cw(void) static void test_fpu_setup(void) { #if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) - D3DPRESENT_PARAMETERS present_parameters; + struct device_desc device_desc; IDirect3DDevice8 *device; D3DDISPLAYMODE d3ddm; IDirect3D8 *d3d8; @@ -2594,21 +2603,18 @@ static void test_fpu_setup(void) hr = IDirect3D8_GetAdapterDisplayMode(d3d8, D3DADAPTER_DEFAULT, &d3ddm); ok(SUCCEEDED(hr), "GetAdapterDisplayMode failed, hr %#x.\n", hr); - memset(&present_parameters, 0, sizeof(present_parameters)); - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = window; - present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; - present_parameters.BackBufferFormat = d3ddm.Format; + 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 = IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, window, - D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); - if (FAILED(hr)) + if (!(device = create_device(d3d8, 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; } @@ -2624,9 +2630,9 @@ static void test_fpu_setup(void) cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw); - hr = IDirect3D8_CreateDevice(d3d8, 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(d3d8, window, &device_desc); + ok(!!device, "CreateDevice failed.\n"); cw = get_fpu_cw(); ok(cw == 0xf60, "cw is %#x, expected 0xf60.\n", cw);

1 0

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

22 Oct '14

Module: wine Branch: master Commit: 94f20a6fff18876ef7c16b3b2c22251cb0ab9176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94f20a6fff18876ef7c16b3b2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Oct 22 00:22:07 2014 +0200 d3d8/tests: Use create_device in test_swvp_buffer. --- dlls/d3d8/tests/device.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 6caf8b4..9ffac8b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -33,6 +33,7 @@ struct vec3 #define CREATE_DEVICE_FULLSCREEN 0x01 #define CREATE_DEVICE_FPU_PRESERVE 0x02 +#define CREATE_DEVICE_SWVP_ONLY 0x04 struct device_desc { @@ -110,6 +111,8 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, 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_FPU_PRESERVE) behavior_flags |= D3DCREATE_FPU_PRESERVE; } @@ -123,6 +126,8 @@ static IDirect3DDevice8 *create_device(IDirect3D8 *d3d8, 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(IDirect3D8_CreateDevice(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, @@ -4758,7 +4763,7 @@ static void test_swvp_buffer(void) IDirect3DVertexBuffer8 *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; @@ -4769,15 +4774,11 @@ static void test_swvp_buffer(void) d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "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(IDirect3D8_CreateDevice(d3d8, 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(d3d8, window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); IDirect3D8_Release(d3d8);

1 0

David Heidelberger : winedbg: List Dwarf2 GNU extensions as TODO to workaround spam in debug.
by Alexandre Julliard 22 Oct '14

22 Oct '14

Module: wine Branch: master Commit: 4f18c053d3bce0ec88bbb337e1f0bae7909d90e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f18c053d3bce0ec88bbb337e… Author: David Heidelberger <david.heidelberger(a)ixit.cz> Date: Wed Oct 22 09:23:36 2014 +0200 winedbg: List Dwarf2 GNU extensions as TODO to workaround spam in debug. --- dlls/dbghelp/dwarf.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a89cf11..f1bd6cb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1467,6 +1467,8 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, case DW_TAG_variable: case DW_TAG_imported_declaration: case DW_TAG_ptr_to_member_type: + case DW_TAG_GNU_template_parameter_pack: + case DW_TAG_GNU_formal_parameter_pack: /* FIXME: some C++ related stuff */ break; default: @@ -1967,6 +1969,8 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, case DW_TAG_template_type_param: case DW_TAG_template_value_param: case DW_TAG_GNU_call_site: + case DW_TAG_GNU_template_parameter_pack: + case DW_TAG_GNU_formal_parameter_pack: /* FIXME: no support in dbghelp's internals so far */ break; default:

1 0

Nikolay Sivov : dwrite: Remove unused parameter.
by Alexandre Julliard 22 Oct '14

22 Oct '14

Module: wine Branch: master Commit: b4dc4e257ce61b5c3d99eb55499ed5acec478470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4dc4e257ce61b5c3d99eb554… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 21 17:14:31 2014 +0400 dwrite: Remove unused parameter. --- dlls/dwrite/dwrite_private.h | 2 +- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/main.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fad7a21..5ac0852 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -105,7 +105,7 @@ extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDE extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; -extern HRESULT font_create_fontface(IDWriteFactory*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; +extern HRESULT font_create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2 **) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 783b035..2b67543 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -747,7 +747,7 @@ static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 if (!font->face) { HRESULT hr = font->is_system ? create_system_fontface(font, &font->face) : - font_create_fontface(NULL, font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, + font_create_fontface(font->data->face_data->type, font->data->face_data->file_count, font->data->face_data->files, font->data->face_data->index, font->data->face_data->simulations, &font->face); if (FAILED(hr)) return hr; } @@ -1676,7 +1676,7 @@ HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_ke return S_OK; } -HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) +HRESULT font_create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, DWRITE_FONT_SIMULATIONS sim_flags, IDWriteFontFace2 **font_face) { int i; struct dwrite_fontface *This; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index bac0c78..3211ee3 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -629,7 +629,7 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, { struct dwritefactory *This = impl_from_IDWriteFactory(iface); TRACE("(%p)->(%d %u %p %u 0x%x %p)\n", This, facetype, files_number, font_files, index, sim_flags, font_face); - return font_create_fontface(iface, facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); + return font_create_fontface(facetype, files_number, font_files, index, sim_flags, (IDWriteFontFace2**)font_face); } static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params)

1 0

Nikolay Sivov : dwrite: Some tests for reused fontface instances.
by Alexandre Julliard 22 Oct '14

22 Oct '14

Module: wine Branch: master Commit: 42e5a32cc3ecb7064c1019d5212520ab2e6a33d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e5a32cc3ecb7064c1019d52… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 22 11:06:15 2014 +0400 dwrite: Some tests for reused fontface instances. --- dlls/dwrite/tests/font.c | 184 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 131 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42e5a32cc3ecb7064c101…

1 0

André Hentschel : d3dx9_30: Add stub for D3DXCpuOptimizations.
by Alexandre Julliard 22 Oct '14

22 Oct '14

Module: wine Branch: master Commit: b48e74749de682951320235f13eab4ffc52eb0aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48e74749de682951320235f1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Oct 21 23:23:34 2014 +0200 d3dx9_30: Add stub for D3DXCpuOptimizations. --- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_30/d3dx9_30_main.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index 107fad1..54234b2 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -30,7 +30,7 @@ @ stdcall D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) d3dx9_36.D3DXConcatenateMeshes @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToSingleStrip @ stdcall D3DXConvertMeshSubsetToStrips(ptr long long ptr ptr ptr ptr) d3dx9_36.D3DXConvertMeshSubsetToStrips -@ stub D3DXCpuOptimizations(long) +@ stdcall D3DXCpuOptimizations(long) @ stdcall D3DXCreateAnimationController(long long long long ptr) d3dx9_36.D3DXCreateAnimationController @ stdcall D3DXCreateBox(ptr float float float ptr ptr) d3dx9_36.D3DXCreateBox @ stdcall D3DXCreateBuffer(long ptr) d3dx9_36.D3DXCreateBuffer diff --git a/dlls/d3dx9_30/d3dx9_30_main.c b/dlls/d3dx9_30/d3dx9_30_main.c index 25fd035..81e53f8 100644 --- a/dlls/d3dx9_30/d3dx9_30_main.c +++ b/dlls/d3dx9_30/d3dx9_30_main.c @@ -30,6 +30,9 @@ #include "winuser.h" #include "d3dx9.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); /*********************************************************************** * DllMain. @@ -58,3 +61,17 @@ BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) else return FALSE; } + +typedef enum _D3DX_CPU_OPTIMIZATION +{ + D3DX_NOT_OPTIMIZED = 0, + D3DX_3DNOW_OPTIMIZED = 1, + D3DX_SSE2_OPTIMIZED = 2, + D3DX_SSE_OPTIMIZED = 3 +} D3DX_CPU_OPTIMIZATION; + +D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) +{ + FIXME("%i - stub\n", enable); + return D3DX_NOT_OPTIMIZED; +}

1 0

Nikolay Sivov : dwrite: Store registered file loaders in a list.
by Alexandre Julliard 21 Oct '14

21 Oct '14

Module: wine Branch: master Commit: 177f601889dac6e887564011035f93e7499da828 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177f601889dac6e8875640110… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 12:53:21 2014 +0400 dwrite: Store registered file loaders in a list. --- dlls/dwrite/main.c | 115 ++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 59 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index cdd27c2..bac0c78 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -398,6 +398,12 @@ struct collectionloader IDWriteFontCollectionLoader *loader; }; +struct fileloader +{ + struct list entry; + IDWriteFontFileLoader *loader; +}; + struct dwritefactory { IDWriteFactory IDWriteFactory_iface; LONG ref; @@ -407,8 +413,7 @@ struct dwritefactory { IDWriteGdiInterop *gdiinterop; struct list collection_loaders; - IDWriteFontFileLoader **file_loaders; - LONG file_loader_count; + struct list file_loaders; }; static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *iface) @@ -418,8 +423,8 @@ static inline struct dwritefactory *impl_from_IDWriteFactory(IDWriteFactory *ifa static void release_dwritefactory(struct dwritefactory *factory) { + struct fileloader *fileloader, *fileloader2; struct collectionloader *loader, *loader2; - int i; if (factory->localfontfileloader) IDWriteLocalFontFileLoader_Release(factory->localfontfileloader); @@ -430,10 +435,12 @@ static void release_dwritefactory(struct dwritefactory *factory) heap_free(loader); } - for (i = 0; i < factory->file_loader_count; i++) - if (factory->file_loaders[i]) - IDWriteFontFileLoader_Release(factory->file_loaders[i]); - heap_free(factory->file_loaders); + LIST_FOR_EACH_ENTRY_SAFE(fileloader, fileloader2, &factory->file_loaders, struct fileloader, entry) { + list_remove(&fileloader->entry); + IDWriteFontFileLoader_Release(fileloader->loader); + heap_free(fileloader); + } + if (factory->system_collection) IDWriteFontCollection_Release(factory->system_collection); if (factory->gdiinterop) @@ -449,6 +456,20 @@ static void release_shared_factory(IDWriteFactory *iface) release_dwritefactory(factory); } +static struct fileloader *factory_get_file_loader(struct dwritefactory *factory, IDWriteFontFileLoader *loader) +{ + struct fileloader *entry, *found = NULL; + + LIST_FOR_EACH_ENTRY(entry, &factory->file_loaders, struct fileloader, entry) { + if (entry->loader == loader) { + found = entry; + break; + } + } + + return found; +} + static HRESULT WINAPI dwritefactory_QueryInterface(IDWriteFactory *iface, REFIID riid, void **obj) { struct dwritefactory *This = impl_from_IDWriteFactory(iface); @@ -592,21 +613,14 @@ static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory *ifac static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory *iface, void const *reference_key, UINT32 key_size, IDWriteFontFileLoader *loader, IDWriteFontFile **font_file) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); - HRESULT hr; TRACE("(%p)->(%p %u %p %p)\n", This, reference_key, key_size, loader, font_file); - if (loader == NULL) + if (!loader || !factory_get_file_loader(This, loader)) return E_INVALIDARG; - for (i = 0; i < This->file_loader_count; i++) - if (This->file_loaders[i] == loader) break; - if (i == This->file_loader_count) - return E_INVALIDARG; - hr = create_font_file(loader, reference_key, key_size, font_file); - return hr; + return create_font_file(loader, reference_key, key_size, font_file); } static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, @@ -655,53 +669,47 @@ static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory * static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + struct fileloader *entry; + TRACE("(%p)->(%p)\n", This, loader); if (!loader) return E_INVALIDARG; - for (i = 0; i < This->file_loader_count; i++) - if (This->file_loaders[i] == loader) + LIST_FOR_EACH_ENTRY(entry, &This->file_loaders, struct fileloader, entry) { + if (entry->loader == loader) return DWRITE_E_ALREADYREGISTERED; - else if (This->file_loaders[i] == NULL) - break; - - if (i == This->file_loader_count) - { - IDWriteFontFileLoader **new_list = NULL; - int new_count = 0; - - new_count = This->file_loader_count * 2; - new_list = heap_realloc_zero(This->file_loaders, new_count * sizeof(*This->file_loaders)); - - if (!new_list) - return E_OUTOFMEMORY; - else - { - This->file_loader_count = new_count; - This->file_loaders = new_list; - } } + + entry = heap_alloc(sizeof(*entry)); + if (!entry) + return E_OUTOFMEMORY; + + entry->loader = loader; IDWriteFontFileLoader_AddRef(loader); - This->file_loaders[i] = loader; + list_add_tail(&This->file_loaders, &entry->entry); return S_OK; } static HRESULT WINAPI dwritefactory_UnregisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader) { - int i; struct dwritefactory *This = impl_from_IDWriteFactory(iface); + struct fileloader *found; + TRACE("(%p)->(%p)\n", This, loader); - for (i = 0; i < This->file_loader_count; i++) - if (This->file_loaders[i] == loader) break; - if (i == This->file_loader_count) - return E_INVALIDARG; - IDWriteFontFileLoader_Release(This->file_loaders[i]); - This->file_loaders[i] = NULL; + if (!loader) + return E_INVALIDARG; + + found = factory_get_file_loader(This, loader); + if (!found) + return E_INVALIDARG; + + IDWriteFontFileLoader_Release(found->loader); + list_remove(&found->entry); + heap_free(found); return S_OK; } @@ -875,28 +883,21 @@ static const struct IDWriteFactoryVtbl shareddwritefactoryvtbl = { dwritefactory_CreateGlyphRunAnalysis }; -static HRESULT init_dwritefactory(struct dwritefactory *factory, const struct IDWriteFactoryVtbl *vtbl) +static void init_dwritefactory(struct dwritefactory *factory, const struct IDWriteFactoryVtbl *vtbl) { factory->IDWriteFactory_iface.lpVtbl = vtbl; factory->ref = 1; factory->localfontfileloader = NULL; - factory->file_loader_count = 2; - factory->file_loaders = heap_alloc_zero(sizeof(*factory->file_loaders) * 2); factory->system_collection = NULL; factory->gdiinterop = NULL; list_init(&factory->collection_loaders); - - if (!factory->file_loaders) - return E_OUTOFMEMORY; - - return S_OK; + list_init(&factory->file_loaders); } HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnknown **ret) { struct dwritefactory *factory; - HRESULT hr; TRACE("(%d, %s, %p)\n", type, debugstr_guid(riid), ret); @@ -913,11 +914,7 @@ HRESULT WINAPI DWriteCreateFactory(DWRITE_FACTORY_TYPE type, REFIID riid, IUnkno factory = heap_alloc(sizeof(struct dwritefactory)); if (!factory) return E_OUTOFMEMORY; - hr = init_dwritefactory(factory, type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl); - if (FAILED(hr)) { - heap_free(factory); - return hr; - } + init_dwritefactory(factory, type == DWRITE_FACTORY_TYPE_SHARED ? &shareddwritefactoryvtbl : &dwritefactoryvtbl); if (type == DWRITE_FACTORY_TYPE_SHARED) if (InterlockedCompareExchangePointer((void**)&shared_factory, factory, NULL)) {

1 0

Nikolay Sivov : dwrite: Implement GetInformationalStrings().
by Alexandre Julliard 21 Oct '14

21 Oct '14

Module: wine Branch: master Commit: 04a237fe18cb775bf7545472bea88d6a79e5344e URL: http://source.winehq.org/git/wine.git/?a=commit;h=04a237fe18cb775bf7545472b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 20 21:45:57 2014 +0400 dwrite: Implement GetInformationalStrings(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 45 ++++++++-- dlls/dwrite/opentype.c | 204 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 6 +- 4 files changed, 244 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04a237fe18cb775bf7545…

1 0

Hans Leidekker : secur32/tests: Switch requested protocol from SSL3 to TLS1.
by Alexandre Julliard 21 Oct '14

21 Oct '14

Module: wine Branch: master Commit: 5a6558b854bc320066d8dfbfa4a7a1d21dc88837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a6558b854bc320066d8dfbfa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 21 11:28:44 2014 +0200 secur32/tests: Switch requested protocol from SSL3 to TLS1. --- dlls/secur32/tests/schannel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index e868b13..97fa0bc 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -533,7 +533,7 @@ static void init_cred(SCHANNEL_CRED *cred) cred->aphMappers = NULL; cred->cSupportedAlgs = 0; cred->palgSupportedAlgs = NULL; - cred->grbitEnabledProtocols = SP_PROT_SSL3_CLIENT; + cred->grbitEnabledProtocols = SP_PROT_TLS1_CLIENT; cred->dwMinimumCipherStrength = 0; cred->dwMaximumCipherStrength = 0; cred->dwSessionLifespan = 0; @@ -685,7 +685,7 @@ static void test_communication(void) ok(status == SEC_E_OK, "AcquireCredentialsHandleA failed: %08x\n", status); if (status != SEC_E_OK) return; - test_supported_protocols(&cred_handle, SP_PROT_SSL3_CLIENT); + test_supported_protocols(&cred_handle, SP_PROT_TLS1_CLIENT); /* Initialize the connection */ init_buffers(&buffers[0], 4, buf_size);

1 0

Hans Leidekker : msi: Support more transform validation flags.
by Alexandre Julliard 21 Oct '14

21 Oct '14

Module: wine Branch: master Commit: 1e3f15d88c1e878f5c459e642ff2079b05aa5c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3f15d88c1e878f5c459e642… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 21 11:29:08 2014 +0200 msi: Support more transform validation flags. --- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 +- dlls/msi/patch.c | 215 ++++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 191 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1e3f15d88c1e878f5c459…

1 0