- wine-devel - winehq.org

Re: Win64 patch 3/6 (resend)
by Dmitry Timoshkov 25 Jul '06

25 Jul '06

"Ge van Geldorp" <ge(a)gse.nl> wrote: > --- a/include/wine/server_protocol.h > +++ b/include/wine/server_protocol.h > @@ -33,6 +33,9 @@ struct reply_header > struct request_max_size > { > int pad[16]; > +#ifdef _WIN64 > + int pad64[10]; > +#endif > }; Why is this required? Is that due to asserts in server/request.c, open_master_socket() ? Is changing 'int' to 'long' a better fix? Also probably the fix should go in server/protocol.def instead. -- Dmitry.

3 6

Repetitve fixme for each file accessed.
by Segin 25 Jul '06

25 Jul '06

I keep getting stub fixme's for each and every single file that is access in Wine, especially via an installer. THe fixmes look like: fixme:sfc:SfcIsFileProtected ((nil), L"C:\\Program Files\\GeneXproTools 4\\SampleRuns\\XOR.gep") stub Does this have anything to do with the ClamAV integration I've heard you guys talking about? -- The real problem with C++ for kernel modules is: the language just sucks. -- Linus Torvalds

5 6

Re: oleaut32: Adding a NULL to a safearray is supposed to crash
by Robert Shearman 25 Jul '06

25 Jul '06

Neil Skrypuch wrote: >diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c >index 0eb92da..d3dd5e1 100644 >--- a/dlls/oleaut32/safearray.c >+++ b/dlls/oleaut32/safearray.c >@@ -843,12 +843,6 @@ HRESULT WINAPI SafeArrayPutElement(SAFEA > if (!psa || !rgIndices) > return E_INVALIDARG; > >- if (!pvData) >- { >- ERR("Invalid pvData would crash under Win32!\n"); >- return E_INVALIDARG; >- } >- > hRet = SafeArrayLock(psa); > > if (SUCCEEDED(hRet)) > > This patch looks good to me and it fixes a number of installers. -- Rob Shearman

2 1

Re: [oleaut32 2/3] Removes stub for varformat:VarWeekdayName
by Robert Shearman 25 Jul '06

25 Jul '06

Benjamin Arai wrote: >diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec >index ad110c7..9e1f1db 100644 >--- a/dlls/oleaut32/oleaut32.spec >+++ b/dlls/oleaut32/oleaut32.spec >@@ -124,7 +124,7 @@ > 125 stdcall VarBoolFromStr(wstr long long ptr) > 126 stdcall VarBoolFromDisp(ptr long ptr) > 127 stdcall VarFormatCurrency(ptr long long long long long ptr) >-128 stub VarWeekdayName # stdcall (long long long long ptr) >+128 stdcall VarWeekdayName(long long long long ptr) > 129 stdcall VarMonthName(long long long ptr) > 130 stdcall VarUI1FromI2(long ptr) > 131 stdcall VarUI1FromI4(long ptr) > > This should be included in the first patch. -- Rob Shearman

1 0

Re: [oleaut32 1/3] Implements function varformat:VarWeekdayName
by Robert Shearman 25 Jul '06

25 Jul '06

Benjamin Arai wrote: > /********************************************************************** >+ * VarWeekdayName [OLEAUT32.128] >+ * >+ * Print the specified month as localized name. >+ * >+ * PARAMS >+ * iWeekday [I] day number of week 0 = sys default, 1 = Monday, etc >+ * fAbbrev [I] 0 - full name, !0 - abbreviated name >+ * iFirstDay [I] first day week, 0 = sys default, 1 = Monday, etc >+ * dwFlags [I] flag stuff. only VAR_CALENDAR_HIJRI possible. > > s/flag stuff/flags/ >+ >+ size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, NULL, 0); >+ if (!size) { >+ FIXME("GetLocaleInfo 0x%lx failed.\n", localeValue); > > This should be an ERR instead. >+ return E_INVALIDARG; > > I don't think this is a good error code to return here. Even E_UNEXPECTED would be better, although perhaps HRESULT_FROM_WIN32(GetLastError()) would be the best. >+ } >+ str = HeapAlloc(GetProcessHeap(),0,sizeof(WCHAR)*size); >+ if (!str) >+ return E_OUTOFMEMORY; >+ size = GetLocaleInfoW(LOCALE_USER_DEFAULT,localeValue, str, size); >+ if (!size) { >+ FIXME("GetLocaleInfo of 0x%lx failed in 2nd stage?!\n", localeValue); >+ HeapFree(GetProcessHeap(),0,str); >+ return E_INVALIDARG; > > Ditto for the above two comments; -- Rob Shearman

1 0

Re: usp10: Resend - Add funtionality for ScriptStringAnalyse
by Alexandre Julliard 25 Jul '06

25 Jul '06

Jeff L <lats(a)yless4u.com.au> writes: > + psssa = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(Scriptstringanalysis)); > + *pssa = (Scriptstringanalysis*)psssa; Please try to find better names for your variables, don't name everything pssa or psssa or pssap etc. Also please use underscores to separate words in identifiers so that they are readable. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Remove unused "ignore" field in widl structures
by Dan Hipschman 25 Jul '06

25 Jul '06

On Mon, Jul 24, 2006 at 11:49:35AM -0700, Dan Hipschman wrote: > > This field is superfluous: > > [widl]$ find -name "*.[chly]" | xargs fgrep -n ignore > ./parser.y:1049: t->ignore = parse_only; > ./parser.y:1126: f->ignore = parse_only; > ./widltypes.h:208: int ignore, is_const, sign; > ./widltypes.h:238: int ignore, idx; > ./parser.tab.c:3841: t->ignore = parse_only; > ./parser.tab.c:3918: f->ignore = parse_only; This patch has been obsoleted by the patch, "widl [1/2]: Fix redefinition of types in output (take 2)," here: <http://www.winehq.org/pipermail/wine-patches/2006-July/028998.html>, which rather than removing the ignore field, puts it to use.

1 0

Cursor patches
by H. Verbeet 24 Jul '06

24 Jul '06

Attached to this mail are a couple of patches that should fix some issues with mouse cursors. It would be nice if some people could have a look and see if the patches break anything. Patches 1-4 move cursors into the server, 5 adds support for Xcursor cursors, 6 & 7 are cleanups, 8 fixes loading of .cur cursors, 9 adds support for animated cursors and 10 adds support for 32bpp cursors.

4 9

Re: Possible bug in Wine or NDISWRAPPER
by gslink 24 Jul '06

24 Jul '06

The most common problem with Ndiswrapper is that it requires more than a 4k stack. The result you are getting may be coming from a stack overflow caused by a combination of Wine and Ndiswrapper. Compile and install the native drivers for your lan card and see if that makes a difference. The signal strength icon will also start working.

3 5

Re: wcmd: strip quotes around executable and retry on error
by Thomas Kho 24 Jul '06

24 Jul '06

On 7/6/06, Thomas Kho <tkho(a)ucla.edu> wrote: > wcmd: strip quotes around executable and retry on error > wcmd currently gives a 'File not found' error for the command: > `./wine wcmd /c "notepad test.txt"` because it only tries to execute the > program "notepad text.txt". In XP, cmd.exe starts notepad.exe with test.txt as > its argument upon not finding a "notepad text.txt" executable. Hi, Is there something wrong with this patch? http://www.winehq.org/pipermail/wine-patches/2006-July/028367.html Thanks, Thomas Kho

3 4

How do I get the unix filename for a wine handle?
by wino＠piments.com 24 Jul '06

24 Jul '06

>> Currently I'm working on a scan-after-write functionality: Whenever a >> file was changed the virusscanner checks the file. My plan is to hook in NtWriteFile() (dlls/ntdll/file.c), because whenever a windows program writes to a file this function is called. why not scan-before-write? you have a hook into the write process, why not block the write if you have a hit?

1 0

Re: usp10: Implement and test ScriptCacheGetHeight. (rediffed)
by Jeff Latimer 24 Jul '06

24 Jul '06

Hans, I don't think that your test was applied, only the function was. Jeff Hans Leidekker wrote: >Lotus Notes calls this one. See bug 4944. > > -Hans > >Changelog > Implement and test ScriptCacheGetHeight. > > >------------------------------------------------------------------------ > >bd39fa31f57846d1fd50aebd9425a739e6c74d9e >diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c >index cbaf44a..51f967a 100644 >--- a/dlls/usp10/tests/usp10.c >+++ b/dlls/usp10/tests/usp10.c >@@ -561,6 +561,40 @@ static void test_ScriptString(void) > } > } > >+void test_ScriptCacheGetHeight(void) >+{ >+ HRESULT hr; >+ HDC hdc; >+ HWND hwnd; >+ SCRIPT_CACHE sc = NULL; >+ LONG height; >+ >+ hwnd = CreateWindowExA(0, "static", "", WS_POPUP, 0, 0, 100, 100, 0, 0, 0, NULL); >+ assert(hwnd != 0); >+ >+ hdc = GetDC(hwnd); >+ ok(hdc != NULL, "HDC failed to be created\n"); >+ >+ hr = ScriptCacheGetHeight(NULL, NULL, NULL); >+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08lx\n", hr); >+ >+ hr = ScriptCacheGetHeight(NULL, &sc, NULL); >+ ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got 0x%08lx\n", hr); >+ >+ hr = ScriptCacheGetHeight(NULL, &sc, &height); >+ ok(hr == E_PENDING, "expected E_PENDING, got 0x%08lx\n", hr); >+ >+ height = 0; >+ >+ hr = ScriptCacheGetHeight(hdc, &sc, &height); >+ ok(hr == S_OK, "expected S_OK, got 0x%08lx\n", hr); >+ >+ ok(height > 0, "expected height > 0\n"); >+ >+ ReleaseDC(hwnd, hdc); >+ DestroyWindow(hwnd); >+} >+ > START_TEST(usp10) > { > unsigned short pwOutGlyphs[256]; >@@ -570,4 +604,5 @@ START_TEST(usp10) > test_ScriptGetFontProperties(); > test_ScriptTextOut(); > test_ScriptString(); >+ test_ScriptCacheGetHeight(); > } > >

3 8

Re: [kernel] Add dummy HeapSetInformation, take 2
by Dmitry Timoshkov 24 Jul '06

24 Jul '06

"Dan Kegel" <dank(a)kegel.com> wrote: > Changelog: > include/winnt.h: add enum HEAP_INFORMATION_CLASS > kernel/heap.c: add dummy HeapSetInformation() > +enum _HEAP_INFORMATION_CLASS { > + HeapCompatibilityInfo > +}; PSDK uses Information not just short Info at the end. -- Dmitry.

1 0

Re: usp10: Add funtionality for ScriptStringAnalyse
by Detlef Riekenberg 24 Jul '06

24 Jul '06

Jeff wrote: > + if (psssa->pssap->psva) > + HeapFree(GetProcessHeap(), 0, psssa->pssap->psva); > + if (psssa->pssap->piAdvance) > + HeapFree(GetProcessHeap(), 0, > psssa->pssap->piAdvance); > + if (psssa->pssap->pGoffset) > + HeapFree(GetProcessHeap(), 0, > psssa->pssap->pGoffset); > + if (psssa->pssap->pwOutGlyphs) > + HeapFree(GetProcessHeap(), 0, > psssa->pssap->pwOutGlyphs); A NULL-Pointer is handled by HeapFree() and we cleaned up similar unneeded "if " - tests recently. Thanks. -- By By ... ... Detlef

2 1

Re: winnt.h: Add more SID defines.
by Detlef Riekenberg 23 Jul '06

23 Jul '06

Robert Reif wrote: > +#define SECURITY_LOGON_IDS_RID_COUNT 3L The other defines in your Patch use SPACE. Thanks. -- By By ... ... Detlef

1 0

RE: Winlib - Active Scripting
by Luc-Eric Rousseau 23 Jul '06

23 Jul '06

thanks. Are there any known issue with the native microsoft WSH (Windows Scripting Host)DLL under wine? Has this this been done with a WineLib app in the past? > -----Original Message----- > From: daniel.r.kegel(a)gmail.com [mailto:daniel.r.kegel@gmail.com]On > > 2) one application we'd like to port uses active scripting > (VBScript). Basically we wrote some features in VBScript, > which in turn automating our application (like macros in > Photoshop CS). What would be our options for this if we were > to use WinLib? (MainWin ships with VBscript and JScript) > > Wine doesn't currently support VBScript (unless you install > WSH from Microsoft). > That could be added, but it'd be a substantial effort.

4 4

Re: WineHQ.org will be moving to a new server today.
by Juan Lang 23 Jul '06

23 Jul '06

Hey Newman--for me, at least, the whole site is _much_ zippier. Love it. Thanks for all the work! --Juan

6 5

Re: msvcrt: fix crash in _execl
by Dmitry Timoshkov 23 Jul '06

23 Jul '06

Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> wrote: > @@ -225,9 +225,12 @@ MSVCRT_intptr_t CDECL _execl(const char* > char * args; > MSVCRT_intptr_t ret; > > - va_start(ap, arg0); > - args = msvcrt_valisttos(arg0, ap, ' '); > - va_end(ap); > + if(arg0) > + { > + va_start(ap, arg0); > + args = msvcrt_valisttos(arg0, ap, ' '); > + va_end(ap); > + } > > ret = msvcrt_spawn(MSVCRT__P_OVERLAY, name, args, NULL); > MSVCRT_free(args); I wonder whether compiler was complaining that args might be used not initialized, what is the case when arg0 is NULL. -- Dmitry.

1 0

NTDLL_from_server_timeout and CreationTime / ExitTime
by Stefan Siebert 22 Jul '06

22 Jul '06

hello, I've seen that my patch (Implementation of CreationTime and ExitTime for GetProcessTimes / NtQueryInformationProcess) now uses NTDLL_from_server_timeout for abs_time_t conversion to large integer. I wasn't using it as it doesn't explicitly said it's doing that thing and the function name was incorrect in the patches context. Maybe we should rename NTDLL_from_server_timeout (ntdll/times.c) to something like NTDLL_abstime_conversion_large_integer for better understanding ? - Stefan

1 0

Antialiased text
by Segin 22 Jul '06

22 Jul '06

One new thing I have found with Wine 0.9.17 is the inclusion of anitaliased text. Winecfg et. al. now have their text antialiased. I don't know if this is a new feature (i'll go dig in the ChangeLogs), but it is a significant improvement in the user experience. -- The real problem with C++ for kernel modules is: the language just sucks. -- Linus Torvalds

1 0

Re: Asynchronous Direct3D rendering design sugeestion
by H. Verbeet 22 Jul '06

22 Jul '06

On 20/07/06, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > for us. The reason why it doesn't are apparently drawStridedSlow and the > brute force setting of gl states. The debugging facilies seem to have really > bad effects on performance too. Well, that should be fixed anyway, of course. > Yet I think some things should be done, like having vertex and pixel format > fixups in a seperate thread, or shader perhaps compilation. The D3D objects > have to be protected with critical sections too. I think that should be dependant on whether the device was created with D3DCREATE_MULTITHREADED or not. I'm not sure how much can be gained by moving shader compilation into it's own thread, but I suppose it's worth some tests.

2 1

Re: wined3d: Fix regression from dynamic constants patch
by Ivan Gyurdiev 22 Jul '06

22 Jul '06

> > There were plenty of ways to fix this. One would have been to unroll > all of the memset/memcpy calls into functions that explicitly set > every value on the stateblock. While this might have been more > "correct", it would be harder to maintain. I argue that an explicit initializer is always better than an implicit one. An implicit initializer is basically programmer laziness imho (I consider myself very lazy :) When you add a new feature, you should check its initialization one way or the other - can't rely on calloc assumptions, the code has to be verified. So, while you're doing that, it's easy to add an initializer. > Plus, we might lose some performance from numerous sets vs. > a single memset routine. Code correctness, clarity and reliability is much more important than any performance considerations imho. Saving 1 cpu cycle here or there does not matter in the long run. > So, I chose to make the number of constants more fixed again (less > dynamic). The number of available constants is now capped at 256, > which is the minimum required number for shader model 3.0. Software shaders require 8192 constants. They're not supported right now, but that gives you an idea of how many we need to support. Anyway, I'm not sure which way is better - maybe you're right that making things dynamic is not worth the trouble. However, I think that shows lack of flexibility in the stateblock, and if we ever need to make other things dynamic in the future we might run into the same issue. > The app > will use the min() of 256 and the number reported by the card So it uses the lower value? How come?

2 1

Re: wine-devel Digest, Vol 12, Issue 71
by Yuriy 22 Jul '06

22 Jul '06

Uh-oh. I'm already well into making this. I guess we have a little mis-/lack-of communication. https://wiki.kubuntu.org/KDEGuidanceWineSpec As for ideas/testing -- yes please! It's part of guidance in kde svn. http://websvn.kde.org/trunk/playground/base/guidance/?rev=563975#dirlist ~Yuriy > Date: Thu, 20 Jul 2006 10:48:55 -0600 > From: "Brian Vincent" <brian.vincent(a)gmail.com> > Subject: KDE Wine Kcontrol module > To: "Wine Develop" <wine-devel(a)winehq.org> > Cc: davidsansome(a)gmail.com, kevin.krammer(a)gmx.at > Message-ID: > <3010968c0607200948v6f4f634avdcdbbbf4515ff069(a)mail.gmail.com> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > I just noticed KDE accepted a project for their "Season of KDE" > program for a Wine KControl module: > http://developer.kde.org/seasonofkde/project.php?kde_wine.xml > > Not sure if anyone from Wine wants to get in contact with the author, > but we might be able to help out with ideas / testing / etc. For > example, the two things that come to mind are that it should implement > everything in winecfg and also have a button to pop up regedit. Maybe > it should also be able to pop up taskmgr too. > > -Brian Vincent

3 3

Re: wined3d: Implement more GLSL instructions
by Chris 21 Jul '06

21 Jul '06

On Friday 21 July 2006 11:19, Jason Green wrote: > + /* Calculate reflection vector (Assume normal is normalized): RF = 2*(N.E)*N -E */ > + shader_addline(buffer, "tmp0.w = dot(vec3(tmp0), %s);\n", src1_str); > + shader_addline(buffer, "tmp0 = tmp0.w * tmp0;\n"); > + shader_addline(buffer, "tmp0 = (2.0 * tmp0) - %s;\n", src1_str); I'm hardly an expert, but couldn't this be simplified to: shader_addline(buffer, "tmp0 = reflect(-%s, vec3(tmp0));\n", src1_str);

2 1

Wine f0.9.17 fails to build
by Segin 21 Jul '06

21 Jul '06

Well, it seems that we have a bit of a problem building Wine 0.9.17 on Gentoo... make[2]: Entering directory `/var/tmp/portage/wine-0.9.17/work/wine-0.9.17/dlls/gphoto2.ds' ../../tools/makedep -I. -I. -I../../include -I../../include -I/usr/include/gphoto2 -I/usr/include -I/usr/include/gphoto2 -I/usr/include -C. capability.c ds_ctrl.c ds_image.c gphoto2_main.c ui.c rsrc.rc /usr/include/io.h:29: config.h must not be included by a header file make[2]: *** [depend] Error 1 make[2]: Leaving directory `/var/tmp/portage/wine-0.9.17/work/wine-0.9.17/dlls/gphoto2.ds' make[1]: *** [gphoto2.ds/__depend__] Error 2 make[1]: Leaving directory `/var/tmp/portage/wine-0.9.17/work/wine-0.9.17/dlls' make: *** [dlls/__depend__] Error 2 I don't know if this is my fault, or what, because I have recently reinstalled gphoto2 from scratch. -- The real problem with C++ for kernel modules is: the language just sucks. -- Linus Torvalds

1 0

ntdll: Heap implementation has a performance bottleneck
by Michael Kaufmann 21 Jul '06

21 Jul '06

Hi, I have discovered that Wine's heap implementation (HeapAlloc(), HeapFree(), etc. in dlls/ntdll/heap.c) is very slow if many small memory blocks are allocated and freed. Somebody has reported this before: http://www.winehq.org/pipermail/wine-devel/2005-February/034095.html HomeSite's syntax checker needs 120 seconds to load on Wine because of Wine's poor heap implementation. Most users will think that the program has crashed. I have created a trace of HomeSite's memory requests and a program to replay them. For details and performance measurements, please look at bug 5709 ( http://bugs.winehq.org/show_bug.cgi?id=5709 ). According to the source code, Wine's heap implementation is described in the book "Windows 95 System Programming Secrets". This implementation is inefficient: KB225099 ( http://support.microsoft.com/kb/225099/en-us ) says that the heap implementation of Windows NT 4.0 SP4 and 2000 is much better than the heap implementation of Windows 95. Does anybody know some details about the heap implementation of Windows NT/2000/XP ? Regards, Michael

3 3

Re: [kernel] add dummy HeapSetInformation()
by Robert Shearman 21 Jul '06

21 Jul '06

dank(a)vroo.pair.com wrote: > /*********************************************************************** >+ * HeapSetInformation (KERNEL32.@) >+ * Change options for a given heap. >+ * >+ * NOTES >+ * All options are ignored. >+ * >+ * RETURNS >+ * TRUE: Success >+ * FALSE: Failure >+ */ >+BOOL WINAPI HeapSetInformation( >+ HANDLE heap, /* [in] Handle to the heap */ >+ DWORD class, /* [in] enum describing which option to set */ >+ LPCVOID poption, /* [in] Pointer to option value */ >+ DWORD optionlen /* [in] Length of option value */ >+) { >+ /* Only option available is Low Fragmentation Heap, which >+ * is just a performance thing. Allow but ignore; this should let >+ * Lionhead Studios' Black & White 2 run. >+ */ >+ return TRUE; >+} >+ > > You should make this function print a fixme and a minor nitpick that NOTES should probably be BUGS instead. -- Rob Shearman

4 3

Re: wined3d: Fix for for vertex shaders
by Ivan Gyurdiev 21 Jul '06

21 Jul '06

> + /* Make sure the fog value is positive - values above 1.0 are ignored */ > + if (reg_maps->fog) > + shader_addline(&buffer, "MAX result.fogcoord, TMP_FOG, 0.0;\n"); > + > What do you mean by "values above 1.0 are ignored" ? Why does the GLSL implementation of this clamp between 0 and 1, and the ARB implementation only does a lower bound ? (sorry, I don't remember if you responded when I asked this last time)

1 0

KDE Wine Kcontrol module
by Brian Vincent 20 Jul '06

20 Jul '06

I just noticed KDE accepted a project for their "Season of KDE" program for a Wine KControl module: http://developer.kde.org/seasonofkde/project.php?kde_wine.xml Not sure if anyone from Wine wants to get in contact with the author, but we might be able to help out with ideas / testing / etc. For example, the two things that come to mind are that it should implement everything in winecfg and also have a button to pop up regedit. Maybe it should also be able to pop up taskmgr too. -Brian Vincent

2 1

Wine, cygwin, X, and ssh working pretty well these days...
by Dan Kegel 20 Jul '06

20 Jul '06

To my surprise, I was able to verify a Wine bugfix today even though I'm in a hotel room with a Windows-only laptop. cygwin's X server worked like a champ, and I was able to ssh into my development box, git pull, build, and install and run a windows app fine remotely. It was just a bit slow, but I'm not complaining!

1 0

WineHQ.org will be moving to a new server today.
by Jeremy Newman 20 Jul '06

20 Jul '06

Starting today at 2pm CDT winehq.org will be moving to a new ISP. At the same time I am moving everything over to new server hardware. This means we will be having some DNS issues for the next week or so. It really depends on how quickly your ISP's DNS servers catch the changes. As a workaround if you DNS is stale and you still need access to CVS/git/etc you can add the following to your /etc/hosts file 209.46.25.134 www.winehq.org cvs.winehq.org source.winehq.org bugs.winehq.org appdb.winehq.org wine.codeweavers.com Note: The above is all one line. Just remember to remove that after a week or so. I will also have a redirect setup from the old IP to a temporary hostname of www2.winehq.org at the new IP. This will allow the website to be available to everyone else. Lastly, Bugzilla and the Appdb will be down slightly longer as that is the last thing I will be copying over to the new server.

1 0

getwinegit.sh v0.4 released!
by Christian Lachner 20 Jul '06

20 Jul '06

Hello all, There's a new Version of getwinegit.sh. It is now at 0.4. There is no need to comfigure the pathes to the programs getwinegit needs. Everything happens automatically now ;). I hope you enjoy this release... Here's the readme and the changelog: getwinegit.sh-README :: Intro getwinegit is a script which was designed to download/update, compile and install the current wine-source-tree from a git-repository. :: Usage Usage: getwinegit.sh mode [config-file] modes: -0 update the local source-tree -1 + compile the source -2 + install -3 no update; just compile the local source-tree and install -4 no update, no compile; just install -h help ;) The Config-File is optional :: Install Just copy getwinegit.sh wherever you want, make it executable and (optionally) create a softlink at /usr/bin. Then (or before) configure the script by editing the variables in the head with your favourite editor. APP The name of the app which's sources we want to fetch and compile GITROOT The GIT-Repository from where we want to fetch the sources SRC Your Source-Directory (default is /usr/src) TARGET The Sub-Directory where the sources will get stored LOG Location of the Logfile that getwinegit.sh creates PIDFILE Location of the PID-File COMPILED_HELPER A dirty File which is needed to detect, if the source is already compiled or not WAIT_FOR_CLEAN Seconds to wait until the script begins to clean the source. 0 = disabled (default is 5) DEFAULT_MODE The Mode in which getwinegit.sh should operate if NO Parameter is given. (default is 2) By default this Feature is commented out. To enable, remove the rhomb at the beginning of the line. getwinegit.sh needs some packages to function properly. Go install the following ones: gcc, make, curl, bison, flex, git. I hope i did not forget any. :: Future? This is one of the last versions. No great changes are planned, only bugfixes. :: Bugs? Report them to wine-devel or wine-users ;) getwinegit.sh ChangeLog 0.4 Long time no see, but now it's time, isn't it? - More Checks - The Script now tells you if you are already up-to-date with the git-repository - Cleanups :) - Some small Bugfixes

1 0

Asynchronous Direct3D rendering design sugeestion
by Stefan Dösinger 20 Jul '06

20 Jul '06

Hi, (warning: long mail) Currently the wined3d code is doing more or less syncronous rendering, that means that a Direct3D function call from the app results directly results in the equivalent opengl call(s). There are a few issues with that: * Multithreaded Direct3D: Opengl calls can only be done from the thread that owns the glX context. Direct3D calls can be done from any thread. Passing around the context is only possible with hacks(SetThreadContext or pthread_kill) and prone to deadlocks. * Performance: Applications expect the 3D calls to return immediately so they can do other things while the gpu is rendering. GL works in the same way, so our Direct3D rendering functions should return almost immediately too, but due to the state changes and drawStridedSlow seem to cause gl to wait until the pipeline is empty. My suggestion is to create a per-device thread which does the rendering and owns the thread, and the rendering calls only place some tokens into a queue and return immediately. This way the app gets the control back immediately and multithreaded direct3d is only about locking the queue correctly. The rendering thread and all rendering code would be in drawprim.c(and maybe a new file e.g. opengl_utils.c). The other files would contain no gl code. Here are some more concrete suggestions for implementing this: The pipeline is a block of memory with a fixed size(e.g. 64k, whatever), and the work orders that are placed in it consist of an opcode and any number of arguments. A NULL opcode means that the place is empty. When a new operation doesn't fit at the bottom of the pipeline we start again. A instruction pointer points at the opcode of the next instruction. If the next opcode is NULL that means that the pipeline is empty. When an instruction was executed the memory of the instruction is zeroed and the instruction pointer set to the next byte after the old instruction. A new instruction doesn't fit into the pipeline if it would overwrite nonzero memory, then we issue a warning and wait until some more space is free. A little modification would be to fix the number of arguments to an opcode. Checking for emtpy instructions would be easier then because we only have to check if the address holding the operation code is NULL and not the whole memory when placing a new instruction, but on the other hand waste memory. Of course we can HeapAlloc the instructions and place pointers to the allocated memory. That doesn't waste memory(maybe, depends on how HeapAlloc works), but imposes the overhead of regular HeapAlloc / HeapFree calls. So what instructions would we need? Everything that issues GL calls. Here are some I could think of and some implementation thoughts: SetRenderState: IWineD3DDevice::SetRenderState sets the update stateblock, and if not recording to a stateblock places a SETRENDERSTATE operation. Arguments are the render state to set and the value to set it to. When the instruction from the pipeline is exectured the value is set in the actual render stateblock and the gl state is updated with the code that is in setrenderstate already. IWineD3DDevice::GetRenderState returns the value from the update stateblock, so it is independent from the execution state of the pipe. SetTextureStageState: Arguments are the stage, state and value, otherwise it is simmilar to SetRenderState SetStreamSource, SetTexture, Set*Shader: Update the update state block, update the refcounts and if not recording queue a setting operation for the stream/texture/shader. This operation updates the render state block, but does not necessarilly change the gl setting(e.g. SetTexture requires texture coords in the vertex too) The Getters return the values stored in the update state block. SetDisplayMode, GetDisplayMode: Not GL calls SetClipPlane, SetMateral, SetLight, SetLightenable, SetTransform, MultiplyTransform, SetViewport: Pretty simple, update the updatestateblock, ... SetFVF, SetVertexDeclaration: Updates the update stateblock and queues a SetDeclaration operation. The declaration is stored in the render stateblock and referenced for rendering. I'd suggest that the render thread should not deal with FVFs Set*ShaderConstant: No idea UpdateTexture, UpdateSurface: No idea either. Maybe relay to DirectDraw Blits ApplyStateBlock: Compare the stateblock contents against the updatestateblock, update the updatestateblock and queue Set* commands for different ones Surface Locking: Set up the local memory for the surface, and if necessary issue a command to read back the surface from gl. Wait for this command to be executed and wait until the last command referencing the surface is finished. If a surface is locked often keep the local memory copy to avoid flushing the whole pipeline for the readback command. When the surface memory is ready pass return Surface unlocking: If necessary start converting the surface e.g. for color keying in a seperate thread and return. If the surface is used for drawing before the conversion is complete the rendering thread has to wait until the conversion is finished. Uploading the surface to gl is done during drawprim when the surface is used. Vertex Buffer locking: Simmilar to surface locking. If neither NOOVERWRITE or DISCARD locking flags are provided wait until all rendering with the buffer is done. Then return the buffer data. We may have to give up the idea of mapping gl memory via glMapBuffer or we might have to wait for the whole pipeline to be executed to place a command for that. Unlocking vertex buffers: If the semantics of the data is known start fixing up vertices in a seperate thread. When done fixing up the buffer place a preload command into the pipeline to load the buffer as early as possible, some gl implementations seem to need that. Again if the buffer is used for drawing until the conversion is done the drawing thread has to wait. Also convert buffers if no vbos are available to get rid of drawStridedSlow completely. Drawprim: This is the most complex thing: First, check if all bound textures and vertex buffers are unlocked(Unit test!). Then increase the rendering reference counter of all textures and buffers(to count how often the object is used in the queue). Then queue a drawprim command and return. If drawing from a user pointer we either have to wait until drawing is done or create a copy before placing the call(this is my favorite, we can fixup colors too while we're at it) Blits: Find out if the blit can be handled in opengl and queue a blit call(which will draw a textured quad). If gl can't handle that fall back to the gdi code, it will perform everything in software, from a gl perspective surface locks are done. This is slow, we will want to handle everything in gl. GetDC: At the moment this is a LockRect from the gl pov, we may want to write a gl gdi driver which queues commands on the pipeline Present: Queue a FLIP command and wait for the pipeline to be emptied, then return. Ideally the rendering is done when Present is called and present returns immediately. Destroying objects: Wait until they aren't needed in the pipeline anymore in Release. Open issues: SetRenderTarget: Afaik those have their own gl context. Should we have a different pipeline or request the worker to switch to a different gl context? Synchonisation is a issue Multiple swapchains: Simmilar issue Anything I forgot? How do we reference objects in the pipeline? For the start I'd suggest to use the implementation pointer, later we may want to replace it by handles(to avoid issues with the pointer size on 64 bit). See the roadmap. My suggestion for the roadmap: 1) Start by protecting the ddraw, d3d8 and d3d9 objects with critical sections against race conditions(easy). 2) Move the code around in wined3d a bit, split up COM from GL stuff without actually changing the way rendering is done. 3) Add a stub pipeline and add code queing the command 4) Move the context into the worker thread and call the actual gl commands from there Additional stuff that can be done if we feel like it: * Get rid of COM in wined3d * Move non-rendering things like Private Data, Stateblocks and Getters into ddraw, d3d8 and d3d9, leave only rendering code in wined3d. The software ddraw code has to stay in wined3d though * Adopt ddi, ddentry or whatever is used in windows xp / vista(Potential legal issues as these interfaces aren't well documented). Stefan

2 1

Re: dinput8 Dll(Un)RegisterServer
by Roderick Colenbrander 20 Jul '06

20 Jul '06

Hi, A couple of weeks ago I have been working on dinput8. I implemented the CoCreateInstance code and other pieces. The first time I did the registering code the same way but this isn't correct. On windows the dinput8 objects are registered when directx is installed. Alexandre preferred it to put the stuff in wine.inf. My patch which also included a big testcase for dinput8 did this but wasn't merged. I didn't have time the past few weeks to clean it up, I was actually planning to do it this week. Tombraider legend worked 'fine' using the dinput8 at the time, I believe something broke in the latest version. At the time the main issue was that there was no keyboard or mouse input (forgot which of the two). For some reason I think based on 'device caps' tombraider wasn't calling Acquire for one of the devices. I traced it very deeply (I even wrote a dinput8->native dinput8 wrapper and verified it there). I was planning to contact Core Design about this. Regards, Roderick Colenbrander > Sorry I doesn't atteched the patch. > Hi, > > I implemented (taken from wine's dinput directory, modified) dinput8's > DllRegisterServer, and DllUnRegisterServer functions, which will register > dinput8, and dinputdevice8 co-classes. > With this patch Tomb Raider Legends go further, then crashes again with > builtin dinput. > Applies to current cvs. > > Changelog: > * Implement Dll(Un)RegisterServer > -- > Lamarr > Kovács András > andras(a)csevego.net > http://csevego.net -- Echte DSL-Flatrate dauerhaft für 0,- Euro*! "Feel free" mit GMX DSL! http://www.gmx.net/de/go/dsl

