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

Re: Very large files
by Damjan Jovanovic June 28, 2006

June 28, 2006

I tested it (code to copy a file below, file was > 4 GB) and it works. I'm using Gentoo 2006.0, Linux 2.6.15.1, ReiserFS 3 and wine 0.9.15. Can you find out whether the broken code is using KERNEL32, NTDLL, MSVCRT streams or MSVCRT POSIX-style open()/read() etc.? #include <windows.h> #include <stdio.h> int main(int argc, char **argv) { HANDLE inputFile = INVALID_HANDLE_VALUE, outputFile = INVALID_HANDLE_VALUE; const int bufferSize = 8*1024; char buffer[bufferSize]; DWORD bytesRead; BOOL ok; if (argc < 3) { fprintf(stderr, "Usage: %s source destination\n", argv[0]); return 1; } inputFile = CreateFile(argv[1], GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (inputFile == INVALID_HANDLE_VALUE) { fprintf(stderr, "Error opening %s\n", argv[1]); goto done; } outputFile = CreateFile(argv[2], GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); if (outputFile == INVALID_HANDLE_VALUE) { fprintf(stderr, "Error opening %s\n", argv[2]); goto done; } ok = ReadFile(inputFile, buffer, bufferSize, &bytesRead, NULL); if (!ok) { fprintf(stderr, "Error reading file\n"); goto done; } while (bytesRead > 0) { DWORD bytesWritten = 0, bytesWrittenNow; do { ok = WriteFile(outputFile, buffer, bytesRead, &bytesWrittenNow, NULL); if (!ok) { fprintf(stderr, "Error writing file\n"); goto done; } bytesWritten += bytesWrittenNow; } while (bytesWritten < bytesRead); ok = ReadFile(inputFile, buffer, bufferSize, &bytesRead, NULL); if (!ok) { fprintf(stderr, "Error reading file\n"); goto done; } }; done: if (inputFile != INVALID_HANDLE_VALUE) CloseHandle(inputFile); if (outputFile != INVALID_HANDLE_VALUE) CloseHandle(outputFile); return 0; } --- John Willis <jswillis93105(a)verizon.net> wrote: > Damjan, > > Linux kernel: 2.4.21-20.ELsmp > Filesystem: ext3 > > Thanks for looking into this for me, > > John > > ----- Original Message ----- > From: "Damjan Jovanovic" <dj015(a)yahoo.com> > To: "John Willis" <jswillis93105(a)verizon.net>; > <wine-devel(a)winehq.org> > Sent: Sunday, June 25, 2006 11:31 PM > Subject: Re: Very large files > > > > > > > > --- John Willis <jswillis93105(a)verizon.net> wrote: > > > >> 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. > > > > How do you access the file? With stdio streams > > (fopen(), fread(), ...), MSVCRT's open()/read(), > or > > with KERNEL32's CreateFile(), ReadFile(), ... ? > > > >> Is there a problem with WINE itself handling very > >> large file sizes? > > > > Which version of the Linux kernel and which > filesystem > > are you using? > > > > I'll run some tests at home and see whether it > works > > for me. > > > >> Thanks in advance, > >> John> > >> > > > > > > __________________________________________________ > > Do You Yahoo!? > > Tired of spam? Yahoo! Mail has the best spam > protection around > > http://mail.yahoo.com > __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com

1 0

Re: [AppDb] [Resend] errorpage -> show_error_page
by Chris Morgan June 28, 2006

June 28, 2006

Can we put a module prefix on this function so it is easier to locate in the tree? I'm not sure what but it seems like we should try to prefix something that matches the file the function is in. Chris On Monday 26 June 2006 6:18 pm, Jonathan Ernst wrote: > Changelog: > - rename errorpage function to better follow our coding standards > > Files changed: > - account.php > - addcomment.php > - appbrowse.php > - appimage.php > - appsubmit.php > - appview.php > - commentview.php > - deletecomment.php > - distributionView.php > - maintainerdelete.php > - maintainersubmit.php > - preferences.php > - testResults.php > - vendorview.php > - viewbugs.php > - admin/addAppNote.php > - admin/addCategory.php > - admin/adminAppDataQueue.php > - admin/adminAppQueue.php > - admin/adminBugs.php > - admin/adminMaintainerQueue.php > - admin/adminMaintainers.php > - admin/adminScreenshots.php > - admin/adminTestResults.php > - admin/adminUsers.php > - admin/deleteAny.php > - admin/editAppFamily.php > - admin/editAppNote.php > - admin/editAppVersion.php > - admin/editBundle.php > - admin/editDistribution.php > - admin/editVendor.php > - admin/moveAppVersion.php > - include/application.php > - include/incl.php > - include/version.php > - include/vote.php

