- Wine-Devel - list.winehq.org

Re: MSI: Fix msi_dup_record_field for Integer Records
by Alexandre Julliard Jan. 23, 2006

Jan. 23, 2006

Robert Shearman <rob(a)codeweavers.com> writes: > ChangeLog: > Make msi_dup_record_field not fail when dealing with integer records by > calling MSI_RecordGetStringW instead of MSI_RecordGetString, as the > former does conversion. It fails make test: ../../../tools/runtest -q -P wine -M msi.dll -T ../../.. -p msi_test.exe.so format.c && touch format.ok format.c:128: Test failed: size wrong format.c:132: Test failed: size wrong format.c:133: Test failed: wrong output format.c:146: Test failed: size wrong format.c:147: Test failed: wrong output format.c:241: Test failed: size wrong 0 format.c:242: Test failed: wrong output() format.c:663: Test failed: size wrong (0) format.c:664: Test failed: wrong output() -- Alexandre Julliard julliard(a)winehq.org

1 0

wine performance question on different machines
by Ananth M Jan. 23, 2006

Jan. 23, 2006

Hi All , I am executing a windows program, that calls function in the vendor supplied dll from one of its functions. I executed this program in Linux using wine, in two PC's. PC 1 ( with Enterprize Linux 4.0 ): Processor : Intel Pentium 4 , 2.80 GHz Cache Size : 512 KB RAM : 1 GB Result : When I execute this program in the above machine using wine , I am getting the same performance as in windows for the execution of the function that is in the vendor supplied dll. PC 2 ( with Enterprize Linux 4.0 ): Processor : Intel Xeon , with CPU - 2.80 GHz Cache Size : 1024 KB RAM : 2 GB Result : When I execute this program in the above machine using wine , the execution time of the function that is in the vendor supplied dll is nearly 10 times morethan as in case of first machine. Can any one has same type of observation earlier ? Is there any issue like this w.r.t wine ? Thank you ajay .

2 2

Regression testing sadness
by Louis. Lenders Jan. 23, 2006

Jan. 23, 2006

Hi, i tried to do a regression test for a bug (bug 4370) This is what i found: cvs update -PAd -D "2006-01-06 15:52:12 CDT" --> no bug cvs update -PAd -D "2006-01-06 15:52:13 CDT" --> bug. Now in the cvs list i see absolutely no patch committed at that time. With some effort i found out that the patch should be: http://www.winehq.org/pipermail/wine-cvs/2006-January/020141.html There are two time's given on this page: Fri Jan 6 14:49:30 CST 2006 on top and in the middle: Date: Fri Jan 6 21:15:48 2006 +0100 Now either i'm doing something completely wrong, or something is really wrong with the regression testing (documentation). at least it's very confusing! Anyone can help? BTW i did not have this trouble finding a regression in another bug , where the patch was committed about a half year ago. ___________________________________________________________ To help you stay safe and secure online, we've developed the all new Yahoo! Security Centre. http://uk.security.yahoo.com

2 1

re: X Error of failed request: Bad alloc (insufficient resources for operation)
by Dan Kegel Jan. 23, 2006

Jan. 23, 2006

Markus Gömmel m.goemmel at compulab.de wrote: > trying to run a astrology software brings the following > error message... > > X Error of failed request: BadAlloc (insufficient resources for operation) > Major opcode of failed request: 53 (X_CreatePixmap) Is the app in question freely downloadable? If so, what's the URL? Sounds like http://bugs.winehq.org/show_bug.cgi?id=3826 Dustin says in that report that a fix or partial fix is already in CVS, and is testing on a different app. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 1

X Error of failed request: Bad alloc (insufficient resources for operation)
by Markus G�mmel Jan. 23, 2006

Jan. 23, 2006

Hi... trying to run a astrology software brings the following error message at a point where the graphics data should be displayed: X Error of failed request: BadAlloc (insufficient resources for operation) Major opcode of failed request: 53 (X_CreatePixmap) Serial number of failed request: 56041 Current serial number in output stream: 56043 and the program stops immediately. Looks like X is not able or willing to bring enough memory to the app. Is there anything I can do? Thanks for helping Markus m.goemmel(a)compulab.de

1 0

Golden apps?
by Dan Kegel Jan. 23, 2006

Jan. 23, 2006

I'm trying to get a list of 'gold' apps from the appdb, but it doesn't have a way to search like that, so I filed http://bugs.winehq.org/show_bug.cgi?id=4365 In the meantime, what apps work *really well* with Wine at the moment? Firefox 1.5 seems to be in good shape. I'm looking for apps that will demo well for my talk at SCALE in two weeks. It'd be cool if OpenOffice 2.0.1 isn't (http://bugs.winehq.org/show_bug.cgi?id=4366) -- Wine for Windows ISVs: http://kegel.com/wine/isv

4 6

StartServiceCtrlDispatcher/
by Uwe Bonnes Jan. 23, 2006

Jan. 23, 2006

Hallo, jtagserver.exe from the Altera Quartus suite hangs in a call to ConnectNamedPipe (as a result of a call to StartServiceCtrlDispatcherA()) Anybody an idea what is going wrong? Appended a +relay,+snoop,+ntdll,+file,+server,+advapi log from the point where the main process is started. -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- 0009:Starting process L"C:\\altera\\quartus51\\bin\\jtagserver.exe" (entryproc=0x41a49a) 0009:Call msvcrt.__set_app_type(00000001) ret=0041a4cc 0009:Ret msvcrt.__set_app_type() retval=7fa6f018 ret=0041a4cc 0009:Call msvcrt.__p__fmode() ret=0041a4e1 0009:Ret msvcrt.__p__fmode() retval=7fa6efe8 ret=0041a4e1 0009:Call msvcrt.__p__commode() ret=0041a4ef 0009:Ret msvcrt.__p__commode() retval=7fa6eff0 ret=0041a4ef 0009:Call msvcrt._controlfp(00010000,00030000) ret=0041a5dd 0009:Ret msvcrt._controlfp() retval=0009001f ret=0041a5dd 0009:Call msvcrt._initterm(00420020,00420024) ret=0041a531 0009:Ret msvcrt._initterm() retval=00000000 ret=0041a531 0009:Call msvcrt.__getmainargs(7fb9feec,7fb9fedc,7fb9fee8,00000000,7fb9fee0) ret=0041a555 0009:Ret msvcrt.__getmainargs() retval=00000000 ret=0041a555 0009:Call msvcrt._initterm(00420000,0042001c) ret=0041a564 0009:Call msvcrt._onexit(00402740) ret=0041a202 0009:Call kernel32.InitializeCriticalSection(7fa6e9d0) ret=7fa3b76e 0009:Call ntdll.RtlInitializeCriticalSection(7fa6e9d0) ret=7fc6007c 0009:Ret ntdll.RtlInitializeCriticalSection() retval=00000000 ret=7fc6007c 0009:Ret kernel32.InitializeCriticalSection() retval=00000000 ret=7fa3b76e 0009:Call ntdll.RtlAllocateHeap(7fce0000,00000008,00000080) ret=7fa3a5fe 0009:Ret ntdll.RtlAllocateHeap() retval=7fcfe888 ret=7fa3a5fe 0009:Ret msvcrt._onexit() retval=00402740 ret=0041a202 0009:Call msvcrt._onexit(0040875c) ret=0041a202 0009:Ret msvcrt._onexit() retval=0040875c ret=0041a202 0009:Call msvcrt._onexit(00409850) ret=0041a202 0009:Ret msvcrt._onexit() retval=00409850 ret=0041a202 0009:Call msvcrt._onexit(0040988b) ret=0041a202 0009:Ret msvcrt._onexit() retval=0040988b ret=0041a202 0009:Call msvcrt._onexit(004166b3) ret=0041a202 0009:Ret msvcrt._onexit() retval=004166b3 ret=0041a202 0009:Ret msvcrt._initterm() retval=00000000 ret=0041a564 0009:Call msvcrt.__p___initenv() ret=0041a56a 0009:Ret msvcrt.__p___initenv() retval=7fa5a614 ret=0041a56a 0009:Call kernel32.GetVersionExA(7fb9fdec) ret=00414a0b 0009:Call ntdll.RtlGetVersion(7fb9fc24) ret=7fc6cf3d 0009:Ret ntdll.RtlGetVersion() retval=00000000 ret=7fc6cf3d 0009:Ret kernel32.GetVersionExA() retval=00000001 ret=00414a0b 0009:Call advapi32.StartServiceCtrlDispatcherA(00420078) ret=00413a3e trace:advapi:StartServiceCtrlDispatcherA 0x420078 0009:Call kernel32.MultiByteToWideChar(00000000,00000000,00420088 "Altera JTAG Server",ffffffff,00000000,00000000) ret=7f99ad13 0009:Ret kernel32.MultiByteToWideChar() retval=00000013 ret=7f99ad13 0009:Call ntdll.RtlAllocateHeap(7fce0000,00000008,0000005e) ret=7f99ad2f 0009:Ret ntdll.RtlAllocateHeap() retval=7fcfe910 ret=7f99ad2f 0009:Call kernel32.MultiByteToWideChar(00000000,00000000,00420088 "Altera JTAG Server",ffffffff,7fcfe944,00000013) ret=7f99ad48 0009:Ret kernel32.MultiByteToWideChar() retval=00000013 ret=7f99ad48 trace:advapi:service_run_threads starting 1 pipe listener threads 0009:Call ntdll.RtlAllocateHeap(7fce0000,00000000,00000004) ret=7f99ab83 0009:Ret ntdll.RtlAllocateHeap() retval=7fcfe630 ret=7f99ab83 0009:Call kernel32.CreateThread(00000000,00000000,7f99c9a0,7fcfe910,00000000,00000000) ret=7f99abb8 0009:Call ntdll.RtlAllocateHeap(7fce0000,00000000,00000008) ret=7fc6740b 0009:Ret ntdll.RtlAllocateHeap() retval=7fcfe3a8 ret=7fc6740b 0009:Call ntdll.RtlCreateUserThread(ffffffff,00000000,00000001,00000000,00000000,00000000,7fc672e0,7fcfe3a8,7fb9fc78,7fb9fc6c) ret=7fc67451 0009: *fd* 9 <- 30 0009: new_thread( access=001f03ff, attributes=00000000, suspend=1, request_fd=9 ) 0009: new_thread() = 0 { tid=000a, handle=0x44 } 0009:Ret ntdll.RtlCreateUserThread() retval=00000000 ret=7fc67451 0009:Call ntdll.NtResumeThread(00000044,7fb9fc74) ret=7fc674b5 0009: resume_thread( handle=0x44 ) 0009: resume_thread() = 0 { count=1 } 0009:Ret ntdll.NtResumeThread() retval=00000000 ret=7fc674b5 0009:Ret kernel32.CreateThread() retval=00000044 ret=7f99abb8 0009:Call kernel32.WaitForMultipleObjectsEx(00000001,7fcfe630,00000001,ffffffff,00000000) ret=7f99ac24 0009:Call ntdll.NtWaitForMultipleObjects(00000001,7fb9fba0,00000001,00000000,00000000) ret=7fc604d9 0009: select( flags=5, cookie=0x7fb9fa54, signal=(nil), timeout=0, handles={0x44} ) 0009: select() = PENDING 000a: *fd* 11 <- 31 000a: *fd* 13 <- 32 000a: init_thread( unix_pid=3608, unix_tid=3615, teb=0xb7f60000, peb=0x7ffdf6e0, entry=0x7fc672e0, ldt_copy=0xb7f71860, reply_fd=11, wait_fd=13, debug_level=1 ) 000a: init_thread() = 0 { pid=0008, tid=000a, info_size=0, server_start=1137885144, version=221 } 000a:Call ntdll.RtlFreeHeap(7fce0000,00000000,7fcfe3a8) ret=7fc6731d 000a:Ret ntdll.RtlFreeHeap() retval=00000001 ret=7fc6731d 000a:Starting thread (entryproc=0x7f99c9a0) 000a:Call ntdll.MODULE_DllThreadAttach(00000000) ret=7fc673c8 000a:Call PE DLL (proc=0x7fc73570,module=0x7fc00000 L"kernel32.dll",reason=THREAD_ATTACH,res=(nil)) 000a:Call ntdll.RtlAllocateHeap(7fce0000,00000000,00010000) ret=7fc2d683 000a:Ret ntdll.RtlAllocateHeap() retval=7fd01dd8 ret=7fc2d683 000a:Ret PE DLL (proc=0x7fc73570,module=0x7fc00000 L"kernel32.dll",reason=THREAD_ATTACH,res=(nil)) retval=1 000a:Call PE DLL (proc=0x7fa4d280,module=0x7fa20000 L"msvcrt.dll",reason=THREAD_ATTACH,res=(nil)) 000a:Ret PE DLL (proc=0x7fa4d280,module=0x7fa20000 L"msvcrt.dll",reason=THREAD_ATTACH,res=(nil)) retval=1 000a:Call PE DLL (proc=0x7f9e93c0,module=0x7f9d0000 L"ws2_32.dll",reason=THREAD_ATTACH,res=(nil)) 000a:Ret PE DLL (proc=0x7f9e93c0,module=0x7f9d0000 L"ws2_32.dll",reason=THREAD_ATTACH,res=(nil)) retval=1 000a:Ret ntdll.MODULE_DllThreadAttach() retval=00000000 ret=7fc673c8 trace:advapi:service_control_dispatcher 0x7fcfe910 L"Altera JTAG Server" 000a:Call ntdll.RtlAllocateHeap(7fce0000,00000000,00000054) ret=7f99bf68 000a:Ret ntdll.RtlAllocateHeap() retval=7fcfe978 ret=7f99bf68 000a:Call kernel32.CreateNamedPipeW(7fcfe978 L"\\\\.\\pipe\\__wineservice_Altera JTAG Server",00000003,00000000,00000002,00000400,00000400,00000000,00000000) ret=7f99c9fc 000a:Call ntdll.RtlDosPathNameToNtPathName_U(7fcfe978 L"\\\\.\\pipe\\__wineservice_Altera JTAG Server",b7e159ec,00000000,00000000) ret=7fc6202c trace:file:RtlDosPathNameToNtPathName_U (L"\\\\.\\pipe\\__wineservice_Altera JTAG Server",0xb7e159ec,(nil),(nil)) trace:file:RtlGetFullPathName_U (L"\\\\.\\pipe\\__wineservice_Altera JTAG Server" 520 0xb7e156e4 (nil)) 000a:Ret ntdll.RtlDosPathNameToNtPathName_U() retval=00000001 ret=7fc6202c 000a:Call ntdll.NtCreateNamedPipeFile(b7e159f4,c0000000,b7e159c0,b7e159e4,00000000,00000005,00000012,00000000,00000000,00000000,00000002,00000400,00000400,b7e159d8) ret=7fc6214e trace:ntdll:NtCreateNamedPipeFile (0xb7e159f4 c0000000 L"\\??\\pipe\\__wineservice_Altera JTAG Server" 0xb7e159e4 0 5 12 0 0 0 2 1024 1024 0xb7e159d8) 000a: create_named_pipe( access=c0000000, attributes=00000040, rootdir=(nil), options=00000012, flags=00000000, maxinstances=00000002, outsize=00000400, insize=00000400, timeout=00000000, name=L"\\??\\pipe\\__wineservice_Altera JTAG Server" ) 000a: create_named_pipe() = 0 { handle=0x48 } 000a:Ret ntdll.NtCreateNamedPipeFile() retval=00000000 ret=7fc6214e 000a:Call ntdll.RtlFreeUnicodeString(b7e159ec) ret=7fc6215a 000a:Ret ntdll.RtlFreeUnicodeString() retval=00000000 ret=7fc6215a 000a:Ret kernel32.CreateNamedPipeW() retval=00000048 ret=7f99c9fc 000a:Call ntdll.RtlFreeHeap(7fce0000,00000000,7fcfe978) ret=7f99ca1e 000a:Ret ntdll.RtlFreeHeap() retval=00000001 ret=7f99ca1e 000a:Call ntdll.RtlAllocateHeap(7fce0000,00000000,00000042) ret=7f99c928 000a:Ret ntdll.RtlAllocateHeap() retval=7fcfe978 ret=7f99c928 000a:Call kernel32.CreateEventW(00000000,00000001,00000000,7fcfe978 L"__wineservice_Altera JTAG Server") ret=7f99c980 000a:Call ntdll.RtlInitUnicodeString(b7e159f0,7fcfe978 L"__wineservice_Altera JTAG Server") ret=7fc608c6 000a:Ret ntdll.RtlInitUnicodeString() retval=00000042 ret=7fc608c6 000a:Call ntdll.RtlInitUnicodeString(b7e159a0,7fc80f40 L"\\BaseNamedObjects") ret=7fc5fdb2 000a:Ret ntdll.RtlInitUnicodeString() retval=00000024 ret=7fc5fdb2 000a:Call ntdll.NtOpenDirectoryObject(b7e159a8,00000006,b7e15988) ret=7fc5fdea trace:ntdll:NtOpenDirectoryObject (0xb7e159a8,0x00000006) trace:ntdll:dump_ObjectAttributes 0xb7e15988:(name=L"\\BaseNamedObjects", attr=0x00000000, hRoot=(nil), sd=(nil)) 000a: open_directory( access=00000006, attributes=00000000, rootdir=(nil), directory_name=L"\\BaseNamedObjects" ) 000a: open_directory() = 0 { handle=0x4c } 000a:Ret ntdll.NtOpenDirectoryObject() retval=00000000 ret=7fc5fdea 000a:Call ntdll.NtCreateEvent(b7e159f8,001f0003,b7e159d8,00000001,00000000) ret=7fc608f4 000a: create_event( access=001f0003, attributes=000000c0, rootdir=0x4c, manual_reset=1, initial_state=0, name=L"__wineservice_Altera JTAG Server" ) 000a: create_event() = 0 { handle=0x50 } 000a:Ret ntdll.NtCreateEvent() retval=00000000 ret=7fc608f4 000a:Call ntdll.RtlNtStatusToDosError(00000000) ret=7fc60907 000a:Ret ntdll.RtlNtStatusToDosError() retval=00000000 ret=7fc60907 000a:Ret kernel32.CreateEventW() retval=00000050 ret=7f99c980 000a:Call ntdll.RtlFreeHeap(7fce0000,00000000,7fcfe978) ret=7f99c995 000a:Ret ntdll.RtlFreeHeap() retval=00000001 ret=7f99c995 000a:Call kernel32.SetEvent(00000050) ret=7f99ce47 000a:Call ntdll.NtSetEvent(00000050,00000000) ret=7fc60aee 000a: event_op( handle=0x50, op=1 ) 000a: event_op() = 0 000a:Ret ntdll.NtSetEvent() retval=00000000 ret=7fc60aee 000a:Ret kernel32.SetEvent() retval=00000001 ret=7f99ce47 000a:Call kernel32.CloseHandle(00000050) ret=7f99ce4d 000a:Call ntdll.NtClose(00000050) ret=7fc4d744 000a: close_handle( handle=0x50 ) 000a: close_handle() = 0 { fd=-1 } 000a:Ret ntdll.NtClose() retval=00000000 ret=7fc4d744 000a:Ret kernel32.CloseHandle() retval=00000001 ret=7f99ce4d 000a:Call kernel32.ConnectNamedPipe(00000048,00000000) ret=7f99ca60 000a:Call ntdll.NtFsControlFile(00000048,00000000,00000000,00000000,b7e15a14,00110008,00000000,00000000,00000000,00000000) ret=7fc6171e trace:ntdll:NtFsControlFile (0x48,(nil),(nil),(nil),0xb7e15a14,0x00110008,(nil),0x00000000,(nil),0x00000000) 000a: create_event( access=001f0003, attributes=00000000, rootdir=(nil), manual_reset=0, initial_state=0, name=L"" ) 000a: create_event() = 0 { handle=0x50 } 000a: connect_named_pipe( handle=0x48, event=0x50, func=0x7ff98ee0 ) 000a: connect_named_pipe() = 0 000a: select( flags=6, cookie=0xb7e157d4, signal=(nil), timeout=0, handles={0x50} ) 000a: select() = PENDING 0009: get_console_input_info( handle=(nil) ) 0009: get_console_input_info() = INVALID_PARAMETER { history_mode=0, history_size=0, history_index=0, edition_mode=0, title=L"" } 0009:Call ntdll.RtlNtStatusToDosError(c000000d) ret=7fc1f699 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000057 ret=7fc1f699 0009:Call msvcrt._except_handler3(7fb9f88c,7fb9fef8,7fb9f5c0,7fb9f520) ret=7ffb8529 0009:Call msvcrt._XcptFilter(c000013a,7fb9f3c4) ret=0041a59b 0009:Ret msvcrt._XcptFilter() retval=00000000 ret=0041a59b 0009:Ret msvcrt._except_handler3() retval=00000001 ret=7ffb8529 0009:Call ntdll.NtTerminateProcess(ffffffff,00000001) ret=7fc4cb30 0009: terminate_process( handle=0xffffffff, exit_code=1 ) 000a: *killed* exit_code=1 0009: *wakeup* signaled=0 cookie=0x7fb9fa54 0009: terminate_process() = 0 { self=1 } 0009: *killed* exit_code=1 wineserver: exiting (pid=3614)

2 3

[Corrected] Fix (w)strto(l)d family and test for atof
by Uwe Bonnes Jan. 23, 2006

Jan. 23, 2006

(I forgot some fix in wcstod) Changelog: /home/wine/wine/dlls/msvcrt/wcs.c, string.c, test/string.c: Fix wcstod, implement strtod and atof on top of an adapted copy of wcsto(l)d. Add tests for atof and strtod. This supercedes the patch adding atof todo_wines. Maybe strtod should be implemented by translating the string to a wide string and calling wcstod. Few other msvcrt ascii functions however use MultiByteToWideChar and call the wcs counterpart... -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- Index: wine/dlls/msvcrt/wcs.c =================================================================== RCS file: /home/wine/wine/dlls/msvcrt/wcs.c,v retrieving revision 1.35 diff -u -r1.35 wcs.c --- wine/dlls/msvcrt/wcs.c 14 Jan 2006 17:00:58 -0000 1.35 +++ wine/dlls/msvcrt/wcs.c 22 Jan 2006 23:35:23 -0000 @@ -108,13 +108,13 @@ } /********************************************************************* - * wcstod (MSVCRT.@) + * wcstold (internal) */ -double MSVCRT_wcstod(const MSVCRT_wchar_t* lpszStr, MSVCRT_wchar_t** end) +long double MSVCRT_wcstold(const MSVCRT_wchar_t* lpszStr, MSVCRT_wchar_t** end) { const MSVCRT_wchar_t* str = lpszStr; int negative = 0; - double ret = 0, divisor = 10.0; + long double ret = 0L, divisor = 1L; TRACE("(%s,%p) semi-stub\n", debugstr_w(lpszStr), end); @@ -134,27 +134,32 @@ while (isdigitW(*str)) { - ret = ret * 10.0 + (*str - '0'); + ret = ret * 10L + (*str - '0'); str++; } if (*str == '.') str++; while (isdigitW(*str)) { - ret = ret + (*str - '0') / divisor; - divisor *= 10; + ret = ret + (*str - '0'); + divisor *= 10L; str++; } + ret /= divisor; if (*str == 'E' || *str == 'e' || *str == 'D' || *str == 'd') { int negativeExponent = 0; int exponent = 0; - if (*(++str) == '-') + str++; + if (*str == '-') { negativeExponent = 1; str++; } + else + if (*str == '+') + str++; while (isdigitW(*str)) { exponent = exponent * 10 + (*str - '0'); @@ -163,9 +168,9 @@ if (exponent != 0) { if (negativeExponent) - ret = ret / pow(10.0, exponent); + ret = ret / powl(10L, exponent); else - ret = ret * pow(10.0, exponent); + ret = ret * powl(10L, exponent); } } @@ -175,10 +180,16 @@ if (end) *end = (MSVCRT_wchar_t*)str; - TRACE("returning %g\n", ret); + TRACE("returning %Lg\n", ret); return ret; } - +/********************************************************************* + * wcstod (MSVCRT.@) + */ +double MSVCRT_wcstod(const MSVCRT_wchar_t* lpszStr, MSVCRT_wchar_t** end) +{ + return (double) MSVCRT_wcstold(lpszStr, end); +} typedef struct pf_output_t { Index: wine/dlls/msvcrt/string.c =================================================================== RCS file: /home/wine/wine/dlls/msvcrt/string.c,v retrieving revision 1.15 diff -u -r1.15 string.c --- wine/dlls/msvcrt/string.c 14 Jan 2006 17:01:19 -0000 1.15 +++ wine/dlls/msvcrt/string.c 22 Jan 2006 23:35:23 -0000 @@ -22,6 +22,7 @@ */ #include <stdlib.h> +#include <math.h> #include "msvcrt.h" #include "wine/debug.h" @@ -138,19 +139,104 @@ } /********************************************************************* - * atof (MSVCRT.@) + * strtold (internal) */ -double MSVCRT_atof( const char *str ) +long double MSVCRT_strtold( const char *lpszStr, char **end ) { - return atof( str ); + const char* str = lpszStr; + int negative = 0; + long double ret = 0L, divisor = 1L; + + TRACE("(%s,%p) semi-stub\n", debugstr_a(lpszStr), end); + + /* FIXME: + * - Should set errno on failure + * - Should fail on overflow + * - Need to check which input formats are allowed + */ + while (isspace(*str)) + str++; + + if (*str == '-') + { + negative = 1; + str++; + } + + while (isdigit(*str)) + { + ret = ret * 10L + (*str - '0'); + str++; + } + if (*str == '.') + str++; + while (isdigit(*str)) + { + ret = ret*10L + (*str - '0'); + divisor *= 10L; + str++; + } + + ret /= divisor; + if (*str == 'E' || *str == 'e' || *str == 'D' || *str == 'd') + { + int negativeExponent = 0; + int exponent = 0; + str++; + if (*str == '-') + { + negativeExponent = 1; + str++; + } + else + if (*str == '+') + str++; + while (isdigit(*str)) + { + exponent = exponent * 10 + (*str - '0'); + str++; + } + if (exponent != 0) + { + if (negativeExponent) + ret = ret / powl(10L, exponent); + else + ret = ret * powl(10L, exponent); + } + } + + if (negative) + ret = -ret; + + if (end) + *end = (char*)str; + + TRACE("returning %Lg\n", ret); + return ret; +} + +/********************************************************************* + * strtold (MSVCRT.@) + */ +double MSVCRT_strtod( const char *lpszStr, char **end ) +{ + return (double) MSVCRT_strtold(lpszStr, end); } /********************************************************************* - * strtod (MSVCRT.@) + * atold (MSVCRT.@) */ -double MSVCRT_strtod( const char *str, char **end ) +double MSVCRT_atold( const char *lpszStr) +{ + return MSVCRT_strtold(lpszStr, NULL); +} + +/********************************************************************* + * atof (MSVCRT.@) + */ +double MSVCRT_atof( const char *str ) { - return strtod( str, end ); + return (double) MSVCRT_strtold(str, NULL); } /********************************************************************* Index: wine/dlls/msvcrt/tests/string.c =================================================================== RCS file: /home/wine/wine/dlls/msvcrt/tests/string.c,v retrieving revision 1.6 diff -u -r1.6 string.c --- wine/dlls/msvcrt/tests/string.c 21 Nov 2005 12:03:18 -0000 1.6 +++ wine/dlls/msvcrt/tests/string.c 22 Jan 2006 23:35:23 -0000 @@ -27,6 +27,8 @@ static void* (*pmemcpy)(void *, const void *, size_t n); static int* (*pmemcmp)(void *, const void *, size_t n); +static double (*patof)(const char *); +static double (*pstrtod)(const char *, char ** ); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hMsvcrt,y) #define SET(x,y) SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y) @@ -99,6 +101,78 @@ ok( ret==0, "_mbsspn returns %d should be 0\n", ret); } +static void test_atof( void) +{ + char s1[]=" -2309.12E-15"; + char s2[]="7.8912654773d10"; + char s3[]="7.8912654773d210"; + char s4[]=" -9885 pigs"; + char s5[]="98854 dollars"; + char s6[]="7.8912654773d+210"; + double x; + + x = patof( s1 ); + ok(x==-2.309120e-012, "atof(%s) returned %e\n", s1, x ); + + x = patof( s2 ); + ok(x==7.8912654773e10, "atof(%s) returned %2.20e\n", s2, x ); + + x = patof( s3 ); + ok(x==7.8912654773e210, "atof(%s) returned %2.20e\n", s3, x ); + + x = patof( s4 ); + ok(x==-9.885000e+003, "atof(%s) returned %e\n", s4, x ); + + x = patof( s5 ); + ok(x==9.885400e+004, "atof(%s) returned %e\n", s5, x ); + + x = patof( s6 ); + ok(x==7.8912654773e+210, "atof(%s) returned %e\n", s6, x ); + +} + +static void test_strtod( void) +{ + char s1[]=" -2309.12E-15"; + char s2[]="7.8912654773d10"; + char s3[]="7.8912654773d210"; + char s4[]=" -9885 pigs"; + char s5[]="98854 dollars"; + char s6[]="7.8912654773d+210"; + char s7[]="\t7.8912654773d+210"; + char *end; + double x; + + x = pstrtod( s1, &end); + ok(x==-2.309120e-012, "strtod(%s) returned %e\n", s1, x ); + ok(*end == 0, "strtod(%s) unexpected end %s\n", s1, end); + + x = pstrtod( s2, &end ); + ok(x==7.8912654773e10, "strtod(%s) returned %2.20e\n", s2, x ); + ok(*end == 0, "strtod(%s) unexpected end %s\n", s2, end); + + x = pstrtod( s3, &end ); + ok(x==7.8912654773e210, "strtod(%s) returned %2.20e\n", s3, x ); + ok(*end == 0, "strtod(%s) unexpected end %s\n", s3, end); + + x = pstrtod( s4, &end ); + ok(x==-9.885000e+003, "strtod(%s) returned %e\n", s4, x ); + ok(strcmp(end," pigs") == 0, "strtod(%s) unexpected end %s\n", s4, end); + + x = pstrtod( s5, &end ); + ok(x==9.885400e+004, "strtod(%s) returned %e\n", s5, x ); + ok(strcmp(end," dollars") == 0, "strtod(%s) unexpected end %s\n", s5, end); + + x = pstrtod( s6, &end ); + ok(x==7.8912654773e+210, "strtod(%s) returned %e\n", s6, x ); + ok(*end == 0, "strtod(%s) unexpected end %s\n", s6, end); + + x = pstrtod( s7, &end ); + ok(x==7.8912654773e+210, "strtod(%s) returned %e\n", s7, x ); + ok(*end == 0, "strtod(%s) unexpected end %s\n", s7, end); + +} + START_TEST(string) { void *mem; @@ -108,6 +182,8 @@ ok(hMsvcrt != 0, "LoadLibraryA failed\n"); SET(pmemcpy,"memcpy"); SET(pmemcmp,"memcmp"); + SET(patof,"atof"); + SET(pstrtod,"strtod"); /* MSVCRT memcpy behaves like memmove for overlapping moves, MFC42 CString::Insert seems to rely on that behaviour */ @@ -125,4 +201,6 @@ test_ismbblead(); /* test _mbsspn */ test_mbsspn(); + if (patof) test_atof(); + if (pstrtod) test_strtod(); }

1 0

Mac OS X/Intel port
by Chris Campbell Jan. 23, 2006

Jan. 23, 2006

Hi, I just recently downloaded the CVS of WINE and tried to build it on an Apple Intel machine. I ran into some problems during the build and fixed them. I then got to the server and the build quit on context_i386.c. There is nothing in that file that handles darwin/ Mac OS X. It looks like the ptrace functionality (GETREGS, etc) that is used on Linux and FreeBSD is not present in the xnu kernel... I would like to get WINE working on x86 OS X. Can anyone tell me who is working on this? I would like to help with this effort. Chris

4 3

Doomsday (jDoom) directinput error
by Segin Jan. 22, 2006

Jan. 22, 2006

I have tried to use jDoom/Doomsday in Wine, because I rather not have to reboot to play it. The error is in DirectInput. I have tried to disable stuff such as joystick, but not mouse (kinda hard to play without mouse). Anyways, the startup console displays this where it crashes (irrelevant text stripped): Sys_Init: Setting up machine state. Sys_Init: Initializing keyboard, mouse and joystick. I_Init: DirectInput 8 init failed (0x80040154). I_Init: failed to create DirectInput 3 object (0x800704df). also, a dialog box appears, with that text, a blank newline, and then "Sys_init: Failed to initalize DirecInput". On the xterm, i get all this: fixme:system:SystemParametersInfoW Unimplemented action: 4118 (SPI_GETTOOLTIPANIMATION) fixme:system:SystemParametersInfoW Unimplemented action: 4120 (SPI_GETTOOLTIPFADE) fixme:win:AnimateWindow partial stub fixme:system:SystemParametersInfoW Unimplemented action: 4118 (SPI_GETTOOLTIPANIMATION) fixme:system:SystemParametersInfoW Unimplemented action: 4120 (SPI_GETTOOLTIPFADE) fixme:win:AnimateWindow partial stub err:ole:CoGetClassObject class {25e609e4-b259-11cf-bfc7-444553540000} not registered err:ole:CoGetClassObject no class object {25e609e4-b259-11cf-bfc7-444553540000} could be created for for context 0x1 fixme:ole:CoCreateInstance no classfactory created for CLSID {25e609e4-b259-11cf-bfc7-444553540000}, hres is 0x80040154 Could this have something to do wih my problems? Also, I will try to disable both mouse/joystick, see how far that gets.

1 0