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

Re: appdb/include application.php
by Tony Lambregts Dec. 8, 2006

Dec. 8, 2006

WineHQ wrote: > ChangeSet ID: 30409 > CVSROOT: /opt/cvs-commit > Module name: appdb > Changes by: wineowner(a)winehq.org 2006/12/07 21:38:27 > > Modified files: > include : application.php > > Log message: > Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> > Use $this instead of $oApp since this method is referring to its class > > Patch: http://cvs.winehq.org/patch.py?id=30409 > > Old revision New revision Changes Path > 1.76 1.77 +2 -2 appdb/include/application.php > > Index: appdb/include/application.php > diff -u -p appdb/include/application.php:1.76 appdb/include/application.php:1.77 > --- appdb/include/application.php:1.76 8 Dec 2006 3:38:27 -0000 > +++ appdb/include/application.php 8 Dec 2006 3:38:27 -0000 > @@ -345,12 +345,12 @@ class Application { > { > case "add": > $sSubject = "Submitted application accepted"; > - $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; > + $sMsg = "The application you submitted (".$this->sName." ".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; This is not right. this will print the application name twice. it should be + $sMsg = "The application you submitted (".$this->sName.") has been accepted by .$_SESSION['current']->sRealname."."; > $sMsg .= "Administrators Responce:\n"; > break; > case "reject": > $sSubject = "Submitted application rejected"; > - $sMsg = "The application you submitted (".$oApp->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; > + $sMsg = "The application you submitted (".$this->sName." ".$this->sName.") has been rejected by ".$_SESSION['current']->sRealname."."; same thing here > $sMsg .= "Clicking on the link in this email will allow you to modify and resubmit the application. "; > $sMsg .= "A link to your queue of applications and versions will also show up on the left hand side of the Appdb site once you have logged in. "; > $sMsg .= APPDB_ROOT."appsubmit.php?sub=view&apptype=application&appId=".$this->iAppId."\n"; > > >

1 0

Re: mshtml as html parser
by Kirill K. Smirnov Dec. 7, 2006

Dec. 7, 2006

>> Just a little question: can wine's current implementation of mshtml.dll be >> used as html parser? I need to convert html code into a tree without >> displaying it. >You might want to use tidy and an XML pareser : >http://www-128.ibm.com/developerworks/library/x-tiptidy.shtml This way looks too complicated in the following case: I switched off from winhelp in favor of chmhelp - winhelp works somehow, but chmhelp not. chm content is an simple HTML file, which can be parsered by hands (like xCHM utility does), but if there is a library like mshtml (or msxml) why not use it? The only problem is I am afraid wine's mshtml has E_NOTIMPL in piece of codes looks interesting to me. (I do not understand the architcture of mshtml.dll to be sure). To stop wandering I decided to write a question here. So the question: can the wine's mshtml (as it is now) be used? I looked for smth like CreateHTMLDocument2(...) but failed. -- Kirill K. Smirnov

1 0

Change to fix Mac OS X
by Michael Casadevall Dec. 7, 2006

Dec. 7, 2006

I've been tracking Wine for sometime in git, and attempting to build it on Mac OS X just to have repetitive failure. I finally had some time to look at the cause, and figured out that it was failing due to a prototype mismatch in dlls/dbghelp/dbghelp_private.h and dlls/ dbghelp/elf_loader.c. The problem is that the function elf_load_module uses a DWORD in elf_loader.c and an unsigned load in the dbghelp_private.h. I changed the header to a DWORD which fixed the compile right up and allowed it to successfully build Wine, but after talking to vitamin, this change might cause issues with Wine on 64-bit systems. Since I only own 32-bit, and know little about differences when programming 64-bit systems, I thought I should ask before I submit the patch to wine-patches. The full prototype and arguments are: dbghelp_private.h: extern struct module* elf_load_module(struct process* pcs, const char* name, unsigned long) elf_loader.c: struct module* elf_load_module(struct process* pcs, const char* name, DWORD addr) For good measure, I've also attached the patch to this email. Regard, Michael

3 4

Question about allocating memory for a Windows PE file
by Stephen Torri Dec. 7, 2006

Dec. 7, 2006

I am trying to create a custom Windows PE loader (binary & DLL) for the purpose of security research. I am having a difficult time finding how to allocate memory for a binary at the desired address in memory (especially if its non-relocatable). I would like to see why I cannot get memory allocated at the exact address request in the binary headers. Is there a program or system call that allows me to see a list of memory address ranges allocated to the running processes on a system? Stephen

3 2

Re: [Wine] Re: Difference Between WINE and an Emulator
by Edward Savage Dec. 7, 2006

Dec. 7, 2006

>An emulator is a specific type of program that mimics hardware. Windows > is not a piece of hardware, ergo Wine Is Not an Emulator. It's merely a > clone of the Windows API. This is probably the best answer you will get that is clear and simple. Out of interest the term I use to explain to others the concept is that WINE is a compatibility layer between Linux and Windows. Does that seem an accurate use of the word? It tends to set the right impression in the minds of the people I've explained it too.

3 2

