wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Nikolay Sivov : dwrite: Update to IDWriteGdiInterop1.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: f9e257418ea59aff159e34b621ac11c64fcb8a48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e257418ea59aff159e34b62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 09:39:28 2016 +0300 dwrite: Update to IDWriteGdiInterop1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 4 +- dlls/dwrite/gdiinterop.c | 100 +++++++++++++++++++++++++++++++------------ dlls/dwrite/main.c | 4 +- include/dwrite_3.idl | 25 +++++++++++ 4 files changed, 101 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9e257418ea59aff159e3…

1 0

Nikolay Sivov : dwrite: Fix IDWriteFactory3 methods order.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 897c1d03fac13f6d0d7f32f85951d09d3bb3a42b URL: http://source.winehq.org/git/wine.git/?a=commit;h=897c1d03fac13f6d0d7f32f85… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 09:39:27 2016 +0300 dwrite: Fix IDWriteFactory3 methods order. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 16 ++++++++-------- dlls/dwrite/tests/font.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dwrite_3.idl | 12 +++++++----- 3 files changed, 64 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index bf0c41d..de60147 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1261,22 +1261,22 @@ static HRESULT WINAPI dwritefactory3_CreateCustomRenderingParams(IDWriteFactory3 gridfit_mode, params); } -static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory3 *iface, WCHAR const *path, FILETIME const *writetime, - UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference) +static HRESULT WINAPI dwritefactory3_CreateFontFaceReference_(IDWriteFactory3 *iface, IDWriteFontFile *file, UINT32 index, + DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference) { struct dwritefactory *This = impl_from_IDWriteFactory3(iface); - FIXME("(%p)->(%s %p %u %x, %p): stub\n", This, debugstr_w(path), writetime, index, simulations, reference); + FIXME("(%p)->(%p %u %x %p): stub\n", This, file, index, simulations, reference); return E_NOTIMPL; } -static HRESULT WINAPI dwritefactory3_CreateFontFaceReference_(IDWriteFactory3 *iface, IDWriteFontFile *file, UINT32 index, - DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference) +static HRESULT WINAPI dwritefactory3_CreateFontFaceReference(IDWriteFactory3 *iface, WCHAR const *path, FILETIME const *writetime, + UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference) { struct dwritefactory *This = impl_from_IDWriteFactory3(iface); - FIXME("(%p)->(%p %u %x %p): stub\n", This, file, index, simulations, reference); + FIXME("(%p)->(%s %p %u %x, %p): stub\n", This, debugstr_w(path), writetime, index, simulations, reference); return E_NOTIMPL; } @@ -1362,8 +1362,8 @@ static const struct IDWriteFactory3Vtbl dwritefactoryvtbl = { dwritefactory2_CreateGlyphRunAnalysis, dwritefactory3_CreateGlyphRunAnalysis, dwritefactory3_CreateCustomRenderingParams, - dwritefactory3_CreateFontFaceReference, dwritefactory3_CreateFontFaceReference_, + dwritefactory3_CreateFontFaceReference, dwritefactory3_GetSystemFontSet, dwritefactory3_CreateFontSetBuilder, dwritefactory3_CreateFontCollectionFromFontSet, @@ -1419,8 +1419,8 @@ static const struct IDWriteFactory3Vtbl shareddwritefactoryvtbl = { dwritefactory2_CreateGlyphRunAnalysis, dwritefactory3_CreateGlyphRunAnalysis, dwritefactory3_CreateCustomRenderingParams, - dwritefactory3_CreateFontFaceReference, dwritefactory3_CreateFontFaceReference_, + dwritefactory3_CreateFontFaceReference, dwritefactory3_GetSystemFontSet, dwritefactory3_CreateFontSetBuilder, dwritefactory3_CreateFontCollectionFromFontSet, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 515ece4..3c1f332 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5792,6 +5792,54 @@ static void test_HasCharacter(void) IDWriteFactory_Release(factory); } +static void test_CreateFontFaceReference(void) +{ + static const WCHAR dummyW[] = {'d','u','m','m','y',0}; + IDWriteFontFaceReference *ref; + IDWriteFactory3 *factory3; + IDWriteFactory *factory; + UINT32 index; + WCHAR *path; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory3, (void**)&factory3); + IDWriteFactory_Release(factory); + if (FAILED(hr)) { + win_skip("CreateFontFaceReference() is not supported.\n"); + return; + } + + path = create_testfontfile(test_fontfile); + + hr = IDWriteFactory3_CreateFontFaceReference(factory3, NULL, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + /* test file is not a collection, but reference could still be created */ + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 1, DWRITE_FONT_SIMULATIONS_NONE, &ref); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) { + index = IDWriteFontFaceReference_GetFontFaceIndex(ref); + ok(index == 1, "got %u\n", index); +} + /* path however has to be valid */ + hr = IDWriteFactory3_CreateFontFaceReference(factory3, dummyW, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); +todo_wine + ok(hr == DWRITE_E_FILENOTFOUND, "got 0x%08x\n", hr); + + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) + IDWriteFontFaceReference_Release(ref); + + IDWriteFactory3_Release(factory3); + DELETE_FONTFILE(path); +} + START_TEST(font) { IDWriteFactory *factory; @@ -5846,6 +5894,7 @@ START_TEST(font) test_GetPaletteEntries(); test_TranslateColorGlyphRun(); test_HasCharacter(); + test_CreateFontFaceReference(); IDWriteFactory_Release(factory); } diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index b69f29a..bf16800 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -282,15 +282,17 @@ interface IDWriteFactory3 : IDWriteFactory2 DWRITE_GRID_FIT_MODE gridfit_mode, IDWriteRenderingParams3 **params); - HRESULT CreateFontFaceReference( - WCHAR const *path, - FILETIME const *writetime, + /* CreateFontFaceReference methods are listed in reversed order to make + resulting vtable order compatible. */ + HRESULT CreateFontFaceReference_( + IDWriteFontFile *file, UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference); - HRESULT CreateFontFaceReference_( - IDWriteFontFile *file, + HRESULT CreateFontFaceReference( + WCHAR const *path, + FILETIME const *writetime, UINT32 index, DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFaceReference **reference);