1 0

Lotus native on Linux
by Fabian Cenedese 20 Jul '06

20 Jul '06

Hi I just got this newsletter, thought I'd share it here: >At my previous job, everyone in the company was forced to use Lotus Notes. I recall being often annoyed with the Notes e-mail client for its clumsy user interface and appalling lack of features (to say nothing of its crummy calendar). The moment the platform supported POP3 mail clients, I switched to Netscape Messenger. > >But regardless of my personal feelings about Notes, the platform eventually earned my respect. The Notes developers on our IT staff built and maintained several excellent applications exclusively for my department. We used those applications regularly, along with our trading partners, and we quickly came to depend on them. The power of Notes as a collaborative platform is clear to anyone who uses it in this way. > >On Monday, a Notes client will be available for Linux. That s right. Companies will be able to <http://www-128.ibm.com/developerworks/lotus>download Lotus Notes on Linux 7.0.1, an Eclipse plug-in that delivers Notes client functionality to Linux workstations. This includes the crummy e-mail and calendar (which themselves are custom Notes apps), and other collaboration software, as well as your company s own custom applications that once ran only on Mac OS and Windows desktops. Initial support will be for Red Hat Enterprise Linux 4, update 3, but IBM promises a version for Novell SUSE Linux Desktop 10 within 90 days. > >Pricing starts at US$101 per client plus another $70 per client for messaging. Current Mac OS and Windows licenses can be transferred. > >But don t be looking to code your Notes apps on a Linux box. For that, you ll have to wait for the full Eclipse implementation code-named Hannover which IBM says should be at milestone 3 (public beta) by this fall. Hannover will implement RCP under Eclipse 3.2, and will introduce Notes to support for the OpenDocument format (ODF) spec from OASIS. IBM expects general availability the first half of 2007. > >Why did IBM wait so long to develop a Linux-based client? We were waiting for Eclipse to be ready, said Arthur Fontaine, IBM s senior offering manager. The company did not want to add a third code base to the MacOS and Windows bases it was already maintaining. > >IBM sees an opportunity to enter the Linux desktop market with a lower-cost alternative to Mac OS and Windows operating systems, Fontaine added. Among the subtler messages IBM is sending, he said, is that we re changing to a new client software development model. This has been evidenced by the Eclipse-ification of its Rational tools and later this year its Sametime 7.5 instant messaging client. This sends a message that IBM is attacking the deficit of desktop apps that Linux suffers. > >Love or hate it, Lotus Notes usage in the enterprise remains strong. And stronger still are the prospects of enterprise desktop Linux. For more coverage of this important story, see the upcoming Aug. 1 issue of SD Times. > >Contact me at <mailto:ecorreia@bzmedia.com>ecorreia(a)bzmedia.com. > >Edward J. Correia bye Fabi

2 1

Re: advapi32: partial LookupAccountSid implementation
by Robert Reif 20 Jul '06

20 Jul '06

Robert Reif wrote: > Implement some more of LookupAccountSidW for local computer. > Make LookupAccountSidA use LookupAccountSidW. > Add debugstr_sid for local debugging. Please hold off on this patch. It seems to have a problem. It passed the windows compiled tests but I am seeing a problem with the tests when ported to the wine tests framework.

1 0

Free Trial of Auto Assault available for download.
by Hans Kristian Rosbach 20 Jul '06

20 Jul '06

https://secure.plaync.com/cgi-bin/free_trial.pl?partner=10 Remember to enter your email address at the bottom of the page to actually receive a free trial key. Then start the trial ~1GB (or full version ~3GB) download. While downloading you create an account at plaync. Press the add game link in account management, enter the serial key you should have in your email by now. When the game is added, you might still have to "activate" the game from the account management screen. Once these steps are done you should be able to attempt an install and play this very new and fun game. I have not tested to run this under wine, but thought some others might want to. The game was released this easter and resembles the good old Carmageddon games, only MMORPG. No credit-card necessary for this trial luckily. I hope this will drive wine development forward, good luck! PS: You might not want to create the plaync account before you have seen that you can make the game install, or else you might be wasting a good 14 day trial. In any case, you can install, start the game and get into the first menu without having an account. And even that might be a challenge for wine . -HK

1 0

Re: Test Framework for WIDL [1/2]
by Dan Hipschman 19 Jul '06

19 Jul '06

On Wed, Jul 19, 2006 at 02:09:45PM -0700, Dan Hipschman wrote: > > This sets up a regression testing framework for WIDL (it could be used > in other places, too). You'll need the next patch to actually do "make > test" in tools/widl/tests, but this patch contains the test script and > list of test cases. The test cases contain all the header files used by > Wine that are generated from IDL files. Note that the TLB files are > commented out for now since they contain a timestamp and hence can't be > directly compared with known good copies. It's still better to at least > have a test for the headers and work on getting a test for the TLB files > soon. I wanted to clarify something. Please note that this test framework is only comparing the current output of widl with the future output of widl. It's not comparing any Windows files, and it's possible that the output of widl could change in the future and still be correct. My main motivation here is that the current IDL files used by Wine only use a small set of features, so having a tests like this allows us to more confidently add new features to widl and be sure we aren't breaking anything on which Wine depends.

1 0

race condition in dinput's multiple joystick code and IL2
by Christoph Frick 19 Jul '06

19 Jul '06

hi there, the code i submitted some weeks ago about having more than one /dev/input/event-joystick shows from time to time a race condition in IL2 Sturmovik. this game is written in java and somehow exe-fied. so the whole thing is running a boatload of threads. my box is a smp-opteron-system with gentoo and a 2.6.17 kernel. my problem is the following (in dlls/dinput/joystick_linuxinput.c): the new code calls a method (find_joydevs) on serveral places which checks by a global variable, whether it ran before (have_joydevs) and then builds up a list of the valid devices (joydevs). so what happes there is a struct is filled on the stack and later memcpy-ied to the end of a (re)alloced (HeapAlloc/HeapRealloc) list. things like the device are strdup'ed from the stack into the struct before copy. so in IL2 often - but not always - the have_joydevs has a count > -1, the joydevs has a pointer. but when it access the "struct" behind it, this is uninitialized memory (at least for the device-member) and random errors occur. so what i have tried so far: - put find_joydevs into a critical section - dont use strdup, but HeapAlloc+lstrcpyA nothing helped. the only other thing that came this morning into my mind but i have not yet tried to change, is the fact, that i malloc the string and store the pointer to it in the struct. next thing is a memcpy of the whole struct, which seems ok to my c-knowledge. so if one of the wine gurus has some tips i would be glad to try them out. -- cu

3 3

RE: Winlib - Active Scripting
by Luc-Eric Rousseau 19 Jul '06

19 Jul '06

Right, there might be legal issues for distribution, but I was thinking in term of getting a port up-and-running quick internally to validate what parts to replace moving forward. I'm particulary interested in Wine for OS X, a plateform MainWin hasn't announced support for. We have a test version of our application up-and-running on linux in 64-bit, however, which if I'm not mistaken isn't possible with Wine at this stage. We do like the idea of customizing the app for each plateform, this is why I am interested in WineLib and having access to the source. > -----Original Message----- > From: Jason Green [mailto:jave27@gmail.com] > > On 7/19/06, Dan Kegel <dank(a)kegel.com> wrote: > > Hi Luc, > > I know of no issues (other than that this would restrict > you to running on x86, > > but perhaps that's not an issue for you). > > I don't think anyone's done it before, but I could be wrong. > > > > On 7/19/06, Luc-Eric Rousseau <lucer(a)softimage.com> wrote: > > > thanks. > > > Are there any known issue with the native microsoft WSH (Windows > > > Scripting Host)DLL under wine? Has this this been done > with a WineLib > > > app in the past? > > If you're planning on distributing this app to customers, there may be > legal licensing issues involved with using those libraries. IANAL, > but just thought I'd give a heads up. > > Jason >

2 1

Re: WineD3D: Split out the call to glDrawPixels
by Jesse Allen 19 Jul '06

19 Jul '06

On 7/17/06, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This patch removes the glDrawPixels calls from IWineD3DSurface::UnlockRect and > creates a new function flush_to_framebuffer_drawpixels for it. > > This is another patch to improve render target locking and support opengl'ed > ddraw better. > > I have disabled the alpha fixups for the X bits, those shouldn't be needed any > more because X don't use alpha any more, but I don't know if opengl gets that > correctly. I have left the code in but commented it out with #if 0 until I > get my hands on Pirates! . Stefan, Pirates still needs the X8R8G8B8 alpha fixup for the intro movie.

1 0

Re: A great way for non programmers to help with Wine - Audio
by Yuriy 19 Jul '06

19 Jul '06

Sound report: Kernel 2.6.15 Sound driver: snd_emu10k1 Sound card: Audigy2 ZS Sound driver description from lspci: Multimedia audio controller: Creative Labs SB Audigy (rev 04) 32 bit Kubuntu 6.06 system Alsa version 1.0.10-4ubuntu4 Tested against Wine 0.9.17 Results: Tested under winealsa and wineoss. Both had slight distortion/stutter between each tone. Alsa runs reported 50 failures. OSS runs reported 74 failures Full log files of the runs attached.

1 0

another wined3d compile fail
by James Hawkins 19 Jul '06

19 Jul '06

make[2]: Entering directory `/home/jhawkins/wine/dlls/wined3d' ... gcc -c -I. -I. -I../../include -I../../include -I/usr/X11R6/include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o directx.o directx.c directx.c: In function `IWineD3DImpl_FillGLCaps': directx.c:553: `GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB' undeclared (first use in this function) directx.c:553: (Each undeclared identifier is reported only once directx.c:553: for each function it appears in.) make[2]: *** [directx.o] Error 1 make[2]: Leaving directory `/home/jhawkins/wine/dlls/wined3d' -- James Hawkins

2 1

RE: winnt32.exe on AMD64
by Ge van Geldorp 19 Jul '06

19 Jul '06

> From: "Nadgir, Ananth P" <ananth.p.nadgir(a)intel.com> > > Does Wine now support executing x64 bit PE executable like > winnt32.exe under amd64 directory? No, the biggest problem is that the 64-bit calling conventions are different between PE executables and Linux executables. Some more info on the Wine64 wiki page http://wiki.winehq.org/Wine64 Ge van Geldorp.

7 10

Re: msi: Use -fno-builtin to avoid warnings with gcc 4.1.1.
by Dan Kegel 19 Jul '06

19 Jul '06

On 7/19/06, Mike McCormack <mike(a)codeweavers.com> wrote: > gcc 4.1.1 seems to have a bug or some new "feature" in that it still > warns about builtin iswalpha, etc having a different prototype to the > msvcrt functions with the same name, even when -fno-builtin-iswalpha is > specified. > > It seems to behave when -fno-builtin is specified though, so I suggest > we change to using that. Can you file a bug report at http://gcc.gnu.org/bugzilla/ ? - Dan

2 4

Re: [SETUPAPI] SetupDiCreateDeviceInfo - try 4
by Mike McCormack 19 Jul '06

19 Jul '06

Christian Gmeiner wrote: > Fixed typo... > > Lets hope its okay now If you want to get it in with less mails, how about splitting it up? First, add the include patch. That's easy, it should go straight in. Second add a stub implementation (with the nice comments headers) for each function you plan to implement. Finally, add the implementation of the functions. Mike

1 0

Re: [Wine] Problems with newest Wine versions (.16, .17)
by Christoph Frick 19 Jul '06

19 Jul '06

On Wed, Jul 19, 2006 at 07:48:17AM -0700, Alex Ferguson wrote: > Here's Planescape's output: > fixme:d3d:IWineD3DDeviceImpl_GetAvailableTextureMem (0x7fd61210) : stub, emulating 64MB for now, returning 64MB > fixme:ddraw:IDirectDrawImpl_SetCooperativeLevel (0x7fd4d940)->(0x10024,00000011) > fixme:xrandr:X11DRV_XRandR_SetCurrentMode Cannot change screen BPP from 32 to 16 > err:d3d_surface:IWineGDISurfaceImpl_PrivateSetup (0x6da5d6d0) IWineD3DSurface::GetDC failed with hr 80070006 > err:ddraw:IDirectDrawImpl_CreateNewSurface IWineD3DDevice::CreateSurface failed. hr = 80070006 > err:ddraw:IDirectDrawImpl_CreateSurface IDirectDrawImpl_CreateNewSurface failed with 80070006 for the files - this is what i get (like all other stuff i run this game in wine's desktop-mode; might this explain another outcome?) trace:ddraw:IDirectDrawImpl_CreateNewSurface (0x7fd358c8) Created IDirectDrawSurface implementation structure at 0x6d326e90 trace:ddraw:IDirectDrawImpl_CreateNewSurface Using Surface interface 0x6d326e90 as parent trace:d3d:IWineD3DDeviceImpl_CreateSurface (0x7fd46638) Create surface trace:d3d:IWineD3DDeviceImpl_GetAvailableTextureMem (0x7fd46638) : emulating 256MB for now, returning 222MB trace:d3d:IWineD3DDeviceImpl_AddResource (0x7fd46638) : resource 0x6d326f70 trace:d3d:IWineD3DDeviceImpl_AddResource Added resource 0x6d326f70 with element 0x6d326cf8 pointing to 0x6d326708 trace:d3d:IWineD3DDeviceImpl_CreateSurface (0x7fd46638) : Created resource 0x6d326f70 trace:d3d:IWineD3DDeviceImpl_CreateSurface Pool 0 0 1 2Creating a surface with a POOL of DEFAULT with Lockable true, that doesn't specify DYNAMIC usage. trace:d3d:IWineD3DDeviceImpl_QueryInterface (0x7fd46638)->({3c2aebf6-6f30-11d9-c687-00046142c14f},0x7fbca964) trace:d3d:IWineD3DDeviceImpl_CreateSurface (0x7fd46638) : w(64) h(64) fmt(23,WINED3DFMT_R5G6B5) lockable(0) surf@0x6d326f70, surfmem@(nil), 8192 bytes err:clipping:CLIPPING_UpdateGCRegion hVisRgn is zero. Please report this. this is the end of a +ddraw,+d3d trace i wanted to use in a bugzilla entry. if somebody is interested, please let me know so i can mail it off-list. -- cu

1 0

git annoyances: how to force git to fetch a particular file
by Dan Kegel 19 Jul '06

19 Jul '06

What's the right way to force a get of a particular file? With cvs, you can just remove the file and do 'cvs update foo.c', but I'm having trouble RTF git M, and the otherwise helpful http://wiki.winehq.org/GitWine doesn't seem to mention this case. (Every so often, it seems like git fetch doesn't get me the latest version of a few files. git diff shows no differences. I assume this is because I've manually patched a file or something, but it'd be nice to know how to deal with this other than throwing away the whole git tree and re-cloning. ) - Dan

6 8

What's wrong in my Trash patches?
by Mikołaj Zalewski 19 Jul '06

19 Jul '06

I've sent patches to implement the trashing of files (starting from http://www.winehq.org/pipermail/wine-patches/2006-July/028782.html ) and they were rejected. Could someone tell me what's wrong with them? Mikolaj Zalewski

2 1

Re: [SETUPAPI] SetupDiCreateDeviceInfo - next try
by Paul Vriens 19 Jul '06

19 Jul '06

On Wed, 2006-07-19 at 15:19 +0200, Christian Gmeiner wrote: > This is my next try to get this patch in... if it gets accepted i am > working > to get SetupDiCreateDeviceInfoW correctly... if something should be > wrong > with this patch, please let me know it > greets, > Christian > >+ if (DeviceNameW) >+ MyFree(DeviceDescriptionW); Typo. Cheers, Paul

1 0

IE and MSN Messenger 7.0
by Alexander Nicolaysen Sørnes 19 Jul '06

19 Jul '06

Hello, In WIne version 0.9.14 and earlier, MSN Messenger can be installed without installing IE6, but starting with 0.9.15, it complains about missing IE unless this is installed. I tested this is the same .wine directory (created by Wine 0.9.17); to my knowledge, registry keys are only created when 'wineprefixcreate' is run, so that means the problem must be somewhere else. My question is: is this a known side-effect due to the ongoing work on builtin IE and WIne's Gecko engine, or is it a nasty regression that should be tracked down? http://www.microsoft.com/downloads/details.aspx?displaylang=en&FamilyID=744… Regards, Alexander N. Sørnes

3 2

Re: "assumed" graphic card memory
by Jesse Allen 19 Jul '06

19 Jul '06

On 7/14/06, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Am Donnerstag 13 Juli 2006 22:07 schrieb Frank Richter: > > I think the article exaggerates. (a) it refers to one driver which > > exhibits the problem - Matrox G400 GL, on Win32. Linux drivers may > > actually all properly support that function. (b) you could use a cap - > > e.g. never report more than 50% of the total system ram as VRAM. Or use > > that as a threshold for a heuristic - if more than that amount of > > textures are reported as "resident", assume the logic is broken. > I tried the sample program on my Linux box (radeon M9, 64 mb vram) and I don't > think that it reported correct values. It said 32 mb textures, not all > resident. While I have a 1400x1050 resolution I don't think it eats 32 mb > vidmem. > Yeah, not at all. Graphics card video ram these days far exceed whats needed for video modes. Just a quick number crunch shows 1400x1050@32bpp only requires approx 5.6MB. Most of the ram is used for textures, I believe. I think the worst case at detecting amount of video ram is stuffing it with textures and guessing how much went in.

3 2

Re: oleaut32:VatCat fixes initialization and conformance test
by qingdoa daoo 19 Jul '06

19 Jul '06

--- Benjamin Arai <me(a)benjaminarai.com>: > Changelog: > - Helps address http://bugs.winehq.com/show_bug.cgi?id=3628 > - Addresses variant initialization and missing conformance test > issues brought up by Qingdoa Daoo > - Fixes VarCat conformance test failures exposed by Rob Shearman: > "oleaut32: Test the return value of VarCat in the tests." > > A test may pass on Windows because it returned without any errors > (S_OK) but on Wine that same test can technically fail but be > misinterpeted as a correct result in Wine if the expected error code > is returned. Temporary variants may be uninitialized before usage in > specific cases causing unexpected results. > Your patch is hard to read without apply first. Could you also attach the two functions you modified in your local tree ( not in patch form ) @@ -2523,8 +2566,8 @@ HRESULT WINAPI VarCat(LPVARIANT left, LP rightvt == VT_UI2 || rightvt == VT_UI4 || rightvt == VT_I8 || rightvt == VT_UI8 || rightvt == VT_INT || rightvt == VT_UINT)) - return DISP_E_BADVARTYPE; - return hres; + return DISP_E_TYPEMISMATCH; + return DISP_E_TYPEMISMATCH; Why the two consecutive "return DISP_E_TYPEMISMATCH" ? ___________________________________________________________ Mp3疯狂搜-新歌热歌高速下 http://music.yahoo.com.cn/?source=mail_mailbox_footer

1 0

Winlib - Active Scripting
by Luc-Eric Rousseau 18 Jul '06

18 Jul '06

Hi, I am starting to investigate if it would be feasible to port some of our applications with WinLib. Presently, we use MainSoft MainWin. I have a few questions: 1) is there a definitive list somewhere what API WinLib implements of Win32, and what it doesn't? I have had some difficulty finding this information. 2) one application we'd like to port uses active scripting (VBScript). Basically we wrote some features in VBScript, which in turn automating our application (like macros in Photoshop CS). What would be our options for this if we were to use WinLib? (MainWin ships with VBscript and JScript) 3) Would the Ole Compound Storage format (StgCreateDocfile) WinLib read/write be binary compatible with the one on Windows? 4) what are the options of an application that embeds the IE web browser control?

2 1

wined3d regression
by Vijay Kiran Kamuju 18 Jul '06

18 Jul '06

Hi, I think todays check-ins related to wined3d broke Guildwars. Now it complains DirectX 8 could not be found and install it. Before showing that dialog box it show some citical section failure. I think the y'days locking fixes broke guildwars :( Have to do regression testing today bye, Vijay

1 0

Re: msi: Implement MsiSetInstallLevel.
by Dan Kegel 18 Jul '06

18 Jul '06

On 7/18/06, Mike McCormack <mike(a)codeweavers.com> wrote: > + * MsiGetLanguage (MSI.@) > + */ > +UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) typo. Do we have a tool that sweeps the source for doc - code mismatches?

2 1

Re: PATCH: Re: prelink check
by Vitaliy Margolen 18 Jul '06

18 Jul '06

Tuesday, July 18, 2006, 3:07:58 AM, Marcus Meissner wrote: > On Tue, Jul 18, 2006 at 10:03:54AM +0200, Alexandre Julliard wrote: >> Marcus Meissner <marcus(a)jet.franken.de> writes: >> >> > It seems the PATH usage of AC_CHECK_PROGS is not taken into account. >> > >> > Adding /usr/sbin/prelink to the checked programs does not help, >> > the check always prepends paths. >> >> Replacing AC_CHECK_PROGS by AC_PATH_PROGS should do the trick. > Yes, it did. > I now get "ntdll.dll.so: Unknown stabs code 0x2e", but this is prelinks > fault. Btw this should be fixed. Just have to wait for the fix to make it to us: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=198203 Vitaliy Margolen

1 0

Some help needed on basic oleacc implementation
by Stefan Siebert 18 Jul '06

18 Jul '06

Hello, currently I'm working to get the Notes Client (7.0.x) running on wine. I've done some work on oleacc and so far it seems to work. As this is my first try on ole maybe someone could help out (ie. reviewing my code and tell me what needs to done), so I don't blame myself on getting this patch checked in. Some info on the internals: The Notes Client is linked against the oleacc.dll. On a call to AccessibleObjectFromWindow there's simply no check if it was successfull (S_OK). Next it calls addref and crashes badly. Normally this should be fixed in the Notes Client itself, but I don't know if someone want's this to be fixed at IBM and if they may such things in the productive code stream (although fixes have been done before in Notes 6.5.1 to get it magically running on wine). - Stefan

1 0

Re: Support SAFEARRAY(type) Syntax in MIDL
by Robert Shearman 18 Jul '06

18 Jul '06

Dan Hipschman wrote: >diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h >index 508284e..ee73ba6 100644 >--- a/tools/widl/widltypes.h >+++ b/tools/widl/widltypes.h >@@ -205,6 +205,7 @@ struct _type_t { > const attr_t *attrs; > func_t *funcs; > var_t *fields; >+ int safearray; > int ignore, is_const, sign; > int defined, written, user_types_registered; > int typelib_idx; > I think this should be implemented by calling reg_types in parser.y with a constructed SAFEARRAY type. This should allow it to be used by the NDR typeformat generation code too. Adding more and more fields to type_t isn't scalable. -- Rob Shearman

1 0

re: ntdll: enable CreateRemoteThread and RtlCreateUserThread for remote processes
by Dan Kegel 18 Jul '06

18 Jul '06

Mike wrote: > ... I'm not sure how this works. You create a new "raw" kernel thread > using clone, then run NT code using it. But that isn't valid and may not > work - only threads created by Wine may use Win32. The right thing to do would be to promote the linux thread to be a win32 thread, but as a temporary stopgap, Thomas had the linux thread just do CreateThread and exit, hoping that the newly create Windows thread was healthy. Maybe we should look more carefully about what it takes to build a normal, healthy win32 thread from a posix thread. > You are using ptrace instead of signals. That seems over complex - > signals are designed to interrupt a thread ... Well, kind of. Signals are only delivered when syscalls return, so they won't work well if the thread you pick to molest happens to not make any syscalls for a long time. (Plus, signals aren't completely reliable... see http://www.opengroup.org/austin/mailarchives/ag/msg07173.html for a 2004 proposal for making signals reliable.) > You don't preserve the register state. Really? What's ptrace(PTRACE_GETREGS, pid, NULL, regs) then, chopped liver? :-) > [Why not queue a windows APC?] Well, if Alexandre thinks that's the way to go, that'd be fine. I thought those only fired when the thread in question performed an alertable wait condition (so says http://msdn.microsoft.com/library/en-us/dllproc/base/queueuserapc.asp ) so it didn't seem like an obvious way to go. - Dan

5 9

Re: [Wine] Re: latest git fails to compile, amstream.c:77: undefined ref to `IID_IUnknown'
by Christoph Frick 18 Jul '06

18 Jul '06

On Tue, Jul 18, 2006 at 09:35:05AM +0200, Christoph Frick wrote: > > Well, I was able to successfully build git revision > > 6a97f2202e91fed286ff6ca254926e5f57ca17c1 so this topic is closed. > this is a problem, that seemed to exist for a few days on gcc32 > compiles. Alexandre fixed this yesterday. please get the current > version. ah i love this mornings, where not a single drop of tea or coffee hit me yet - so excuse my inabillity to read properly ;) -- cu

1 0

IID_IUnknown not defined?
by Christoph Frick 18 Jul '06

18 Jul '06

hiho i build wine nearly every day from cvs. for the last to days i was not able to do so as the first occurences of IID_IUnknown and IID_IClassFactory the compiler thinks they are missing. i can also not find them via tags-file nor grep **/*.h; is there something wrong on my end (as i would expect, because no one else is complaining)? anybody any ideas? -- cu

5 7

Wiki page about getting Notes running on Wine
by Dan Kegel 18 Jul '06

18 Jul '06

As I wrote earlier, I think it's worth polishing up Wine's support for Lotus Notes even though IBM has a Java version of Notes. And it seems that Stefan Seifert is actually trying to get Wine working well in the next two weeks. So I put together a wiki page to coordinate the effort, hope it's useful: http://wiki.winehq.org/LotusNotes

1 1

RE: winnt32.exe on AMD64
by Nadgir, Ananth P 18 Jul '06

18 Jul '06

Thanks for responding guys. >From all these conversations, I gather that, although it may be possible in future, currently there is no support to run x64 PE executables :-( Now I need to find out some alternative means (Dos?/WinPE) to run winnt32.exe to run unattended windows (x64) installation. Ananth -----Original Message----- From: Troy Rollo [mailto:wine@troy.rollo.name] Sent: Tuesday, July 18, 2006 6:35 AM To: wine-devel(a)winehq.org Cc: Jacek Caban; Ge van Geldorp; Nadgir, Ananth P Subject: Re: winnt32.exe on AMD64 On Tuesday 18 July 2006 09:53, Jacek Caban wrote: > It's not enough. We have to be able to call these functions from the > Wine code, call callbacks, COM interfaces etc... These are complications rather than impenetrable barriers. Wine->Wine (and Winelib App->Wine) calls would not need to go through the thunks. Many of the issues involved have already been dealt with for 16<->32 thunking and cross-process COM calls. It's not ideal, but it should be possible. -- Troy Rollo - wine(a)troy.rollo.name

1 0

Re: oleview: Added skeleton for IDL files generation (1/2)
by Jacek Caban 17 Jul '06

17 Jul '06

Hi Piotr, Piotr Caban wrote: > Hi, > > Changelog: > - Added skeleton for IDL files generation > > programs/oleview/main.h | 8 ++++ > programs/oleview/pane.c | 9 ++++ > programs/oleview/typelib.c | 96 > +++++++++++++++++++++++++++++++++++++++++++- > 3 files changed, 111 insertions(+), 2 deletions(-) > > -- > Piotr > > > diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c > index 9eab7c4..8a46c1e 100644 > --- a/programs/oleview/typelib.c > +++ b/programs/oleview/typelib.c > @@ -30,6 +30,15 @@ static const WCHAR wszTypeLib[] = { 'T', > static const WCHAR wszFailed[] = { '<','f','a','i','l','e','d','>','\0' }; > static const WCHAR wszSpace[] = { ' ','\0' }; > static const WCHAR wszAsterix[] = { '*','\0' }; > +static const WCHAR wszComa[] = { ',','\0' }; > +static const WCHAR wszSemicolon[] = { ';','\0' }; > +static const WCHAR wszNewLine[] = { '\n','\0' }; > +static const WCHAR wszOpenBrackets1[] = { '[','\0' }; > +static const WCHAR wszCloseBrackets1[] = { ']','\0' }; > +static const WCHAR wszOpenBrackets2[] = { '(','\0' }; > +static const WCHAR wszCloseBrackets2[] = { ')','\0' }; > + > +static const WCHAR wszUUID[] = { 'u','u','i','d','\0' }; > > static const WCHAR wszVT_BOOL[] > = { 'V','A','R','I','A','N','T','_','B','O','O','L','\0' }; > @@ -61,6 +70,30 @@ void AddToStrW(WCHAR *wszDest, const WCH > lstrcpyW(&wszDest[lstrlenW(wszDest)], wszSource); > } > > +void AddToTLDataStrW(TYPELIB_DATA *pTLData, const WCHAR *wszSource) > +{ > + WCHAR *newIdl; > + int SourceLen = lstrlenW(wszSource); > + > + newIdl = HeapAlloc(GetProcessHeap(), 0, > + sizeof(WCHAR)*(pTLData->idlLen+SourceLen+1)); > + memcpy(newIdl, pTLData->idl, sizeof(WCHAR)*pTLData->idlLen); > + memcpy(&newIdl[pTLData->idlLen], wszSource, sizeof(WCHAR)*(SourceLen+1)); > + pTLData->idlLen += SourceLen; > + HeapFree(GetProcessHeap(), 0, pTLData->idl); > It would be better to use HeapReAlloc here. Jacek

1 0

Re: SetDesktopWallPaper() should call SystemParametersInfoA()
by Dmitry Timoshkov 17 Jul '06

17 Jul '06

"Andrew Ziem" <ahziem1(a)mailbolt.com> wrote: > -static HBITMAP hbitmapWallPaper; > -static SIZE bitmapSize; > -static BOOL fTileWallPaper; > +HBITMAP hbitmapWallPaper; /* desktop wallpaper */ > +SIZE bitmapSize; /* size of desktop wallpaper */ > +BOOL fTileWallPaper; If the varaibles are no more used in this file you should not make static variables public, but move them into appropriate file instead. -- Dmitry.

2 2

Re: [SETUPAPI] SetupDiCreateDeviceInfo
by Paul Vriens 17 Jul '06

17 Jul '06

> This patch implements SetupDiCreateDeviceInfoA and > SetupDiCreateDeviceInfoW as > stub. > > If something should be wrong with this patch, please let me know it :) > > Greets, > Christian > > -- > Christian Gmeiner - student of computer science > > http://dxr3plugin.sf.net > Wanna listen to good music? - http://www.purevolume.com/sinceyouaredead > > Hi Christian, I haven't checked if the logic is corret. But this certainly isn't: >+ if (DeviceDescription) >+ { >+ DeviceDescriptionW = MultiByteToUnicode(DeviceDescription, CP_ACP); >+ if (DeviceNameW == NULL) return FALSE; Shouldn't that be DeviceDescriptionW? >+ if (DeviceNameW) >+ MyFree(DeviceDescriptionW); >+ if (DeviceNameW) >+ MyFree(DeviceDescriptionW); Some typos here as well. Cheers, Paul

2 1

winnt32.exe on AMD64
by Nadgir, Ananth P 17 Jul '06

17 Jul '06

Does Wine now support executing x64 bit PE executable like winnt32.exe under amd64 directory? Thanks, Ananth