Re: winex11.drv: Update cached cursor position after calling hook.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Vitaliy Margolen <wine-patches(a)kievinfo.com> writes: > @@ -276,10 +274,12 @@ void X11DRV_send_mouse_input( HWND hwnd, > if ((injected_flags & LLMHF_INJECTED) && > ((flags & MOUSEEVENTF_ABSOLUTE) || x || y)) /* we have to actually move the cursor */ > { > - TRACE( "warping to (%d,%d)\n", pt.x, pt.y ); > + X11DRV_SetCursorPos( pt.x, pt.y ); > + } > + else > + { > wine_tsx11_lock(); > - XWarpPointer( thread_display(), root_window, root_window, 0, 0, 0, 0, > - pt.x - virtual_screen_rect.left, pt.y - virtual_screen_rect.top ); > + cursor_pos = pt; > wine_tsx11_unlock(); > } You need to update the position for button events too. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ole32: Support reading and writing custom clipformats in the data cache.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Robert Shearman <rob(a)codeweavers.com> writes: > --- > dlls/ole32/datacache.c | 106 > +++++++++++++++++++++++++++++++++++++++++------- > 1 files changed, 91 insertions(+), 15 deletions(-) This breaks make test: ../../../tools/runtest -q -P wine -M ole32.dll -T ../../.. -p ole32_test.exe.so ole2.c && touch ole2.ok ole2.c:1257: Test failed: IViewObject_Draw failed with error 0x80040007 ole2.c:1266: Test failed: IViewObject_Draw failed with error 0x80040007 ole2.c:1272: Test failed: IViewObject_Draw failed with error 0x80040007 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: mshtml #3: Use HTMLWindow::alert in nsPromptService::Alert.
by Alexandre Julliard Dec. 7, 2006

Dec. 7, 2006

Jacek Caban <jacek(a)codeweavers.com> writes: > @@ -39,6 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); > > #define HTMLWINDOW2_THIS(iface) DEFINE_THIS(HTMLWindow, HTMLWindow2, iface) > > +typedef struct { > + struct list entry; > + HTMLWindow *window; > +} window_list_t; > + > +static struct list window_list = LIST_INIT(window_list); > + The right way to build a list of windows is to put the list entry directly in the HTMLWindow structure, there's no need for a separate structure. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] [WineCfg]: a few fixes for the French translation
by Jonathan Ernst Dec. 7, 2006

Dec. 7, 2006

Le mercredi 06 décembre 2006 à 21:35 +0100, Eric Pouech a écrit : > - remove typos (ortaugraffe) > - set correct size for controls > - used correct space usage (for French) > [...] > - LTEXT "&Nouveau suclassage pour:",IDC_STATIC,16,58,100,8 > + LTEXT "&Nouveau suclassage pour :",IDC_STATIC,16,58,100,8 Could you please fix "suclassage" as well ;-) Thanks. Jonathan

1 0

Re: [PATCH 4/4] ole32: Support reading and writing custom clipformats in the data cache.
by Mike McCormack Dec. 7, 2006

Dec. 7, 2006

Robert Shearman wrote: > + { > + char *format_name = HeapAlloc(GetProcessHeap(), 0, length); > + if (!format_name) > + return E_OUTOFMEMORY; > + GetClipboardFormatNameA(clipformat, format_name, length); > + hr = IStream_Write(stream, format_name, length, NULL); > + } You might want to free format_name at the end of that block. Mike

2 1

Re: [Wine] Cyber Cafe Pro on Linux
by Edward Savage Dec. 6, 2006

Dec. 6, 2006

I'm going to get eaten alive for this though depending on your requirements it might be a better idea to stick with Windows and really lock down your installation. I've been directly involved in two Linux migrations for Internet Cafes (and advised on several others) - one successful (net cafe) and the other unsuccessful (gaming cafe) - and in both cases it was more trouble than it was worth. The problem isn't the software it is the users; When they go to use the software they notice, for example, that they aren't using IE and when they come up to some page that doesn't display perfectly problems occur. There are many more examples that just make the mind hurt. So unless this Cycber Cafe Pro provides _everything_ you really need to be asking yourself if you really want to open this can of worms. On 12/5/06, vulani mabunda <vulani(a)mac.com> wrote: > > Hi, > > I'm running an internet cafe using Cyber Cafe Pro software. This software > is design soley for Windows platforms. We're constantly experiencing > problems with Windows with regards to viruses and stability issues. > Recently, we lost all our data and had to re-install. > > May you please help us in flawlessly porting this application so that it > can run on Linux both on the server and client sides. If this happens, it > could mean an end to our nightmare with Windows! > > We have already tried Open Kiosk (which natively runs on Linux) prior to > making my request. Open Kiosk is free but is not advanced enough to meet our > requirements. For example, it can't allow us to control and charge for > excessive bandwidth. We've done extensive research on what is available and > so far Cyber Cafe Pro seems to meet all our requirements with the exception > of running only on Windows. Hodoman works on Linux but isn't as advanced as > Cyber Cafe Pro is. > > This is the reason why we are interested in trying to get Cyber Cafe Pro > to work on Linux. Cyber Cafe Pro people aren't interested in assisting us > with regards to porting their application to Windows. > > > Regards > > Vulani Mabunda > CEO > Internet CAfe Jack > South Africa > > _______________________________________________ > wine-users mailing list > wine-users(a)winehq.org > http://www.winehq.org/mailman/listinfo/wine-users >

3 3

Putting my hand up for WWN
by Edward Savage Dec. 6, 2006

Dec. 6, 2006