1 0

Nikolay Sivov : dwrite: Implement GetFontFamily() for IDWriteFontCollection1.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 54b89a2942d455190a2e38a99df573a06bf43a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b89a2942d455190a2e38a99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 09:39:26 2016 +0300 dwrite: Implement GetFontFamily() for IDWriteFontCollection1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 26 ++++++++++++++++---------- dlls/dwrite/tests/font.c | 5 +---- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4120cf6..fef11e6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -133,7 +133,7 @@ struct dwrite_fontfamily { struct dwrite_fontfamily_data *data; - IDWriteFontCollection* collection; + IDWriteFontCollection1 *collection; }; struct dwrite_font { @@ -1715,7 +1715,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily1 *iface) if (!ref) { - IDWriteFontCollection_Release(This->collection); + IDWriteFontCollection1_Release(This->collection); release_fontfamily_data(This->data); heap_free(This); } @@ -1726,10 +1726,11 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily1 *iface) static HRESULT WINAPI dwritefontfamily_GetFontCollection(IDWriteFontFamily1 *iface, IDWriteFontCollection **collection) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily1(iface); + TRACE("(%p)->(%p)\n", This, collection); - *collection = This->collection; - IDWriteFontCollection_AddRef(This->collection); + *collection = (IDWriteFontCollection*)This->collection; + IDWriteFontCollection_AddRef(*collection); return S_OK; } @@ -1971,7 +1972,7 @@ static const IDWriteFontFamily1Vtbl fontfamilyvtbl = { dwritefontfamily1_GetFontFaceReference }; -static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily1 **family) +static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFontCollection1 *collection, IDWriteFontFamily1 **family) { struct dwrite_fontfamily *This; @@ -1983,7 +1984,7 @@ static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFon This->IDWriteFontFamily1_iface.lpVtbl = &fontfamilyvtbl; This->ref = 1; This->collection = collection; - IDWriteFontCollection_AddRef(collection); + IDWriteFontCollection1_AddRef(collection); This->data = data; InterlockedIncrement(&This->data->ref); @@ -2082,7 +2083,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection1 return E_FAIL; } - return create_fontfamily(This->family_data[index], (IDWriteFontCollection*)iface, (IDWriteFontFamily1**)family); + return create_fontfamily(This->family_data[index], iface, (IDWriteFontFamily1**)family); } static UINT32 collection_find_family(struct dwrite_fontcollection *collection, const WCHAR *name) @@ -2176,7 +2177,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (!found_font) return DWRITE_E_NOFONT; - hr = create_fontfamily(found_family, (IDWriteFontCollection*)iface, &family); + hr = create_fontfamily(found_family, iface, &family); if (FAILED(hr)) return hr; @@ -2198,9 +2199,14 @@ static HRESULT WINAPI dwritefontcollection1_GetFontFamily(IDWriteFontCollection1 { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection1(iface); - FIXME("(%p)->(%p): stub\n", This, family); + TRACE("(%p)->(%u %p)\n", This, index, family); - return E_NOTIMPL; + if (index >= This->family_count) { + *family = NULL; + return E_FAIL; + } + + return create_fontfamily(This->family_data[index], iface, family); } static const IDWriteFontCollection1Vtbl fontcollectionvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a57b9ae..515ece4 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2073,14 +2073,11 @@ static void test_system_fontcollection(void) family1 = (void*)0xdeadbeef; hr = IDWriteFontCollection1_GetFontFamily(collection1, ~0u, &family1); - todo_wine { ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(family1 == NULL, "got %p\n", family1); - } + hr = IDWriteFontCollection1_GetFontFamily(collection1, 0, &family1); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) IDWriteFontFamily1_Release(family1); IDWriteFontCollection1_Release(collection1); }