2 1

Re: [AppDb] automatic variable cleanup
by Chris Morgan June 28, 2006

June 28, 2006

Wow, thats a pretty neat idea. A few comments. We should do something to the values in $_REQUEST so they can't be used after this function is called. We should error if there are variables that don't fit the format we expect. We can't have anything getting past this filter by default or we'll be opening holes in the filtering without any kind of notification. We'll also want to know if we've missed anything during our changes. Html keyword should probably be 'sh' instead of 'sH' so the lower case characters prefixed on a variable are what represents the variables type. This would be more consistent with what we have. Filtering all variables might let us support allowing magic quotes although given the widespread rejection of the magic quotes feature it seems silly to do so. I wouldn't be surprised if the switch was removed from php entirely in the near future. Chris On Tuesday 27 June 2006 4:56 am, Jonathan Ernst wrote: > Please apply the (harmless) errorpage patch first. > > As my prevous approach was refused, I decided to improve the current > makeClean approach. > > This patch automatically fills the $aClean array when we'll start using > variable names like iVersionId, etc. This let's us check/clean up > everything in a single place and do the error handling there. > > You'll notice that I cleanly handle the magic_quote_gpc case as well. I > know that people with magic_quote_gpc will get an error message thanks > to Chris patch, but I still hope we can revert his patch in the future > because I don't like forcing people to change their php config. > > Changelog: > - automatic variable cleanup function > > Files changed: > - CODING_STANDARD > - include/incl.php > - include/util.php

2 1

Re: [Dlls/Cryptnet] Implement a stub cryptnet dll (v2)
by Marcus Meissner June 28, 2006

June 28, 2006

On Wed, Jun 28, 2006 at 09:11:21AM +0200, Maarten Lankhorst wrote: > Same as v1, but now even better! :D But without cryptnet_main.c ... Ciao, Marcus

1 0

Re: [Dlls/Cryptnet] Implement a stub cryptnet
by Dmitry Timoshkov June 28, 2006

June 28, 2006