1 0

Interview with Alexandre in golem.de, July 5th
by Dan Kegel 17 Jul '06

17 Jul '06

I don't know if this was mentioned yet, but Alexandre had an interview (in german) a couple weeks ago: http://www.pc-magazin.de/common/nws/einemeldung.php?id=46304 The interesting bit for me: Golem.de: Seit die erste Beta-Version von Wine im Oktober 2005 erschienen ist, gibt es nur 0.9.x-Veröffentlichungen anstatt einer Version 1.0. Wie ist der derzeitige Status des Projektes, wie nah sind Sie an etwas, das Sie als 1.0 bezeichnen würden? Alexandre Julliard: Der Kern ist ziemlich stabil und wir haben große Fortschritte bei Installern gemacht, so dass sich die meisten Anwendungen installieren lassen sollten. Dies ist das Hauptziel für 1.0. Derzeit arbeiten wir noch daran, die Spieleunterstützung zu verbessern und ich warte mit der Veröffentlichung von 1.0, bis diese ebenfalls stabil ist. Spiele sind einer der Hauptgründe, weshalb Leute sich Wine anschauen. Also muss die Version 1.0 in dieser Hinsicht so gut wie möglich sein. Translation: Q. Since the first beta in October 2005 appeared, there have only been 0.9.x releases instead of a version 1.0. What's the current status of the project, how close are you to something that you would call 1.0? A. The core is quite stable, and we've made great progress with installers; most applications can now be installed. That's the main goal for 1.0. We're also working on improving support for games, and I'm waiting for that to stabilize before I announce 1.0. Games are one of the main reasons people look at Wine, so version 1.0 has to be as good as possible at running them. - Dan

1 0

ChurchWindows success report
by Dan Kegel 16 Jul '06

16 Jul '06

It's not in CVS yet, but it's so close I can taste it: with just a couple patches yet to be submitted, my poster child Visual Basic app, ChurchWindows, actually starts (see http://bugs.winehq.org/show_bug.cgi?id=3628). Wine is really starting to shape up!

1 0

ntdll: enable CreateRemoteThread and RtlCreateUserThread for remote processes
by Mike Hearn 16 Jul '06

16 Jul '06

[forgot to hit "reply to all" instead of just reply ...] On 7/15/06, Dan Kegel <dank(a)kegel.com> wrote: > The right thing to do would be to promote the linux thread to > be a win32 thread, but as a temporary stopgap, Thomas > had the linux thread just do CreateThread and exit, hoping > that the newly create Windows thread was healthy. Well, I think calling CreateThread directly from the context of the hijacked thread would be simpler, though I understand that gets hairy as well if the hijacked thread is holding (say) the loader lock > Maybe we should look more carefully about what it takes to > build a normal, healthy win32 thread from a posix thread. This has been looked at in the past for sure, but I'm not sure if it's documented anywhere. > Well, kind of. Signals are only delivered when syscalls return, so > they won't work well if the thread you pick to molest happens to > not make any syscalls for a long time. Hm, really? I haven't come across this before ... how then is it possible to debug a program that is sitting in while(1); if SIGSTOP cannot be delivered? Also we already use SIGUSR1 to suspend a thread and that has to work at any point, so maybe it might need to be changed. > > > You don't preserve the register state. > > Really? What's > ptrace(PTRACE_GETREGS, pid, NULL, regs) > then, chopped liver? :-) Oops, my mistake! Sorry Thomas, I didn't see that. If you switch EIP to a register function though you get all this for free ... > Well, if Alexandre thinks that's the way to go, that'd be fine. > I thought those only fired when the thread in question performed > an alertable wait condition (so says > http://msdn.microsoft.com/library/en-us/dllproc/base/queueuserapc.asp ) > so it didn't seem like an obvious way to go. Right but if the thread is suspended then it's waiting, and we could maybe hack it to do an alertable wait. Though doing an alertable wait during a suspend is surely the wrong thing to do in most cases, presumably the server could easily queue an APC itself but not allow other clients to do the same. thanks -mike

2 3

REGRESSION: FUNCFLAG_FRESTRICTED check breaks VisualBasic Collection
by a_villacis＠palosanto.com 16 Jul '06

16 Jul '06

As of 2006-07-14, the CVS snapshot of Wine 0.9.17 broke MS Visual Basic collections, when they ask for the _NewEnum in the _Collection interface. This method is used for the For Each...Next language construct, when applied to collection interfaces implemented in external DLLs (that is, collections compiled inside the same EXE where they are used are not affected). After a little digging I found that a recent patch adds a FUNCFLAG_FRESTRICTED check when looking for appropriate methods in an interface: (from dlls/oleaut32/typelib.c: 5223) /* we do this instead of using GetFuncDesc since it will return a fake * FUNCDESC for dispinterfaces and we want the real function description */ for (pFuncInfo = This->funclist; pFuncInfo; pFuncInfo=pFuncInfo->next) if ((memid == pFuncInfo->funcdesc.memid) && (wFlags & pFuncInfo->funcdesc.invkind) && !(pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED)) <-- breaks VB collections break; If the FUNCFLAG_FRESTRICTED check is removed, the problem is solved. I would normally send in a patch for this, but since this check was deliberately added, there must be some other reason why this check was deemed necessary, so I am sending this notice instead. BTW, this is why the check breaks collections: 0009:trace:ole:dump_TypeInfo 0x7fe99a80 ref=2 0009:trace:ole:dump_TypeInfo L"_Collection" (null) 0009:trace:ole:dump_TypeInfo attr:{00000512-0000-0010-8000-00aa006d2ea4} 0009:trace:ole:dump_TypeInfo kind:TKIND_DISPATCH 0009:trace:ole:dump_TypeInfo fct:3 var:0 impl:1 0009:trace:ole:dump_TypeInfo wTypeFlags: 0x11c0 0009:trace:ole:dump_TypeInfo parent tlb:0x7fe81738 index in TLB:53 L"Count"(1) parm0: L"c" memid is 00000001 Param 0: tdesc.vartype 26 (ptr to VT_I4) u.paramdesc.wParamFlags PARAMFLAG_FOUT PARAMFLAG_FRETVAL u.paramdesc.lpex (nil) funckind: 1 (pure virtual) invkind: 2 (property get) callconv: 4 (stdcall) oVft: 28 cParamsOpt: 0 wFlags: 0 elemdescFunc (return value type): tdesc.vartype 25 (VT_HRESULT) u.paramdesc.wParamFlags PARAMFLAGS_NONE u.paramdesc.lpex (nil) helpstring: (null) entry: (null) L"_NewEnum"(1) parm0: L"ppvObject" memid is fffffffc Param 0: tdesc.vartype 26 (ptr to VT_UNKNOWN) u.paramdesc.wParamFlags PARAMFLAG_FOUT PARAMFLAG_FRETVAL u.paramdesc.lpex (nil) funckind: 1 (pure virtual) invkind: 1 (func) callconv: 4 (stdcall) oVft: 32 cParamsOpt: 0 wFlags: 1 elemdescFunc (return value type): tdesc.vartype 25 (VT_HRESULT) u.paramdesc.wParamFlags PARAMFLAGS_NONE u.paramdesc.lpex (nil) helpstring: (null) entry: (null) L"Refresh"(0) memid is 00000002 funckind: 1 (pure virtual) invkind: 1 (func) callconv: 4 (stdcall) oVft: 36 cParamsOpt: 0 wFlags: 0 elemdescFunc (return value type): tdesc.vartype 25 (VT_HRESULT) u.paramdesc.wParamFlags PARAMFLAGS_NONE u.paramdesc.lpex (nil) helpstring: (null) entry: (null) Many VB programs (especially those dealing with DAO/ADO collections) ask for the _NewEnum method with index fffffffc. However, this method has the FUNCFLAG_FRESTRICTED flag set, as seen from the typelib dump. Alex Villacís Lasso

2 1

Re: advapi32: Add CreateWellKnownSid.
by Robert Shearman 16 Jul '06

16 Jul '06

