wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Hugh McMaster : regedit/tests: Add a few more import tests.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 467def8352734a41a36104f944b600dc9e255a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=467def8352734a41a36104f94… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 11 13:11:44 2017 +0000 regedit/tests: Add a few more import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d15c477..515a6ed 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -510,11 +510,13 @@ static void test_invalid_import(void) "\"Test12a\"=dword:\n" "\"Test12b\"=dword:hello\n" "\"Test12c\"=dword:123456789\n" - "\"Test12d\"=dword:012345678\n\n"); + "\"Test12d\"=dword:012345678\n" + "\"Test12e\"=dword:000000001\n\n"); verify_reg_nonexist(hkey, "Test12a"); verify_reg_nonexist(hkey, "Test12b"); verify_reg_nonexist(hkey, "Test12c"); verify_reg_nonexist(hkey, "Test12d"); + verify_reg_nonexist(hkey, "Test12e"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -532,6 +534,13 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Test14b"); verify_reg_nonexist(hkey, "Test14c"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test15a\"=\"foo\"bar\"\n" + "\"Test15b\"=\"foo\"\"bar\"\n\n"); + todo_wine verify_reg_nonexist(hkey, "Test15a"); + todo_wine verify_reg_nonexist(hkey, "Test15b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Add tests for importing DWORD values.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 098be09bcec750eb653fd33452be42194d783245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098be09bcec750eb653fd3345… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 11 13:11:32 2017 +0000 regedit/tests: Add tests for importing DWORD values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index bbe5c4b..d15c477 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -280,6 +280,15 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine8a\"=dword:1\n" + "\"Wine8b\"=dword:4444\n\n"); + dword = 0x1; + verify_reg(hkey, "Wine8a", REG_DWORD, &dword, sizeof(dword), 0); + dword = 0x4444; + verify_reg(hkey, "Wine8b", REG_DWORD, &dword, sizeof(dword), 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n"); verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); @@ -496,6 +505,33 @@ static void test_invalid_import(void) " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); todo_wine verify_reg_nonexist(hkey, "Multi-Line4"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test12a\"=dword:\n" + "\"Test12b\"=dword:hello\n" + "\"Test12c\"=dword:123456789\n" + "\"Test12d\"=dword:012345678\n\n"); + verify_reg_nonexist(hkey, "Test12a"); + verify_reg_nonexist(hkey, "Test12b"); + verify_reg_nonexist(hkey, "Test12c"); + verify_reg_nonexist(hkey, "Test12d"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test13a\"=dword:12345678abc\n" + "\"Test13b\"=dword:12345678 abc\n\n"); + verify_reg_nonexist(hkey, "Test13a"); + verify_reg_nonexist(hkey, "Test13b"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test14a\"=dword:0x123\n" + "\"Test14b\"=dword:123 456\n" + "\"Test14c\"=dword:1234 5678\n\n"); + todo_wine verify_reg_nonexist(hkey, "Test14a"); + verify_reg_nonexist(hkey, "Test14b"); + verify_reg_nonexist(hkey, "Test14c"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -596,6 +632,18 @@ static void test_comments(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine25a\"=dword:1234;5678\n" + "\"Wine25b\"=dword:1234 ;5678\n" + "\"Wine25c\"=dword:1234#5678\n" + "\"Wine25d\"=dword:1234 #5678\n\n"); + dword = 0x1234; + todo_wine verify_reg(hkey, "Wine25a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine25b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg_nonexist(hkey, "Wine25c"); + verify_reg_nonexist(hkey, "Wine25d"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" " 63,6f,6e,\\;comment\n" " 63,61,74,\\;comment\n" @@ -747,6 +795,14 @@ static void test_import_with_whitespace(void) verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine9a\"=dword: 00000008\n" + "\"Wine9b\"=dword:\t\t00000008\n\n"); + dword = 0x00000008; + todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Hugh McMaster : reg/tests: Add a few more import tests.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 4bee2b4f4198ba03016721fe81d223bee1c2c72d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bee2b4f4198ba03016721fe8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 11 13:12:07 2017 +0000 reg/tests: Add a few more import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9799815..0771391 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1233,12 +1233,14 @@ static void test_import(void) "\"Wine33a\"=dword:\n" "\"Wine33b\"=dword:hello\n" "\"Wine33c\"=dword:123456789\n" - "\"Wine33d\"=dword:012345678\n\n", &r); + "\"Wine33d\"=dword:012345678\n" + "\"Wine33e\"=dword:000000001\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg_nonexist(hkey, "Wine33a"); todo_wine verify_reg_nonexist(hkey, "Wine33b"); todo_wine verify_reg_nonexist(hkey, "Wine33c"); todo_wine verify_reg_nonexist(hkey, "Wine33d"); + todo_wine verify_reg_nonexist(hkey, "Wine33e"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1273,6 +1275,14 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine37a\"=\"foo\"bar\"\n" + "\"Wine37b\"=\"foo\"\"bar\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine37a"); + todo_wine verify_reg_nonexist(hkey, "Wine37b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1655,12 +1665,14 @@ static void test_import(void) "\"Wine33a\"=dword:\n" "\"Wine33b\"=dword:hello\n" "\"Wine33c\"=dword:123456789\n" - "\"Wine33d\"=dword:012345678\n\n", &r); + "\"Wine33d\"=dword:012345678\n" + "\"Wine33e\"=dword:000000001\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg_nonexist(hkey, "Wine33a"); todo_wine verify_reg_nonexist(hkey, "Wine33b"); todo_wine verify_reg_nonexist(hkey, "Wine33c"); todo_wine verify_reg_nonexist(hkey, "Wine33d"); + todo_wine verify_reg_nonexist(hkey, "Wine33e"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1695,6 +1707,14 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine37a\"=\"foo\"bar\"\n" + "\"Wine37b\"=\"foo\"\"bar\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine37a"); + todo_wine verify_reg_nonexist(hkey, "Wine37b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\;comment\n"

1 0

Nikolay Sivov : xmllite/writer: Fix IID argument handling in CreateXmlWriter().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 707ab559e529ac7e3370146fc48b08ec381b628f URL: http://source.winehq.org/git/wine.git/?a=commit;h=707ab559e529ac7e3370146fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:28:41 2017 +0300 xmllite/writer: Fix IID argument handling in CreateXmlWriter(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 12 ++++++++++++ dlls/xmllite/writer.c | 24 +++++++++++++----------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 62ab871..89fdb4e 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -237,6 +237,7 @@ static void test_writer_create(void) HRESULT hr; IXmlWriter *writer; LONG_PTR value; + IUnknown *unk; /* crashes native */ if (0) @@ -245,6 +246,17 @@ static void test_writer_create(void) CreateXmlWriter(NULL, (void**)&writer, NULL); } + hr = CreateXmlWriter(&IID_IStream, (void **)&unk, NULL); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = CreateXmlWriter(&IID_IUnknown, (void **)&unk, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IXmlWriter, (void **)&writer); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(unk == (IUnknown *)writer, "unexpected interface pointer\n"); + IUnknown_Release(unk); + IXmlWriter_Release(writer); + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a841614..b0e16c0 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -458,11 +458,17 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IXmlWriter)) + if (IsEqualGUID(riid, &IID_IXmlWriter) || + IsEqualGUID(riid, &IID_IUnknown)) { *ppvObject = iface; } + else + { + FIXME("interface %s is not supported\n", debugstr_guid(riid)); + *ppvObject = NULL; + return E_NOINTERFACE; + } IXmlWriter_AddRef(iface); @@ -1393,15 +1399,10 @@ static const struct IUnknownVtbl xmlwriteroutputvtbl = HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) { xmlwriter *writer; + HRESULT hr; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (!IsEqualGUID(riid, &IID_IXmlWriter)) - { - ERR("Unexpected IID requested -> (%s)\n", wine_dbgstr_guid(riid)); - return E_FAIL; - } - if (imalloc) writer = IMalloc_Alloc(imalloc, sizeof(*writer)); else @@ -1423,11 +1424,12 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->starttagopen = FALSE; list_init(&writer->elements); - *obj = &writer->IXmlWriter_iface; + hr = IXmlWriter_QueryInterface(&writer->IXmlWriter_iface, riid, obj); + IXmlWriter_Release(&writer->IXmlWriter_iface); - TRACE("returning iface %p\n", *obj); + TRACE("returning iface %p, hr %#x\n", *obj, hr); - return S_OK; + return hr; } static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding,

1 0

Nikolay Sivov : xmllite/reader: Fix IID argument handling in CreateXmlReader().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: d1e14576bb746ce898782920712da8bf903d852c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e14576bb746ce8987829207… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:28:40 2017 +0300 xmllite/reader: Fix IID argument handling in CreateXmlReader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 14 +++++--------- dlls/xmllite/tests/reader.c | 19 +++++++++++++++++-- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6056418..7f127f6 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3603,16 +3603,11 @@ static const struct IUnknownVtbl xmlreaderinputvtbl = HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; + HRESULT hr; int i; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (!IsEqualGUID(riid, &IID_IXmlReader)) - { - ERR("Unexpected IID requested -> (%s)\n", wine_dbgstr_guid(riid)); - return E_FAIL; - } - if (imalloc) reader = IMalloc_Alloc(imalloc, sizeof(*reader)); else @@ -3640,11 +3635,12 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; - *obj = &reader->IXmlReader_iface; + hr = IXmlReader_QueryInterface(&reader->IXmlReader_iface, riid, obj); + IXmlReader_Release(&reader->IXmlReader_iface); - TRACE("returning iface %p\n", *obj); + TRACE("returning iface %p, hr %#x\n", *obj, hr); - return S_OK; + return hr; } HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 72c1fb7..9cdc7a7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -536,11 +536,11 @@ static IXmlResolver testresolver = { &resolvervtbl }; static void test_reader_create(void) { IXmlResolver *resolver; - HRESULT hr; + IUnknown *input, *unk; IXmlReader *reader; - IUnknown *input; DtdProcessing dtd; XmlNodeType nodetype; + HRESULT hr; /* crashes native */ if (0) @@ -549,6 +549,21 @@ static void test_reader_create(void) CreateXmlReader(NULL, (void**)&reader, NULL); } + hr = CreateXmlReader(&IID_IStream, (void **)&unk, NULL); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = CreateXmlReader(&IID_IUnknown, (void **)&unk, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IXmlReader, (void **)&reader); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(unk == (IUnknown *)reader, "unexpected interface\n"); + IXmlReader_Release(reader); + IUnknown_Release(unk); + + hr = CreateXmlReader(&IID_IUnknown, (void **)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IXmlReader_Release(reader); + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Nikolay Sivov : dwrite: Fix file object leak.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: d5d863597d2d9614b98f8623c50c5c376e253003 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d863597d2d9614b98f8623c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:21:34 2017 +0300 dwrite: Fix file object leak. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d8ffa14..8bf8753 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2408,6 +2408,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (found_font) break; } + IDWriteFontFile_Release(file); if (!found_font) return DWRITE_E_NOFONT;

