April 2016 - Wine-commits - list.winehq.org

Francois Gouget : kernel32/tests: Spelling fixes for a couple of comments.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: ccad9f3b978d18080dfa8660fde33bd8098167c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccad9f3b978d18080dfa8660f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:56:57 2016 +0200 kernel32/tests: Spelling fixes for a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/debugger.c | 2 +- dlls/kernel32/tests/sync.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index d4d66b2..a277f93 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -159,7 +159,7 @@ BOOL WINAPI WaitForDebugEvent( * PARAMS * pid [I] The id of the process to continue. * tid [I] The id of the thread to continue. - * status [I] The rule to apply to unhandled exeptions. + * status [I] The rule to apply to unhandled exceptions. * * RETURNS * diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 325e1ff..26cd1d6 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -1735,9 +1735,9 @@ static SRWLOCK condvar_srwlock; /* Sequence of wake/sleep to check boundary conditions: * 0: init - * 1: producer emits a WakeConditionVaribale without consumer waiting. + * 1: producer emits a WakeConditionVariable without consumer waiting. * 2: consumer sleeps without a wake expecting timeout - * 3: producer emits a WakeAllConditionVaribale without consumer waiting. + * 3: producer emits a WakeAllConditionVariable without consumer waiting. * 4: consumer sleeps without a wake expecting timeout * 5: a wake is handed to a SleepConditionVariableCS * 6: a wakeall is handed to a SleepConditionVariableCS

1 0

Nikolay Sivov : dwrite/tests: Added GetFontSignature() test.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: e48879b13f8f6588c4b880f3b6acac221f7c0667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48879b13f8f6588c4b880f3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:50:57 2016 +0300 dwrite/tests: Added GetFontSignature() test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3c1f332..e8ceca2 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -43,8 +43,10 @@ #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif #define EXPECT_HR(hr,hr_exp) \ @@ -5840,6 +5842,127 @@ if (hr == S_OK) DELETE_FONTFILE(path); } +static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) +{ + void *os2_context; + IDWriteFontFace *fontface; + const TT_OS2_V2 *tt_os2; + UINT32 size; + BOOL exists; + HRESULT hr; + + memset(fontsig, 0, sizeof(*fontsig)); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (tt_os2) { + fontsig->fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); + fontsig->fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); + fontsig->fsUsb[2] = GET_BE_DWORD(tt_os2->ulUnicodeRange3); + fontsig->fsUsb[3] = GET_BE_DWORD(tt_os2->ulUnicodeRange4); + + fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); + fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); + + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + } + + IDWriteFontFace_Release(fontface); +} + +static void test_GetFontSignature(void) +{ + IDWriteFontCollection *syscollection; + IDWriteGdiInterop1 *interop1; + IDWriteGdiInterop *interop; + IDWriteFactory *factory; + FONTSIGNATURE fontsig; + UINT count, i; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_GetGdiInterop(factory, &interop); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteGdiInterop_QueryInterface(interop, &IID_IDWriteGdiInterop1, (void**)&interop1); + IDWriteGdiInterop_Release(interop); + if (FAILED(hr)) { + win_skip("GetFontSignature() is not supported.\n"); + IDWriteGdiInterop_Release(interop); + IDWriteFactory_Release(factory); + return; + }; + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteGdiInterop1_GetFontSignature(interop1, NULL, &fontsig); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + FONTSIGNATURE expected_signature; + IDWriteLocalizedStrings *names; + IDWriteFontFace *fontface; + IDWriteFontFamily *family; + IDWriteFont *font; + WCHAR nameW[256]; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, 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); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + IDWriteLocalizedStrings_Release(names); + + hr = IDWriteGdiInterop1_GetFontSignature(interop1, font, &fontsig); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (hr == S_OK) { + get_expected_fontsig(font, &expected_signature); + + ok(fontsig.fsUsb[0] == expected_signature.fsUsb[0], "%s: fsUsb[0] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[0], expected_signature.fsUsb[0]); + ok(fontsig.fsUsb[1] == expected_signature.fsUsb[1], "%s: fsUsb[1] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[1], expected_signature.fsUsb[1]); + ok(fontsig.fsUsb[2] == expected_signature.fsUsb[2], "%s: fsUsb[2] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[2], expected_signature.fsUsb[2]); + ok(fontsig.fsUsb[3] == expected_signature.fsUsb[3], "%s: fsUsb[3] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsUsb[3], expected_signature.fsUsb[3]); + + ok(fontsig.fsCsb[0] == expected_signature.fsCsb[0], "%s: fsCsb[0] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsCsb[0], expected_signature.fsCsb[0]); + ok(fontsig.fsCsb[1] == expected_signature.fsCsb[1], "%s: fsCsb[1] %#x, expected %#x\n", wine_dbgstr_w(nameW), + fontsig.fsCsb[1], expected_signature.fsCsb[1]); +} + IDWriteFont_Release(font); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + + IDWriteGdiInterop1_Release(interop1); + IDWriteFontCollection_Release(syscollection); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -5895,6 +6018,7 @@ START_TEST(font) test_TranslateColorGlyphRun(); test_HasCharacter(); test_CreateFontFaceReference(); + test_GetFontSignature(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite/tests: Some basic tests for fontface references.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 8b8098461d8510364b414d21f8aae03a802b46bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8098461d8510364b414d21f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:50:58 2016 +0300 dwrite/tests: Some basic tests for fontface references. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e8ceca2..d5de80e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -5797,7 +5797,9 @@ static void test_HasCharacter(void) static void test_CreateFontFaceReference(void) { static const WCHAR dummyW[] = {'d','u','m','m','y',0}; - IDWriteFontFaceReference *ref; + IDWriteFontFace3 *fontface, *fontface1; + IDWriteFontFaceReference *ref, *ref1; + IDWriteFontFile *file, *file1; IDWriteFactory3 *factory3; IDWriteFactory *factory; UINT32 index; @@ -5826,18 +5828,72 @@ todo_wine if (hr == S_OK) { index = IDWriteFontFaceReference_GetFontFaceIndex(ref); ok(index == 1, "got %u\n", index); + + hr = IDWriteFontFaceReference_GetFontFile(ref, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface); + ok(hr == DWRITE_E_FILEFORMAT, "got 0x%08x\n", hr); + + IDWriteFontFaceReference_Release(ref); } /* 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); + EXPECT_REF(factory3, 1); 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) +if (hr == S_OK) { + EXPECT_REF(factory3, 2); + + /* new file is returned */ + hr = IDWriteFontFaceReference_GetFontFile(ref, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFaceReference_GetFontFile(ref, &file1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(file != file1, "got %p, previous file %p\n", file1, file); + + IDWriteFontFile_Release(file); + IDWriteFontFile_Release(file1); + + /* references are not reused */ + hr = IDWriteFactory3_CreateFontFaceReference(factory3, path, NULL, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ref1 != ref, "got %p, previous ref %p\n", ref1, ref); + + /* created fontfaces are cached */ + hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFaceReference_CreateFontFace(ref1, &fontface1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fontface == fontface1, "got %p, expected %p\n", fontface1, fontface); + IDWriteFontFace3_Release(fontface); + IDWriteFontFace3_Release(fontface1); + + IDWriteFontFaceReference_Release(ref1); IDWriteFontFaceReference_Release(ref); + /* create reference from a file */ + hr = IDWriteFactory3_CreateFontFileReference(factory3, path, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory3_CreateFontFaceReference_(factory3, file, 0, DWRITE_FONT_SIMULATIONS_NONE, &ref); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFaceReference_GetFontFile(ref, &file1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(file != file1, "got %p, previous file %p\n", file1, file); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontFile_Release(file); + IDWriteFontFile_Release(file1); +} IDWriteFactory3_Release(factory3); DELETE_FONTFILE(path); }

1 0

Nikolay Sivov : dwrite: Handle NULL path in CreateFontFileReference().
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: af18a098628fb60d3b296a689183c5a97e4afe1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=af18a098628fb60d3b296a689… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:50:59 2016 +0300 dwrite: Handle NULL path in CreateFontFileReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 3 +++ dlls/dwrite/main.c | 2 ++ dlls/dwrite/tests/font.c | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index fef11e6..4d5f43c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4399,6 +4399,9 @@ HRESULT get_local_refkey(const WCHAR *path, const FILETIME *writetime, void **ke { struct local_refkey *refkey; + if (!path) + return E_INVALIDARG; + *size = FIELD_OFFSET(struct local_refkey, name) + (strlenW(path)+1)*sizeof(WCHAR); *key = NULL; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 47f57d8..da12669 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -778,6 +778,8 @@ static HRESULT WINAPI dwritefactory_CreateFontFileReference(IDWriteFactory3 *ifa TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(path), writetime, font_file); + *font_file = NULL; + if (!This->localfontfileloader) { hr = create_localfontfileloader(&This->localfontfileloader); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d5de80e..64e6a93 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2599,6 +2599,11 @@ static void test_CreateFontFileReference(void) path = create_testfontfile(test_fontfile); factory = create_factory(); + ffile = (void*)0xdeadbeef; + hr = IDWriteFactory_CreateFontFileReference(factory, NULL, NULL, &ffile); + ok(hr == E_INVALIDARG, "got 0x%08x\n",hr); + ok(ffile == NULL, "got %p\n", ffile); + hr = IDWriteFactory_CreateFontFileReference(factory, path, NULL, &ffile); ok(hr == S_OK, "got 0x%08x\n",hr);

1 0

Nikolay Sivov : dwrite: Accept local loader in CreateCustomFontFileReference().
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: e55d40743077a4fa453b432aaf617c5c9ad3cfac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e55d40743077a4fa453b432aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:51:00 2016 +0300 dwrite: Accept local loader in CreateCustomFontFileReference(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 4 +++- dlls/dwrite/tests/font.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index da12669..8b87590 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -807,7 +807,9 @@ static HRESULT WINAPI dwritefactory_CreateCustomFontFileReference(IDWriteFactory *font_file = NULL; - if (!loader || !factory_get_file_loader(This, loader)) + /* local loader is accepted as well */ + if (!loader || !(factory_get_file_loader(This, loader) || + (IDWriteFontFileLoader*)This->localfontfileloader == loader)) return E_INVALIDARG; return create_font_file(loader, reference_key, key_size, font_file); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 64e6a93..54f0714 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2431,6 +2431,7 @@ static void test_CreateCustomFontFileReference(void) IDWriteFontFileLoader floader2 = { &dwritefontfileloadervtbl }; IDWriteFontFileLoader floader3 = { &dwritefontfileloadervtbl }; IDWriteFactory *factory, *factory2; + IDWriteFontFileLoader *loader; IDWriteFontFile *file, *file2; BOOL support; DWRITE_FONT_FILE_TYPE file_type; @@ -2441,6 +2442,11 @@ static void test_CreateCustomFontFileReference(void) HRSRC fontrsrc; UINT32 codePoints[1] = {0xa8}; UINT16 indices[2]; + const void *key; + UINT32 key_size; + WCHAR *path; + + path = create_testfontfile(test_fontfile); factory = create_factory(); factory2 = create_factory(); @@ -2449,6 +2455,23 @@ if (0) { /* crashes on win10 */ hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); } + /* local loader is accepted too */ + hr = IDWriteFactory_CreateFontFileReference(factory, path, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateCustomFontFileReference(factory, key, key_size, loader, &file2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFontFile_Release(file2); + IDWriteFontFile_Release(file); + IDWriteFontFileLoader_Release(loader); + hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_RegisterFontFileLoader(factory, &floader2); @@ -2582,6 +2605,7 @@ if (0) /* crashes on native */ IDWriteFactory_Release(factory2); IDWriteFactory_Release(factory); + DELETE_FONTFILE(path); } static void test_CreateFontFileReference(void)

1 0

Nikolay Sivov : dwrite: Initial implementation of IDWriteFontFaceReference.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: fd06cc7c492c20233056dc33f91c253f793802fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd06cc7c492c20233056dc33f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 20 10:51:01 2016 +0300 dwrite: Initial implementation of IDWriteFontFaceReference. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/font.c | 263 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 18 ++- dlls/dwrite/tests/font.c | 13 +-- 4 files changed, 285 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd06cc7c492c20233056d…

1 0

Caron Wills : wined3d: Add Nvidia GeForce GTX 850M.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: e44e6b2244154c9e00f48179737c2b5d1e328201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44e6b2244154c9e00f481797… Author: Caron Wills <caron(a)codeweavers.com> Date: Tue Apr 19 19:33:49 2016 +0000 wined3d: Add Nvidia GeForce GTX 850M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8f47b24..c6167b6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1291,6 +1291,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_830M, "NVIDIA GeForce 830M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_840M, "NVIDIA GeForce 840M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_845M, "NVIDIA GeForce 845M", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX850M, "NVIDIA GeForce GTX 850M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1755,6 +1756,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GTX 850M", CARD_NVIDIA_GEFORCE_GTX850M}, /* GeForce 800 - mobile */ {"GeForce 845M", CARD_NVIDIA_GEFORCE_845M}, /* GeForce 800 - mobile */ {"GeForce 840M", CARD_NVIDIA_GEFORCE_840M}, /* GeForce 800 - mobile */ {"GeForce 830M", CARD_NVIDIA_GEFORCE_830M}, /* GeForce 800 - mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 50034a3..c70a6f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1799,6 +1799,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_830M = 0x1340, CARD_NVIDIA_GEFORCE_840M = 0x1341, CARD_NVIDIA_GEFORCE_845M = 0x1344, + CARD_NVIDIA_GEFORCE_GTX850M = 0x1391, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Francois Gouget : ddraw: Spelling and plural fixes in comments.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 8f42343c0288a300f70cde87c637fbabd2c1e698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f42343c0288a300f70cde87c… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:56:24 2016 +0200 ddraw: Spelling and plural fixes in comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c969e4d..60875d2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1604,7 +1604,7 @@ static HRESULT WINAPI ddraw1_Compact(IDirectDraw *iface) * * Returns information about the current display mode * - * Exists in Version 1, 2, 4 and 7 + * Exists in versions 1, 2, 4 and 7 * * Params: * DDSD: Address of a surface description structure to write the info to @@ -1695,7 +1695,7 @@ static HRESULT WINAPI ddraw1_GetDisplayMode(IDirectDraw *iface, DDSURFACEDESC *s * * Returns an array of supported FourCC codes. * - * Exists in Version 1, 2, 4 and 7 + * Exists in versions 1, 2, 4 and 7 * * Params: * NumCodes: Contains the number of Codes that Codes can carry. Returns the number @@ -3617,7 +3617,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA * Enumerates all supported Direct3DDevice interfaces. This is the * implementation for Direct3D 1 to Direc3D 3, Version 7 has its own. * - * Version 1, 2 and 3 + * Versions 1, 2 and 3 * * Params: * callback: Application-provided routine to call for each enumerated device @@ -3759,7 +3759,7 @@ static HRESULT WINAPI d3d1_EnumDevices(IDirect3D *iface, LPD3DENUMDEVICESCALLBAC * by the DIRECT3DLIGHT7 structure. Wine's Direct3DLight implementation * uses the IDirect3DDevice7 interface with D3D7 lights. * - * Version 1, 2 and 3 + * Versions 1, 2 and 3 * * Params: * light: Address to store the new interface pointer @@ -3822,7 +3822,7 @@ static HRESULT WINAPI d3d1_CreateLight(IDirect3D *iface, IDirect3DLight **light, * and older versions. The IDirect3DMaterial implementation wraps its * functionality to IDirect3DDevice7::SetMaterial and friends. * - * Version 1, 2 and 3 + * Versions 1, 2 and 3 * * Params: * material: Address to store the new interface's pointer to @@ -3971,7 +3971,7 @@ static HRESULT WINAPI d3d1_CreateViewport(IDirect3D *iface, IDirect3DViewport ** * This method finds a device with the requested properties and returns a * device description * - * Verion 1, 2 and 3 + * Versions 1, 2 and 3 * Params: * fds: Describes the requested device characteristics * fdr: Returns the device description @@ -4053,7 +4053,7 @@ static HRESULT WINAPI d3d1_FindDevice(IDirect3D *iface, D3DFINDDEVICESEARCH *fds * * Creates an IDirect3DDevice7 interface. * - * Version 2, 3 and 7. IDirect3DDevice 1 interfaces are interfaces to + * Versions 2, 3 and 7. IDirect3DDevice 1 interfaces are interfaces to * DirectDraw surfaces and are created with * IDirectDrawSurface::QueryInterface. This method uses CreateDevice to * create the device object and QueryInterfaces for IDirect3DDevice @@ -4155,7 +4155,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, * Creates a new vertex buffer object and returns a IDirect3DVertexBuffer7 * interface. * - * Version 3 and 7 + * Versions 3 and 7 * * Params: * desc: Requested Vertex buffer properties @@ -4225,7 +4225,7 @@ static HRESULT WINAPI d3d3_CreateVertexBuffer(IDirect3D3 *iface, D3DVERTEXBUFFER * * Enumerates all supported Z buffer pixel formats * - * Version 3 and 7 + * Versions 3 and 7 * * Params: * device_iid: @@ -4369,7 +4369,7 @@ static HRESULT WINAPI d3d3_EnumZBufferFormats(IDirect3D3 *iface, REFCLSID device * Removes all managed textures (=surfaces with DDSCAPS2_TEXTUREMANAGE or * DDSCAPS2_D3DTEXTUREMANAGE caps) to be removed from video memory. * - * Version 3 and 7 + * Versions 3 and 7 * * Returns: * D3D_OK, because it's a stub

1 0

Józef Kucia : wined3d: Add support for rendering to 2D array textures.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 879d4bffeb1c978d03a9925a85d5ec06f525e6c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=879d4bffeb1c978d03a9925a8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 20 11:42:17 2016 +0200 wined3d: Add support for rendering to 2D array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 84 +++++++++++++++++++++++++----------------- dlls/wined3d/directx.c | 6 +++ dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 60 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 50456b4..07ddf1c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -118,6 +118,36 @@ static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_inf } } +static void context_attach_gl_texture_fbo(struct wined3d_context *context, + GLenum fbo_target, GLenum attachment, const struct wined3d_fbo_resource *resource) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (!resource) + { + gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, GL_TEXTURE_2D, 0, 0); + checkGLcall("glFramebufferTexture2D()"); + } + else if (resource->target == GL_TEXTURE_2D_ARRAY) + { + if (!gl_info->fbo_ops.glFramebufferTextureLayer) + { + FIXME("OpenGL implementation doesn't support glFramebufferTextureLayer().\n"); + return; + } + + gl_info->fbo_ops.glFramebufferTextureLayer(fbo_target, attachment, + resource->object, resource->level, resource->layer); + checkGLcall("glFramebufferTextureLayer()"); + } + else + { + gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, attachment, + resource->target, resource->object, resource->level); + checkGLcall("glFramebufferTexture2D()"); + } +} + /* Context activation is done by the caller. */ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, @@ -137,41 +167,24 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, else { if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, - resource->target, resource->object, resource->level); - checkGLcall("glFramebufferTexture2D()"); - } + context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, resource); if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, - resource->target, resource->object, resource->level); - checkGLcall("glFramebufferTexture2D()"); - } + context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, resource); } if (!(flags & WINED3D_FBO_ENTRY_FLAG_DEPTH)) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); - } + context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); if (!(flags & WINED3D_FBO_ENTRY_FLAG_STENCIL)) - { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); - } + context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } else { TRACE("Attach depth stencil 0.\n"); - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); - - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_STENCIL_ATTACHMENT, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); + context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); + context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } } @@ -194,15 +207,12 @@ static void context_attach_surface_fbo(struct wined3d_context *context, } else { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, - resource->target, resource->object, resource->level); - checkGLcall("glFramebufferTexture2D()"); + context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, resource); } } else { - gl_info->fbo_ops.glFramebufferTexture2D(fbo_target, GL_COLOR_ATTACHMENT0 + idx, GL_TEXTURE_2D, 0, 0); - checkGLcall("glFramebufferTexture2D()"); + context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, NULL); } } @@ -353,12 +363,14 @@ static inline void context_set_fbo_key_for_surface(const struct wined3d_context if (!surface) { key->objects[idx].object = 0; - key->objects[idx].level = key->objects[idx].target = 0; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; } else if (surface->current_renderbuffer) { key->objects[idx].object = surface->current_renderbuffer->id; - key->objects[idx].level = key->objects[idx].target = 0; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; } else @@ -367,25 +379,29 @@ static inline void context_set_fbo_key_for_surface(const struct wined3d_context { case WINED3D_LOCATION_TEXTURE_RGB: key->objects[idx].object = surface_get_texture_name(surface, context, FALSE); - key->objects[idx].level = surface->texture_level; key->objects[idx].target = surface->texture_target; + key->objects[idx].level = surface->texture_level; + key->objects[idx].layer = surface->texture_layer; break; case WINED3D_LOCATION_TEXTURE_SRGB: key->objects[idx].object = surface_get_texture_name(surface, context, TRUE); - key->objects[idx].level = surface->texture_level; key->objects[idx].target = surface->texture_target; + key->objects[idx].level = surface->texture_level; + key->objects[idx].layer = surface->texture_layer; break; case WINED3D_LOCATION_RB_MULTISAMPLE: key->objects[idx].object = surface->container->rb_multisample; - key->objects[idx].level = key->objects[idx].target = 0; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; break; case WINED3D_LOCATION_RB_RESOLVED: key->objects[idx].object = surface->container->rb_resolved; - key->objects[idx].level = key->objects[idx].target = 0; + key->objects[idx].target = 0; + key->objects[idx].level = key->objects[idx].layer = 0; key->rb_namespace |= 1 << idx; break; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c6167b6..3f80225 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3835,6 +3835,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD gl_info->fbo_ops.glFramebufferTexture1D = gl_info->gl_ops.ext.p_glFramebufferTexture1D; gl_info->fbo_ops.glFramebufferTexture2D = gl_info->gl_ops.ext.p_glFramebufferTexture2D; gl_info->fbo_ops.glFramebufferTexture3D = gl_info->gl_ops.ext.p_glFramebufferTexture3D; + gl_info->fbo_ops.glFramebufferTextureLayer = gl_info->gl_ops.ext.p_glFramebufferTextureLayer; gl_info->fbo_ops.glFramebufferRenderbuffer = gl_info->gl_ops.ext.p_glFramebufferRenderbuffer; gl_info->fbo_ops.glGetFramebufferAttachmentParameteriv = gl_info->gl_ops.ext.p_glGetFramebufferAttachmentParameteriv; @@ -3869,6 +3870,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD WARN_(d3d_perf)("Framebuffer objects not supported, falling back to backbuffer offscreen rendering mode.\n"); wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; } + + if (gl_info->supported[ARB_GEOMETRY_SHADER4]) + { + gl_info->fbo_ops.glFramebufferTextureLayer = gl_info->gl_ops.ext.p_glFramebufferTextureLayerARB; + } if (gl_info->supported[EXT_FRAMEBUFFER_BLIT]) { gl_info->fbo_ops.glBlitFramebuffer = gl_info->gl_ops.ext.p_glBlitFramebufferEXT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c70a6f3..f630223 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1870,6 +1870,8 @@ struct wined3d_fbo_ops GLenum textarget, GLuint texture, GLint level); void (WINE_GLAPI *glFramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer); + void (WINE_GLAPI *glFramebufferTextureLayer)(GLenum target, GLenum attachment, + GLuint texture, GLint level, GLint layer); void (WINE_GLAPI *glFramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); void (WINE_GLAPI *glGetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, @@ -2626,7 +2628,8 @@ struct wined3d_renderbuffer_entry struct wined3d_fbo_resource { GLuint object; - GLuint level, target; + GLenum target; + GLuint level, layer; }; #define WINED3D_FBO_ENTRY_FLAG_ATTACHED 0x1

1 0

Francois Gouget : msvcp120/tests: A spelling fix and rewording for an msvcp120 ok() message.
by Alexandre Julliard 20 Apr '16

20 Apr '16

Module: wine Branch: master Commit: 8c0c34b491643b16dae12907ad4b91a4e202e7f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0c34b491643b16dae12907a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Apr 20 08:55:04 2016 +0200 msvcp120/tests: A spelling fix and rewording for an msvcp120 ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 8c7c093..86162bc 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -1359,7 +1359,7 @@ static void test_tr2_sys__Last_write_time(void) newtime = last_write_time + 123456789; p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); todo_wine ok(last_write_time == p_tr2_sys__Last_write_time("tr2_test_dir/f1"), - "last_write_time before modfied should not equal to last_write_time %s\n", + "last_write_time should have changed: %s\n", debugstr_longlong(last_write_time)); errno = 0xdeadbeef;

1 0