Robert Reif wrote: >+static const WELLKNOWNSID WellKnownSids[] = >+{ >+ { {' ',' '}, WinNullSid, SID_REVISION, 1, { SECURITY_NULL_SID_AUTHORITY }, { SECURITY_NULL_RID } }, > > Two spaces isn't a very good way of making the entry not be parsed by ParseStringSidToSid. Might I suggest using two nuls instead? -- Rob Shearman

1 0

(off-topic) tomshardware benchmark: Ati vs Nvidia on Linux
by Molle Bestefich 16 Jul '06

16 Jul '06

just in case anyone is interested... http://www.tomshardware.com/2006/07/12/geforce_and_radeon_take_on_linux/

2 1

I need my bearings...
by Segin 16 Jul '06

16 Jul '06

Being out of a Internet connection for a while, could somebody summarize everything important that's happened since... May 15? I don't really want to read 3485 pieces of email I couldn't read during that time I was offline. -- The real problem with C++ for kernel modules is: the language just sucks. -- Linus Torvalds

2 1

Printer fonts
by Duane Clark 15 Jul '06

15 Jul '06

It looks like, when printing via CUPS, if the PPD file for an installed printer does not contain entries (usually at the end of the file) like: *DefaultFont: Courier *Font AvantGarde-Book: Standard "(001.006S)" Standard ROM *Font AvantGarde-BookOblique: Standard "(001.006S)" Standard ROM ... (lots more) Then when Wine goes to create the registry entries for the printers, it prints out messages like: To use WINEPS you need to install some AFM files. fixme:winspool:AddPrinterW DocumentPropertiesW on printer 'L"i560"' fails To use WINEPS you need to install some AFM files. And printing with Wine won't work to that printer. It looks like the PPD files supplied with CUPS contain those entries, so this is not normally a problem. However, some manufacturers supply PPD files that do not have them. In particular, Canon supplies a nice package of files designed for installation into CUPS under Linux: ftp://download.canon.jp/pub/driver/bj/linux The package bjcups-2.4.0 contains this, including PPD files. But the supplied PPD files do not contain the above mentioned entries. Simply copying those entries from, for example, the Wine supplied generic.ppd into the Canon supplied PPD file allows the printer to be installed correctly in Wine and print: http://www.winehq.org/pipermail/wine-users/2006-July/022856.html Looking at the PPD spec version 4.3, the "*Font" entries are not part of the required entries (listed at the beginning of section 5, page 41). The same section does say that "Every feature of the device that can be described by a PPD keyword should be included in the PPD file". So it would appear that Canon perhaps should supply them. On the other hand, the CUPS supplied cupstestppd flags the file as "PASS". It seems to me that Wine probably should work in this case. Would it be acceptable to supply the defaults used in Wine's generic PPD file if they are not in the one being used? I could take a shot at trying to code that if it would be acceptable. Otherwise, I could change the error message to perhaps better explain what the problem is.

1 1

ntdll: enable CreateRemoteThread and RtlCreateUserThread for remote processes
by tkho＠ucla.edu 15 Jul '06

15 Jul '06

ntdll: enable CreateRemoteThread and RtlCreateUserThread for remote processes Greetings, The attached patch is a proof-of-concept for implementing CreateRemoteThread and RtlCreateUserThread for remote processes. It is currently Linux and x86 specific but should be portable to other platforms/OSes with a ptrace-like mechanism. CreateRemoteThread is a wrapper around RtlCreateUserThread, which works as follows: Assume process 1 calls RtlCreateUserThread. This function makes a server call in which ptrace is used to switch execution in a thread in process 2 (say, thread A) to a special function placed in kernel32. The function calls clone() to create a new Linux thread (thread B) and then allows thread A to continue. This hopefully solves any synchronization issues with injecting into thread A. Thread B proceeds to call RtlCreateUserThread to create a thread in its own process and then sets an event to communicate success back to process 1. This is when process 1 returns from RtlCreateUserThread. After this, thread B cleans itself up and exits. I'd like to get any comments on this approach now, as there was lukewarm reception to previous tries at this. Future work includes addressing the FIXMEs sprinkled in the patch and adding the ifdefs to make sure the code path is only turned on in Linux/x86 systems. Thomas Kho --- dlls/kernel/kernel32.spec | 3 + dlls/kernel/thread.c | 168 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/thread.c | 68 ++++++++++++++++ include/wine/server_protocol.h | 31 +++++++ include/winternl.h | 1 server/process.c | 135 ++++++++++++++++++++++++++++++++ server/protocol.def | 21 +++++ server/request.h | 2 server/trace.c | 19 +++++ 9 files changed, 443 insertions(+), 5 deletions(-) Copyright 2006 Google (Thomas Kho) diff --git a/dlls/kernel/kernel32.spec b/dlls/kernel/kernel32.spec index 7369b59..39f5c23 100644 --- a/dlls/kernel/kernel32.spec +++ b/dlls/kernel/kernel32.spec @@ -1239,3 +1239,6 @@ # Unix files # Init code @ cdecl __wine_kernel_init() + +# kernel32 is mapped to the same place in every process +@ cdecl wine_remote_CreateRemoteThread(ptr) diff --git a/dlls/kernel/thread.c b/dlls/kernel/thread.c index bf29aac..09c6dc1 100644 --- a/dlls/kernel/thread.c +++ b/dlls/kernel/thread.c @@ -25,9 +25,11 @@ #include <assert.h> #include <fcntl.h> #include <stdarg.h> #include <sys/types.h> +#include <sys/mman.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif +#include <sched.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -53,6 +55,16 @@ struct new_thread_info LPTHREAD_START_ROUTINE func; void *arg; }; +static struct new_thread_info threadInfo; + + +/* We initially use a small fixed stack for the cloned process + * 1) because only one thread can be created at any time so it is okay and + * 2) if we passed clone an mmap'd stack, there's no way for the cloned thread + * to directly munmap its working stack. */ +static char clone_stack_fixed[4096]; +static char *clone_stack_fixed_ptr; /* stack pointer saved in stack swap */ +static char *clone_stack_dyn; /* dynamically allocated stack */ /*********************************************************************** @@ -62,7 +74,7 @@ struct new_thread_info */ static void CALLBACK THREAD_Start( void *ptr ) { - struct new_thread_info *info = ptr; + struct new_thread_info *info = &threadInfo; LPTHREAD_START_ROUTINE func = info->func; void *arg = info->arg; @@ -83,6 +95,152 @@ static void CALLBACK THREAD_Start( void } +/* Creates thread and sets an event to signal to originating processs */ +static int wine_cloned_thread_create_thread(void *arg) +{ + /* FIXME args need a proper data structure */ + struct new_remote_thread_request *args = arg; + HANDLE hNewThread; + CLIENT_ID cidNewThread; + NTSTATUS status; +#if 0 + printf("inside wine_cloned_thread_creator, " + "params (%x, %x, %x, %x, %x, %x, %x, %x, %x, %x)\n", + args->suspended, args->stack_addr, + args->stack_reserve, args->stack_commit, args->start, args->param, + args->event, args->src_process, args->handle_ptr, args->id); +#endif + status = RtlCreateUserThread( GetCurrentProcess(), NULL, args->suspended, + args->stack_addr, args->stack_reserve, + args->stack_commit, args->start, + args->param, + args->handle_ptr ? &hNewThread : 0, + args->id ? &cidNewThread : 0); + /* args->src_process is a duplicate of NtCurrentProcess() created in the + * server and has all access rights */ + if (args->handle_ptr) + { + HANDLE hRemoteNewThread; + DuplicateHandle(GetCurrentProcess(), hNewThread, args->src_process, + &hRemoteNewThread, 0, 0, + DUPLICATE_SAME_ACCESS|DUPLICATE_CLOSE_SOURCE); + printf("writing handle %x\n", hRemoteNewThread); + WriteProcessMemory(args->src_process, args->handle_ptr, + &hRemoteNewThread, + sizeof(HANDLE), NULL); + } + if (args->id) + { + if (cidNewThread.UniqueProcess) + { + HANDLE hRemoteProcess; + DuplicateHandle(GetCurrentProcess(), cidNewThread.UniqueProcess, + args->src_process, &hRemoteProcess, 0, 0, + DUPLICATE_SAME_ACCESS|DUPLICATE_CLOSE_SOURCE); + cidNewThread.UniqueProcess = hRemoteProcess; + } + if (cidNewThread.UniqueThread) + { + HANDLE hRemoteThread; + DuplicateHandle(GetCurrentProcess(), cidNewThread.UniqueThread, + args->src_process, &hRemoteThread, 0, 0, + DUPLICATE_SAME_ACCESS|DUPLICATE_CLOSE_SOURCE); + cidNewThread.UniqueThread = hRemoteThread; + } + WriteProcessMemory(args->src_process, args->id, &cidNewThread, + sizeof(CLIENT_ID), NULL); + } + + printf("SetEvent %s, error=%d\n", + SetEvent(args->event) ? "succeeded" : "failed", GetLastError()); + CloseHandle(args->event); + CloseHandle(args->src_process); + printf("RtlCreateUserThread status %x in wine_cloned_thread_creator\n", + status); + return 0; +} + + +/* Entry-point for cloned thread. */ +static int wine_cloned_thread(void *arg) +{ + const int clone_stack_size = 1<<18; /* 256K */ + void *clone_stack_dyn = mmap(0, clone_stack_size, + PROT_READ|PROT_WRITE|PROT_EXEC, + MAP_ANONYMOUS|MAP_SHARED, 0, 0); + + /* save current stack pointer */ + asm("movl %%esp, %0" + : "=r"(clone_stack_fixed_ptr) + ); + + /* swap in larger dynamic stack */ + asm("movl %0, %%esp" + : + : "r"(clone_stack_dyn + clone_stack_size) + : "%esp"); + + wine_cloned_thread_create_thread(arg); + + /* replace old stack pointer */ + asm("movl %0, %%esp" + : + : "r"(clone_stack_fixed_ptr) : + "%esp"); + + munmap(clone_stack_dyn, clone_stack_size); + return 0; +} + + +/*********************************************************************** + * wine_remote_CreateRemoteThread (KERNEL32.@) Not a Windows API + * + * We need to be careful not to perturb anything as we don't know when this + * code takes over a process. + */ +int wine_remote_CreateRemoteThread( unsigned int suspended, + void *stack_addr, + unsigned int stack_reserve, + unsigned int stack_commit, + void *start, void *param, + obj_handle_t event, + obj_handle_t src_process, + void *handle_ptr, + void *id) +{ + struct new_remote_thread_request *args = clone_stack_fixed + + sizeof(clone_stack_fixed) + - sizeof(struct new_remote_thread_request); + int c_tid; +#if 0 + printf("inside wine_remote_CreateRemoteThread, " + "params (%x, %x, %x, %x, %x, %x, %x, %x, %x, %x)\n", + suspended, stack_addr, stack_reserve, stack_commit, + start, param, event, src_process, handle, id); +#endif + args->suspended = suspended; + args->stack_addr = stack_addr; + args->stack_reserve = stack_reserve; + args->stack_commit = stack_commit; + args->start = start; + args->param = param; + args->event = event; + args->src_process = src_process; + args->handle_ptr = handle_ptr; + args->id = id; + /* args is bottom of stack and a pointer to arguments */ + c_tid = clone(wine_cloned_thread, args, + CLONE_VM|CLONE_FILES|CLONE_FS, args); + if (c_tid == -1) + printf("clone failed!\n"); + else + printf("in parent, child is %d\n", c_tid); + asm("int3"); /* break execution, return to tracer */ + return 0; +} + + /*********************************************************************** * CreateThread (KERNEL32.@) */ @@ -130,6 +288,14 @@ HANDLE WINAPI CreateRemoteThread( HANDLE info->func = start; info->arg = param; + /* FIXME need to implement serialization of this class of calls... + * which means the write and thread creation below should happen after + * getting a mutex from the remote process + * + * Until then, Create[Remote]Thread is _NO LONGER_ reentrant */ + WriteProcessMemory(hProcess, &threadInfo, info, + sizeof(struct new_thread_info), NULL); + if (flags & STACK_SIZE_PARAM_IS_A_RESERVATION) stack_reserve = stack; else stack_commit = stack; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 10cb72b..7e94230 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -380,8 +380,72 @@ NTSTATUS WINAPI RtlCreateUserThread( HAN if( ! is_current_process( process ) ) { - ERR("Unsupported on other process\n"); - return STATUS_ACCESS_DENIED; + typedef void (*thread_creator_fcn_type)(unsigned int stack_size, + void *start_address, + void *param, + unsigned int flags); + static FARPROC thread_creator_fcn = NULL; + HANDLE hThreadCreatedEvent; + + status = NtCreateEvent(&hThreadCreatedEvent, EVENT_ALL_ACCESS, NULL, + FALSE, FALSE); /* FIXME check this */ + + if (!thread_creator_fcn) + { + HMODULE hkernel32; + UNICODE_STRING module; + ANSI_STRING function; + WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2', + '.','d','l','l',0}; + RtlInitUnicodeString(&module, kernel32W); + RtlInitAnsiString(&function, "wine_remote_CreateRemoteThread"); + if (LdrGetDllHandle(0, 0, &module, &hkernel32) == STATUS_SUCCESS) + LdrGetProcedureAddress(hkernel32, &function, 0, + (void**)&thread_creator_fcn); + else + return STATUS_DLL_NOT_FOUND; + printf("using thread_creator_fcn in kernel32 at 0x%08x\n", + (unsigned) thread_creator_fcn); + } + + SERVER_START_REQ( new_remote_thread ) + { + req->handle = process; + + req->suspended = suspended; + req->stack_addr = stack_addr; + req->stack_reserve = stack_reserve; + req->stack_commit = stack_commit; + req->start = start; + req->param = param; + req->thread_creator_fcn = thread_creator_fcn; + /* these two handles are duplicated in the server + * and forwarded to the remote process */ + req->event = hThreadCreatedEvent; + req->src_process = NtCurrentProcess(); + req->handle_ptr = handle_ptr; + req->id = id; + + printf("remote op, " + "params (%x, %x, %x, %x, %x, %x, %x, %x, %x, %x)\n", + req->suspended, req->stack_addr, req->stack_reserve, + req->stack_commit, req->start, req->param, req->event, + req->src_process, req->handle_ptr, req->id); + + status = wine_server_call( req ); + } + SERVER_END_REQ; + + if (!status) + { + printf("waiting...\n"); + NtWaitForSingleObject(hThreadCreatedEvent, FALSE, NULL); + printf("got handle %x\n", *handle_ptr); + } + + printf("RtlCreateUserThread status=0x%08x\n", (unsigned) status); + NtClose(hThreadCreatedEvent); + return status; } if (pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fc9e616..0a6f428 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3925,6 +3925,32 @@ struct query_symlink_reply }; + +struct new_remote_thread_request +{ + struct request_header __header; + obj_handle_t handle; + + unsigned int suspended; + void* stack_addr; + unsigned int stack_reserve; + unsigned int stack_commit; + void* start; + void* param; + void* thread_creator_fcn; + + obj_handle_t event; + obj_handle_t src_process; + + void* handle_ptr; + void* id; +}; +struct new_remote_thread_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -4149,6 +4175,7 @@ enum request REQ_create_symlink, REQ_open_symlink, REQ_query_symlink, + REQ_new_remote_thread, REQ_NB_REQUESTS }; @@ -4378,6 +4405,7 @@ union generic_request struct create_symlink_request create_symlink_request; struct open_symlink_request open_symlink_request; struct query_symlink_request query_symlink_request; + struct new_remote_thread_request new_remote_thread_request; }; union generic_reply { @@ -4605,8 +4633,9 @@ union generic_reply struct create_symlink_reply create_symlink_reply; struct open_symlink_reply open_symlink_reply; struct query_symlink_reply query_symlink_reply; + struct new_remote_thread_reply new_remote_thread_reply; }; -#define SERVER_PROTOCOL_VERSION 242 +#define SERVER_PROTOCOL_VERSION 4 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/include/winternl.h b/include/winternl.h index c8aa3ed..76da612 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2243,7 +2243,6 @@ extern NTSTATUS wine_nt_to_unix_file_nam UINT disposition, BOOLEAN check_case ); extern NTSTATUS wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ); - /*********************************************************************** * Inline functions */ diff --git a/server/process.c b/server/process.c index 0c71540..587c7b2 100644 --- a/server/process.c +++ b/server/process.c @@ -22,12 +22,15 @@ #include "config.h" #include "wine/port.h" #include <assert.h> +#include <errno.h> #include <limits.h> +#include <linux/user.h> #include <signal.h> #include <string.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> +#include <sys/ptrace.h> #include <sys/time.h> #ifdef HAVE_SYS_SOCKET_H # include <sys/socket.h> @@ -36,6 +39,7 @@ #include <unistd.h> #ifdef HAVE_POLL_H #include <poll.h> #endif +#include <sys/wait.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -1081,3 +1085,134 @@ DECL_HANDLER(wait_input_idle) release_object( process ); } } + +/* FIXME invert vararg stack-push order so calls to ptrace_remote_call don't + * need to have the arguments inverted */ +int ptrace_remote_call(struct user_regs_struct *regs, int pid, void *fcn, + int n_args, ...) +{ + va_list ap; + struct user_regs_struct oldregs; + + printf("attaching to process with pid %d\n", pid); + if (ptrace(PTRACE_ATTACH, pid, NULL, NULL) == -1) + goto errorbeforeattach; + + wait(NULL); + if (ptrace(PTRACE_GETREGS, pid, NULL, regs) == -1) + goto error; + + memcpy(&oldregs, regs, sizeof(struct user_regs_struct)); + + regs->eip = (int) fcn; + + /* cdecl */ + va_start(ap, n_args); + while (n_args--) + { + regs->esp -= 4; + if (ptrace(PTRACE_POKEDATA, pid, regs->esp, va_arg(ap, void *)) == -1) + goto error; + } + regs->esp -= 4; + va_end(ap); + + /* prevent the kernel from restarting the system call. + * see i386_linux_write_pc() in gdb/i386-linux-tdep.c of gdb */ + regs->orig_eax = -1; + + if (ptrace(PTRACE_SETREGS, pid, NULL, regs) == -1) + goto error; + if (ptrace(PTRACE_CONT, pid, NULL, NULL) == -1) + goto error; + + wait(NULL); + if (ptrace(PTRACE_GETREGS, pid, NULL, regs) == -1) + goto error; + + /* eax has pointer to allocated memory */ + //printf("mem allocated in target process at 0x%08x\n", (unsigned) regs->eax); + if (ptrace(PTRACE_SETREGS, pid, NULL, &oldregs) == -1) + goto error; + if (ptrace(PTRACE_DETACH, pid, NULL, NULL) == -1) + goto error; + + return 0; + +error: + printf("error!\n"); + ptrace(PTRACE_DETACH, pid, NULL, NULL); + set_error( STATUS_INVALID_PARAMETER ); + return -1; + +errorbeforeattach: + printf("error before attach!, errno=%d\n", errno); + set_error( STATUS_INVALID_PARAMETER ); + return -1; +} + +/* Accept parameters for remote operation and start it */ +DECL_HANDLER(new_remote_thread) +{ +#if defined(linux) && defined(__i386__) + int access; + struct process *process; + struct thread *thread; + int pid; + struct user_regs_struct regs; + struct process *src, *dst; + obj_handle_t dupevent = NULL, dupprocess = NULL; + + /* define required access rights */ + /* FIXME check these */ + access = PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION + | PROCESS_VM_OPERATION | PROCESS_VM_READ | PROCESS_VM_WRITE; + + /* get process object */ + if (!(process = get_process_from_handle( req->handle, access ))) + return; + + thread = get_process_first_thread(process); + pid = thread->unix_pid; + release_object(process); + +#if 0 + printf("remote op, " + "params (%x, %x, %x, %x, %x, %x, %x, %x, %x, %x)\n", + req->suspended, req->stack_addr, + req->stack_reserve, req->stack_commit, req->start, + req->param, req->event, req->src_process, + req->handle, req->id); +#endif + + if ((src = get_process_from_handle(0xffffffff, 0))) + { + if ((dst = get_process_from_handle(req->handle, 0))) + { + dupevent = duplicate_handle(src, req->event, + dst, 0, 0, + DUPLICATE_SAME_ACCESS); + dupprocess = duplicate_handle(src, req->src_process, + dst, 0, 0, + DUPLICATE_SAME_ACCESS); + release_object( dst ); + printf("successfully duplicated as %x\n", req->event); + } + release_object( src ); + } + + ptrace_remote_call(&regs, pid, req->thread_creator_fcn, 10, + req->id, + req->handle_ptr, + dupprocess, + dupevent, + req->param, + req->start, + req->stack_commit, + req->stack_reserve, + req->stack_addr, + req->suspended); +#else + set_error( STATUS_NOT_IMPLEMENTED ); +#endif +} diff --git a/server/protocol.def b/server/protocol.def index 6e0b6d8..de832a1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2768,3 +2768,24 @@ #define MAILSLOT_SET_READ_TIMEOUT 1 @REPLY VARARG(target_name,unicode_str); /* target name */ @END + + +/* Accept parameters for remote operation and start it */ +@REQ(new_remote_thread) + obj_handle_t handle; /* process handle */ + + unsigned int suspended; + void* stack_addr; + unsigned int stack_reserve; + unsigned int stack_commit; + void* start; + void* param; + void* thread_creator_fcn; + + obj_handle_t event; + obj_handle_t src_process; + + void* handle_ptr; + void* id; +@REPLY +@END diff --git a/server/request.h b/server/request.h index 317bb0c..531b0e2 100644 --- a/server/request.h +++ b/server/request.h @@ -332,6 +332,7 @@ DECL_HANDLER(open_directory); DECL_HANDLER(create_symlink); DECL_HANDLER(open_symlink); DECL_HANDLER(query_symlink); +DECL_HANDLER(new_remote_thread); #ifdef WANT_REQUEST_HANDLERS @@ -560,6 +561,7 @@ static const req_handler req_handlers[RE (req_handler)req_create_symlink, (req_handler)req_open_symlink, (req_handler)req_query_symlink, + (req_handler)req_new_remote_thread, }; #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index ea40286..3259211 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3416,6 +3416,22 @@ static void dump_query_symlink_reply( co dump_varargs_unicode_str( cur_size ); } +static void dump_new_remote_thread_request( const struct new_remote_thread_request *req ) +{ + fprintf( stderr, " handle=%p,", req->handle ); + fprintf( stderr, " suspended=%08x,", req->suspended ); + fprintf( stderr, " stack_addr=%p,", req->stack_addr ); + fprintf( stderr, " stack_reserve=%08x,", req->stack_reserve ); + fprintf( stderr, " stack_commit=%08x,", req->stack_commit ); + fprintf( stderr, " start=%p,", req->start ); + fprintf( stderr, " param=%p,", req->param ); + fprintf( stderr, " thread_creator_fcn=%p,", req->thread_creator_fcn ); + fprintf( stderr, " event=%p,", req->event ); + fprintf( stderr, " src_process=%p,", req->src_process ); + fprintf( stderr, " handle_ptr=%p,", req->handle_ptr ); + fprintf( stderr, " id=%p", req->id ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -3639,6 +3655,7 @@ static const dump_func req_dumpers[REQ_N (dump_func)dump_create_symlink_request, (dump_func)dump_open_symlink_request, (dump_func)dump_query_symlink_request, + (dump_func)dump_new_remote_thread_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -3864,6 +3881,7 @@ static const dump_func reply_dumpers[REQ (dump_func)dump_create_symlink_reply, (dump_func)dump_open_symlink_reply, (dump_func)dump_query_symlink_reply, + (dump_func)0, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4089,6 +4107,7 @@ static const char * const req_names[REQ_ "create_symlink", "open_symlink", "query_symlink", + "new_remote_thread", }; static const struct

2 1

re: add userenv.h
by Dan Kegel 15 Jul '06

15 Jul '06

Dmitry wrote: > Vijay wrote: >> If you think i need to send a newer patch, i will send it monday. > >I hope that Alexandre won't accept this and other patches of a similar >"style". Indeed. Vijay, your best bet at this point is probably to file bug reports in bugs.winehq.org for the compilation errors you're trying to fix. How many of your previous cvs contributions were similarly "modified" from Microsoft headers? - Dan

2 2

Imperialism II - Take 2
by Martin Owens 15 Jul '06

15 Jul '06

OK the screen shot is attached, so is the log, but I can't make much out of it it's very small even with the WINE_DEBUG=+ddraw,+d3d7 Demo: http://www.download.com/Imperialism-II-demo/3000-2119_4-904359.html Screenshot: http://www.postmaster.co.uk/fs/doctormo/Public//imperialismII_screenshot.png trace:ddraw:DllMain (0x7f540000,8,(nil)) trace:ddraw:DllMain (0x7f540000,1,0x1) trace:ddraw:DllMain Attach counter: 1 fixme:mci:MCI_LoadMciDriver Couldn't load driver for type L"CDAUDIO". If you don't have a windows installation accessible from Wine, you perhaps forgot to create a [mci] section in system.ini trace:ddraw:DirectDrawEnumerateExA Enumerating default DirectDraw HAL interface trace:ddraw:DirectDrawEnumerateExA End of enumeration trace:ddraw:DllGetClassObject ({d7b70ee0-4340-11cf-b063-0020afc2cd35},{00000001-0000-0000-c000-000000000046},0x7fb9fd78) trace:ddraw:IDirectDrawClassFactoryImpl_CreateInstance (0x7fd42220)->((nil),{9c59509a-39bd-11d1-8c4a-00c04fd930c5},0x7e031588) trace:ddraw:CF_CreateDirectDraw ((nil),{9c59509a-39bd-11d1-8c4a-00c04fd930c5},0x7e031588) trace:ddraw:DDRAW_Create ((null),0x7e031588,(nil)) trace:ddraw:DDRAW_Create WineD3D created at 0x7fd427c0 trace:ddraw:DDRAW_Create wineD3DDevice created at 0x7fd42bc0 fixme:d3d:IWineD3DDeviceImpl_GetAvailableTextureMem (0x7fd42bc0) : stub, emulating 64MB for now, returning 64MB trace:ddraw:IDirectDrawImpl_QueryInterface (0x7fd42568)->({9c59509a-39bd-11d1-8c4a-00c04fd930c5},0x7e031588) trace:ddraw:IDirectDrawImpl_QueryInterface (0x7fd42568) Returning IDirectDraw4 interface at 0x7fd4256c trace:ddraw:IDirectDrawImpl_AddRef (0x7fd42568) : incrementing from 1. trace:ddraw:IDirectDrawImpl_Release (0x7fd42568)->() decrementing from 2. trace:ddraw:IDirectDrawClassFactoryImpl_Release (0x7fd42220)->() decrementing from 1. trace:ddraw:IDirectDrawImpl_Initialize (0x7fd42568)->((null)): No-op trace:ddraw:IDirectDrawImpl_EnumDisplayModes (0x7fd42568)->(0x7fb9fd44,0x7fb9fd43,0x40220c): Relay fixme:mci:MCI_LoadMciDriver Couldn't load driver for type L"CDAUDIO". If you don't have a windows installation accessible from Wine, you perhaps forgot to create a [mci] section in system.ini fixme:mci:MCI_LoadMciDriver Couldn't load driver for type L"AVIVIDEO". If you don't have a windows installation accessible from Wine, you perhaps forgot to create a [mci] section in system.ini fixme:mci:MCI_LoadMciDriver Couldn't load driver for type L"AVIVIDEO". If you don't have a windows installation accessible from Wine, you perhaps forgot to create a [mci] section in system.ini fixme:advapi:GetFileSecurityW (L"C:\\Program Files\\imp2\\Save\\slotA.imp") : returns fake SECURITY_DESCRIPTOR fixme:advapi:GetFileSecurityW (L"C:\\Program Files\\imp2\\Save\\slotA.imp") : returns fake SECURITY_DESCRIPTOR fixme:advapi:SetFileSecurityW (L"C:\\Program Files\\imp2\\Save\\MFC7ba1.tmp") : stub If anyone would like to guide me to how to fix this issue, I have the cvs checked out and this was taken with the latest checkoiut. Thanks Best Regards, Martin Owens

1 0

Re: oleaut32: Conformance test and patch for VarCat
by qingdoa daoo 15 Jul '06

15 Jul '06

--- qingdoa daoo <qingdao33122(a)yahoo.com> wrote: > --- Benjamin Arai <me(a)benjaminarai.com> wrote: > > > See http://bugs.winehq.com/show_bug.cgi?id=5545 > > License: LGPL > > > > Changelog: > > - oleaut32: Add conformance test for VarCat > > - oleaut32: Update VarCat function to address all conformance test > > failures > > - Tests all pass on Windows XP SP2 and Wine > > > > > >From 61bbc58d652c97b70309c0fd37107e60cbaad86a Mon Sep 17 00:00:00 2001 > > From: Benjamin Arai <barai(a)barai.smo.corp.google.com> > > Date: Mon, 10 Jul 2006 09:12:46 -0700 > > Subject: [PATCH] oleaut32:VarCat - Adds conformance test and updates VarCat to pass > all > > tests > > --- > > dlls/oleaut32/tests/vartest.c | 319 +++++++++++++++++++++++++++++++++++++++++ > > dlls/oleaut32/variant.c | 150 +++++++++++++++---- > > 2 files changed, 439 insertions(+), 30 deletions(-) > > > > diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c > > index e8e4654..ba7ba84 100644 > > --- a/dlls/oleaut32/tests/vartest.c > > +++ b/dlls/oleaut32/tests/vartest.c > === message truncated ===> > > > > Be careful when you call VariantClear. Calling VariantClear on a random value is > dangerous. > > Specifically, > Before a local variable is initialzed its content is undefined. > When a function call fails the content of the output buffer is usually undefined. > Another problem. Your test for VarCat won't catch many cases in which native returns S_OK while our code fails. hres = VarCat(&left, &right, &result); ...... if (hres != S_OK) { HRESULT expected_error_num; ...... The test may pass on Windows because the hres is S_OK and on Wine because hres is the expected error num according to our test code. ___________________________________________________________ 抢注雅虎免费邮箱-3.5G容量，20M附件！ http://cn.mail.yahoo.com

2 1

Re: [userenv] add userenv.h
by Dmitry Timoshkov 15 Jul '06

15 Jul '06

"Vijay Kiran Kamuju" <infyquest(a)gmail.com> wrote: > ChangeLog > ---------------- > Add userenv.h for userenv.dll It appears that you have blindly copied the PSDK header contents, that's not allowed. Moreover some things required for proper compilation with and without UNICODE defined are missing. -- Dmitry.

2 2

Re: Empty "what was tested", "what was not" fields
by Tony Lambregts 15 Jul '06

15 Jul '06

Jonathan Ernst wrote: > Le jeudi 13 juillet 2006 à 23:06 -0600, Tony Lambregts a écrit : > >> Change log: Don't allow empty "what works", "what was tested" and "what was not" >> fields again ;^) >> >> Files Changed: include/testData.php >> >> >> > > I think we should trim s and sH variables in filter.php, it seems more > correct to me. > > Something like the attached patch... > That is a good idea but that does not solve the problem with the fields in test results since we cannot and do not use include/filter.php because of problems with xinha variables. I do not see a problem with this patch going in but for now we need my patch as well. -- Tony Lambregts

2 1

re: Juan Lang : msi: Let caller set property in AppSearch.
by Dan Kegel 15 Jul '06

15 Jul '06

Juan, http://winehq.org/pipermail/wine-cvs/2006-July/024546.html may have caused http://bugs.winehq.org/show_bug.cgi?id=5680 could you have a look?

1 0

Re: msi breakage
by Juan Lang 15 Jul '06

15 Jul '06

Damn. Boneheadedness. That should be: if (rc == ERROR_SUCCESS && !value) throughout ACTION_AppSearch. I'll submit a patch on Monday. --Juan

1 0

setup_dos_mem error dutifully reported
by Michael Ost 15 Jul '06

15 Jul '06

As of wine-0.9.16 my winelib app now prints this message at startup: err:dosmem:setup_dos_mem Cannot use first megabyte for DOS address space, please report Quick googling finds an old closed bug about this here: http://bugs.winehq.org/show_bug.cgi?id=2062 Is this important? Is there any more info I can provide? ... mo

1 0

bugzilla admin
by James Hawkins 15 Jul '06

15 Jul '06

Hey, Who has control over bugzilla accounts? I can't remember. Thanks, James Hawkins

5 6

Re: Question regarding VT_INT in oleaut32
by qingdoa daoo 15 Jul '06

15 Jul '06

--- qingdoa daoo <qingdao33122(a)yahoo.com> wrote: > --- Benjamin Arai <me(a)benjaminarai.com> wrote: > > > Hi, > > > > I wrote a conformance test for oleaut32:VariantChangeType but I ran > > into a snag. The conformance test under windows does not allow the > > conversion from type VT_INT to VT_I8 but it does allow for VT_I4 to > > VT_I8. I made the necessary changes to VariantChangeType so that it > > conforms to windows but in doing so, it has broken several functions > > that use VariantChangeType to coerce from VT_INT to VT_I8 cause > > several conformance tests to fail as a result. > > > > Is it reasonable to fix the now failing functions in wine by > > converting VT_INT to VT_I4 before coercing in the broken > > functions? This will fix the conformance tests but I want to make > > sure that we can assume VT_INT is a 4 byte integer before > > proceeding. Any help is greatly appreciated. > > > > Benjamin Arai me(a)benjamianrai.com > > > > > > > > I think we can wait until a real world app breaks because it rely on this. > I doubt if it will happen because native oleaut32 from win2000 doesn't seem > to support VT_I8 at all. > You can make a note in some wine source file to document your findings. > CC to wine-devel ___________________________________________________________ Mp3疯狂搜-新歌热歌高速下 http://music.yahoo.com.cn/?source=mail_mailbox_footer

1 0

Question regarding VT_INT in oleaut32
by Benjamin Arai 14 Jul '06

14 Jul '06

Hi, I wrote a conformance test for oleaut32:VariantChangeType but I ran into a snag. The conformance test under windows does not allow the conversion from type VT_INT to VT_I8 but it does allow for VT_I4 to VT_I8. I made the necessary changes to VariantChangeType so that it conforms to windows but in doing so, it has broken several functions that use VariantChangeType to coerce from VT_INT to VT_I8 cause several conformance tests to fail as a result. Is it reasonable to fix the now failing functions in wine by converting VT_INT to VT_I4 before coercing in the broken functions? This will fix the conformance tests but I want to make sure that we can assume VT_INT is a 4 byte integer before proceeding. Any help is greatly appreciated. Benjamin Arai me(a)benjamianrai.com

2 1

msi: Download the MSI package if it is a remote URL [try3]
by Dan Kegel 14 Jul '06

14 Jul '06

James wrote: + GetUrlCacheEntryInfoW( szUrl, NULL, &size ); + if ( GetLastError() != ERROR_FILE_NOT_FOUND ) Is it really ok to check GetLastError() to see if there's been an error? I thought successful operations did not affect the value of GetLastError(). Something like int succeeded = GetUrlCacheEntryInfoW( szUrl, NULL, &size ); if (succeeded) seems cleaner to me. - Dan

1 0

DirectDraw Issues continue
by Martin Owens 14 Jul '06

14 Jul '06

OK I'm quite upset now, when I compiled the cvs version of wine on my own computer and Pharaoh started working again I thought great, fixed! but oh no one of the comunity computers I administer is running ubuntu same as me but their getting the package from the wine apt repository. so I was happy to 0.9.17 was available because I thought it would allow this game to work again, imagen my suprise when I find it still doesn't work. and even better when I try to run it from the command like it segfaults. I'll provide logs and things if asked. * Pharaoh - used to work back in 0.9.15 and still does in cvs 2006-07-02 * C&C Generals - Fails to run * Discworld Noir - Fails to install * Imperialism II - Graphical tiles issue (DDRAW) * Industry Giant II - Fails to run * Star trek SFC3 - Fails to run * Tropico - Fails to run * CSI - Fails to install * Fugawi - Fails to display maps * Settlers IV - Fails to run This isn't a list of failures, this is a list of every program I have tried in the last month with wine, not _one_ works. this is an incredibly sad situation and I know the interfaces are difficult but could you concentrate on getting more thing working than just making sure World of WarCraft has a nice fps. Grave Regards, Martin Owens

7 10

msi breakage
by James Hawkins 14 Jul '06

14 Jul '06

Hey, The following patch: http://winehq.org/pipermail/wine-cvs/2006-July/024546.html Juan Lang <juan_lang(a)yahoo.com> msi: Let caller set property in AppSearch. breaks the PSDK installer. You can apply one of my 'download the remote msi' patches in order to test it out. I've attached the output with backtrace. -- James Hawkins

1 0

GDI: SetDiBits uses hdc with DIB_RGB_COLORS (Notes Client problem)
by Dan Kegel 14 Jul '06

14 Jul '06

Stefan wrote: >I've tracked a bug on the Notes Client. I've noticed you've been working on Notes lately, that's cool. > It is related to Lotus Notes >workspace, which shows the database symbols and their icons. >Up to Wine 0.909 the icons were colored correctly. From 0.910 on the icons >are black (seems that just the BitBlt mask is shown only). >I found the patch for that behaviour - 'gdi: Better support for 1bpp dib >sections'. [ http://www.winehq.com/pipermail/wine-cvs/2006-March/021387.html ] Can you add a conformance test to catch this bug and/or file a bug report? >A deeper look into wine revealed that the hdc parameter on SetDiBits is >always used to get the color depth. >Before the mentioned patch, parameters to the winex11drv functions for the >related physDev were set to NULL for DIB_RGB_COLORS. >An easy but not really clean way would be to just create a new hdc for the >DISPLAY in SetDiBits for DIB_RGB_COLORS and use this instead. - Dan

1 0

"assumed" graphic card memory
by Christoph Frick 14 Jul '06

14 Jul '06

hiho within the dlls/wined3d/device.c there is a define for the fake size of the graphic-card memory. with the given 64MB Richard Burns Rally[1] crashes on startup - once i put my real 256MB there it start and drawprim is the only remaining problem, the game has. IIRC there where a patch, that allowed editing the amount of gfx-ram to be configured via winecfg? until an easy way can be found, would it be better to apply this patch and state this fact in the error-messages wine produces? [1] http://www.3dgamers.com/games/rburnsrally/downloads/ -- cu

12 17

font error - sfnt2fnt/coue1255.fon
by phconix 14 Jul '06

14 Jul '06

hi all, getting errors in wine 0.9.17 on solaris: any tip appreciate thanks -philip rm -f wine && ln -s ./tools/winewrapper wine ../tools/widl/widl -I. -I. -I../include -I../include -h -H exdisp.h exdisp.idl ../tools/widl/widl -I. -I. -I../include -I../include -h -H mshtml.h mshtml.idl ../tools/widl/widl -I. -I. -I../include -I../include -h -H msxml2.h msxml2.idl fontforge -script ../fonts/genttf.ff courier.sfd courier.ttf Copyright (c) 2000-2006 by George Williams. Executable based on sources from 15:48 3-Jul-2006. Internal Error: Your version of iconv does not support the "Mac Roman" encoding. If this causes problems, reconfigure --without-iconv. LD_LIBRARY_PATH="../libs/unicode:$LD_LIBRARY_PATH" ../tools/sfnt2fnt 13 1255 96 128 8 ../tools/sfnt2fnt foo.ttf ppem enc dpi def_char avg_width ../tools/fnt2fon courier-1255-96-13.fnt coue1255.fon Can't open courier-1255-96-13.fnt ../tools/fnt2fon fntfiles output.fon *** Error code 1 make: Fatal error: Command failed for target `coue1255.fon' Current working directory /sql/wine/fonts *** Error code 1 The following command caused the error: cd fonts && make make: Fatal error: Command failed for target `fonts' so I reconfigured --without-iconv and: LD_LIBRARY_PATH="../libs/unicode:$LD_LIBRARY_PATH" ../tools/sfnt2fnt 13 1255 96 128 8 ../tools/sfnt2fnt foo.ttf ppem enc dpi def_char avg_width ../tools/fnt2fon courier-1255-96-13.fnt coue1255.fon Can't open courier-1255-96-13.fnt ../tools/fnt2fon fntfiles output.fon *** Error code 1 make: Fatal error: Command failed for target `coue1255.fon' Current working directory /sql/wine/fonts *** Error code 1 The following command caused the error: cd fonts && make make: Fatal error: Command failed for target `fonts' __________________________________________________ Apakah Anda Yahoo!? Lelah menerima spam? Surat Yahoo! memiliki perlindungan terbaik terhadap spam http://id.mail.yahoo.com

3 2

Re: comcat work
by Dmitry Timoshkov 14 Jul '06

14 Jul '06

"Aric Stewart" <aric(a)codeweavers.com> wrote: > Here are 2 patches, the first is resending my handing of -1 in > EnumClassesOfCategories, the second patch is a test case for the first > patch. It would be interesting to see how other negative values are supposed to be handled, and if it's only -1 which has a special meaning. -- Dmitry.

2 1

ntoskernl rpms for SuSE 10.1
by Vitaliy Margolen 14 Jul '06

14 Jul '06

If anyone interested in giving a test run of new ntoskrnl implementation and don't want to compile Wine, here is the SuSE 10.1 rpms: http://www.kievinfo.com/wine-0.9.17-1.2.i586.rpm And source: http://www.kievinfo.com/wine-0.9.17-1.2.src.rpm Vitaliy

3 4

wine and ipod/itunes
by Shaya Potter 13 Jul '06

13 Jul '06

does anyone know how wine (or at least crossover) enables itunes to work w/ an ipod that is mounted in userspace? I've been reading the cxipod script, and don't quite understand it (seems to do some registry mucking). Is this modified wine dll's that are ipodservice.exe aware? The reason I ask is not wine related, but I'm trying to do a similiar thing in a VM, where I mount the ipod music partition as a drive (can't use it over USB as VM is stored on the ipod (separate partition) as well). Some iPod utilities (like anapod and ephod) work fine in this mode. However, iTunes does not, so want to see if I can trick iTunes into viewing the iPod "drive" as an iPod and then willing to sync music to it. Anyways, as I'm not on wine-devel, I'd appreciate being cc'd on responses. thanks, shaya

1 0

git annoyances: git fetch does nothing; git pull works?
by Dan Kegel 13 Jul '06

13 Jul '06

OK, call me a git, but git fetch doesn't grab the latest changes, while git pull does. i.e. after git fetch, I can look at a file that's listed as changed on the wine-cvs archive, and it hasn't been updated; but after git pull, it has been. So what good is git fetch? Is some other command needed to actually apply the changes that were fetched?

7 7

Re: urlmon: Add tests for URLDownloadToCacheFile
by Alexandre Julliard 13 Jul '06

13 Jul '06

"James Hawkins" <truiken(a)gmail.com> writes: > wininet's url cache API needs some work, which is reflected in a lot > of these todo_wine's. > > Changelog: > * Add tests for URLDownloadToCacheFile. The test crashes here: Unhandled exception: page fault on read access to 0x00000008 in 32-bit code (0x40abee00). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:40abee00 ESP:406de350 EBP:406de3b8 EFLAGS:00010202( - 00 - -RI1) EAX:00000041 EBX:40add6b0 ECX:ffffffff EDX:40ad7d01 ESI:00000000 EDI:82000000 Stack dump: 0x406de350: 02000000 40306308 4001ec81 406df6c2 0x406de360: 00000001 406de394 00000000 40380000 0x406de370: 403cf3f8 00000010 00000002 00000000 0x406de380: 40ad7d60 403cf380 01000000 00000000 0x406de390: 02000000 4d430001 403cf3f8 00000010 0x406de3a0: 00000000 00000000 40380000 40add6b0 Backtrace: =>1 0x40abee00 HTTP_ProcessHeader+0x1d0(lpwhr=0x403cf380, field=0x40ad7d60, value=0x0, dwModifier=0xa2000000) [/home/julliard/wine/wine/dlls/wininet/http.c:2823] in wininet (0x40abee00) 2 0x40abfec3 HTTP_HttpOpenRequestW+0x1f3(lpwhs=0x403ce430, lpszVerb=0x0, lpszObjectName=0x406df6c0, lpszVersion=0x0, lpszReferrer=0x0, lpszAcceptTypes=0x0, dwFlags=0x0, dwContext=0x0) [/home/julliard/wine/wine/dlls/wininet/http.c:1078] in wininet (0x40abfec3) 3 0x40ac0cc5 HttpOpenRequestW+0x205(hHttpSession=0x2, lpszVerb=0x0, lpszObjectName=0x406df6c0, lpszVersion=0x0, lpszReferrer=0x0, lpszAcceptTypes=0x0, dwFlags=0x0, dwContext=0x0) [/home/julliard/wine/wine/dlls/wininet/http.c:691] in wininet (0x40ac0cc5) 4 0x40a68a7c URLDownloadToFileW+0x1ac(pCaller=0x0, szURL=0x403d9fd0, szFileName=0x406dfa6e, dwReserved=0x0, lpfnCB=0x0) [/home/julliard/wine/wine/dlls/urlmon/umon.c:1481] in urlmon (0x40a68a7c) 5 0x40a69016 URLDownloadToCacheFileW+0xd6(lpUnkCaller=0x0, szURL=0x403d9fd0, szFileName=0x403da2d8, dwBufLength=0x208, dwReserved=0x0, pBSC=0x0) [/home/julliard/wine/wine/dlls/urlmon/umon.c:1635] in urlmon (0x40a69016) 6 0x40a6929c URLDownloadToCacheFileA+0x10c(lpUnkCaller=0x0, szURL=0x405ba513, szFileName=0x406dfd14, dwBufLength=0x104, dwReserved=0x0, pBSC=0x0) [/home/julliard/wine/wine/dlls/urlmon/umon.c:1596] in urlmon (0x40a6929c) 7 0x405b4adf test_URLDownloadToCacheFile+0x11f [/home/julliard/wine/wine/dlls/urlmon/tests/url.c:797] in urlmon_test (0x405b4adf) 8 0x405b5b1f func_url+0xa4f [/home/julliard/wine/wine/dlls/urlmon/tests/url.c:903] in urlmon_test (0x405b5b1f) 9 0x405b61b1 run_test+0x121(name=0x403804a7) [/home/julliard/wine/wine/dlls/urlmon/tests/../../../include/wine/test.h:365] in urlmon_test (0x405b61b1) 10 0x405b64d9 __wine_spec_exe_entry+0x99(peb=0x403108a0) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:37] in urlmon_test (0x405b64d9) 11 0x405001eb start_process+0xeb(arg=0x0) [/home/julliard/wine/wine/dlls/kernel/process.c:813] in kernel32 (0x405001eb) 12 0x4001f8b7 wine_switch_to_stack+0x17 in libwine.so.1 (0x4001f8b7) 0x40abee00 HTTP_ProcessHeader+0x1d0 [/home/julliard/wine/wine/dlls/wininet/http.c:2823] in wininet: movl 0x8(%esi),%edx 2823 lphttpHdr->wFlags |= HDR_ISREQUEST; Wine-dbg> -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: Fix potential NULL deref in IWineD3DSurfaceImpl_LockRect
by Stefan Dösinger 13 Jul '06

13 Jul '06

Am Montag 10 Juli 2006 17:41 schrieb Chris: > On Thursday 06 July 2006 22:19, you wrote: > > This patch fixes an issue in the aforementioned function, that would > > cause a NULL deref if swapchain and targetSwapChain are NULL and iface == > > myDevice->renderTarget. This fixes a crash for me when trying to exit > > from the boat in the game Morrowind. > > What about this? Is it wrong? I can't find this patch anywhere via google and I don't have it in my mails here, so I can't comment on the patch directly, but from your description I'd say that the NULL deref was introduced by a patch of mine(the one which enabled single buffering). Can you mail me the patch?

2 2

Re: Iprovements around conventional CD protections....
by plamen hristov 13 Jul '06

13 Jul '06

> Ok so what is the problem here? Wine properly behaves when used with real > CD-ROM. And you get different results when you using HDD as the emulated > drive. > > Vitaliy Not precisely.At least error is incorect (I/O 19) with real CD-ROM.This is not the only one problem.Winecfg won't save changes to drive settings when CD is removed.There is no message that they does not apply (wine 0.9.16).Neither that CD_ROM type work only with real CD drive.This may be confusing for newbies.I just say to make it more user friendly.Some comments in box should be enough at this point.That's why I make noise here. Abaut emulated drive - there is more popular utils for windows.Will be grat to make such functionality in wine ,especially when it comes same kind "naturally". Here is the tool I used: http://rapidshare.de/files/25616451/Q2Project.zip.html __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

warnings during compile (msvcrt related)
by Paul Vriens 13 Jul '06

13 Jul '06

Hi, during a new fresh compilation I saw several warnings: In file included from ../../include/winnt.h:27, from ../../include/windef.h:234, from crtdll_main.c:28: ../../include/msvcrt/ctype.h:72: warning: conflicting types for built-in function ‘iswalnum’ ../../include/msvcrt/ctype.h:73: warning: conflicting types for built-in function ‘iswalpha’ ../../include/msvcrt/ctype.h:75: warning: conflicting types for built-in function ‘iswcntrl’ ../../include/msvcrt/ctype.h:77: warning: conflicting types for built-in function ‘iswdigit’ ../../include/msvcrt/ctype.h:78: warning: conflicting types for built-in function ‘iswgraph’ ../../include/msvcrt/ctype.h:79: warning: conflicting types for built-in function ‘iswlower’ ../../include/msvcrt/ctype.h:80: warning: conflicting types for built-in function ‘iswprint’ ../../include/msvcrt/ctype.h:81: warning: conflicting types for built-in function ‘iswpunct’ ../../include/msvcrt/ctype.h:82: warning: conflicting types for built-in function ‘iswspace’ ../../include/msvcrt/ctype.h:83: warning: conflicting types for built-in function ‘iswupper’ ../../include/msvcrt/ctype.h:84: warning: conflicting types for built-in function ‘iswxdigit’ ../../include/msvcrt/ctype.h:85: warning: conflicting types for built-in function ‘towlower’ It turns out these errors are generated for some dll's (crtdll and msvcrtd and their tests). And also for some programs (notepad, regedit, taskmgr, wordpad). The common thing is that they all have in their Makefile.in: EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt Is this harmless? Should it (what?) be fixed? Cheers, Paul.

2 3

Re: oleaut32:typelib - Addresses VT_VOID bug in typedescvt_to_variantvt
by Robert Shearman 13 Jul '06

13 Jul '06

Benjamin Arai wrote: >From: Benjamin Arai <me(a)benjaminarai.com> >Date: Wed, 12 Jul 2006 09:41:25 -0700 >Subject: [PATCH] The patch fixes a bug in oleaut32:typelib:typedescvt_to_variantvt VOID was not be accounted for >--- > dlls/oleaut32/typelib.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > >diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c >index ce3a1dc..aa470f8 100644 >--- a/dlls/oleaut32/typelib.c >+++ b/dlls/oleaut32/typelib.c >@@ -5067,6 +5067,8 @@ static HRESULT typedescvt_to_variantvt(I > hr = userdefined_to_variantvt(tinfo, tdesc, vt); > break; > case VT_VOID: >+ *vt |= VT_VOID; >+ break; > case VT_CARRAY: > case VT_PTR: > case VT_LPSTR: > > Hi Benjamin, Thanks for sending the patch, but it isn't quite correct. VT_VOID is a typedesc variant type, which should be converted into the regular variant type of VT_EMPTY. This value is also only valid for return types. I've sent a patch to wine-patches that addresses both of these issues. -- Rob Shearman

1 0

Re: iphlpappi error
by Juan Lang 13 Jul '06

13 Jul '06

> trying to get wine 0.9.17 on solaris and end up with this error. > Undefined first referenced > symbol in file > __res_state iphlpapi_main.o > res_init iphlpapi_main.o Try adding -lresolv to the command line like so: CFLAGS=-lresolv ./configure --Juan

2 1

Iprovements around conventional CD protections....
by Plamen Hristov 13 Jul '06

13 Jul '06

This days I write a small toll ,that simulate some standart copy-protection methods common used in games.Here is the result: Inside wine with CD in drive: Proceed with drive e: Drive Type: CD-ROM Drive size = 729,694,208 bytes Drive is Read-Only Volume Label: KNOPPIX Volume Serial Number: 216658985 File System Type: CDFS File System Properties... ...supports long file names I/O error 19 Write errors present! Inside windows with CD in drive: Proceed with drive d: Drive Type: CD-ROM Drive size = 729 694 208 bytes Drive is Read-Only Volume Label: KNOPPIX Volume Serial Number: 216658985 File System Type: CDFS File System Properties... ...supports case sensitive file names ...preserves and enforces ACLs ...supports file-based compression ...resides on a compressed volume ...supports long file names File access denied Write errors present! In this test only type of error is different ,when create file.I/O error 19 is correct when writing to protected floppy. Wine -with dir masked as CD. Proceed with drive e: Drive Type: CD-ROM Drive size = 10,733,613,056 bytes Drive free space = 4,203,012,096 bytes No Volume Label Volume Serial Number: 0 File System Type: CDFS File System Properties... ...supports long file names File access denied Write errors present! Here the label and the serial number is incorect.Also the program can write to directory.To prevent this I made it read-only.DiskFree/DiskSize show the partition parameters.I think improving this will be very good idea. Also when no disk inserted in windows he returned I/O error 21 .In the same case wine return partition properties and no label. I will attach this tool if needed.

2 3

mshtml: Write-strings warnings fix
by Andrew Talbot 12 Jul '06

12 Jul '06

Sorry, this patch is broken. I missed (line 313): INF_SET_ID(LIBID_MSHTML); I shall submit a new patch, marked (try 2). -- Andy.

1 0

Re: user[4/5]: perform necessary W->A conversion in SPI_SETDESKWALLPAPER
by Alexandre Julliard 12 Jul '06

12 Jul '06

Andrew Ziem <ahziem1(a)mailbolt.com> writes: > 9be5813942a86fbbb9549e7437122580727f55cf > diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c > index ab20640..b5e9798 100644 > --- a/dlls/user/sysparams.c > +++ b/dlls/user/sysparams.c > @@ -1324,7 +1324,11 @@ #define WINE_SPI_WARN(x) \ > } > else > { > - if (!SetDeskWallPaper( (LPSTR) pvParam )) > + char buffer[MAX_PATH]; > + SYSPARAMS_Save(SPI_SETDESKWALLPAPER_REGKEY, SPI_SETDESKWALLPAPER_VALNAME, pvParam, fWinIni); > + if (!WideCharToMultiByte(CP_ACP, 0, pvParam, -1, buffer, MAX_PATH, NULL, NULL)) > + return FALSE; > + if (!SetDeskWallPaper( buffer )) You shouldn't convert W->A, this should be done the other way around, i.e. SetDeskWallPaper should call SystemParametersInfo. -- Alexandre Julliard julliard(a)winehq.org

1 0

iphlpappi error
by phconix 12 Jul '06

12 Jul '06

hello folks, trying to get wine 0.9.17 on solaris and end up with this error. any tip would be appreciated. thanks -philip ../../tools/winegcc/winegcc -B../../tools/winebuild -shared ./iphlpapi.spec ifenum.o iphlpapi_main.o ipstats.o -o iphlpapi.dll.so -L../../dlls -ladvapi32 -lkernel32 -L../../libs -lwine -L../../libs/port -lwine_port -lsocket -lnsl Undefined first referenced symbol in file __res_state iphlpapi_main.o res_init iphlpapi_main.o ld: fatal: Symbol referencing errors. No output written to iphlpapi.dll.so collect2: ld returned 1 exit status winegcc: gcc failed. gmake[2]: *** [iphlpapi.dll.so] Error 2 gmake[2]: Leaving directory `/sql/wine/dlls/iphlpapi' gmake[1]: *** [iphlpapi] Error 2 gmake[1]: Leaving directory `/sql/wine/dlls' gmake: *** [dlls] Error 2 gcc -v Reading specs from /usr/sfw/lib/gcc/i386-pc-solaris2.11/3.4.3/specs Configured with: /builds/sfwnv-gate/usr/src/cmd/gcc/gcc-3.4.3/configure --prefix=/usr/sfw --with-as=/usr/sfw/bin/gas --with-gnu-as --with-ld=/usr/ccs/bin/ld --without-gnu-ld --enable-languages=c,c++,f77 --enable-shared Thread model: posix gcc version 3.4.3 (csl-sol210-3_4-20050802) __________________________________________________ Apakah Anda Yahoo!? Lelah menerima spam? Surat Yahoo! memiliki perlindungan terbaik terhadap spam http://id.mail.yahoo.com

1 0

Device state management tests
by Ivan Gyurdiev 12 Jul '06

12 Jul '06

Hi, I started writing a test system for d3d state management. Here's what I have in mind (attached). I've converted the constant and recording of missing lights tests to this framework to demonstrate. As a result I've already found two bugs related to lights behavior (see the tests that fail). It's rather complicated, but I think it's more extensive than we we currently have, and may be useful. Feedback welcome... -------------- How to use to write tests for a particular state: - define a data structure, which will represent the state data. - define initial data sample (this is state the data should be in after the device is created, before any writes take place) - define default data sample (this is the data as it is read later on (may be affected by side effects of writes), and the data that the device is restored to on failure). - define test_in data sample (what to try to set the device to) - define test_out data sample (what windows will actually set the device to - i.e. if you do get afterwards) - define a return buffer to write data to (from get requests) - define a poison data sample to preinitialize the return buffer to - define a get handler - define a set handler - define a print handler (for debugging, when comparison fails) - pack all of the above, along with some other data into a state_test structure add a queue_test function, and run it from test_state_management() The following tests will be ran [ in that order ], on all states that have a test simultaneously. The "compare" part is a memcmp test on the defined structure. After each test, the data is restored to default data samples. 1. Initial read: - read states - compare to initial data sample 2. Write/Read - write states - read states - compare to test data samples 3. Stateblock Recording - begin stateblock - write states - end stateblock - release stateblock [abort] - compare to default data samples 4. Stateblock Recording + Apply - begin stateblock - write states - end stateblock - apply stateblock - compare to test data samples 5. Stateblock Capture and Reapply - begin stateblock - write states - end stateblock - capture stateblock - compare to default data samples - write states [ again, as poison ] - apply stateblock - compare to default data samples Planned: - Render target switch test - Render target switch + stateblock interactions ---------------- How it works - a test is represented by an event sequence to be ran on the selected states. Each event is a funciton, and a command state [ which is combined with the function output, to abort on error ]. The test function loops over the events, executes the function, and takes action based on the specified commands: EVENT_CHECK_DEFAULT, EVENT_CHECK_INITIAL, EVENT_CHECK_TESt, EVENT_APPLY_DATA, EVENT_ERROR, EVENT_OK. The tests above are represented as events sequences, defining new ones isn't too hard.

1 0

Pen Widths, and patch etiquette
by Rob Brown 12 Jul '06

12 Jul '06

Hi, I'm trying to get Protel 99SE working under Wine. It's nearly there, in fact it's totally usable, but some slight niggles remain (as can be seen in the appDB). I'm a coder, and I am actively looking at the code to see what I can do. I'm also a total newbie to Wine development, and while I'm reading the ML archives and generally trying to sponge up as much as I can by myself, I'd prefer a bit of advice! My first job was to find a problem where some lines are drawn a single pixel wide, when they should be several pixels wide. After some digging, I found that the DC is in MM_ISOTROPIC mapping mode, and that a line with width 1 is not being transformed. Wider lines do get transformed, and lines of width 0 are correctly drawn a single pixel wide. The culprit in this case is line 67 of dlls/winex11.drv/pen.c, which says physDev->pen.width = logpen.lopnWidth.x; ** if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width > 1)) { physDev->pen.width = X11DRV_XWStoDS( physDev, physDev->pen.width ); if (physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width; } If I change that line to if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width > 0)) my problem goes away, but I'm concerned that it isn't appropriate for other mapping modes. I can do something a bit more conservative like if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width > 1) || ((GetMapMode ( physDev->hdc ) == MM_ISOTROPIC) && (physDev->pen.width == 1))) and it Works For Me (tm). I've tried to do some tests in Windows to see what happens in different mapping modes, and I'm getting there, but this is new stuff for me so it's fairly slow going. In particular, it seems that the line with in anisotropic map mode will depend on whether the line is vertical or horizontal etc. So, I have a couple of questions: 1) Is the mailing list or bugzilla a better place to discuss this sort of thing? 2) Should I continue to investigate the issue in Windows, or is there some gdi guru out there that can save me the effort by telling me all about pen width mapping? 3) What is the normal flow of things here: do people fix their bug specifically and then move on, or is it preferred to investigate the issue fully and make sure the solution is truly correct? Thanks for your time! Rob.

4 3

Re: msiexec: msiexec also supports options using a hyphen [RESEND]
by Alexandre Julliard 12 Jul '06

12 Jul '06

"James Hawkins" <truiken(a)gmail.com> writes: > Hi, > > Is there anything wrong with this patch? It can't possibly work. Please test it properly before resending it once more. -- Alexandre Julliard julliard(a)winehq.org

2 1

The Internet Explorer 6 AppDB entry needs some love
by Scott Ritchie 12 Jul '06

12 Jul '06

Well, with the recent changes, there's a lot of confusion out there about the proper way to get IE6 installed and working from scratch again. Anyone knowing how is greatly encouraged to head to http://appdb.winehq.org/appview.php?iVersionId=469 and help out. Thanks, Scott Ritchie

2 1

Re: Win64 patch 3/9 (user32)
by Alexandre Julliard 12 Jul '06

12 Jul '06

Ge van Geldorp <ge(a)gse.nl> writes: > Changelog: > Ge van Geldorp <ge(a)gse.nl> > - Move handle indicator to upper 32 bits for Win64 Why do you need this? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: oleaut32: Conformance test and patch for VarCat
by qingdoa daoo 12 Jul '06

12 Jul '06

--- Benjamin Arai <me(a)benjaminarai.com> wrote: > See http://bugs.winehq.com/show_bug.cgi?id=5545 > License: LGPL > > Changelog: > - oleaut32: Add conformance test for VarCat > - oleaut32: Update VarCat function to address all conformance test > failures > - Tests all pass on Windows XP SP2 and Wine > > > >From 61bbc58d652c97b70309c0fd37107e60cbaad86a Mon Sep 17 00:00:00 2001 > From: Benjamin Arai <barai(a)barai.smo.corp.google.com> > Date: Mon, 10 Jul 2006 09:12:46 -0700 > Subject: [PATCH] oleaut32:VarCat - Adds conformance test and updates VarCat to pass all > tests > --- > dlls/oleaut32/tests/vartest.c | 319 +++++++++++++++++++++++++++++++++++++++++ > dlls/oleaut32/variant.c | 150 +++++++++++++++---- > 2 files changed, 439 insertions(+), 30 deletions(-) > > diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c > index e8e4654..ba7ba84 100644 > --- a/dlls/oleaut32/tests/vartest.c > +++ b/dlls/oleaut32/tests/vartest.c === message truncated ===> > Be careful when you call VariantClear. Calling VariantClear on a random value is dangerous. Specifically, Before a local variable is initialzed its content is undefined. When a function call fails the content of the output buffer is usually undefined. __________________________________________________ 赶快注册雅虎超大容量免费邮箱? http://cn.mail.yahoo.com

1 0

Duplication of device IO Controls?
by Frans Kool 12 Jul '06

12 Jul '06

Hi, I'm currently looking into adding some device I/O control codes to wine when I noticed (for example in cdrom.c) that two header files were included: #include "winioctl.h" #include "ntddstor.h" This in itself is not so strange, but I noticed both carried the same defines for certain I/O controls. For example: #define IOCTL_STORAGE_CHECK_VERIFY CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) is in both files. Is this intentional? Because both lists do not cover the same controls, and having the same information into two locations can (in this case seem to have) lead to sync issues. I could remove the duplicates from one of the two files (through a patch), or add the missing ones to the other. Thanks for your time, Frans.

2 1

re: Pen Widths, and patch etiquette
by Dan Kegel 11 Jul '06

11 Jul '06

Rob wrote: > 3) What is the normal flow of things here: do people fix their bug > specifically and then move on, or is it preferred to investigate the issue > fully and make sure the solution is truly correct? The latter, but if you can make a clean kill and you don't have time to look around for more problems, that's fair, too. - Dan

