October 2003 - Wine-Devel - list.winehq.org

Re: kernel32: Fix lstrcmp(i)A/W to correct return values and document this behaviour
by Dmitry Timoshkov Oct. 25, 2003

Oct. 25, 2003

"Rolf Kalbermatter" <rolf.kalbermatter(a)citeng.com> wrote: > int WINAPI lstrcmpA(LPCSTR str1, LPCSTR str2) > { > - int ret = CompareStringA(GetThreadLocale(), 0, str1, -1, str2, -1); > - if (ret) ret -= 2; > - return ret; > + int ret = CompareStringA(GetThreadLocale(), 0, str1, -1, str2, -1); > + if (!ret) > + { > + ret = CompareStringA(GetSystemDefaultLCID(), 0, str1, -1, str2, -1); > + if (!ret) > + { > + if (!str1) > + return (str2 ? -1 : 0); > + else if (!str2) > + return 1; > + return strcasecmp(str1, str2); > + } > + } > + return ret - 2; > } Windows doesn't do anything of the above. A patch for CompareString I sent recently to wine-devel has lots of tests and fixes for all the differences we have found so far. It just needs a clean approach for unicode.org/windows collation table differences merge to be included in Wine. -- Dmitry.

1 0

Summary of translations
by Vincent Béron Oct. 24, 2003

Oct. 24, 2003

This is the current summary of Wine translations. It lists languages for which at least one resource exists. It can be found here: http://mecano.gme.usherb.ca/~vberon/wine/translation All comments welcome. Vincent

2 2

Re: Translation support (wrc)
by Alexandre Julliard Oct. 24, 2003

Oct. 24, 2003

Vincent Béron <vberon(a)mecano.gme.usherb.ca> writes: > Changelog: > Add support for comparing resources to wrc for translations. That's a clear case of preprocessor abuse... there has to be a better way to do that than with a 100-line macro. -- Alexandre Julliard julliard(a)winehq.com

2 1

Re: ClipCursor values init on start (resize missing update values)
by Carlos Lozano Oct. 24, 2003

Oct. 24, 2003

El vie, 24 de oct de 2003, a las 23:08, Carlos Lozano escribio: > > - Windows init the clipcursor values with width and height of > the screen of the primary display monitor. > (Theme Hospital mouse is now fixed) Hmmm, it is even more complex what i had thought. When the resolution mode is changed, the values for clipcursor are reset to 0,0,X,Y. Now the question is: a) Should we modify the function SYSMETRICS_Set, and when the values SM_CXSCREEN or SM_CYSCREEN will get changed, call to the Clipcursor function b) or add a Clipcursor call after of every change resolution function?? Regards, Carlos. -- ___ _ \ | / Consulting | . |._ _ _| | ___ ___ ___ http://www.andago.com | || ' |/ . |<_> |/ . |/ . \__ GNU/Linux |_|_||_|_|\___|<___|\_. |\___/ _ \ __|\ \ / Carlos A. Lozano <___'/ | \ -_) __/\__ \ > < -_) [ carlos.lozano(a)andago.com ]\___|_| ____/ _/\_\___| [ calb(a)epsxe.com ] http://www.ePSXe.com

1 0

Re: FoldStringA (using W version)
by Jon Griffiths Oct. 24, 2003

Oct. 24, 2003

Hi, > + goto FoldStringA_exit; > ^^^^^^^^^^^^^^^^^^^^^^ > No allocation has been done yet, just "return 0;" would be > enough! Indeed, although the above is functionally identical. Feel free to submit a patch if you feel strongly about it... > Interesting idea, but I wonder how you can distinguish between > equal 0 and FALSE without some real magic! > Same applies to lstrcmpi No magic required. Use GetLastError(), just like it says. Cheers, Jon ===== "Don't wait for the seas to part, or messiahs to come; Don't you sit around and waste this chance..." - Live jon_p_griffiths(a)yahoo.com __________________________________ Do you Yahoo!? The New Yahoo! Shopping - with improved product search http://shopping.yahoo.com

3 4

WineHQ: PATCH to fix IPersistFile::Load() and associated functions
by Subhobroto Sinha Oct. 24, 2003

Oct. 24, 2003

