wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Zebediah Figura : msi: Don't set _BrowseProperty.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: 44fb23dc32872385000a5f2c6494130b15d1c626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44fb23dc32872385000a5f2c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:12 2017 -0500 msi: Don't set _BrowseProperty. This is a revert of 166a7e993cb0033fac7ec2712c346558fb7bd100. _BrowseProperty is not set by Windows, but should rather be set by the program in question. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/package.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 6c24f61..4c44a84 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -746,8 +746,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szPrintHoodFolder[] = {'P','r','i','n','t','H','o','o','d','F','o','l','d','e','r',0}; static const WCHAR szRecentFolder[] = {'R','e','c','e','n','t','F','o','l','d','e','r',0}; static const WCHAR szComputerName[] = {'C','o','m','p','u','t','e','r','N','a','m','e',0}; - static const WCHAR szBrowseProperty[] = {'_','B','r','o','w','s','e','P','r','o','p','e','r','t','y',0}; - static const WCHAR szInstallDir[] = {'I','N','S','T','A','L','L','D','I','R',0}; /* * Other things that probably should be set: @@ -1019,7 +1017,6 @@ static VOID set_installer_properties(MSIPACKAGE *package) msi_free( computername ); } } - msi_set_property( package->db, szBrowseProperty, szInstallDir, -1 ); } static MSIPACKAGE *msi_alloc_package( void )

1 0

Zebediah Figura : msi: Avoid a null pointer dereference.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: b4c39f4e7c9d8b20afb615f00f1013b7fec69b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4c39f4e7c9d8b20afb615f00… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:11 2017 -0500 msi: Avoid a null pointer dereference. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/database.c | 5 +++++ dlls/msi/tests/db.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 34f8d04..85e8306 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -778,6 +778,11 @@ static UINT MSI_DatabaseImport(MSIDATABASE *db, LPCWSTR folder, LPCWSTR file) lstrcatW( path, file ); data = msi_read_text_archive( path, &len ); + if (!data) + { + msi_free(path); + return ERROR_FUNCTION_FAILED; + } ptr = data; msi_parse_line( &ptr, &columns, &num_columns, &len ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 278b45f..4ea1f10 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -2369,6 +2369,12 @@ static void test_msiimport(void) r = MsiOpenDatabaseW(msifileW, MSIDBOPEN_CREATE, &hdb); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiDatabaseImportA(hdb, CURR_DIR, NULL); + ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + + r = MsiDatabaseImportA(hdb, CURR_DIR, "nonexistent"); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); + r = add_table_to_db(hdb, test_data); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);

1 0

Zebediah Figura : msi/tests: Use static linking for a couple functions.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: e76b42c0966a4f4445312ac5b9e5a9f6a425af99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e76b42c0966a4f4445312ac5b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 20 23:43:10 2017 -0500 msi/tests: Use static linking for a couple functions. These are available on all of the test machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 110 ++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 63 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 1173c92..0b287f4 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -38,9 +38,7 @@ static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','-','p','a','c','k','a','g','e','.','m','s','i',0}; static char CURR_DIR[MAX_PATH]; -static UINT (WINAPI *pMsiApplyMultiplePatchesA)(LPCSTR, LPCSTR, LPCSTR); static INSTALLSTATE (WINAPI *pMsiGetComponentPathExA)(LPCSTR, LPCSTR, LPCSTR, MSIINSTALLCONTEXT, LPSTR, LPDWORD); -static UINT (WINAPI *pMsiSetExternalUIRecord)(INSTALLUI_HANDLER_RECORD, DWORD, LPVOID, PINSTALLUI_HANDLER_RECORD); static HRESULT (WINAPI *pSHGetFolderPathA)(HWND, int, HANDLE, DWORD, LPSTR); static BOOL (WINAPI *pCheckTokenMembership)(HANDLE,PSID,PBOOL); @@ -67,9 +65,7 @@ static void init_functionpointers(void) #define GET_PROC(mod, func) \ p ## func = (void*)GetProcAddress(mod, #func); - GET_PROC(hmsi, MsiApplyMultiplePatchesA); GET_PROC(hmsi, MsiGetComponentPathExA); - GET_PROC(hmsi, MsiSetExternalUIRecord); GET_PROC(hshell32, SHGetFolderPathA); GET_PROC(hadvapi32, CheckTokenMembership); @@ -8795,48 +8791,43 @@ static void test_MsiApplyMultiplePatches(void) { UINT r, type = GetDriveTypeW(NULL); - if (!pMsiApplyMultiplePatchesA) { - win_skip("MsiApplyMultiplePatchesA not found\n"); - return; - } - - r = pMsiApplyMultiplePatchesA(NULL, NULL, NULL); + r = MsiApplyMultiplePatchesA(NULL, NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = pMsiApplyMultiplePatchesA("", NULL, NULL); + r = MsiApplyMultiplePatchesA("", NULL, NULL); ok(r == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u\n", r); - r = pMsiApplyMultiplePatchesA(";", NULL, NULL); + r = MsiApplyMultiplePatchesA(";", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA(" ;", NULL, NULL); + r = MsiApplyMultiplePatchesA(" ;", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATCH_PACKAGE_OPEN_FAILED, "Expected ERROR_PATCH_PACKAGE_OPEN_FAILED, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA(";;", NULL, NULL); + r = MsiApplyMultiplePatchesA(";;", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); + r = MsiApplyMultiplePatchesA("nosuchpatchpackage;", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = pMsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); + r = MsiApplyMultiplePatchesA(";nosuchpatchpackage", NULL, NULL); if (type == DRIVE_FIXED) todo_wine ok(r == ERROR_PATH_NOT_FOUND, "Expected ERROR_PATH_NOT_FOUND, got %u\n", r); else ok(r == ERROR_INVALID_NAME, "Expected ERROR_INVALID_NAME, got %u\n", r); - r = pMsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); + r = MsiApplyMultiplePatchesA("nosuchpatchpackage;nosuchpatchpackage", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); - r = pMsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); + r = MsiApplyMultiplePatchesA(" nosuchpatchpackage ; nosuchpatchpackage ", NULL, NULL); todo_wine ok(r == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %u\n", r); } @@ -9154,6 +9145,7 @@ static void test_externalui(void) INSTALLUI_HANDLER_RECORD prev_record; MSIHANDLE hpkg, hrecord; UINT r; + INT retval = 0; prev = MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); @@ -9178,48 +9170,41 @@ static void test_externalui(void) ok(r == 0, "expected 0, got %u\n", r); ok(externalui_ran == 1, "external UI callback did not run\n"); - if (pMsiSetExternalUIRecord) - { - INT retval = 0; - - prev = MsiSetExternalUIA(prev, 0, NULL); - ok(prev == externalui_callback, "wrong callback function %p\n", prev); - r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_USER, &retval, &prev_record); - ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); - - externalui_ran = externalui_record_ran = 0; - r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - ok(r == 0, "expected 0, got %u\n", r); - ok(externalui_ran == 0, "external UI callback should not have run\n"); - ok(externalui_record_ran == 1, "external UI record callback did not run\n"); - - MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); - - externalui_ran = externalui_record_ran = 0; - r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - ok(r == 0, "expected 0, got %u\n", r); - ok(externalui_ran == 1, "external UI callback did not run\n"); - ok(externalui_record_ran == 1, "external UI record callback did not run\n"); - - retval = 1; - externalui_ran = externalui_record_ran = 0; - r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - ok(r == 1, "expected 1, got %u\n", r); - ok(externalui_ran == 0, "external UI callback should not have run\n"); - ok(externalui_record_ran == 1, "external UI record callback did not run\n"); - - /* filter and context should be kept separately */ - r = pMsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_ERROR, &retval, &prev_record); - ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); - - externalui_ran = externalui_record_ran = 0; - r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); - ok(r == 0, "expected 0, got %u\n", r); - ok(externalui_ran == 1, "external UI callback did not run\n"); - ok(externalui_record_ran == 0, "external UI record callback should not have run\n"); - } - else - win_skip("MsiSetExternalUIRecord is not available\n"); + prev = MsiSetExternalUIA(prev, 0, NULL); + ok(prev == externalui_callback, "wrong callback function %p\n", prev); + r = MsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_USER, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + MsiSetExternalUIA(externalui_callback, INSTALLLOGMODE_USER, NULL); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + retval = 1; + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 1, "expected 1, got %u\n", r); + ok(externalui_ran == 0, "external UI callback should not have run\n"); + ok(externalui_record_ran == 1, "external UI record callback did not run\n"); + + /* filter and context should be kept separately */ + r = MsiSetExternalUIRecord(externalui_record_callback, INSTALLLOGMODE_ERROR, &retval, &prev_record); + ok(r == ERROR_SUCCESS, "MsiSetExternalUIRecord failed %u\n", r); + + externalui_ran = externalui_record_ran = 0; + r = MsiProcessMessage(hpkg, INSTALLMESSAGE_USER, hrecord); + ok(r == 0, "expected 0, got %u\n", r); + ok(externalui_ran == 1, "external UI callback did not run\n"); + ok(externalui_record_ran == 0, "external UI record callback should not have run\n"); MsiCloseHandle(hpkg); DeleteFileA(msifile); @@ -9496,7 +9481,7 @@ static void test_externalui_message(void) /* processing SHOWDIALOG with a record handler causes a crash on XP */ MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, &retval); - r = pMsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, &retval, &prev); + r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, &retval, &prev); flush_sequence(); @@ -9703,8 +9688,7 @@ START_TEST(package) test_MsiEnumComponentCosts(); test_MsiDatabaseCommit(); test_externalui(); - if (pMsiSetExternalUIRecord) - test_externalui_message(); + test_externalui_message(); if (pSRSetRestorePointA && !pMsiGetComponentPathExA && ret) {

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 21 Jul '17

21 Jul '17

Module: wine Branch: master Commit: b143ae84a7f5fc95cf2d815fcef66c4db554910f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b143ae84a7f5fc95cf2d815fc… Author: Kim Malmo <berencamlost(a)msn.com> Date: Thu Jul 20 23:09:06 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 188 ++++++++++++++++-------------------------------------------- 1 file changed, 50 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b143ae84a7f5fc95cf2d8…

1 0

Nikolay Sivov : dwrite: Fix cache entry use-after-free (Valgrind).
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: addd8e69ff09e8620aa3c9c2120d2161df478ac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=addd8e69ff09e8620aa3c9c21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 20 19:47:33 2017 +0300 dwrite: Fix cache entry use-after-free (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 6 ++++++ dlls/dwrite/main.c | 1 + 3 files changed, 8 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 9530399..57731a9 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -198,6 +198,7 @@ extern void factory_release_cached_fontface(struct fontfacecached*) DECLSPEC_HID extern void get_logfont_from_font(IDWriteFont*,LOGFONTW*) DECLSPEC_HIDDEN; extern void get_logfont_from_fontface(IDWriteFontFace*,LOGFONTW*) DECLSPEC_HIDDEN; extern HRESULT create_gdiinterop(IDWriteFactory5*,IDWriteGdiInterop1**) DECLSPEC_HIDDEN; +extern void fontface_detach_from_cache(IDWriteFontFace4*) DECLSPEC_HIDDEN; /* Opentype font table functions */ struct dwrite_font_props { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6862d7b..be0131a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -443,6 +443,12 @@ static void release_fontfamily_data(struct dwrite_fontfamily_data *data) heap_free(data); } +void fontface_detach_from_cache(IDWriteFontFace4 *iface) +{ + struct dwrite_fontface *fontface = impl_from_IDWriteFontFace4(iface); + fontface->cached = NULL; +} + static HRESULT WINAPI dwritefontface_QueryInterface(IDWriteFontFace4 *iface, REFIID riid, void **obj) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c822781..36d8613 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -566,6 +566,7 @@ static void release_fontface_cache(struct list *fontfaces) LIST_FOR_EACH_ENTRY_SAFE(fontface, fontface2, fontfaces, struct fontfacecached, entry) { list_remove(&fontface->entry); + fontface_detach_from_cache(fontface->fontface); heap_free(fontface); } }

1 0

Nikolay Sivov : dwrite: Print missing table message as a trace.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: d06443d659d1a86f0111859711203bc426ef7b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06443d659d1a86f011185971… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 20 19:47:32 2017 +0300 dwrite: Print missing table message as a trace. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5e72aea..6862d7b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -353,7 +353,7 @@ static void* get_fontface_table(IDWriteFontFace4 *fontface, UINT32 tag, struct d hr = IDWriteFontFace4_TryGetFontTable(fontface, tag, (const void**)&table->data, &table->size, &table->context, &table->exists); if (FAILED(hr) || !table->exists) { - WARN("Font does not have a %s table\n", debugstr_tag(tag)); + TRACE("Font does not have %s table\n", debugstr_tag(tag)); return NULL; } @@ -5118,7 +5118,7 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaBlendParams(IDWriteGlyphRunAnalys break; } case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED: - WARN("Downsampled mode is ignored.\n"); + WARN("NATURAL_SYMMETRIC_DOWNSAMPLED mode is ignored.\n"); /* fallthrough */ case DWRITE_RENDERING_MODE1_ALIASED: case DWRITE_RENDERING_MODE1_NATURAL:

1 0

Nikolay Sivov : xmllite/tests: Use input stream helper in more tests.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: b1e0f7597233dd1828586087fe362a9d6d6d4e79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1e0f7597233dd1828586087f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 20 19:47:08 2017 +0300 xmllite/tests: Use input stream helper in more tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 65 +++++++-------------------------------------- 1 file changed, 10 insertions(+), 55 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9cdc7a7..673e6c4 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -796,7 +796,6 @@ static void test_reader_state(void) { XmlNodeType nodetype; IXmlReader *reader; - IStream *stream; HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); @@ -815,12 +814,7 @@ if (0) hr = IXmlReader_Read(reader, &nodetype); ok(hr == S_FALSE, "got %08x\n", hr); } - - stream = create_stream_on_data("xml", sizeof("xml")); - - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - + set_input_string(reader, "xml"); TEST_READER_STATE(reader, XmlReadState_Initial); nodetype = XmlNodeType_Element; @@ -838,7 +832,6 @@ todo_wine ok(FAILED(hr), "got %08x\n", hr); ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); - IStream_Release(stream); IXmlReader_Release(reader); } @@ -1282,7 +1275,6 @@ static void test_read_public_dtd(void) IXmlReader *reader; const WCHAR *str; XmlNodeType type; - IStream *stream; UINT len, count; HRESULT hr; @@ -1292,9 +1284,7 @@ static void test_read_public_dtd(void) hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); ok(hr == S_OK, "got 0x%8x\n", hr); - stream = create_stream_on_data(test_public_dtd, sizeof(test_public_dtd)); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test_public_dtd); read_node(reader, XmlNodeType_DocumentType); @@ -1335,7 +1325,6 @@ todo_wine { ok(len == lstrlenW(dtdnameW), "got %u\n", len); ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); } - IStream_Release(stream); IXmlReader_Release(reader); } @@ -1349,7 +1338,6 @@ static void test_read_system_dtd(void) IXmlReader *reader; const WCHAR *str; XmlNodeType type; - IStream *stream; UINT len, count; HRESULT hr; @@ -1359,9 +1347,7 @@ static void test_read_system_dtd(void) hr = IXmlReader_SetProperty(reader, XmlReaderProperty_DtdProcessing, DtdProcessing_Parse); ok(hr == S_OK, "got 0x%8x\n", hr); - stream = create_stream_on_data(test_system_dtd, sizeof(test_system_dtd)); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test_system_dtd); read_node(reader, XmlNodeType_DocumentType); @@ -1395,7 +1381,6 @@ todo_wine { read_node(reader, XmlNodeType_Comment); - IStream_Release(stream); IXmlReader_Release(reader); } @@ -1709,11 +1694,8 @@ static void test_read_cdata(void) while (test->xml) { XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1759,7 +1741,6 @@ static void test_read_cdata(void) reader_value(reader, test->value); } - IStream_Release(stream); test++; } @@ -1786,11 +1767,8 @@ static void test_read_text(void) while (test->xml) { XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1832,7 +1810,6 @@ static void test_read_text(void) reader_value(reader, test->value); } - IStream_Release(stream); test++; } @@ -1862,12 +1839,9 @@ static void test_isemptyelement(void) while (test->xml) { XmlNodeType type; - IStream *stream; BOOL ret; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); @@ -1877,7 +1851,6 @@ static void test_isemptyelement(void) ret = IXmlReader_IsEmptyElement(reader); ok(ret == test->empty, "got %d, expected %d. xml=%s\n", ret, test->empty, test->xml); - IStream_Release(stream); test++; } @@ -1920,11 +1893,8 @@ static void test_read_attribute(void) while (test->xml) { XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(test->xml, strlen(test->xml)+1); - hr = IXmlReader_SetInput(reader, (IUnknown*)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, test->xml); hr = IXmlReader_Read(reader, NULL); @@ -1962,7 +1932,6 @@ static void test_read_attribute(void) reader_value(reader, test->value); } - IStream_Release(stream); test++; } @@ -2019,11 +1988,8 @@ static void test_prefix(void) for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { XmlNodeType type; - IStream *stream; - stream = create_stream_on_data(prefix_tests[i].xml, strlen(prefix_tests[i].xml) + 1); - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, prefix_tests[i].xml); hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "Read() failed, %#x\n", hr); @@ -2051,8 +2017,6 @@ static void test_prefix(void) /* back to the element, check prefix */ move_to_element(reader); reader_prefix(reader, prefix_tests[i].prefix1); - - IStream_Release(stream); } IXmlReader_Release(reader); @@ -2098,11 +2062,9 @@ static void test_namespaceuri(void) ok(hr == S_OK, "S_OK, got %08x\n", hr); for (i = 0; i < sizeof(uri_tests)/sizeof(uri_tests[0]); i++) { - IStream *stream = create_stream_on_data(uri_tests[i].xml, strlen(uri_tests[i].xml) + 1); unsigned int j = 0; - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, uri_tests[i].xml); type = ~0u; while (IXmlReader_Read(reader, &type) == S_OK) { @@ -2147,8 +2109,6 @@ static void test_namespaceuri(void) j++; } ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); - - IStream_Release(stream); } IXmlReader_Release(reader); @@ -2224,17 +2184,12 @@ static void test_encoding_detection(void) for (i = 0; i < sizeof(encoding_testsA)/sizeof(encoding_testsA[0]); i++) { - stream = create_stream_on_data(encoding_testsA[i], strlen(encoding_testsA[i])); - - hr = IXmlReader_SetInput(reader, (IUnknown *)stream); - ok(hr == S_OK, "got %08x\n", hr); + set_input_string(reader, encoding_testsA[i]); type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); ok(type != XmlNodeType_None, "Unexpected node type %d\n", type); - - IStream_Release(stream); } for (i = 0; i < sizeof(encoding_testsW)/sizeof(encoding_testsW[0]); i++)

