Ros-diffs March 2016

ros-diffs@reactos.org

13 participants
263 discussions

[akhaldi] 70895: [OLE32] Adapt to the recent objbase.h change.
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 17:54:32 2016 New Revision: 70895 URL: http://svn.reactos.org/svn/reactos?rev=70895&view=rev Log: [OLE32] Adapt to the recent objbase.h change. Modified: trunk/reactos/dll/win32/ole32/ifs.c Modified: trunk/reactos/dll/win32/ole32/ifs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ifs.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ifs.c [iso-8859-1] Thu Mar 3 17:54:32 2016 @@ -377,7 +377,7 @@ * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemAlloc(ULONG size) +LPVOID WINAPI CoTaskMemAlloc(SIZE_T size) { return IMalloc_Alloc(&Malloc32.IMalloc_iface,size); } @@ -411,7 +411,7 @@ * Success: Pointer to newly allocated memory block. * Failure: NULL. */ -LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, ULONG size) +LPVOID WINAPI CoTaskMemRealloc(LPVOID pvOld, SIZE_T size) { return IMalloc_Realloc(&Malloc32.IMalloc_iface, pvOld, size); }

1 0

[akhaldi] 70894: [PSDK] Update objbase.h. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 17:49:03 2016 New Revision: 70894 URL: http://svn.reactos.org/svn/reactos?rev=70894&view=rev Log: [PSDK] Update objbase.h. CORE-10912 Modified: trunk/reactos/include/psdk/objbase.h Modified: trunk/reactos/include/psdk/objbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/objbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objbase.h [iso-8859-1] Thu Mar 3 17:49:03 2016 @@ -363,7 +363,7 @@ _Check_return_ LPVOID WINAPI -CoTaskMemAlloc(_In_ ULONG size) __WINE_ALLOC_SIZE(1); +CoTaskMemAlloc(_In_ SIZE_T size) __WINE_ALLOC_SIZE(1); void WINAPI @@ -377,7 +377,7 @@ WINAPI CoTaskMemRealloc( _In_opt_ __drv_freesMem(Mem) _Post_invalid_ LPVOID ptr, - _In_ ULONG size); + _In_ SIZE_T size); HRESULT WINAPI CoRegisterMallocSpy(_In_ LPMALLOCSPY pMallocSpy); HRESULT WINAPI CoRevokeMallocSpy(void);

1 0

[akhaldi] 70893: [MSIEXEC] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 14:29:43 2016 New Revision: 70893 URL: http://svn.reactos.org/svn/reactos?rev=70893&view=rev Log: [MSIEXEC] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/base/system/msiexec/service.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/base/system/msiexec/service.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/servic… ============================================================================== --- trunk/reactos/base/system/msiexec/service.c [iso-8859-1] (original) +++ trunk/reactos/base/system/msiexec/service.c [iso-8859-1] Thu Mar 3 14:29:43 2016 @@ -39,7 +39,9 @@ status.dwServiceType = SERVICE_WIN32_OWN_PROCESS; status.dwCurrentState = dwCurrentState; - if (dwCurrentState == SERVICE_START_PENDING) + if (dwCurrentState == SERVICE_START_PENDING + || dwCurrentState == SERVICE_STOP_PENDING + || dwCurrentState == SERVICE_STOPPED) status.dwControlsAccepted = 0; else { @@ -73,8 +75,6 @@ static void WINAPI ServiceCtrlHandler(DWORD code) { - DWORD state = SERVICE_RUNNING; - WINE_TRACE("%u\n", code); switch (code) @@ -83,14 +83,12 @@ case SERVICE_CONTROL_STOP: UpdateSCMStatus(SERVICE_STOP_PENDING, NO_ERROR, 0); KillService(); - state = SERVICE_STOPPED; break; default: fprintf(stderr, "Unhandled service control code: %u\n", code); + UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); break; } - - UpdateSCMStatus(state, NO_ERROR, 0); } static DWORD WINAPI ServiceExecutionThread(LPVOID param) @@ -142,10 +140,7 @@ } UpdateSCMStatus(SERVICE_RUNNING, NO_ERROR, 0); - - WaitForSingleObject(kill_event, INFINITE); - KillService(); - + WaitForSingleObject(thread, INFINITE); UpdateSCMStatus(SERVICE_STOPPED, NO_ERROR, 0); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Mar 3 14:29:43 2016 @@ -243,7 +243,7 @@ reactos/base/applications/wordpad # Synced to WineStaging-1.7.55 reactos/base/services/rpcss # Synced to WineStaging-1.7.55 reactos/base/system/expand # Synced to WineStaging-1.7.55 -reactos/base/system/msiexec # Synced to WineStaging-1.7.55 +reactos/base/system/msiexec # Synced to WineStaging-1.9.4 reactos/modules/rosapps/winfile # Autosync In addition the following libs, dlls and source files are mostly based on code ported

1 0