Hi. I finally produced the "official patch" after verifying that everything is OK. Thanks to Dimi for putting up a temporary diff for me meanwhile ;) This patch has been inlined as well as attached as a ZIP file, so suit yourself. All reports regaring this patch is to be sent to <subhobrotosinha at yahoo.com> with a proper subject prefixed by "IPersistFile patch" in the subject header. For the uninitiated, here's what has to be done: Please make sure that you have the 20031016 source (latest tarball) (1)Copy this .diff to dlls/shell32/ (2)Run 'patch' on this diff file (3)It should patch "shelllink.c" (4)Type 'make' to rebuild 'shell32.dll.so' (5)'su' out and overwrite/symlink the current 'shell32.dll.so' over the installed one Now IPersistFile::Load() should work as intended. Try out McCormack's 'winemenubuilder' or my WineLib 'linkresolve' (NOT my C++ version) If the diff is not proper, etc, please alert me at the mentioned address BTW: If I should have submitted at 'wine-patches' rather at 'wine-devel', please let me know :=) I really want this BUG fixed you know ;-) Regards Subhobroto Sinha --- shelllink.c.original 2003-10-22 17:56:31.000000000 +0530 +++ shelllink.c 2003-10-24 13:09:59.000000000 +0530 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * NOTES - * Nearly complete informations about the binary formats + * Nearly complete informations about the binary formats * of .lnk files avaiable at http://www.wotsit.org * */ @@ -401,9 +401,49 @@ return S_OK; } +static HRESULT wineStream_LoadString( IStream* stm, LPWSTR *pstr ) +{ + DWORD count=0; + USHORT len; + LPWSTR str=NULL; + HRESULT r; + /* + From Win98 upwards unicode==TRUE.(Atleast for shortcuts..) + However, the value of SCF_UNICODE does NOT seem to be 0x1000. + Until then, we assume it true. + Anybody differing mail to <subhobrotosinha at yahoo.com>. + */ + TRACE("%p\n", stm); + + r = IStream_Read(stm, &len, sizeof(len), &count); + if(FAILED(r)||(count != sizeof(len))) return E_FAIL; + + len *= sizeof(WCHAR); + + TRACE("reading %d\n", len); + str = HeapAlloc(GetProcessHeap(), 0, len+sizeof(WCHAR)); + if(!str) return E_OUTOFMEMORY; + + count = 0; + r = IStream_Read(stm, str, len, &count); + if( FAILED(r)||( count!=len) ) + { + HeapFree( GetProcessHeap(), 0, str ); + return E_FAIL; + } + + TRACE("read %s\n", debugstr_w(str)); + str[count/2]=0; + *pstr = str; + return S_OK; +} static HRESULT Stream_LoadString( IStream* stm, BOOL unicode, LPWSTR *pstr ) { +/*This is the original function short circuited to the above till we find out correct 'SCF_UNICODE'. +Now it's assumed that the data's unicode. (This assumption failes iff the OS was <=Win95*/ +return (wineStream_LoadString(stm,pstr)); +#if 0 DWORD count; USHORT len; LPVOID temp; @@ -453,6 +493,7 @@ *pstr = str; return S_OK; +#endif } static HRESULT Stream_LoadLocation( IStream* stm ) @@ -533,6 +574,27 @@ if( FAILED( r ) ) return r; } + /*Fill in the target path. This marked portion will be rewritten once GetPathFromIDList() is completed*/ + //LPITEMIDLIST pidltemp=_dbg_ILGetNext(This->pPidl); + LPITEMIDLIST pidltemp=ILGetNext(This->pPidl); + char szPasha[128][MAX_PATH]={{0},{0}},szTemp[MAX_PATH]={0}; + int i=0,j=1; + do + { + _ILSimpleGetText(pidltemp,szPasha[i++],MAX_PATH); + pidltemp=ILGetNext(pidltemp); + }while(pidltemp->mkid.cb); + strcpy(szTemp,szPasha[0]); + for(;j<i;j++) + { + strcat(szTemp,szPasha[j]); + if(j!=(i-1))strcat(szTemp,"\\"); + } + strcat(szTemp,szPasha[j]); + This->sPath=HeapAlloc( GetProcessHeap(), 0,(strlen(szTemp)+1)*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP,0,szTemp,(strlen(szTemp)+1),This->sPath,(strlen(szTemp)+1)); + TRACE("%s\n",szTemp); + /*End marking*/ This->wHotKey = hdr.wHotKey; This->iIcoNdx = hdr.nIcon; FileTimeToSystemTime (&hdr.Time1, &This->time1); __________________________________ Do you Yahoo!? The New Yahoo! Shopping - with improved product search http://shopping.yahoo.com

2 1

IPersistFile patch
by Ivan Leo Murray-Smith Oct. 24, 2003

Oct. 24, 2003

>BTW: If I should have submitted at 'wine-patches' >rather at 'wine-devel', please let me know :=) >I really want this BUG fixed you know ;-) If you send your patch to wine-patches and it's OK for Alexandre, your patch will get into the CVS, and into the next release of wine.

1 0

Winesetuptk
by Ivan Leo Murray-Smith Oct. 24, 2003

Oct. 24, 2003

Rc1 had a bug that caused winesetuptk to crash when it looked for a real windows drive and didn't find one. Also, with rc2 winver is set to 98, as a lot of apps refuse to install on 95. source http://www003.portalis.it/115/download/prerelease/winesetuptk0.7rc2.tar.bz2 binary http://www003.portalis.it/115/download/prerelease/winesetuptk0.7rc2.bz2

1 0

Re: Winesetuptk 0.7 rc1
by Ivan Leo Murray-Smith Oct. 24, 2003

Oct. 24, 2003

>My ignorance may be obvious here, but is there any reason it is 5 meg? >(I don't remember the old one being that big.) You can get a 700kb compressed binary at www003.portalis.it/115/download/prerelease/winesetuptk0.7rc1.bz2 freedback is welcome.

1 0

Bug in cxx_frame_handler
by Robert Shearman Oct. 24, 2003

Oct. 24, 2003

Hi, I believe there is a bug in cxx_frame_handler which causes an infinite loop of exceptions I believe the offending lines are 359-364. BTW, original exception was a call to NULL. Wine Trace: trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=(nil) trace:seh:EXC_RtlRaiseException info[0]=00000000 trace:seh:EXC_RtlRaiseException info[1]=00000000 trace:seh:EXC_CallHandler calling handler at 0x1019c7d code=c0000005 flags=0 trace:seh:EXC_CallHandler handler returned 1 trace:seh:EXC_CallHandler calling handler at 0x5f492e0a code=c0000005 flags=0 trace:seh:EXC_CallHandler handler returned 1 trace:seh:EXC_CallHandler calling handler at 0x5f492d82 code=c0000005 flags=0 trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x40774fa4 trace:seh:EXC_RtlRaiseException info[0]=00000000 trace:seh:EXC_RtlRaiseException info[1]=0000001c trace:seh:EXC_CallHandler calling handler at 0x401a6120 code=c0000005 flags=0 trace:seh:EXC_CallHandler handler returned 2 trace:seh:EXC_CallHandler calling handler at 0x1019c7d code=c0000005 flags=10 trace:seh:EXC_CallHandler handler returned 1 trace:seh:EXC_CallHandler calling handler at 0x5f492e0a code=c0000005 flags=10 trace:seh:EXC_CallHandler handler returned 1 trace:seh:EXC_CallHandler calling handler at 0x5f492d82 code=c0000005 flags=10 trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x40774fa4 trace:seh:EXC_RtlRaiseException info[0]=00000000 trace:seh:EXC_RtlRaiseException info[1]=0000001c trace:seh:EXC_CallHandler calling handler at 0x401a6120 code=c0000005 flags=0 trace:seh:EXC_CallHandler handler returned 2 trace:seh:EXC_CallHandler calling handler at 0x401a6120 code=c0000005 flags=10 trace:seh:EXC_CallHandler handler returned 2 trace:seh:EXC_CallHandler calling handler at 0x1019c7d code=c0000005 flags=10 trace:seh:EXC_CallHandler handler returned 1 trace:seh:EXC_CallHandler calling handler at 0x5f492e0a code=c0000005 flags=10 trace:seh:EXC_CallHandler handler returned 1 trace:seh:EXC_CallHandler calling handler at 0x5f492d82 code=c0000005 flags=10 trace:seh:EXC_RtlRaiseException code=c0000005 flags=0 addr=0x40774fa4 ... same messages repeated again and again. gdb backtrace: #50 0x4005f518 in sigaction () from /lib/libc.so.6 #51 0x40775260 in __CxxFrameHandler (rec=0x4063ef04, frame=0x4074fc7c, exc_context=0x4063ef78, dispatch=0x4063ee94, context=0x4063eae0) at cppexcept.c:392 #52 0x401c4155 in __wine_call_from_32_regs () from /usr/local/lib/wine/ntdll.dll.so #53 0x40770d0d in __wine_regs_msvcrt_dll_77 () from /usr/local/lib/wine/msvcrt.dll.so #54 0x401a651f in EXC_RtlRaiseException (rec=0x4063ef04, context=0x4063ef78) at exception.c:216 #55 0x401bc646 in do_segv (context=0x4063ef78, trap_code=14, cr2=0x1c, err_code=4) at signal_i386.c:851 #56 0x401bca82 in segv_handler (__signal=11, __context= {sc_gs = 5335, __gsh = 0, sc_fs = 143, __fsh = 0, sc_es = 43, __esh = 0, sc_ds = 43, __dsh = 0, sc_edi = 1080292788, sc_esi = 0, sc_ebp = 1080292716, sc_esp = 1080292648, sc_ebx = 1081684044, sc_edx = 1075713776, sc_ecx = 0, sc_eax = 0, sc_trapno = 14, sc_err = 4, sc_eip = 1081560996, sc_cs = 35, __csh = 0, sc_eflags = 66050, esp_at_signal = 1080292648, sc_ss = 43, __ssh = 0, i387 = 0, oldmask = 0, cr2 = 28}) at signal_i386.c:1057 #57 0x4005f518 in sigaction () from /lib/libc.so.6 #58 0x40775260 in __CxxFrameHandler (rec=0x4063f9dc, frame=0x4074fc7c, exc_context=0x4063fa50, dispatch=0x4063f96c, context=0x4063f5b8) at cppexcept.c:392 #59 0x401c4155 in __wine_call_from_32_regs () from /usr/local/lib/wine/ntdll.dll.so #60 0x40770d0d in __wine_regs_msvcrt_dll_77 () from /usr/local/lib/wine/msvcrt.dll.so #61 0x401a651f in EXC_RtlRaiseException (rec=0x4063f9dc, context=0x4063fa50) at exception.c:216 #62 0x401bc646 in do_segv (context=0x4063fa50, trap_code=14, cr2=0x0, err_code=4) at signal_i386.c:851 #63 0x401bca82 in segv_handler (__signal=11, __context= {sc_gs = 5335, __gsh = 0, sc_fs = 143, __fsh = 0, sc_es = 43, __esh = 0, sc_ds = 43, __dsh = 49168, sc_edi = 1081408212, sc_esi = 1081408216, sc_ebp = 1081408220, sc_esp = 1081408180, sc_ebx = 1087173732, sc_edx = 1077335880, sc_ecx = 1077404792, sc_eax = 0, sc_trapno = 14, sc_err = 4, sc_eip = 0, sc_cs = 35, __csh = 0, sc_eflags = 66118, esp_at_signal = 1081408180, sc_ss = 43, __ssh = 0, i387 = 1080294784, oldmask = 0, cr2 = 0}) at signal_i386.c:1057 #64 0x4005f518 in sigaction () from /lib/libc.so.6 disassemble of section around second exception, sc_eip = 1081560996 (0x40774fa4): 0x40774f78 <cxx_frame_handler+180>: push %esi 0x40774f79 <cxx_frame_handler+181>: push %edx 0x40774f7a <cxx_frame_handler+182>: mov 0x18(%ebp),%edx 0x40774f7d <cxx_frame_handler+185>: push %edx 0x40774f7e <cxx_frame_handler+186>: pushl 0x14(%ebp) 0x40774f81 <cxx_frame_handler+189>: pushl 0x10(%ebp) 0x40774f84 <cxx_frame_handler+192>: mov 0xc(%ebp),%ecx 0x40774f87 <cxx_frame_handler+195>: push %ecx 0x40774f88 <cxx_frame_handler+196>: mov 0x8(%ebp),%edx 0x40774f8b <cxx_frame_handler+199>: push %edx 0x40774f8c <cxx_frame_handler+200>: call *%eax 0x40774f8e <cxx_frame_handler+202>: jmp 0x40775225 <cxx_frame_handler+865> 0x40774f93 <cxx_frame_handler+207>: cmpl $0x0,0xffffffe4(%ebp) 0x40774f97 <cxx_frame_handler+211>: jne 0x40774faa <cxx_frame_handler+230> 0x40774f99 <cxx_frame_handler+213>: call 0x40787070 <msvcrt_get_thread_data> 0x40774f9e <cxx_frame_handler+218>: mov 0x1c(%eax),%eax 0x40774fa1 <cxx_frame_handler+221>: mov %eax,0x8(%ebp) 0x40774fa4 <cxx_frame_handler+224>: mov 0x1c(%eax),%ecx 0x40774fa7 <cxx_frame_handler+227>: mov %ecx,0xffffffe4(%ebp) 0x40774faa <cxx_frame_handler+230>: mov 0x1fc(%ebx),%edx

1 0