1 0

Jacek Caban : mshtml: Added IHTMLDOMNode3::get_textContent implementation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: c8cab0d3f6cd74838e7d872ac68cd69133717cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8cab0d3f6cd74838e7d872ac… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 20 18:11:29 2017 +0200 mshtml: Added IHTMLDOMNode3::get_textContent implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 10 ++++++++-- dlls/mshtml/tests/elements.js | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 8202803..ec18648 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1248,8 +1248,14 @@ static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT static HRESULT WINAPI HTMLDOMNode3_get_textContent(IHTMLDOMNode3 *iface, VARIANT *p) { HTMLDOMNode *This = impl_from_IHTMLDOMNode3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMNode_GetTextContent(This->nsnode, &nsstr); + return return_nsstr_variant(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDOMNode3_isEqualNode(IHTMLDOMNode3 *iface, IHTMLDOMNode3 *otherNode, VARIANT_BOOL *isEqual) diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index c307e50..79eb68a 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -59,6 +59,19 @@ function test_input_selection() { next_test(); } +function test_textContent() { + var text = document.createTextNode("test"); + ok(text.textContent === "test", "text.textContent = " + text.textContent); + + var div = document.createElement("div"); + document.body.appendChild(div); + div.innerHTML = "abc<script>/* */</script><div>text</div>"; + ok(div.textContent === "abc/* */text", "div.textContent = " + div.textContent); + + next_test(); +} + var tests = [ - test_input_selection + test_input_selection, + test_textContent ];

1 0

Jacek Caban : mshtml: Support returning VT_NULL from return_nsstr_variant.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: fd44c7ac26ddb2c4d5567f224609884f478c1975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd44c7ac26ddb2c4d5567f224… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 20 18:11:22 2017 +0200 mshtml: Support returning VT_NULL from return_nsstr_variant. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 7 +------ dlls/mshtml/nsembed.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9bdb0844..f95adc0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -926,12 +926,7 @@ UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; - -static inline HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) -{ - V_VT(p) = VT_BSTR; - return return_nsstr(nsres, nsstr, &V_BSTR(p)); -} +HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) DECLSPEC_HIDDEN; nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN; HRESULT nsnode_to_nsstring(nsIDOMNode*,nsAString*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index aee00e6..a32f8f1 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -69,6 +69,7 @@ static nsresult (CDECL *NS_CStringSetData)(nsACString*,const char*,PRUint32); static nsresult (CDECL *NS_NewLocalFile)(const nsAString*,cpp_bool,nsIFile**); static PRUint32 (CDECL *NS_StringGetData)(const nsAString*,const PRUnichar **,cpp_bool*); static PRUint32 (CDECL *NS_CStringGetData)(const nsACString*,const char**,cpp_bool*); +static cpp_bool (CDECL *NS_StringGetIsVoid)(const nsAString*); static void* (CDECL *NS_Alloc)(SIZE_T); static void (CDECL *NS_Free)(void*); @@ -518,6 +519,7 @@ static BOOL load_xul(const PRUnichar *gre_path) NS_DLSYM(NS_NewLocalFile); NS_DLSYM(NS_StringGetData); NS_DLSYM(NS_CStringGetData); + NS_DLSYM(NS_StringGetIsVoid); NS_DLSYM(NS_Alloc); NS_DLSYM(NS_Free); NS_DLSYM(ccref_incr); @@ -870,6 +872,38 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) return S_OK; } +HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) +{ + const PRUnichar *str; + + if(NS_FAILED(nsres)) { + ERR("failed: %08x\n", nsres); + nsAString_Finish(nsstr); + return E_FAIL; + } + + if(NS_StringGetIsVoid(nsstr)) { + TRACE("ret null\n"); + V_VT(p) = VT_NULL; + }else { + nsAString_GetData(nsstr, &str); + TRACE("ret %s\n", debugstr_w(str)); + if(*str) { + V_BSTR(p) = SysAllocString(str); + if(!V_BSTR(p)) { + nsAString_Finish(nsstr); + return E_OUTOFMEMORY; + } + }else { + V_BSTR(p) = NULL; + } + V_VT(p) = VT_BSTR; + } + + nsAString_Finish(nsstr); + return S_OK; +} + nsICommandParams *create_nscommand_params(void) { nsICommandParams *ret = NULL;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 20 Jul '17

20 Jul '17

Module: wine Branch: master Commit: 97b6b1e224faf948fe9d76ec6bf8d19aa028e8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b6b1e224faf948fe9d76ec6… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Jul 20 17:38:45 2017 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 72 ++++++++++++++-------------------------------------------------- 1 file changed, 15 insertions(+), 57 deletions(-) diff --git a/po/fi.po b/po/fi.po index 01e6de0..ef8fc7f 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-03 17:32+0200\n" +"PO-Revision-Date: 2017-07-20 17:38+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -6882,27 +6882,23 @@ msgstr "valitse kansio, jossa on %s" #: msi.rc:71 msgid "{{Fatal error: }}" -msgstr "" +msgstr "{{Peruuttamaton virhe: }}" #: msi.rc:72 msgid "{{Error [1]. }}" -msgstr "" +msgstr "{{Virhe [1]. }}" #: msi.rc:73 msgid "Warning [1]." -msgstr "" +msgstr "Varoitus [1]." #: msi.rc:74 -#, fuzzy -#| msgid "Info [1]. " msgid "Info [1]." -msgstr "Tiedote [1]. " +msgstr "Tiedote [1]." #: msi.rc:75 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Levy täynnä.\n" +msgstr "{{Levy täynnä: }}" #: msi.rc:76 msgid "Action %s: [1]. [2]" @@ -6930,6 +6926,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Asennusohjelma kohtasi odottamattoman virheen tämän paketin asennuksessa. " +"Paketissa voi olla ongelma. Virhekoodi on [1]. {{Argumentit ovat: [2], [3], " +"[4]}}" #: msi.rc:92 msgid "Allocating registry space" @@ -12357,38 +12356,6 @@ msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "Tiedostoa %1 ei voi tuoda, koska se ei ole kelpo rekisteritiedosto." #: regedit.rc:408 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " regedit [options] [filename] [reg_key]\n" -#| "\n" -#| "Options:\n" -#| " [no option] Launch the graphical version of this program.\n" -#| " /L:system.dat The location of the system.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /R:user.dat The location of the user.dat file to be modified.\n" -#| " Compatible with any other switch. Ignored.\n" -#| " /C Import the contents of a registry file.\n" -#| " /D Delete a specified registry key.\n" -#| " /E Export the contents of a specified registry key to a " -#| "file.\n" -#| " If no key is specified, the entire registry is " -#| "exported.\n" -#| " /S Silent mode. No messages will be displayed.\n" -#| " /V Launch the GUI in advanced mode. Ignored.\n" -#| " /? Display this information and exit.\n" -#| " [filename] The location of the file containing registry information " -#| "to\n" -#| " be imported. When used with [/E], this option specifies " -#| "the\n" -#| " file location where registry information will be " -#| "exported.\n" -#| " [reg_key] The registry key to be modified.\n" -#| "\n" -#| "Usage examples:\n" -#| " regedit \"import.reg\"\n" -#| " regedit /E \"export.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -#| " regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" msgid "" "Usage:\n" " regedit [options] [filename] [reg_key]\n" @@ -12442,7 +12409,7 @@ msgstr "" "Käyttöesimerkkejä:\n" " regedit \"tuotava.reg\"\n" " regedit /E \"vietävä.reg\" \"HKEY_CURRENT_USER\\Console\"\n" -" regedit /D \"HKEY_LOCAL_MACHINE\\Error\\Path\"\n" +" regedit /D \"HKEY_LOCAL_MACHINE\\Key\\Path\"\n" #: regedit.rc:409 msgid "regedit: Invalid or unrecognized switch [%1]\n" @@ -12513,21 +12480,18 @@ msgid "regedit: Unable to open the registry key '%1'.\n" msgstr "regedit: Rekisteriavainta '%1' ei voida avata.\n" #: regedit.rc:425 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1] encountered in '%2'.\n" msgid "" "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" -msgstr "regedit: Rekisterin tietotyypille [%1] kohteessa '%2' ei ole tukea.\n" +msgstr "" +"regedit: Rekisterin tietotyypille [0x%1!x!] kohteessa '%2' ei ole tukea.\n" #: regedit.rc:426 msgid "regedit: The registry value '%1' will be exported as binary data.\n" msgstr "regedit: Rekisteriarvo '%1' viedään binääridatana.\n" #: regedit.rc:427 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "regedit: Invalid system key [%1]\n" -msgstr "reg: Avaimen nimi ei kelpaa\n" +msgstr "regedit: Järjestelmäavain [%1] ei kelpaa\n" #: regedit.rc:428 msgid "" @@ -12535,10 +12499,8 @@ msgid "" msgstr "regedit: Ei voida viedä kohdetta '%1'. Rekisteriavainta ei löydy.\n" #: regedit.rc:429 -#, fuzzy -#| msgid "regedit: Unable to delete the registry class '%1'.\n" msgid "regedit: Unable to delete the registry key '%1'.\n" -msgstr "regedit: Rekisteriluokkaa '%1' ei voida poistaa.\n" +msgstr "regedit: Rekisteriavainta '%1' ei voida poistaa.\n" #: regedit.rc:431 msgid "regedit: The line contains invalid syntax.\n" @@ -12685,13 +12647,9 @@ msgid "Confirm Key Delete" msgstr "Vahvista avaimen tuhoaminen" #: regedit.rc:213 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registry key '%1' and all of its " -#| "subkeys?" msgid "" "Are you sure you want to delete this registry key and all of its subkeys?" -msgstr "Haluatko varmasti tuhota rekisteriavaimen '%1' ja sen aliavaimet?" +msgstr "Haluatko varmasti tuhota tämän rekisteriavaimen ja sen aliavaimet?" #: regedit.rc:199 msgid "Expands or collapses the selected node"

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
64
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 July 2017