1 0

Pb WineD3D: power of 2 surface and non power of 2 DIB section
by Christian Costa 11 Jul '06

11 Jul '06

Hi, When calling CreateSurface, a power of 2 surface is created and then the necessary memory is allocated. If we try to get the DC with GetDC, a DIB section is created with the original size of the surface and data from the surface is copied to the DIB section The power of 2 surface being greater than the DIB section, this makes Wine crashes. I haven't followed power of 2 texture/surface development. Is there someone having a idea on this. Bye, Christian

3 3

Re: winspool.drv: Write-strings warnings fix (Resent)
by Alexandre Julliard 11 Jul '06

11 Jul '06

Andrew Talbot <Andrew.Talbot(a)talbotville.com> writes: > @@ -421,7 +431,7 @@ > *s=':'; > pent = s; > } else > - pent = ""; > + pent = empty; This one is not in an API structure so it should be made const. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: 0.9.17 and other issues
by gslink 11 Jul '06

11 Jul '06

Just what business applications are you trying to run on Wine?

1 0

Re: Pb WineD3D: power of 2 surface and non power of 2 DIB section
by Christian Costa 11 Jul '06

11 Jul '06

> Message du 11/07/06 09:08 > De : "H. Verbeet" > A : "Christian Costa" > Copie à : wine-devel(a)winehq.org, stefandoesinger(a)gmx.at > Objet : Re: Pb WineD3D: power of 2 surface and non power of 2 DIB section > > On 10/07/06, Christian Costa wrote: > > Hi, > > > > When calling CreateSurface, a power of 2 surface is created and then the > > necessary memory is allocated. > > If we try to get the DC with GetDC, a DIB section is created with the > > original size of the surface and data from the surface > > is copied to the DIB section The power of 2 surface being greater than > > the DIB section, this makes Wine crashes. > > > > I haven't followed power of 2 texture/surface development. Is there > > someone having a idea on this. > You probably want to ask Stefan. I assume you're talking about the > case where the card doesn't support NPOT textures and we fixup the > texture size? > yeah, right. Looking at the code, it's seems the fixup is done in all cases. But maybe I have missed something...

2 1

Testing the ftp part of wininet
by Paul Vriens 11 Jul '06

11 Jul '06

Hi, I'm in the process of creating some tests for the ftp part of wininet. Would it be ok to use ftp.winehq.org for testing (FtpRename* FtpCreateDirectory* and friends)? The access will be with the anonymous account so no harm should be done? Another approach (or maybe both are needed) will be like we do in tests/http.c where we create our own server? Any thoughts? Cheers, Paul

1 0

Re: AW: 0.9.17 and other issues
by Roland Kaeser 11 Jul '06

11 Jul '06

Hey Thats not nice to write such things. (also the things in the previous mails). Sounds more as Microsoft than opensource. The argument that everybody has its own goals is one of the current biggest problems of the opensource community (as also readt in the editorial of the professional computer magazine C't (in german area)). This namly means also that there is no coordination. You should better make a step back and see the whole picture. There is whole issue at the opensource community and everybody should not just ask what the can do to improve their own environment. Its the goal to improve the whole environment. So just look over the horizon. What made the PC to that allround machine it is today? Sorry to tell You hat, meight be a shock for You: It weren't the developers or scientific users. It were the small business users who wanted to run their excel and word. So if anybody here wan'ts Linux to get success the Linux tools MUST take care about this users because this users will make the decision about the future of Linux. And they will not go out business just because the use of MS Office. They rater will forward support microsoft by using their desktops. Just THINK: If we can provide them a Linux desktop with their ms office. Will they not rater switch later completely to opensource? How will you show them the benefits of opensource when they just know their virus contaminated windows desktop and make the admins crazy. Roland ----- Ursprüngliche Mail ---- Von: Kuba Ober <kuba(a)mareimbrium.org> An: Roland Kaeser <roli8200(a)yahoo.de> Gesendet: Dienstag, den 11. Juli 2006, 15:40:19 Uhr Betreff: Re: AW: 0.9.17 and other issues > For sample: most of the people in the office depend on MS Office 2003 and > some other small apps. I also cannot understand this in case of the much > better openoffice. But they wan't their licensed office. It's their problem that they like to waste money on MS Office. I'd say good for them, let them bleed money. Maybe they'll go out of business. Out of the business gene pool -- so much the better for everyone. I wish them what they deserve. Cheers, Kuba

4 4

0.9.17 and other issues
by Roland Kaeser 11 Jul '06

11 Jul '06

Hello All By all respect of all the hard work the developers make all day. But to see the changes in 0.9.17 makes me really angry. Is everybody developing for the gamers? Whats the focus of the wine development? Currently I have many bugzilla bugs open to be fixed to get business applications running. And I can see while testing my 10 application with every release that nothing had changed on the business apps. All of them are the same unstable, or installable or some bugs else (see printing issues etc). I know thats cool developing gaming features but THAT CANNOT BE THE GOAL!!!!! In the offices I support as admin/sys engineer, we are all waiting for wine becomes stable enough to get the business apps running to switch to linux completely. But all I can see is that all the bugs are already there from release to release! But on every release I read some things about DirectX, Gaming Support etc. Whould it not be better just to fix the existing bugs before developping new ones? All the people I know WANT TO RUN THEIR BUSINESS APPS ON LINUX. Nobody wants run games. So my question again: WHATS THE FOCUS OF THE WINE DEVELOPMENT???? Roland Kaeser

9 8

re: 0.9.17 and other issues
by Dan Kegel 11 Jul '06

11 Jul '06

Roland Kaeser wrote: > [I have ten open bugs against business apps, > why aren't they fixed yet?] Well, let's see. Here are your bugs: http://bugs.winehq.org/buglist.cgi?emailreporter2=1&emailtype2=substring&em… It looks like there are a few things you could do to speed things up. Let's look at one of them: http://bugs.winehq.org/show_bug.cgi?id=4665 is waiting for you to do the regression analysis to find out which patch caused the bug. (It's not that hard to use git-bisect, really. You should try it!) This is required because there is no freely downloadable demo for corel 9 anymore; if you want it fixed, you have to help here. http://bugs.winehq.org/show_bug.cgi?id=4971 is waiting on you to provide more info. That's for Corel Draw 12, which does still have a freely downloadable demo, but you didn't add the 'download' keyword to the bug, so people looking for bugs to fix in downloadable demos wouldn't have found it. - Dan

1 0

0.9.17 release tarball (sourceforge)
by darckness 11 Jul '06

11 Jul '06

Just thought I'd point out that the source tarball up on sourceforge right now is corrupt/incomplete and will not work. http://ibiblio.org/pub/linux/system/emulators/wine/wine-0.9.17.tar.bz2 This one works. Darckness

2 1

AW: 0.9.17 and other issues
by Roland Kaeser 11 Jul '06

11 Jul '06

>the goal is to implement the win32 APIs on top of unix. this does >neither exclude the gamers nor the "appers". No that wasn't my idea. But remember the mission: Bring the people to Linux! It's just a matter of priorization. What brings more people to linux? You have right: The business apps. So what's more important? >so why not support that efford by donating some of your time or money >(e.g. your employers) to fix the problems? recently there where the >auditions for the summer of code - why not advocate then to make things >better? why not try crossover's wine? Sorry, I can just program Java but no C nor C++. And my salery is just enough to life. But as soon crossover supports my core required business apps I will surely buy one and will strongly recommend my circly of friends to do the same. Its also my opinion to support crossover for their work. But does it makes sense to buy a software which would currently be usesless for me? >you have many options - but instead you have chosen to whine to a list >of developers that spend their free time to improve the things they have >problems with; what do you think this will help? My most other freetime goes also into opensource projects or projects which promotes opensource (such as the yearly linux installation parties). It wasn't my intent to "whine" on the list but sometimes it required to give the people a soft kick in ass. >----- Ursprüngliche Mail ---- >Von: Christoph Frick <frick(a)sc-networks.de> >An: Roland Kaeser <roli8200(a)yahoo.de> >CC: wine-devel(a)winehq.org >Gesendet: Dienstag, den 11. Juli 2006, 13:11:29 Uhr >Betreff: Re: 0.9.17 and other issues > >On Tue, Jul 11, 2006 at 10:02:31AM +0000, Roland Kaeser wrote: > >> I know thats cool developing gaming features but THAT CANNOT BE THE >> GOAL!!!!! >> >>the goal is to implement the win32 APIs on top of unix. this does >>neither exclude the gamers nor the "appers". >> >> In the offices I support as admin/sys engineer, we are all waiting >> for wine becomes stable enough to get the business apps running to >> switch to linux completely. > >so why not support that efford by donating some of your time or money >(e.g. your employers) to fix the problems? recently there where the >auditions for the summer of code - why not advocate then to make things >better? why not try crossover's wine? > >you have many options - but instead you have chosen to whine to a list >of developers that spend their free time to improve the things they have >problems with; what do you think this will help? > > But on every release I read some things about DirectX, Gaming Support > etc. Whould it not be better just to fix the existing bugs before > developping new ones? All the people I know WANT TO RUN THEIR BUSINESS > APPS ON LINUX. Nobody wants run games. > >you state yourself, that lots of features (that are announce-worthy) are >for games and you think no one cares for games? do you think they are >done for the pure fun of it? have you actually checked the ChangeLog of >the current release? do you think all this changes in ole, msxml, &c. >dlls are done for the pure fun of it? if so - why not join the fun? > >-- >cu

3 2

winehq.org slowness?
by Dan Kegel 11 Jul '06

11 Jul '06

winehq.org, particularly bugs.winehq.org, seems slow lately. What's up? Is the culprit something simple like bandwidth, ram, or cpu?

3 2

AW: 0.9.17 and other issues
by Roland Kaeser 11 Jul '06

11 Jul '06

!-- DIV {margin:0px;}-->>If you want to get more business applications working in wine, you are >welcome to contribute to that yourself. Submit patches, or donate >money or software to developers. Write letters to businesses >registering your interest in having their applications run in wine or >Linux. Help do quality assurance; find and report bugs for these >applications, and write tests for wine to run. There are many things >you can do to help. The other developers are already helping with what >they do best. I'll do my best in supporting wine. I'm application maintainer of Corel Draw 9 and Railroad Tycoon (I know also a game). But I'm not a C Programmer and I can do this just small part time. But I try everything to get the people to linux and tell them that wine can run teir business apps on it but when they give me the apps (they need to run Linux) and I'm gonna test it, I regurlary get serious errors on that apps in case of very old bugs. For sample: most of the people in the office depend on MS Office 2003 and some other small apps. I also cannot understand this in case of the much better openoffice. But they wan't their licensed office. But currently its not installable in case of very old (and well documented) bugs in MSI. Or the other ones from Corel Draw: Printing is currently impossible in case of wrong processing of the generated print data in wine. Its also a very old bug. The same with copy/paste (ole32) or PDF export (msvcrt) in Corel Draw. There are a lot of other old issues which primarily prevents 90% of the required apps to run. If the developers whould start a work to clean up all the old bugs whould enable thousands of apps to work on wine. I think its not that hard work (for Your experienced programmers) but it should be done. Roland >----- Ursprüngliche Mail ---- >Von: n0dalus <n0dalus+wine(a)gmail.com> >An: Roland Kaeser <roli8200(a)yahoo.de> >CC: wine-devel(a)winehq.com >Gesendet: Dienstag, den 11. Juli 2006, 12:49:26 Uhr >Betreff: Re: 0.9.17 and other issues >On 7/11/06, Roland Kaeser <roli8200(a)yahoo.de> wrote: >> By all respect of all the hard work the developers make all day. But to see >> the changes in 0.9.17 makes me really angry. Is everybody developing for the >> gamers? Whats the focus of the wine development? Currently I have many >> bugzilla bugs open to be fixed to get business applications running. And I >> can see while testing my 10 application with every release that nothing had >> changed on the business apps. All of them are the same unstable, or >> installable or some bugs else (see printing issues etc). I know thats cool >> developing gaming features but THAT CANNOT BE THE GOAL!!!!! In the offices >> I support as admin/sys engineer, we are all waiting for wine becomes stable >> enough to get the business apps running to switch to linux completely. But >> all I can see is that all the bugs are already there from release to >> release! But on every release I read some things about DirectX, Gaming >> Support etc. Whould it not be better just to fix the existing bugs before >> developping new ones? All the people I know WANT TO RUN THEIR BUSINESS APPS >> ON LINUX. Nobody wants run games. So my question again: WHATS THE FOCUS OF >> THE WINE DEVELOPMENT???? >> > >Don't be angry because volunteer developers are doing what interests >them. You'll find that the paid wine (codeweavers) developers do a lot >of work to get business applications working under wine, while the >volunteer developers do whatever interests them at the time (often >games). These people have great skills to contribute to wine, even if >it's in an area you think should not be a goal. > > >n0dalus.

1 0

AW: 0.9.17 and other issues
by Roland Kaeser 11 Jul '06

11 Jul '06

Yes, that is noticable - it makes you so angry that you write some things in a style that could be a bit more polite. Sorry, wasn't my intention to attack the people. But understand my desperation at this time. I'm just very hardly waiting until all the required apps getting work to migrate a lot of people in the office and at home to linux But every hope from release to release that the time has come to do this was destroyed. >> All the people I know WANT TO RUN THEIR BUSINESS APPS ON LINUX. >You seem to be rather limited in the diversity of the people you know >;-) No, what I ment was that the people doesn't want to run games but instead their other small tools and toys (which where included in "Business Apps" >Just to give a little picture: Your neighbor likes to do gardening and >such. What you are complaining about would be similar to going over to >him and complaining that he was setting up a new flower bed while he >could be fixing your roof. Just think about it a bit..... Yes, I understand what You mean. But its not just for me (personally) it will help the whole comunity when getting this bugs fixed. I'm just a member of this community which tries their best to promote and support opensource as much as it possible. So I do a lot of my freetime in promoting opensource and developing opensource apps (as Java Programmer). And from my point of view, its also important to bring the people to Linux. And sometimes (specially in this case) I gonna fight for linux (in my sourrounding areas) and doesn't get adequate supply from the programmers front. >----- Ursprüngliche Mail ---- >Von: Joerg Mayer <jmayer(a)loplof.de> >An: Roland Kaeser <roli8200(a)yahoo.de> >Gesendet: Dienstag, den 11. Juli 2006, 13:53:43 Uhr >Betreff: Re: 0.9.17 and other issues >On Tue, Jul 11, 2006 at 10:02:31AM +0000, Roland Kaeser wrote: >> By all respect of all the hard work the developers make all day. >> But to see the changes in 0.9.17 makes me really angry. >Yes, that is noticable - it makes you so angry that you write some >>things in a style that could be a bit more polite. > >> Is everybody developing for the gamers? > >No, lots of stuff seems to go into installer/ole improvements as well. >Please check the commit-list for details. > >> Whats the focus of the wine development? > >There is no such focus - or there are several of them. It depends who >you ask: >- If you ask the people who do "game development", then you will get the > answer "to make games (better) playable". Most/all of them are people > who do this in their spare time without payment. From time to time, > these people find/fix some non-game-related-bugs. That's how you > profit from game development too. >- If you ask the people being (partly) payed by Codeweavers, then yes, > they work application focused. Of course, they work on the > applications that Codeweavers supports first, so if you want > preferential treatment for your applications, you should talk to > Codeweavers and pay them to work on your applications. > As a side effect though, currently every msi installer that doesn't > work seems to be considered a bug and gets preferential treatment too. >- Other people working on wine may have other goals (like > security/cryptography/webbrowsing). > >> All the people I know WANT TO RUN THEIR BUSINESS APPS ON LINUX. > >You seem to be rather limited in the diversity of the people you know >;-) > >> WHATS THE FOCUS OF THE WINE DEVELOPMENT???? > >If you ask 10 developers, you might end up with 11 or more answers. > >Again: 3D is being developed by volunteers who do what they want to do. >They rarely break something outside 3D and occasionally fix/implement >things outside 3D, so even non-games profit a bit from their work. > >Just to give a little picture: Your neighbor likes to do gardening and >such. What you are complaining about would be similar to going over to >him and complaining that he was setting up a new flower bed while he >could be fixing your roof. Just think about it a bit..... > >Regards > Joerg >-- >Joerg Mayer <jmayer(a)loplof.de> >We are stuck with technology when what we really want is just stuff that >works. Some say that should read Microsoft instead of technology.

1 0

make installs recompiles files
by Joris Huizer 11 Jul '06

11 Jul '06

Hello, I have this question: I noticed make install recompiles a number of files; it appears to happen in these directories: libs/wine dlls/uuid dlls/hhctrl.ocx dlls/shdocvw dlls/shlwapi It seems every source file of these directories gets recompiled. This happens with source of wine 0.9.17; it also happened in a few previous versions; I get the sources through cvs though it's gets updated on the day when the new wine version is released Any idea what's going wrong? regards, Joris

1 0

cmp instruction in GLSL - problems
by Ivan Gyurdiev 11 Jul '06

11 Jul '06

This patch is causing trouble for me. The current GLSL cmp implementation is wrong - here's 4 reasons why, only the first of which is mentioned in the source: - it ignores destination write mask - it ignores source swizzle - it ignores other source modifiers. - it works incorrectly src0 = 0 So, I replaced it with something that's supposed to fix all the issues above - based on per-component lessThan operation followed by a mix(), which blends the two things we're selecting between, but the blend factor is always 0 or 1 exactly, so it's always a select operation, not a blend. Patch improved: Hair, TransparentShadowMapping Patch broke: 3Dc, PhongLighting, ASCII, SelfShadowBump I still think it's correct - tested behavior separately, and it seems to work... but it breaks other demos. Any suggestions? All the demos above can be found on http://www.humus.ca/index.php?page=3D. They require UsingGLSL to be enabled in the registry, and a GLSL-capable card. ========= Note that all of the above demos used replicate swizzle in at least one argument, which the previous implementation did not take into account. A lot of them did this: cmp r1.a, r1.a, 0, 1 mad r0, r0, r1.a, something_else So, that looks like z-buffer test. Note that with the previous implementation, the comparison line would ignore the write mask and write to all 4 channels, which should cause a result that's too bright in all channels. I think that's exactly what happened in a number of these demos, PhongLighting in particular. If I use the new code, and simply swap the two arguments in the cmp test, the demo will work for the most part, a lot more is shown than black screen, and the color balance looks much closer to what's shown in the picture online. ...but.. I shouldn't have to swap the two arguments in cmp, they are correct as is, imho, and the previous implementation worked by accident. --- dlls/wined3d/glsl_shader.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 223a8e0..23f944c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -987,20 +987,19 @@ void shader_glsl_compare(SHADER_OPCODE_A /** Process CMP instruction in GLSL (dst = src0.x > 0.0 ? src1.x : src2.x), per channel */ void shader_glsl_cmp(SHADER_OPCODE_ARG* arg) { + char tmpLine[256]; char dst_str[100], src0_str[100], src1_str[100], src2_str[100]; char dst_reg[50], src0_reg[50], src1_reg[50], src2_reg[50]; char dst_mask[6], src0_mask[6], src1_mask[6], src2_mask[6]; - + shader_glsl_add_param(arg, arg->dst, 0, FALSE, dst_reg, dst_mask, dst_str); shader_glsl_add_param(arg, arg->src[0], arg->src_addr[0], TRUE, src0_reg, src0_mask, src0_str); shader_glsl_add_param(arg, arg->src[1], arg->src_addr[1], TRUE, src1_reg, src1_mask, src1_str); shader_glsl_add_param(arg, arg->src[2], arg->src_addr[2], TRUE, src2_reg, src2_mask, src2_str); - /* FIXME: This isn't correct - doesn't take the dst's swizzle into account. */ - shader_addline(arg->buffer, "%s.x = (%s.x > 0.0) ? %s.x : %s.x;\n", dst_reg, src0_reg, src1_reg, src2_reg); - shader_addline(arg->buffer, "%s.y = (%s.y > 0.0) ? %s.y : %s.y;\n", dst_reg, src0_reg, src1_reg, src2_reg); - shader_addline(arg->buffer, "%s.z = (%s.z > 0.0) ? %s.z : %s.z;\n", dst_reg, src0_reg, src1_reg, src2_reg); - shader_addline(arg->buffer, "%s.w = (%s.w > 0.0) ? %s.w : %s.w;\n", dst_reg, src0_reg, src1_reg, src2_reg); + shader_glsl_add_dst(arg->dst, dst_reg, dst_mask, tmpLine); + shader_addline(arg->buffer, "%smix(vec4(%s), vec4(%s), vec4(lessThan(vec4(%s), vec4(0.0)))))%s;\n", + tmpLine, src1_str, src2_str, src0_str, dst_mask); } /** Process the CND opcode in GLSL (dst = (src0 < 0.5) ? src1 : src2) */ -- 1.4.0

1 2

Re: Link or rename wcmd.exe to cmd.exe?
by Neal Gompa 10 Jul '06

10 Jul '06

Forwarded because accidently did not add wine-devel to it. Also, noting that this is about Wine, not ReactOS. But both still apply. ---------- Forwarded message ---------- From: Neal Gompa <ngompa13(a)gmail.com> Date: Jul 10, 2006 5:59 PM Subject: Re: Link or rename wcmd.exe to cmd.exe? To: Thomas Kho <tkho(a)ucla.edu> Most applications I know of will check not for cmd.exe, but for command.com. I believe Windows uses a stub command.com to open up cmd.com with more limited capabilities. I believe we need both cmd.exe and command.com on ReactOS, in order to ensure compatibility. However, the state of wcmd.exemakes me think that it is not quite ready for regular usage. As such, I think you should just add a stub command.com that forwards everything to wcmd.exe, and nearly all Windows apps that have commandline dependencies (MikTeX comes in mind) use command.com, not cmd.exe. Just my 2¢. On 7/6/06, Thomas Kho <tkho(a)ucla.edu> wrote: > > On 7/1/06, Alexandre Julliard <julliard(a)winehq.org> wrote: > > "Thomas Kho" <tkho(a)ucla.edu> writes: > > > > > I'm currently looking into what would be required for something like a > > > symlink to wcmd.exe, but at the same time I'm wondering the historical > > > > reasons for choosing 'wcmd' and if it should be changed to just 'cmd'. > > > > Yes, I think it should be renamed to cmd.exe, at this point it's > > supposed to be a complete replacement. > > It's a ~500k patch to rename programs/wcmd to programs/cmd so I want > to get this as right as possible prior to submitting a patch. How much > of wcmd's identity should remain? That is--should it be a wholesale > s/wcmd/cmd or should wcmd keep the name wcmd with just the executable > name changed? > > Thomas Kho > > >

1 0

Re: Speed up GetTextExtentExPointW (Take 3)
by Huw Davies 10 Jul '06

10 Jul '06

On Mon, Jul 10, 2006 at 01:24:53PM -0700, Dan Hipschman wrote: > > Hi, > > This is a fix for http://bugs.winehq.org/show_bug.cgi?id=5569 It speeds up > the loading of the EULA for the trial version of Acrobat by about 50x. Since > the last attempt at this fix I improved performance in the case where both > lpnFit and alpDx are NULL. I also added a few more tests to cover each of > the four cases where lpnFit and alpDx are NULL/non-NULL. The tests pass in > both Wine and XP Pro. If you don't accept this, please let me know what I can > do to improve it. Thanks. There are GetTextExtentPoint entry points in both winex11.drv and wineps.drv. Both of these will need to be updated to GetTextExtentExPoint. For one other niggle see below. > diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c > index 9f52e60..2020d9d 100644 > --- a/dlls/gdi/freetype.c > +++ b/dlls/gdi/freetype.c > @@ -3849,32 +3849,43 @@ BOOL WineEngGetCharABCWidthsI(GdiFont fo ... > > size->cx = 0; > WineEngGetTextMetrics(font, &tm); > size->cy = tm.tmHeight; > > - for(idx = 0; idx < count; idx++) { > - get_glyph_index_linked(font, wstr[idx], &linked_font, &glyph_index); > + for (i = 0; i < count; ++i) > + { > + get_glyph_index_linked(font, wstr[i], &linked_font, &glyph_index); Please don't add in this sort of change, it just makes the patch even larger. Huw.

2 1

New Bugzilla Season begins
by Vijay Kiran Kamuju 10 Jul '06

10 Jul '06

Hi all, I would say lets start, checking out all the old bugs. And close all the bugs which have been fixed by latest 0.9.17 The bug count is near to 1910 or more. Last time when we did this exercise was when 0.9 was to be released. Say lets start the season again. And close all the bugs that have been fixed and revive those that are neglected. Thanks, Vijay

1 0

riched20 - patch ping
by Krzysztof Foltman 10 Jul '06

10 Jul '06

These could get in unchanged, perhaps? http://www.winehq.org/pipermail/wine-patches/2006-June/028096.html http://www.winehq.org/pipermail/wine-patches/2006-June/027940.html http://www.winehq.org/pipermail/wine-patches/2006-June/027978.html This is the one I want comments for before I split it into smaller parts (and update to take Thomas Kho's patch into account): http://www.winehq.org/pipermail/wine-patches/2006-June/028159.html Krzysztof

1 0

widl/parser.y: Correct use of free()?
by Andrew Talbot 10 Jul '06

10 Jul '06

Hi, I am trying to constify some of the "name" strings in this file. But I am running into problems caused by what seems to be an unusual use of the free() function. To my novice eye, it appears that, in functions such as get_type(), the author is trying to free strings that were not given space via malloc(). Is free() being used correctly in this file? Can I remove these calls to free()? Thanks, -- Andy.

2 2

Re: msi: Implement the InstallServices action
by Robert Shearman 10 Jul '06

10 Jul '06