I'm prepared to write the WWN releases in Brian Vincent seeming absence if it pleases the powers that be. If this is alright I'd like some one to give an overview of what topics should be covered and then for some one to review the first one or two created. I've read the last hundred or so WWN issues over the years so I have a good idea of whats required though clarification would be nice. I already got wine-devel/wine-users - are there any more that need to be monitored. Finally I would need to know how to submit the newsletter and the proper syntax. Edward

2 2

Re: [winetest] Make sure we can send larger files
by Dimi Paun Dec. 5, 2006

Dec. 5, 2006

On Thu, November 30, 2006 1:01 pm, Paul Vriens wrote: > I'm hitting the 1MB limit already with my win98 tests. Most other tests > are about to reach that threshold as well. I'd make it 2MB, what's 1MB these days... :) -- Dimi Paun <dimi(a)lattica.com> Lattica, Inc.

3 2

Putting my hand up for WWN
by Edward Savage Dec. 5, 2006

Dec. 5, 2006

I'm prepared to write the WWN releases in Brian Vincent seeming absence if it pleases the powers that be. If this is alright I'd like some one to give an overview of what topics should be covered and then for some one to review the first one or two created. I've read the last hundred or so WWN issues over the years so I have a good idea of whats required though clarification would be nice. I already got wine-devel/wine-users - are there any more that need to be monitored. Finally I would need to know how to submit the newsletter and the proper syntax. Edward

3 2

Re: [PATCH][DbgHelp] Recognize DT_GNU_HASH
by Thomas Fitzsimmons Dec. 5, 2006

Dec. 5, 2006

Thomas Fitzsimmons wrote: > This patch fixes #6830. > > Tom > > 2006-12-05 Thomas Fitzsimmons <fitzsim(a)redhat.com> > > * dlls/dbghelp/elf_module.c (is_dt_flag_valid): Recognize > DT_GNU_HASH. > > > ------------------------------------------------------------------------ > > diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c > index 85494ca..a7fa2f8 100644 > --- a/dlls/dbghelp/elf_module.c > +++ b/dlls/dbghelp/elf_module.c > @@ -1041,6 +1041,9 @@ #endif > #ifndef DT_EXTRANUM > #define DT_EXTRANUM 0 > #endif > +#ifndef DT_GNU_HASH > +#define DT_GNU_HASH 0x6ffffef5 > +#endif > return (d_tag >= 0 && d_tag < DT_NUM + DT_PROCNUM + DT_EXTRANUM) > #if defined(DT_LOOS) && defined(DT_HIOS) > || (d_tag >= DT_LOOS && d_tag < DT_HIOS) > @@ -1048,6 +1051,9 @@ #endif > #if defined(DT_LOPROC) && defined(DT_HIPROC) > || (d_tag >= DT_LOPROC && d_tag < DT_HIPROC) > #endif > +#if defined(DT_GNU_HASH) > + || (d_tag == DT_GNU_HASH) > +#endif > ; > } Ugh, no need for the extra "if defined" check, of course. Tom

1 0

Re: James Hawkins : msi: Add tests for installing from continuouscabinets.
by Dmitry Timoshkov Dec. 5, 2006

Dec. 5, 2006

"Dmitry Timoshkov" <dmitry(a)codeweavers.com> wrote: > the test should be either disabled completely, or made it run only > if cabinet.dll is detected. Last line should read as: if good/not broken cabinet.dll is detected. -- Dmitry.

1 0

Re: James Hawkins : msi: Add tests for installing from continuouscabinets.
by Dmitry Timoshkov Dec. 5, 2006

Dec. 5, 2006

"Alexandre Julliard" <julliard(a)wine.codeweavers.com> wrote: > Module: wine > Branch: master > Commit: 1f3f88bf67d32983ff00d96bf58bf91c6e72ae02 > URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3f88bf67d32983ff00d96bf… > > Author: James Hawkins <truiken(a)gmail.com> > Date: Mon Oct 23 18:15:28 2006 -0700 > > msi: Add tests for installing from continuous cabinets. According to http://test.winehq.org/data/200612021000/ this test fails under all NT based platforms. I've ran it under XP SP2 and got the following error messages: install.c:864: Test failed: Expected ERROR_SUCCESS, got 1603 install.c:869: Test failed: File not installed install.c:870: Test failed: File not installed install.c:871: Test failed: File not installed install.c:873: Test failed: File not installed install: 1147 tests executed, 0 marked as todo, 5 failures. and a bunch of .log files in the TEMP directory with the following contents: Error 1334. The file 'maximus' cannot be installed because the file cannot be found in cabinet file 'test1.cab'. This could indicate a network error, an error reading from the CD-ROM, or a problem with this package. Error 1334. The file 'augustus' cannot be installed because the file cannot be found in cabinet file 'test1.cab'. This could indicate a network error, an error reading from the CD-ROM, or a problem with this package. So, either the test is not entirely correct, or just the .cab files it creates are corrupted. -- Dmitry.

2 2

Re: make check_no_exec() work reliable
by Peter Beutner Dec. 4, 2006

Dec. 4, 2006

Peter Beutner wrote: > Before starting to make this whole noexecute override behaviour configurable, > it first must work reliable. In its current form there is no guarantee that > the check_no_exec() function is actually called, because any other installed > exception handler might decide to handle the exception itself. > And as seen by the number of failing applications, this seems to happen > quite a lot. > This patch therefore makes check_no_exec() to be called before any other > exception handler. > > --- Any comments what is wrong with this one?