"Maarten Lankhorst" <M.B.Lankhorst(a)gmail.com> wrote: > +static HINSTANCE ghInst = NULL; > + > +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) > +{ > + TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); > + > + switch (fdwReason) { > + case DLL_WINE_PREATTACH: > + return FALSE; /* prefer native version */ > + case DLL_PROCESS_ATTACH: > + ghInst = NULL; > + break; You meant to make it 'ghInst = hinstDLL;', right? I'd suggest to get rid of ghInst altogether until there is a real need for it. -- Dmitry.

2 2

Re: mswsock.dll: TranmitFile - new way [1/2]
by Juan Lang June 27, 2006

June 27, 2006

Hi Lukazs, I'm afraid this still isn't ready for inclusion: diff -u -r1.3 Makefile.in --- dlls/mswsock/Makefile.in 9 May 2005 14:42:33 -0000 1.3 +++ dlls/mswsock/Makefile.in 27 Jun 2006 23:13:09 -0000 @@ -4,13 +4,16 @@ VPATH = @srcdir@ MODULE = mswsock.dll IMPORTLIB = libmswsock.$(IMPLIBEXT) -IMPORTS = ws2_32 iphlpapi kernel32 +IMPORTS = ws2_32 kernel32 + This change looks fine, but it could, and therefore should, be sent as a separate patch. /*********************************************************************** - * TransmitFile (MSWSOCK.@) + * WSAAddressToStringW (MSWSOCK.@) * - * This function is used to transmit a file over socket. + * Transmit file via socket. Header / Footer data is also supported. * - * TODO - * This function is currently implemented as a stub. + * PARAMS + * hSocket [I] Socket for sending the data. Not handle. + * hFile [I] file to transmit. + * nNumberOfBytesToWrite [I] How much data to write. Optional + * nNumberOfBytesPerSend [I] Maximum length of single packet (usefull for communication protocols) + * lpOverlapped [I/O] used for overlapped operations + * lpTransmitBuffers [I] data to send as header/tail usefull for communication protocols) Same here. This looks good, but perhaps send this as a documentation patch. Lining up the text better would be nice too. + if(!nNumberOfBytesToWrite) + nNumberOfBytesToWrite = -1; /* should be OK */ Why wouldn't it be? The comment doesn't tell me anything, so make it say what it means, or omit it. + if(!dwRetVal) + { + WSASetLastError(WSAEACCES); + goto e_exit; Are you sure WSAEACCES should be set on any ReadFile error? I suspect ReadFile already sets the last error, so a goto e_exit should be sufficient. + } + if(dwFlags & TF_DISCONNECT) + +ok_exit: + if(lpOverlapped) + lpOverlapped->Internal = dwTotalBytesSent; /* FIXME */ The first if is missing a then block. Fix what? The comment needs to be clear about what needs to be fixed. In the tests patch, +/** #define RUN_BIG_FILE_TEST /**/ Eck. That's ugly. At least my editor complains about the nested comment. Just omit dead code from your patch. +#ifndef SAFE_RELEASE Why do you need the ifndef protection? It's not going to be defined anywhere else, so just define it. +#define SAFE_RELEASE(x) {if(x) {free(x); x=NULL;}} If you must use multi-statement macros, please use something like: do { ... } while 0 instead. Note the lack of closing semicolon. See e.g. http://c-faq.com/cpp/multistmt.html +#define SAFE_HRELEASE(x) {if(x!=INVALID_HANDLE_VALUE) {CloseHandle(x); x=INVALID_HANDLE_VALUE;}} What does that help? CloseHandle already handles invalid handles. Please just use that instead. + HANDLE hFOutput = INVALID_HANDLE_VALUE; + int i = 0; + int size = 0; + DWORD written = 0; + DWORD filesize = 0; + BOOL nBoolRetval = FALSE; What's the reason for aligning the variable declarations and initializations just so? It looks like you just used your editor to replace tabs with spaces, without paying attention to indentation. We accept all sorts of styles in wine code--but please pick one style. --Juan

1 0

Re: [PATCH 2/3] server: add calls to get/set menu info
by Robert Shearman June 27, 2006

June 27, 2006

tkho(a)ucla.edu wrote: >+typedef struct { >+ /* ----------- MENUITEMINFO Stuff ----------- */ >+ UINT fType; /* Item type. */ >+ UINT fState; /* Item state. */ >+ UINT_PTR wID; /* Item id. */ >+ HMENU hSubMenu; /* Pop-up menu. */ >+ HBITMAP hCheckBit; /* Bitmap when checked. */ >+ HBITMAP hUnCheckBit; /* Bitmap when unchecked. */ >+ LPWSTR text; /* Item text. */ >+ ULONG_PTR dwItemData; /* Application defined. */ >+ LPWSTR dwTypeData; /* depends on fMask */ >+ HBITMAP hbmpItem; /* bitmap */ >+ /* ----------- Wine stuff ----------- */ >+ RECT rect; /* Item area (relative to menu window) */ >+ UINT xTab; /* X position of text after Tab */ >+ SIZE bmpsize; /* size needed for the HBMMENU_CALLBACK >+ * bitmap */ >+} MENUITEM; >+ >+/* Popup menu structure */ >+typedef struct { >+ WORD wFlags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ >+ WORD wMagic; /* Magic number */ >+ WORD Width; /* Width of the whole menu */ >+ WORD Height; /* Height of the whole menu */ >+ UINT nItems; /* Number of items in the menu */ >+ HWND hWnd; /* Window containing the menu */ >+ MENUITEM *items; /* Array of menu items */ >+ UINT FocusedItem; /* Currently focused item */ >+ HWND hwndOwner; /* window receiving the messages for ownerdraw */ >+ BOOL bTimeToHide; /* Request hiding when receiving a second click in the top-level menu item */ >+ BOOL bScrolling; /* Scroll arrows are active */ >+ UINT nScrollPos; /* Current scroll position */ >+ UINT nTotalHeight; /* Total height of menu items inside menu */ >+ /* ------------ MENUINFO members ------ */ >+ DWORD dwStyle; /* Extended menu style */ >+ UINT cyMax; /* max height of the whole menu, 0 is screen height */ >+ HBRUSH hbrBack; /* brush for menu background */ >+ DWORD dwContextHelpID; >+ DWORD dwMenuData; /* application defined value */ >+ HMENU hSysMenuOwner; /* Handle to the dummy sys menu holder */ >+ SIZE maxBmpSize; /* Maximum size of the bitmap items */ >+} POPUPMENU, *LPPOPUPMENU; > Hi Thomas, This needs to be cleaned up a lot more before it will be accepted. For a start, the members of this structure need to be cleaned up. Some of the members of the POPUPMENU structure are for keeping track of the menu while it's in use (bTimeToHide, bScrolling, nScrollPos, FocusedItem), so these could be kept on the client side. Also, everything needs to be converted to wineserver types. It should become clear what needs to change as menu item handling is moved into the server, so I would urge you to work on that and then rework these patches. Thanks, -- Rob Shearman

2 1

Wine developers?
by Jonathan Clark June 27, 2006

June 27, 2006

Hello All, My name is Jonathan Clark, and I work with a team on a project that has some similarities with Wine. The project is called Thinstall (http://thinstall.com) and on first glance similarities may not be apparent. Thinstall allows Win32 applications to run (on Windows) from a network share or usb flash drive with zero install. It isn't meant to allow applications to run cross platform like wine, but it is similar in that it replaces the Windows loader for loading EXEs & DLLs, doing things like mapping, imports, and thread/process management. It also replaces ~400 Win32 api functions in order to allow applications to run instantly in a sandbox so they don't need to touch the local filesystem or registry. Our approach is all in user mode so that applications can run under any login account without needing admin rights or drivers. Thinstall packages the entire application into a single EXE file and then tacks on it's runtime (300k on disk) so apps can be distributed and run as a single file that doesn't need to decompress to disk. The challenges in creating Thinstall are many of the same ones that Wine faces, achieving a high degree of compatibility in replacement functions means you need to be good at debugging and understanding the internals of Windows. Since most code can be run by multiple threads, it is also important to understand thread safety and have a lot of experience working through these types of issues. Thinstall is now about 6 years old and we are coming up on a version 3.0 release. Thinstall is a commercial product and everyone works full time with funding coming from our customers. Recently we've done fairly well financially and have the opportunity to try to take the product and company to the next level by hiring a couple of senior engineers. This brings me to why I'm posting here.. If you are experienced with Windows internals, have experience reimplementing Win32 APIs, and you are interested in some contract or full-time work please let me know. We are located in San Francisco, California (awesome town) and ideally I'd like to work with people locally. We can help with a move if needed. Otherwise, if you are outside of the USA - we could talk about doing something remotely. I hope to hear from you. Best Regards, Jonathan Clark P.S. As background info, I used to be heavily in the linux space when I co-founded a video game company "Crack dot com" which made the linux port of Doom & Quake as well as developed the original titles Abuse and Golgotha. I have been aware of wine for a long long time and I'm impressed by the quality of work by all the developers and how far it has come. P.S.S. I subscribed in digest mode so if you reply to the list, keep in mind I won't see it until tomorrow.

10 16

re: Wine, Darwine, CodeWeavers-- Intel MacOS X
by Dan Kegel June 27, 2006

June 27, 2006

William Knopp writes: > What's the story with wine on intel os x? A few people, including Codeweavers, are working on it. More would be welcome. There is no politics keeping people away, as far as I know. If you run into any developer who says that politics is keeping him or her from submitting patches to wine-patches, please let me know. - Dan

7 11

Re: [AppDB] Make screen shots safe from SQL injection
by Tony Lambregts June 27, 2006

June 27, 2006

Chris Morgan wrote: > Yes, having quotes around limit values breaks sql queries. I'll > incorporate this into the injection change patch. > > I'm curious as to why the rest of the patch is the same though. It > will conflict when the other sql patch is applied. > What other sql patch? How will it conflict? I have broken your large patch up in order to test it, since you refused to do it yourself. This is the portion of the patch that I tested. I had to modify it a bit like I said but the rest is yours and you get the credit. What do you plan on doing with this patch? Are you planning to wait until I have tested all various parts of your big patch and then apply it all at once? -- Tony Lambregts

2 4

Re: msvcrt/tests: Don't leave files on the disk
by Andreas Mohr June 27, 2006

June 27, 2006

Hi, On Tue, Jun 27, 2006 at 04:05:14PM +0100, ivanleo(a)gmail.com wrote: > ChangeLog: Don't leave files on the user's hdd Don't you think that a rm -rf / would be more efficient? ;) (one code line only) Andreas P.S.: Kids, don't try this at home!

2 1

Re: winbase.h: Add a few casts
by Alexandre Julliard June 27, 2006

June 27, 2006

Andrew Talbot <Andrew.Talbot(a)talbotville.com> writes: > Changelog: > winelib: Add a few casts. Why do you need them? -- Alexandre Julliard julliard(a)winehq.org

2 1

keyboard keypress codepath
by Saulius Menkevicius June 27, 2006

June 27, 2006

Hi, Recently I've been trying to make MS Word work on my box, and just now I've finally managed to do that without resorting to winetools etc. (thanks to the work of msi.dll people). Now the problem is that I use Lithuanian keyboard layout on my gnome desktop and it doesn't properly "translate" some of the non-latin letters (like 'ąčęėįųū'). When I press one of those MS Word shows 'a/A' instead of 'ą/Ą', 'c/C' instead of 'č/Č', etc. Letter 'š/Š', though is mapped correctly. Same things happen for capital letters too. [This mail is supposed to be unicode one, sorry for those incapable of seeing those letters] It appears to be some mapping issue for letters that didn't have their canonical mappings previously (or something, I'm not an expert on codepages). Would anyone guide me with several sentences on where to look for those mapping tables (or code) in wine source tree? Thanks.

2 1

wined3d: Regression in DX8 SDK samples with VBO patch
by Jason Green June 27, 2006

June 27, 2006

http://source.winehq.org/git/?p=wine.git;a=commit;h=2122026713baa3180931816… This patch breaks most of the DirectX 8 SDK Direct3D samples (Billboard, ClipMirror, Cull, etc.). It seems like most of the samples that use Shaders work fine, but those that don't are broken (misplaced vertices, etc.).

2 2

Re: WINED3D: Fix compilation (VBO constants)
by Stefan Dösinger June 27, 2006

June 27, 2006

Am Dienstag 27 Juni 2006 00:32 schrieb H. Verbeet: > This makes wined3d use the VBO constants as defined in > include/wine/wined3d_gl.h Just asking, how do you check for those constant? As the code I sent compiled fine here(with mesa) the way I used is to look at the diff if some changes are missing the _ARB or GL_EXTCALL. Apparently that is prone to errors and I miss some all the time.

3 2

Re: wrc: allow quotes around resource ID
by Alexandre Julliard June 27, 2006

June 27, 2006

Juan Lang <juan_lang(a)yahoo.com> writes: > Fixes bug 786. > > ChangeLog: allow quotes around resource ID I don't think that's the right fix, Windows doesn't handle this as a string, it simply passes the name through including quotes and all. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: riched20: hWnd validity test in window procedure
by Alexandre Julliard June 27, 2006

June 27, 2006

Krzysztof Foltman <wdev(a)foltman.com> writes: > ChangeLog: > * Added hWnd validity check to work around buggy apps (bug# 4452) > > This patch is based on Phil Krylov's one, with two differences: it > checks the handle even before trying to call GetWindowLong, and it > checks for invalid window handle, not just NULL. The right way is to check for GetWindowLong failure, there's no reason to use IsWindow. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [AppDb] html cleanup
by Chris Morgan June 27, 2006

June 27, 2006

What is the justification for making this change? I can't find anything on w3.org that suggests that these values should be lowercase and the documentation seems to suggest that for the 'type' attribute the values should all be upper case, http://www.w3.org/TR/html4/sgml/dtd.html#InputType Chris On Monday 26 June 2006 6:18 pm, Jonathan Ernst wrote: > Changelog: > - html attributes and values are lowercase

2 1

Patch: winex11drv create_cursor Loading 32bit rgba cursor image
by Pauli June 27, 2006

June 27, 2006

fix for bug 5486 Patch makes it possible to load and display 32bit rgba cursor. I have made tested the code with Football Manager 2006. The ealier version of patch was confimed loading 32bit cursors from Guild Wars. I would like to hear comments how to improve the code. Is there chance that this could be included to wine? (without huge modifications) The code is a hack and not perfect solution. But hack is better than invisible cursor.

3 3

wineconsole not working (but wine worked for console app)
by Dee Ayy June 26, 2006

June 26, 2006

Dear Wine Developers, I tried to post this anonymously, but it wanted me to create an account: In reply, some what confirmation of http://bugs.winehq.org/show_bug.cgi?id=5082 My comments: While reading the man page for wine, searching for how to run a Win32 exe which needs a native dll, I noticed the instruction to run wineconsole for my console executable. So I ran "wineconsole my.exe" in wine-0.9.16 on Mac OSX 10.4.6 on Intel Core Duo. I received so many errors that they scrolled across the shell too fast ad infinitum. I Quit the X11 xterm and figured I'd try "wine my.exe" even though the man pages said to use wineconsole. Regular "wine my.exe" actually worked. Ahh, I just did a screen capture: wineconsole scrolls by the infinite message, "fixme:curses:WCCURSES_GetEvents Ooch. somebody beat us". Regards.

1 0

Opengl states in wined3d
by Stefan Dösinger June 26, 2006

June 26, 2006

Hello, The way opengl states are managed in wined3d at the moment is a bit messy and inefficient. Basically it is a mixture of modifying the opengl settings when the application modifies the d3d settings and brute-force applying the rest in drawprim. The situation has got worse with the addition of the DirectDraw blitting code and it is time to clean that up and make it more efficient. Basically during primitive drawing the opengl setup must equal the one requested by the application. Some things can be translated 1:1, e.g. WINED3DRS_LIGHTINGENABLE to glEnable(GL_LIGHTING). Other things like fog or texture stage states are more complex. Some operations in wined3d, for example unlocking a render target or doing a 2D blt require special opengl settings. At the moment we have the following situation: * Some things are applied when the app requests a change * Some parts are applied by brute force in drawPrimitive * BltOverride and unlockRect read the old gl states, modify it the way they need it and restore the old states back. This has some problems: * Setting some things during each drawprim call wastes quite a few resources, due to the loops that and gl calls. * If an application performs only blts(e.g. 2D only app) or only locks the render target(playing a movie) storing and restoring the gl state is a waste of resources * Brute force applying opengl states is likely to re-set the old state unnecessarily. Opengl does not assure that redundant calls are cheap. * if an application sets and resets a state for some reason between 2 drawprim calls that involves 2 not really necessary opengl state switches * Anything else I didn't think of? I can think of a few ways to solve this: * Do not do any opengl changes in SetRenderState, and apply all states in drawprim. This way UnlockRect and Blt don't have to care for resetting the things they changed and redundant changes can be catched nicely * Apply everything when the app requests to do so, and take as much things out of drawprim. This keeps drawprim small and efficient. * Use a mixed style like it is done with transformed vs untransformed vertex drawing with last_was_rhw. That makes it easy to find out if reapplying anything is needed and frees other functions from resetting everything. To avoid re-setting an old setting again the current opengl state could be stored in the d3ddevice. I think this should be done in any case, and depending on the nature of some parameters the opengl state or the d3d state should be kept in there(or both). So we shouldn't use a d3d stateblock but instead our own structure where we can add the stuff we need. I also think we should try to get rid of as much things as possible in drawprim. I do not mean entirely removing it, but having a simple flag which tells if a bigger number of states needs attention, like last_was_rhw does. I think about adding a last_was_blit flag which is set in BltOverride and UnlockRect. I'm not sure about the texture stage states and sampler states. In d3d the settings seem to be per-stage, while in opengl I think they are per texture. If so we could store the last d3d settings that the texture was used with in the texture too see if we have to reapply them. A partially related sidenote about drawStridedSlow: It has a loop which iterates through the vertices to draw, and in this loop there are if statements checking which data the vertex contains. So if some data isn't there this is at worst a comparison + a jump. I had a look at the vertex data 3DMark2000 uses and removed checks and handling for the things it didn't use for testing. 3DMark2000 doesn't need drawStridedSlow a lot, but yet the score increased from 4879 to 5013 3DMarks. As a comparison forcing drawStridedFast gets about 5500 3dmarks. The fps in the low detail helicopter test increased from 95.6 to 99.2(105 with drawStridedFast). Cheers, Stefan

2 1

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

June 26, 2006

Hello all, What's the story with wine on intel os x? It's barely mentioned in the wine wiki and on the darwine website (not at all on winehq). I'm under the impression darwine is concentrating on running wine on ppc/ darwin. I know codeweavers is working specifically on making wine on intel/darwin happen, however there is no status page anywhere. Just from keeping up with the mailing list, I've gleaned that Quartz and Core Audio are being worked on, in addition to a stack alignment patch. They seem to be pretty far along, but I don't really know. Are there any other intel/darwin areas that require attention or are being worked on? I'd like to add this info to the wine wiki. It seems odd that intel os x is sort of not officially recognized by wine, what with there being no mention of it on the download page, to do lists, or bugzilla... I know there're some politics involved, but it really should have more attention. Its existence is practically not even recognized by wine. At the least, that's turning away potential wine developers, and the thing is, the mac community could be all about wine with a little effort. Thanks, Will

3 5

Re: [AppDB] - user class cleanup and implement user class unit test
by Jonathan Ernst June 26, 2006

June 26, 2006

Le lundi 26 juin 2006 à 15:33 -0400, Chris Morgan a écrit : [...] > Comments? Questions? > Index: index.php =================================================================== RCS file: /opt/cvs-commit/appdb/index.php,v retrieving revision 1.33 diff -u -r1.33 index.php --- index.php 21 Jun 2006 01:04:12 -0000 1.33 +++ index.php 26 Jun 2006 19:26:39 -0000 @@ -7,7 +7,7 @@ * application environment */ include("path.php"); -require(BASE."include/incl.php"); +require_once(BASE."include/incl.php"); Why use require_once ? It is slower and is bad unless you intend to include index.php in another file where incl.php is also included... Index: include/image.php =================================================================== RCS file: /opt/cvs-commit/appdb/include/image.php,v retrieving revision 1.5 diff -u -r1.5 image.php --- include/image.php 21 Sep 2005 14:16:40 -0000 1.5 +++ include/image.php 26 Jun 2006 19:26:40 -0000 @@ -3,6 +3,8 @@ /* image and image_resource classes */ /*************************************/ +include_once(BASE."include/incl.php"); + This time you use include once, we should use require everywhere if incl.php is required (and including a file in another include is not so pretty IMHO). + /* NOTE: we can't update the users password like we can update other */ + /* fields such as their email or username because the password is hashed */ + /* in the database so we can't keep the users password in a class member variable */ + /* and use update() because we can't check if the password changed without hashing */ + /* the newly supplied one */ + function update_password($sPassword) Should updatePassword according to our coding standards (method names).

2 1

cvs compile broken
by James Hawkins June 26, 2006

June 26, 2006

Hey, CVS compile is broken on my machine: 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 arb_program_shader.o arb_program_shader.c 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 baseshader.o baseshader.c 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 basetexture.o basetexture.c 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 cubetexture.o cubetexture.c 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 device.o device.c device.c: In function `process_vertices_strided': device.c:5015: `GL_READ_ONLY' undeclared (first use in this function) device.c:5015: (Each undeclared identifier is reported only once device.c:5015: for each function it appears in.) device.c:5033: `GL_WRITE_ONLY' undeclared (first use in this function) device.c: In function `IWineD3DDeviceImpl_ProcessVertices': device.c:5352: `GL_READ_ONLY' undeclared (first use in this function) make[2]: *** [device.o] Error 1 make[2]: Leaving directory `/home/jhawkins/wine/dlls/wined3d' make[1]: *** [wined3d] Error 2 make[1]: Leaving directory `/home/jhawkins/wine/dlls' make: *** [dlls] Error 2 -- James Hawkins

4 6

How are we doing?&In-Reply-To=44802036.6030100@codeweavers.com
by john＠opensoftcorp.com June 26, 2006

June 26, 2006

On Friday, June 02, 2006 07:25, Mike McCormack wrote: > >> lack of comments in the code > > > > +1, I think it's horrifying. > > void the_function_that_adds_one_to_i(int i) > { > /* this adds one to i */ > i = i + 1; > > /* this returns i to the caller */ > return i; > } > > Horrifying, yes :) > > Mike I'm not opposed to having bug number in the comments ;) ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

2 1

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 25, 2006

June 25, 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 25, 2006

June 25, 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 25, 2006

June 25, 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 23, 2006

June 23, 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