James Hawkins wrote: > +static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) > +{ > ... > + service = CreateServiceW(hscm, name, disp, SERVICE_START | > GENERIC_ALL, > + serv_type, start_type, err_control, > file->TargetPath, > + load_order, NULL, depends, serv_name, pass); > + if (!service) > + ERR("Failed to create service %s: %ld\n", debugstr_w(disp), > GetLastError()); > + > + if (!StartServiceW(service, 0, NULL)) > + ERR("Failed to start service %s: %ld\n", debugstr_w(disp), > GetLastError()); Is this function really supposed to start the service as well? Shouldn't this be done by the StartServices action instead (http://msdn.microsoft.com/library/default.asp?url=/library/en-us/msi/setup/… -- Rob Shearman

2 1

Re: user[2/5]: implement A version of SPI_GETDESKWALLPAPER
by Dmitry Timoshkov 10 Jul '06

10 Jul '06

"Andrew Ziem" <ahziem1(a)mailbolt.com> wrote: > + case SPI_GETDESKWALLPAPER: /* 115 */ > + { > + WCHAR buffer[MAX_PATH]; > + ret = SystemParametersInfoW( SPI_GETDESKWALLPAPER, uiParam, buffer, fuWinIni ); > + if (!WideCharToMultiByte(CP_ACP, 0, buffer, -1, pvParam, uiParam, NULL, NULL)) > + ret = FALSE; > + break; > + } You need to check first whether the SystemParametersInfoW call succeeded or not, otherwise it will end up translating garbage in WideCharToMultiByte. -- Dmitry.

1 0

lotus notes and wine
by Dan Kegel 10 Jul '06

10 Jul '06

http://linux.slashdot.org/linux/06/07/10/121246.shtml says that IBM has Lotus Notes running in Java (on Eclipse!). Two readers commented that they've used the code, and it's uncomfortably bloated. I bet there's still a window of opportunity for Wine here. James Hawkins is fixing the wine bugs that keep Lotus Notes 6.5.3 demo from installing on Wine; if that's done before the Java version of Notes is released (in two weeks), and Notes on Wine becomes easy to set up and run, it's possible we'll get a wad of good publicity out of it...

1 0

Re: [WINED3D 1] Place immediate constants in the same array as global constants.
by H. Verbeet 10 Jul '06

10 Jul '06

On 10/07/06, Ivan Gyurdiev <ivg231(a)gmail.com> wrote: > Also note that there's diffrent lifetime rules for immediate constants > in d3d8 and d3d9, and as far as I know we implement one of them wrong. > Here I stick with the current behavior, which I think is d3d9-compliant. Yes. In d3d8 constants set with the def instructions persist between shaders.

2 2

Issue with French Canadian Keyboard Under SLED 10
by Michael Lessard 10 Jul '06

10 Jul '06

Hi everybody ! We still have an issue with wine 0.9.16 and french canadian keyboard accent, we use locale fr_FR.UTF-8 ... in terminal, accent working great but in appz who use wine, only é and ç working, all other accent (è,ê,à,ô) are replace by ç. Where can modify the config of keyboard under wine ? Or how could resolv this issue ... Is very important to work for us, many our of clients will use Wine to help migration to Linux. Thanks -- Michael Lessard Chargé de projet / Project Manager Techno Centre Logiciels Libres, http://www.tc2l.ca/ Téléphone : (418) 681-2929 poste 121

2 2

Re: DDraw: Split up the ddraw refcount
by Stefan Dösinger 10 Jul '06

10 Jul '06

Am Montag 10 Juli 2006 10:47 schrieb Stefan Dösinger: > Here is a patch with the improvement suggestions from AJ. The changes to > the older versions are: > > * Use the counter from InterlockedDecrement to check if the object has to > be destroyed > * Get rid of IDirectDrawImpl::DoNotDestroy > * Minor spelling fixes in the added comments :-) > > The aim of this is to fix the startup Star Wars Episode 1 racer and most > likely Star Wars Jedi Knight 1(Not tested, I do not have this game), and > fix the shutdown of C&C Red Alert. The 2 star wars games depend on the > individual refcounts of the interface versions, while Red Alert depends on > the different palette refcounting behavior in older interface versions. > > This patch also requires the palette refcounting fix for older interfaces > which I will resend too. > > ChangeLog: > Stefan Dösinger: Split up the ddraw refcount Grrr. Got to send another updated patch :-( I accidentally renamed Thunk_IDirect3D_3_Release to Thunk_IDirect3D_1_Release, so the older patch didn't even compile. I wonder how I could run the regression tests and my games with it. The attached patch corrects this wrong numer.

1 0

Re: riched20: add stub ITextDocument
by Alexandre Julliard 10 Jul '06

10 Jul '06

Juan Lang <juan_lang(a)yahoo.com> writes: > +#define DECL_IFACE(ifc) const I##ifc##Vtbl *lp##ifc##Vtbl; > + > +#define IFACE2IMPL(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp##ifc##Vtbl))) > +#define IMPL2IFACE(ifc,x) ((I##ifc*)&(x)->lp##ifc##Vtbl) Please avoid that sort of macros, it makes grepping for things a lot harder. Just spell things out explicitly, and for IFACE2IMPL define a couple of inline functions instead. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: include/msvcrt: Make sure size_t is properly defined for 64-bit.
by Ge van Geldorp 10 Jul '06

10 Jul '06

> diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h > index a821aa2..cc0b25e 100644 > --- a/include/msvcrt/string.h > +++ b/include/msvcrt/string.h > @@ -18,8 +18,18 @@ typedef unsigned short wchar_t; > #endif > #endif > > +#ifndef _MSC_VER > +# ifndef __int64 > +# define __int64 long long > +# endif > +#endif > + > #ifndef _SIZE_T_DEFINED > +#ifdef _WIN64 > +typedef unsigned __int64 size_t; > +#else > typedef unsigned int size_t; > +#endif > #define _SIZE_T_DEFINED > #endif Unfortunately, your changes to the submitted patch break it. The problem is that at this point _WIN64 is not defined yet. It is defined in windef.h which hasn't been included at this point. With your change, I still get the following compile-time error during compilation of dlls/msvcrt/test/data.c: In file included from data.c:21: ./../msvcrt.h:625: error: conflicting types for _strnset ../../../include/msvcrt/string.h:62: error: previous declaration of _strnset was here The patch I submitted fixes the problem by moving the include of "windef.h" a bit up: diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index fc330ce..3da416d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -36,11 +36,12 @@ #ifndef __WINE_MSVCRT_H #define __WINE_MSVCRT_H +#include "windef.h" + #include <stdarg.h> #include <ctype.h> #include <string.h> -#include "windef.h" #include "winbase.h" #include "winerror.h" #include "winnls.h" Gé van Geldorp.

3 5

GDI: SetDiBits uses hdc with DIB_RGB_COLORS (Notes Client problem)
by Stefan Siebert 10 Jul '06

10 Jul '06

Hello, I've tracked a bug on the Notes Client. It is related to Lotus Notes workspace, which shows the database symbols and their icons. Up to Wine 0.909 the icons were colored correctly. From 0.910 on the icons are black (seems that just the BitBlt mask is shown only). I found the patch for that behaviour - 'gdi: Better support for 1bpp dib sections'. A deeper look into wine revealed that the hdc parameter on SetDiBits is always used to get the color depth. Before the mentioned patch, parameters to the winex11drv functions for the related physDev were set to NULL for DIB_RGB_COLORS. An easy but not really clean way would be to just create a new hdc for the DISPLAY in SetDiBits for DIB_RGB_COLORS and use this instead. My question is if anyone has an idea how to get this correctly implemented.

1 0

Re: [AppDB] - clean up testResult::ShowTestResult() and testResult::ShowVersionsTestingTable()
by Tony Lambregts 10 Jul '06

10 Jul '06

Chris Morgan wrote: > Eliminate redundant parameters from these functions. Have version class check > to see if the $iTestingId seems valid. > > Patch removes a query for each call to testResult::ShowTestResult() because we > don't actually have to re-query the database for information already stored > in the class. > > > Looks fine. -- Tony Lambregts

1 0

Re: [AppDB] - speed loading of the main page by optimizing screenshot class
by Tony Lambregts 10 Jul '06

10 Jul '06

Chris Morgan wrote: > I think this is the cleanest this can be done until we get php5 on the server, > then we'll be able to private the images in the screenshot class. > > This patch defers loading the thumbnail and screenshot images into memory > until they are necessary. Doing so requires that we not have any users of > the screenshot class accessing the $oScreenshotImage or $oThumbnailImage > fields directly. > > looks good

1 0

http://source.winehq.org/git shows no history anymore
by Paul Vriens 09 Jul '06

09 Jul '06

Hi, I was curious about some changes made in the past and tried to get the history. All I get is empty pages (expect for the headers). Any idea? Cheers, Paul.

1 0

re: Possible bug in WINE or NDISWRAPPER
by Dan Kegel 09 Jul '06

09 Jul '06

Jacob wrote: > [I use both Wine and NDISWRAPPER. After a while, my network breaks. > Is this a bug in Wine, or in NDISWRAPPER?] I don't know where the bug is, but it's not in Wine. Wine is a pure user-level app, it *can't* break the system's networking. It's either a bug in NDISWRAPPER or in the driver you're using it with. Please contact the ndiswrapper folks. - Dan

1 0

[AppDB] Fix Bug links
by Tony Lambregts 08 Jul '06

08 Jul '06

This patch is meant to start a discussion more than anything else. We currently have no way of sorting test results in a reasonable order. If we sort by testedRating the order is not what we want. IE: Bronze, Garbage, Gold, Platinum and Silver. It might be better in the long run to replace testedRating in testResults with ratingId. That however is a fairly big project. (You need to run the table/testRating.sql script in mysql to test this patch out.) Change Log: Sort test results by rating in distributions Files Changed: include/distributions.php New File: tables/testRating.sql

2 1

Re: SetLastError in CreateWindowEx
by James Hawkins 08 Jul '06

08 Jul '06

On 7/7/06, Dan Hipschman <dsh(a)linux.ucla.edu> wrote: > I noticed that sometimes when CreateWindowEx fails and the app tries to > display a helpful error message, you get something like "Couldn't create > window: Success." These are the error codes that XP sets for the given > failures. > > ChangeLog: > * Correctly call SetLastError in a few places where CreateWindowEx fails. This is a great candidate for a conformance test. -- James Hawkins

1 0

Possible bug in WINE or NDISWRAPPER
by Jacob Reynoldson 08 Jul '06

08 Jul '06

Greetings! First off, let me say that I recently switched to Ubuntu Linux from WinXP, and with Wine powering the only Windows program I ever used (that doesnt have a Linux version like Firefox, GAIM, OO.o, etc), and I couldnt be happier. Secondly, I apologize for contacting in this manner, since the FAQ says this is where suggestions go, so I hope this is where you want this comment. Now on to what I believe might be a repeatable bug. Setup: Ubuntu 6.06 (Dapper), fully updated as of 7/7/2006. D-Link wireless USB DWL-G132. Wine 0.9.16 (current). I have been using NDISWRAPPER to use my wireless device, a Dlink DWL-G132. I have not had any trouble with this device since I got it running in Linux. Wine has been running without error, and the programs I have been running are AORC+ (1.0.56 version), and Anarchy Online (Fully upgraded, all expansions). I am able to achieve 20-60 FPS with Anarchy Online, which rivals my Windows Install (but I am running only 16 bit graphics to do it). The issue is this: I am uncertain which is the culprate (my guess is NDISWRAPPER), but when I run Anarchy Online for more than a few minutes, my network cuts out (the program doesnt close or crash), and I am unable to reconnect to the Internet using any method I know (Soft reboot Gnome, removing Wine from memory, disabling and re-enabling the wireless device). To reconnect, I have to reboot. When I run off of my ethernet card (Nvidia Nforce2, on board), everything runs flawlessly until I chose to quit. Since I am unable to isolate (given my current toolset) whether it is Wine or Ndiswrapper, it appears that the interaction between the two buckle under the strain of playing a MMO... unless my wireless device is faulty. I have not had these troubles in Windows XP (Service Pack 2), and Wine works fine when I run from my ethernet port. I hope this is useful, I just wasnt sure who needed to be contacted in regards to this possible conflict. Sincerely, Jacob Reynoldson, new Ubuntu convert. -- Jacob Reynoldson Currently located in: Huntington Beach, California

1 0

Re: msi: appsearch
by Juan Lang 07 Jul '06

07 Jul '06

> if trying to find a DLL that is located in the system directory, also check for > a builtin version Can't this be done by putting a fake dll entry in wine.inf? --Juan

2 2

Re: ole32: Get the threading model value for inproc classes and output a fixme if we should create it in an apartment of another type.
by Alexandre Julliard 07 Jul '06

07 Jul '06

Robert Shearman <rob(a)codeweavers.com> writes: > dlls/ole32/compobj.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 45 insertions(+), 0 deletions(-) This one crashes the urlmon tests: ../../../tools/runtest -q -P wine -M urlmon.dll -T ../../.. -p urlmon_test.exe.so url.c && touch url.ok wine: Unhandled page fault on read access to 0x0000000c at address 0x407536a9 (thread 0323), starting debugger... WineDbg starting on pid 0x322 Unhandled exception: page fault on read access to 0x0000000c in 32-bit code (0x407536a9). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:003b GS:0033 EIP:407536a9 ESP:406cf6b0 EBP:406cfb58 EFLAGS:00010202( - 00 - -RI1) EAX:00000000 EBX:407ab11c ECX:40380020 EDX:40380024 ESI:40034000 EDI:0000005c Stack dump: 0x406cf6b0: 40380000 00000008 00000010 406cfb44 0x406cf6c0: 406cfb2c 406cfb48 406cf6d8 406cf71c 0x406cf6d0: 00000040 406cf82c 0000004a 401cdc5e 0x406cf6e0: 403ce208 406cf704 406cf718 00000498 0x406cf6f0: 406cfb48 406cfb44 401ed0eb 406f9df0 0x406cf700: 406cfc80 406cf75c 406cf798 401f18ed Backtrace: =>1 0x407536a9 get_inproc_class_object+0xa9(hkeydll=0x5c, rclsid=0x406cfc80, riid=0x406f9df0, ppv=0x406cfd64) [/home/julliard/wine/wine/dlls/ole32/compobj.c:1593] in ole32 (0x407536a9) 2 0x4075407e CoGetClassObject+0x1fe(rclsid=0x406cfc80, dwClsContext=0x1, pServerInfo=0x0, iid=0x406f9df0, ppv=0x406cfd64) [/home/julliard/wine/wine/dlls/ole32/compobj.c:1710] in ole32 (0x4075407e) 3 0x406ed5b6 get_protocol_iface+0x1a6(schema=0x406cfce0, schema_len=<register not in topmost frame>, ret=0x406cfd64) [/home/julliard/wine/wine/dlls/urlmon/session.c:95] in urlmon (0x406ed5b6) 4 0x406ed88f get_protocol_info+0xff(url=0x403ce460) [/home/julliard/wine/wine/dlls/urlmon/session.c:124] in urlmon (0x406ed88f) 5 0x406e9c12 CoInternetCombineUrl+0x32(pwzBaseUrl=0x403ce460, pwzRelativeUrl=0x405b8cf6, dwCombineFlags=0x0, pwzResult=0x403ce3a0, cchResult=0x3d, pcchResult=0x406cfe10, dwReserved=0x0) [/home/julliard/wine/wine/dlls/urlmon/internet.c:197] in urlmon (0x406e9c12) 6 0x406f1ef6 CreateURLMoniker+0x166(pmkContext=0x403ce320, szURL=0x405b8cf6, ppmk=0x406cfe94) [/home/julliard/wine/wine/dlls/urlmon/umon.c:1077] in urlmon (0x406f1ef6) 7 0x405b4881 func_url+0xa1 [/home/julliard/wine/wine/dlls/urlmon/tests/url.c:109] in urlmon_test (0x405b4881) 8 0x405b58c1 run_test+0x121(name=0x403804a7) [/home/julliard/wine/wine/dlls/urlmon/tests/../../../include/wine/test.h:365] in urlmon_test (0x405b58c1) 9 0x405b5be9 __wine_spec_exe_entry+0x99(peb=0x40219820) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:37] in urlmon_test (0x405b5be9) 10 0x405000bb start_process+0xeb(arg=0x0) [/home/julliard/wine/wine/dlls/kernel/process.c:832] in kernel32 (0x405000bb) 11 0x4001da77 wine_switch_to_stack+0x17 in libwine.so.1 (0x4001da77) 0x407536a9 get_inproc_class_object+0xa9 [/home/julliard/wine/wine/dlls/ole32/compobj.c:1593] in ole32: movl 0xc(%eax),%eax 1593 if (apt->multi_threaded) Wine-dbg> -- Alexandre Julliard julliard(a)winehq.org

3 2

Re: DDraw: Split up the ddraw refcount
by Alexandre Julliard 07 Jul '06

07 Jul '06

Stefan Dösinger <stefandoesinger(a)gmx.at> writes: > + if(ref == 0) InterlockedDecrement(&This->numIfaces); > > - /* This is for the dll cleanup code in DllMain() */ > - if(!This->DoNotDestroy) > - IDirectDrawImpl_Destroy(This); > - } > + /* Checks the refcount before actually destroying the object */ > + IDirectDrawImpl_Destroy(This); This isn't thread safe, you should only call Destroy when the InterlockedDecrement returns 0, otherwise there's no point in using interlocked functions at all. Also you should get rid of the DoNotDestroy flag and use the refcount for that. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: oleaut32: Copying a NULL BSTR should result in an empty BSTR in VariantCopy
by Robert Shearman 07 Jul '06

07 Jul '06

qingdoa daoo wrote: >Hi, > >This patch should fix Bug 4141 > >Changelog: > Copying a NULL BSTR should result in an empty BSTR in VariantCopy > >------------------------------------------------------------------------ > >--- dlls/oleaut32/variant.c.cvs 2006-07-05 17:23:04.000000000 +0800 >+++ dlls/oleaut32/variant.c 2006-07-05 17:31:53.000000000 +0800 >@@ -719,13 +719,16 @@ HRESULT WINAPI VariantCopy(VARIANTARG* p > else if (V_VT(pvargSrc) == VT_BSTR) > { > if (V_BSTR(pvargSrc)) >- { > V_BSTR(pvargDest) = SysAllocStringByteLen((char*)V_BSTR(pvargSrc), SysStringByteLen(V_BSTR(pvargSrc))); >- if (!V_BSTR(pvargDest)) >- { >- TRACE("!V_BSTR(pvargDest), SysAllocStringByteLen() failed to allocate %d bytes\n", SysStringByteLen(V_BSTR(pvargSrc))); >- hres = E_OUTOFMEMORY; >- } >+ else >+ { >+ OLECHAR c = 0; >+ V_BSTR(pvargDest) = SysAllocString(&c); >+ } >+ if (!V_BSTR(pvargDest)) >+ { >+ TRACE("Allocation failed for destination BSTR\n"); >+ hres = E_OUTOFMEMORY; > } > } > else if (V_VT(pvargSrc) == VT_RECORD) > > I think you could get the same result by just removing the "if (V_BSTR(pvargSrc)" check. This should result in simpler code. -- Rob Shearman

1 0

Re: [AppDB] - cleanup require/require_once()/include()
by Jonathan Ernst 07 Jul '06

07 Jul '06

Le vendredi 07 juillet 2006 à 00:37 -0400, Chris Morgan a écrit : > Use require() for path.php and include/incl.php. We can't proceed without > these files. Use require_once() for all include/*.php files. To simplify > inclusion each file includes the other files it needs. In this manner we > don't have to include "mail.php" when we include "application.php", something > that was done all over the place in the appdb. Remove unnecessary includes > of mail.php and other classes that weren't being used. Add missing includes > for some classes that were being used but not being included. > > Chris > That makes sense to me.

1 0

Re: [ntdll/tests] Added some NULL testing
by Alexandre Julliard 07 Jul '06

07 Jul '06

Paul Vriens <Paul.Vriens(a)xs4all.nl> writes: > Hi, > > added some tests with NULL parameters. > > Changelog > Added some NULL testing I appreciate your willingness to write tests, but please don't spend too much effort on testing NULL inputs, it's not an interesting case unless there's a specific app that depends on it. Otherwise we end up adding NULL checks all over the place for no good reason. It's much more interesting to test valid inputs. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: FIXED: Running siap and modules under wine, first steps
by Alex Villacís Lasso 07 Jul '06

07 Jul '06

Maximiliano Curia wrote: > On Monday 12 June 2006 14:59, you wrote: > >> As of 2006-06-09, the CVS snapshot of Wine seems to run SIAP correctly. >> No crashes at all. Could you please be so kind as to test with the *most >> recent CVS snapshot* and confirm? >> > > I tested SIAP under one of the 0.9.15 nightly snapshots, and another > 0.9.16 nightly snapshot. It did work better than before, but some > things are still not working right. > > One thing is that the installations done by "WineTools" are needed to > get SIAP working, and the latest Wine does not work with WineTools. > However, I used a previous "drive_c" with WineTools already applied to > it, and got the app to start and could test it. > > Currently, the Siap program itself works fine, but when you load any > external modules, it doesn't work correctly. Some modules won't load at > all, some other would crash and the wine debugger would be called, and > some of them would load ok. > > This is quite difficult to debug, since the program itself is really > messy. It's amazing the job that has been done by the Wine team up to > now. Anyway, if you want to download them, these are some of the > conflicting modules: > > ftp://www.afip.gov.ar/sicore/sicorev62r0.exe > ftp://www.afip.gov.ar/multinota/multinota.exe > > The first one doesn't even load, the second one loads, but crashes when > clicking on something. > > Also, after trying several things the siap installation broke. > > First, could you please *not* use WineTools with recent Wine versions? There has been lots of discussions in wine-devel over whether WineTools is actually damaging a Wine installation instead of helping it. If you want to keep a WineTools-modified .wine directory, please rename it, then re-install SIAP. The .wine directory will be recreated if it does not exist. All of my tests are done without WineTools, in order to remove interference. Could you please provide me with the valid format of a CUIT number for a record? I need it in order to create a record that is accepted by the plugin modules - all of them require a record with a CUIT in order to run. Alex Villacís Lasso

1 0

Re: [AppDB] - preferences.php cleanups
by Jonathan Ernst 07 Jul '06

07 Jul '06

Le vendredi 07 juillet 2006 à 01:06 -0400, Chris Morgan a écrit : > Stop using global variables in preferences.php. Reorder functions so we don't > have php code running and functions in the middle of it. Rename a couple of > variables to match our current variable naming convention. > > Chris > This one will conflict with the filter.php enabling in this file, can you redo it afterwards ? Thanks.

1 0

Re: [AppDB] - move getMaintainersUserIds...() to version::getMaintainersUserIds()
by Jonathan Ernst 07 Jul '06

07 Jul '06

Le vendredi 07 juillet 2006 à 01:21 -0400, Chris Morgan a écrit : > Move getMaintainersUserIds...() to version::getMaintainersUserIds() and fixup > callers of this function. > > Chris > > > This one looks fine to me.

1 0

Re: Testing help needed: Pixel format whitelisting
by Jason Green 07 Jul '06

07 Jul '06

On 7/1/06, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > Hi, > The attached patch modifies IWineD3D::CheckDeviceFormat to whitelist supported > formats and return unsupported on unknown formats. Games which use funky > float formats or simmilar things should then see that the formats aren't > supported and (hopefully) fall back to less fancy formats. Before I send it > to wine-patches I'd like to know however how those games react to the change. > (Do they just fail with an error message or fall back to other formats). Here are my [limited] results: Prior to your patch, I'd get these errors from the startup of newer games (Oblivion, Civ4 at least): err:d3d:IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt unsupported format WINED3DFMT_A4R4G4B4 err:d3d:IWineD3DImpl_IsGLXFBConfigCompatibleWithRenderFmt unsupported format WINED3DFMT_A8 ... That list would go on for a ton of formats. After this patch, I still get it for the following formats: WINED3DFMT_X4R4G4B4 WINED3DFMT_A4R4G4B4 WINED3DFMT_A8 WINED3DFMT_A8R3G3B2 But, everything else remains the same in those apps. Half Life 2, on the other hand, won't launch the level after the patch (at least with pixel shaders enabled). I've attached the d3d_caps logs grepped for "CheckDeviceFormat" from before and after for comparison. The game launches, but it gets about half-way through the status bar loading the first level (Point Insertion), and then crashes.

1 1

Debugging _CheckNotSysLevel() errors?
by Dan Kegel 07 Jul '06

07 Jul '06

http://bugs.winehq.org/show_bug.cgi?id=4063 is a crash on exit from a VB6 app due to a _CheckNotSysLevel() error. What typically causes these - are they a bug in the windows program? And is there a good reference from understanding the whole syslevel thing in gdi? Thanks!

3 3

Re: winecfg: Shift Graphics page up to fill the empty place.
by Ivan Gyurdiev 07 Jul '06

07 Jul '06

Speaking of the graphics page... 1. Is there a reason why we allow the user to choose software vs hardware shaders? (i.e. why isn't this a developers' option, or no option at all) 2. Is there a reason why we allow the user to disable vertex and/or pixel shaders?

1 0

wine packages for Fedora Extras
by Andreas Bierfert 07 Jul '06

07 Jul '06

Hi, some of you might have noticed that building 0.9.16 for Fedora Extras took me more time then the releases before. This was because of the discussions from a couple of weeks ago on this list. As a result I did spent some time on the mentioned issues and came across an easy solution: If you install wine form the Fedora Extras repository via 'yum install wine' nearly everything that would be in a monolithic package is going to be installed. The 'wine' package now is a meta-package containing requires for the various subpackages. So now 'normal' users who do a 'yum install wine' will get everything they need and experts who know what they are doing can go and install only the parts they want. I hope that this solution now leads to fewer 'false positives' on bug reports and for better user integration and satisfies some of the things you, the wine folks, brought up. Thanks for the input on this matter. I hope that this is only the first step towards a good relation ship between wine and the fedora packages for wine and that emails like the ones from a couple of weeks back won't happen again... So for the announcement: wine 0.9.16 for Fedora Extras 3,4,5,devel is build and should be pushed to the mirrors in a couple of hours. - Andreas -- Andreas Bierfert | http://awbsworld.de | GPG: C58CF1CB andreas.bierfert(a)lowlatency.de | http://lowlatency.de | signed/encrypted phone: +49 2402 102373 | cell: +49 173 5803043 | mail preferred

4 4

RE: include/msvcrt: Make sure size_t is properly defined for 64-bit.
by Ge van Geldorp 07 Jul '06

07 Jul '06

> From: Ge van Geldorp [mailto:ge@gse.nl] > > Yes, this works fine, both with and without the change to > include/msvcrt/string.h. Sorry, I only tested dlls/msvcrt. When doing a full rebuild I get errors, will investigate and let you know. Ge.

1 0

[AppDB] Re: appdb/include incl.php
by Jonathan Ernst 07 Jul '06

07 Jul '06

Le jeudi 06 juillet 2006 à 21:36 -0500, WineHQ a écrit : [...] > > +/** > + * rename $_REQUEST variables to preserve backwards compatibility > + * with bugzilla links and urls in emails and on google from before our > + * mass rename of GPC variables to use our coding standard prefixing > + * > + * NOTE: we may be able to remove these backwareds compatibility changes > + * in a few years, check in mid 2007 to see how many old > + * links are still poping up in google then > + */ > +if(isset($_REQUEST['versionId'])) > +{ > + $_REQUEST['iVersionId'] = $_REQUEST['versionId']; > + unset($_REQUEST['versionId']); > +} > +if(isset($_REQUEST['appId'])) > +{ > + $_REQUEST['iAppId'] = $_REQUEST['appId']; > + unset($_REQUEST['appId']); > +} This (+catId) is enough IMHO, looking at the results of google when you search for site:appdb.winehq.org, you'll see than only pages with catId, versionId and appId are indexed and I can't think of any reason that would make someone link to the AppDb with buglinkId or sub for example. > +if(isset($_REQUEST['buglinkId'])) > +{ > + $_REQUEST['iBuglinkId'] = $_REQUEST['buglinkId']; > + unset($_REQUEST['buglinkId']); > +} > +if(isset($_REQUEST['catId'])) > +{ > + $_REQUEST['iCatId'] = $_REQUEST['catId']; > + unset($_REQUEST['catId']); > +} > +if(isset($_REQUEST['sub'])) > +{ > + $_REQUEST['sSub'] = $_REQUEST['sub']; > + unset($_REQUEST['sub']); > +} > +if(isset($_REQUEST['topic'])) > +{ > + $_REQUEST['sTopic'] = $_REQUEST['topic']; > + unset($_REQUEST['topic']); > +} > +/* End backwards compatibility code */ > + > + > + > // create arrays > $sidebar_func_list = array(); > $help_list = array(); > > >

1 0

[AppDB] Re: appdb/include filter.php
by Jonathan Ernst 07 Jul '06

07 Jul '06

Le jeudi 06 juillet 2006 à 23:49 -0500, WineHQ a écrit : > ChangeSet ID: 26258 > CVSROOT: /opt/cvs-commit > Module name: appdb > Changes by: wineowner(a)winehq.org 2006/07/06 23:49:32 > > Modified files: > include : filter.php > > Log message: > Tony Lambregts <tony.lambregts(a)gmail.com> > filter_gpc() should ignore any bugzilla parameters to avoid errors when these cookies are set > > Patch: http://cvs.winehq.org/patch.py?id=26258 > > Old revision New revision Changes Path > 1.3 1.4 +12 -1 appdb/include/filter.php > > Index: appdb/include/filter.php > diff -u -p appdb/include/filter.php:1.3 appdb/include/filter.php:1.4 > --- appdb/include/filter.php:1.3 7 Jul 2006 4:49:32 -0000 > +++ appdb/include/filter.php 7 Jul 2006 4:49:32 -0000 > @@ -42,8 +42,19 @@ function filter_gpc() > util_show_error_page_and_exit("Fatal error: ".$aKeys[$i]." should be an array."); > break; > default: > - if($aKeys[$i]!="whq_appdb" && $aKeys[$i]!="MAX_FILE_SIZE") // whq_appdb is the name of the session cookie > + if($aKeys[$i]!="whq_appdb" && // don't filter the appdb session cookie > + > + // or any bugzilla cookies > + $aKeys[$i]!="BUGLIST" && > + $aKeys[$i]!="DEFAULTFORMAT" && > + $aKeys[$i]!="Bugzilla_login" && > + $aKeys[$i]!="LASTORDER" && > + $aKeys[$i]!="Bugzilla_logincookie" && > + $aKeys[$i]!="DEFAULTFORMAT" && > + $aKeys[$i]!="MAX_FILE_SIZE") These cookies cannot be accessible in the real AppDB as bugzilla and AppDB are in separate hosts... I don't think this patch makes any sense in AppDB. A better fix would be to don't clear $_COOKIES in filter.php and have a unit test that checks that $_COOKIES is not used anywhere in the code (only in filter.php).

1 0

appdb url format change problem
by Dan Kegel 07 Jul '06

07 Jul '06

All the links in Google to the appdb are of the form http://appdb.winehq.org/appview.php?appId=86 This no longer works. The new format appears to be http://appdb.winehq.org/appview.php?iAppId=86 Can we change the appdb code to also accept the old format? Thanks!

2 2

Troubles ith newest Ogre demo's
by Louis. Lenders 06 Jul '06

06 Jul '06

Hi, the ogre demos from http://prdownloads.sourceforge.net/ogre/OgreDemos_1.2.0.msi?download are nice for testing wine's directx as you can run the samples in opengl and directx mode. The Newest samples fail however with an error that the application has made an attempt to load the C runtime library incorrectly. I then applied this patch: http://bugs.winehq.org/attachment.cgi?id=2500&action=view from Mike Mccormack, but it still failed. A trace showed this: 0009:Call kernel32.FindFirstFileW(7fc9bb14 L"C:\\Program Files\\OgreDemo\\Microsoft.VC80.CRT.manifest",7fc977ac) ret=78133da7 After a simple 'touch Microsoft.VC80.CRT.manifest' the demo's start just fine. Two simple questions: 1. Is there a reason that this patch has never been sent in? It also fixes another application with same problem. If not, could it be sent in. 2. Does wine need to provide this Microsoft.VC80.CRT.manifest file (as far as i understand this is an xml file) or should this file be provided by the application, and is this just Ogre's fault. thanks --------------------------------- All new Yahoo! Mail "The new Interface is stunning in its simplicity and ease of use." - PC Magazine

2 1

Link or rename wcmd.exe to cmd.exe?
by Thomas Kho 06 Jul '06

06 Jul '06

I'd like to restart this old thread <http://www.winehq.com/hypermail/wine-users/2005/05/index.html#165> which brings up the point that there are applications that hard-code cmd.exe and (sometimes intentionally) ignore COMSPEC. One example is Perl, which has the following comment in win32/win32.c: /* we don't use COMSPEC here for two reasons: * 1. the same reason perl on UNIX doesn't use SHELL--rampant and * uncontrolled unportability of the ensuing scripts. * 2. PERL5SHELL could be set to a shell that may not be fit for * interactive use (which is what most programs look in COMSPEC * for). */ I'm currently looking into what would be required for something like a symlink to wcmd.exe, but at the same time I'm wondering the historical reasons for choosing 'wcmd' and if it should be changed to just 'cmd'. Thomas Kho

3 3

Greetings
by Dan Hipschman 06 Jul '06

06 Jul '06

Hello, I've been asked to introduce myself. You can figure out a lot from my email. My name is Dan, I'm an undergrad at UCLA and I like Linux. I've never worked for Microsoft or even visited a Microsoft office (I drove by one once). I'll be working on slow loading times of Richedit documents for a while. All my patches will be licensed under the LGPL. I hope you find them useful. - Dan

3 2

Re: DDraw: Split up the ddraw refcount
by Stefan Dösinger 06 Jul '06

06 Jul '06

Am Mittwoch 05 Juli 2006 18:27 schrieb Stefan Dösinger: > Am Mittwoch 05 Juli 2006 02:27 schrieb Stefan Dösinger: > > The DirectDraw reference counting is a bit more complex than it seemed at > > first. The unit test in that patch shows that the IDirectDraw, > > IDirectDraw2, IDirectDraw4 and IDirectDraw7 interfaces of one object have > > their own reference count. The object is the same, the test with > > SetCooperativeLevel shows this(Setting a focus window returns an error in > > exclusive mode). Interestingly the IDirect3DX interfaces do not have > > their own refcount, instead they are linked to a DirectDraw interface > > refcount. > > > > This patch splits up the IDirectDrawImpl::ref member in ref7, ref4, ref2 > > and ref1 and changes the AddRef and Release methods accordingly. Of > > course a number of tests to show this behavior are included :-) > > > > I will also send a patch which fixes some reference counting issues with > > Palettes, and both patches depend on each other. So please apply either > > both patches or none of them if one is wrong. > > > > ChangeLog: > > Stefan Dösinger: Split the ddraw refcount > > Here is an updated patch, it implements the destroy condition as suggested > by Rob and adds the accidentally dropped SetCooperativeLevel(NULL, > DDSCL_NORMAL) cooplevel and screen mode restoring call. Oh wait, this is not necessarilly correct. Considered that Direct3D came with DirectX 3.0 (I think) IDirect3D(1) isn't necessarily linked to IDirectDraw(1). I will add some more tests to check for that, do not apply this patch for now

1 0

Re: ActiveDS Stubs
by Detlef Riekenberg 06 Jul '06

06 Jul '06

Matthew Maurer wrote: > Description: Adds stubs for all functions in ActiveDS documented by > MSDN, noting which ones are not. Thanks for working on this dll. >From activeds_main.c: > * This file contains only stubs to get the printui.dll up and running printui.dll and localspl.dll import all "activeds.dll" - Functions by ordinal, so the ordinals must not change (activeds.spec)! About your added FIXME: Changing the Parameter-Order or display some Parameter inside the Bracket and some Parameter outside the Bracket will confuse other Developer. Never do that. I also suggest to add the stubs only, when needed by an App. When you want to implement the Functions / COM-Interfaces, it might be a good Idea to add a seperate sourcefile. More Infos: The German Book (at the Library) "Windows Script Referenz" (from Microsoft Press) has the SDK, Documentation and Install-Packages on the CD. I can give ISBN and Author next week. -- By By ... ... Detlef

1 0

Re: wine's fullscreen code has no effect on metacity
by Neal Gompa 06 Jul '06

06 Jul '06

This is forwarded because I forgot to CC it... Sorry ---------- Forwarded message ---------- From: Neal Gompa <ngompa13(a)gmail.com> Date: Jul 5, 2006 5:54 PM Subject: Re: wine's fullscreen code has no effect on metacity To: Vincent Povirk <madewokherd+d41d(a)gmail.com> I do not know if this helps, but on some games, Wine correctly activates fullscreen mode in metacity, but in others, it just resizes the screen and gets stuck that way... For example, Sim City 3000. Ubuntu Breezy and Fedora Core 5 cannot seem to properly go into fullscreen mode. But when running Where in Time is Carmen Sandiego? metacity properly activates fullscreen mode with it. Same thing with ClueFinders, etc. On 7/4/06, Vincent Povirk <madewokherd+d41d(a)gmail.com> wrote: > I've enabled that key combination, and I can now make gedit fullscreen > with alt+f11 so I think that's working properly (this is nifty; wonder > how I missed it..). > > Pressing alt+f11 when windows firefox thinks it's in fullscreen mode > has no effect. xprop shows no _NET_WM_STATE. > > However, it does work (sort of) if I press it when firefox is not in > fullscreen mode, except that I can see part of the bottom panel (but > can't interact with it; I assume it's really firefox's window there > but firefox hasn't drawn anything). xprop does show > _NET_WM_STATE_FULLSCREEN when I do that. > > I'm not aware of anything different about how wine sets fullscreen > from other programs that I know work with metacity (I've compared the > source code and as far as I can tell it's identical, unless wine is > doing something else I'm not aware of). > > > Yeah, that looks really odd. That alone almost certainly means > > there's either a bug in KWin, metacity, or the EWMH. Could you try > > something for me to see if we can narrow down the cause? There's a > > special keybinding in Gnome, disabled by default, for manually setting > > windows to fullscreen mode. Could you run > > gnome-keybinding-properties, find the "Toggle fullscreen mode" item in > > the list, click on it, press some special key combo (e.g. Alt-F11), > > then focus your window in question, and press that key combo? That > > should make the window fullscreen and place it on top. If you could > > check the xprop thing again at that point just to verify the > > _NET_WM_STATE, that would also help. > > > > After we know that, we can try seeing if you're setting the state in a > > weird way that KWin accepts but other WMs don't, or are setting it in > > a valid but slightly different way that Metacity should accept but > > doesn't, or if Metacity is doing something else weird. > > > > Cheers, > > Elijah > > > > > -- > Vincent Povirk > > >

