July 2006 - Wine-devel - list.winehq.org

Re: msi: Don't set the shortcut's working directory if it's NULL.
by Dan Kegel 27 Jul '06

27 Jul '06

On 7/27/06, Mike McCormack <mike(a)codeweavers.com> wrote: > --- > dlls/msi/action.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) That fixes the last AA installer crash. As soon as that's committed we can close out http://bugs.winehq.org/show_bug.cgi?id=5139 Thanks!! - Dan

1 0

Winelib and msvcrt/process.h
by Johannes Holzer 27 Jul '06

27 Jul '06

Hi Everybody. I have some problems compiling my win32 Application with Windows-Threads ("_beginthreadex") against winelib. It seems, that i cannot use the header files in /usr/include/wine/msvcrt. Wine Version 0.9.8, 0.9.16, 0.9.17 GCC: gcc version 4.0.2 20050901 (prerelease) (SUSE Linux), gcc 3.4.4-r1 ssp-3.4.4-1.0 pie-8.7.8 (gentoo) 1st try: Compile with $wineg++ -c -I. -I../com -o ../com/b12.o ../com/b12.cppIn file included from ../com/b12.cpp:22: ../com/W32/b12s.cpp:12:21: error: process.h: No such file or directory ../com/W32/b12s.cpp: In function 'void* pvSTART_THREAD(void* (*)(void*), unsigned int, B12_ThreadClass*, B00_ThreadIdType*)': ../com/W32/b12s.cpp:109: error: '_beginthreadex' was not declared in this scope ../com/W32/b12s.cpp: In function 'F02_ErrorType B12_errSET_ENVIRONMENT_STRING(const str&, const str&)': ../com/W32/b12s.cpp:360: error: invalid conversion from 'const char*' to 'char*' ../com/W32/b12s.cpp:360: error: initializing argument 1 of 'int putenv(char*)' winegcc: g++ failed. okay, i need process.h. so i use the -mno-cygwin - switch, wich includes the "msvcrt"-path and sets some #defines. Now the 2nd try: $ wineg++ -c -I. -I../com -o ../com/b12.o ../com/b12.cpp -mno-cygwin /usr/include/c++/4.0.2/cstdio:168: error: '::snprintf' has not been declared /usr/include/c++/4.0.2/cstdio:169: error: '::vfscanf' has not been declared /usr/include/c++/4.0.2/cstdio:170: error: '::vscanf' has not been declared /usr/include/c++/4.0.2/cstdio:172: error: '::vsscanf' has not been declared /usr/include/c++/4.0.2/cstdio:178: error: '__gnu_cxx::snprintf' has not been declared /usr/include/c++/4.0.2/cstdio:179: error: '__gnu_cxx::vfscanf' has not been declared /usr/include/c++/4.0.2/cstdio:180: error: '__gnu_cxx::vscanf' has not been declared /usr/include/c++/4.0.2/cstdio:182: error: '__gnu_cxx::vsscanf' has not been declared /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:55: error: 'uselocale' was not declared in this scope /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:55: error: invalid type in declaration before ';' token /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h: In function 'int std::__convert_from_v(char*, int, const char*, _Tv, __locale_struct* const&, int)': /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:73: error: '__gnu_cxx::__uselocale' cannot be used as a function /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:84: error: 'snprintf' is not a member of 'std' /usr/include/c++/4.0.2/i586-suse-linux/bits/c++locale.h:90: error: '__gnu_cxx::__uselocale' cannot be used as a function /usr/include/bits/sigthread.h: At global scope: /usr/include/bits/sigthread.h:32: error: expected ',' or '...' before '*' token /usr/include/c++/4.0.2/cwchar:151: error: '::fwide' has not been declared /usr/include/c++/4.0.2/cwchar:158: error: '::mbsinit' has not been declared [ ... a lot more errors ... ] If I ommit -mno-cygwin and set "-I/usr/include/wine/msvcrt" , i get the same results lioke with -mno-cygwin. Where is the Problem? How can i compile this file? johannes Holzer

1 0

Re: Winebrowser: Let the browser decide how to handle a given url
by Dan Kegel 27 Jul '06

27 Jul '06