[akhaldi] 70892: [MSI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 14:28:57 2016 New Revision: 70892 URL: http://svn.reactos.org/svn/reactos?rev=70892&view=rev Log: [MSI_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/install.c trunk/rostests/winetests/msi/source.c Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… ============================================================================== --- trunk/rostests/winetests/msi/automation.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/automation.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -877,7 +877,7 @@ hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); HeapFree(GetProcessHeap(), 0, name); ok(hr == S_OK, "IDispatch::GetIDsOfNames returned 0x%08x\n", hr); - if (!hr == S_OK) return hr; + if (hr != S_OK) return hr; memset(&excepinfo, 0, sizeof(excepinfo)); hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_NEUTRAL, wFlags, pDispParams, pVarResult, &excepinfo, NULL); Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=70… ============================================================================== --- trunk/rostests/winetests/msi/db.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/db.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -1287,13 +1287,15 @@ r = run_query( hdb, 0, "CREATE TABLE `Properties` " "( `Property` CHAR(255), " - " `Value` CHAR(1), " - " `Intvalue` INT, " - " `Integervalue` INTEGER, " - " `Shortvalue` SHORT, " - " `Longvalue` LONG, " - " `Longcharvalue` LONGCHAR " - " PRIMARY KEY `Property`)" ); + " `Value` CHAR(1), " + " `Intvalue` INT, " + " `Integervalue` INTEGER, " + " `Shortvalue` SHORT, " + " `Longvalue` LONG, " + " `Longcharvalue` LONGCHAR, " + " `Charvalue` CHAR, " + " `Localizablevalue` CHAR LOCALIZABLE " + " PRIMARY KEY `Property`)" ); ok( r == ERROR_SUCCESS , "Failed to create table\n" ); /* check the column types */ @@ -1307,6 +1309,8 @@ ok( check_record( rec, 5, "I2"), "wrong record type\n"); ok( check_record( rec, 6, "I4"), "wrong record type\n"); ok( check_record( rec, 7, "S0"), "wrong record type\n"); + ok( check_record( rec, 8, "S0"), "wrong record type\n"); + ok( check_record( rec, 9, "L0"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -1318,6 +1322,8 @@ ok( 0x1502 == get_columns_table_type(hdb, "Properties", 5 ), "_columns table wrong\n"); ok( 0x1104 == get_columns_table_type(hdb, "Properties", 6 ), "_columns table wrong\n"); ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 7 ), "_columns table wrong\n"); + ok( 0x1d00 == get_columns_table_type(hdb, "Properties", 8 ), "_columns table wrong\n"); + ok( 0x1f00 == get_columns_table_type(hdb, "Properties", 9 ), "_columns table wrong\n"); /* now try the names */ rec = get_column_info( hdb, "select * from `Properties`", MSICOLINFO_NAMES ); @@ -1330,6 +1336,8 @@ ok( check_record( rec, 5, "Shortvalue"), "wrong record type\n"); ok( check_record( rec, 6, "Longvalue"), "wrong record type\n"); ok( check_record( rec, 7, "Longcharvalue"), "wrong record type\n"); + ok( check_record( rec, 8, "Charvalue"), "wrong record type\n"); + ok( check_record( rec, 9, "Localizablevalue"), "wrong record type\n"); MsiCloseHandle( rec ); @@ -7266,7 +7274,7 @@ create_file_data("forcecodepage.idt", "\r\n\r\n9999\t_ForceCodepage\r\n", 0); r = MsiDatabaseImportA(hdb, CURR_DIR, "forcecodepage.idt"); - ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_FUNCTION_FAILED, "Expected ERROR_FUNCTION_FAILED, got %d\n", r); MsiCloseHandle(hdb); DeleteFileA(msifile); Modified: trunk/rostests/winetests/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/install.c?r… ============================================================================== --- trunk/rostests/winetests/msi/install.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/install.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -2994,7 +2994,7 @@ } else { - ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAIRE, got %u\n", r); + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAILURE, got %u\n", r); todo_wine ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(!delete_pf("msitest\\caesar", TRUE), "File installed\n"); todo_wine ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n"); Modified: trunk/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/source.c?re… ============================================================================== --- trunk/rostests/winetests/msi/source.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/source.c [iso-8859-1] Thu Mar 3 14:28:57 2016 @@ -986,7 +986,7 @@ r = pMsiSourceListAddSourceExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT | MSISOURCETYPE_URL, "C:\\source", 0); - ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + ok(r == ERROR_UNKNOWN_PRODUCT, "Expected ERROR_UNKNOWN_PRODUCT, got %d\n", r); lstrcpyA(keypath, "Software\\Classes\\Installer\\Products\\"); lstrcatA(keypath, prod_squashed); @@ -1315,7 +1315,7 @@ MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT | MSICODE_PATCH | MSISOURCETYPE_URL, 0, value, &size); - ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r); ok(!lstrcmpA(value, "aaa"), "Expected value to be unchanged, got %s\n", value); ok(size == MAX_PATH, "Expected MAX_PATH, got %d\n", size);

1 0

[akhaldi] 70943: [WBEMDISP] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Sat Mar 5 10:36:27 2016 New Revision: 70943 URL: http://svn.reactos.org/svn/reactos?rev=70943&view=rev Log: [WBEMDISP] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/wbemdisp/locator.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemdisp/locator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/locator… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] Sat Mar 5 10:36:27 2016 @@ -343,6 +343,7 @@ ISWbemObjectSet ISWbemObjectSet_iface; LONG refs; IEnumWbemClassObject *objectenum; + LONG count; }; static inline struct objectset *impl_from_ISWbemObjectSet( @@ -504,20 +505,10 @@ LONG *iCount ) { struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); - LONG count = 0, total = 0; TRACE( "%p, %p\n", objectset, iCount ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) count++; - - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) total++; - - count = total - count; - IEnumWbemClassObject_Reset( objectset->objectenum ); - while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ); - - *iCount = total; + *iCount = objectset->count; return S_OK; } @@ -554,6 +545,14 @@ objectset_ItemIndex }; +static LONG get_object_count( IEnumWbemClassObject *iter ) +{ + LONG count = 0; + while (IEnumWbemClassObject_Skip( iter, WBEM_INFINITE, 1 ) == S_OK) count++; + IEnumWbemClassObject_Reset( iter ); + return count; +} + static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) { struct objectset *objectset; @@ -565,6 +564,7 @@ objectset->refs = 1; objectset->objectenum = wbem_objectenum; IEnumWbemClassObject_AddRef( objectset->objectenum ); + objectset->count = get_object_count( objectset->objectenum ); *obj = &objectset->ISWbemObjectSet_iface; TRACE( "returning iface %p\n", *obj ); Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Mar 5 10:36:27 2016 @@ -198,7 +198,7 @@ reactos/dll/win32/vbscript # Synced to WineStaging-1.7.55 reactos/dll/win32/version # Synced to WineStaging-1.9.4 reactos/dll/win32/vssapi # Synced to WineStaging-1.7.55 -reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.55 +reactos/dll/win32/wbemdisp # Synced to WineStaging-1.9.4 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.55 reactos/dll/win32/windowscodecs # Synced to WineStaging-1.7.55 reactos/dll/win32/windowscodecsext # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70890: [PSDK] Add some missing definitions.
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 14:11:13 2016 New Revision: 70890 URL: http://svn.reactos.org/svn/reactos?rev=70890&view=rev Log: [PSDK] Add some missing definitions. Modified: trunk/reactos/include/psdk/ntstatus.h Modified: trunk/reactos/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntstatus.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] Thu Mar 3 14:11:13 2016 @@ -73,6 +73,7 @@ #define STATUS_WAIT_3 ((NTSTATUS)0x00000003) #define STATUS_WAIT_63 ((NTSTATUS)0x0000003f) #define STATUS_ABANDONED ((NTSTATUS)0x00000080) +#define STATUS_ABANDONED_WAIT_0 ((NTSTATUS)0x00000080) #define STATUS_ABANDONED_WAIT_63 ((NTSTATUS)0x000000BF) #define STATUS_USER_APC ((NTSTATUS)0x000000C0) #define STATUS_KERNEL_APC ((NTSTATUS)0x00000100) @@ -942,6 +943,7 @@ #define STATUS_INVALID_CRUNTIME_PARAMETER ((NTSTATUS)0xC0000417) #define STATUS_ASSERTION_FAILURE ((NTSTATUS)0xC0000420L) #define STATUS_CALLBACK_POP_STACK ((NTSTATUS)0xC0000423) +#define STATUS_ELEVATION_REQUIRED ((NTSTATUS)0xC000042C) #define STATUS_WOW_ASSERTION ((NTSTATUS)0xC0009898) #define STATUS_INVALID_SIGNATURE ((NTSTATUS)0xC000A000) #define STATUS_HMAC_NOT_SUPPORTED ((NTSTATUS)0xC000A001)

1 0

[akhaldi] 70891: [MSI] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 14:28:37 2016 New Revision: 70891 URL: http://svn.reactos.org/svn/reactos?rev=70891&view=rev Log: [MSI] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/database.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/sql.y trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Thu Mar 3 14:28:37 2016 @@ -2987,7 +2987,11 @@ { *p = 0; if (!p[1]) continue; /* trailing backslash */ +#ifdef __REACTOS__ /* CORE-10587 */ hkey = open_key( comp, root, subkey, FALSE, access | READ_CONTROL ); +#else + hkey = open_key( comp, root, subkey, FALSE, access ); +#endif if (!hkey) break; res = RegDeleteKeyExW( hkey, p + 1, access, 0 ); RegCloseKey( hkey ); @@ -4119,7 +4123,6 @@ if (rc != ERROR_SUCCESS) { ERR("Failed to get stream\n"); - CloseHandle(the_file); DeleteFileW(FilePath); break; } Modified: trunk/reactos/dll/win32/msi/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Thu Mar 3 14:28:37 2016 @@ -972,7 +972,7 @@ return r; /* if the destination folder does not exist then create it (folder name = table name) */ - snprintfW( stream_filename, sizeof(stream_filename), fmt_folder, folder, table ); + snprintfW( stream_filename, sizeof(stream_filename)/sizeof(WCHAR), fmt_folder, folder, table ); if (GetFileAttributesW( stream_filename ) == INVALID_FILE_ATTRIBUTES) { if (!CreateDirectoryW( stream_filename, NULL )) @@ -980,7 +980,7 @@ } /* actually create the file */ - snprintfW( stream_filename, sizeof(stream_filename), fmt_file, folder, table, stream_name ); + snprintfW( stream_filename, sizeof(stream_filename)/sizeof(WCHAR), fmt_file, folder, table, stream_name ); file = CreateFileW( stream_filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); if (file == INVALID_HANDLE_VALUE) Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Thu Mar 3 14:28:37 2016 @@ -533,6 +533,17 @@ LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) { if ( control->property && !strcmpW( control->property, property ) && control->update ) + control->update( dialog, control ); + } +} + +static void msi_dialog_update_all_controls( msi_dialog *dialog ) +{ + msi_control *control; + + LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + { + if ( control->property && control->update ) control->update( dialog, control ); } } @@ -674,11 +685,13 @@ { struct subscriber *sub; - TRACE("event %s control %s attribute %s\n", debugstr_w(event), debugstr_w(control), debugstr_w(attribute)); + TRACE("dialog %s event %s control %s attribute %s\n", debugstr_w(dialog->name), debugstr_w(event), + debugstr_w(control), debugstr_w(attribute)); LIST_FOR_EACH_ENTRY( sub, &dialog->package->subscriptions, struct subscriber, entry ) { - if (!strcmpiW( sub->event, event ) && + if (sub->dialog == dialog && + !strcmpiW( sub->event, event ) && !strcmpiW( sub->control, control ) && !strcmpiW( sub->attribute, attribute )) { @@ -2210,6 +2223,7 @@ control->attributes = MSI_RecordGetInteger( rec, 8 ); prop = MSI_RecordGetString( rec, 9 ); control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + control->update = msi_dialog_update_pathedit; info->dialog = dialog; info->control = control; @@ -4369,7 +4383,11 @@ { /* don't destroy a modeless dialogs that might be our parent */ event_do_dialog( dialog->package, argument, dialog, FALSE ); - if (dialog->package->CurrentInstallState != ERROR_SUCCESS) msi_dialog_end_dialog( dialog ); + if (dialog->package->CurrentInstallState != ERROR_SUCCESS) + msi_dialog_end_dialog( dialog ); + else + msi_dialog_update_all_controls(dialog); + return ERROR_SUCCESS; } Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… ============================================================================== --- trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/registry.c [iso-8859-1] Thu Mar 3 14:28:37 2016 @@ -1305,7 +1305,7 @@ REGSAM access = KEY_ENUMERATE_SUB_KEYS | KEY_WOW64_64KEY; HKEY key_users, key_components; - if (ctx == MSIINSTALLCONTEXT_USERMANAGED) /* FIXME: were to find these? */ + if (ctx == MSIINSTALLCONTEXT_USERMANAGED) /* FIXME: where to find these? */ return ERROR_NO_MORE_ITEMS; if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, userdataW, 0, access, &key_users )) Modified: trunk/reactos/dll/win32/msi/sql.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.y?rev=70… ============================================================================== --- trunk/reactos/dll/win32/msi/sql.y [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/sql.y [iso-8859-1] Thu Mar 3 14:28:37 2016 @@ -355,7 +355,7 @@ data_type: TK_CHAR { - $$ = MSITYPE_STRING | 1; + $$ = MSITYPE_STRING | 0x400; } | TK_CHAR TK_LP data_count TK_RP { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Mar 3 14:28:37 2016 @@ -114,7 +114,7 @@ reactos/dll/win32/msgsm32.acm # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml.tlb # Synced to WineStaging-1.7.55 -reactos/dll/win32/msi # Synced to WineStaging-1.7.55 +reactos/dll/win32/msi # Synced to WineStaging-1.9.4 reactos/dll/win32/msimg32 # Synced to WineStaging-1.7.55 reactos/dll/win32/msimtf # Synced to WineStaging-1.7.55 reactos/dll/win32/msisip # Synced to WineStaging-1.7.55

1 0

[akhaldi] 70889: [MSRLE_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 14:10:09 2016 New Revision: 70889 URL: http://svn.reactos.org/svn/reactos?rev=70889&view=rev Log: [MSRLE_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/msrle32/msrle.c Modified: trunk/rostests/winetests/msrle32/msrle.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msrle32/msrle.c… ============================================================================== --- trunk/rostests/winetests/msrle32/msrle.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msrle32/msrle.c [iso-8859-1] Thu Mar 3 14:10:09 2016 @@ -137,7 +137,7 @@ hic = ICLocate(FCC('V', 'I', 'D', 'C'), codecs[i], bih, NULL, ICMODE_DECOMPRESS); ok(hic != NULL, "Test[%d]: Expected non-NULL return\n", i); - /* Now wich is this codec? Windows returns MRLE for uncompressed cases */ + /* Now which is this codec? Windows returns MRLE for uncompressed cases */ memset(&codec_info, 0, sizeof(codec_info)); hr = ICGetInfo(hic, &codec_info, sizeof(codec_info)); ok(hr == sizeof(codec_info), "Test[%d]: Incorrect amount of data returned\n", i);

1 0

[akhaldi] 70888: [MSCMS_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 14:08:46 2016 New Revision: 70888 URL: http://svn.reactos.org/svn/reactos?rev=70888&view=rev Log: [MSCMS_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/mscms/profile.c Modified: trunk/rostests/winetests/mscms/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/profile.c… ============================================================================== --- trunk/rostests/winetests/mscms/profile.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mscms/profile.c [iso-8859-1] Thu Mar 3 14:08:46 2016 @@ -675,10 +675,8 @@ ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); size = 0; @@ -689,10 +687,8 @@ size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -729,10 +725,8 @@ ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); @@ -742,10 +736,8 @@ size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); }

1 0

[akhaldi] 70886: [MSXML3_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912
by akhaldi＠svn.reactos.org 05 Mar '16

05 Mar '16

Author: akhaldi Date: Thu Mar 3 14:05:59 2016 New Revision: 70886 URL: http://svn.reactos.org/svn/reactos?rev=70886&view=rev Log: [MSXML3_WINETEST] Sync with Wine Staging 1.9.4. CORE-10912 Modified: trunk/rostests/winetests/msxml3/domdoc.c trunk/rostests/winetests/msxml3/httpreq.c trunk/rostests/winetests/msxml3/saxreader.c trunk/rostests/winetests/msxml3/schema.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Thu Mar 3 14:05:59 2016 @@ -489,7 +489,7 @@ " <d>D1 field</d>\n" " <description xmlns:foo='http://www.winehq.org' xmlns:bar='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'>\n" " <html xmlns='http://www.w3.org/1999/xhtml'>\n" -" This is a description. <bar:x/>\n" +" <![CDATA[]]> This is a description<dot>. </dot><bar:x/>\n" " </html>\n" " <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description with preserved whitespace. <bar:x/>\n" @@ -3146,8 +3146,7 @@ { r = IXMLDOMNode_get_text( nodeRoot, &str ); ok( r == S_OK, "ret %08x\n", r ); - ok( compareIgnoreReturns(str, _bstr_("fn1.txt\n\n fn2.txt \n\nf1\n")), "wrong get_text: %s\n", wine_dbgstr_w(str)); - SysFreeString(str); + expect_bstr_eq_and_free(str, "fn1.txt\n \nfn2.txt\n \nf1"); IXMLDOMNode_Release(nodeRoot); } @@ -4175,81 +4174,97 @@ ok_(__FILE__, line)(r == S_OK, "=> %i: " #expr " returned %08x\n", __LINE__, r); \ } +#define helper_ole_check_ver(expr) { \ + HRESULT r = expr; \ + ok_(__FILE__, line)(r == S_OK, "-> %i (%s): " #expr " returned %08x\n", __LINE__, ver, r); \ +} + #define helper_expect_list_and_release(list, expstr) { \ char *str = list_to_string(list); \ - ok_(__FILE__, line)(strcmp(str, expstr)==0, "=> %i: Invalid node list: %s, expected %s\n", __LINE__, str, expstr); \ + ok_(__FILE__, line)(strcmp(str, expstr)==0, "=> %i (%s): Invalid node list: %s, expected %s\n", __LINE__, ver, str, expstr); \ if (list) IXMLDOMNodeList_Release(list); \ } #define helper_expect_bstr_and_release(bstr, str) { \ ok_(__FILE__, line)(lstrcmpW(bstr, _bstr_(str)) == 0, \ - "=> %i: got %s\n", __LINE__, wine_dbgstr_w(bstr)); \ + "=> %i (%s): got %s\n", __LINE__, ver, wine_dbgstr_w(bstr)); \ SysFreeString(bstr); \ } -#define check_ws_ignored(doc, str) _check_ws_ignored(__LINE__, doc, str) -static inline void _check_ws_ignored(int line, IXMLDOMDocument2* doc, char const* str) +#define check_ws_ignored(ver, doc, str) _check_ws_ignored(__LINE__, ver, doc, str) +static inline void _check_ws_ignored(int line, const char *ver, IXMLDOMDocument2* doc, char const* str) { IXMLDOMNode *node1, *node2; IXMLDOMNodeList *list; BSTR bstr; - helper_ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); - helper_ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); - helper_ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); - helper_ole_check(IXMLDOMNodeList_reset(list)); + helper_ole_check_ver(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); + helper_ole_check_ver(IXMLDOMNodeList_get_item(list, 0, &node1)); + helper_ole_check_ver(IXMLDOMNodeList_get_item(list, 1, &node2)); + helper_ole_check_ver(IXMLDOMNodeList_reset(list)); helper_expect_list_and_release(list, "E1.E5.E1.E2.D1 E2.E5.E1.E2.D1"); - helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E1.E5.E1.E2.D1 E2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 T4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1"); - helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); + helper_ole_check_ver(IXMLDOMNode_get_childNodes(node1, &list)); + helper_expect_list_and_release(list, + "[4]1.E1.E5.E1.E2.D1 T2.E1.E5.E1.E2.D1 E3.E1.E5.E1.E2.D1 " + "E4.E1.E5.E1.E2.D1 E5.E1.E5.E1.E2.D1 E6.E1.E5.E1.E2.D1"); + helper_ole_check_ver(IXMLDOMNode_get_text(node1, &bstr)); if (str) { helper_expect_bstr_and_release(bstr, str); } else { - helper_expect_bstr_and_release(bstr, "This is a description."); + helper_expect_bstr_and_release(bstr, " This is a description."); } IXMLDOMNode_Release(node1); - helper_ole_check(IXMLDOMNode_get_childNodes(node2, &list)); - helper_expect_list_and_release(list, "T1.E2.E5.E1.E2.D1 E2.E2.E5.E1.E2.D1 T3.E2.E5.E1.E2.D1 E4.E2.E5.E1.E2.D1 T5.E2.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1 T7.E2.E5.E1.E2.D1"); - helper_ole_check(IXMLDOMNode_get_text(node2, &bstr)); - helper_expect_bstr_and_release(bstr, "\n This is a description with preserved whitespace. \n "); + helper_ole_check_ver(IXMLDOMNode_get_childNodes(node2, &list)); + helper_expect_list_and_release(list, + "T1.E2.E5.E1.E2.D1 E2.E2.E5.E1.E2.D1 T3.E2.E5.E1.E2.D1 " + "E4.E2.E5.E1.E2.D1 T5.E2.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1 T7.E2.E5.E1.E2.D1"); + helper_ole_check_ver(IXMLDOMNode_get_text(node2, &bstr)); + helper_expect_bstr_and_release(bstr, + "\n This is a description with preserved whitespace. \n "); IXMLDOMNode_Release(node2); } -#define check_ws_preserved(doc, str) _check_ws_preserved(__LINE__, doc, str) -static inline void _check_ws_preserved(int line, IXMLDOMDocument2* doc, char const* str) +#define check_ws_preserved(ver, doc, str) _check_ws_preserved(__LINE__, ver, doc, str) +static inline void _check_ws_preserved(int line, const char *ver, IXMLDOMDocument2* doc, char const* str) { IXMLDOMNode *node1, *node2; IXMLDOMNodeList *list; BSTR bstr; - helper_ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); - helper_ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); - helper_ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); - helper_ole_check(IXMLDOMNodeList_reset(list)); + helper_ole_check_ver(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); + helper_ole_check_ver(IXMLDOMNodeList_get_item(list, 0, &node1)); + helper_ole_check_ver(IXMLDOMNodeList_get_item(list, 1, &node2)); + helper_ole_check_ver(IXMLDOMNodeList_reset(list)); helper_expect_list_and_release(list, "E2.E10.E2.E2.D1 E4.E10.E2.E2.D1"); - helper_ole_check(IXMLDOMNode_get_childNodes(node1, &list)); - helper_expect_list_and_release(list, "T1.E2.E10.E2.E2.D1 E2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 T7.E2.E10.E2.E2.D1"); - helper_ole_check(IXMLDOMNode_get_text(node1, &bstr)); + helper_ole_check_ver(IXMLDOMNode_get_childNodes(node1, &list)); + helper_expect_list_and_release(list, + "T1.E2.E10.E2.E2.D1 [4]2.E2.E10.E2.E2.D1 T3.E2.E10.E2.E2.D1 " + "E4.E2.E10.E2.E2.D1 T5.E2.E10.E2.E2.D1 E6.E2.E10.E2.E2.D1 " + "E7.E2.E10.E2.E2.D1 E8.E2.E10.E2.E2.D1 T9.E2.E10.E2.E2.D1"); + helper_ole_check_ver(IXMLDOMNode_get_text(node1, &bstr)); if (str) { helper_expect_bstr_and_release(bstr, str); } else { - helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); + helper_expect_bstr_and_release(bstr, "\n This is a description. \n "); } IXMLDOMNode_Release(node1); - helper_ole_check(IXMLDOMNode_get_childNodes(node2, &list)); - helper_expect_list_and_release(list, "T1.E4.E10.E2.E2.D1 E2.E4.E10.E2.E2.D1 T3.E4.E10.E2.E2.D1 E4.E4.E10.E2.E2.D1 T5.E4.E10.E2.E2.D1 E6.E4.E10.E2.E2.D1 T7.E4.E10.E2.E2.D1"); - helper_ole_check(IXMLDOMNode_get_text(node2, &bstr)); - helper_expect_bstr_and_release(bstr, "\n This is a description with preserved whitespace. \n "); + helper_ole_check_ver(IXMLDOMNode_get_childNodes(node2, &list)); + helper_expect_list_and_release(list, + "T1.E4.E10.E2.E2.D1 E2.E4.E10.E2.E2.D1 T3.E4.E10.E2.E2.D1 " + "E4.E4.E10.E2.E2.D1 T5.E4.E10.E2.E2.D1 E6.E4.E10.E2.E2.D1 T7.E4.E10.E2.E2.D1"); + helper_ole_check_ver(IXMLDOMNode_get_text(node2, &bstr)); + helper_expect_bstr_and_release(bstr, + "\n This is a description with preserved whitespace. \n "); IXMLDOMNode_Release(node2); } @@ -4301,110 +4316,142 @@ IXMLDOMNodeList_Release(list); } +struct whitespace_t { + const CLSID *clsid; + const char *name; +}; + +static const struct whitespace_t whitespace_test_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument" }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2" }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26" }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30" }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40" }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60" }, + { 0 } +}; + static void test_whitespace(void) { - IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; - IXMLDOMNodeList *list; - IXMLDOMElement *root; - VARIANT_BOOL b; - HRESULT hr; - LONG len; - - if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return; - doc1 = create_document(&IID_IXMLDOMDocument2); - doc2 = create_document(&IID_IXMLDOMDocument2); - - ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_TRUE)); - ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); - ok(b == VARIANT_FALSE, "expected false\n"); - ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); - ok(b == VARIANT_TRUE, "expected true\n"); - - ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); - ok(b == VARIANT_TRUE, "failed to load XML string\n"); - ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); - ok(b == VARIANT_TRUE, "failed to load XML string\n"); - - /* switch to XPath */ - ole_check(IXMLDOMDocument2_setProperty(doc1, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); - ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); - - check_ws_ignored(doc1, NULL); - check_ws_preserved(doc2, NULL); - - /* new instances copy the property */ - ole_check(IXMLDOMDocument2_QueryInterface(doc1, &IID_IXMLDOMDocument2, (void**) &doc3)); - ole_check(IXMLDOMDocument2_QueryInterface(doc2, &IID_IXMLDOMDocument2, (void**) &doc4)); - - ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); - ok(b == VARIANT_FALSE, "expected false\n"); - ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); - ok(b == VARIANT_TRUE, "expected true\n"); - - check_ws_ignored(doc3, NULL); - check_ws_preserved(doc4, NULL); - - /* setting after loading xml affects trimming of leading/trailing ws only */ - ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_TRUE)); - ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_FALSE)); - - /* the trailing "\n " isn't there, because it was ws-only node */ - check_ws_ignored(doc1, "\n This is a description. "); - check_ws_preserved(doc2, "This is a description."); - - /* it takes effect on reload */ - ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); - ok(b == VARIANT_TRUE, "expected true\n"); - ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); - ok(b == VARIANT_FALSE, "expected false\n"); - - ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); - ok(b == VARIANT_TRUE, "failed to load XML string\n"); - ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); - ok(b == VARIANT_TRUE, "failed to load XML string\n"); - - check_ws_preserved(doc1, NULL); - check_ws_ignored(doc2, NULL); - - /* other instances follow suit */ - ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); - ok(b == VARIANT_TRUE, "expected true\n"); - ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); - ok(b == VARIANT_FALSE, "expected false\n"); - - check_ws_preserved(doc3, NULL); - check_ws_ignored(doc4, NULL); - - IXMLDOMDocument2_Release(doc2); - IXMLDOMDocument2_Release(doc3); - IXMLDOMDocument2_Release(doc4); - - /* text with char references */ - test_preserve_charref(doc1, VARIANT_TRUE); - test_preserve_charref(doc1, VARIANT_FALSE); - - /* formatting whitespaces */ - hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IXMLDOMDocument2_loadXML(doc1, _bstr_(complete7), &b); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(b == VARIANT_TRUE, "for %x\n", b); - - hr = IXMLDOMDocument2_get_documentElement(doc1, &root); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMElement_get_childNodes(root, &list); - ok(hr == S_OK, "got 0x%08x\n", hr); - len = 0; - hr = IXMLDOMNodeList_get_length(list, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 3, "got %d\n", len); - IXMLDOMNodeList_Release(list); - IXMLDOMElement_Release(root); - - IXMLDOMDocument2_Release(doc1); - - free_bstrs(); + const struct whitespace_t *class_ptr = whitespace_test_data; + + while (class_ptr->clsid) + { + IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + IXMLDOMNodeList *list; + IXMLDOMElement *root; + VARIANT_BOOL b; + HRESULT hr; + LONG len; + + if (!is_clsid_supported(class_ptr->clsid, &IID_IXMLDOMDocument2)) + { + class_ptr++; + continue; + } + + hr = CoCreateInstance(class_ptr->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument2, (void**)&doc1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = CoCreateInstance(class_ptr->clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument2, (void**)&doc2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_TRUE)); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + + ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + /* switch to XPath */ + ole_check(IXMLDOMDocument2_setProperty(doc1, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + + check_ws_ignored(class_ptr->name, doc1, NULL); + check_ws_preserved(class_ptr->name, doc2, NULL); + + /* new instances copy the property */ + ole_check(IXMLDOMDocument2_QueryInterface(doc1, &IID_IXMLDOMDocument2, (void**) &doc3)); + ole_check(IXMLDOMDocument2_QueryInterface(doc2, &IID_IXMLDOMDocument2, (void**) &doc4)); + + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + + check_ws_ignored(class_ptr->name, doc3, NULL); + check_ws_preserved(class_ptr->name, doc4, NULL); + + /* setting after loading xml affects trimming of leading/trailing ws only */ + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_TRUE)); + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_FALSE)); + + /* the trailing "\n " isn't there, because it was ws-only node */ + check_ws_ignored(class_ptr->name, doc1, " This is a description. "); + check_ws_preserved(class_ptr->name, doc2, " This is a description."); + + /* it takes effect on reload */ + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + + ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + check_ws_preserved(class_ptr->name, doc1, NULL); + check_ws_ignored(class_ptr->name, doc2, NULL); + + /* other instances follow suit */ + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + + check_ws_preserved(class_ptr->name, doc3, NULL); + check_ws_ignored(class_ptr->name, doc4, NULL); + + IXMLDOMDocument2_Release(doc2); + IXMLDOMDocument2_Release(doc3); + IXMLDOMDocument2_Release(doc4); + + /* text with char references */ + test_preserve_charref(doc1, VARIANT_TRUE); + test_preserve_charref(doc1, VARIANT_FALSE); + + /* formatting whitespaces */ + hr = IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument2_loadXML(doc1, _bstr_(complete7), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_TRUE, "for %x\n", b); + + hr = IXMLDOMDocument2_get_documentElement(doc1, &root); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMElement_get_childNodes(root, &list); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = 0; + hr = IXMLDOMNodeList_get_length(list, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(len == 3, "got %d\n", len); + IXMLDOMNodeList_Release(list); + IXMLDOMElement_Release(root); + + IXMLDOMDocument2_Release(doc1); + + free_bstrs(); + + class_ptr++; + } } typedef struct { @@ -4640,7 +4687,7 @@ ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); - expect_list_and_release(list, "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); + expect_list_and_release(list, "E6.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1"); /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */ ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), @@ -4812,7 +4859,8 @@ static void test_cloneNode(void ) { - IXMLDOMDocument *doc, *doc2; + IXMLDOMDocument2 *doc, *doc_clone; + IXMLDOMDocument *doc2; VARIANT_BOOL b; IXMLDOMNodeList *pList; IXMLDOMNamedNodeMap *mapAttr; @@ -4821,14 +4869,52 @@ IXMLDOMNode *node, *attr; IXMLDOMNode *node_clone; IXMLDOMNode *node_first; + VARIANT v; HRESULT hr; - doc = create_document(&IID_IXMLDOMDocument); - - ole_check(IXMLDOMDocument_loadXML(doc, _bstr_(complete4A), &b)); + doc = create_document(&IID_IXMLDOMDocument2); + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(complete4A), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "failed to load XML string\n"); - hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("lc/pr"), &node); + hr = IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionLanguage"), &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("XSLPattern")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_BSTR(&v) = _bstr_("XPath"); + V_VT(&v) = VT_BSTR; + hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), v); + ok(hr == S_OK, "got 0x%08x\n", hr); + VariantClear(&v); + + /* clone document node */ + hr = IXMLDOMDocument2_cloneNode(doc, VARIANT_TRUE, &node); + ok( hr == S_OK, "ret %08x\n", hr ); + ok( node != NULL, "node %p\n", node ); + + hr = IXMLDOMNode_get_childNodes(node, &pList); + ok( hr == S_OK, "ret %08x\n", hr ); + length = 0; + hr = IXMLDOMNodeList_get_length(pList, &length); + ok( hr == S_OK, "ret %08x\n", hr ); + ok(length == 2, "got %d\n", length); + IXMLDOMNodeList_Release(pList); + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMDocument2, (void**)&doc_clone); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* cloned document inherits properties */ + hr = IXMLDOMDocument2_getProperty(doc_clone, _bstr_("SelectionLanguage"), &v); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(V_BSTR(&v), _bstr_("XPath")), "got prop value %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + IXMLDOMDocument2_Release(doc_clone); + IXMLDOMNode_Release(node); + + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("lc/pr"), &node); ok( hr == S_OK, "ret %08x\n", hr ); ok( node != NULL, "node %p\n", node ); @@ -4916,7 +5002,7 @@ IXMLDOMNode_Release(node_clone); IXMLDOMNode_Release(node); - IXMLDOMDocument_Release(doc); + IXMLDOMDocument2_Release(doc); free_bstrs(); } @@ -6932,7 +7018,7 @@ static const xslpattern_test_t xslpattern_test_no_ns[] = { /* prefixes don't need to be registered, you may use them as they are in the doc */ - { "//bar:x", "E5.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, + { "//bar:x", "E6.E1.E5.E1.E2.D1 E6.E2.E5.E1.E2.D1" }, /* prefixes must be explicitly specified in the name */ { "//foo:elem", "" }, { "//foo:c", "E3.E4.E2.D1" }, Modified: trunk/rostests/winetests/msxml3/httpreq.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/httpreq.… ============================================================================== --- trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/httpreq.c [iso-8859-1] Thu Mar 3 14:05:59 2016 @@ -1690,6 +1690,7 @@ hr = GetHGlobalFromStream((IStream*)V_UNKNOWN(&varbody), &g); EXPECT_HR(hr, S_OK); ok(g != NULL, "got %p\n", g); + VariantClear(&varbody); IDispatch_Release(event); @@ -1757,6 +1758,7 @@ test_open(xhr, "GET", "http://www.test.winehq.org/tests/hello.html", E_ACCESSDENIED); IXMLHttpRequest_Release(xhr); + free_bstrs(); } START_TEST(httpreq) Modified: trunk/rostests/winetests/msxml3/saxreader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/saxreade… ============================================================================== --- trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/saxreader.c [iso-8859-1] Thu Mar 3 14:05:59 2016 @@ -302,7 +302,10 @@ SysFreeString(call_seq->sequence[i].attributes[j].uriW); SysFreeString(call_seq->sequence[i].attributes[j].localW); SysFreeString(call_seq->sequence[i].attributes[j].qnameW); + SysFreeString(call_seq->sequence[i].attributes[j].valueW); } + HeapFree(GetProcessHeap(), 0, call_seq->sequence[i].attributes); + call_seq->sequence[i].attr_count = 0; SysFreeString(call_seq->sequence[i].arg1W); SysFreeString(call_seq->sequence[i].arg2W); @@ -2868,9 +2871,7 @@ CloseHandle(file); hr = ISAXXMLReader_parseURL(reader, testXmlW); - if (entry->todo) - todo_wine ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); - else + todo_wine_if(entry->todo) ok(hr == entry->hr, "Expected 0x%08x, got 0x%08x. CLSID %s\n", entry->hr, hr, entry->clsid); DeleteFileA(testXmlA); Modified: trunk/rostests/winetests/msxml3/schema.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/schema.c… ============================================================================== --- trunk/rostests/winetests/msxml3/schema.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/schema.c [iso-8859-1] Thu Mar 3 14:05:59 2016 @@ -1324,15 +1324,13 @@ EXPECT_HR(hr, S_FALSE); ok(V_VT(&type) == VT_NULL, "%s: got type %i\n", ptr->query, V_VT(&type)); } + VariantClear(&type); VariantClear(&v); hr = IXMLDOMNode_get_nodeTypedValue(node, &v); EXPECT_HR(hr, S_OK); - if (ptr->todo) - todo_wine - ok(V_VT(&v) == ptr->type_schema, "%s: got variant type %i\n", ptr->query, V_VT(&v)); - else + todo_wine_if(ptr->todo) ok(V_VT(&v) == ptr->type_schema, "%s: got variant type %i\n", ptr->query, V_VT(&v)); switch (ptr->type_schema)

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
27
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2016