3 2

Re: [WiKI] Common site menu 4/4
by Dimi Paun 06 Jul '06

06 Jul '06

On Sat, 2006-06-03 at 16:20 -0600, Tony Lambregts wrote: > Change log: update menus for all sites to have a common "WineHQ Menu". OK, it's in, it needed a few fixes, but it should be good now. My apologies for the long delay in getting this in. -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

2 1

Re: [dinput] infos
by Christoph Frick 06 Jul '06

06 Jul '06

On Thu, Jul 06, 2006 at 01:28:21PM +0200, Christoph Frick wrote: > - i have to find the range an app expects the min/max are - either we > have to map the hardware allready to something sane - or we have to > fix map_axis; currently my flight stick reports 0-2**16 - with the > center at 2**15 this overflows map_axis (2**31+X in int is <0) - this > would be a problem with apps, that rely/work with GetProperty/range riddle solved - map_axis needs fixing; the ranges are the full LONG range. -- cu

1 0

Re: Win64 patch 1/5 (configure)
by Alexandre Julliard 06 Jul '06

06 Jul '06

Ge van Geldorp <ge(a)gse.nl> writes: > Changelog: > Ge van Geldorp <ge(a)gse.nl> > - Allow relocation on x86_64 Is that really needed for Win64? And if so, shouldn't it use a more appropriate address? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: [ntdll][3/3] Fix returncode for NtDeleteKey (with test)
by Alexandre Julliard 06 Jul '06

06 Jul '06

Paul Vriens <Paul.Vriens(a)xs4all.nl> writes: > Some original tests still fail for NT4, haven't looked into that (yet). > > Changelog > Fix returncode for NtDeleteKey (with test) This should be fixed in the server. -- Alexandre Julliard julliard(a)winehq.org

3 5

Re: ActiveDS Stubs
by Mike McCormack 06 Jul '06

06 Jul '06

Matthew Maurer wrote: > (Sorry, I missed one debugstr_w call in my first patch, this is the same > thing only with that there. I promise it won't happen again.) It's easy enough to submit a few smaller patches. If you do so, you'll avoid having to resend everything when there's a small problem with your patch, and as smaller patches are easier to read, there's more chance some of them will be accepted in to the tree. Mike

1 0

Re: [PATCH 10/11] server: add calls to get/set menu item info
by H. Verbeet 06 Jul '06

06 Jul '06

On 29/06/06, Thomas Kho <tkho(a)ucla.edu> wrote: > +@REQ(get_menu_item_info) > + user_handle_t handle; > + unsigned int pos; > +@REPLY > + unsigned int required_size; > + > + unsigned int type; > + unsigned int state; > + unsigned int id; > + user_handle_t submenu; > + user_handle_t checkbit; > + user_handle_t uncheckbit; > + void* text; > + unsigned long itemdata; > + void* typedata; > + user_handle_t bmpitem; > + > + rectangle_t rect; > + unsigned int xTab; > + dimension_t bmpsize; > + > + VARARG(text,unicode_str); > +@END HBITMAPs aren't technically user handles, and afaik you can't pass GDI handles between processes like that. At least, not on Windows.

4 9

Re: [WINED3D 3] Only link and use GLSL programs if at least one GLSL shader is available.
by H. Verbeet 06 Jul '06

06 Jul '06

On 04/07/06, Ivan Gyurdiev <ivg231(a)gmail.com> wrote: > There's something wrong with this patch... I'm not sure what it is yet, The 0 program (fixed function) doesn't get set anymore when there are no shaders.

2 3

re: Wine packages for Fedora Extras
by gslink 05 Jul '06

05 Jul '06

There is only one other thing that really needs to be in the source for this. There needs to be a SHORT description of exactly how this differs from the Wine CVS tree. The description should also include any interesting comments That would make tinkering much easier. I once had Wine blow up because I had a defective Fontforge and I didn't even know Wine used Fontforge because it wasn't in the documentation.

1 0

re: Link or rename wcmd.exe to cmd.exe?
by Dan Kegel 05 Jul '06

05 Jul '06

chris kcat wrote: >Not sure if this is the best place to bring this up, but I'm not sure >it's "ready". The problem is it runs through the terminal the Wine was exec'd >from. When Wine is run from the desktop manager's menu, or started in the >background (eg. wine foo.exe &), if wcmd is subsequently exec'd, it will >become completely unuseable since it has no input, and potentially no output, >terminal. It then has to be killed through the kill or killall command. Have you ever seen this be a problem in the real world? >To be "ready", wouldn't it need to open up its own terminal window for input >and output in Wine's desktop space (eg. the virtual desktop if it's in use, >or the standard desktop)? No. That would destroy its usefulness in background applications. - Dan

4 7

Re: RESEND: enhmetafile: Read and write support for little-endian EMFs on big-endian machines
by Phil Krylov 05 Jul '06

05 Jul '06

Hi, Is anything wrong with that patch? On 25/06/06, Phil Krylov <phil(a)newstar.rinet.ru> wrote: > Hi, > > This version has no ugly macros and adds read support. Diffed against current > CVS. > > ChangeLog: > > enhmetafile: Read and write support for little-endian EMFs on big-endian > machines. -- Ph.

1 1

[WINED3D: Review] Hook software shaders into drawStridedSlow
by Ivan Gyurdiev 05 Jul '06

05 Jul '06

I am hoping someone (Stefan?) will help me with testing/review here, because I don't have the apps and the disk space to test properly. This changes things in drawStridedSlow, which is an important code path, so correctness and performance matter (for non shader apps). If there is no feedback I'll submit the patch as is. ==================== - split drawStridedSlow into "prepare" and "draw" segments - fixed_prepare_draw (vs swshader_prepare_draw), and draw_vertex. - do not load or unload attribute arrays for software shaders make software shaders go through the drawStridedSlow code path - disable VBOs for software shaders - delete the old (disabled) swshader hook. --- dlls/wined3d/device.c | 4 dlls/wined3d/drawprim.c | 786 +++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 9 3 files changed, 267 insertions(+), 532 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 714bb1d..076cc58 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -738,10 +738,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl * dx7 apps. * There is a IDirect3DVertexBuffer7::Optimize call after which the buffer can't be locked any * more. In this call we can convert dx7 buffers too. + * + * Also, disable VBOs for software shaders. */ conv = ((FVF & D3DFVF_POSITION_MASK) == D3DFVF_XYZRHW ) || (FVF & (D3DFVF_DIFFUSE | D3DFVF_SPECULAR)); if( GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) && Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) && - (dxVersion > 7 || !conv) ) { + (dxVersion > 7 || !conv) && wined3d_settings.vs_selected_mode != SHADER_SW) { CreateVBO(object); /* DX7 buffers can be locked directly into the VBO(no conversion, see above */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index f81b23d..a98905d 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -791,137 +791,6 @@ #endif } } -#if 0 /* TODO: Software Shaders */ -/* Draw a single vertex using this information */ -static void draw_vertex(IWineD3DDevice *iface, /* interface */ - BOOL isXYZ, float x, float y, float z, float rhw, /* xyzn position*/ - BOOL isNormal, float nx, float ny, float nz, /* normal */ - BOOL isDiffuse, float *dRGBA, /* 1st colors */ - BOOL isSpecular, float *sRGB, /* 2ndry colors */ - BOOL isPtSize, float ptSize, /* pointSize */ - WINED3DVECTOR_4 *texcoords, int *numcoords) /* texture info */ -{ - unsigned int textureNo; - float s, t, r, q; - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - - /* Diffuse -------------------------------- */ - if (isDiffuse) { - glColor4fv(dRGBA); - VTRACE(("glColor4f: r,g,b,a=%f,%f,%f,%f\n", dRGBA[0], dRGBA[1], dRGBA[2], dRGBA[3])); - } - - /* Specular Colour ------------------------------------------*/ - if (isSpecular) { - if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { - GL_EXTCALL(glSecondaryColor3fvEXT(sRGB)); - VTRACE(("glSecondaryColor4f: r,g,b=%f,%f,%f\n", sRGB[0], sRGB[1], sRGB[2])); - } else { - VTRACE(("Specular color extensions not supplied\n")); - } - } - - /* Normal -------------------------------- */ - if (isNormal) { - VTRACE(("glNormal:nx,ny,nz=%f,%f,%f\n", nx,ny,nz)); - glNormal3f(nx, ny, nz); - } - - /* Point Size ----------------------------------------------*/ - if (isPtSize) { - - /* no such functionality in the fixed function GL pipeline */ - FIXME("Cannot change ptSize here in openGl\n"); - } - - /* Texture coords --------------------------- */ - for (textureNo = 0; textureNo < GL_LIMITS(textures); ++textureNo) { - - if (!GL_SUPPORT(ARB_MULTITEXTURE) && textureNo > 0) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - continue ; - } - - /* Query tex coords */ - if (This->stateBlock->textures[textureNo] != NULL) { - - int coordIdx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX]; - if (coordIdx >= MAX_TEXTURES) { - VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); - continue; - } else if (numcoords[coordIdx] == 0) { - TRACE("tex: %d - Skipping tex coords, as no data supplied or no coords supplied\n", textureNo); - continue; - } else { - - /* Initialize vars */ - s = 0.0f; - t = 0.0f; - r = 0.0f; - q = 0.0f; - - switch (numcoords[coordIdx]) { - case 4: q = texcoords[coordIdx].w; /* drop through */ - case 3: r = texcoords[coordIdx].z; /* drop through */ - case 2: t = texcoords[coordIdx].y; /* drop through */ - case 1: s = texcoords[coordIdx].x; - } - - switch (numcoords[coordIdx]) { /* Supply the provided texture coords */ - case D3DTTFF_COUNT1: - VTRACE(("tex:%d, s=%f\n", textureNo, s)); - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GLMULTITEXCOORD1F(textureNo, s); - } else { - glTexCoord1f(s); - } - break; - case D3DTTFF_COUNT2: - VTRACE(("tex:%d, s=%f, t=%f\n", textureNo, s, t)); - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GLMULTITEXCOORD2F(textureNo, s, t); - } else { - glTexCoord2f(s, t); - } - break; - case D3DTTFF_COUNT3: - VTRACE(("tex:%d, s=%f, t=%f, r=%f\n", textureNo, s, t, r)); - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GLMULTITEXCOORD3F(textureNo, s, t, r); - } else { - glTexCoord3f(s, t, r); - } - break; - case D3DTTFF_COUNT4: - VTRACE(("tex:%d, s=%f, t=%f, r=%f, q=%f\n", textureNo, s, t, r, q)); - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GLMULTITEXCOORD4F(textureNo, s, t, r, q); - } else { - glTexCoord4f(s, t, r, q); - } - break; - default: - FIXME("Should not get here as numCoords should be 0->4 (%x)!\n", numcoords[coordIdx]); - } - } - } - } /* End of textures */ - - /* Position -------------------------------- */ - if (isXYZ) { - if (1.0f == rhw || rhw < 0.00001f) { - VTRACE(("Vertex: glVertex:x,y,z=%f,%f,%f\n", x,y,z)); - glVertex3f(x, y, z); - } else { - /* Cannot optimize by dividing through by rhw as rhw is required - later for perspective in the GL pipeline for vertex shaders */ - VTRACE(("Vertex: glVertex:x,y,z=%f,%f,%f / rhw=%f\n", x,y,z,rhw)); - glVertex4f(x,y,z,rhw); - } - } -} -#endif /* TODO: Software shaders */ - void loadNumberedArrays( IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, @@ -1400,350 +1269,275 @@ #endif return; } -/* - * Actually draw using the supplied information. - * Slower GL version which extracts info about each vertex in turn - */ - -static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, - UINT NumVertexes, GLenum glPrimType, - const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx) { - - unsigned int textureNo = 0; - unsigned int texture_idx = 0; - const short *pIdxBufS = NULL; - const long *pIdxBufL = NULL; - LONG SkipnStrides = 0; - LONG vx_index; - float x = 0.0f, y = 0.0f, z = 0.0f; /* x,y,z coordinates */ - float nx = 0.0f, ny = 0.0, nz = 0.0f; /* normal x,y,z coordinates */ - float rhw = 0.0f; /* rhw */ - float ptSize = 0.0f; /* Point size */ - DWORD diffuseColor = 0xFFFFFFFF; /* Diffuse Color */ - DWORD specularColor = 0; /* Specular Color */ - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - - TRACE("Using slow vertex array code\n"); +static inline void swshader_prepare_draw( + IWineD3DDeviceImpl* This, + WineDirect3DVertexStridedData *strided, + int skip_strides, + draw_context* draw) { + + This = NULL; + strided = NULL; + skip_strides = 0; + draw = NULL; + FIXME("Stub"); +} - /* Variable Initialization */ - if (idxData != NULL) { - if (idxSize == 2) pIdxBufS = (const short *) idxData; - else pIdxBufL = (const long *) idxData; +static inline void fixed_prepare_draw( + IWineD3DDeviceImpl* This, + WineDirect3DVertexStridedData *strided, + int skip_strides, + draw_context* draw) { + + int i, textureNo; + + const WINED3DSHADERVECTOR def_position = { 0.0f, 0.0f, 0.0f, 0.0f }; + const WINED3DSHADERVECTOR def_diffuse = { 1.0f, 1.0f, 1.0f, 1.0f }; + const WINED3DSHADERVECTOR def_specular = { 0.0f, 0.0f, 0.0f, 1.0f }; + const WINED3DSHADERVECTOR def_normal = { 0.0f, 0.0f, 1.0f, 0.0f }; + const WINED3DSHADERVECTOR def_texcoord = { 0.0f, 0.0f, 0.0f, 1.0f }; + + /* Defaults */ + draw->is_transformed = FALSE; + memcpy(&draw->diffuse, &def_diffuse, sizeof(WINED3DSHADERVECTOR)); + memcpy(&draw->specular, &def_specular, sizeof(WINED3DSHADERVECTOR)); + memcpy(&draw->position, &def_position, sizeof(WINED3DSHADERVECTOR)); + memcpy(&draw->normal, &def_normal, sizeof(WINED3DSHADERVECTOR)); + for (i = 0; i < GL_LIMITS(texture_stages); i++) { + if (This->stateBlock->textures[i] != NULL) + memcpy(&draw->texcoords[i], &def_texcoord, sizeof(WINED3DSHADERVECTOR)); } - /* Start drawing in GL */ - VTRACE(("glBegin(%x)\n", glPrimType)); - glBegin(glPrimType); + /* Position ---------------------------- */ + if (strided->u.s.position.lpData) { + float *ptrToCoords = + (float *)(strided->u.s.position.lpData + (skip_strides * strided->u.s.position.dwStride)); - /* We shouldn't start this function if any VBO is involved. Should I put a safety check here? - * Guess it's not necessary(we crash then anyway) and would only eat CPU time - */ + draw->position.x = ptrToCoords[0]; + draw->position.y = ptrToCoords[1]; + draw->position.z = ptrToCoords[2]; + draw->position.w = 1.0; - /* For each primitive */ - for (vx_index = 0; vx_index < NumVertexes; ++vx_index) { + /* Data contains rhw */ + if (strided->u.s.position.dwType == D3DDECLTYPE_FLOAT4) { + float rhw = ptrToCoords[3]; - /* Initialize diffuse color */ - diffuseColor = 0xFFFFFFFF; + draw->is_transformed = TRUE; - /* For indexed data, we need to go a few more strides in */ - if (idxData != NULL) { + /* FIXUP: divide by rhw */ + if (rhw > eps && rhw < -eps) { + draw->position.w = 1.0 / rhw; + draw->position.x /= rhw; + draw->position.y /= rhw; + draw->position.z /= rhw; - /* Indexed so work out the number of strides to skip */ - if (idxSize == 2) { - VTRACE(("Idx for vertex %ld = %d\n", vx_index, pIdxBufS[startIdx+vx_index])); - SkipnStrides = pIdxBufS[startIdx + vx_index]; - } else { - VTRACE(("Idx for vertex %ld = %ld\n", vx_index, pIdxBufL[startIdx+vx_index])); - SkipnStrides = pIdxBufL[startIdx + vx_index]; - } + } else draw->position.w = rhw; } + VTRACE(("position = { %f, %f, %f, %f }\n", + draw->position.x, draw->position.y, draw->position.z, draw->position.w)); + } - /* Position Information ------------------ */ - if (sd->u.s.position.lpData != NULL) { + /* Normal --------------------------------- */ + if (strided->u.s.normal.lpData) { + float *ptrToCoords = + (float *)(strided->u.s.normal.lpData + (skip_strides * strided->u.s.normal.dwStride)); + draw->normal.x = ptrToCoords[0]; + draw->normal.y = ptrToCoords[1]; + draw->normal.z = ptrToCoords[2]; + VTRACE(("normal = { %f, %f, %f }\n", draw->normal.x, draw->normal.y, draw->normal.z)); + } + + /* Diffuse -------------------------------- */ + if (strided->u.s.diffuse.lpData) { + + DWORD *ptrToCoords = + (DWORD *)(strided->u.s.diffuse.lpData + (skip_strides * strided->u.s.diffuse.dwStride)); + draw->diffuse.x = D3DCOLOR_B(ptrToCoords[0]); + draw->diffuse.y = D3DCOLOR_G(ptrToCoords[0]); + draw->diffuse.z = D3DCOLOR_R(ptrToCoords[0]); + draw->diffuse.w = D3DCOLOR_A(ptrToCoords[0]); + VTRACE(("diffuse = { %f, %f, %f, %f }\n", + draw->diffuse.x, draw->diffuse.y, draw->diffuse.z, draw->diffuse.w)); + } + /* Specular -------------------------------- */ + if (strided->u.s.specular.lpData) { + + DWORD *ptrToCoords = + (DWORD *)(strided->u.s.specular.lpData + (skip_strides * strided->u.s.specular.dwStride)); + draw->specular.x = D3DCOLOR_B(ptrToCoords[0]); + draw->specular.y = D3DCOLOR_G(ptrToCoords[0]); + draw->specular.z = D3DCOLOR_R(ptrToCoords[0]); + draw->specular.w = D3DCOLOR_A(ptrToCoords[0]); + VTRACE(("specular = { %f, %f, %f, %f }\n", + draw->specular.x, draw->specular.y, draw->specular.z, draw->specular.w)); + } - float *ptrToCoords = (float *)(sd->u.s.position.lpData + (SkipnStrides * sd->u.s.position.dwStride)); - x = ptrToCoords[0]; - y = ptrToCoords[1]; - z = ptrToCoords[2]; - rhw = 1.0; - VTRACE(("x,y,z=%f,%f,%f\n", x,y,z)); + /* Blending ---------------------------------- */ + if (strided->u.s.blendWeights.lpData != NULL || + strided->u.s.blendMatrixIndices.lpData != NULL) { - /* RHW follows, only if transformed, ie 4 floats were provided */ - if (sd->u.s.position.dwType == D3DDECLTYPE_FLOAT4) { - rhw = ptrToCoords[3]; - VTRACE(("rhw=%f\n", rhw)); - } - } + FIXME("Blending not supported yet\n"); + } - /* Blending data -------------------------- */ - if (sd->u.s.blendWeights.lpData != NULL) { - /* float *ptrToCoords = (float *)(sd->u.s.blendWeights.lpData + (SkipnStrides * sd->u.s.blendWeights.dwStride)); */ - FIXME("Blending not supported yet\n"); + /* Point Size -------------------------------- */ + if (strided->u.s.pSize.lpData != NULL) { - if (sd->u.s.blendMatrixIndices.lpData != NULL) { - /*DWORD *ptrToCoords = (DWORD *)(sd->u.s.blendMatrixIndices.lpData + (SkipnStrides * sd->u.s.blendMatrixIndices.dwStride));*/ - } - } + FIXME("Point Size not supported yet\n"); + } - /* Vertex Normal Data (untransformed only)- */ - if (sd->u.s.normal.lpData != NULL) { + /* Texture ---------------------------------- */ + for (textureNo = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { - float *ptrToCoords = (float *)(sd->u.s.normal.lpData + (SkipnStrides * sd->u.s.normal.dwStride)); - nx = ptrToCoords[0]; - ny = ptrToCoords[1]; - nz = ptrToCoords[2]; - VTRACE(("nx,ny,nz=%f,%f,%f\n", nx, ny, nz)); - } + unsigned int idx; + if (This->stateBlock->textures[textureNo] == NULL) + continue; - /* Point Size ----------------------------- */ - if (sd->u.s.pSize.lpData != NULL) { + idx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX]; + if (strided->u.s.texCoords[idx].lpData) { + + float* ptrToCoords = + (float *)(strided->u.s.texCoords[idx].lpData + (skip_strides * strided->u.s.texCoords[idx].dwStride)); + unsigned int numcoords = strided->u.s.texCoords[idx].dwType + 1; + switch (numcoords) { + case 4: draw->texcoords[textureNo].w = ptrToCoords[3]; /* drop through */ + case 3: draw->texcoords[textureNo].z = ptrToCoords[2]; /* drop through */ + case 2: draw->texcoords[textureNo].y = ptrToCoords[1]; /* drop through */ + case 1: draw->texcoords[textureNo].x = ptrToCoords[0]; + } + + /* Projected is more 'fun' - Move the last coord to the 'q' + * parameter (see comments under D3DTSS_TEXTURETRANSFORMFLAGS */ + if ((This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] != D3DTTFF_DISABLE) && + (This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED)) { + + if (This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED) { + switch (numcoords) { + case 0: /* Drop Through */ + case 1: + FIXME("D3DTTFF_PROJECTED but only zero or one coordinate?\n"); + break; + case 2: + draw->texcoords[textureNo].w = draw->texcoords[textureNo].y; + draw->texcoords[textureNo].y = 0.0; + break; + case 3: + draw->texcoords[textureNo].w = draw->texcoords[textureNo].z; + draw->texcoords[textureNo].z = 0.0; + break; + case 4: /* Nop here */ + break; + default: + FIXME("Unexpected D3DTSS_TEXTURETRANSFORMFLAGS value of %ld\n", + This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] & + D3DTTFF_PROJECTED); + } + } + } - float *ptrToCoords = (float *)(sd->u.s.pSize.lpData + (SkipnStrides * sd->u.s.pSize.dwStride)); - ptSize = ptrToCoords[0]; - VTRACE(("ptSize=%f\n", ptSize)); - FIXME("No support for ptSize yet\n"); - } + VTRACE(("tex: %d (%u coords) = { %f %f %f %f }\n", idx, + numcoords, draw->texcoords[textureNo].x, draw->texcoords[textureNo].y, + draw->texcoords[textureNo].z, draw->texcoords[textureNo].w)); + } + } +} - /* Diffuse -------------------------------- */ - if (sd->u.s.diffuse.lpData != NULL) { +/* Draw a single vertex using the supplied data */ +static inline void draw_vertex( + IWineD3DDeviceImpl* This, + draw_context* draw) { - DWORD *ptrToCoords = (DWORD *)(sd->u.s.diffuse.lpData + (SkipnStrides * sd->u.s.diffuse.dwStride)); - diffuseColor = ptrToCoords[0]; - VTRACE(("diffuseColor=%lx\n", diffuseColor)); - } + unsigned int textureNo, texture_idx; - /* Specular -------------------------------- */ - if (sd->u.s.specular.lpData != NULL) { + /* Draw Vertex: Texture coords --------------------------- */ + for (textureNo = 0, texture_idx = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { - DWORD *ptrToCoords = (DWORD *)(sd->u.s.specular.lpData + (SkipnStrides * sd->u.s.specular.dwStride)); - specularColor = ptrToCoords[0]; - VTRACE(("specularColor=%lx\n", specularColor)); + if (!GL_SUPPORT(ARB_MULTITEXTURE) && textureNo > 0) { + FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + continue ; } - /* Texture coords --------------------------- */ - for (textureNo = 0, texture_idx = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { - - if (!GL_SUPPORT(ARB_MULTITEXTURE) && textureNo > 0) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - continue ; - } - - /* Query tex coords */ - if (This->stateBlock->textures[textureNo] != NULL) { - - int coordIdx = This->stateBlock->textureState[textureNo][D3DTSS_TEXCOORDINDEX]; - float *ptrToCoords = NULL; - float s = 0.0, t = 0.0, r = 0.0, q = 0.0; - - if (coordIdx > 7) { - VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); - continue; - } else if (coordIdx < 0) { - FIXME("tex: %d - Coord index %d is less than zero, expect a crash.\n", textureNo, coordIdx); - continue; - } - - ptrToCoords = (float *)(sd->u.s.texCoords[coordIdx].lpData + (SkipnStrides * sd->u.s.texCoords[coordIdx].dwStride)); - if (sd->u.s.texCoords[coordIdx].lpData == NULL) { - TRACE("tex: %d - Skipping tex coords, as no data supplied\n", textureNo); - continue; - } else { - - int coordsToUse = sd->u.s.texCoords[coordIdx].dwType + 1; /* 0 == D3DDECLTYPE_FLOAT1 etc */ - - /* The coords to supply depend completely on the fvf / vertex shader */ - switch (coordsToUse) { - case 4: q = ptrToCoords[3]; /* drop through */ - case 3: r = ptrToCoords[2]; /* drop through */ - case 2: t = ptrToCoords[1]; /* drop through */ - case 1: s = ptrToCoords[0]; - } - - /* Projected is more 'fun' - Move the last coord to the 'q' - parameter (see comments under D3DTSS_TEXTURETRANSFORMFLAGS */ - if ((This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] != D3DTTFF_DISABLE) && - (This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED)) { - - if (This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED) { - switch (coordsToUse) { - case 0: /* Drop Through */ - case 1: - FIXME("D3DTTFF_PROJECTED but only zero or one coordinate?\n"); - break; - case 2: - q = t; - t = 0.0; - coordsToUse = 4; - break; - case 3: - q = r; - r = 0.0; - coordsToUse = 4; - break; - case 4: /* Nop here */ - break; - default: - FIXME("Unexpected D3DTSS_TEXTURETRANSFORMFLAGS value of %ld\n", - This->stateBlock->textureState[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] & D3DTTFF_PROJECTED); - } - } - } - - switch (coordsToUse) { /* Supply the provided texture coords */ - case D3DTTFF_COUNT1: - VTRACE(("tex:%d, s=%f\n", textureNo, s)); - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord1fARB(texture_idx, s)); - } else { - glTexCoord1f(s); - } - break; - case D3DTTFF_COUNT2: - VTRACE(("tex:%d, s=%f, t=%f\n", textureNo, s, t)); - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord2fARB(texture_idx, s, t)); - } else { - glTexCoord2f(s, t); - } - break; - case D3DTTFF_COUNT3: - VTRACE(("tex:%d, s=%f, t=%f, r=%f\n", textureNo, s, t, r)); - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord3fARB(texture_idx, s, t, r)); - } else { - glTexCoord3f(s, t, r); - } - break; - case D3DTTFF_COUNT4: - VTRACE(("tex:%d, s=%f, t=%f, r=%f, q=%f\n", textureNo, s, t, r, q)); - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glMultiTexCoord4fARB(texture_idx, s, t, r, q)); - } else { - glTexCoord4f(s, t, r, q); - } - break; - default: - FIXME("Should not get here as coordsToUse is two bits only (%x)!\n", coordsToUse); - } - } - } - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]) ++texture_idx; - } /* End of textures */ - - /* Diffuse -------------------------------- */ - if (sd->u.s.diffuse.lpData != NULL) { - glColor4ub(D3DCOLOR_B_R(diffuseColor), - D3DCOLOR_B_G(diffuseColor), - D3DCOLOR_B_B(diffuseColor), - D3DCOLOR_B_A(diffuseColor)); - VTRACE(("glColor4ub: r,g,b,a=%lu,%lu,%lu,%lu\n", - D3DCOLOR_B_R(diffuseColor), - D3DCOLOR_B_G(diffuseColor), - D3DCOLOR_B_B(diffuseColor), - D3DCOLOR_B_A(diffuseColor))); - } else { - if (vx_index == 0) glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - } + if (This->stateBlock->textures[textureNo] != NULL) { - /* Specular ------------------------------- */ - if (sd->u.s.specular.lpData != NULL) { - /* special case where the fog density is stored in the diffuse alpha channel */ - if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] && - (This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] == D3DFOG_NONE || sd->u.s.position.dwType == D3DDECLTYPE_FLOAT4 )&& - This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE] == D3DFOG_NONE) { - if(GL_SUPPORT(EXT_FOG_COORD)) { - GL_EXTCALL(glFogCoordfEXT(specularColor >> 24)); - } else { - static BOOL warned = FALSE; - if(!warned) { - /* TODO: Use the fog table code from old ddraw */ - FIXME("Implement fog for transformed vertices in software\n"); - warned = TRUE; - } - } - } + float s = draw->texcoords[textureNo].x; + float t = draw->texcoords[textureNo].y; + float r = draw->texcoords[textureNo].z; + float q = draw->texcoords[textureNo].w; - VTRACE(("glSecondaryColor4ub: r,g,b=%lu,%lu,%lu\n", - D3DCOLOR_B_R(specularColor), - D3DCOLOR_B_G(specularColor), - D3DCOLOR_B_B(specularColor))); - if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { - GL_EXTCALL(glSecondaryColor3ubEXT)( - D3DCOLOR_B_R(specularColor), - D3DCOLOR_B_G(specularColor), - D3DCOLOR_B_B(specularColor)); - } else { - /* Do not worry if specular colour missing and disable request */ - VTRACE(("Specular color extensions not supplied\n")); - } - } else { - if (vx_index == 0) { - if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { - GL_EXTCALL(glSecondaryColor3fEXT)(0, 0, 0); - } else { - /* Do not worry if specular colour missing and disable request */ - VTRACE(("Specular color extensions not supplied\n")); - } - } + VTRACE(("DRAW tex:%d, s=%f, t=%f, r=%f, q=%f\n", textureNo, s, t, r, q)); + if (GL_SUPPORT(ARB_MULTITEXTURE)) + GL_EXTCALL(glMultiTexCoord4fARB(texture_idx, s, t, r, q)); + else + glTexCoord4f(s, t, r, q); } + if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]) ++texture_idx; + } /* End of textures */ - /* Normal -------------------------------- */ - if (sd->u.s.normal.lpData != NULL) { - VTRACE(("glNormal:nx,ny,nz=%f,%f,%f\n", nx,ny,nz)); - glNormal3f(nx, ny, nz); - } else { - if (vx_index == 0) glNormal3f(0, 0, 1); - } + /* Draw Vertex: Diffuse -------------------------------- */ + glColor4f(draw->diffuse.z, draw->diffuse.y, draw->diffuse.x, draw->diffuse.w); + VTRACE(("DRAW diffuse: r,g,b,a=%f,%f,%f,%f\n", + draw->diffuse.z, draw->diffuse.y, draw->diffuse.x, draw->diffuse.w)); + + /* Draw Vertex: Fog (non-table, non-vertex) ------------------------------- */ + /* special case where the fog density is stored in the diffuse alpha channel */ + /* FIXME: then why is this looking in the specular alpha channel? */ + if(This->stateBlock->renderState[WINED3DRS_FOGENABLE] && + (This->stateBlock->renderState[WINED3DRS_FOGVERTEXMODE] == D3DFOG_NONE || draw->is_transformed ) && + This->stateBlock->renderState[WINED3DRS_FOGTABLEMODE] == D3DFOG_NONE) { + + if (GL_SUPPORT(EXT_FOG_COORD)) + GL_EXTCALL(glFogCoordfEXT(draw->specular.w)); + + else { + static BOOL warned = FALSE; + if(!warned) { + /* TODO: Use the fog table code from old ddraw */ + FIXME("Implement fog for transformed vertices in software\n"); + warned = TRUE; + } + } + } - /* Position -------------------------------- */ - if (sd->u.s.position.lpData != NULL) { - if (1.0f == rhw || ((rhw < eps) && (rhw > -eps))) { - VTRACE(("Vertex: glVertex:x,y,z=%f,%f,%f\n", x,y,z)); - glVertex3f(x, y, z); - } else { - GLfloat w = 1.0 / rhw; - VTRACE(("Vertex: glVertex:x,y,z=%f,%f,%f / rhw=%f\n", x,y,z,rhw)); - glVertex4f(x*w, y*w, z*w, w); - } - } + /* Draw Vertex: Specular ------------------------------- */ + VTRACE(("DRAW specular: r,g,b=%f,%f,%f\n", + draw->specular.z, draw->specular.y, draw->specular.x)); + if (GL_SUPPORT(EXT_SECONDARY_COLOR)) + GL_EXTCALL(glSecondaryColor3fEXT(draw->specular.z, draw->specular.y, draw->specular.x)); + else + /* Do not worry if specular colour missing and disable request */ + VTRACE(("Specular color extensions not supplied\n")); - /* For non indexed mode, step onto next parts */ - if (idxData == NULL) { - ++SkipnStrides; - } - } + /* Draw Vertex: Normal -------------------------------- */ + VTRACE(("DRAW normal:nx,ny,nz=%f,%f,%f\n", draw->normal.x, draw->normal.y, draw->normal.z)); + glNormal3f(draw->normal.x, draw->normal.y, draw->normal.z); - glEnd(); - checkGLcall("glEnd and previous calls"); + /* Draw Vertex: Position -------------------------------- */ + VTRACE(("DRAW position: x,y,z,w=%f,%f,%f,%f\n", + draw->position.x, draw->position.y, draw->position.z, draw->position.w)); + glVertex4f(draw->position.x, draw->position.y, draw->position.z, draw->position.w); } -#if 0 /* TODO: Software/Hardware vertex blending support */ /* - * Draw with emulated vertex shaders - * Note: strided data is uninitialized, as we need to pass the vertex - * shader directly as ordering irs yet + * Actually draw using the supplied information. + * Slower GL version which extracts info about each vertex in turn */ -void drawStridedSoftwareVS(IWineD3DDevice *iface, WineDirect3DVertexStridedData *sd, - int PrimitiveType, ULONG NumPrimitives, - const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx) { - unsigned int textureNo = 0; - GLenum glPrimType = GL_POINTS; - int NumVertexes = NumPrimitives; +static void drawStridedSlow( + IWineD3DDevice *iface, + WineDirect3DVertexStridedData *strided, + UINT NumVertexes, + GLenum glPrimType, + const void *idxData, + short idxSize, + ULONG minIndex, + ULONG startIdx, + BOOL software_shader) { + const short *pIdxBufS = NULL; const long *pIdxBufL = NULL; LONG SkipnStrides = 0; LONG vx_index; - float x = 0.0f, y = 0.0f, z = 0.0f; /* x,y,z coordinates */ - float rhw = 0.0f; /* rhw */ - float ptSize = 0.0f; /* Point size */ - D3DVECTOR_4 texcoords[8]; /* Texture Coords */ - int numcoords[8]; /* Number of coords */ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IDirect3DVertexShaderImpl* vertexShader = NULL; - - TRACE("Using slow software vertex shader code\n"); + TRACE("Using slow vertex array code\n"); /* Variable Initialization */ if (idxData != NULL) { @@ -1751,115 +1545,44 @@ void drawStridedSoftwareVS(IWineD3DDevic else pIdxBufL = (const long *) idxData; } - /* Ok, Work out which primitive is requested and how many vertexes that will be */ - NumVertexes = primitiveToGl(PrimitiveType, NumPrimitives, &glPrimType); - - /* Retrieve the VS information */ - vertexShader = (IWineD3DVertexShaderImp *)This->stateBlock->VertexShader; - /* Start drawing in GL */ VTRACE(("glBegin(%x)\n", glPrimType)); glBegin(glPrimType); - /* For each primitive */ - for (vx_index = 0; vx_index < NumVertexes; ++vx_index) { + /* For each primitive */ + for (vx_index = 0; vx_index < NumVertexes; ++vx_index) { - /* For indexed data, we need to go a few more strides in */ - if (idxData != NULL) { + draw_context draw; - /* Indexed so work out the number of strides to skip */ - if (idxSize == 2) { - VTRACE(("Idx for vertex %ld = %d\n", vx_index, pIdxBufS[startIdx+vx_index])); - SkipnStrides = pIdxBufS[startIdx+vx_index]; - } else { - VTRACE(("Idx for vertex %ld = %ld\n", vx_index, pIdxBufL[startIdx+vx_index])); - SkipnStrides = pIdxBufL[startIdx+vx_index]; - } - } + /* For indexed data, we need to go a few more strides in */ + if (idxData != NULL) { - /* Fill the vertex shader input */ - IDirect3DDeviceImpl_FillVertexShaderInputSW(This, vertexShader, SkipnStrides); - - /* Initialize the output fields to the same defaults as it would normally have */ - memset(&vertexShader->output, 0, sizeof(VSHADEROUTPUTDATA8)); - vertexShader->output.oD[0].x = 1.0; - vertexShader->output.oD[0].y = 1.0; - vertexShader->output.oD[0].z = 1.0; - vertexShader->output.oD[0].w = 1.0; - - /* Now execute the vertex shader */ - IDirect3DVertexShaderImpl_ExecuteSW(vertexShader, &vertexShader->input, &vertexShader->output); - - /* - TRACE_VECTOR(vertexShader->output.oPos); - TRACE_VECTOR(vertexShader->output.oD[0]); - TRACE_VECTOR(vertexShader->output.oD[1]); - TRACE_VECTOR(vertexShader->output.oT[0]); - TRACE_VECTOR(vertexShader->output.oT[1]); - TRACE_VECTOR(vertexShader->input.V[0]); - TRACE_VECTOR(vertexShader->data->C[0]); - TRACE_VECTOR(vertexShader->data->C[1]); - TRACE_VECTOR(vertexShader->data->C[2]); - TRACE_VECTOR(vertexShader->data->C[3]); - TRACE_VECTOR(vertexShader->data->C[4]); - TRACE_VECTOR(vertexShader->data->C[5]); - TRACE_VECTOR(vertexShader->data->C[6]); - TRACE_VECTOR(vertexShader->data->C[7]); - */ + /* Indexed so work out the number of strides to skip */ + if (idxSize == 2) { + VTRACE(("Idx for vertex %ld = %d\n", vx_index, pIdxBufS[startIdx+vx_index])); + SkipnStrides = pIdxBufS[startIdx + vx_index]; + } else { + VTRACE(("Idx for vertex %ld = %ld\n", vx_index, pIdxBufL[startIdx+vx_index])); + SkipnStrides = pIdxBufL[startIdx + vx_index]; + } + } - /* Extract out the output */ - /* FIXME: Fog coords? */ - x = vertexShader->output.oPos.x; - y = vertexShader->output.oPos.y; - z = vertexShader->output.oPos.z; - rhw = vertexShader->output.oPos.w; - ptSize = vertexShader->output.oPts.x; /* Fixme - Is this right? */ - - /** Update textures coords using vertexShader->output.oT[0->7] */ - memset(texcoords, 0x00, sizeof(texcoords)); - memset(numcoords, 0x00, sizeof(numcoords)); - for (textureNo = 0; textureNo < GL_LIMITS(textures); ++textureNo) { - if (This->stateBlock->textures[textureNo] != NULL) { - texcoords[textureNo].x = vertexShader->output.oT[textureNo].x; - texcoords[textureNo].y = vertexShader->output.oT[textureNo].y; - texcoords[textureNo].z = vertexShader->output.oT[textureNo].z; - texcoords[textureNo].w = vertexShader->output.oT[textureNo].w; - if (This->stateBlock->texture_state[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] != D3DTTFF_DISABLE) { - numcoords[textureNo] = This->stateBlock->texture_state[textureNo][D3DTSS_TEXTURETRANSFORMFLAGS] & ~D3DTTFF_PROJECTED; - } else { - switch (IDirect3DBaseTexture8Impl_GetType((LPDIRECT3DBASETEXTURE8) This->stateBlock->textures[textureNo])) { - case WINED3DRTYPE_TEXTURE: numcoords[textureNo] = 2; break; - case WINED3DRTYPE_VOLUMETEXTURE: numcoords[textureNo] = 3; break; - default: numcoords[textureNo] = 4; - } - } - } else { - numcoords[textureNo] = 0; - } - } + if (software_shader) + swshader_prepare_draw(This, strided, SkipnStrides, &draw); + else + fixed_prepare_draw(This, strided, SkipnStrides, &draw); - /* Draw using this information */ - draw_vertex(iface, - TRUE, x, y, z, rhw, - TRUE, 0.0f, 0.0f, 1.0f, - TRUE, (float*) &vertexShader->output.oD[0], - TRUE, (float*) &vertexShader->output.oD[1], - FALSE, ptSize, /* FIXME: Change back when supported */ - texcoords, numcoords); - - /* For non indexed mode, step onto next parts */ - if (idxData == NULL) { - ++SkipnStrides; - } + draw_vertex(This, &draw); - } /* for each vertex */ + /* For non indexed mode, step onto next parts */ + if (idxData == NULL) + ++SkipnStrides; + } glEnd(); checkGLcall("glEnd and previous calls"); } -#endif - static inline void drawPrimitiveDrawStrided( IWineD3DDevice *iface, BOOL useVertexShaderFunction, @@ -1913,8 +1636,8 @@ #undef BUFFER_OR_DATA loadVertexData(iface, dataLocations); useDrawStridedSlow = FALSE; - /* Shader pipeline - load attribute arrays */ - } else if(useVertexShaderFunction) { + /* Hardware Shader pipeline - load attribute arrays */ + } else if(useVertexShaderFunction && wined3d_settings.vs_selected_mode != SHADER_SW) { loadNumberedArrays(iface, dataLocations, ((IWineD3DVertexShaderImpl *)This->stateBlock->vertexShader)->semantics_in); @@ -1983,12 +1706,13 @@ #undef BUFFER_OR_DATA /* Draw vertex-by-vertex */ if (useDrawStridedSlow) - drawStridedSlow(iface, dataLocations, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx); + drawStridedSlow(iface, dataLocations, numberOfIndicies, glPrimType, + idxData, idxSize, minIndex, StartIdx, useVertexShaderFunction); else drawStridedFast(iface, numberOfIndicies, glPrimType, idxData, idxSize, minIndex, StartIdx); /* Cleanup vertex program */ - if (useVertexShaderFunction) { + if (useVertexShaderFunction && wined3d_settings.vs_selected_mode != SHADER_SW) { /* disable any attribs (this is the same for both GLSL and ARB modes) */ GLint maxAttribs; int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a71539a..e70a9a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1284,6 +1284,15 @@ #define MAX_CONST_F 256 #define MAX_CONST_I 16 #define MAX_CONST_B 16 +typedef struct draw_context { + WINED3DSHADERVECTOR position; + WINED3DSHADERVECTOR diffuse; + WINED3DSHADERVECTOR specular; + WINED3DSHADERVECTOR texcoords[D3DDP_MAXTEXCOORD]; + WINED3DSHADERVECTOR normal; + BOOL is_transformed; +} draw_context; + typedef struct shader_reg_maps { char texcoord[MAX_REG_TEXCRD]; /* pixel < 3.0 */ -- 1.4.0