On 7/27/06, Stefan Siebert <stefan.siebert(a)web.de> wrote: > This is an enhancement for winebrowser. Currently http urls are only > accepted if they are prefixed (http://). Although the browser should > know how to handle a given url best. The patch passes every given url to > the browser (if it is not a mailto: url). > So programs like the Notes Client may use winebrowser and the user is > not forced to type the http:// prefix. While your patch points out a bug in wine, and makes Notes work better, the description's slightly off. I think a bare hostname by itself isn't a URL; to be a URL, you need a protocol prefix. So a better description might be "assume any address given by the user is a web page unless a protocol prefix is present which indicates that the address is something else".

1 0

Regression in wine 0.9.6 in riched20 causes program to fail
by Arren Lex 26 Jul '06

26 Jul '06

Wine suffered a regression between 06:47:19 CST (12:47:19 UTC) and 06:47:20 CST (12:47:20 UTC). CVS indicates that the files P wine/dlls/riched20/caret.c P wine/dlls/riched20/editor.c P wine/dlls/riched20/paint.c were modified in this interval. The regression causes the open-source KeyNote note editor (http://keynote.sf.net) to crash after a few clicks through the sample note file. More information and screenshot in bugzilla entry: http://bugs.winehq.org/show_bug.cgi?id=5769 If you need more information, please be very explicit in your instructions about how I should get it. I have little experience with the development\debugging side of Linux. Thanks a lot for Wine in all its glory!

1 0

Broken character models in dx8/9 games in wined3d
by Jason Green 26 Jul '06

26 Jul '06

I've spent a couple of days researching the issue of broken/upside-down character/object models in Wine in almost all newer games when you have vertex shaders enabled (Civ4, Half Life 2, Oblivion, Max Payne 2, etc.). I think I've boiled it down to a single case: When "device->renderUpsideDown" is set in the case where vertex shaders are enabled. That flag gets set in device.c:7395 when the current renderTarget is not on the current swapchain. The comments in the source say that the upside-downedness is produced by glCopyTexImage, so it sets a flag to flip everything over. In the case w/o shaders, there is code in drawprim.c which loads the WORLDVIEW and PROJECTION matrices and then multiplies those matrices by one which inverts the y coordinates when that flag is set. That seems to work in the case without vertex shaders, but when shaders are enabled, they bypass the WORLD, VIEW, and PROJECTION matrices entirely. The shader case was written when only software shaders worked, but that is no longer true. It loads identity matrices and performs the y flip, but that code is entirely irrelevant since the vertex shader doesn't reference those matrices; it only uses constants that are passed by the app, which we can't perform any type of fixup on since we don't know which constants will be used for which calculation. So, I think what we need to do is prevent ourselves from having to do any flipping whatsoever. That's the part that I'm not sure how to do and is the reason for this email. Can we load the textures in system memory first, perform a software reversing process, then load that up with glCopyTexImage instead? Will we need to do that type of fixup every time the app locks/unlocks/changes part of the texture? Or, is there a better way? I think I've figured out the problem, it's just the next step of fixing it that I'm unsure of. :-) >From a few hackish tests, I've been able to fix some of the issues where the only thing wrong was that the images were upside-down with this hack (for GLSL shader mode only): diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 84f90f5..d0325d9 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -719,6 +719,7 @@ #endif shader_addline(&buffer, "gl_FogFragCoord = clamp(gl_FogFragCoord, 0.0, 1.0);\n"); } + shader_addline(&buffer, "gl_Position = gl_Position * gl_ModelViewProjectionMatrix;\n"); shader_addline(&buffer, "}\n\0"); TRACE("Compiling shader object %u\n", shader_obj); This works because the gl_ModelViewProjectionMatrix is just a matrix which reverses the y position when This->renderUpsideDown == TRUE, otherwise it's the identity matrix. Here are a few comparison screenshots: Oblvion: --------- Before: http://www.cmhousing.net/wine/oblivion2.png After: http://www.cmhousing.net/wine/oblivion_sortacorrect3.png Civ4: ----- Before: http://www.cmhousing.net/wine/civ4_before.png After: http://www.cmhousing.net/wine/civ4_leaderhead.png Half Life 2: ------------- After: http://www.cmhousing.net/wine/hl2_rightsideup.png (the bottom got screwed up, but normally the guy on the picture is upside-down) Many of the character models and other objects are still broken even with that hack, but that's because we should be flipping more than just the final position - we should be flipping a whole row of constants that the app is using before it starts its calculations. Instead of trying to do that, we should fix the root of the problem IMHO. Anyway, any ideas are welcome. :-) Jason

5 14

Re: WineD3D: BltFast/BltOverride color keying
by Roderick Colenbrander 26 Jul '06

26 Jul '06

Use this version instead as the previous one didn't compile due to an extra '(' :( Roderick > Hi, > > This patch adds color keying support to *_BltOverride. It required changes > to *_BltFast to properly pass 'BLT' flags instead of 'BLTFAST' to > *_BltOverride. Next it adds SRC/DEST color keying to *_BltOverride. > > Further to get color keying working at all it fixed a small error in > LoadTexture which I paste here because it is hard to spot in the patch. Right > now a check in there looks like: > (This->Flags & SFLAG_GLCKEY && !(This->CKeyFlags & DDSD_CKSRCBLT)) || > /* Reload: vice versa OR */ > (!(This->Flags & SFLAG_GLCKEY) && !This->CKeyFlags & DDSD_CKSRCBLT) || > > The third '!' was removed as indicated by the comment this fixes color > keying. Next to this some gcc warning was silenced by adding some more braces. > > Regards, > Roderick Colenbrander > -- Echte DSL-Flatrate dauerhaft für 0,- Euro*. Nur noch kurze Zeit! "Feel free" mit GMX DSL: http://www.gmx.net/de/go/dsl

1 0

registry entry creation problems
by Kuba Ober 26 Jul '06

26 Jul '06

Hi, I'm trying to install some registry entries via a custom .inf file. Eventually the .inf file will do more than install registry entries, so I can't just use regedit and .reg files for the task. The relay shows that the entries were supposedly created without problems (retval == ERROR_SUCCESS), but subsequent runs of regedit show that nothing of the sort has happened. I've done it all on a fresh wine prefix, like so: $ rpm -q wine-core wine-core-0.9.16-2.fc4 $ rm -rf ~/wp $ wineprefixcreate --wineprefix ~/wp /vol1/home/kuba/wp updated successfully. $ WINEDEBUG=relay WINPREFIX=~/wp wine rundll32 setupapi.dll,InstallHinfSection DefaultInstall 0 z:\\home\\kuba\\build.inf 2> log $ WINEPREFIX=~/wp regedit /E z:\\home\\kuba\\foo.reg HKEY_CURRENT_USER None of the keys from the .inf file appear in ~/foo.reg, even though the relay dump would have you think that their creation had succeeded. Manual creation of keys via $ WINEPREFIX=~/wp regedit works fine. Below is the relay trace, with my annotations. I'd appreciate any suggestions as to how to debug this. Cheers, Kuba 0009:Call advapi32.RegCreateKeyW(80000001,7fc8d818 L"Environment",7fc8f838) ret=420bd1ca 0009:Call ntdll.NtCreateKey(7fc8f838,000f003f,7fc8d6a4,00000000,7fc8d6bc,00000000,00000000) ret=7b4e19dd 0009:Ret ntdll.NtCreateKey() retval=00000000 ret=7b4e19dd 0009:Call ntdll.RtlNtStatusToDosError(00000000) ret=7b4e19e8 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000000 ret=7b4e19e8 0009:Ret advapi32.RegCreateKeyW() retval=00000000 ret=420bd1ca * HKCU/Environment was successfully created/opened. 0009:Call advapi32.RegSetValueExW(00000044,7fc8d818 L"TEMP",00000000,00000001,7ff19ae8,0000000e) ret=420bd56e 0009:Call ntdll.NtSetValueKey(00000044,7fc8d6e4,00000000,00000001,7ff19ae8,0000000e) ret=7b4e34ca 0009:Ret ntdll.NtSetValueKey() retval=00000000 ret=7b4e34ca 0009:Call ntdll.RtlNtStatusToDosError(00000000) ret=7b4e34d5 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000000 ret=7b4e34d5 0009:Ret advapi32.RegSetValueExW() retval=00000000 ret=420bd56e * HKCU/Environment/TEMP was successfully set. 0009:Call advapi32.RegCloseKey(00000044) ret=420bd19f 0009:Call ntdll.NtClose(00000044) ret=7b4e1097 0009:Ret ntdll.NtClose() retval=00000000 ret=7b4e1097 0009:Call ntdll.RtlNtStatusToDosError(00000000) ret=7b4e10a2 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000000 ret=7b4e10a2 0009:Ret advapi32.RegCloseKey() retval=00000000 ret=420bd19f * The key was successfully closed.

1 0

Re: [oleaut32 1/2] Resend: Implements function varformat:VarWeekdayName
by Alexandre Julliard 26 Jul '06

26 Jul '06

"Benjamin Arai" <me(a)benjaminarai.com> writes: > + str = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*size); > + if (!str) > + return E_OUTOFMEMORY; > + size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, str, size); > + if (!size) { > + ERR("GetLocaleInfo of 0x%lx failed in 2nd stage?!\n", localeValue); > + HeapFree(GetProcessHeap(),0,str); > + return HRESULT_FROM_WIN32(GetLastError()); > + } > + *pbstrOut = SysAllocString(str); You should do the GetLocaleInfoW directly into the destination string instead of allocating another buffer. -- Alexandre Julliard julliard(a)winehq.org

1 0

vartest.c contains varformat.c tests
by Benjamin Arai 26 Jul '06

26 Jul '06

Hi, A bug was submitted (http://bugs.winehq.org/show_bug.cgi?id=5306) that vartest.c was getting too large and that it needs to be smaller. I don't think to much can be done about the size but I did notice that all the tests for varformat.c are being put into vartest.c as opposed to making a new test file test/varformat.c. Would there be any problems if I create a new test file for varformat.c and move the appropriate test from vartest.c to it? -- Benjamin Arai http://www.benjaminarai.com

4 3

Re: usp10: Implement ScriptGetGlyphABCWidth.
by Alexandre Julliard 26 Jul '06

26 Jul '06

Hans Leidekker <hans(a)it.vu.nl> writes: > -Hans > > Changelog > Implement ScriptGetGlyphABCWidth. > Add a test for ScriptGetGlyphABCWidth and ScriptCacheGetHeight. The tests fail here: ../../../tools/runtest -q -P wine -M usp10.dll -T ../../.. -p usp10_test.exe.so usp10.c && touch usp10.ok usp10.c:273: Test failed: Translation not correct. WCHAR 0 - 0000 != 0035 usp10.c:722: Test failed: expected S_OK, got 0x80070006 -- Alexandre Julliard julliard(a)winehq.org

3 2