2 7

Re: [5/6] wined3d: Make CreateFakeGLContext thread safe.
by Alexandre Julliard Dec. 4, 2006

Dec. 4, 2006

Jan Zerebecki <jan.wine(a)zerebecki.de> writes: > This adds thread safety to CreateFakeGLContext and it's > corresponding Release function only. This addresses no thread > safety in the rest of wined3d, which AFAIk as a whole is still > not thread safe. When addressing thread safety in wined3d it must > also be taken care that a GL context is not deleted away by a > different thread when execution is between these two functions. You are calling ENTER_GL while holding your crit section, this will deadlock. -- Alexandre Julliard julliard(a)winehq.org

1 0

Help needed on an SHGetFileInfoW() crash
by Francois Gouget Dec. 4, 2006

Dec. 4, 2006

A friend pointed me to a railway signalling simulation game: http://www.simsig.co.uk/html/downloads.html However, the installer crashes in SHGetFileInfoW(): 000d:Call shell32.SHGetFileInfoA(0045eae8,00000010,0034fcec,00000160,00001010) ret=0045e9f6 000d:trace:seh:raise_exception code=c0000005 flags=0 addr=0x7e8871b2 000d:trace:seh:raise_exception info[0]=00000000 000d:trace:seh:raise_exception info[1]=00000000 More precisely the crash happens on this line: hr = IShellFolder_GetUIObjectOf(psfParent, 0, 1, (LPCITEMIDLIST*)&pidlLast, &IID_IExtractIconW, &uDummy, (LPVOID*)&pei); And the reason is that psfParent is NULL. psfParent is initialized a bit above, but only if SHGetFileInfoW() was given a PIDL and SHGFI_USEFILEATTRIBUTES was not used. This means that whenever a 'real path' or SHGFI_USEFILEATTRIBUTES is used in combination with SHGFI_DISPLAYNAME, SHGFI_ICONLOCATION, SHGFI_ICON or SHGFI_SYSICONINDEX, then SHGetFileInfoW() will crash. However we cannot just create a pidl since the 'real path' will usually refer to a nonexistent file or directory (in our case it is 'c:\directory' so it's clear the installer just wants to know what's the icon for a standard directory). Any idea? -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ "Lotto: A tax on people who are bad at math." -- unknown "Windows: Microsoft's tax on computer illiterates." -- WE7U

2 1

Call for DirectPlay captures
by Kai Blin Dec. 4, 2006

Dec. 4, 2006

Hi folks, As you might know, I'm currently toying with figuring out the MS DirectPlay protocol. I've been making some progress with my wireshark dissector over the weekend, and would be interested in some additional games to get more different data on some of this stuff. Here's what I would like you to do (if you want to help out): Fire up a network sniffer that dumps to libpcap format. Grab TCP and UDP packets. Start a game that uses DirectPlay for networking and start a network game. Start the game on another box and connect to the game. Now, in the game lobby, use the chat to say something from both games. Then, change a setting or two and start the game. After a few moments of playing (or more, your pick), leave the game. After both games are closed, you can stop the capture, zip it up and send it to me. Thanks in advance, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

4 6

Re: riched20: fixes and additional conformance tests for EM_EXSETSEL
by Matt Finnicum Dec. 4, 2006

Dec. 4, 2006

Hey, I'm sorry for not noticing this bug earlier - I have a bad habit of only browsing bugs listed under wine-richedit. I actually sent in a patch that fixes this bug before, but it wasn't accepted because I hadn't marked a test that it causes to fail as todo_wine. Does the attached patch solve your problem? The attached patch moves all the logic to ME_SetSelection, so it'll apply to EM_SETSEL as well as EM_EXSETSEL (they both are supposed to follow the same special cases), and this way it will contribute to my further separating functionality from the message handlers into ME_ local functions which is needed to properly implement windowless controls. This patch does result in a wrong return if the user sent a SetSelection beyond the end of the document (windows allows you to select an imaginary character at the end), but I don't think that's a problem for anything, and I'll have it working in a couple weeks (I'm working on improving the selection code in general, a part of which will allow you to actually select that extra character in our richedit). I suppose i could just put a small hack in for the meantime, if anyone cares. I haven't tried them together yet, but your new tests do look significantly more comprehensive - well done. --Matt On 12/3/06, Lei Zhang <thestig(a)google.com> wrote: > Hi, > > Changelog: > * Check the input to EM_EXSETSEL > * Fixes bug 6814 > * Added more comprehensive conformance tests for EM_EXSETSEL > > editor.c | 52 +++++++++++++++++++++--- > tests/editor.c | 103 +++++++++++++++++++++++++++++++------------------ > 2 files changed, 112 insertions(+), 43 deletions(-) > > > > > > >

2 1

Re: tools/. mono.php
by Jonathan Ernst Dec. 4, 2006

Dec. 4, 2006

Le vendredi 01 décembre 2006 à 10:35 -0600, Jeremy Newman a écrit : > ChangeSet ID: 30235 > CVSROOT: /opt/cvs-commit > Module name: tools > Changes by: jnewman(a)winehq.org 2006/12/01 10:35:01 > > Added files: > . : mono.php > > Log message: > Jonathan Ernst <jonathan(a)ernstfamily.ch> > - mono downloader script Please don't forget to upload the files to sourceforge as requested with the patches, because it is breaking those Wine downloads... See: http://source.winehq.org/mono.php?action=showlist http://source.winehq.org/mozactivex?action=showlist Thanks

