msi 2: Handle carriage returns in MsiDatabaseImport

[Alexandre Julliard]

"James Hawkins" <truiken at gmail.com> writes:

> Hi,
>
> Fixes bug 11479.  http://bugs.winehq.org/show_bug.cgi?id=11479

This doesn't work:

../../../tools/runtest -q -P wine -M msi.dll -T ../../.. -p msi_test.exe.so automation.c && touch automation.ok
automation.c:276: Test failed: Expected ERROR_SUCCESS, got 1627
wine: Unhandled page fault on read access to 0x00000018 at address 0x6002a3da (thread 0009), starting debugger...
Unhandled exception: page fault on read access to 0x00000018 in 32-bit code (0x6002a3da).
Register dump:
 CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b
 EIP:6002a3da ESP:0033f400 EBP:0033f578 EFLAGS:00010206(   - 00      - RIP1)
 EAX:00000018 EBX:60121844 ECX:00000018 EDX:0033f5b8
 ESI:602adce0 EDI:0033f52d
Stack dump:
0x0033f400:  00000000 4d430002 00132fac 00000004
0x0033f410:  600425f6 0033f44c 6065e20e 602adce0
0x0033f420:  0033f5b8 0033f5b8 00000001 7bc417fa
0x0033f430:  00000000 4d430002 00133004 00000004
0x0033f440:  00000010 0033f47c 0033f464 00000030
0x0033f450:  00134180 00110014 00000020 00000000
Backtrace:
=>1 0x6002a3da vsnprintfW+0x3ca(str=0x33f67a, len=0x7fffffff, format=0x6065e20a, valist=0x33f5b8) [/home/julliard/wine/wine/libs/wine/string.c:376] in libwine.so.1 (0x0033f578)
  2 0x6002a596 sprintfW+0x36(str=0x33f678, format=0x6065e20a) [/home/julliard/wine/wine/libs/wine/string.c:458] in libwine.so.1 (0x0033f5a8)
  3 0x60610808 MSI_DatabaseImport+0x13e8(db=0x130ef8, folder=<is not available>, file=0x1329ca) [/home/julliard/wine/wine/dlls/msi/database.c:603] in msi (0x0033f7f8)
  4 0x60610b29 MsiDatabaseImportW+0x129(handle=<register EDI not in topmost frame>, szFolder=0x12fcd0, szFilename=0x1329b0) [/home/julliard/wine/wine/dlls/msi/database.c:777] in msi (0x0033f828)
  5 0x60610cce MsiDatabaseImportA+0x18e(handle=0x1, szFolder=0x605b43c0, szFilename=0x605a3db7) [/home/julliard/wine/wine/dlls/msi/database.c:803] in msi (0x0033f868)
  6 0x60527631 test_Installer+0x571() [/home/julliard/wine/wine/dlls/msi/tests/automation.c:275] in msi_test (0x0033fbd8)
  7 0x6052983b func_automation+0xebb() [/home/julliard/wine/wine/dlls/msi/tests/automation.c:2428] in msi_test (0x0033fe68)
  8 0x60592cea run_test+0x14a(name=0x1103ec) [/home/julliard/wine/wine/dlls/msi/tests/../../../include/wine/test.h:389] in msi_test (0x0033fea8)
  9 0x60593332 main+0x142(argc=<register ECX not in topmost frame>, argv=0x1103d0) [/home/julliard/wine/wine/dlls/msi/tests/../../../include/wine/test.h:437] in msi_test (0x0033fed8)
  10 0x6059340b __wine_spec_exe_entry+0x5b(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in msi_test (0x0033ff08)
  11 0x7b8744ee start_process+0xee(arg=0x0) [/home/julliard/wine/wine/dlls/kernel32/process.c:883] in kernel32 (0x0033ffe8)
  12 0x600288d7 wine_switch_to_stack+0x17() in libwine.so.1 (0x00000000)
0x6002a3da vsnprintfW+0x3ca [/home/julliard/wine/wine/libs/wine/string.c:376] in libwine.so.1: movzwl	0x0(%ecx),%edx
376	                while (*striter)

-- 
Alexandre Julliard
julliard at winehq.org