1 0

Nikolay Sivov : dwrite: Pass index directly to font and family creation helpers.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: f5b6563bec818edcbf0d2561a61ece0e234e765d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5b6563bec818edcbf0d2561a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:21:33 2017 +0300 dwrite: Pass index directly to font and family creation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index aeebb0d..d8ffa14 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1737,7 +1737,7 @@ void get_logfont_from_fontface(IDWriteFontFace *iface, LOGFONTW *lf) *lf = fontface->lf; } -static HRESULT create_font(struct dwrite_font_data *data, struct dwrite_fontfamily *family, IDWriteFont3 **font) +static HRESULT create_font(struct dwrite_fontfamily *family, UINT32 index, IDWriteFont3 **font) { struct dwrite_font *This; @@ -1751,8 +1751,8 @@ static HRESULT create_font(struct dwrite_font_data *data, struct dwrite_fontfami This->ref = 1; This->family = family; IDWriteFontFamily1_AddRef(&family->IDWriteFontFamily1_iface); - This->style = data->style; - This->data = data; + This->data = family->data->fonts[index]; + This->style = This->data->style; InterlockedIncrement(&This->data->ref); *font = &This->IDWriteFont3_iface; @@ -1835,7 +1835,7 @@ static HRESULT WINAPI dwritefontlist_GetFont(IDWriteFontList1 *iface, UINT32 ind if (index >= This->font_count) return E_INVALIDARG; - return create_font(This->fonts[index], This->family, (IDWriteFont3 **)font); + return create_font(This->family, index, (IDWriteFont3 **)font); } static DWRITE_LOCALITY WINAPI dwritefontlist1_GetFontLocality(IDWriteFontList1 *iface, UINT32 index) @@ -1861,7 +1861,7 @@ static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList1 *iface, UINT32 in if (index >= This->font_count) return E_FAIL; - return create_font(This->fonts[index], This->family, font); + return create_font(This->family, index, font); } static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList1 *iface, UINT32 index, @@ -1974,7 +1974,7 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily1 *iface, UINT32 if (index >= This->data->font_count) return E_INVALIDARG; - return create_font(This->data->fonts[index], This, (IDWriteFont3 **)font); + return create_font(This, index, (IDWriteFont3 **)font); } static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily1 *iface, IDWriteLocalizedStrings **names) @@ -2029,8 +2029,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily1 * { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily1(iface); struct dwrite_font_propvec req; - struct dwrite_font_data *match; - UINT32 i; + UINT32 i, match; TRACE("(%p)->(%d %d %d %p)\n", This, weight, stretch, style, font); @@ -2040,14 +2039,14 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily1 * } init_font_prop_vec(weight, stretch, style, &req); - match = This->data->fonts[0]; + match = 0; for (i = 1; i < This->data->font_count; i++) { - if (is_better_font_match(&This->data->fonts[i]->propvec, &match->propvec, &req)) - match = This->data->fonts[i]; + if (is_better_font_match(&This->data->fonts[i]->propvec, &This->data->fonts[match]->propvec, &req)) + match = i; } - return create_font(match, This, (IDWriteFont3 **)font); + return create_font(This, match, (IDWriteFont3 **)font); } typedef BOOL (*matching_filter_func)(const struct dwrite_font_data*); @@ -2163,7 +2162,7 @@ static HRESULT WINAPI dwritefontfamily1_GetFont(IDWriteFontFamily1 *iface, UINT3 if (index >= This->data->font_count) return E_FAIL; - return create_font(This->data->fonts[index], This, font); + return create_font(This, index, font); } static HRESULT WINAPI dwritefontfamily1_GetFontFaceReference(IDWriteFontFamily1 *iface, UINT32 index, @@ -2202,8 +2201,7 @@ static const IDWriteFontFamily1Vtbl fontfamilyvtbl = { dwritefontfamily1_GetFontFaceReference }; -static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, struct dwrite_fontcollection *collection, - IDWriteFontFamily1 **family) +static HRESULT create_fontfamily(struct dwrite_fontcollection *collection, UINT32 index, IDWriteFontFamily1 **family) { struct dwrite_fontfamily *This; @@ -2216,7 +2214,7 @@ static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, struct dwr This->ref = 1; This->collection = collection; IDWriteFontCollection1_AddRef(&collection->IDWriteFontCollection1_iface); - This->data = data; + This->data = collection->family_data[index]; InterlockedIncrement(&This->data->ref); *family = &This->IDWriteFontFamily1_iface; @@ -2317,7 +2315,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection1 return E_FAIL; } - return create_fontfamily(This->family_data[index], This, (IDWriteFontFamily1 **)family); + return create_fontfamily(This, index, (IDWriteFontFamily1 **)family); } static UINT32 collection_find_family(struct dwrite_fontcollection *collection, const WCHAR *name) @@ -2375,10 +2373,9 @@ static BOOL is_same_fontfile(IDWriteFontFile *left, IDWriteFontFile *right) static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollection1 *iface, IDWriteFontFace *face, IDWriteFont **font) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection1(iface); - struct dwrite_fontfamily_data *found_family = NULL; - struct dwrite_font_data *found_font = NULL; IDWriteFontFamily1 *family; UINT32 i, j, face_index; + BOOL found_font = FALSE; IDWriteFontFile *file; HRESULT hr; @@ -2395,27 +2392,31 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec return hr; face_index = IDWriteFontFace_GetIndex(face); + found_font = FALSE; for (i = 0; i < This->family_count; i++) { struct dwrite_fontfamily_data *family_data = This->family_data[i]; + for (j = 0; j < family_data->font_count; j++) { struct dwrite_font_data *font_data = family_data->fonts[j]; if (face_index == font_data->face_index && is_same_fontfile(file, font_data->file)) { - found_font = font_data; - found_family = family_data; + found_font = TRUE; break; } } + + if (found_font) + break; } if (!found_font) return DWRITE_E_NOFONT; - hr = create_fontfamily(found_family, This, &family); + hr = create_fontfamily(This, i, &family); if (FAILED(hr)) return hr; - hr = create_font(found_font, impl_from_IDWriteFontFamily1(family), (IDWriteFont3 **)font); + hr = create_font(impl_from_IDWriteFontFamily1(family), j, (IDWriteFont3 **)font); IDWriteFontFamily1_Release(family); return hr; } @@ -2440,7 +2441,7 @@ static HRESULT WINAPI dwritefontcollection1_GetFontFamily(IDWriteFontCollection1 return E_FAIL; } - return create_fontfamily(This->family_data[index], This, family); + return create_fontfamily(This, index, family); } static const IDWriteFontCollection1Vtbl fontcollectionvtbl = {

1 0

Nikolay Sivov : dwrite: Improve font objects refcounting.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: be5a4656bd299f0b2d42623a8112bdb7eba61f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5a4656bd299f0b2d42623a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:21:32 2017 +0300 dwrite: Improve font objects refcounting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 15 +- dlls/dwrite/font.c | 186 +++++++++------- dlls/dwrite/gdiinterop.c | 40 +++- dlls/dwrite/main.c | 79 ++++--- dlls/dwrite/tests/font.c | 512 ++++++++++++++++++++++++++++++++++++------- 5 files changed, 617 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be5a4656bd299f0b2d426…

1 0

Henri Verbeet : wined3d: Invalidate sub-levels in wined3d_texture_add_dirty_region().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 6a307598b19813bd5a65982eb2e8d4df43e08207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a307598b19813bd5a65982eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:36 2017 +0200 wined3d: Invalidate sub-levels in wined3d_texture_add_dirty_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 2 +- dlls/d3d9/tests/visual.c | 2 +- dlls/wined3d/texture.c | 17 ++++++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index d97f467..88667b4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5518,7 +5518,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set texture stage state, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6fe7c8b..65bc8fc 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17618,7 +17618,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to set sampler state, hr %#x.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6997378..3219305 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1639,8 +1639,8 @@ static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(str HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) { + unsigned int sub_resource_idx, i; struct wined3d_context *context; - unsigned int sub_resource_idx; TRACE("texture %p, layer %u, dirty_region %s.\n", texture, layer, debug_box(dirty_region)); @@ -1649,19 +1649,22 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, WARN("Invalid layer %u specified.\n", layer); return WINED3DERR_INVALIDCALL; } - sub_resource_idx = layer * texture->level_count; if (dirty_region) FIXME("Ignoring dirty_region %s.\n", debug_box(dirty_region)); context = context_acquire(texture->resource.device, NULL, 0); - if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) + sub_resource_idx = layer * texture->level_count; + for (i = 0; i < texture->level_count; ++i, ++sub_resource_idx) { - ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); - context_release(context); - return E_OUTOFMEMORY; + if (!wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding)) + { + ERR("Failed to load location %s.\n", wined3d_debug_location(texture->resource.map_binding)); + context_release(context); + return E_OUTOFMEMORY; + } + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); } - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); context_release(context); return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Require a valid source rectangle in surface_upload_from_surface().
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 2310378042e50690adc130129a69ec6907035cc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2310378042e50690adc130129… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 10 23:47:35 2017 +0200 wined3d: Require a valid source rectangle in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dfb083d..d809282 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -859,13 +859,6 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w } } -static BOOL wined3d_surface_check_rect_dimensions(struct wined3d_surface *surface, const RECT *rect) -{ - struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - - return SUCCEEDED(wined3d_texture_check_box_dimensions(surface->container, surface->texture_level, &box)); -} - static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { @@ -878,25 +871,11 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, struct wined3d_context *context; struct wined3d_bo_address data; UINT update_w, update_h; - RECT r; TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", dst_surface, wine_dbgstr_point(dst_point), src_surface, wine_dbgstr_rect(src_rect)); - if (!src_rect) - { - SetRect(&r, 0, 0, wined3d_texture_get_level_width(src_texture, src_surface->texture_level), - wined3d_texture_get_level_height(src_texture, src_surface->texture_level)); - src_rect = &r; - } - - if (!wined3d_surface_check_rect_dimensions(src_surface, src_rect)) - { - WARN("Source rectangle not block-aligned.\n"); - return WINED3DERR_INVALIDCALL; - } - context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
76
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 2017