2 3

indented relay traces
by James Hawkins 05 Jul '06

05 Jul '06

Hey guys, I don't know if you've ever wished the relay traces were indented by the level of the call, so you can get a better feel for who calls what from where, but I thought it would be nifty. I've attached a patch for dlls/ntdll/relay.c that gives you this. You see the call level next to the thread id, then twice that number of spaces, then the usual relay information. I'd paste an example, but it would just get line wrapped, so patch your tree and give it a shot! -- James Hawkins

6 6

Using GL commands in vga.c to add VGA bitplane support
by Jeremiah Flerchinger 05 Jul '06

05 Jul '06

I want to use wGL in VGA.c to add bitplane support and other functionality. What would be the correct or "preferred" method of implementing this? As it stands I am looking at something like the following to bring in GL functions: #include <GL/gl.h> typedef void (WINAPI *glClearColorProc)(float,float,float,float); static glClearColorProc ptr_glClearColor; HMODULE wgl_Lib = LoadLibraryA("opengl32.dll"); if (wgl_Lib) { ptr_glClearColor = GetProcAddress(wgl_Lib, "glClearColor"); } Is this the preferred way to make use of openGL inside of Wine? Is there a better way? I really don't want to have to figure out a typedef and make a pointer for every single library function I plan to use. Plus I find it annoying I can't use the real name of the function and am stuck using a differently named pointer. Thanks in advance, Jeremiah Flerchinger

1 0

Re: msi: Update the files' target paths as well, because they may have changed if a parent directory is changed
by Andrey Turkin 05 Jul '06

05 Jul '06

James Hawkins wrote: > Hi, > > This fixes bug 5595. The Lotus Notes installer was calling > MsiSetTargetPath after the CostFinalize action, which is where the > target paths are originally set for installation files. Originally, > the directories were being changed, but that doesn't trickle down to > the file's target paths, so we have to update those too. After this > change, all the Lotus Notes files install in the correct destination > directory. Note that this affects other installers as well, but I > don't remember the numbers off the top of my head. > > Changelog: > * Update the files' target paths as well, because they may have > changed if a parent directory is changed. > > dlls/msi/install.c | 16 ++++++++++++++++ > 1 files changed, 16 insertions(+), 0 deletions(-) > > -- > James Hawkins > > > ------------------------------------------------------------------------ > > diff --git a/dlls/msi/install.c b/dlls/msi/install.c > index 5eaf10b..a09782d 100644 > --- a/dlls/msi/install.c > +++ b/dlls/msi/install.c > @@ -331,6 +331,7 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *pack > LPWSTR path = NULL; > LPWSTR path2 = NULL; > MSIFOLDER *folder; > + MSIFILE *file; > > TRACE("(%p %s %s)\n",package, debugstr_w(szFolder),debugstr_w(szFolderPath)); > > @@ -374,6 +375,21 @@ UINT MSI_SetTargetPathW(MSIPACKAGE *pack > path2 = resolve_folder(package, f->Directory, FALSE, TRUE, NULL); > msi_free(path2); > } > + > + LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) > + { > + MSICOMPONENT *comp = file->Component; > + LPWSTR p; > + > + if (!comp) > + continue; > + > + p = resolve_folder(package, comp->Directory, FALSE, FALSE, NULL); > + msi_free(file->TargetPath); > + > + file->TargetPath = build_directory_name(2, p, file->FileName); > + msi_free(p); > + } > } > msi_free(path); > > > > ------------------------------------------------------------------------ > > Hi James, Funny, your patch looks just identical to mine (submitted but rejected by some reason) except for comments :)  By the way, does your patch fixes this issue for TARGETPATH? If yes, then the patch should remove some todo_wine in tests. If no, then do you plan to fix it in another patch? If no, then I will send patch to fix it myself later.

2 2

Re: [ntdll][2/3] Fix returncodes for NtOpenKey (with tests)
by Alexandre Julliard 05 Jul '06

05 Jul '06

Paul Vriens <Paul.Vriens(a)xs4all.nl> writes: > Some original tests still fail for NT4, haven't looked into that (yet). > > Changelog > Fix returncodes for NtOpenKey (with tests) This breaks the advapi32 tests: ../../../tools/runtest -q -P wine -M advapi32.dll -T ../../.. -p advapi32_test.exe.so registry.c && touch registry.ok registry.c:553: Test failed: expected ERROR_INVALID_PARAMETER, got 998 -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [dinput-0/6] multiple devices - Resend #2
by Robert Reif 05 Jul '06

05 Jul '06

The iteration is already done for you in IDirectInputWImpl_EnumDevices . You only need to probe for the specified device in joydev_enum_deviceW where id is the index of the device being probed ("/dev/input/event%d", id). Pass the id to joydev_have(). Look at the linux_input code to see how it is done.

2 1

Re: WineD3D: Flip WINED3DFMT_R8G8B8 to GL_RGB
by Ivan Gyurdiev 05 Jul '06

05 Jul '06

Stefan Dösinger wrote: > WINED3DFMT_R8G8B8 means that the 8 most significant bits contain the red color > channel, and the 8 least significant ones the blue channel. But in memory the > least significant bits are at the highest address, so the surface ends up as > BGR in memory. This patch finally changes that after the surface format > cleanup has been done as requested by AJ. > > To my knowledge this format has been changed at least 3 times. Originally(in > old d3d8) it was GL_RGB as this seems most intuitive. Then Oliver noticed the > endianity problem and flipped it to GL_BGR, but incorrectly changed > WINED3DFMT_R5G6B6 too, which caused gl errors with the 16 bit format. Some > time later a patch for WINED3DFMT_R5G6B6 was sent which incorrectly changed > WINED3DFMT_R8G8B8 back to GL_RGB too. This patch only modifies > WINED3DFMT_R8G8B8 and leaves the other formats in peace :-) > And what about LockRect() ?

2 2

wine bugzilla questions
by Molle Bestefich 05 Jul '06

05 Jul '06

Regarding the Wine bugzilla "keywords": http://bugs.winehq.org/describekeywords.cgi 1) Where are they documented? 2) What does FIXME mean (seems superfluous)? 3) Should there be an "installer" keyword to easily pinpoint installer problems?

1 0

Re: [dinput-0/6] multiple devices - Resend #2
by Robert Reif 05 Jul '06

05 Jul '06

Christoph Frick wrote: >hiho > >this is again my patch for handling more than one /dev/input/event* >joystick within dinput. there are several other patches now to follow, >that expect this patch to be applied. so i label this one 0 of 6. >against the previous version it only has some "detect first joystick" >code moved around. > >License: LGPL >ChangeLog: >2006-07-02 Christoph Frick <rid(a)zefix.tv> >multiple /dev/input/event* joysticks > > > Why are you changing the code outside of joystick_linuxinput?

3 3

Re: msvcrt [2/4]: Change the do-while loop to a while loop as arg can be NULL before the loop
by Alexandre Julliard 05 Jul '06

05 Jul '06

"James Hawkins" <truiken(a)gmail.com> writes: > Changelog: > * Change the do-while loop to a while loop, as arg can be NULL before the loop. I'm not sure what code checker you are using for these things, but please don't blindly quiet the warnings, try to understand the code and fix it the right way. Pretty much every one of your NULL check patches has the same problem. -- Alexandre Julliard julliard(a)winehq.org

1 0

wine and serial port - again
by Pavel Troller 05 Jul '06

05 Jul '06

Hi! From time to time, complaints can be heard about functionality of the serial port implementation in wine. Just now I have one of examples of the serial communication problem. There is a very simple program, called ft or softjump, intended to dump or modify some particular addresses of an EEPROM of an amateur radio. It uses a serial port in non-canonical mode, writing always 5 binary chars into it and reading (also binary) reply. I've run this program under wine but there were problems - the program never dumped any data. The source is included in the program archive; it was about 30 minutes of work to convert it for Linux. After successfull compilation, I've run the resulting Linux program (pure Linux, not winelib) and it worked as expected. For the testing purposes, I've then compiled the original windows version using winegcc. I was able to run the program, but the results were identical to those with original windows binary (no data). The windows binary output shows this: patrol@arcus:~/ft817$ wine ft.exe ft.exe by Peter May, VK2JCG, vk2jcg(a)yahoo.com.au This program uses undocumented CAT commands to read or update the EEPROM in the Yaesu FT817 and FT897 Radios. The soft jumper settings are stored in location 4 and 5 of the EEPROM. Power the radio off and on to activate the new settings. If you do a reset of the radio, you will have to run this program again to rewrite the values The program assumes that the radio is connected to COM1: and the CAT rate is set to 38400 baud *** USE AT YOUR OWN RISK *** Serial port COM1: successfully reconfigured. Read current data from EEPROM gives : patrol@arcus:~/ft817$ Its Linux version works well: patrol@arcus:~/ft817/Source$ ft ft by Peter May, VK2JCG, vk2jcg(a)yahoo.com.au This program uses undocumented CAT commands to read or update the EEPROM in the Yaesu FT817 and FT897 Radios. The soft jumper settings are stored in location 4 and 5 of the EEPROM. Power the radio off and on to activate the new settings. If you do a reset of the radio, you will have to run this program again to rewrite the values. *** USE AT YOUR OWN RISK *** Linux version by Pavel Troller - OK1XPT, <patrol(a)sinus.cz> Serial port /dev/tts/0 successfully reconfigured. Read current data from EEPROM gives : DD BF patrol@arcus:~/ft817/Source$ Do you see ? The windows version doesn't output the actual EEPROM data. +file,+comm trace from wine looks like this: trace:file:CreateFileW L"COM1:" GENERIC_READ GENERIC_WRITE creation 3 attributes 0x0 trace:file:RtlDosPathNameToNtPathName_U (L"COM1:",0x7fb3fdd0,(nil),(nil)) trace:file:RtlGetFullPathName_U (L"COM1:" 520 0x7fb3fb44 (nil)) trace:file:get_dos_device L"COM1" -> "/dev/ttyS0" trace:file:CreateFileW returning 0x2c trace:comm:GetCommState handle 0x2c, ptr 0x7fb3fe70 trace:comm:COMM_DeviceIoControl 0x2c IOCTL_SERIAL_GET_BAUD_RATE (nil) 0 0x7fb3fe18 4 0x7fb3fdb0 trace:comm:COMM_DeviceIoControl 0x2c IOCTL_SERIAL_GET_LINE_CONTROL (nil) 0 0x7fb3fe1d 3 0x7fb3fdb0 trace:comm:COMM_DeviceIoControl 0x2c IOCTL_SERIAL_GET_HANDFLOW (nil) 0 0x7fb3fe00 16 0x7fb3fdb0 trace:comm:COMM_DeviceIoControl 0x2c IOCTL_SERIAL_GET_CHARS (nil) 0 0x7fb3fe12 6 0x7fb3fdb0 trace:comm:GetCommState OK trace:comm:dump_dcb bytesize=8 baudrate=38400 fParity=0 Parity=0 stopbits=2 trace:comm:dump_dcb ~IXON ~IXOFF trace:comm:dump_dcb fOutxCtsFlow=0 fRtsControl=0 trace:comm:dump_dcb fOutxDsrFlow=0 fDtrControl=1 trace:comm:dump_dcb ~CRTSCTS trace:comm:dump_dcb bytesize=8 baudrate=38400 fParity=0 Parity=0 stopbits=2 trace:comm:dump_dcb ~IXON ~IXOFF trace:comm:dump_dcb fOutxCtsFlow=0 fRtsControl=0 trace:comm:dump_dcb fOutxDsrFlow=0 fDtrControl=0 trace:comm:dump_dcb ~CRTSCTS trace:comm:COMM_DeviceIoControl 0x2c IOCTL_SERIAL_SET_BAUD_RATE 0x7fb3fe18 4 (nil) 0 0x7fb3fdb0 trace:comm:COMM_DeviceIoControl 0x2c IOCTL_SERIAL_SET_LINE_CONTROL 0x7fb3fe1d 3 (nil) 0 0x7fb3fdb0 trace:comm:COMM_DeviceIoControl 0x2c IOCTL_SERIAL_SET_HANDFLOW 0x7fb3fe00 16 (nil) 0 0x7fb3fdb0 trace:comm:COMM_DeviceIoControl 0x2c IOCTL_SERIAL_SET_CHARS 0x7fb3fe12 6 (nil) 0 0x7fb3fdb0 trace:comm:SetCommTimeouts (0x2c, 0x7fb3fe5c) trace:comm:COMM_DeviceIoControl 0x2c IOCTL_SERIAL_SET_TIMEOUTS 0x7fb3fe0c 20 (nil) 0 0x7fb3fdb0 trace:file:WriteFile 0x8 0x7fb3f9cc 48 0x7fb3fdd4 (nil) Serial port COM1: successfully reconfigured. trace:file:WriteFile 0x2c 0x7fb3fe54 5 0x7fb3fe4c (nil) trace:file:ReadFile 0x2c 0x7fb3fe8c 4 0x7fb3fe4c (nil) trace:file:WriteFile 0x8 0x7fb3f9b4 38 0x7fb3fdbc (nil) Read current data from EEPROM gives : trace:file:WriteFile 0x8 0x7fb3f9b8 2 0x7fb3fdc0 (nil) You can see the port configuration phase, as well 5 bytes being written and a read being attempted. However, resulting "count" variable (see source) is probably 0, because there is no output of values read. I don't know, whether it is due to wrong command being written to the radio, or failure to read its response. Original package can be downloaded freely for example here: http://www.817-onair.de/download.php?id=6&sid=c66545090cd6b5cbc2e1c06321ff9… My Linux variant is attached to this mail. Sorry for the lengthy mail, but I hope that it can really help to improve the serial communication support in wine. With regards, Pavel Troller

2 1

Re: [PATCH 1/2] kernel/tests: Implement safe local strcat function.
by Dmitry Timoshkov 05 Jul '06

05 Jul '06

"Saulius Krasuckas" <saulius.krasuckas(a)ieee.org> wrote: > +static void safe_strcatA(char *dst, DWORD dst_len, const char *src) > +{ > + UINT length; > + char *buff; > + > + length = lstrlenA(dst); > + length += lstrlenA(src); > + buff = HeapAlloc(GetProcessHeap(), 0, length + 1); > + > + lstrcpyA(buff, dst); > + lstrcatA(buff, src); > + lstrcpynA(dst, buff, dst_len); > + > + HeapFree(GetProcessHeap(), 0, buff); > +} This kind of "safe" wrappers doesn't makes the code be safer in reality, needlessly clobbering the code instead. -- Dmitry.

2 7

Question about regedit:listview.c:AddEntryToList()
by Andrew Talbot 04 Jul '06

04 Jul '06

In the above function, am I right in thinking that the "(not set)" string literal ought to be represented by something of type LPTSTR? Thanks, -- Andy.

1 0

Re: [wininet][3] Use a blank password if a NULL password is given
by James Hawkins 04 Jul '06

04 Jul '06

On 7/4/06, Paul Vriens <Paul.Vriens(a)xs4all.nl> wrote: > > Hi, > > > MSDN states that we should use a blank password when a NULL password is > given together with a NON-NULL username. > > Ethereal confirms this :-) > Changelog > Use a blank password if a NULL password is given > uh oh: > Hi, > > See msdn: > http://msdn.microsoft.com/library/default.asp?url=/library/en-us/wininet/wi… > Changelog: > * Use a blank password if none is provided in FTP_Connect. http://winehq.org/pipermail/wine-patches/2006-July/028265.html -- James Hawkins

1 0

Strange behavior in debugging of bug #5245, looking for comments
by Alex Villacís Lasso 04 Jul '06

04 Jul '06

Last weekend, I was trying to trace down bug #5245 (Run-Time error '6' overflow in terragen). With current CVS, the bug manifests itself with an "Overflow" dialog when starting up Terragen. However, this bug does *not* go away with a native oleaut32.dll (taken from win98), so this does not seem like an OLE bug. When running the program with the debugger, the underlying exception trapped before displaying the dialog reads "inexact float result", with a backtrace that comes out of the bowels of msvbvm60.dll (weird - NOT inside Terragen.exe, and NOT inside Terragen.dll). However, if the user types "pass" at the debugger prompt, the dialog box does not appear, and the program continues "normally". The exception occurs again whenever a File Open dialog is dismissed, and again, typing "pass" lets the program run normally. Several questions: - Can programs that execute floating-point instructions get the "inexact float result" exception without any explicit setup, or do they have to call some API in order to enable this notification? If so, is it described in MSDN? - Is the described behavior normal for the "pass" command? I was expecting the command to make the app show the Overflow dialog and then exit. Alex Villacís Lasso

3 4

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel