June 2006 - Wine-Devel - list.winehq.org

Build on kubuntu 6.06,amd_64 works
by Amaury June 26, 2006

June 26, 2006

Hi, Sorry if I'm ask a stupid question, but I'm a newbie to Linux, trying to learn... I've been trying to install wine through the package manager but it said it was not possible (error message: "Depends: wine-dev but it is not installable"). I kind of knew it cos i'm running under Ubuntu 6.06-LTS for amd 64 and I had read somewhere that wine didn't run on such system. My investigations led me to your post on http://www.winehq.com/pipermail/wine-devel/2006-June/048637.html Could you please detail step by step how the installation works cos the command lines don't make much sense to me MT A.

1 0

New dlls/ddraw/device.c warnings
by Gerald Pfeifer June 26, 2006

June 26, 2006

After the recent sets of changes, I found that GCC 3.4 issues the following warnings (on FreeBSD 5.4. I checked and depending on how a compiler implements assert(), the warnings are valid, insofar as the compiler doesn't have a way to automatically determine that all code paths are covered: device.c: In function `Thunk_IDirect3DDeviceImpl_2_Begin': device.c:1826: warning: 'FVF' might be used uninitialized in this function device.c: In function `Thunk_IDirect3DDeviceImpl_2_BeginIndexed': device.c:1886: warning: 'FVF' might be used uninitialized in this function device.c: In function `Thunk_IDirect3DDeviceImpl_2_DrawPrimitive': device.c:2752: warning: 'FVF' might be used uninitialized in this function device.c: In function `Thunk_IDirect3DDeviceImpl_2_DrawIndexedPrimitive': device.c:2891: warning: 'FVF' might be used uninitialized in this function Could you have a look into this, Stefan? If someone has a hint on the preferred approach to address this, I can give it a try as well. Thanks, Gerald -- Gerald (Jerry) Pfeifer gerald(a)pfeifer.com http://www.pfeifer.com/gerald/

2 1

Re: [AppDb] [2/3] safe functions
by Chris Morgan June 26, 2006

June 26, 2006

Hi Jonathan. You'll want to talk to EA about the filtering changes. The plan is to filter using the same syntax and flags that the php filter extension is going to use so we can easily switch over to this extension in the future. Also, I've submitted a patch for review to appdb(a)winehq.com and wine-patches(a)winehq.com that removes all of our get_magic_quotes_gpc() use and adds a check in include/incl.php that warns and prevents appdb from running if magic quotes is enabled. So you shouldn't need to have any get_magic_quotes_gpc() checks anymore. I also noticed your quote_smart_sql() call. This call isn't used anywhere, we shouldn't add calls to functions that aren't called. We also already have a function that will make sql calls safe called query_paramters() in include/db.php. Also, do we want to strip tags from sql? Won't that remove all tags from things like app/version descriptions, comments and notes? Chris On 6/25/06, Jonathan Ernst <jonathan(a)ernstfamily.ch> wrote: > Hi, > > The code I made is not dependent on magic_quote value and shouldn't > allow anybody to mess with the values read or written from/to the > database. Also it doesn't require to make copies of every single string the user > passes to us. > > It is based on php manual's best practices for avoiding injection. > > I'd be very glad if we'll use such mechanism for the rest of the > queries and get rid of compile_whatever, makeSafe & co. > > Changelog: > - functions to avoid sql/html injection without having issues with addslashes/magic_quotes_gpc > > Files changed: > - include/util.php > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.2.2 (GNU/Linux) > > iD8DBQBEnt7SIW5mR/h6b38RAii/AKCB26o0DAM978gQz8baVz6VuubW3ACgqBoJ > Or4cDg49YqCUD3dughsW1oY= > =keDV > -----END PGP SIGNATURE----- > > > > > > >

3 4

Re: Wine, Darwine, CodeWeavers-- Intel MacOS X
by William Knop June 26, 2006

June 26, 2006

On 6/26/06, Alexandre Julliard <julliard(a)winehq.org> wrote: > There's no quartz driver in WineHQ. There are some patches floating > around but it's very far from working. Oops, I realized that just after I hit send. I'll make sure to state that it has rudimentary support.

1 0

How do I get the unix filename for a wine handle?
by Christoph Probst June 26, 2006

June 26, 2006

Hi, I'm one of the Google Summer of Code students and I'm working on the ClamAV integration in wine. Today I was discussing an issue with my mentor and he suggested to post it here. 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. Within this function the file is accessed using its unix_handle. The problem is that I need to know the unix filename for clamAV to access the file, but I see no proper way or function to get it as long as I just know the unix_handle or fd. Possible solutions so far: 1. searching /proc/self/fd/%d for the name. This would be an easy but very ugly solution. 2. maintaining a table mapping unix_handles to filenames from within NtCreateFile(). Hence I don't have the feeling that this is a good solution. 3. storing the unix filename in the wineserver handle object when it's created. This is probably the right place to keep this information but it would require some changes to the wineserver. If I understand it right it is already planned to implement something like this ("lookup_name" in server/object.c) But maybe I just missed an even better approach. What would you recommend to do? Any comment is appreciated. Cheers, Chris -- Kontakt-Details: http://www.christoph-probst.com/kontakt/ PGP-FP: B171 7EA4 988C DD90 1601 D21C 5279 2FAF 9978 AF86

5 8

Autocad 2004 STATUS_INVALID_LDT_OFFSET
by Jaap Stolk June 26, 2006

June 26, 2006

I'm trying to run Autocad 2004. (installation from cd "works") current status: (/blog) http://wiki.jswindle.com/index.php/AutoCad#Forum_Comments It starts a long way, and wine seems to handle the usual CreateFileA("\\\\.\\NTICE") and IsDebuggerPresent() properly, and it generates and runs some dll's in the temp directory. But the program exists without any waring or error. I'm still searching for the reason, but i have several clues. But today the log files are shorter, the above calls are missing, and instead I get an c0000119 error (STATUS_INVALID_LDT_OFFSET) 200135:0011: read_process_memory() = 0 { data={00,00,00,00} } 200136:0011: get_handle_fd( handle=0xc, access=00000002 ) 200137:0011: get_handle_fd() = 0 { fd=9, removable=0, flags=0 } 200138:0x4074fc00: 00000000 00000000 00000000 00000000 200139:0011: get_selector_entry( handle=0x2c, entry=7 ) 200140:000f: *signal* signal=19 200141:0011: get_selector_entry() = 0 { base=00000000, limit=00000000, flags=00 } 200142:fixme:ntdll:RtlNtStatusToDosErrorNoTeb no mapping for c0000119 200143:0011: get_handle_fd( handle=0xc, access=00000002 ) 200144:0011: get_handle_fd() = 0 { fd=9, removable=0, flags=0 } 200145:Backtrace: 200146:0011: get_handle_fd( handle=0xc, access=00000002 ) 200147:0011: get_handle_fd() = 0 { fd=9, removable=0, flags=0 } 200148:=>1 0xffffe002 (0xffffe002) 200149:0009:Ret ntdll.NtDelayExecution() retval=00000000 ret=4037416a 200150:0009:Ret kernel32.Sleep() retval=00000000 ret=408fc345 200151:0009:Call ntdll.NtQuerySystemInformation(0000000b,00000000,00000000,4072ef3c) ret=408fc296 I don't have any "+all" log files from yesterday, but I'm sure there was no "fixme" then. Is Wine actually simulating the LDT stuff ? I think I should try with a fresh install.

5 15

Compilation error using winegcc
by Vikas Gera June 26, 2006

June 26, 2006

Hello!! I am new user to Wine. I have downloaded Wine-0.9.15 sources on solaris box and tried to compile a simple "Hello World" program using WineLib. I am getting following error: winegcc: -Wl,-G,-B,symbolic failed. *** Error code 2 make: Fatal error: Command failed for target `helloworld.so' Can anybody guide me as to what went wrong? I have following environment setup Solaris 10, gcc, wine sources 0.9.15 built (compiled) using patch released on 2006/05/22 (http://www.blastwave.org/wine) regards, Vikas Gera

1 0

Re: mshtml 8: Added beginning IDM_BROWSEMODE implementation.
by Alexandre Julliard June 26, 2006

June 26, 2006

This one breaks the tests: ../../../tools/runtest -q -P wine -M mshtml.dll -T ../../.. -p mshtml_test.exe.so htmldoc.c && touch htmldoc.ok htmldoc.c:1703: Test failed: expected Invoke_AMBIENT_USERMODE htmldoc.c:1703: Test failed: expected Invoke_AMBIENT_USERMODE htmldoc.c:1703: Test failed: expected Invoke_AMBIENT_USERMODE htmldoc.c:1703: Test failed: expected Invoke_AMBIENT_USERMODE -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: riched20: (updated) EM_GETLINE implementation and test
by Alexandre Julliard June 26, 2006

June 26, 2006

Krzysztof Foltman <wdev(a)foltman.com> writes: > This is the EM_GETLINE patch from Thomas Kho, updated to current git > and with L"" replaced by proper WCHAR array. There are many more problems with that patch. For instance, it shouldn't call IsWindowUnicode all the time, once is enough. Also casting pointers to int is a bad idea (and not needed), it should use sizeof(WCHAR) instead of hardcoding 2, and preferably use proper data types instead of the nBPC hack. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winspool.drv: Write-strings warnings fix
by Mike McCormack June 26, 2006

June 26, 2006

Andrew Talbot wrote: > + static CHAR dtype[] = "RAW", > + processor[] = "WinPrint", These strings should really be const. IMO, a better fix would be to add a cast to cast them back to (char*) than to change their storage class. Mike

2 1

Very large files
by John Willis June 26, 2006

June 26, 2006

Howdy, I have a large VS 6.0 C++ program and I'm running it under WINE under Redhat Linux. Everything works fine, but it doesn't handle file sizes greater than 4gb like it can running directly under Windows XP. I've tweaked everything that I can find that seems to deal with file sizes. Is there a problem with WINE itself handling very large file sizes? Thanks in advance, John

4 3

Re: [AppDB] - protect against sql injection in select, update and delete statements
by Tony Lambregts June 26, 2006

June 26, 2006

Chris Morgan wrote: > On Sunday 25 June 2006 10:00 pm, Tony Lambregts wrote: >> Chris Morgan wrote: >>> Testing once beats testing over and over and over again IMO. >> Thats why you want to make the patches small. Small patches are easy to >> review, test and prove the correctness of. Big patches are difficult to >> test and one bug rejects the whole thing, so you have to start all over >> again. >> >>> I suspect that if your testing looks good and mine does as well then we >>> should be ready to go. >> I will NOT be able to test a big patch again for a while, nor am I really >> willing to. I took quite a while out of my weekend to do the testing >> because I don't want a bad patch going into production again. We have had >> enough bad feelings going on over this that it was easier for me to do the >> testing then to continue arguing with you. I really have a limit though and >> I ask you politely to meet me half way by breaking it up. >> >>> I'll fix up moving test results, that should be an easy one, and do >>> another once over of the patch before comitting it. >>> I'm pretty confident that it is all set, I've tested submitting notes, >>> comments, applications, distributions etc here and it looks good. >> I do not support that idea. If you break the patch up into smaller chunks >> then Those can be tested and hopfully put in. >> >> -- >> >> Tony Lambregts > > I'll break up the patch if you'll start submitting patches that implement > automated testing. > > Otherwise our testing is always going to have poor coverage and is going to be > a waste of time. It might be more difficult to implement automated testing > but it will improve the codebase by allowing us to test it quickly and > reproducably. > > Chris > > Oh for crying out loud. Go ahead and automate if you know how to. If you or someone else can show me how I am willing to work on it too, I an not opposed to automating all of the testing if that is possible. In the mean time am against these large patches that are difficult to test because the are so large. -- Tony Lambregts

2 2

Re: [AppDB] - protect against sql injection in select, update and delete statements
by Tony Lambregts June 26, 2006

June 26, 2006

Chris Morgan wrote: > Testing once beats testing over and over and over again IMO. Thats why you want to make the patches small. Small patches are easy to review, test and prove the correctness of. Big patches are difficult to test and one bug rejects the whole thing, so you have to start all over again. > I suspect that if your testing looks good and mine does as well then we > should be ready to go. I will NOT be able to test a big patch again for a while, nor am I really willing to. I took quite a while out of my weekend to do the testing because I don't want a bad patch going into production again. We have had enough bad feelings going on over this that it was easier for me to do the testing then to continue arguing with you. I really have a limit though and I ask you politely to meet me half way by breaking it up. > > I'll fix up moving test results, that should be an easy one, and do > another once over of the patch before comitting it. > I'm pretty confident that it is all set, I've tested submitting notes, comments, > applications, distributions etc here and it looks good. > I do not support that idea. If you break the patch up into smaller chunks then Those can be tested and hopfully put in. -- Tony Lambregts

2 1

Re: [AppDb] [3/3] Comments handling cleanup
by Chris Morgan June 26, 2006

June 26, 2006

The makeSafe() changes for filtering data and the query_parameters() changes for sql injection parameters are related but independent changes. It seems like query_parameters() is a better fix than putting inline sprintf()s and quote_safe_sql() calls. query_parameters() encapsulates the calls to whatever 'escape' function that we choose. query_parameters() also uses the syntax that pear db uses for place holders, ?, ~ and &. Chris On 6/25/06, Jonathan Ernst <jonathan(a)ernstfamily.ch> wrote: > Hi, > > Here is a cleaned up version of the comments handling that better fixes > (imho) all problems related to sql and html injection (it requires the previous patches to be applied). > > It is based on php manual's best practices for avoiding injection. > > I'd be very glad if we'll use such mechanism for the rest of the > queries and get rid of compile_whatever, makeSafe & co. > > Changelog: > - avoid sql/html injection in the comments > > Files changed: > - addcomment.php > - deletecomment.php > - include/comment.php > > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.2.2 (GNU/Linux) > > iD8DBQBEnt7XIW5mR/h6b38RAqtqAKCw7qX+8JTVDI0VvvHSfZTbeGYJOQCglZtg > gRVPintjJeZ1yhupSF5V+RE= > =6bPd > -----END PGP SIGNATURE----- > > > > > > >

1 0

[AppDb] stuff thats broken
by Tony Lambregts June 26, 2006

June 26, 2006

So I was testing Chris's "query_parameters" patch and I found the following things broken with current CVS. This note is mostly to archive the issues I found than anything else. Most of these are minor problems but they should be fixed. If you want to have a go at fixing any of the issues feel free to do so. 1.) When I go to enter a new distribution in the testing data (new application, new version or new testing data) I get the following error We found the following errors: * Please enter a distribution. Please correct them. This is probably due to the makesafe() patch. I have no idea how long these next 3 have not worked. 2.) I also cannot add a new category under the "Main" category This is minor but we should fix it 3.) Editing a category is broken all fields are blank 4.) deleting a category is broken. I get this error at least *Database Error!* Query: DELETE FROM appCategory WHERE catId = LIMIT 1 You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'LIMIT 1' at line 3 5.) If you add a hyperlink in a note it is broken with makesafe() turned on. 6.) Voting is broken (I don't care really) the whole thing is kind meaningless right now anyway. but that is another subject. -- Tony Lambregts

3 4

SecuRom investigation
by Martin Owen June 25, 2006

June 25, 2006

Hello all, I have been investigating getting rid of a terminal anoyancy for wine game users, SecuRom security. I don't believe it is good enough to crack the games as this makes us out to look like criminals rather than trying to get legitimate games to work. I have sent a query to sony, asking if they will help with providing information, but I'm not hopeful of a positive response. I found an interesting tool here: http://www.gameburnworld.com/securompatches.htm which if we could get our hands on the source code would at least give us more information about how this security works and may even allow us to work around it perminently with in wine. Best Regards, Martin Owens

4 4

Re: [AppDb] Comments handling cleanup
by Tony Lambregts June 25, 2006

June 25, 2006

Jonathan Ernst wrote: > Hi, > > I followed your discussions about sql/html injection and had a look at > what you are doing in order to fix the situation and I don't want to > offense anybody but I feel that what you are trying to do is a bit hacky > ;-). > > Here is a cleaned up version of the comments handling that better fixes > (imho) all problems related to sql and html injection. > > The code I made is not dependent on magic_quote value and should'nt > allow anybody to mess with the values read or written from/to the > database. Also it doesn't require to make copies of every single string the user > passes to us. > > It is based on php manual's best practices for avoiding injection. > > I'd be very glad if we'll use such mechanism for the rest of the > queries and get rid of compile_whatever, makeSafe & co. > > This patch follows the Coding Standards we set up a little bit more as > well. > > Awaiting your comments. I am more in favor of this approach than using makeSafe() and do the same thing as Chris's query_parameters() patch. However I am hard pressed to say whether this method is really better or safer than query_parameters(). I have had real issues with makeSafe() the primary one is that IMO the place to make sure that we are safe from sql injection is where we create the SQL. The makeSafe() did not do that. The changes to that are only cosmetic and make it harder to see the actual changes. Formating changes should be in a separate patch. Also I would really appreciate a "Files Changed:" section that lists the files changed/added/removed by this patch. I find that it really helps in reviewing patches. Please resubmit with the formating changes in a separate patch. -- Tony Lambregts

2 1

An RPM of wine with safedisc support
by ivanleo＠gmail.com June 25, 2006

June 25, 2006

Safedisc has now been working on wine for almost a year, but it'll still take some time before we get the code into winehq, so I've decided to build an RPM of wine with safedisc 1 support so users can play around with it, you can download it from http://www003.portalis.it/115/wine-safedisc-0.9.16-mdk.i586.rpm Safedisc 2 and above are not supported. This is based on wine 0.9.16, however it isn't an official winehq release, and is provided on an as is basis. To run a safedisc protected game, you must run winecfg and set the drive type of your cdrom drive to "cdrom" in the drives tab. Yes, this sounds dumb, but it has to be done. Then run the game normally, and as long as you have an original CD (Ok, copies can work too but that's Macrovision's fault) in the drive, the game will start. Ivan.

3 4

Ole-BSTR-Concat broken?
by Olaf Schmidt June 25, 2006

June 25, 2006

Hi *.*, seems, that the Ole-BSTR-Concat doesn't work anymore: (Debian Sid, from wine 0.9.12 upwards - wine configured, to use the builtin Ole-Stuff) In VB-Applications (wich are using (wide) Ole-BSTRs under the hood), I can reduce the problem to the following: If I define two Strings with the Content: S1, containing a Zero WChar (BSTR-LenDescriptor=2, ByteSequence 0 0) and S2, containing "A|Zero|B" (BSTR-LenDescriptor=6, ByteSequence 65 0 | 0 0 | 66 0) and then do the concat: SResult = S1 + S2 the resulting string contains only an "A" (BSTR-LenDescriptor=2, ByteSequence 65 0) instead of the correct ByteSequence: 0 0 | 65 0 | 0 0 | 66 0 That means, that the current implementation does not use the BSTR-Len-Descriptor anymore (it has worked in 0.9.10 or 0.9.11 - not very sure, but think it was 0.9.11 in my last tests) Instead it now behaves like routines, wich have to concat Zero-Terminated Strings. Nothing changed in my wine-configuration - only apt-getted to 0.9.12 first -> then to the latest 0.9.16 (ubuntu-deb) -> same problem. Do you handle the OLE-BSTR-stuff directly in wine, or do you give that jobs to other Libs in the system (the 0.9.12er winelib- update has also changed some dependencies (Gtk, libc* and others)? Olaf Schmidt

4 3

Re: Recording with "Lexia" (mci "open new")
by Damjan Jovanovic June 25, 2006

June 25, 2006

> 3) Most importantly: Why is it necessary to add > CAPTURE to system.ini? > Perhaps the "alias" argument isn't correctly > handled? Yes wine's MCI is broken: the parsing of some formats of MCI commands is incorrect, one of the examples I clearly remember being: "open G: type cdaudio alias cd" and wine complains that it could not load driver for type G: (whereas the driver type is cdaudio, no?) and you have to add "G:=mcicda.dll" in system.ini __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

3 3

Re: riched20: WM_SETFONT support
by Matt Finnicum June 25, 2006

June 25, 2006

I was just about to send in the same patch when you did. I'll have to keep you updated on what I'm working on in the future. (You can see what I'm planning to do for my SoC project at http://wiki.winehq.org/MatthewFinnicum) I've attached the patch I was going to send - I suggest we use some parts of each (either I can merge them into a patch or you can, your call). Our code is actually quite similar - though your "ME_CharFormatFromLogFont" is definitely superior to mine (I just did it all in function / was slightly less awesome). Aside from my conformance tests (Which your patch passed just fine), my patch covers some extra things: 1) You need to rewrap the paragraphs, since line lengths change. 2) Your code ignores lParam (which is supposed to specify if it repaints immediately) 3) You need to invalidate the entire control - otherwise just the are the text takes up will be redrawn - if the text shrinks, then the area outside it's new size won't be blanked / you'll see fragments of the old text. 4) Your code (I believe) will reset the scroll position - I store it ahead of time and then restore it. Thanks, --Matt On 6/24/06, Krzysztof Foltman <wdev(a)foltman.com> wrote: > ChangeLog: > * WM_SETFONT implementation - sets the default font and the font for > the whole pre-existing text > > Seems to fix bug 4563 and half of the bug 3917. > > Krzysztof > > > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > old mode 100644 > new mode 100755 > index 50527ca..61ecc72 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -92,7 +92,7 @@ > - EM_SELECTIONTYPE > - EM_SETBIDIOPTIONS 3.0 > + EM_SETBKGNDCOLOR > - - EM_SETCHARFORMAT (partly done, no ANSI) > + + EM_SETCHARFORMAT (partly done, no ANSI) > - EM_SETEDITSTYLE > + EM_SETEVENTMASK (few notifications supported) > - EM_SETFONTSIZE > @@ -135,7 +135,7 @@ > + WM_GETTEXT (ANSI&Unicode) > + WM_GETTEXTLENGTH (ANSI version sucks) > + WM_PASTE > - - WM_SETFONT > + + WM_SETFONT > + WM_SETTEXT (resets undo stack !) (proper style?) ANSI&Unicode > - WM_STYLECHANGING > - WM_STYLECHANGED (things like read-only flag) > @@ -1442,7 +1442,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND > UNSUPPORTED_MSG(EM_SETTYPOGRAPHYOPTIONS) > UNSUPPORTED_MSG(EM_SETWORDBREAKPROCEX) > UNSUPPORTED_MSG(EM_SHOWSCROLLBAR) > - UNSUPPORTED_MSG(WM_SETFONT) > UNSUPPORTED_MSG(WM_STYLECHANGING) > UNSUPPORTED_MSG(WM_STYLECHANGED) > /* UNSUPPORTED_MSG(WM_UNICHAR) FIXME missing in Wine headers */ > @@ -1844,6 +1843,27 @@ LRESULT WINAPI RichEditANSIWndProc(HWND > > return 0; > } > + case WM_SETFONT: > + { > + LOGFONTW lf; > + CHARFORMAT2W fmt; > + HDC hDC; > + BOOL bRepaint = LOWORD(lParam); > + > + if (!wParam) > + wParam = (WPARAM)GetStockObject(DEFAULT_GUI_FONT); > + GetObjectW((HGDIOBJ)wParam, sizeof(LOGFONTW), &lf); > + hDC = GetDC(hWnd); > + ME_CharFormatFromLogFont(hDC, &lf, &fmt); > + ReleaseDC(hWnd, hDC); > + ME_SetCharFormat(editor, 0, ME_GetTextLength(editor), &fmt); > + ME_SetDefaultCharFormat(editor, &fmt); > + > + ME_CommitUndo(editor); > + if (bRepaint) > + ME_UpdateRepaint(editor); > + return 0; > + } > case WM_SETTEXT: > { > ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor)); > diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h > old mode 100644 > new mode 100755 > index 33b7626..a4d4980 > --- a/dlls/riched20/editor.h > +++ b/dlls/riched20/editor.h > @@ -55,6 +55,7 @@ void ME_CopyToCF2W(CHARFORMAT2W *to, CHA > CHARFORMAT2W *ME_ToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from); > void ME_CopyToCFAny(CHARFORMAT2W *to, CHARFORMAT2W *from); > void ME_CopyCharFormat(CHARFORMAT2W *pDest, CHARFORMAT2W *pSrc); /* only works with 2W structs */ > +void ME_CharFormatFromLogFont(HDC hDC, LOGFONTW *lf, CHARFORMAT2W *fmt); /* ditto */ > > /* list.c */ > void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat); > diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c > old mode 100644 > new mode 100755 > index f420f09..6104a0c > --- a/dlls/riched20/style.c > +++ b/dlls/riched20/style.c > @@ -286,6 +286,25 @@ ME_LogFontFromStyle(HDC hDC, LOGFONTW *l > lf->lfCharSet = s->fmt.bCharSet; > } > > +void ME_CharFormatFromLogFont(HDC hDC, LOGFONTW *lf, CHARFORMAT2W *fmt) > +{ > + int rx, ry; > + > + ME_InitCharFormat2W(fmt); > + rx = GetDeviceCaps(hDC, LOGPIXELSX); > + ry = GetDeviceCaps(hDC, LOGPIXELSY); > + lstrcpyW(fmt->szFaceName, lf->lfFaceName); > + fmt->dwEffects = 0; > + fmt->dwMask = CFM_WEIGHT|CFM_BOLD|CFM_ITALIC|CFM_UNDERLINE|CFM_STRIKEOUT|CFM_SIZE|CFM_FACE|CFM_CHARSET; > + fmt->wWeight = lf->lfWeight; > + fmt->yHeight = -lf->lfHeight*1440/ry; > + if (lf->lfWeight>400) fmt->dwEffects |= CFM_BOLD; > + if (lf->lfItalic) fmt->dwEffects |= CFM_ITALIC; > + if (lf->lfUnderline) fmt->dwEffects |= CFM_UNDERLINE; > + if (lf->lfStrikeOut) fmt->dwEffects |= CFM_STRIKEOUT; > + fmt->bPitchAndFamily = lf->lfPitchAndFamily; > + fmt->bCharSet = lf->lfCharSet; > +} > > BOOL ME_IsFontEqual(LOGFONTW *p1, LOGFONTW *p2) > { > > > > > >

2 2

Re: wined3d: declaration/FVF conversion test
by Jason Green June 25, 2006

June 25, 2006

On 6/19/06, Ivan Gyurdiev <ivg231(a)gmail.com> wrote: > Does the windows box support shader model 3.0 ? The reason I keep asking > about this is that MSDN talks about a ' pre-3.0' driver and a 3.0 driver, > and I wanted to see if behavior was different. Just tested on my primary machine which has an NVidia 6600GT (Shader Model 3.0) in Windows XP, and got this: vertexdeclaration: 441 tests executed, 0 marked as todo, 0 failures. So, looks like we are good to go.

1 0

Re: setupapi: Fix SetupCloseInfFile when a NULL handle is given, with tests
by Joris Huizer June 24, 2006

June 24, 2006

James Hawkins wrote: > Hi, > > This fixes bug 5511. > > Changelog: > * Fix SetupCloseInfFile when a NULL handle is given, with tests. > > dlls/setupapi/parser.c | 2 ++ > dlls/setupapi/tests/parser.c | 9 +++++++++ > 2 files changed, 11 insertions(+), 0 deletions(-) > > -- > James Hawkins > > > ------------------------------------------------------------------------ > > This attachment seems to be empty; regards, Joris

1 0

Variable sized server replies
by Thomas Kho June 24, 2006

June 24, 2006

In protocol.def, the get_startup_info request declares two VARARGS as replies. Unless I've mistaken, replies are limited to one VARARG that the server call writes into preallocated data, right? That leads me to my next question: I'm currently working on moving menus into the server (see <http://silenceisdefeat.org/~tkho/seas/wine/patches/menu-0622-3/> for a series of patches that moves most menu data into the server. Most logic is still on the client, but it's still surprisingly snappy.) If you look at <http://silenceisdefeat.org/~tkho/seas/wine/patches/menu-0622-3/10-server-mii>, my problem is that I don't know the size of the data that the server is going to return and my current hack is to set a hard upper limit. I can think of two ways to tackle this: 1. Do a server call before hand to request the size of the data to be returned. This has the overhead of the additional call, but doesn't increase the complexity of the server itself. 2. Instead of preallocating memory for the variable reply, have the request mechanism allocate it (like it does on the server end for variable sized data in the request). This also adds complexity as the reply would be callee-allocated, caller-freed (or perhaps we could take advantage of SERVER_END_REQ?). However, it seems kind of natural to have the request process parallel the reply process. Is there another alterative? Any comments on which approach is better? Thomas Kho

2 1

Re: [AppDB] - protect sql insert statements from injection attacks
by Tony Lambregts June 24, 2006

June 24, 2006

Chris Morgan wrote: > Here is the new version. I've switched to the fully expanded method of > writing out the sql. This is the same format used by several db wrapper > libraries, in prepared sql statements and is the recommended style under > c#/.net for queries. > > I've tested creating new users and distributions and submitting an > application. > I have tested the patch thoroughly and it looks good to me. -- Tony Lambregts

1 0