1 0

Nikolay Sivov : dwrite: Update to IDWriteRenderingParams3.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: ae85317b1dab42f9fce1a3ff29105a05711213c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae85317b1dab42f9fce1a3ff2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 09:39:25 2016 +0300 dwrite: Update to IDWriteRenderingParams3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 116 ++++++++++++++++++++++++++++------------------- dlls/dwrite/tests/font.c | 22 +++++++++ 2 files changed, 91 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae85317b1dab42f9fce1a…

1 0

Francois Gouget : tools: Assorted comment spelling fixes.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 44468e85369bd8e36c9e68d71718c12ff6976225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44468e85369bd8e36c9e68d71… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 19 06:14:05 2016 +0200 tools: Assorted comment spelling fixes. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_unicode | 2 +- tools/widl/typelib_struct.h | 2 +- tools/winebuild/utils.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 1a9026b..a089e23 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1393,7 +1393,7 @@ sub dump_scripts($) print OUTPUT "/* generated from $UNIDATA/Scripts.txt */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; - # Inherited was consumed by Unknown, we don't need it as a separate enum memeber + # Inherited was consumed by Unknown, we don't need it as a separate enum member delete $scripts{"Inherited"}; print OUTPUT "enum unicode_script_id {\n"; foreach my $script (sort { $scripts{$a} <=> $scripts{$b} } keys %scripts) diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 42faac8..0d9f8eb 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -215,7 +215,7 @@ typedef struct { /* after this may follow an array with default value pointers if the * appropriate bit in the FKCCIC field has been set: - * INT oDefautlValue[nrargs]; + * INT oDefaultValue[nrargs]; */ /* Parameter info one per argument*/ diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 9308e83..6e01f1a 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -871,7 +871,7 @@ int get_cpu_from_name( const char *name ) * align on an 8-byte boundary you'd say * .align 3 * - * The reason gas is written this way is that it's trying to mimick + * The reason gas is written this way is that it's trying to mimic * native assemblers for the various architectures it runs on. gas * provides other directives that work consistently across * architectures, but of course we want to work on all arches with or

1 0

Francois Gouget : advapi32/tests: Some spelling fixes for the security ok( ) messages.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 0beaaa6bc2561daf6f918587379ee83f1dced53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0beaaa6bc2561daf6f9185873… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 19 06:11:41 2016 +0200 advapi32/tests: Some spelling fixes for the security ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 775e708..3639ebd 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3474,7 +3474,7 @@ static void test_CreateDirectoryA(void) GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); GetTempPathA(MAX_PATH, tmpdir); lstrcatA(tmpdir, "Please Remove Me"); @@ -3521,7 +3521,7 @@ static void test_CreateDirectoryA(void) bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); ok(bret, "Failed to initialize ACL\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor\n"); + ok(bret, "Failed to add ACL to security descriptor\n"); strcpy(tmpfile, tmpdir); lstrcatA(tmpfile, "/tmpfile"); @@ -3595,7 +3595,7 @@ static void test_CreateDirectoryA(void) bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); ok(bret, "Failed to initialize ACL\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor\n"); + ok(bret, "Failed to add ACL to security descriptor\n"); strcpy(tmpfile, tmpdir); lstrcatA(tmpfile, "/tmpfile"); @@ -3778,7 +3778,7 @@ static void test_GetNamedSecurityInfoA(void) bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); GetTempFileNameA(".", "foo", 0, tmpfile); hTemp = CreateFileA(tmpfile, WRITE_DAC|GENERIC_WRITE, FILE_SHARE_DELETE|FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); @@ -3887,7 +3887,7 @@ static void test_GetNamedSecurityInfoA(void) bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); @@ -3923,7 +3923,7 @@ static void test_GetNamedSecurityInfoA(void) bret = pAddAccessDeniedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); ok(bret, "Failed to add Current User to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); @@ -3939,7 +3939,7 @@ static void test_GetNamedSecurityInfoA(void) bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); ok(bret, "Failed to add Current User to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); @@ -4589,7 +4589,7 @@ static void test_GetSecurityInfo(void) bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); ret = pSetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, pDacl, NULL); ok(ret == ERROR_SUCCESS, "SetSecurityInfo returned %d\n", ret);