3 2

Re: [ws2_32] make closesocket cancel pending I/O operations
by Kai Blin Dec. 4, 2006

Dec. 4, 2006

On Monday 04 December 2006 07:01, Damjan Jovanovic wrote: > On Windows, calling closesocket in one thread causes blocking I/O > operations on that socket (select, accept) running in other threads to > return immediately. On Linux, the I/O will block forever. Calling > shutdown as part of closesocket reproduces the same behaviour under > Linux. Closes #4619 and #3777. Sweet, this seems to solve part of the problems in bug #5534, too. Thanks, Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Re: ws2_32: Rewrite getsockopt to make it more readable.
by Kai Blin Dec. 4, 2006

Dec. 4, 2006

On Sunday 03 December 2006 16:46, Kai Blin wrote: > --- > dlls/ws2_32/socket.c | 409 > ++++++++++++++++++++++++++++++++++------------ > dlls/ws2_32/tests/sock.c | 35 ++++ > 2 files changed, 332 insertions(+), 112 deletions(-) Sorry, misplaced a closing bracked somehow. I'll send a fixed version in a minute. Kai -- Kai Blin, <kai Dot blin At gmail Dot com> WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin/ -- Will code for cotton.

1 0

Firefox-1.5.x on Wine slow on javascript-heavy pages
by Dan Kegel Dec. 4, 2006

Dec. 4, 2006

I've been using Firefox-1.5.x again on wine (using the winehq packages for Ubuntu) on my dual 650MHz system as my main browser again for the last few months. It's working quite well... except that javascript-heavy pages/apps like gmail are a tad sluggish at accepting keyboard input. For some reason, yahoo.com's main page is also sluggish; they must do something fancy. Both are fine with native firefox on this system. I'm sure this won't affect anyone with a modern system, but it is kind of sad that my trusty old dual CPU system isn't up to daily tasks anymore. Sniff... ah, well, I see Fry's has amd64 4000 motherboard/cpu combos for $189, guess it's time to upgrade. At some point it'd be nice to look into why Firefox's javascript is slow under Wine, though. - Dan

2 1

Re: d3d [2]: Optional callback infrastructure for implicit texture surface destruction.
by Stefan Dösinger Dec. 3, 2006

Dec. 3, 2006

Am Sonntag 03 Dezember 2006 21:52 schrieb Markus Amsler: > /* IWineD3DTexture */ > + IWineD3DTextureImpl_Destroy, Wouldn't it maybe be better to make the destroy method part of IWineD3DBase?

2 1

Re: d3d [2]: Optional callback infrastructure for implicit texture surface destruction.
by H. Verbeet Dec. 3, 2006

Dec. 3, 2006

On 03/12/06, Markus Amsler <markus.amsler(a)oribi.org> wrote: > --- > dlls/wined3d/texture.c | 53 > +++++++++++++++++++++++--------------- > include/wine/wined3d_interface.h | 7 +++++ > 2 files changed, 39 insertions(+), 21 deletions(-) I think the callback should be non-optional.

2 1

One more go at fixing GetCursorPos()
by Vitaliy Margolen Dec. 3, 2006

Dec. 3, 2006