1 0

Stefan Dösinger : wined3d: Merge wined3d_surface_prepare() and wined3d_volume_prepare_location().
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 1462f66d5d9d3e0f694ffe79287e70874e527cb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1462f66d5d9d3e0f694ffe792… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 18 19:06:32 2016 +0200 wined3d: Merge wined3d_surface_prepare() and wined3d_volume_prepare_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 52 ++-------------------------- dlls/wined3d/texture.c | 77 +++++++++++++++++++++++++++++++----------- dlls/wined3d/volume.c | 37 +------------------- dlls/wined3d/wined3d_private.h | 8 ++--- 4 files changed, 63 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1462f66d5d9d3e0f694ff…

1 0

Henri Verbeet : wined3d: Reject sub-resource types in wined3d_check_device_format().
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: f519aca8b3109f529a77c0a4ef8baa182fdd66da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f519aca8b3109f529a77c0a4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:31 2016 +0200 wined3d: Reject sub-resource types in wined3d_check_device_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 19 ++++++------------- dlls/d3d9/directx.c | 19 ++++++------------- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/surface.c | 12 +++--------- dlls/wined3d/directx.c | 41 +++++++++++++++++++++++------------------ 6 files changed, 44 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f519aca8b3109f529a77c…

1 0

Henri Verbeet : dxgi: Use the correct resource type in dxgi_device_CreateSurface().
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: c21b51ad7157fead65e324732e64a40154635f72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21b51ad7157fead65e324732… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:30 2016 +0200 dxgi: Use the correct resource type in dxgi_device_CreateSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2cf9aa7..2486204 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -182,7 +182,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); FIXME("Implement DXGI<->wined3d usage conversion\n"); - surface_desc.resource_type = WINED3D_RTYPE_SURFACE; + surface_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; surface_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_sample_desc_from_dxgi(&surface_desc.multisample_type, &surface_desc.multisample_quality, &desc->SampleDesc);

1 0

Henri Verbeet : wined3d: Properly check for 3D/ volume textures in wined3d_device_update_texture().
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: e5a7d5465b2fffdd0e68d6e490c4e8f9fe4113d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a7d5465b2fffdd0e68d6e49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:29 2016 +0200 wined3d: Properly check for 3D/volume textures in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f3fb732..f00c906 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3641,7 +3641,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, src_size = max(src_texture->resource.width, src_texture->resource.height); dst_size = max(dst_texture->resource.width, dst_texture->resource.height); - if (type == WINED3D_RTYPE_VOLUME) + if (type == WINED3D_RTYPE_TEXTURE_3D) { src_size = max(src_size, src_texture->resource.depth); dst_size = max(dst_size, dst_texture->resource.depth);

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016