Here is one more shot at fixing GetCursorPos() to make it usable in dinput. This time I used a refcount of sorts. Because the problem appears only during processing of hook chain. Just to remind about what is the problem: when hook handler calls GetCursorPos() position returned is the "old" position. While hook parameters contain "new" coordinates. This is on windows. On Wine returned position queried directly from X and might be even "newer" then position in hook parameters. Attached are two tests (out of lots more that I've used to find and fix the problem). test_msg.c - tests major problem that Alexandre pointed out about last fix attempt. Application in question does not process messages while calling GetCursorPos(). It still works properly with proposed patch. di_mouse_2th.c - 2 threads showing that there are no extra thread local position involved (if there is such a thing). Cached cursor position is global to all threads. (Last numbers should stay at dt(0 0) at all times). Inside hook handler d(x y) should show relative mouse move delta. If anyone has any objections, comment, suggestions, please do send them. Vitaliy Margolen. #define COBJMACROS #define _WIN32_WINNT 0x0501 #include <windows.h> #include <windowsx.h> #include <stdio.h> static HANDLE event1, event2; static HINSTANCE g_hInstance; static POINT pt_global; LRESULT CALLBACK hook_proc( int code, WPARAM wparam, LPARAM lparam ) { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; POINT pt; GetCursorPos(&pt); if (code == HC_ACTION) { fprintf(stderr, "Hook: code=%d w=%x [(%ld %ld) %lx %lx %lx] cur(%ld %ld) d(%ld %ld) ", code, wparam, hook->pt.x, hook->pt.y, hook->mouseData, hook->flags, hook->dwExtraInfo, pt.x, pt.y, hook->pt.x - pt.x, hook->pt.y - pt.y); pt_global = pt; SetEvent(event1); WaitForSingleObject(event2, INFINITE); } return CallNextHookEx( 0, code, wparam, lparam ); } static DWORD CALLBACK thread_proc(LPVOID arg) { while (WaitForSingleObject(event1, INFINITE) == WAIT_OBJECT_0) { POINT pt; GetCursorPos(&pt); fprintf(stderr, "Th: (%ld %ld) dt(%ld %ld)\n", pt.x, pt.y, pt.x - pt_global.x, pt.y - pt_global.y); SetEvent(event2); } return 0; } static DWORD wnd_proc(void) { MSG msg; while (GetMessage(&msg, NULL, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } return msg.wParam; } #define SEND(x,y) \ i.mi.time = GetCurrentTime(); \ i.mi.dx = x; i.mi.dy = y; \ SendInput(1, &i, sizeof(INPUT)); void send_input(void) { INPUT i; POINT ptorg, pt; GetCursorPos(&ptorg); fprintf(stderr, "Cur pos: %ld %ld\n", ptorg.x, ptorg.y); i.type = INPUT_MOUSE; i.mi.dwFlags = MOUSEEVENTF_MOVE; i.mi.dwExtraInfo = 0; i.mi.mouseData = 0; SEND(-4, -4) GetCursorPos(&pt); fprintf(stderr, "%ld %ld\n", pt.x, pt.y); SetCursorPos(ptorg.x, ptorg.y); Sleep(250); fprintf(stderr, "***DONE***\n"); } void test1(HWND hwnd) { HANDLE thread; HHOOK hook; MSG msg; event1 = CreateEvent(NULL, FALSE, FALSE, NULL); event2 = CreateEvent(NULL, FALSE, FALSE, NULL); thread = CreateThread(NULL, 0, thread_proc, NULL, 0, NULL); Sleep(250); hook = SetWindowsHookExA(WH_MOUSE_LL, hook_proc, g_hInstance, 0); Sleep(250); // send_input(); wnd_proc(); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); UnhookWindowsHookEx(hook); CloseHandle(event1); CloseHandle(event2); CloseHandle(thread); Sleep(250); } LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { case WM_DESTROY: PostQuitMessage(0); return 0; } return DefWindowProc(hWnd, message, wParam, lParam); } int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { WNDCLASSEX wcex; HWND hwnd; g_hInstance = hInstance; wcex.cbSize = sizeof(WNDCLASSEX); wcex.style = CS_HREDRAW | CS_VREDRAW; wcex.lpfnWndProc = (WNDPROC)WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hInstance; wcex.hIcon = NULL; wcex.hCursor = LoadCursor(NULL, IDC_ARROW); wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW+1); wcex.lpszMenuName = NULL; wcex.lpszClassName = "MainWindow"; wcex.hIconSm = NULL; RegisterClassEx(&wcex); hwnd = CreateWindow("MainWindow", "Title", WS_OVERLAPPEDWINDOW, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ShowWindow(hwnd, SW_SHOW); test1(hwnd); DestroyWindow(hwnd); return 0; } #include <windows.h> #include <stdio.h> int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { LONG started = GetTickCount(); POINT pt, pt_org; HWND hwnd; MSG msg; hwnd = CreateWindow("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); GetCursorPos(&pt_org); while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); while (started + 10000 > GetTickCount()) { GetCursorPos(&pt); if ((pt.x - pt_org.x) || (pt.y - pt_org.y)) printf("(%ld %ld)\n", pt.x - pt_org.x, pt.y - pt_org.y); pt_org = pt; } DestroyWindow(hwnd); return 0; }

2 2

winedump: Cast-qual warnings fix (2 of 2)
by Andrew Talbot Dec. 3, 2006

Dec. 3, 2006

Sorry, I made a mess of titling this patch, twice. Please find and use the version whose subject line and changelog entry refer to "winedump", not "winedbg". Thanks, -- Andy.

1 0

[PATCH] overflow checking for MultiByteToWideChar/WideCharToMultiByte
by Marcus Meissner Dec. 3, 2006

Dec. 3, 2006

Hi, This is more a FYI patch and GCC 4.0+ specific. This enhancement detects if the size of a known buffer is different than the specified size. Thie tests/sock.c adjustement is necessary due to stdlib.h inclusion. Ciao, Marcus --- dlls/kernel32/locale.c | 2 ++ dlls/ws2_32/tests/sock.c | 2 +- include/winnls.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletions(-) d0e7840335b6bbe4990b1c043dcff9b298c7a5a8 diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index bc7db75..1d4ceaf 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1757,6 +1757,7 @@ BOOL WINAPI EnumSystemCodePagesW( CODEPA * is passed, and ERROR_NO_UNICODE_TRANSLATION if no translation is * possible for src. */ +#undef MultiByteToWideChar INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, LPWSTR dst, INT dstlen ) { @@ -1850,6 +1851,7 @@ INT WINAPI MultiByteToWideChar( UINT pag * and dstlen != 0, and ERROR_INVALID_PARAMETER, if an invalid * parameter was given. */ +#undef WideCharToMultiByte INT WINAPI WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, LPSTR dst, INT dstlen, LPCSTR defchar, BOOL *used ) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c8b9cc8..f5ed0c1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -22,8 +22,8 @@ #include <stdarg.h> #include <windef.h> -#include <winbase.h> #include <winsock2.h> +#include <winbase.h> #include <mswsock.h> #include "wine/test.h" #include <winnt.h> diff --git a/include/winnls.h b/include/winnls.h index 8888171..c13c0bf 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -20,6 +20,10 @@ #define __WINE_WINNLS_H #ifndef NONLS +#ifndef RC_INVOKED +# include <stdlib.h> +#endif + #ifdef __cplusplus extern "C" { #endif @@ -768,6 +772,26 @@ INT WINAPI LCMapStringW(LCID,DWO #define LCMapString WINELIB_NAME_AW(LCMapString) LCID WINAPI LocaleNameToLCID(LPCWSTR,DWORD); INT WINAPI MultiByteToWideChar(UINT,DWORD,LPCSTR,INT,LPWSTR,INT); + +static inline INT +WINAPI MultiByteToWideChar_ichk( + UINT cp,DWORD flags, + LPCSTR src,INT srclen,INT srcbuflen, + LPWSTR dst,INT dstlen,INT dstbuflen +) { + if ((srclen != -1) && (srcbuflen != -1) && (srcbuflen < srclen)) + abort(); + if ((dstlen != -1) && (dstbuflen != -1) && (dstbuflen/2 < dstlen)) + abort(); + /* later add assertions regarding conversion lengths */ + return MultiByteToWideChar(cp,flags,src,srclen,dst,dstlen); +} +#define MultiByteToWideChar(cp,flags,src,srclen,dst,dstlen) \ + MultiByteToWideChar_ichk(cp,flags, \ + src,srclen,__builtin_object_size(src,0), \ + dst,dstlen,__builtin_object_size(dst,0) \ + ) + INT WINAPI SetCalendarInfoA(LCID,CALID,CALTYPE,LPCSTR); INT WINAPI SetCalendarInfoW(LCID,CALID,CALTYPE,LPCWSTR); #define SetCalendarInfo WINELIB_NAME_AW(SetCalendarInfo) @@ -778,6 +802,27 @@ BOOL WINAPI SetThreadLocale(LCID) BOOL WINAPI SetUserGeoID(GEOID); INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL); +static inline INT +WINAPI WideCharToMultiByte_ichk( + UINT cp,DWORD flags, + LPCWSTR src,INT srclen,INT srcbuflen, + LPSTR dst,INT dstlen,INT dstbuflen, + LPCSTR xstr,LPBOOL b +) { + if ((srclen != -1) && (srcbuflen != -1) && (srcbuflen/2 < srclen)) + abort(); + if ((dstlen != -1) && (dstbuflen != -1) && (dstbuflen < dstlen)) + abort(); + /* later add assertions regarding conversion lengths */ + return WideCharToMultiByte(cp,flags,src,srclen,dst,dstlen,xstr,b); +} +#define WideCharToMultiByte(cp,flags,src,srclen,dst,dstlen,defchar,b) \ + WideCharToMultiByte_ichk(cp,flags, \ + src,srclen,__builtin_object_size(src,0), \ + dst,dstlen,__builtin_object_size(dst,0), \ + defchar,b \ + ) + #ifdef __cplusplus } #endif -- 1.2.4

1 0

Re: [PATCH] check length in path canonicalize
by Dmitry Timoshkov Dec. 3, 2006

Dec. 3, 2006

"Marcus Meissner" <marcus(a)jet.franken.de> wrote: > - MultiByteToWideChar(CP_ACP,0,lpszPath,-1,szPath,MAX_PATH); > + INT ret; > + > + ret = MultiByteToWideChar(CP_ACP,0,lpszPath,-1,NULL,0); > + if (ret > MAX_PATH) { > + FIXME("Too long path!\n"); > + return FALSE; > + } > + ret = MultiByteToWideChar(CP_ACP,0,lpszPath,-1,szPath,sizeof(szPath)/sizeof(WCHAR)); It should be sufficient to check return value of MultiByteToWideChar to detect an overflow, there is no need to call MultiByteToWideChar twice for that. -- Dmitry.

1 0

XEMBED Implementation
by Cloudor Pu Dec. 3, 2006

Dec. 3, 2006

Hi, I find discussion about XEMBED implementation in this mailing list and that was 3 years ago. Is there now any usable implementation or examples for wine XEMBED plug? What I am doing is to embed IE into a GtkSocket. I wrote a standalone program compiled using winelib that can CreateWindow and embed IE. Can I CreateWindow using the XEMBED Id if there is already XEMBED implementation or can I just CreateWindow as a child of a GtkPlug which is a gtk-embeddee? Any advices or suggestions would be highly appreciated. Thank you! Regards, cloudor

3 3

Wined3d State management again
by Stefan Dösinger Dec. 2, 2006

Dec. 2, 2006

Hi, I've done some more work on my state management, and I uploaded an updated patch to http://stud4.tuwien.ac.at/~e0526822/wined3d-statemgmt-2.tar.bz2 . Ok, so what's updated: * Pixel shaders: Should work now * GLSL shaders: Working too. Henris shader backend stuff is integrated in a messy way. * Offscreen rendering: Works with back buffer and pbuffer rendering, fbos not yet. * Stateblocks: Brute force integration by just scheduling all modified states for a reset. No display list yet * Blitting, render target unlocking: Enabled again, sets new gl states and schedules a reapplication of the modified states. Not a nice solution yet What is still missing: * Nv register combiners. I haven't found a way yet to build a texture stage -> texture unit mapping which I like. All the ways I could think of could potentially cause lots of unneccessary state changes. One nice thing I have noticed is that this changes give a huge performance gain in Half-Life 2(dxlevel 80, and 90). Dxlevel 80 is accelerated to approximately 150-200% of the former performance, and especially slow parts are faster now. This makes a really huge playability difference :-) There are some regressions too, especially related to texture loading(3Dmark2000), and some glsl crashes. The good part about this change is that I can send it in in very small patches, making regression testing much easier, contrary to the huge ddraw rewrite. Where to go from here? As long as nobody screams I'd start sending patches now. Its easier to catch regressions while sending small patches instead of hunting them on the blob I have here(and my messy patch history in my git tree). I'm also afraid that I get too far away from the main wined3d code(See the shader backend integration). We can discuss the code based on the small changes I'll send. Stefan

1 1

Re: msi 2: Remove redundant NULL checks before x_Release
by Mike McCormack Dec. 2, 2006

Dec. 2, 2006

James Hawkins wrote: > Changelog: > * Remove redundant NULL checks before x_Release. obj->Release() will read the vtable pointer from the object, and that will crash if obj is NULL, so these checks are needed. The following code will crash: IUnknown *obj = NULL; IUnknown_Release(obj); You can see this looking at the definition of the IUnknown_Release macro: include/unknwn.h:#define IUnknown_Release(p) (p)->lpVtbl->Release(p) Mike

1 0

Video problems with FC6
by gslink Dec. 1, 2006

Dec. 1, 2006

There is currently a bug in FC6 that affects Wine. If, with any Nvidia driver from any source, a program attempts to use accelerated video and the attached monitor uses digital feed the program will often crash the user session. This has been reported and is not a problem in Wine but a good many games that used to run under Wine now crash. Other cards were not tested but may be affected. It is hoped RH will fix this rather quickly.

2 1

Re: [PATCH 1/9] dinput: Move acquired flag to the base device class.
by Peter Oberndorfer Dec. 1, 2006

Dec. 1, 2006

On Friday 01 December 2006 07:23, Vitaliy Margolen wrote: > Sorry ignore my previous patches. I didn't send them in the proper order. > > --- > dlls/dinput/device.c | 28 ++++++++++++++++++++++++++++ > dlls/dinput/device_private.h | 3 +++ > dlls/dinput/joystick_linux.c | 23 ++++++++--------------- > dlls/dinput/keyboard.c | 36 ++++++++++++++++-------------------- > dlls/dinput/mouse.c | 23 ++++++++--------------- > 5 files changed, 63 insertions(+), 50 deletions(-) > Hi, some questions/notices about this patch: Previously when the device was not acquired inside JoystickAImpl_Unacquire DIERR_NOTACQUIRED was returned. now you call IDirectInputDevice2AImpl_Unacquire, which returns DI_NOEFFECT when not acquired. but DI_NOEFFECT does not have high bit set so it won't trigger the FAILED macro. Do you know if the Acquire/Unacquire functions return value the same for all device types? In JoystickAImpl_Acquire you don't use your new IDirectInputDevice2AImpl_Acquire function but set This->base.acquired = 1; Is there a reason for this? In SysKeyboardAImpl_Unacquire you seem to call IDirectInputDevice2AImpl_Acquire? Greetings Peter

2 1

Re: user32: Factorize graphics driver's WindowCreate and ShowWindow in user32.
by Dmitry Timoshkov Dec. 1, 2006

Dec. 1, 2006

"Pierre d'Herbemont" <pdherbemont(a)free.fr> wrote: > At the same time ShowWindow gets factorized because WindowCreate and > ShowWindow share both the use of WINPOS_MinMaximize, so it is easier to > factorize both functions in a single patch. In fact ShowWindow is > removed entirely from the drivers as it is driver independant. > > To properly factorize WindowCreate we have to export 3 new functions > from the graphics driver which are SetIconicState, SyncWindowStyle, > SystrayDockWindow. I'd suggest to leave ShowWindow in the driver's interface. You already have created 3 new entry points to replace its partial functionality, but still miss ShowWindow functionality for at least SW_RESTORE and SW_MAXIMIZE. Also did you run 'make test' after this patch? -- Dmitry.

2 3

Re: oleaut32: add VarBstrCmp binary comparison for LCID==0
by Dmitry Timoshkov Dec. 1, 2006

Dec. 1, 2006

"Charles Blacklock" <charles(a)diagnos.co.uk> wrote: > + if (lcid == 0) > + { > + ret = memcmp(pbstrLeft, pbstrRight, min(SysStringByteLen(pbstrLeft), SysStringByteLen(pbstrRight))); > + if (ret < 0) > + return VARCMP_LT; > + if (ret > 0) > + return VARCMP_GT; > + if (SysStringByteLen(pbstrLeft) < SysStringByteLen(pbstrRight)) > + return VARCMP_LT; > + if (SysStringByteLen(pbstrLeft) > SysStringByteLen(pbstrRight)) > + return VARCMP_GT; > + return VARCMP_EQ; > + } It would be much more effective to call SysStringByteLen only once for each string instead of calling it again and again after a failing comparison. -- Dmitry.

2 2

How to embed wine into swt?
by Cloudor Pu Dec. 1, 2006

Dec. 1, 2006

Hi, all I am developing an swt app only for gtk. I want to embed IE into this app. I can create a SWT.EMBEDDED composite and get its embededHandle (an integer). Then, how to do next? Thanks in advace! regards, cloudor

3 3