- wine-devel - winehq.org

Re: fix async read on mailslots
by Rob Shearman 18 Jul '08

18 Jul '08

2008/7/18 Ambroz Bizjak <ambro(a)b4ever.net>: > Hi, > In Wine creating a mailslot (CreateMailslot) with non-zero timeout > (argument 3 to CreateMailslot) and then attempting an asynchronous read on > it will cause a synchronous read to be performed - ReadFile will block > instead of failing with ERROR_IO_PENDING. Good spot, but then the correct fix is to only set FILE_SYNCHRONOUS_IO_NONALERT on the created fd if the timeout is non-zero. Asynchronous I/O has a performance penalty in Wine (extra server round-trips) so we want to avoid it if at all possible. > I'm attaching a fix as suggested by jil and a test. > The test creates an empty mailbox with a small timeout and performs an > asynchronous read - if broken, it will fail with ERROR_SEM_TIMEOUT. > I've also tried the test on Vista. It's good that you've included a test, but a few comments: > + mailslot = CreateMailslot("\\\\.\\mailslot\\TestMailslot", 100, 10, NULL); > + ok(mailslot!=INVALID_HANDLE_VALUE, "CreateMailslot failed\n"); > + if(mailslot==INVALID_HANDLE_VALUE) return; > + > + event = CreateEvent(NULL, FALSE, FALSE, NULL); > + ok(event!=INVALID_HANDLE_VALUE, "CreateEvent failed\n"); > + if(event==INVALID_HANDLE_VALUE) return; > + > + ol.Offset = 0; > + ol.OffsetHigh = 0; > + ol.hEvent = event; > + res = ReadFile(mailslot, buf, 100, NULL, &ol); > + ok(res==FALSE, "ReadFile succeeded; expected failure\n"); > + if(res!=FALSE) return; > + > + res = GetLastError(); > + ok(res==ERROR_IO_PENDING, "ReadFile returned error code %d, expected ERROR_IO_PENDING\n", res); There's no need to return after every unexpected failure. If one of the tests is likely to fail on some machine due to a configuration issue or some other feature beyond our control then it is acceptable to put in a skip statement, but generally we only do this after we've seen real-world evidence of failures. You also didn't include an LGPL header for the new file that you added. Also, in general you should include only one patch per mail to wine-patches and include an appropriate changelog (I see that you are using git and there are various tools to do this automatically). It is helpful if you can submit a test that has appropriate todo_wine's that show where Wine is failing a test, and then to submit a patch which does the fix and removes the todo_wine. However, in this case I don't believe that it is possible so you can send the fix first and then the tests. -- Rob Shearman

1 0

Re: [2/6] winhttp: Allow winhttp to use wininet.h with winhttp.h
by James Hawkins 18 Jul '08

18 Jul '08

On Thu, Jul 17, 2008 at 7:37 PM, Zac Brown <zac(a)zacbrown.org> wrote: > Setup winhttp.h and wininet.h with type guards to allow for use of wininet.h > in winhttp implementation. > > --snip-- > > Note: I am unsure of whether its better to do this, or finish up winhttp.h > and then create a private header in dlls/winhttp for winhttp to use. > diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index e69b137..7e8146f 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = winhttp.dll IMPORTLIB = winhttp -IMPORTS = kernel32 +IMPORTS = wininet kernel32 C_SRCS = main.c I thought the idea was to implement winhttp and then implement wininet on top of winhttp. Why are you importing wininet? -- James Hawkins

2 1

Re: advapi32: "RegGetValue" fails with some correct combinations of "dwFlags"
by Alexandre Julliard 18 Jul '08

18 Jul '08

Mathias Kosch <info(a)mkosch.de> writes: > --- old/registry.c 2008-07-11 17:55:55.000000000 +0200 > +++ registry.c 2008-07-18 01:39:21.000000000 +0200 > @@ -1466,6 +1466,8 @@ Patches should be generated from the top-level directory. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32 [1/2]: Don't try to convert a possibly uninitialized out param on error
by Alexandre Julliard 18 Jul '08

18 Jul '08

"James Hawkins" <jhawkins(a)codeweavers.com> writes: > Changelog: > * Don't try to convert a possibly uninitialized out param on error. There are several ways to fix that one, it will need test cases to find out which one is right. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [5/6] winhttp: main.c: Add implementation for WinHttpOpenRequest
by Dan Hipschman 18 Jul '08

18 Jul '08

On Thu, Jul 17, 2008 at 05:38:29PM -0700, Zac Brown wrote: > > + if (dwFlags & WINHTTP_FLAG_ESCAPE_PERCENT || > + dwFlags & WINHTTP_FLAG_NULL_CODEPAGE || > + dwFlags & WINHTTP_FLAG_ESCAPE_DISABLE || > + dwFlags & WINHTTP_FLAG_ESCAPE_DISABLE_QUERY) if (dwFlags & (WINHTTP_FLAG_ESCAPE_PERCENT | WINHTTP_FLAG_NULL_CODEPAGE | WINHTTP_FLAG_ESCAPE_DISABLE | WINHTTP_FLAG_ESCAPE_DISABLE_QUERY)) is shorter and more efficient since it boils down to one "test" instruction (at least it should), rather than a bunch of branching required by short-circuiting.

1 0

Re: ws2_32: update to WSASendTo / last error patch
by James Hawkins 18 Jul '08

18 Jul '08

On Thu, Jul 17, 2008 at 2:19 PM, Daniel Santos <daniel(a)bytesage.com> wrote: > Since this is my 1st real patch for wine, it's taken me a few iterations to > get this down. Attached is the updated patch to WSASendTo that includes a > conformance test. I have NOT run this on windows yet because I don't have > access to a windows machine at the moment. > Then we can't accept the tests (and thus the implementation). In the future, please attach your test patch to a message in wine-devel asking someone to run the test in windows. -- James Hawkins

2 1

Re: advapi32: "RegGetValue" fails with some correct combinations of "dwFlags"
by Mathias Kosch 17 Jul '08

17 Jul '08

Dan Kegel wrote: > You forgot to mention which versions of Windows you > ran the test case on (and whether it passed there). Thank you for telling me. (I'm not yet very familar with the process of publishing patches.) It took me some time, for I first had to install "Windows Server 2003". Testing was a good idea because I found out that my bugfix was a little too lax. Windows only allows "RRF_RT_ANY" without "RRF_NOEXPAND", but not a combination of "(RRF_RT_REG_EXPAND_SZ | RRF_RT_REG_SZ)". This is still a little curious because I thought "dwFlags" would act like a mask. Nevertheless Bug#14509 (and Bug#14350) are still fixed. I successfully tested the test case under "Windows Server 2003" and Wine 1.1.1 with this patch applied. You can find the updates to this patch and test case as attachments. -- Mathias Kosch <info(a)mkosch.de> | http://www.mkosch.de/ RSA Public Key: http://www.mkosch.de/pubkey Mehr Schutz der Privatsphäre: http://www.gnupg.org/

1 0

Re: dlls/ws2_32/tests/sock.c: Wait on thread handles before closing sockets
by Alexandre Julliard 17 Jul '08

17 Jul '08

Jon Griffiths <jon_p_griffiths(a)yahoo.com> writes: > In the socket tests, avoid a race by waiting for the read threads to > finish before closing the sockets (found during TransmitFile testing). CloseHandle doesn't wait for the thread to finish, so this has no effect. In any case there doesn't seem to be any need to wait in those tests. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 1/3] mstask: TaskScheduler stub with AddRef, QueryInterface, and Release
by Roy Shea 17 Jul '08

17 Jul '08

Broken patch set :( Please disregard this sequence (1-3) of patches. I'll send a revised version out later today. Peace, -Roy On Thu, Jul 17, 2008 at 1:37 PM, Roy Shea <royshea(a)gmail.com> wrote: > --- > dlls/mstask/Makefile.in | 2 + > dlls/mstask/mstask_main.c | 5 +- > dlls/mstask/mstask_private.h | 39 ++++++++++ > dlls/mstask/task_scheduler.c | 167 ++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 209 insertions(+), 4 deletions(-) > create mode 100644 dlls/mstask/mstask_private.h > create mode 100644 dlls/mstask/task_scheduler.c >

1 0

Re: user32: fix create_window_handle to create Ansi Edit after SetClassLongPtrW
by Vitaliy Margolen 17 Jul '08

17 Jul '08

Hongbo Ni wrote: > --=====================_35969977==.ALT > Content-Type: text/html; charset="us-ascii" > > > <html> > <body> > > This patch fixes Bug#14350 > CreateWindowA("Edit"...) should create an Ansi window even > after the builtin > Edit class has been subclassed by > SetClassLongPtrW(hEdit,GCLP_WNDPROC,procW). > This bug applies to all builtin classes, but only Edit needs to be > fixed > since in other builtin classes, user can not change the text in the > control. > A->W->A conversion will get same string back. Edit is special since > user > interact with it. > --- > Please do not send patches in HTML format. Plain text only. Vitaliy

1 0

re: advapi32: "RegGetValue" fails with some correct combinations of "dwFlags"
by Dan Kegel 17 Jul '08

17 Jul '08

Mathias Kosch wrote: > ... > The patch and test case were created against wine-1.1.1 and are both > attached to this mail. > > I hope this time I provided enough information You forgot to mention which versions of Windows you ran the test case on (and whether it passed there). - Dan

1 0

Re: [PATCH 05/10][try 2] quartz/tests: Fix interface leaks in aggregation test.
by Michael Karcher 17 Jul '08

17 Jul '08

Am Donnerstag, den 17.07.2008, 20:24 +0300 schrieb Alexander Dorofeyev: > + do > + { > + hr = IUnknown_Release(pUnkInner); > + } while (hr); Release returns a ULONG, not a HRESULT. Do we ignore the difference in Wine? Regards, Michael Karcher

2 1

Uninitialized memory reference in winefile
by Dan Kegel 17 Jul '08

17 Jul '08

While valgrinding Picasa, I came across the following valgrind error in winefile. (My daily valgrind runs only run the conformance suite, which is why I've never seen this before.) The lines involved seem unchanged since Martin Fuchs' winefile code was merged back in 2002. Conditional jump or move depends on uninitialised value(s) at calc_widths (winefile.c:2711) by create_tree_window (winefile.c:2974) by InitChildWindow (winefile.c:2984) by ChildWndProc (winefile.c:4259) by ??? (library.h:136) by call_window_proc (winproc.c:457) by WINPROC_call_window (winproc.c:2198) by call_window_proc (message.c:1610) by send_message (message.c:2434) by SendMessageW (message.c:2557) by WIN_CreateWindowEx (win.c:1164) by CreateWindowExW (win.c:1362) by MDIClientWndProc_common (mdi.c:1140) by MDIClientWndProcW (mdi.c:1307) by ??? (library.h:136) by call_window_proc (winproc.c:457) by WINPROC_call_window (winproc.c:2198) by call_window_proc (message.c:1610) by send_message (message.c:2434) by SendMessageW (message.c:2557) by create_child_window (winefile.c:1789) by show_frame (winefile.c:4839) by winefile_main (winefile.c:4931) by WinMain (winefile.c:4965) by main (exe_main.c:48) Uninitialised value was created by a stack allocation at calc_widths (winefile.c:2645)

3 2

Re: [10/10] [try 4] appwiz.cpl: Gather extra information for Support Info dialog
by Juan Lang 17 Jul '08

17 Jul '08

Hi Owen, this one's another line-limit buster. I won't quote the lines in this one, as most of it is too long. --Juan

1 0

Re: [9/10] [try 4] appwiz.cpl: Add basic Support Information dialog
by Juan Lang 17 Jul '08

17 Jul '08

Hi Owen, this one's another long-liner: + if (GetWindowTextW(GetDlgItem(hWnd, IDC_INFO_LABEL), oldtitle, MAX_STRING_LEN) != 0) + DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_INFO), hWnd, (DLGPROC) SupportInfoDlgProc, + selitem = SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETNEXTITEM, -1, + if (SendDlgItemMessageW(hWnd, IDL_PROGRAMS, LVM_GETITEMW, 0, (LPARAM) &lvItem)) Please set your editor window to be rather narrower. --Juan

1 0

Re: [6/10] [try 4] appwiz.cpl: Read installed application information from registry
by Juan Lang 17 Jul '08

17 Jul '08

Hi Owen, this patch goes rather over the suggested line length limit of 80. Offending lines: + if (RegOpenKeyExW(root, PathUninstallW, 0, KEY_READ, &hkeyUninst) != ERROR_SUCCESS) + for (i = 0; RegEnumKeyExW(hkeyUninst, i, subKeyName, &sizeOfSubKeyName, NULL, NULL, NULL, NULL) != ERROR_NO_MORE_ITEMS; ++i) + if ((RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, NULL, &displen) == ERROR_SUCCESS) + && (RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, NULL, &uninstlen) == ERROR_SUCCESS)) + RegQueryValueExW(hkeyApp, DisplayNameW, 0, 0, (LPBYTE)iter->title, &displen); + RegQueryValueExW(hkeyApp, DisplayIconW, 0, 0, (LPBYTE)iter->icon, &displen); + RegQueryValueExW(hkeyApp, UninstallCommandlineW, 0, 0, (LPBYTE)iter->path, &uninstlen); + if (RegQueryValueExW(hkeyApp, PublisherW, 0, 0, NULL, &displen) == ERROR_SUCCESS) + RegQueryValueExW(hkeyApp, PublisherW, 0, 0, (LPBYTE)iter->publisher, &displen); + if (RegQueryValueExW(hkeyApp, DisplayVersionW, 0, 0, NULL, &displen) == ERROR_SUCCESS) + RegQueryValueExW(hkeyApp, DisplayVersionW, 0, 0, (LPBYTE)iter->version, &displen); + /* reset the list, since it's probably changed if the uninstallation was successful */ Also, + + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_INSTALL: + FIXME("Installer not implemented."); + break; + } + + break; This doesn't appear to have anything to do with the subject of the patch. In fact it's never used in this patch set, so you should just omit it. --Juan

1 0

Re: [3/10] [try 4] appwiz.cpl: Add column headers to listview
by Juan Lang 17 Jul '08

17 Jul '08

Hi Owen, + IDS_COLUMN_TITLE_1, "Name" + IDS_COLUMN_TITLE_2, "Publisher" + IDS_COLUMN_TITLE_3, "Version" These seem like rather poor names for the string IDs. Why not e.g. IDS_COLUMN_NAME or simply IDS_NAME? +/* Definition of column headers for AddListViewColumns function */ +#define NUM_COLUMNS 3 I don't think you need a separate symbolic constant for this, as.. +AppWizColumn columns[NUM_COLUMNS] = { this can be replaced with: +AppWizColumn columns[] = { and this: + /* Add the columns */ + for (i = 0; i < NUM_COLUMNS; i++) can be replaced with: + for (i = 0; i < sizeof(columns) / sizeof(columns[0]; i++) #define IDS_CPL_TITLE 1 #define IDS_CPL_DESC 2 #define IDS_TAB1_TITLE 3 +#define IDS_COLUMN_TITLE_1 6 +#define IDS_COLUMN_TITLE_2 7 +#define IDS_COLUMN_TITLE_3 8 See above for the comment on the choice of names. What happened to items 4 and 5? --Juan

1 0

Re: [2/10] [try 4] appwiz.cpl: Display Add/Remove Programs dialog
by Juan Lang 17 Jul '08

17 Jul '08

Hi Owen, -#define ICO_FLOPPY 4 -#define ICO_CDROM 5 - It seems a little unusual that you remove icon IDs you just introduced in patch 1. (Probably you shouldn't have included them in the first place?) --Juan

1 0

Starting point to debug an application error
by Brad Campbell 17 Jul '08

17 Jul '08

G'day all, I'm playing with a windows program used to develop code for a uC. The application is free to download and installs cleanly with no dependence on external hardware. It's pretty much working except for two details. A) The file tree on the left of the application throws an application exception when clicking on any items. B) It won't recognise there is a serial port configured. I'm working on (B) myself and making progress. It's all to do with registry keys windows 2k+ creates when a serial port is detected/created. This is not an issue for me and I think I can make it work relatively cleanly. I'm having trouble with (A). I've done full traces, relay traces and played with the debugger, but I don't seem to be able to get a starting point to track down the error. The application handles it internally and does not seem to throw an exception at wine. No crash, just not working. If someone has the time to look at it, I'd love a pointer on where / how to start investigating this.. The application is available here. I'd direct link it but their web server won't allow a download without the correct references. http://www.parallax.com/tabid/442/Default.aspx I've tried it on the latest CVS as of this morning. I've also built and tested against crossover-7 sources today. Both fail in precisely the same way. Regards, Brad

2 2

Re: [1/3] [try 3] appwiz.cpl: Add GUI for Add/Remove Programs controlpanel
by Owen Rudge 17 Jul '08

17 Jul '08

> OK, seems there was a small bug in the last patch that could cause > crashes, plus I'd forgotten to include wine.inf.in. I'm pretty sure this > one should be fine now, at least. Sorry for all the messages. ;-) Just wondering if anybody has any feedback on these, as I notice they've not been accepted into the last couple of rounds of commits. If there's anything glaringly wrong with it that I haven't spotted, or another reason why they've not made it into the codebase yet, please do let me know. :-) Thanks, -- Owen Rudge http://www.owenrudge.net/

3 4

Re: taskmgr: Add full translation [1/2]
by Alexandre Julliard 17 Jul '08

17 Jul '08

Vladimir Pankratov <scriptkid(a)mail.ru> writes: > @@ -50,10 +51,17 @@ > int nOldWidth; /* Holds the previous client area width */ > int nOldHeight; /* Holds the previous client area height */ > > +TCHAR szLoadedString[250]; /* Variable where load string from resource*/ > + > BOOL bInMenuLoop = FALSE; /* Tells us if we are in the menu loop */ > > TASKMANAGER_SETTINGS TaskManagerSettings; > > +BOOL GetStringFromRes(UINT uID) > +{ > + LoadStringA(hInst, uID, szLoadedString, sizeof(szLoadedString)); > + return TRUE; > +} That's ugly, you should return string somehow, not use a global variable. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] [WineX11.Drv]: correctly pad 1 bpp DDB's lines with 0 values
by Alexandre Julliard 17 Jul '08

17 Jul '08

Eric Pouech <eric.pouech(a)orange.fr> writes: > A+ > --- > > dlls/gdi32/tests/bitmap.c | 1 - > dlls/winex11.drv/dib.c | 5 ++++- > 2 files changed, 4 insertions(+), 2 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M gdi32.dll -T ../../.. -p gdi32_test.exe.so bitmap.c && touch bitmap.ok bitmap.c:1514: Test failed: DIB bits don't match make[2]: *** [bitmap.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: comctl32: statusbar[3/5]: change the height expression to one that seems to be the same as in Windows
by Alexandre Julliard 17 Jul '08

17 Jul '08

Mikołaj Zalewski <mikolaj(a)zalewski.pl> writes: > @@ -116,7 +116,7 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) > TEXTMETRICW tm; > > COMCTL32_GetFontMetrics(infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont, &tm); > - height = tm.tmHeight + 4 + infoPtr->verticalBorder; > + height = tm.tmHeight + tm.tmInternalLeading + 2 + infoPtr->verticalBorder; This doesn't make sense, the height already includes tmInternalLeading. -- Alexandre Julliard julliard(a)winehq.org

1 0

That tiny OpenGL app
by Markus Hitter 17 Jul '08

17 Jul '08

Hello all, maybe I'm just missing the obvious, but I can't get my small one-file app to link. As I've just built Wine from scratch on this box, everything should be installed, including libGL... in /usr/lib32: mah@piccard:~/Wine Apps/GPWiki Framework$ make i586-mingw32msvc-g++ -pipe -mwindows \ -L/usr/local/lib/wine -L/lib32 -L/usr/lib32 \ -Wl,-rpath,/usr/local/lib/wine -Wl,-rpath,/lib32 -Wl,-rpath,/usr/ lib32 \ -lopengl32 -lglu32 -o OpenGLBase.exe OpenGLBase.cpp /tmp/cclajgrA.o:OpenGLBase.cpp:(.text+0x10e): undefined reference to `_wglCreateContext@4' /tmp/cclajgrA.o:OpenGLBase.cpp:(.text+0x134): undefined reference to `_wglMakeCurrent@8' /tmp/cclajgrA.o:OpenGLBase.cpp:(.text+0x15d): undefined reference to `_glClearColor@16' /tmp/cclajgrA.o:OpenGLBase.cpp:(.text+0x16a): undefined reference to `_glClear@4' collect2: ld returned 1 exit status make: *** [OpenGLBase.exe] Fehler 1 mah@piccard:~/Wine Apps/GPWiki Framework$ for F in /lib32/* /usr/ lib32/* /usr/local/lib/wine/*; do if nm "$F" 2>/dev/null | grep glClearColor; then echo "$F"; fi; done U glClearColor 000621c0 T wine_glClearColor 000522f0 t wine_glClearColorIiEXT 00052240 t wine_glClearColorIuiEXT /usr/local/lib/wine/opengl32.dll.so 00102574 B glClearColor /usr/local/lib/wine/wined3d.dll.so mah@piccard:~/Wine Apps/GPWiki Framework$ Short of solid knowledge I tried about anything I could imagine, but no joy. Any ideas, somebody? Thanks, MarKus - - - - - - - - - - - - - - - - - - - Dipl. Ing. Markus Hitter http://www.jump-ing.de/

3 6

Re: ws2_32: Partial implementation of TransmitFile/TransmitPackets (try 2)
by Alexandre Julliard 17 Jul '08

17 Jul '08

Jon Griffiths <jon_p_griffiths(a)yahoo.com> writes: > + while (send_len) > + { > + wsabuf.len = send_len; > + if (wsabuf.len > chunk_len) > + wsabuf.len = chunk_len; > + if (!ReadFile(packet->u.s.hFile, wsabuf.buf, wsabuf.len, &n, NULL)) > + goto TransmitPackets_fail; > + wsabuf.len = n; > + if (WSASendTo(s, &wsabuf, 1, &n, 0, NULL, 0, NULL, NULL) == SOCKET_ERROR) > + goto TransmitPackets_fail; > + send_len -= n; > + } This is still wrong, WSASendTo doesn't necessarily send the whole buffer. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 03/12] quartz: Make Filtermapper aggregatable.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Alexander Dorofeyev <alexd4(a)inbox.lv> writes: > @@ -1148,7 +1201,7 @@ static const IFilterMapper2Vtbl fm2vtbl = > > static HRESULT WINAPI FilterMapper_QueryInterface(IFilterMapper * iface, REFIID riid, LPVOID *ppv) > { > - FilterMapper2Impl *This = impl_from_IFilterMapper(iface); > + ICOM_THIS_MULTI(FilterMapper2Impl, lpVtblFilterMapper, iface); Please don't do that. Using inline functions is much better than the ugly and non-typesafe ICOM_THIS_MULTI macro. -- Alexandre Julliard julliard(a)winehq.org

1 0

re: msxml3: Added ISAXContentHandler_startDocument evenet (3/12)
by Alistair Leslie-Hughes 17 Jul '08

17 Jul '08

"Piotr Caban" <piotr.caban(a)gmail.com> wrote in message news:200807170041.01333.piotr.caban@gmail.com... +/*** LibXML callbacks ***/ +static void libxmlStartDocument(void *ctx) +{ + saxlocator *This = ctx; + HRESULT hr; + + if(This->saxreader->contentHandler) + { + hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler); + if(FAILED(hr)) + { + xmlStopParser(This->pParserCtxt); + This->ret = hr; + } Hi Piotr, Should This->ret be set on a non-error? Best Regards Alistair Leslie-Hughes _________________________________________________________________ Are you paid what you're worth? Find out: SEEK Salary Centre http://a.ninemsn.com.au/b.aspx?URL=http%3A%2F%2Fninemsn%2Eseek%2Ecom%2Eau%2…

2 1

Re: msi: Partially revert commit 26ae65898685a67f7be29cb94e679e4eb80fc6f5 [RESEND]
by Alexandre Julliard 17 Jul '08

17 Jul '08

"James Hawkins" <jhawkins(a)codeweavers.com> writes: > Anything wrong with this patch? While the commit in question is right > in some ways, it's not completely correct and breaks the Office > installers. You should add fixes on top of it instead of reverting then redoing it, that makes a mess of the history, especially in the tests with things moving in and out of todo_wine several times. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: icmp: Forward Icmp* functions to iphlpapi
by Alexandre Julliard 17 Jul '08

17 Jul '08

"Juan Lang" <juan.lang(a)gmail.com> writes: > Depends on the iphlpapi patches I just sent. You should do the code move in a single patch so that it's seen as a real move, instead of a copy and then a delete two commits later. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/10] WineD3D: Add extension information to the states
by Ivan Gyurdiev 17 Jul '08

17 Jul '08

> Stefan Dösinger wrote: This doesn't look bad on the surface, but I have two concerns: 1. Does not scale to more complex support checks. I suspect you'll have to have to rewrite this as soon as a case comes up that requires more than a single support check to establish support. A function pointer may help here. It would also be interesting to look at similarities and differences with the ffp pipeline replacement - which is essentially the same thing on a much larger scale, where multiple states are replaced rather than a single state. Can these support checks handle the case where an extension would control replacing a group of states ? 2. Not necessarily relating to this patch, but in general I would be wary of trying to replace every if check with a pointer. Splitting on extension support is probably ok. Ivan

3 4

Launching Unix binaries
by Oleh R. Nykyforchyn 16 Jul '08

16 Jul '08

After upgrade to Wine 1.1.0 from 0.9.56 I found out that my WinEdt can't launch Unix binaries (xdvi, xterm etc) anymore. A dialog box saying "Cannot execute command ..." appears, but binaries are started anyway. AFAICS it is caused by patch by Dmitry Timoshkov that introduces "winoldap.mod". Now WinExec creates a process and then executes wait_input_idle() that fails for Unix processes that have hProcess == 0. I attach a quick fix that solves the problem for me, but I am not sure that my patch is quite correct and complete. Now we can only check that a Unix process is started successfully, but we don't know what is going on later. Can somebody propose a better solution? --- kernel32/process.c.orig 2008-06-27 17:24:42.000000000 +0300 +++ kernel32/process.c 2008-07-16 10:03:15.000000000 +0300 @@ -1987,8 +1987,8 @@ if (CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info )) { - /* Give 30 seconds to the app to come up */ - if (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED) + /* Give 30 seconds to the non-Unix app to come up */ + if (info.hProcess && (wait_input_idle( info.hProcess, 30000 ) == WAIT_FAILED)) WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); ret = 33; /* Close off the handles */ --- kernel32/kernel16.c.orig 2008-07-16 09:59:04.000000000 +0300 +++ kernel32/kernel16.c 2008-07-16 10:04:12.000000000 +0300 @@ -190,6 +190,7 @@ if (CreateProcessA( NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info )) { + if ( info.hProcess ) { /* Give 10 seconds to the app to come up */ if (wait_input_idle( info.hProcess, 10000 ) == WAIT_FAILED) WARN("WaitForInputIdle failed: Error %d\n", GetLastError() ); @@ -199,6 +200,15 @@ GetExitCodeProcess( info.hProcess, &exit_code ); CloseHandle( info.hThread ); CloseHandle( info.hProcess ); + } + else + { + /* Unix binary */ + ReleaseThunkLock( &count ); + exit_code = 33; + CloseHandle( info.hThread ); + CloseHandle( info.hProcess ); + } } else ReleaseThunkLock( &count );

1 0

Re: comctl32: status[1/5]: don't issue a WM_PAINT during a WM_CREATE
by James Hawkins 16 Jul '08

16 Jul '08

On Wed, Jul 16, 2008 at 3:02 PM, Mikołaj Zalewski <mikolaj(a)zalewski.pl> wrote: > I haven't noticed such a thing on Windows and it seems strange to run the > WM_PAINT handler before WM_CREATE finishes - it may e.g. break some apps > that subclass this control. > There's only one way to find out for sure. Write a test case. -- James Hawkins

1 0

How long does it take you to compile wine?
by Dan Kegel 16 Jul '08

16 Jul '08

Way back five years ago, we all compared notes on how long it took to build Wine on our systems. http://www.winehq.org/site/?issue=149#Compile%20Time%20Comparisons%20/%20Ti… Today I measured it on a new computer (with a spiffy new Intel dual core e7200 processor with 2GB of RAM, http://kegel.com/new-computer-2008.html ). Result: ... it takes me a bit longer today on this machine (11 minutes) to build as it did then on a dual cpu hot rod (8 minutes). I guess Moore's Law isn't quite keeping up with Wine's code growth :-)

12 15

Re: libs/wine/debug: Avoid over-allocating memory in default_dbgstr_wn.
by Michael Karcher 16 Jul '08

16 Jul '08

Am Dienstag, den 15.07.2008, 15:55 -0700 schrieb Dan Hipschman: > if (n < 0) n = 0; > size = 12 + min( 300, n * 5 ); > - dst = res = funcs.get_temp_buffer( n * 5 + 7 ); > + dst = res = funcs.get_temp_buffer( size ); This looks like fixing an under-allocation, not over-allocation. The patched code allocates at least 5 bytes more, and never less than 312. Regards, Michael Karcher

2 2

Re: [PATCH] Workarounds for lotro bugs
by Rob Shearman 16 Jul '08

16 Jul '08

2008/7/16 Daniel Santos <daniel(a)bytesage.com>: > + if(_lotro_hack_enabled > + && to->sa_family == AF_INET > + && dwBufferCount == 1 > + && _lotro_hack(&get_per_thread_data()->lotro_msgs, > + s, lpBuffers, (struct WS_sockaddr_in*)to)) { > + Sleep(10); > + if(lpNumberOfBytesSent) { > + *lpNumberOfBytesSent = lpBuffers->len; > + } > + return 0; > + } > + Hi Daniel, While I appreciate the effort you've gone to to fix a bug, I don't see any analysis in the bug that suggests this is the only possible solution. It seems to me as though LOTRO is calling WSASendTo in a tight loop and that it isn't such a tight loop on Windows. A +relay log will reveal which calls it is making in that thread. You can then build a similar test program and time how long each call takes on Windows and Wine and see where the difference is (although it probably won't be as simple as that as there will be other threads interacting in LOTRO). At a guess, it might simply be that Windows yields to other threads after making a call to a network function. -- Rob Shearman

2 1

WWN 349
by Kirill K. Smirnov 16 Jul '08

16 Jul '08

Hi, Wine main page is not updated - there are no link to WWN 349. Partial patch? -- Kirill

1 0

d3dx9: Add stubs for the ID3DXSprite functions [2/2, try 2]
by tony.wasserka＠freenet.de 16 Jul '08

16 Jul '08

The last patch was diff'ed against an old version of dlls/d3dx9_36/Makefile.in. Applies fine now. Unbegrenzter Speicher, Top-Spamschutz, 120 SMS und eigene E-MailDomain inkl. http://office.freenet.de/dienste/emailoffice/produktuebersicht/power/mail/i…

1 0

Re: comctl32: initial support for drawing themed push buttons.
by Reece Dunn 16 Jul '08

16 Jul '08

2008/7/15 Reece Dunn <msclrhd(a)googlemail.com>: > This adds basic support for drawing themed push buttons. Please ignore this patch, as it breaks the drawing of some dialogs (e.g. Cepstral SwiftTalker options). - Reece

1 0

Re: Patch for Bug 14072
by Vitaliy Margolen 16 Jul '08

16 Jul '08

Chris Ahrendt wrote: > I have been chasing down a bug which causes a unhandled exception in > wine for various d3d applications and have found where the problem occurs. > > The problem occurs in provider.c in dll/dxdiagn > > here is the dif for the patch : > > --- provider.c 2008-07-15 11:56:57.000000000 -0400 > +++ provider_orig.c 2008-07-11 11:55:55.000000000 -0400 > @@ -665,11 +665,7 @@ static HRESULT DXDiag_InitDXDiagDirectSh > } > IPropertyBag_Release(pPropFilterBag); pPropFilterBag = NULL; > } > - if (pEnum != NULL) > - { > - IEnumMoniker_Release(pEnum); > - pEnum = NULL; > - } > + IEnumMoniker_Release(pEnum); pEnum = NULL; > } > class_enum_failed: > SysFreeString(wszCatName); > > What's occuring is that pEnum is NULL and when the release function is > called it throws an exception. This fix checks to make sure its not > NULL before calling the release. > > If you need the exception please look at bug 14072 > > Chris > Thanks for the patch however there are number of things that are wrong with it: 1. You need to generate patch from the top of the source tree. 2. provider_orig.c goes first not second 3. The patch is not correct - it's hiding an error. The pEnum should not be NULL. If it is - something else is really wrong. 4. The crash in your bug has nothing to do with what you are fixing. Unless you attached the wrong trace. Vitaliy.

1 0

Re: Patches for "RegGetValue" and "SetDIBits"
by James Hawkins 16 Jul '08

16 Jul '08

On Tue, Jul 15, 2008 at 10:56 PM, Mathias Kosch <info(a)mkosch.de> wrote: > Dear Sirs and Madams, > > while configuration "The Bat!" for wine I had to fix some issues with > Wine (version 1.1.1). I am now sending you the patches, because I was > told so in Bugzilla. I hope, they can be applied to the next version > of Wine so I don't need to recompile myself. > > The first problem relates to the functions "RegGetValueW" and > "RegGetValueA" in "advapi32". > In case dwFlags contains the Bits (RRF_RT_REG_EXPAND_SZ | > RRF_RT_REG_SZ) and not the bit RRF_NOEXPAND the function will return > ERROR_INVALID_PARAMETER. This is wrong behaviour, because expansion > will transform a result of type RRF_RT_REG_EXPAND_SZ into > RRF_RT_REG_SZ which satisfies the request. > This will especially make the use of the flag "RRF_RT_ANY" impossible. > The patch can be found in the attached file "registry.c.patch". > > The second problems relates to the function "X11DRV_SetDIBits" in > "winex11.drv". It causes "The Bat!" to display white squares instead > of colored icons. > The mistake is inside the recently added optimization code for the > case "where the input bits are in exactly the same format as the > internal representation". > The assignment >> dbits = (LPBYTE)bits + (dstwidthb * (lines-1)); > obviously needs to be changed to: >> dbits = (LPBYTE)dbits + (dstwidthb * (lines-1)); > The patch can be found in the attached file "dib.c.patch". > Only one patch per mail. Please read about sending patches to Wine at [1]. Also, you forgot to send a test case as was mentioned in the bug report. [1] http://www.winehq.org/site/sending_patches -- James Hawkins

1 0

Re: secur32: First small test for a Kerberos SSP. (try 2)
by Kai Blin 15 Jul '08

15 Jul '08

On Tuesday 15 July 2008 14:23:29 Kai Blin wrote: > + > + ret = pAcquireCredentialsHandleA(NULL, sec_pkg_name, > SECPKG_CRED_INBOUND, + NULL, NULL, NULL, NULL, &cred, &ttl); > + pFreeCredentialsHandle(&cred); > + Of course I missed the ok() check, and of course it's failing. Seems like the patch won't be that small after all. Disregard for now, I'll resend if I have a full patch that works on windows for both server and client side. Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

3 2

Re: secur32: First small test for a Kerberos SSP.
by Kai Blin 15 Jul '08

15 Jul '08

On Tuesday 15 July 2008 12:52:49 Kai Blin wrote: Please disregard this one. It's a bit too small, and I've got a small addition that really doesn't make too much sense by itself, but fits into this patch better than it fits into the next patch. I'll resend in a moment. Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://www.samba.org/samba/team/ -- Will code for cotton.

1 0

Compile error in wine-1.1.1
by George Dunlap 15 Jul '08

15 Jul '08

Downloaded wine-1.1.1.tar.bz2, and after unzipping, running configure (which included adding some -dev libraries to make it happy) and 'make depend', it ran for several minutes before stopping here: --snip-- make[2]: Leaving directory `/home/dunlapg/src/wine-1.1.1/dlls/mswsock' make[2]: Entering directory `/home/dunlapg/src/wine-1.1.1/dlls/msxml3' gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -DCOM_NO_WINDOWS_H -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -g -O2 -o attribute.o attribute.c In file included from attribute.c:32: msxml_private.h:94: error: expected ')' before 'xmldoc' make[2]: *** [attribute.o] Error 1 make[2]: Leaving directory `/home/dunlapg/src/wine-1.1.1/dlls/msxml3' make[1]: *** [msxml3] Error 2 make[1]: Leaving directory `/home/dunlapg/src/wine-1.1.1/dlls' make: *** [dlls] Error 2 --snip-- I looked at msxml_private.h:94, and it looks perfectly harmless; some previous function prototypes in the same header file use xmlDocPtr in the argument list as well, and don't cause an error. I'm using an Ubuntu 8.04 install. gcc reports version "gcc (GCC) 4.2.3 (Ubuntu 4.2.3-2ubuntu7)". Any ideas? -George

4 3

Re: dlls/ws2_32/tests/sock.c: Wait on thread handles before closing sockets
by Andrey Turkin 15 Jul '08

15 Jul '08

Diff doesn't look in line with the description (I can't see any waits in the diff :) 2008/7/15 Jon Griffiths <jon_p_griffiths(a)yahoo.com>: > Hi, > > In the socket tests, avoid a race by waiting for the read threads to finish > before closing the sockets (found during TransmitFile testing). > > Cheers > Jon > > > > > > >

1 0

Re: advpack: Sign-compare warnings fix (Resend)
by Michael Stefaniuc 15 Jul '08

15 Jul '08

Andrew Talbot wrote: > Is there anything wrong with this patch, please? If I might venture a guess it's probably because of the casts. Casts are evil if not really needed and using casts to get rid of the sign comparison warnings is debatable at best. > --- > Changelog: > advpack: Sign-compare warnings fix. > > diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c > index 5e9ce30..43c07ea 100644 > --- a/dlls/advpack/files.c > +++ b/dlls/advpack/files.c > @@ -709,7 +709,7 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, > if (FileList) > { > szConvertedList = convert_file_list(FileList, &dwFileCount); > - if (!szConvertedList || dwFileCount == -1) > + if (!szConvertedList || (LONG)dwFileCount == -1) This one could be replaced by a comparison with either "-1u" or "~0". > { > res = E_FAIL; > goto done; > diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c > index c5a5df0..05a7232 100644 > --- a/dlls/advpack/install.c > +++ b/dlls/advpack/install.c > @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(advpack); > #define SPAPI_MASK 0xFFFFL > #define HRESULT_FROM_SPAPI(x) ((x & SPAPI_MASK) | SPAPI_PREFIX) > > -#define ADV_HRESULT(x) ((x & SPAPI_ERROR) ? HRESULT_FROM_SPAPI(x) : HRESULT_FROM_WIN32(x)) > +#define ADV_HRESULT(x) ((x & SPAPI_ERROR) ? HRESULT_FROM_SPAPI(x) : (DWORD)HRESULT_FROM_WIN32(x)) > > #define ADV_SUCCESS 0 > #define ADV_FAILURE 1 > > bye michael

3 4

RE: [5/8] [wined3d] correctly set lockable boolean in IWineD3DDeviceImpl_CreateVolume
by Stefan Dösinger 15 Jul '08

15 Jul '08

> + if (Usage & WINED3DUSAGE_DYNAMIC) > + object->lockable = ((WINED3DPOOL_DEFAULT == Pool) || (WINED3DPOOL_SYSTEMMEM > == Pool)) ? TRUE : FALSE; The pool check here is somewhat redundant because a DYNAMIC texture of a non-default / non-systemmem pool will not reach that code due to the check added in patches 3 and 4. However, since one is in wined3d and the other check in d3d8/9 it somewhat makes sense to have it; I think we should discuss if we want the pool checks in wined3d or ddraw/d3d8/d3d9/d3d10. I'll take a look at the docs tomorrow. > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Tobias Jakobi > Sent: Monday, July 14, 2008 7:32 AM > To: wine-patches(a)winehq.org > Subject: [5/8] [wined3d] correctly set lockable boolean in > IWineD3DDeviceImpl_CreateVolume > > Hi there, > > this patchset fixes conformance of volumes/volumetextures creation > (plus > locking) in d3d8 and d3d9. Currently creating volumes/volumetextures > always succeeds regardless of the usage and pool type specified. > > A testcase for both d3d8 and d3d9 is included in the last two patches. > The test was verified on Vista and XP systems. > > Further fixes to volume/volumetexture locking are planned (the > behaviour is still not quite correct) and some of the fixes in this > patchset could be moved over to wined3d. That's also something that can > be done when the hardest work is over. > > Cheers, > Tobias Jakobi > > (PART 5/8) > >

1 0

RE: [1/8] [d3d8] validate pool type in CreateVolumeTexture
by Stefan Dösinger 15 Jul '08

15 Jul '08

> + if ((DWORD)(Pool) >= 4) { > + ERR("(%p) Called with invalid pool type\n", This); > + return D3DERR_INVALIDCALL; > + } You could use if(Pool != D3DPOOL_DEFAULT && Pool != MANAGED ...) instead of comparing to the arbitary value "4". The compiler should figure that out and generate a >= 4 for better efficiency, but even if not it doesn't hurt because Create* isn't performance critical.

1 0

Re: [WineHQ][WWN] WWN 349
by Ivan Gyurdiev 14 Jul '08

14 Jul '08

> Zachary Goldberg wrote: ... but did not spell check :) Granted, the movie quote is pretty funny, even if isn't spelled right. Ivan

5 4

Re: [PATCH 1/2] user32: Add more tests for SetWindowPos.
by Alexandre Julliard 14 Jul '08

14 Jul '08

"Lei Zhang" <thestig(a)google.com> writes: > +static UINT sequence_contains(UINT msg) > +{ > + static const struct message end_of_sequence = { 0, 0, 0, 0 }; > + const struct message *actual; > + UINT num = 0; > + > + add_message(&end_of_sequence); > + actual = sequence; > + > + while (actual->message) > + { > + if (actual->message == msg) num++; > + actual++; > + } > + return num; > +} The fix looks good now, but you should really test the message sequences instead of just counting a single message. We have already all the necessary mechanisms for this. -- Alexandre Julliard julliard(a)winehq.org

2 1

RE: wined3d: Enable filtering for D3DFMT_A4R4G4B4.
by Stefan Dösinger 14 Jul '08

14 Jul '08

Looks ok to me > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Philip Nilsson > Sent: Monday, July 14, 2008 11:20 AM > To: wine-patches(a)winehq.org > Subject: wined3d: Enable filtering for D3DFMT_A4R4G4B4. > > This patch enables texture filtering for textures using the A4R4G4B4 > format, I can see no reason why it shouldn't be filtered (especially > considering X4R4G4B4 has it). > > Works for me, in any case. Writing a test case may be hard. > > Probably solves bug 13256 (I can't think of any other format that would > be used instead).

1 0

new valgrind warnings in IWineD3DImpl_CreateDevice, IDirectDrawImpl_CreateSurface
by Dan Kegel 14 Jul '08

14 Jul '08

Lots of tests are showing new valgrind warnings involving IWineD3DImpl_CreateDevice, e.g. http://kegel.com/wine/valgrind/logs/2008-07-14-06.13/vg-ddraw_dsurface-diff… + Invalid free() / delete / delete[] + at notify_free (heap.c:199) + by RtlFreeHeap (heap.c:1284) + by compile_state_table (state.c:4557) + by IWineD3DImpl_CreateDevice (directx.c:3472) + by DDRAW_Create (main.c:235) + by DirectDrawCreate (main.c:373) + by CreateDirectDraw (dsurface.c:36) + by func_dsurface (dsurface.c:2616) + by run_test (test.h:488) + by main (test.h:537) http://kegel.com/wine/valgrind/logs/2008-07-14-06.13/vg-d3d9_query-diff.txt + Invalid free() / delete / delete[] + at notify_free (heap.c:199) + by RtlFreeHeap (heap.c:1284) + by compile_state_table (state.c:4557) + by IWineD3DImpl_CreateDevice (directx.c:3472) + by IDirect3D9Impl_CreateDevice (directx.c:493) + by test_query_support (query.c:96) + by func_query (query.c:266) + by run_test (test.h:488) + by main (test.h:537) Plus, http://kegel.com/wine/valgrind/logs/2008-07-14-06.13/vg-ddraw_dsurface-diff… has the additional new warning: + Conditional jump or move depends on uninitialised value(s) + at IDirectDrawImpl_CreateSurface (ddraw_thunks.c:403) + by MipMapCreationTest (dsurface.c:198) + by func_dsurface (dsurface.c:2618) + by run_test (test.h:488) + by main (test.h:537) + Uninitialised value was created by a stack allocation + at IDirectDrawImpl_CreateSurface (ddraw_thunks.c:384) Stefan, could you have a look? Thanks... - Dan

1 0

RE: wined3d: universal surface convertor function for unsigned integer color formats
by Stefan Dösinger 14 Jul '08

14 Jul '08

There's a pixelformat table that describes bitmasks and sizes in utils.c, you can access it with a function that is next to it. I think you can infer the shifting information from this table, if not please add it there instead of creating your own table. Also please do not use C++ comments("//"), and watch out regarding tabs and spaces Your patch still adds the x8r8g8b8_to_x5r6g5 function, and I think it is a bit ugly to bypass the existing format conversion table entirely and add the convert_unsigned_pixels function. I think it would be better to access this function using the conversion table. One reason is that we could use the table in directx.c in CheckDeviceFormatConversion, so the information is all in one place. > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Victor Eremin > Sent: Sunday, July 13, 2008 5:52 PM > To: wine-patches(a)winehq.org > Subject: wined3d: universal surface convertor function for unsigned > integer color formats > > > Converter function supports conversion between most of "unsigned color" > argb/xrgb surface formats (like D3DFMT_A8R8G8B8, D3DFMT_A8R3G3B2, and > so on), and between "luminosity" color formats (D3DFMT_L8, etc), > excluding D3DFMT_A16R16G16B16, D3DFMT_A8P8, > D3DFMT_P8 and D3DFMT_A1. > > Conversion from rgba to luminosity (and vice versa) is not currently > implemented. > > The patch removes "Cannot find coverter" FIXMEs from "Ancient Evil" and > "Stranded 2" games. > > Patch also fixes water glitches in "Stranded 2" game. > --- > dlls/wined3d/surface_base.c | 215 > +++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 209 insertions(+), 6 deletions(-)

2 1

Re: wined3d: universal surface convertor function for unsigned integer color formats
by Philip Nilsson 14 Jul '08

14 Jul '08

On Mon, Jul 14, 2008 at 02:51:42AM +0400, Victor Eremin wrote: > > Converter function supports conversion between most of > "unsigned color" argb/xrgb surface formats (like D3DFMT_A8R8G8B8, > D3DFMT_A8R3G3B2, and so on), and between "luminosity" color formats > (D3DFMT_L8, etc), excluding D3DFMT_A16R16G16B16, D3DFMT_A8P8, > D3DFMT_P8 and D3DFMT_A1. > > Conversion from rgba to luminosity (and vice versa) is not currently > implemented. > > The patch removes "Cannot find coverter" FIXMEs from "Ancient Evil" and > "Stranded 2" games. > > Patch also fixes water glitches in "Stranded 2" game. I've attached my pixel conversion function which uses the table in utils.c. Hope you find it useful although I haven't really polished it.

1 0

Re: [4/8] [d3d9] handle invalid usage/pool combinations in CreateVolumeTexture
by H. Verbeet 14 Jul '08

14 Jul '08

2008/7/14 Tobias Jakobi <liquid.acid(a)gmx.net>: > Hi there, > > this patchset fixes conformance of volumes/volumetextures creation (plus > locking) in d3d8 and d3d9. Currently creating volumes/volumetextures > always succeeds regardless of the usage and pool type specified. > > A testcase for both d3d8 and d3d9 is included in the last two patches. > The test was verified on Vista and XP systems. > > Further fixes to volume/volumetexture locking are planned (the behaviour > is still not quite correct) and some of the fixes in this patchset could > be moved over to wined3d. That's also something that can be done when > the hardest work is over. > > Cheers, > Tobias Jakobi > As you note in your comment, most of this should go into wined3d. I also think this should for the most part use the same code that is used for CheckDeviceFormat in dlls/wined3d/directx.c. Roderick would probably be able to help you best there, but he's currently away.

2 2

Allow running conformance tests in parallel
by Dan Kegel 14 Jul '08

14 Jul '08

The attached patch lets you run Wine's conformance tests in parallel. On my relatively fast dual core machine (e7200): "make -k test" takes 3 minutes 55 seconds "make -k -j2 test" takes 2 minutes 15 seconds "make -k -j4 test" takes 1 minute 45 seconds "make -k -j10 test" takes 1 minute 27 seconds About the same number of tests fail regardless of -j value. How it works: this patch adds a new function, winetest_exclusive(), that waits until it can acquire an exclusive lock. It should be called near the top of the START_TEST body for any test that needs exclusive access to the system. (In tests that exec themselves, the call has to be placed carefully to avoid having the child call it.) I did this for all tests that call CreateWindow, and a few more that seemed like they might need it. The list of tests marked exclusive is somewhat rough; probably a few tests should be added or removed, but it's pretty good for a first cut. I've been wanting to do this for ages. Turned out to be easier than I'd feared.

2 2

re: Illegal attachment in bug 14461
by Dan Kegel 14 Jul '08

14 Jul '08

Vitaliy wrote: > Bugzilla admin(s) please remove the illegal attachment from the > http://bugs.winehq.org/show_bug.cgi?id=14461 Deleted.

1 0

user32: Problem using SetClassLongW to subclass built-in control (Edit)
by Hongbo Ni 14 Jul '08

14 Jul '08

Hi, Summary: SetClassLongW(hEdit, GCL_WNDPROC,(DWORD)NewEditWndProc) in Wine differs from Windows. Background: when a standard built-in window class (such as Edit for example) is registered initially, the window system register the class with two Procedures (procA and ProcW) and assign a handle as WNDPROC to the class. If a Edit window is created using CreateWindowExA, it will be an Ansi Window. If a Edit window is created using CreateWindowExW, it will be an Unicode Window. This fine in Wine. Problem: I globally subclass the Edit class using SetClassLongW using following code ------------------------------------------------------------------------------------------------------------ HWND hEdit = CreateWindowExA(0,"Edit", "E1",WS_POPUP,0, 0, 1,1,NULL,NULL,NULL,NULL); OldEditWndProc =(WNDPROC)SetClassLongW(hEdit, GCL_WNDPROC,(DWORD)NewEditWndProc); ------------------------------------------------------------------------------------------------------------ After this subclass, Wine behaves different from Windows In Windows: a new Edit windows created by CreateWindowsExA((0,"Edit",...) is a Still an Ansi Windows a new Edit windows created by CreateWindowsExW((0,"Edit",...) is a Unicode Windows But in Wine, new Edit windows created by CreateWindowsExA or CreateWindowsExW are all Unicode Windows. I checked wine 1.1 source code , basically the call to SetClassLongW(hEdit, GCL_WNDPROC,(DWORD)NewEditWndProc) has set the Edit class proc to Unicode Only. So regardless how you create the Edit window, it will be Unicode window. This is understandable but it's different form windows. causing my application to mis-behave. More problem, the OldEditWndProc returned above is only the procW of Edit class, if we try to undo the subclass with SetClassLongW(hEdit, GCL_WNDPROC,(DWORD)OldEditWndProc ); the Edit class also lost it's procA. Discussion: How wine could do the same as windows? SetClassLongW(hEdit, GCL_WNDPROC,(DWORD)NewEditWndProc) should 1. return the proc handle of the class, instead of procW. 2. set both ProcA and ProcW of Edit class to NewEditWndProc. so NewEditWndProc need to handle both messages from Ansi and Unicode Edit control. I don't know what is the best way to fix this. Please help. I have posted a Test application on Bugzilla #14350, please try. Regards Hongbo _________________________________________________________________ Are you paid what you're worth? Find out: SEEK Salary Centre http://a.ninemsn.com.au/b.aspx?URL=http%3A%2F%2Fninemsn%2Eseek%2Ecom%2Eau%2…

4 8

Re: iPod patches
by Maarten Lankhorst 14 Jul '08

14 Jul '08

Hello Austin, 2008/6/9 Austin English <austinenglish(a)gmail.com>: > Howdy Maarten, > > I'm trying to do some dogfood testing with iTunes, and am building a > wine build with a few hacks to get around the ddraw blacking bug, iPod > support, etc. I tried applying your patch for iPod support, but it > seems that patch has a lot of conflicts with recent wine versions. I > was about to go through and start settling them manually, but thought > you may have a version laying around in your git tree that applies > (relatively) cleanly to 1.0-rc4. The most recent iteration is at: http://www.winehq.org/pipermail/wine-patches/2008-May/054483.html It should still apply cleanly, since the last patch touches wineserver, you have to run tools/make_requests from the top of the wine tree to update all wineserver related files. I added wine-devel to CC since lots of people asked me about it. The downside is that it still doesn't work 100%, for some reason there is a huge delay every time the ipod is used. How to use it: Set windows version to vista Install iTunes Mount the ipod 'wine net start "ipod service"' Wait 10 seconds or so start itunes, it should take 3 minutes instead of instantly. (From the delay above) There is a race condition if the ipod service isn't started before itunes is, resulting in the ipod not being found. Might be a wine bug, but I'm not 100% sure. Cheers, Maarten. Cheers, Maarten

3 3

Re: configure: add ip_icmp.h for getICMPStats on FreeBSD
by Alexandre Julliard 14 Jul '08

14 Jul '08

EA Durbin <ead1234(a)hotmail.com> writes: > diff --git a/configure.ac b/configure.ac > index bd764a3..500cae1 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -274,6 +274,7 @@ AC_CHECK_HEADERS(\ > mntent.h \ > ncurses.h \ > netdb.h \ > + netinet/ip_icmp.h \ > netinet/in.h \ > netinet/in_systm.h \ > netinet/tcp.h \ ip_icmp.h is already checked for later on, since it depends on some other headers. -- Alexandre Julliard julliard(a)winehq.org

1 0

Illegal attachment in bug 14461
by Vitaliy Margolen 14 Jul '08

14 Jul '08

Bugzilla admin(s) please remove the illegal attachment from the http://bugs.winehq.org/show_bug.cgi?id=14461 Vitaliy.

1 0

please disregard my patch " wined3d: add surface convertor from D3DFMT_X8R8G8B8 to D3DFMT_R5G6B5"
by Victor 13 Jul '08

13 Jul '08

Hello. I ask to disregard patch " wined3d: add surface convertor from D3DFMT_X8R8G8B8 to D3DFMT_R5G6B5" (d15c66beebaaaa5ab7130161278d0ee86ee79aed.diff) I've sent yesterday. There are minor errors in masks used within x8r8g8b8_to_x5r6g5 that might cause minor graphical artefacts on textures with this conversion. I've written better (more flexible) converter function which will be submitted to wine-patches soon. -- With best regards, Victor Eremin (ErV2005(a)rambler.ru)

1 0

Re: [dplayx] New library dpwsockx, needed by dplayx
by Michael Karcher 13 Jul '08

13 Jul '08

Am Samstag, den 12.07.2008, 18:46 +0300 schrieb Ismael Barros: > I'm sorry, that patch lacked a header file, this is the fixed patch. I would put the dplaysp.h file into include, not dlls/dpwsockx. It contains definitions for all DirectPlay service providers, so it might be useful if a modem provider or a direct serial connection provider will be implemented. Is there a reason not to do so? Regards, Michael Karcher

4 8

Re: [2/3] gdiplus: fix GdipPathIterNextMarker behaviour on path without markers. fix tests.
by James Hawkins 13 Jul '08

13 Jul '08

On Sat, Jul 12, 2008 at 11:56 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Changelog: > - Fix GdipPathIterNextMarker behaviour on path without markers. Make tests pass on native. > > --- > dlls/gdiplus/pathiterator.c | 3 ++- > dlls/gdiplus/tests/pathiterator.c | 6 +++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c > index 55b0782..3d3b1dc 100644 > --- a/dlls/gdiplus/pathiterator.c > +++ b/dlls/gdiplus/pathiterator.c > @@ -140,7 +140,8 @@ GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator* iterator, INT *result > /* first call could start with second point as all subsequent, cause > path couldn't contain only one */ > for(i = iterator->marker_pos + 1; i < iterator->pathdata.Count; i++){ > - if(iterator->pathdata.Types[i] & PathPointTypePathMarker){ > + if((iterator->pathdata.Types[i] & PathPointTypePathMarker) || > + (i == iterator->pathdata.Count - 1)){ > *startIndex = iterator->marker_pos; > if(iterator->marker_pos > 0) (*startIndex)++; > *endIndex = iterator->marker_pos = i; > diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c > index 071c1d5..6498bb3 100644 > --- a/dlls/gdiplus/tests/pathiterator.c > +++ b/dlls/gdiplus/tests/pathiterator.c > @@ -114,7 +114,7 @@ static void test_nextmarker(void) > GdipCreatePathIter(&iter, path); > stat = GdipPathIterNextMarker(iter, &result, &start, &end); > expect(Ok, stat); > - expect(0, result); > + if(stat == Ok) expect(TRUE, (result == 4) && (start == 0) && (end == 3)); Why are you checking if stat == Ok? You're linking what should be separate tests together. You also need to put each of these checks into separate tests. If the test fails, you have no idea (without debugging further) which one of those checks fails. They're called unit tests for a reason. > GdipDeletePathIter(iter); > > /* one marker */ > @@ -125,7 +125,7 @@ static void test_nextmarker(void) > expect(TRUE, (start == 0) && (end == 3) && (result == 4)); > stat = GdipPathIterNextMarker(iter, &result, &start, &end); > expect(Ok, stat); > - expect(0, result); > + if(stat == Ok) expect(0, result); Same thing as above. > GdipDeletePathIter(iter); > > /* two markers */ > @@ -140,7 +140,7 @@ static void test_nextmarker(void) > expect(TRUE, (start == 4) && (end == 5) && (result == 2)); > stat = GdipPathIterNextMarker(iter, &result, &start, &end); > expect(Ok, stat); > - expect(0, result); > + if(stat == Ok) expect(0, result); Same. -- James Hawkins

5 13

RE: wined3d: add surface convertor from D3DFMT_X8R8G8B8 to D3DFMT_R5G6B5
by Stefan Dösinger 13 Jul '08

13 Jul '08

Please allign the entries in the conversion table. It seems that the spacing isn't properly alliged(although maybe my outlook messed it up). Otherwise it looks ok to me Also it is generally better to attach the patch as an extra file to the mail instead of inlining it, since mail clients often mangle the lines, thus breaking the patch > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Victor > Sent: Saturday, July 12, 2008 9:54 PM > To: wine-patches(a)winehq.org > Subject: wined3d: add surface convertor from D3DFMT_X8R8G8B8 to > D3DFMT_R5G6B5 > > > removes "cannot convert" FIXMEs in "Ancient Evil" game. > --- > dlls/wined3d/surface_base.c | 18 ++++++++++++++++++ > 1 files changed, 18 insertions(+), 0 deletions(-) > > diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c > index 183cd2b..d74ec42 100644 > --- a/dlls/wined3d/surface_base.c > +++ b/dlls/wined3d/surface_base.c > @@ -636,6 +636,23 @@ void convert_r32f_r16f(BYTE *src, BYTE *dst, DWORD > pitch_in, DWORD pitch_out, un > } > } > > +inline WORD x8r8g8b8_to_x5r6g5(DWORD xrgb){ > + return ((xrgb & 0xFF) >> 3) | ((xrgb & 0xFF00) >> 10) | > + ((xrgb & 0xFF0000) >> 19); > +} > + > +void convert_x8r8g8b8_x5r6g5(BYTE* src, BYTE* dst, DWORD pitch_in, > DWORD pitch_out, unsigned int w, unsigned int h){ > + unsigned int x, y; > + DWORD* srcp; > + WORD* destp; > + for (y = 0; y < h; y++, src+= pitch_in, dst += pitch_out){ > + srcp = (DWORD*)src; > + destp = (WORD*)dst; > + for (x = 0; x < w; x++) > + destp[x] = x8r8g8b8_to_x5r6g5(srcp[x]); > + } > +} > + > struct d3dfmt_convertor_desc { > WINED3DFORMAT from, to; > void (*convert)(BYTE *src, BYTE *dst, DWORD pitch_in, DWORD > pitch_out, unsigned int w, unsigned int h); @@ -643,6 +660,7 @@ struct > d3dfmt_convertor_desc { > > struct d3dfmt_convertor_desc convertors[] = { > {WINED3DFMT_R32F, WINED3DFMT_R16F, convert_r32f_r16f}, > + {WINED3DFMT_X8R8G8B8, WINED3DFMT_R5G6B5, > convert_x8r8g8b8_x5r6g5} > }; > > static inline struct d3dfmt_convertor_desc > *find_convertor(WINED3DFORMAT from, WINED3DFORMAT to) { > -- > 1.5.5

1 0

How do I write an exception filter?
by Stefan Kuhr 13 Jul '08

13 Jul '08

Hello everyone, I would like to know what the proper way is to write an exception filter function for WINE code. Most of the WINE exception filtering seems to be done with the __EXCEPT_PAGE_FAULT macro, for whatever reason. In all other places I see the macro __EXCEPT with a filter function of this prototype LONG WINAPI filter(EXCEPTION_POINTERS *); However, I have the need to implement a filter function that takes additional formal parameters such as the values of local parameters of the function where the SEH frame resides. Alternatively, I would like to do something like the following (in MSVC parlance), where the exception filter is a simple boolean expression: __try { PDWORD pdwCommStatus = ....; PDWORD pdwFaultStatus = ....; doSomething(); } __except( (pdwCommStatus||pdwFaultStatus) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH ) { // handle the exception } In include/wine/exception.h, a comment from AJ says that "__EXCEPT(filter_func,param)" is the proper way to do it but "param" is not explained at all and "filter_func must be defined with the WINE_EXCEPTION_FILTER macro", as the comment says. However, a search for WINE_EXCEPTION_FILTER yields no results. So, how do I do these things in WINE properly? Did I overlook something obvious? -- Stefan

4 14

RFC: More tests for riched20 ITextServices
by Austin Lund 13 Jul '08

13 Jul '08

The first patch in this series is the same as that which I have sent around before. The remainder implement tests for TxGetText, TxSetText, TxGetNaturalSize and a very simple test for TxDraw. Patches 2 through 4 don't pass on wine but are in a wine_todo{} section. When the TxDraw patch is added and the test is run with WINETEST_INTERACTIVE=1 then you get two seconds to see the text in an undecorated window in the top left of the screen. I have run these with the native dll in wine and it works fine, but would like someone to test them on windows platforms. There is some trickery with "thiscall". Some background for the implementation can be found here: http://www.winehq.org/pipermail/wine-devel/2005-July/038185.html

3 6

re: [3/3] gdiplus: Make GdipInvertMatrix test pass on native
by Dan Kegel 13 Jul '08

13 Jul '08

James wrote: > > GDI+ uses floating point values for matrix elements so >> don't you think the result could be slightly different... > > No I don't think the results will be slightly different. > Higher-precision arithmetic doesn't mean more slop. Floating point equality comparisons need an error tolerance. See e.g. http://teaching.idallen.com/cst8110/97s/floating_point.html http://docs.hp.com/en/B3906-90006/ch03s05.html http://en.wikipedia.org/wiki/Floating_point#Accuracy_problems http://search.cpan.org/~dagolden/Test-Number-Delta-1.03/lib/Test/Number/Del… And testing matrix math routines is even trickier, it helps to have a really good math background there...

1 1

Re: [3/3] gdiplus: Make GdipInvertMatrix test pass on native
by James Hawkins 12 Jul '08

12 Jul '08

On Sat, Jul 12, 2008 at 4:12 PM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Changelog: > - Make GdipInvertMatrix test pass on native > > --- > dlls/gdiplus/tests/matrix.c | 23 +++++++++++++++++------ > 1 files changed, 17 insertions(+), 6 deletions(-) > > diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c > index 16c1517..daf61ea 100644 > --- a/dlls/gdiplus/tests/matrix.c > +++ b/dlls/gdiplus/tests/matrix.c > @@ -27,6 +27,19 @@ > > #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) > > +/* compare matrix data with some tolerance */ > +BOOL m_equalf(REAL *m1, REAL *m2) > +{ > + BOOL ret = TRUE; > + INT i; > + > + for(i = 0; i < 6; i++){ > + ret = ret && (fabsf(m1[i] - m2[i]) < 1e-5); > + } > + > + return ret; > +} > + > static void test_constructor_destructor(void) > { > GpStatus status; > @@ -119,12 +132,12 @@ static void test_isinvertible(void) > GdipDeleteMatrix(matrix); > } > > +static REAL minverted[] = {1.0/9.0, 2.0/9.0, 4.0/9.0, -1.0/9.0, -2.0, -1.0}; > static void test_invert(void) > { > GpStatus status; > GpMatrix *matrix = NULL; > - GpMatrix *inverted = NULL; > - BOOL equal; > + REAL mdata[6]; > > /* NULL */ > status = GdipInvertMatrix(NULL); > @@ -141,11 +154,9 @@ static void test_invert(void) > status = GdipInvertMatrix(matrix); > expect(Ok, status); > > - GdipCreateMatrix2(1.0/9.0, 2.0/9.0, 4.0/9.0, -1.0/9.0, -2.0, -1.0, &inverted); > - GdipIsMatrixEqual(matrix, inverted, &equal); > - expect(TRUE, equal); > + GdipGetMatrixElements(matrix, mdata); > + expect(TRUE, m_equalf(mdata, minverted)); > Why are you creating a new function that allows tolerance when you control the matrix you're comparing it to? Allowing slop is acceptable in some circumstances, but not in this case, when there is one exact value (or matrix of values) returned. -- James Hawkins

4 8

Re: [2/3] gdiplus: Fix test for PathIterator + make it pass on native and Wine (try2)
by James Hawkins 12 Jul '08

12 Jul '08

On Sat, Jul 12, 2008 at 4:11 PM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > Changelog: > - Fix test for PathIterator + make it pass on native and Wine > --- > dlls/gdiplus/pathiterator.c | 3 ++- > dlls/gdiplus/tests/pathiterator.c | 5 +++-- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c > index 55b0782..3d3b1dc 100644 > --- a/dlls/gdiplus/pathiterator.c > +++ b/dlls/gdiplus/pathiterator.c > @@ -140,7 +140,8 @@ GpStatus WINGDIPAPI GdipPathIterNextMarker(GpPathIterator* iterator, INT *result > /* first call could start with second point as all subsequent, cause > path couldn't contain only one */ > for(i = iterator->marker_pos + 1; i < iterator->pathdata.Count; i++){ > - if(iterator->pathdata.Types[i] & PathPointTypePathMarker){ > + if((iterator->pathdata.Types[i] & PathPointTypePathMarker) || > + (i == iterator->pathdata.Count - 1)){ > *startIndex = iterator->marker_pos; > if(iterator->marker_pos > 0) (*startIndex)++; > *endIndex = iterator->marker_pos = i; > diff --git a/dlls/gdiplus/tests/pathiterator.c b/dlls/gdiplus/tests/pathiterator.c > index 071c1d5..90725dc 100644 > --- a/dlls/gdiplus/tests/pathiterator.c > +++ b/dlls/gdiplus/tests/pathiterator.c > @@ -95,7 +95,8 @@ static void test_nextmarker(void) > GpPath *path; > GpPathIterator *iter; > GpStatus stat; > - INT start, end, result; > + INT start, end; > + INT result = (INT)0xdeadbeef; > > /* NULL args > BOOL out argument is local in wrapper class method, > @@ -114,7 +115,7 @@ static void test_nextmarker(void) > GdipCreatePathIter(&iter, path); > stat = GdipPathIterNextMarker(iter, &result, &start, &end); > expect(Ok, stat); > - expect(0, result); > + expect(TRUE, (result == 4) && (start == 0) && (end == 3)); Please break these out into their own tests. Like I said before, they are independent, and if one of them fails, it's impossible to tell from the test results which one is wrong. Also, none of the tests should be (returned == expected) == TRUE. It should simply be expect(expected, returned). -- James Hawkins

1 0

Re: winhttp: tests/winhttp.c[new]: Add test for WinHttpOpenRequest
by Zac Brown 12 Jul '08

12 Jul '08

Zac Brown wrote: > Add test for WinHttpOpenRequest. This test is modeled after > wininet/tests/http.c's InternetOpenRequest_test function. > > This is the first of many tests for getting Bug 14381 > (http://bugs.winehq.org/show_bug.cgi?id=14381) fixed with regard to > WinHTTP. > > > ------------------------------------------------------------------------ > > --- > Makefile.in | 2 + > configure | 3 + > dlls/Makefile.in | 1 + > dlls/winhttp/tests/Makefile.in | 13 +++++ > dlls/winhttp/tests/winhttp.c | 105 ++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 124 insertions(+), 0 deletions(-) > create mode 100644 dlls/winhttp/tests/Makefile.in > create mode 100644 dlls/winhttp/tests/winhttp.c > > diff --git a/Makefile.in b/Makefile.in > index 1b35079..6a56e44 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -495,6 +495,7 @@ ALL_MAKEFILES = \ > dlls/winex11.drv/Makefile \ > dlls/wing32/Makefile \ > dlls/winhttp/Makefile \ > + dlls/winhttp/tests/Makefile \ > dlls/wininet/Makefile \ > dlls/wininet/tests/Makefile \ > dlls/winmm/Makefile \ > @@ -924,6 +925,7 @@ dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules > dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules > dlls/wing32/Makefile: dlls/wing32/Makefile.in dlls/Makedll.rules > dlls/winhttp/Makefile: dlls/winhttp/Makefile.in dlls/Makedll.rules > +dlls/winhttp/tests/Makefile: dlls/winhttp/tests/Makefile.in dlls/Maketest.rules > dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules > dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules > dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules > diff --git a/configure b/configure > index d9f9b65..a276261 100755 > --- a/configure > +++ b/configure > @@ -22416,6 +22416,8 @@ ac_config_files="$ac_config_files dlls/wing32/Makefile" > > ac_config_files="$ac_config_files dlls/winhttp/Makefile" > > +ac_config_files="$ac_config_files dlls/winhttp/tests/Makefile" > + > ac_config_files="$ac_config_files dlls/wininet/Makefile" > > ac_config_files="$ac_config_files dlls/wininet/tests/Makefile" > @@ -23481,6 +23483,7 @@ do > "dlls/winex11.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winex11.drv/Makefile" ;; > "dlls/wing32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wing32/Makefile" ;; > "dlls/winhttp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/Makefile" ;; > + "dlls/winhttp/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/tests/Makefile" ;; > "dlls/wininet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/Makefile" ;; > "dlls/wininet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;; > "dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; > diff --git a/dlls/Makefile.in b/dlls/Makefile.in > index d130f35..1a77dc0 100644 > --- a/dlls/Makefile.in > +++ b/dlls/Makefile.in > @@ -362,6 +362,7 @@ TESTSUBDIRS = \ > usp10/tests \ > uxtheme/tests \ > version/tests \ > + winhttp/tests \ > wininet/tests \ > winmm/tests \ > winspool.drv/tests \ > diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in > new file mode 100644 > index 0000000..3f35e08 > --- /dev/null > +++ b/dlls/winhttp/tests/Makefile.in > @@ -0,0 +1,13 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +TESTDLL = winhttp.dll > +IMPORTS = winhttp ws2_32 kernel32 > + > +CTESTS = \ > + winhttp.c > + > +@MAKE_TEST_RULES@ > + > +@DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c > new file mode 100644 > index 0000000..afc9d97 > --- /dev/null > +++ b/dlls/winhttp/tests/winhttp.c > @@ -0,0 +1,105 @@ > +/* > + * WinHTTP - tests > + * > + * Copyright 2008 Google (Zac Brown) > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301, USA > + */ > + > +#define COBJMACROS > + > +#include <stdarg.h> > +#include <stdio.h> > +#include <stdlib.h> > + > +#include <windef.h> > +#include <winbase.h> > +#include <winhttp.h> > + > +#include "wine/test.h" > + > +/* Function pointer declarations for functions being used */ > +static HINTERNET (WINAPI *pWinHttpOpen) (LPCWSTR pwszUserAgent, DWORD dwAccessType, > + LPCWSTR pwszProxyName, LPCWSTR pwszProxyBypass, DWORD dwFlags); > +static HINTERNET (WINAPI *pWinHttpConnect) (HINTERNET hSession, LPCWSTR pwszServerName, > + INTERNET_PORT nServerPort, DWORD dwReserved); > +static HINTERNET (WINAPI *pWinHttpOpenRequest) (HINTERNET hConnect, LPCWSTR pwszVerb, > + LPCWSTR pwszObjectName, LPCWSTR pwszVersion, LPCWSTR pwszReferrer, > + LPCWSTR* ppwszAcceptTypes, DWORD dwFlags); > +static BOOL (WINAPI *pWinHttpSendRequest) (HINTERNET hRequest, LPCWSTR pwszHeaders, > + DWORD dwHeadersLength, LPVOID lpOptional, DWORD dwOptionalLength, > + DWORD dwTotalLength, DWORD_PTR dwContext); > +static BOOL (WINAPI *pWinHttpCloseHandle) (HINTERNET hInternet); > + > +static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; > +static const WCHAR test_server[] = {'w','i','n','e','h','q','.','o','r','g',0}; > + > +/* BEGIN TESTS */ > + > +static void test_OpenRequest (void) > +{ > + BOOL ret; > + HINTERNET session, request, connection; > + session = request = connection = NULL; > + > + session = pWinHttpOpen (test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); > + todo_wine ok (session != NULL, "WinHttpOpen failed to open session.\n"); > + > + /* Test with a bad server name */ > + SetLastError (0xdeadbeef); > + connection = pWinHttpConnect (session, NULL, INTERNET_DEFAULT_HTTP_PORT, 0); > + ok (connection == NULL, "WinHttpConnect succeeded in opening connection to NULL server argument.\n"); > + todo_wine ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); > + > + /* Test with a valid server name */ > + connection = pWinHttpConnect (session, test_server, INTERNET_DEFAULT_HTTP_PORT, 0); > + todo_wine ok (connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); > + > + request = pWinHttpOpenRequest (connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); > + if (request == NULL && GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED) > + { > + skip("Network unreachable, skipping.\n"); > + goto done; > + } > + todo_wine ok (request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); > + > + ret = pWinHttpSendRequest (request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); > + todo_wine > + { > + ok (ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); > + ok (WinHttpCloseHandle (request), "WinHttpCloseHandle failed on closing request.\n"); > + } > + > + done: > + todo_wine > + { > + ok (WinHttpCloseHandle (connection), "WinHttpCloseHandle failed on closing connection.\n"); > + ok (WinHttpCloseHandle (session), "WinHttpCloseHandle failed on closing session.\n"); > + } > +} > + > +START_TEST (winhttp) > +{ > + HMODULE hmod = LoadLibraryA ("winhttp.dll"); > + > + pWinHttpOpen = (void *) GetProcAddress (hmod, "WinHttpOpen"); > + pWinHttpConnect = (void *) GetProcAddress (hmod, "WinHttpConnect"); > + pWinHttpOpenRequest = (void *) GetProcAddress (hmod, "WinHttpOpenRequest"); > + pWinHttpSendRequest = (void *) GetProcAddress (hmod, "WinHttpSendRequest"); > + pWinHttpCloseHandle = (void *) GetProcAddress (hmod, "WinHttpCloseHandle"); > + > + test_OpenRequest(); > +} > > > ------------------------------------------------------------------------ > > As a note this passes on Win XP as well as Win 2003.

2 1

Installing Wine's fonts system-wide: which ones are worthwhile?
by Scott Ritchie 12 Jul '08

12 Jul '08

After being partially inspired by Ubuntu brainstorm, it occurred to me that some of our fonts would be useful everywhere, but the current Wine package keeps its fonts to itself. Tahoma, for instance, could be useful if someone tries to open a Word document in Open Office. The solution varies across distributions, however in Ubuntu and Debian's case it means naming the fonts specifically and creating a hints file. So, which ones should be installed this way? Thanks, Scott Ritchie

3 3

Question about crosstest build
by Nikolay Sivov 12 Jul '08

12 Jul '08

Hi. Could someone explain me in details how could I build crosstest binaries on Linux (Debian) to run them on WinXP? Now I've done the following: - clean up my wine tree with 'make clean'; - installed mingw32 package - use configure parameters from http://wiki.winehq.org/CompilingDLLsUsingMingw - use 'make crosstest' from tree top. After building wine tools I've got: make[1]: Entering directory `/home/mrlarch/wine/dlls' make[2]: Entering directory `/home/mrlarch/wine/dlls/d3dx9_36' ../../tools/winebuild/winebuild -w --def -o d3dx9_36.def --export ./d3dx9_36.spec false -k -l libd3dx9.a -d d3dx9_36.def make[2]: *** [libd3dx9.a] Error 1 make[2]: Leaving directory `/home/mrlarch/wine/dlls/d3dx9_36' make[1]: *** [d3dx9_36/libd3dx9.a] Error 2 make[1]: Leaving directory `/home/mrlarch/wine/dlls' make: *** [dlls/__crosstest__] Error 2 What should I do with that?

2 2

Re: failing gdiplus:matrix tests
by James Hawkins 12 Jul '08

12 Jul '08

On Sat, Jul 12, 2008 at 1:58 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > James Hawkins wrote: >> >> Hi Nikolay, >> >> Tests you added in the following commit fail on all platforms. Did >> you run the tests in Windows? >> >> commit d7999a008be5d7e95fcd86019adc79b0359ae8d4 >> Author: Nikolay Sivov <bunglehead(a)gmail.com> >> Date: Tue Jul 8 01:32:36 2008 +0400 >> >> gdiplus: GdipInvertMatrix implementation with tests. >> > > No, I never tried to run the test binary on Windows. I always try get test > results > trough my own test application and use these results in Wine test. > Of course I will fix this, could you explain how to build tests on Windows? > I never did such thing. > http://wiki.winehq.org/CompilingDLLsUsingMingw 'make crosstest' works if you have a patched mingw. You can get the patches at: http://www.astro.gla.ac.uk/users/paulm/Cross/ If you end up not being able to build the tests, ask someone on wine-devel to build them for you. -- James Hawkins

3 5

[winehq] broken link
by Stefan Leichter 12 Jul '08

12 Jul '08

Hi, when i click on the "Development" link in the "Development" section i get an 404 error. Can someone please fix this. Thanks Stefan

2 1

Re: failing gdiplus:matrix tests
by James Hawkins 12 Jul '08

12 Jul '08

On Sat, Jul 12, 2008 at 1:58 AM, Nikolay Sivov <bunglehead(a)gmail.com> wrote: > James Hawkins wrote: >> >> Hi Nikolay, >> >> Tests you added in the following commit fail on all platforms. Did >> you run the tests in Windows? >> >> commit d7999a008be5d7e95fcd86019adc79b0359ae8d4 >> Author: Nikolay Sivov <bunglehead(a)gmail.com> >> Date: Tue Jul 8 01:32:36 2008 +0400 >> >> gdiplus: GdipInvertMatrix implementation with tests. >> > > No, I never tried to run the test binary on Windows. I always try get test > results > trough my own test application and use these results in Wine test. > Of course I will fix this, could you explain how to build tests on Windows? > I never did such thing. > http://wiki.winehq.org/CompilingDLLsUsingMingw 'make crosstest' works if you have a patched mingw. You can get the patches at: http://www.astro.gla.ac.uk/users/paulm/Cross/ If you end up not being able to build the tests, ask someone on wine-devel to build them for you. -- James Hawkins

1 0

Re: riched20: Added windowless text services tests (resent)
by Austin Lund 12 Jul '08

12 Jul '08

I haven't heard anything about this patch. I know it is large, but the function headers and wrappers are necessary. Is there anything in particular wrong with it? Is there anything that could make it more obviously correct? 2008/7/7 Austin Lund <austin.lund(a)gmail.com>: > Changes from previously sent patch: > > Removed typeof() from DEFINE_THISCALL_WRAPPER. > Simplified the ITextHost QueryInterface function. > Removed code that allocated memory for the IUnknown interface. >

1 0

failing gdiplus:pathiterator tests
by James Hawkins 12 Jul '08

12 Jul '08

Hi Nikolay, Tests you added in the following two commits fail on all platforms. Did you run the tests in Windows? Please do not send any more test patches before testing on Windows first. commit d93ad02216d28851b2be07d8ee89671a7354761f Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 3 10:42:13 2008 +0400 gdiplus: Construction/desctruction tests for PathIterator. commit 0a9937c534823df161f0b911dd410a508ea4a148 Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Jul 5 13:02:36 2008 +0400 gdiplus: GdipPathIterNextMarker implementation with tests. -- James Hawkins

1 0

failing gdiplus:matrix tests
by James Hawkins 12 Jul '08

12 Jul '08

Hi Nikolay, Tests you added in the following commit fail on all platforms. Did you run the tests in Windows? commit d7999a008be5d7e95fcd86019adc79b0359ae8d4 Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 8 01:32:36 2008 +0400 gdiplus: GdipInvertMatrix implementation with tests. -- James Hawkins

1 0

failing gdiplus:font tests
by James Hawkins 12 Jul '08

12 Jul '08

Hi Adam, Tests you added in the following commit rely on the Arial font being installed, which is not necessarily the case. You can check out [1] for the test output of a system that does not have the Arial font. You should either test a font that is guaranteed to be installed (Tahoma?) or use some API to enumerate the available fonts and test one of those. commit fe3d38d1a0e19e503048f8338f8f26cd0668d364 Author: Adam Petaccia <adam(a)tpetaccia.com> Date: Sat Jun 21 13:02:56 2008 -0400 gdiplus: Tests for new font functions. [1] http://test.winehq.org/data/8fd6f0e26ae28f2ba4938e2fbcc4851f47baa53c/wine_x… Thanks, James Hawkins

1 0

Re: [2/3] appwiz.cpl: Read uninstallable applications from registry, add to list.
by Nikolay Sivov 11 Jul '08

11 Jul '08

Owen Rudge wrote: + while (iter) + { + if (iter->title) + HeapFree(hHeap, 0, iter->title); + + if (iter->path) + HeapFree(hHeap, 0, iter->path); + + if (iter->icon) + HeapFree(hHeap, 0, iter->icon); + + if (iter->publisher) + HeapFree(hHeap, 0, iter->icon); + + if (iter->version) + HeapFree(hHeap, 0, iter->icon); + + next = iter->next; + HeapFree(hHeap, 0, iter); + iter = next; + } Seems to be a copy-paste

2 1

Re: [dplayx 02/29] Tests for DirectPlayCreate
by Michael Karcher 11 Jul '08

11 Jul '08

Hello Ismael, reviewing this patch shows some issues. > +#define _okHR(expected, result) \ > + ok( (expected) == (result), \ > + "expected=%d(%s) got=%d(%s)\n", \ > + HRESULT_CODE(expected), dpResult2str(expected), \ > + HRESULT_CODE(result), dpResult2str(result) ); I dislike the order of the parameters and the name. You would write ok( hr == DP_OK, "Something failed with %x\n", hr); In this line, "hr" is before "DP_OK". So as an analogy, I also want to write _okHR( hr, DD_OK ); Why do you start the macro name with an underscore? And last but not least: As I see it, a static inline would do the job too, and is always preferrable to macros. > + heap = HeapCreate( 0, 0, 0 ); Do you have any reason to create your own heap? Each windows process already comes equipped with a standard heap you can obtain using the API function GetProcessHeap, so this line: > + IUnknown* pUnk = HeapAlloc( heap, 0, sizeof(LPDWORD) ); would then look like: + IUnknown* pUnk = HeapAlloc( GetProcessHeap(), 0, sizeof(LPDWORD) ); Another point is that this line is totally wrong anyway. An IUnknown* is a pointer to an COM object, which starts with a vtable pointer. You let pUnk point to uninitialized memory. While it doesn't matter in this case (as DirectPlayCreate will never access what the pointer points to), it is really bad style. I understand the intention to test that aggregation is not supported for DirectPlay, but you still should keep the contract of the creation function that pUnk either is NULL or points to a valid COM object. A basic COM object is just a pointer to a vtable that contains a QueryInterface method that returns "this" for IUnknown and fails in every other case, an AddRef method that returns 2 and does nothing, and a Release method that returns 1 and does nothing else. > + /* pUnk==NULL, pDP!=NULL */ > + hr = DirectPlayCreate( NULL, &pDP, NULL ); > + _okHR( DPERR_INVALIDPARAMS, hr ); > + hr = DirectPlayCreate( (LPGUID) &_GUID_NULL, &pDP, NULL ); > + _okHR( DP_OK, hr ); > + hr = DirectPlayCreate( (LPGUID) &DPSPGUID_TCPIP, &pDP, NULL ); > + todo_wine _okHR( DP_OK, hr ); Here you are leaking DirectPlay objects. If DirectPlayCreate worked, you have to release the object before you overwrite pDP (by passing it to DirectPlayCreate again) using IDirectPlay_Release(pDP). Regards, Michael Karcher

5 9

Re: extending setupapi
by Juan Lang 11 Jul '08

11 Jul '08

Hi Pieter, overall your patch looks good, but it has some minor errors that get in the way: - struct DeviceInfo *devInfo = SETUPDI_AllocateDeviceInfo(set, set->cDevices, - instanceId, phantom); + struct DeviceInfo *devInfo; TRACE("%p, %s, %d, %s, %d\n", set, debugstr_guid(guid), devInst, debugstr_w(instanceId), phantom); + devInfo = SETUPDI_AllocateDeviceInfo(set, set->cDevices, + instanceId, phantom); + This change is unrelated to the function you're implementing, please send it in a separate patch if you want this change to go in. + TRACE("%s, %s, %p, %08x, %p, %s, %p\n", debugstr_guid(class), + debugstr_a(enumstr), parent, flags, deviceset, + debugstr_a(machine), reserved); + Same here.. - HKEY interfacesKey = SetupDiOpenClassRegKeyExW(interface, KEY_READ, - DIOCR_INTERFACE, NULL, NULL); + HKEY interfacesKey; TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(interface), debugstr_w(enumstr), flags); + interfacesKey = SetupDiOpenClassRegKeyExW(interface, KEY_READ, + DIOCR_INTERFACE, NULL, NULL); + and here.. @@ -3549,6 +3558,10 @@ HKEY WINAPI SetupDiOpenClassRegKeyExW( LPCWSTR lpKeyName; LONG l; + TRACE("%s, %08x, %08x, %s, %p\n", debugstr_guid(ClassGuid), + samDesired, Flags, + debugstr_w(MachineName), Reserved); + and here. +@ stdcall SetupDiOpenDeviceInterfaceRegKey(ptr ptr long long) @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) -@ stub SetupDiOpenDeviceInterfaceRegKey In general we alphabetize function names in spec files, so please don't change the order. Thanks for your help with Wine. --Juan

1 0

Re: quartz: Fix incorrect use of mtCurrent in transform filter
by Alexandre Julliard 11 Jul '08

11 Jul '08

"Maarten Lankhorst" <m.b.lankhorst(a)gmail.com> writes: > --- > mtCurrent is cleared when connecting, so this may cause weird bugs > during connection. This doesn't work: ../../../tools/runtest -q -P wine -M qedit.dll -T ../../.. -p qedit_test.exe.so mediadet.c && touch mediadet.ok err:quartz:OutputPin_Connect cbFormat: 0 pin.c:943: OutputPin_Connect: Assertion `pmtCandidate->pbFormat' failed. wine: Assertion failed at address 0x601b0b87 (thread 0009), starting debugger... Unhandled exception: assertion failed in 32-bit code (0x601b0b87). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:601b0b87 ESP:0032fa50 EBP:0032fa58 EFLAGS:00000206( - 00 - -IP1) EAX:00000000 EBX:00001acf ECX:00001acf EDX:00000006 ESI:0032faf8 EDI:602c8ff4 Stack dump: 0x0032fa50: 602c8ff4 602d19f0 0032fb84 601b2281 0x0032fa60: 00000006 0032faf8 00000000 7d57b460 0x0032fa70: 00000068 7d57b468 0032fa9c 601ede11 0x0032fa80: 0032fabc 7d57b468 7d57b4cc 0032fb94 0x0032fa90: 602c8ff4 0000004a 7d57b468 0032fb68 0x0032faa0: 601e7c7b 7d57b468 0000004a 0032fbac Backtrace: =>1 0x601b0b87 gsignal+0x3f() in libc.so.6 (0x0032fa58) 2 0x601b2281 abort+0x101() in libc.so.6 (0x0032fb84) 3 0x601a9ed4 __assert_fail+0xf0() in libc.so.6 (0x0032fbc8) 4 0x60d7af84 OutputPin_Connect+0x184(iface=0x12f510, pReceivePin=0x12fe50, pmt=0x0) [/home/julliard/wine/wine/dlls/quartz/pin.c:965] in quartz (0x0032fc28) 5 0x60d2a52a MediaDet_put_Filename+0x5aa(iface=<register ESI not in topmost frame>, newVal=0x122834) [/home/julliard/wine/wine/dlls/qedit/mediadet.c:416] in qedit (0x0032fd58) 6 0x6053f375 func_mediadet+0x4d5() [/home/julliard/wine/wine/dlls/qedit/tests/mediadet.c:150] in qedit_test (0x0032fe68) 7 0x60540280 run_test+0x130(name=0x1103ee) [/home/julliard/wine/wine/dlls/qedit/tests/../../../include/wine/test.h:454] in qedit_test (0x0032fea8) 8 0x60540483 main+0x133(argc=<register ECX not in topmost frame>, argv=<register ECX not in topmost frame>) [/home/julliard/wine/wine/dlls/qedit/tests/../../../include/wine/test.h:502] in qedit_test (0x0032fed8) 9 0x60540c38 __wine_spec_exe_entry+0x88(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in qedit_test (0x0032ff08) 10 0x7b87ade8 start_process+0x98(arg=0x0) [/home/julliard/wine/wine/dlls/kernel32/process.c:904] in kernel32 (0x0032ffe8) 11 0x60028b47 wine_switch_to_stack+0x17() in libwine.so.1 (0x00000000) -- Alexandre Julliard julliard(a)winehq.org

1 0

New winetricks 20080710: new verb ogg, fixes for firefox and divx. Schroedinger support!
by Dan Kegel 11 Jul '08

11 Jul '08

Another week, another winetricks. The big news is that Maarten now has a good directshow filter for the Schroedinger codec, and that it runs on Wine finally. To see it in action, do rm winetricks wget http://kegel.com/wine/winetricks wget http://kegel.com/wine/codecdemo bash codecdemo then choose the options to install ogg and xvid; then choose the option to play the example ogg dirac file Acadiane.ogg. It should work (with some artifacts). This is big news because Schroedinger is potentially a good enough, free enough codec to achieve world domination one of these days (once all the bugs are worked out). It's also big news because now I owe Maarten a beer. Online as always at http://kegel.com/wine/winetricks or http://winezeug.googlecode.com Changes since July 4th's wine-devel annoucement: r101 Added Schroedinger directshow filter (w00t!) r100 Add ogg codec to winetricks and codecdemo r99 add missing quotes on backtick; should fix problem reported by Philippe Roubach? r98 Updated divx r97 Fixed URL for firefox3 (thanks Shing-Shong Shei), Fixed silent install for firefox3 Added firefox synonym for firefox3

1 0

New winetricks 20080710: new verb ogg, fixes for firefox and divx.
by Dan Kegel 11 Jul '08

11 Jul '08

Another week, another winetricks. The big news is that Maarten now has a good directshow filter for the Schroedinger codec, and that it runs on Wine finally. To see it in action, do rm winetricks wget http://kegel.com/wine/winetricks wget http://kegel.com/wine/codecdemo bash codecdemo then choose the options to install ogg and xvid; then choose the option to play the example ogg dirac file Acadiane.ogg. It should work (with some artifacts). This is big news because Schroedinger is potentially a good enough, free enough codec to achieve world domination one of these days (once all the bugs are worked out). Online as always at http://kegel.com/wine/winetricks or http://winezeug.googlecode.com Changes since July 4th's wine-devel annoucement: r101 Added Schroedinger directshow filter (w00t!) r100 Add ogg codec to winetricks and codecdemo r99 add missing quotes on backtick; should fix problem reported by Philippe Roubach? r98 Updated divx r97 Fixed URL for firefox3 (thanks Shing-Shong Shei), Fixed silent install for firefox3 Added firefox synonym for firefox3

1 0

What's the holdup with RegisterHotKey and UnregisterHotKey??
by James Keane 11 Jul '08

11 Jul '08

Hey everyone! Just wanted to bring to your attention http://bugs.winehq.org/show_bug.cgi?id=1348 again, and ask what is the holdup? As far as I can see it appears a solution and working patch has been posted. I am interested in getting this into the main tree and wondering what kind of modifications have to be made to the patch supplied to make it happen. ------- Comment #8 From Robert Reif 2007-02-17 15:45:56 ------- The reason I was given by Alexandre is that the functionality should be moved into the server. Why is it not possible to accept this patch and then start working on moving it into the server? With a quick look the only changes from the patch and the git, is the change from dll/user to dll/user32. Cheers! James

3 5

Re: winhttp: main.c: Add stub implementation for WinHttpGetDefaultProxyConfiguration
by Zac Brown 11 Jul '08

11 Jul '08

Zac Brown wrote: > Add stub implementation for WinHttpGetDefaultProxyConfiguration > > Ignore this, formatting is wrong.

1 0

re: gdiplus: Test for CharacterRange.
by Dan Kegel 11 Jul '08

11 Jul '08

Hi Adam, http://source.winehq.org/git/wine.git/?a=commit;h=2f7bb7c5385c86dced1c7e1d1… seems to trigger a valgrind warning in your test code. http://kegel.com/wine/valgrind/logs-2008-07-10-07.15/vg-gdiplus_stringforma… + Conditional jump or move depends on uninitialised value(s) + at winetest_vok (test.h:259) + by winetest_ok (test.h:304) + by test_characterrange (stringformat.c:67) + by func_stringformat (stringformat.c:87) + by run_test (test.h:452) + by main (test.h:501) + Uninitialised value was created by a stack allocation + at test_characterrange (stringformat.c:53) Could you have a look? Thanks, Dan

1 0

Re: msxml3/tests: Added more tests to ISAXXMLReader_putContentHandler and ISAXXMLReader_getContentHandler, added todo test for ISAXXMLReader_parse
by Alistair Leslie-Hughes 10 Jul '08

10 Jul '08

Piotr Caban wrote: > --- > + hr = ISAXXMLReader_getContentHandler(reader, &lpContentHandler); Hi Piotr, You might want to add the test. hr = ISAXXMLReader_getContentHandler(reader, NULL); Best Regards Alistair Leslie-Hughes

2 1

Re: winhttp: tests/winhttp.c[new]: Add test for WinHttpOpenRequest
by Zac Brown 10 Jul '08

10 Jul '08

Zac Brown wrote: > Add test for WinHttpOpenRequest. This test is modeled after > wininet/tests/http.c's InternetOpenRequest_test function. > > This is the first of many tests for getting Bug 14381 > (http://bugs.winehq.org/show_bug.cgi?id=14381) fixed with regard to > WinHTTP. > > > ------------------------------------------------------------------------ > > --- > Makefile.in | 2 + > configure | 3 + > dlls/Makefile.in | 1 + > dlls/winhttp/tests/Makefile.in | 13 +++++ > dlls/winhttp/tests/winhttp.c | 105 ++++++++++++++++++++++++++++++++++++++++ > 5 files changed, 124 insertions(+), 0 deletions(-) > create mode 100644 dlls/winhttp/tests/Makefile.in > create mode 100644 dlls/winhttp/tests/winhttp.c > > diff --git a/Makefile.in b/Makefile.in > index 1b35079..6a56e44 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -495,6 +495,7 @@ ALL_MAKEFILES = \ > dlls/winex11.drv/Makefile \ > dlls/wing32/Makefile \ > dlls/winhttp/Makefile \ > + dlls/winhttp/tests/Makefile \ > dlls/wininet/Makefile \ > dlls/wininet/tests/Makefile \ > dlls/winmm/Makefile \ > @@ -924,6 +925,7 @@ dlls/winequartz.drv/Makefile: dlls/winequartz.drv/Makefile.in dlls/Makedll.rules > dlls/winex11.drv/Makefile: dlls/winex11.drv/Makefile.in dlls/Makedll.rules > dlls/wing32/Makefile: dlls/wing32/Makefile.in dlls/Makedll.rules > dlls/winhttp/Makefile: dlls/winhttp/Makefile.in dlls/Makedll.rules > +dlls/winhttp/tests/Makefile: dlls/winhttp/tests/Makefile.in dlls/Maketest.rules > dlls/wininet/Makefile: dlls/wininet/Makefile.in dlls/Makedll.rules > dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules > dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules > diff --git a/configure b/configure > index d9f9b65..a276261 100755 > --- a/configure > +++ b/configure > @@ -22416,6 +22416,8 @@ ac_config_files="$ac_config_files dlls/wing32/Makefile" > > ac_config_files="$ac_config_files dlls/winhttp/Makefile" > > +ac_config_files="$ac_config_files dlls/winhttp/tests/Makefile" > + > ac_config_files="$ac_config_files dlls/wininet/Makefile" > > ac_config_files="$ac_config_files dlls/wininet/tests/Makefile" > @@ -23481,6 +23483,7 @@ do > "dlls/winex11.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winex11.drv/Makefile" ;; > "dlls/wing32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wing32/Makefile" ;; > "dlls/winhttp/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/Makefile" ;; > + "dlls/winhttp/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winhttp/tests/Makefile" ;; > "dlls/wininet/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/Makefile" ;; > "dlls/wininet/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wininet/tests/Makefile" ;; > "dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; > diff --git a/dlls/Makefile.in b/dlls/Makefile.in > index d130f35..1a77dc0 100644 > --- a/dlls/Makefile.in > +++ b/dlls/Makefile.in > @@ -362,6 +362,7 @@ TESTSUBDIRS = \ > usp10/tests \ > uxtheme/tests \ > version/tests \ > + winhttp/tests \ > wininet/tests \ > winmm/tests \ > winspool.drv/tests \ > diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in > new file mode 100644 > index 0000000..3f35e08 > --- /dev/null > +++ b/dlls/winhttp/tests/Makefile.in > @@ -0,0 +1,13 @@ > +TOPSRCDIR = @top_srcdir@ > +TOPOBJDIR = ../../.. > +SRCDIR = @srcdir@ > +VPATH = @srcdir@ > +TESTDLL = winhttp.dll > +IMPORTS = winhttp ws2_32 kernel32 > + > +CTESTS = \ > + winhttp.c > + > +@MAKE_TEST_RULES@ > + > +@DEPENDENCIES@ # everything below this line is overwritten by make depend > diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c > new file mode 100644 > index 0000000..afc9d97 > --- /dev/null > +++ b/dlls/winhttp/tests/winhttp.c > @@ -0,0 +1,105 @@ > +/* > + * WinHTTP - tests > + * > + * Copyright 2008 Google (Zac Brown) > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA > + * 02110-1301, USA > + */ > + > +#define COBJMACROS > + > +#include <stdarg.h> > +#include <stdio.h> > +#include <stdlib.h> > + > +#include <windef.h> > +#include <winbase.h> > +#include <winhttp.h> > + > +#include "wine/test.h" > + > +/* Function pointer declarations for functions being used */ > +static HINTERNET (WINAPI *pWinHttpOpen) (LPCWSTR pwszUserAgent, DWORD dwAccessType, > + LPCWSTR pwszProxyName, LPCWSTR pwszProxyBypass, DWORD dwFlags); > +static HINTERNET (WINAPI *pWinHttpConnect) (HINTERNET hSession, LPCWSTR pwszServerName, > + INTERNET_PORT nServerPort, DWORD dwReserved); > +static HINTERNET (WINAPI *pWinHttpOpenRequest) (HINTERNET hConnect, LPCWSTR pwszVerb, > + LPCWSTR pwszObjectName, LPCWSTR pwszVersion, LPCWSTR pwszReferrer, > + LPCWSTR* ppwszAcceptTypes, DWORD dwFlags); > +static BOOL (WINAPI *pWinHttpSendRequest) (HINTERNET hRequest, LPCWSTR pwszHeaders, > + DWORD dwHeadersLength, LPVOID lpOptional, DWORD dwOptionalLength, > + DWORD dwTotalLength, DWORD_PTR dwContext); > +static BOOL (WINAPI *pWinHttpCloseHandle) (HINTERNET hInternet); > + > +static const WCHAR test_useragent[] = {'W','i','n','e',' ','R','e','g','r','e','s','s','i','o','n',' ','T','e','s','t',0}; > +static const WCHAR test_server[] = {'w','i','n','e','h','q','.','o','r','g',0}; > + > +/* BEGIN TESTS */ > + > +static void test_OpenRequest (void) > +{ > + BOOL ret; > + HINTERNET session, request, connection; > + session = request = connection = NULL; > + > + session = pWinHttpOpen (test_useragent, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); > + todo_wine ok (session != NULL, "WinHttpOpen failed to open session.\n"); > + > + /* Test with a bad server name */ > + SetLastError (0xdeadbeef); > + connection = pWinHttpConnect (session, NULL, INTERNET_DEFAULT_HTTP_PORT, 0); > + ok (connection == NULL, "WinHttpConnect succeeded in opening connection to NULL server argument.\n"); > + todo_wine ok (GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %u.\n", GetLastError()); > + > + /* Test with a valid server name */ > + connection = pWinHttpConnect (session, test_server, INTERNET_DEFAULT_HTTP_PORT, 0); > + todo_wine ok (connection != NULL, "WinHttpConnect failed to open a connection, error: %u.\n", GetLastError()); > + > + request = pWinHttpOpenRequest (connection, NULL, NULL, NULL, WINHTTP_NO_REFERER, WINHTTP_DEFAULT_ACCEPT_TYPES, 0); > + if (request == NULL && GetLastError() == ERROR_WINHTTP_NAME_NOT_RESOLVED) > + { > + skip("Network unreachable, skipping.\n"); > + goto done; > + } > + todo_wine ok (request != NULL, "WinHttpOpenrequest failed to open a request, error: %u.\n", GetLastError()); > + > + ret = pWinHttpSendRequest (request, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); > + todo_wine > + { > + ok (ret == TRUE, "WinHttpSendRequest failed: %u\n", GetLastError()); > + ok (WinHttpCloseHandle (request), "WinHttpCloseHandle failed on closing request.\n"); > + } > + > + done: > + todo_wine > + { > + ok (WinHttpCloseHandle (connection), "WinHttpCloseHandle failed on closing connection.\n"); > + ok (WinHttpCloseHandle (session), "WinHttpCloseHandle failed on closing session.\n"); > + } > +} > + > +START_TEST (winhttp) > +{ > + HMODULE hmod = LoadLibraryA ("winhttp.dll"); > + > + pWinHttpOpen = (void *) GetProcAddress (hmod, "WinHttpOpen"); > + pWinHttpConnect = (void *) GetProcAddress (hmod, "WinHttpConnect"); > + pWinHttpOpenRequest = (void *) GetProcAddress (hmod, "WinHttpOpenRequest"); > + pWinHttpSendRequest = (void *) GetProcAddress (hmod, "WinHttpSendRequest"); > + pWinHttpCloseHandle = (void *) GetProcAddress (hmod, "WinHttpCloseHandle"); > + > + test_OpenRequest(); > +} > > > ------------------------------------------------------------------------ > > Ignore this patch, comments from James warrant a revision.

1 0

Re: winhttp: main.c: Add stub implementation for WinHttpGetDefaultProxyConfiguration
by James Hawkins 10 Jul '08

10 Jul '08

On Thu, Jul 10, 2008 at 4:58 PM, Zac Brown <zac(a)zacbrown.org> wrote: > Add stub implementation for WinHttpGetDefaultProxyConfiguration > +BOOL WINAPI WinHttpGetDefaultProxyConfiguration (WINHTTP_PROXY_INFO* pProxyInfo) +{ + FIXME("(%p): stub\n", pProxyInfo); + + SetLastError(ERROR_NOT_SUPPORTED); + return FALSE; +} You need to be consistent with the style of the rest of the file (no space after function names before opening parenthesis). -- James Hawkins

1 0

Re: msxml3: oldChild in xmlnode_removeChild may be NULL
by Alistair Leslie-Hughes 10 Jul '08

10 Jul '08

Piotr Caban wrote: > --- > IXMLDOMNode_Release(child); > IXMLDOMNode_AddRef(childNode); >- *oldChild = childNode; >+ >+ if(oldChild) >+ *oldChild = childNode; >return S_OK; > Hi Piotr, Your leaking childNode, it should be destroyed in this case. Best Regards Alistair Leslie-Hughes

1 0

Re: Fallback from RPC_C_AUTHN_GSS_NEGOTIATE to RPC_C_AUTHN_WINNT if no SPNEGO package available
by Rob Shearman 10 Jul '08

10 Jul '08

2008/7/1 Stefan Kuhr <winesku(a)googlemail.com>: > Hello everyone, Hi Stefan, Thank you for your contribution. > please find attached a patch for Bug #14222 (which I just submitted to > bugzilla). I think that this patch is not a hack, because even if > someday a Negotiate package is available in WINE, this code won't > break the Negotiate package. That may be so, but it won't work for servers that only register the RPC_C_AUTHN_GSS_NEGOTIATE authentication scheme. So the patch should include a FIXME to warn users about this. Otherwise, the patch is fine. > Oh, and there was no rpcrt4 component to > be selected for this bug in bugzilla, you might consider to add one. Currently, we are using the "ole" component for RPC bugs, including rpcrt4 and widl, but I agree that this isn't clear. I think we should probably split the ole component up into rpc (which would be a container for rpcrt4 & widl issues), ole32 and oleaut32. > Please let me know if I did something obvious wrong since this is the > first time I submit a patch to WINE. -- Rob Shearman

2 4

Re: [PATCH 2/2] user32: Set WM_NOSIZE for windows smaller than SM_CXMINTRACK/SM_CYMINTRACK.
by Alexandre Julliard 10 Jul '08

10 Jul '08

"Lei Zhang" <thestig(a)google.com> writes: > I added more tests for this and also looked at the trace log from the > tests. My last patch was definitely wrong because it prevents the > window/client size from changing, whereas they do change on Windows. I > check for this in the tests now. > > I looked at the content of the WM_WINDOWPOSCHANGED messages, and I > noticed SWP_NOCLIENTSIZE was set for the cases where the window is too > small. So SWP_DoNCCalcSize seems like the right place to check for > this, and not clear SWP_NOCLIENTSIZE. You are still on the wrong track, you shouldn't mess with the SWP_* flags at all. What you have to do is figure out where the size limits should be enforced on the window; once you fix this, SetWindowPos will automatically get the right flags because the size will be clamped to the limit. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: regedit: Implement deleting multiple values (resend)
by John Klehm 10 Jul '08

10 Jul '08

On Thu, Jul 10, 2008 at 8:20 AM, Andre Wisplinghoff <andre.wisplinghoff(a)gmail.com> wrote: > Changelog: > Regedit: Implement deleting multiple values > > Changes from first send as suggested @ wine-devel: > - Use standard MessageBox instead of making the messagebox function from > edit.c non-static > - Real name in patch, no HTML Mail > Hello Andre, I would wait till tomorrow to see if AJ's scripts pick up your patch but usually a good indicator of how it came through the system can be seen by checking pipermail. http://www.winehq.org/pipermail/wine-patches/2008-July/057590.html is your latest resend. Clicking on the url at the bottom for the attachment yields a blank screen for me. This could be a sign that somehow the scripts on the backend of the mail server lost your patch due to encoding or how you attached it. Unfortunately I don't know which or exactly what the fix is so you might have to experiment. So you might have to ask on the list again and point out that piper mail didn't pick it up. The strange thing is your patch shows up in gmail inlined in the message just fine for me, which is why I suggest to wait and see if AJ's scripts can also pick it up. Best of luck, John

1 0

New winetricks 20080704: added firefox3, kde verbs (and a whole lot of other stuff)
by Dan Kegel 10 Jul '08

10 Jul '08

Another week, another winetricks. Online as always at http://kegel.com/wine/winetricks or http://winezeug.googlecode.com Changes since May 23's wine-devel annoucement: ------------------------------------------------------------------------ r95 | daniel.r.kegel | 2008-07-04 07:46:03 -0700 (Fri, 04 Jul 2008) | 2 lines Added firefox3, kde ------------------------------------------------------------------------ r94 | daniel.r.kegel | 2008-06-27 11:29:19 -0700 (Fri, 27 Jun 2008) | 2 lines Simpler recipe for msls31, thanks to Steven Edwards. ------------------------------------------------------------------------ r93 | daniel.r.kegel | 2008-06-27 11:28:05 -0700 (Fri, 27 Jun 2008) | 2 lines Don't use obsolete command wineprefixcreate. ------------------------------------------------------------------------ r92 | daniel.r.kegel | 2008-06-27 04:41:49 -0700 (Fri, 27 Jun 2008) | 4 lines Grr. Looks like I never fixed the problem reported in http://www.winehq.org/pipermail/wine-users/2008-May/033957.html Fixed now; sets win2k while installing vcrun2005. ------------------------------------------------------------------------ r90 | daniel.r.kegel | 2008-06-22 03:56:48 -0700 (Sun, 22 Jun 2008) | 2 lines Update version. ------------------------------------------------------------------------ r89 | daniel.r.kegel | 2008-06-22 03:54:49 -0700 (Sun, 22 Jun 2008) | 7 lines Added visual j# 2.0 runtime, thanks to http://howto.landure.fr/gnu-linux/install-directx-9-0c-on-linux-using-wine for pointing out it is needed by Supreme Commander Fixed DirectX9 install, thanks to Ahmed for the patch ------------------------------------------------------------------------ r88 | daniel.r.kegel | 2008-06-22 03:15:27 -0700 (Sun, 22 Jun 2008) | 2 lines Hmm, the divx codec download location changed a bit? ------------------------------------------------------------------------ r75 | daniel.r.kegel | 2008-06-14 10:52:00 -0700 (Sat, 14 Jun 2008) | 2 lines Don't forget to register the ocx's ------------------------------------------------------------------------ r74 | daniel.r.kegel | 2008-06-14 10:39:34 -0700 (Sat, 14 Jun 2008) | 2 lines Updated version number ------------------------------------------------------------------------ r73 | daniel.r.kegel | 2008-06-14 10:39:07 -0700 (Sat, 14 Jun 2008) | 5 lines Use "MS" uniformly in front of choices that are Microsoft downloads. Add comctl32.ocx ------------------------------------------------------------------------ r72 | daniel.r.kegel | 2008-06-14 10:17:37 -0700 (Sat, 14 Jun 2008) | 2 lines Added autohotkey ------------------------------------------------------------------------ r71 | daniel.r.kegel | 2008-06-14 10:15:55 -0700 (Sat, 14 Jun 2008) | 2 lines Cosmetic changes to menu: make 1st column wider, make gui window wide enough ------------------------------------------------------------------------ r69 | austinenglish | 2008-06-09 08:59:44 -0700 (Mon, 09 Jun 2008) | 2 lines Restore winversion on dotnet20 ------------------------------------------------------------------------ r61 | daniel.r.kegel | 2008-05-29 11:51:46 -0700 (Thu, 29 May 2008) | 2 lines Add dirac 0.8 directshow filter, even though it's obsolete ------------------------------------------------------------------------ r60 | daniel.r.kegel | 2008-05-28 05:15:44 -0700 (Wed, 28 May 2008) | 3 lines Added divx verb to winetricks. Switched codecdemo to interactive, added sample files from jhepple.com ------------------------------------------------------------------------ r58 | daniel.r.kegel | 2008-05-27 18:06:46 -0700 (Tue, 27 May 2008) | 2 lines Add mpc (as a showcase for installed codecs) ------------------------------------------------------------------------ r57 | daniel.r.kegel | 2008-05-27 17:05:25 -0700 (Tue, 27 May 2008) | 2 lines Added vlc ------------------------------------------------------------------------ r56 | daniel.r.kegel | 2008-05-27 16:03:20 -0700 (Tue, 27 May 2008) | 2 lines Add gdiplus for quicktime ------------------------------------------------------------------------ r55 | daniel.r.kegel | 2008-05-27 15:49:17 -0700 (Tue, 27 May 2008) | 2 lines Echo what's going on in wmp10 (since we can't use try) ------------------------------------------------------------------------ r54 | daniel.r.kegel | 2008-05-27 13:55:30 -0700 (Tue, 27 May 2008) | 2 lines Added quicktime72 ------------------------------------------------------------------------ r53 | daniel.r.kegel | 2008-05-23 14:30:12 -0700 (Fri, 23 May 2008) | 3 lines Fix bug which broke multiple selections in gui. Thanks to Chad Sikorra for the bug report.

7 9

Feedback for "Regedit: Implement deleting multiple values"
by Andre Wisplinghoff 10 Jul '08

10 Jul '08

Hallo, thanks for your help. I just resend my patch, with these issues considered. The standard MessageBox function is now used. The localized message is read in framewnd.c and errors treated the same way as it was with the messagebox function in edit.c. Best Regards - Andre Wisplinghoff

1 0

Re: regedit: 3/7 Convert the rest of setValue to unicode
by Alexandre Julliard 10 Jul '08

10 Jul '08

Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> writes: > @@ -185,13 +199,16 @@ static DWORD getDataType(LPSTR *lpValue, DWORD* parse_type) > *lpValue+=ptr->len; > if (type == -1) { > char* end; > + char* buf = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(*lpValue)+1)*sizeof(WCHAR)); > + WideCharToMultiByte(CP_ACP, 0, *lpValue, -1, buf, (lstrlenW(*lpValue)+1)*sizeof(WCHAR), NULL, NULL); > /* "hex(xx):" is special */ > - type = (int)strtoul( *lpValue , &end, 16 ); > - if (**lpValue=='\0' || *end!=')' || *(end+1)!=':') { > + type = (int)strtoul( buf , &end, 16 ); > + if (*buf=='\0' || *end!=')' || *(end+1)!=':') { > type=REG_NONE; > } else { > - *lpValue=end+2; > + *lpValue += (end - buf)*sizeof(WCHAR) + 2; The last line is not correct, besides we have strtoulW so you don't need any of that W->A conversion. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [Gdiplus 2/3] Add a test for a floating-point triangle
by Huw Davies 10 Jul '08

10 Jul '08

Hi Adam, This is mainly a brain-dump, there's nothing wrong the patch. On Thu, Jul 10, 2008 at 12:44:55AM -0400, Adam Petaccia wrote: > --- > dlls/gdiplus/tests/region.c | 38 ++++++++++++++++++++++++++++++++++++++ > 1 files changed, 38 insertions(+), 0 deletions(-) > > diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c > index 1b1b047..7b1eba5 100644 > --- a/dlls/gdiplus/tests/region.c > +++ b/dlls/gdiplus/tests/region.c > @@ -361,6 +361,44 @@ todo_wine > expect(Ok, status); > status = GdipDeleteRegion(region); > expect(Ok, status); > + status = GdipGetRegionDataSize(region, &needed); > + expect(Ok, status); > + ok(needed == 72, "Expected 72, got %d\n", needed); > + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); > + expect(Ok, status); > + expect_dword(buf, 64); > + trace("buf[1] = %08x\n", buf[1]); > + expect_dword(buf + 2, RGNDATA_MAGIC); > + expect_dword(buf + 3, 0); > + expect_dword(buf + 4, RGNDATA_PATH); > + > + expect_dword(buf + 5, 48); > + expect_dword(buf + 6, RGNDATA_MAGIC); > + expect_dword(buf + 7, 4); > + expect_dword(buf + 8, 0); > + expect_float(buf + 9, 5.6); > + expect_float(buf + 10, 6.2); > + expect_float(buf + 11, 7.2); > + expect_float(buf + 12, 8.9); > + expect_float(buf + 13, 8.1); > + expect_float(buf + 14, 1.6); > + expect_float(buf + 15, 5.6); > + expect_float(buf + 16, 6.2); There's one more DWORD left here (buf + 17). I realised after I sent in my last lot of tests that this is the BYTE array of PathPointType*s packed into DWORDs (hence the 0x81...... vs 0x01...... that you noted in an earlier patch). As you've also noticed there are two ways of storing paths, if all the co-ords are short ints then they get stored that way and the 0x00004000 bit of buf + 8 is set. Otherwise the co-ords are stored as floats. In addition, the 0x00002000 bit of that same DWORD corresponds to the FillMode of the path. Anyway, good work! Huw. -- Huw Davies huw(a)codeweavers.com

1 0

Re: gdiplus: Add a trailing '\n' to Wine traces.
by Nikolay Sivov 10 Jul '08

10 Jul '08

Francois Gouget wrote: > --- > > I believe it's independent from the spelling fixes patch. I'll > resubmit if not. > > dlls/gdiplus/font.c | 2 +- > dlls/gdiplus/image.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) I think you should just remove a bracket here: - FIXME("%p (%s), %f, %p\n)", font, + FIXME("%p (%s), %f, %p\n", font,

2 1

re: Support of USB hardware tokens
by Dan Kegel 10 Jul '08

10 Jul '08

> I think should split my patch into many little commits. > Should also add some tests or make some changes? Yes, add conformance tests for the new ntoskrnl functions and usbd.sys, and break the patch up a lot... Looks like people have been hoping for something like this for a couple years now, e.g. http://www.winehq.org/pipermail/wine-devel/2005-November/042357.html

3 2

Re: gdiplus: Add a trailing '\n' to Wine traces.
by Alistair Leslie-Hughes 10 Jul '08

10 Jul '08

> @@ -327,7 +327,7 @@ GpStatus WINGDIPAPI > GdipGetFontHeightGivenDPI(GDIPCONST GpFont *font, REAL dpi, > { > if (!(font && height)) return InvalidParameter; > > - FIXME("%p (%s), %f, %p\n)", font, > + FIXME("%p (%s), %f, %p\n)\n", font, The first \n in the fixme should be removed. Best Regards Alistair Leslie-Hughes

1 0

Crashes in winetest under wine
by Austin Lund 10 Jul '08

10 Jul '08

I get a crash all the time in winetest since 1.0. Seems there is not a problem with any of the tests themselves (i.e. running make test). The last few lines of output from winetest is: fixme:xrandr:X11DRV_XRandR_SetCurrentMode Cannot change screen BPP from 32 to 8 fixme:xrandr:X11DRV_XRandR_SetCurrentMode Cannot change screen BPP from 32 to 16 err:x11settings:X11DRV_ChangeDisplaySettingsEx No matching mode found 1440x900x24 @0! (XRandR) err:ntdll:RtlpWaitForCriticalSection section 0x7bc91824 "loader.c: loader_section" wait timed out in thread 0039, blocked by 0036, retrying (60 sec) wine: Critical section 7bc91824 wait failed at address 0x7bc3ab60 (thread 0039), starting debugger... err:seh:raise_exception Unhandled exception code c0000194 flags 0 addr 0x7bc3ab60 And the output file made in /tmp has at the end: uxtheme:system start dlls/uxtheme/tests/system.c - system.c:491: Starting test_IsThemed() system.c:87: Theming is inactive system.c:495: Starting test_GetWindowTheme() system.c:499: Starting test_SetWindowTheme() system.c:503: Starting test_OpenThemeData() system.c:263: No active theme, skipping rest of OpenThemeData tests system.c:507: Starting test_GetCurrentThemeName() system.c:511: Starting test_CloseThemeData() system: 45 tests executed (11 marked as todo, 0 failures), 0 skipped. uxtheme:system done (0) It takes quite a long time to get to the point where it crashes so I'd be open to ideas as to how to narrow this down quicker. I'm running everything on a clean install with an empty ~/.wine directory.

2 5

Re: Revert "winemp3: Don't keep unused data buffered."
by Chris Robinson 09 Jul '08

09 Jul '08

On Wednesday 09 July 2008 11:44:17 am Maarten Lankhorst wrote: > This reverts commit 8f46a5119249562aceabff6d120948cbfacb6423. > The data isn't unused, mp3's can set up 'bit buckets', so while the > bit rate is constant, some data is needed anyway for later playback. > --- I don't believe reverting this is correct. Some apps needed this change to keep from stopping the stream prematurely (indeed, acmwrapper does not make sure all data is flushed out after using all input data). See bug 11659 <http://bugs.winehq.org/show_bug.cgi?id=11659>.

2 2

Feedback for "Regedit: Implement deleting multiple values"
by Andre Wisplinghoff 09 Jul '08

09 Jul '08

Hallo, my patch [1] wasn't applied. Can anyone give me a hint what wasn't OK with it? Thanks for your time. Best Regards - Andre Wisplinghoff [1] http://www.winehq.org/pipermail/wine-patches/2008-July/057227.html

3 2

CUDA wrapper
by Seth Shelnutt 09 Jul '08

09 Jul '08

The compiler chokes on the C++ coding that you pointed out. I'm not sure exactly how to handle it, maybe just convert it all to c syntax? For now I'll just commit out those lines and just work on trying to get something to compile. Now are you saying the code should be, retval, WINAPI wine_cudaGetDeviceCount( int* count ){ return cudaGetDeviceCount( count ); } or should it be retval, WINAPI wine_cudaGetDeviceCount( int* count ) or retval = WINAPI wine_cudaGetDeviceCount( int* count ){ return cudaGetDeviceCount( retval ); } I've never used retval and going off of http://www.systhread.net/texts/200612retval.php , it seems that retval is as simple as returning the value from a function, so I set the input to equal retval then I can return the function ( retval) and it will have all the values right? Maybe I am miss understanding it. On Mon, Jul 7, 2008 at 12:26 PM, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > Actually you want something like > > retval WINAPI wine_cudaSomething(int a, int etc) > > so instead of the void use the return value the function is supposed to > return > > > > WINAPI tells the compiler about the calling convention(ie, first parameter > on the stack, in ecx, or elsewhere, who takes care about cleaning up the > stack, etc). You'll have to check the calling convention Win32 cuda uses, > but most likely WINAPI is correct. You don't have to care about the Linux > cuda calling convention, since the compiler knows about that from the Linux > cuda headers > > > > I am also not quite sure about some constructs, like > > "wine_cudaBindTexture( size_t* offset, const struct texture < T, dim, > readMode >& texRef, const void* devPtr, const struct cudaChannelFormatDesc& > desc, size_t size = UINT_MAX )" As far as I know this contains C++ or > Microsoft syntax, which is not valid in pure C. > > > > >

3 10

Re: [Gdiplus 11/15] Implement GdipCreateRegionRect
by Huw Davies 09 Jul '08

09 Jul '08

On Wed, Jul 09, 2008 at 03:34:01AM -0400, Adam Petaccia wrote: > --- > dlls/gdiplus/region.c | 28 ++++++++++++++++++++++++---- > dlls/gdiplus/tests/region.c | 8 ++++---- > 2 files changed, 28 insertions(+), 8 deletions(-) > > diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c > index 59e2fa6..de86ce1 100644 > --- a/dlls/gdiplus/region.c > +++ b/dlls/gdiplus/region.c > @@ -129,12 +129,32 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) > return Ok; > } > > -GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *rect, GpRegion **region) > +GpStatus WINGDIPAPI GdipCreateRegionRect(GDIPCONST GpRectF *rect, > + GpRegion **region) > { > - FIXME("(%p, %p): stub\n", rect, region); > + GpPath *path; > + GpStatus stat; > > - *region = NULL; > - return NotImplemented; > + if (!(rect && region)) > + return InvalidParameter; > + > + TRACE("%p, %p\n", rect, region); > + > + *region = GdipAlloc(sizeof(GpRegion*)); > + if(!*region) > + return OutOfMemory; > + > + stat = GdipCreatePath(FillModeAlternate, &path); > + if (stat != Ok) { GdipDeleteRegion(*region); return stat;} > + stat = GdipAddPathRectangle(path, rect->X, rect->Y, > + rect->Width, rect->Height); > + if (stat != Ok) { GdipDeleteRegion(*region); return stat;} > + stat = GdipCreateRegionPath(path, region); > + if (stat != Ok) { GdipDeleteRegion(*region); return stat;} > + > + GdipDeletePath(path); > + > + return Ok; > } This doesn't look right. See the GdipGetRegionData tests (and extend them to add paths), these are supposed to help understanding how regions are stored. It looks to me that a region is stored as a sequence of rects and paths that are combined with various CombineMode ops. I'll send a patch that adds paths to the test in a bit. Huw. -- Huw Davies huw(a)codeweavers.com

2 3

Re: mshtml.dll:Add implementation of HTMLDocument_(Get|Set)Title
by Jacek Caban 09 Jul '08

09 Jul '08

Ivan Sinitsin wrote: > Changelog: > mshtml.dll:Add implementation of HTMLDocument_(Get|Set)Title > First of all it would be nice if you could add a test case for these. >static HRESULT WINAPI HTMLDocument_put_title(IHTMLDocument2 *iface, BSTR v) > { > HTMLDocument *This = HTMLDOC_THIS(iface); >- FIXME("(%p)->(%s)\n", This, debugstr_w(v)); >- return E_NOTIMPL; >+ nsIDOMDocument *nsdoc; >+ nsIDOMHTMLDocument *nshtmldoc; >+ nsAString nsstr; >+ nsresult nsres; >+ >+ TRACE("(%p)->(%s)\n", This, debugstr_w(v)); >+ >+ if(!This->nscontainer) >+ return E_POINTER; >+ >+ nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); >+ if(NS_FAILED(nsres)) { >+ ERR("GetDocument failed: %08x\n", nsres); >+ return nsres; >+ } >+ >+ if(NS_FAILED(nsres) || !nsdoc). >+ return E_FAIL; >+ >+ nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); >+ nsIDOMDocument_Release(nsdoc); >+ >+ nsAString_Init(&nsstr, NULL); >+ nsAString_SetData(&nsstr, v); Use second argument of nsAString_Init instead of nsAString_SetData. >+ >+ nsres = nsIDOMHTMLDocument_SetTitle(nshtmldoc, &nsstr); >+ nsIDOMHTMLDocument_Release(nshtmldoc); >+ You leak nsstr here. >+ return nsres; Don't mix nsresult with HRESULT. You should return S_OK here. > } > > static HRESULT WINAPI HTMLDocument_get_title(IHTMLDocument2 *iface, BSTR *p) > { > HTMLDocument *This = HTMLDOC_THIS(iface); >- FIXME("(%p)->(%p)\n", This, p); >- return E_NOTIMPL; >+ nsIDOMDocument *nsdoc; >+ nsIDOMHTMLDocument *nshtmldoc; >+ nsAString nsstr; >+ const PRUnichar *ret; >+ nsresult nsres; >+ >+ TRACE("(%p)->(%p)\n", This, p); >+ >+ if (!p). >+ return E_POINTER; >+ >+ if(!This->nscontainer) >+ return E_POINTER; >+ >+ nsres = nsIWebNavigation_GetDocument(This->nscontainer->navigation, &nsdoc); >+ if(NS_FAILED(nsres)) { >+ ERR("GetDocument failed: %08x\n", nsres); >+ return nsres; >+ } >+ >+ if(NS_FAILED(nsres) || !nsdoc). >+ return E_FAIL; >+ >+ nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMHTMLDocument, (void**)&nshtmldoc); >+ nsIDOMDocument_Release(nsdoc); >+ >+ nsAString_Init(&nsstr, NULL); >+ >+ nsres = nsIDOMHTMLDocument_GetTitle(nshtmldoc, &nsstr); >+ nsIDOMHTMLDocument_Release(nshtmldoc); >+ >+ if (NS_FAILED(nsres)) >+ return nsres; Don't mix nsresult with HRESULT. Also ERR would be nice in this case. >+ >+ nsAString_GetData(&nsstr, &ret); >+ *p = SysAllocString(ret); DOM API usually returns NULL instead of empty string. That's worth testing. >+ >+ return nsres; > } Again, don't mix nsresult with HRESULT. Jacek

2 1

Re: msvcrt: Fix printf exponent with tests (resend/update)
by Alexandre Julliard 09 Jul '08

09 Jul '08

Jon Griffiths <jon_p_griffiths(a)yahoo.com> writes: > diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c > index 14daf90..bbbc3f1 100644 > --- a/dlls/msvcrt/wcs.c > +++ b/dlls/msvcrt/wcs.c > @@ -481,6 +481,44 @@ static void pf_integer_conv( char *buf, int buf_len, pf_flags *flags, > return; > } > > +/* pf_fixup_exponent: convert a string containing a 1 or 2 digit exponent > + to 3 digits, accounting for padding, in place */ The comments don't match the code, you don't handle a 1 digit exponent. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/2] user32: Set WM_NOSIZE for windows smaller than SM_CXMINTRACK/SM_CYMINTRACK.
by Alexandre Julliard 09 Jul '08

09 Jul '08

"Lei Zhang" <thestig(a)google.com> writes: > I'm trying to make the test in patch 1/2 pass. > > - I want DEFWND_HandleWindowPosChanged to see SWP_NOCLIENTSIZE = 1. > - SWP_NOCLIENTSIZE gets set to 0 in SWP_DoNCCalcSize because the > client size has changed. > - the client size has changed because the window size has changed? > - the window size changed because it was 100, and > GetSystemMetrics(SM_CXMINTRACK) returns 112. > > so it looks like I just need to set SWP_NOSIZE. That's certainly wrong too, I think you are still on the wrong track. You need to write more test cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [Gdiplus 07/15] Stub GdipFillRegion
by Huw Davies 09 Jul '08

09 Jul '08

On Wed, Jul 09, 2008 at 03:33:47AM -0400, Adam Petaccia wrote: > --- > dlls/gdiplus/gdiplus.spec | 2 +- > dlls/gdiplus/region.c | 11 +++++++++++ > 2 files changed, 12 insertions(+), 1 deletions(-) > > diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c > index 3d95723..717119f 100644 > --- a/dlls/gdiplus/region.c > +++ b/dlls/gdiplus/region.c > @@ -156,6 +156,17 @@ GpStatus WINGDIPAPI GdipDeleteRegion(GpRegion *region) > return NotImplemented; > } > > +GpStatus WINGDIPAPI GdipFillRegion(GpGraphics* graphics, GpBrush* brush, > + GpRegion* region) > +{ > + if (!(graphics && brush && region)) > + return InvalidParameter; > + > + FIXME("(%p, %p, %p): stub\n", graphics, brush, region); > + > + return NotImplemented; > +} > + Msdn lists this in the 'graphics' section of the gdiplus flat api, so I'd suggest it goes in graphics.c Huw. -- Huw Davies huw(a)codeweavers.com

1 0

Re: [1/2] richedit: Prevented cursor flicker while moving over selection bar
by Alexandre Julliard 09 Jul '08

09 Jul '08

"Dylan Smith" <dylan.ah.smith(a)gmail.com> writes: > diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c > index 7e90096..96ab4aa 100644 > --- a/dlls/riched20/editor.c > +++ b/dlls/riched20/editor.c > @@ -1663,10 +1663,13 @@ static int ME_CalculateClickCount(HWND hWnd, UINT msg, WPARAM wParam, > return clickNum; > } > > -static BOOL ME_SetCursor(ME_TextEditor *editor, int x) > +static BOOL ME_SetCursor(ME_TextEditor *editor) > { > + POINT pt; > + GetCursorPos(&pt); > + ScreenToClient(editor->hWnd, &pt); In general GetCursorPos should be avoided. It incurs an X server round-trip, and it's asynchronous so the position may not match the message you are currently processing. Something like GetMessagePos is usually better. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: bug 14361: co-operate with valgrind at execv
by Alexandre Julliard 09 Jul '08

09 Jul '08

John Reiser <jreiser(a)BitWagon.com> writes: > Attached is the patch for http://bugs.winehq.org/show_bug.cgi?id=14361 > co-operate with valgrind at execv You shouldn't need anything like that, running the whole thing including the preloader under valgrind should work fine. At worst some reservations will fail but that shouldn't be an issue for the apps that we'd want to valgrind. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wininet: tests/http.c: Improve HttpOpenRequest test
by Alexandre Julliard 09 Jul '08

09 Jul '08

Zac Brown <zac(a)zacbrown.org> writes: > + SetLastError(0xdeadbeef); > ret = HttpSendRequest(request, NULL, 0, NULL, 0); > ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); > + ok(GetLastError() == ERROR_FILE_NOT_FOUND || > + GetLastError() == ERROR_SUCCESS, > + "HttpSendRequest failed, got %u.\n", GetLastError()); > ok(InternetCloseHandle(request), "Close request handle failed\n"); Testing last error on success is not useful, unless it's explicitly specified that last error is set, or there is an app that depends on it. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] user32: Add test for GetDC
by Alexandre Julliard 09 Jul '08

09 Jul '08

Ilya Shpigor <shpigor(a)etersoft.ru> writes: > Add test for GetDC. This test check is WM_PAINT message send by GetDC > function. There isn't even a GetDC call in that test. Most likely all you are seeing is that expose events generate WM_PAINT, which is as it should be. What are you trying to test? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: Alexandre Julliard : dinput: Don' t depend on the dxerr8 static library in the tests.
by Vitaliy Margolen 09 Jul '08

09 Jul '08

Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: b648dac7e12f593589661d03449e0f092b363f87 > URL: http://source.winehq.org/git/wine.git/?a=commit;h=b648dac7e12f593589661d034… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Tue Jul 8 17:49:03 2008 +0200 > > dinput: Don't depend on the dxerr8 static library in the tests. > > --- > > dlls/dinput/tests/Makefile.in | 2 +- > dlls/dinput/tests/device.c | 27 ++++++------ > dlls/dinput/tests/joystick.c | 95 ++++++++++++++++------------------------- > dlls/dinput/tests/keyboard.c | 39 ++++++++--------- > dlls/dinput/tests/mouse.c | 27 ++++++------ > 5 files changed, 83 insertions(+), 107 deletions(-) > > Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b648dac7e12f593589661… > > > Any particular reason for this patch? It makes it that much more complicated to decipher what the error code is. Vitaliy.

2 1

Re: Slovak translation for shlwapi
by Vladimir Pankratov 09 Jul '08

09 Jul '08

Kario wrote: > hi, i write slovak translation for shlwapi, > > if there is needed GPL header, feel free to append it > > and write me if i must include GPL > > please commit, thanks, bye > > > > see attachment > > > > btw. if you want that i send to you diff/patch file, > > please write me the full command for git > > > > === reklama ====================================== > http://mail.szm.com - e-mail a priestor na www stranku zadarmo > http://webhosting.szm.com - domeny a webhosting za najnizsie ceny > > > > ------------------------------------------------------------------------ > > Hello. Instruction for translate. Copy the English file as your file (let's say Sk.rc). Modify the LANGUAGE line. Lookup you language code in include/winnt.h and the sublangage rule for your language on SublangNeutral (or copy them from another file in your langauge) Translate the string If you havn't GIT, use diff -u. If you need more information please visit http://www.winehq.org/site/sending_patches, or feel free to write letter to me... Good luck.

1 0

Re: msxml3/test: Added ISAXXMLReader test. (4/18) (resend)
by Alistair Leslie-Hughes 09 Jul '08

09 Jul '08

"Piotr Caban" <piotr.caban(a)gmail.com> wrote in message news:200807082053.43537.piotr.caban@gmail.com... > --- > dlls/msxml3/tests/Makefile.in | 3 +- > dlls/msxml3/tests/saxreader.c | 225 > +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 227 insertions(+), 1 deletions(-) > create mode 100644 dlls/msxml3/tests/saxreader.c > >hr = ISAXXMLReader_putContentHandler(reader, &contentHandler); >+ ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); > Hi Piotr, What about more tests for invalid parameters? eg. hr = ISAXXMLReader_putContentHandler(reader, NULL); Add some tests for get_contentHandler to confirm that putContentHandler works. Best Regards Alistair Leslie-Hughes

2 4

Re: msxml3: Implemented domdoc_put_documentElement. (6/18) (resend)
by Alistair Leslie-Hughes 09 Jul '08

09 Jul '08

"Piotr Caban" <piotr.caban(a)gmail.com> wrote in message news:200807082054.16342.piotr.caban@gmail.com... > --- > dlls/msxml3/domdoc.c | 22 ++++++++++++++++++---- > 1 files changed, 18 insertions(+), 4 deletions(-) > -------------------------------------------------------------------------------- Hi Piotr, Your missing test cases. Best Regards Alistair Leslie-Hughes

1 0

Re: msxml3: Added ISAXMLReader_getContentHandler implementation (2/18)(resend)
by Alistair Leslie-Hughes 09 Jul '08

09 Jul '08

"Piotr Caban" <piotr.caban(a)gmail.com> wrote in message news:200807082052.26353.piotr.caban@gmail.com... > --- > dlls/msxml3/saxreader.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > -------------------------------------------------------------------------------- Hi Piotr, You need to check the parameter is not NULL, and add tests cases. Best Regards Alistair Leslie-Hughes

1 0

Re: [PATCH 2/5] dinput: Stop and unload effect when freeing it.
by Daniel Remenak 09 Jul '08

09 Jul '08

On Sat, Jul 5, 2008 at 9:24 PM, Vitaliy Margolen <wine-patches(a)kievinfo.com> wrote: <snip> > + LinuxInputEffectImpl_Stop(iface); > + LinuxInputEffectImpl_Unload(iface); <snip> Vitaliy, Native behavior is for Unload to stop the effect also (see msdn or test it yourself), so the call to Stop here is unnecessary. If the call to Stop is required, it must be done in Unload, not Release, as it's not unusual to unload an effect without releasing it when a game has a large number of available effect instances. It is my understanding that no explicit call to Stop is needed, either in Release or Unload, as evdev has the same behavior documented (see section 3.3 of ff.txt in the kernel docs). The call to Unload is certainly correct, and I don't think there's anything strictly wrong with calling Stop; just make sure it's not covering up a bug in Unload. Regards, Daniel Remenak

2 1

Re: Slovak translation for comctl32
by Vitaliy Margolen 09 Jul '08

09 Jul '08

Kario wrote: > hi, my name is Mario Kacmar and I am from Slovakia > > I made Slovak translation for comctl32 > > please commit this patch > > if there is needed GPL header, feel free to append it > > You have to explicitly state the license of your contribution. Not the GPL will not work, as Wine is LGPL v2. All patches should be in unified diff format diffed from the top of the tree. Use of GIT highly encouraged but not required. See here for more details: http://wiki.winehq.org/SubmittingPatches Vitaliy.

1 0

Re: bug 14370: adjust timeout interval for virtulaizers
by Vitaliy Margolen 09 Jul '08

09 Jul '08

John Reiser wrote: > Attached is the patch for http://bugs.winehq.org/show_bug.cgi?id=14370 > adjust timeout interval for virtulaizers This should go into registry not environment. See other discussion about the same topic. Vitaliy.

1 0

Re: bug 14365: do not touch high address space (initial stack, user_space_limit)
by Vitaliy Margolen 09 Jul '08

09 Jul '08

John Reiser wrote: > Attached is the patch for http://bugs.winehq.org/show_bug.cgi?id=14365 > do not touch high address space (initial stack, user_space_limit) So what's wrong with what Wine doing now? The part you removed states what it's there for - to prevent needless allocation attempts at the end of the address space. > > -- John Reiser, jreiser(a)BitWagon.com > > --- wine-1.0/libs/wine/mmap.c 2008-06-17 07:07:31.000000000 -0700 > +++ po49996-2008-06-30/wine-1.0/libs/wine/mmap.c 2008-06-30 17:18:29.000000000 -0700 > @@ -233,7 +233,9 @@ > return try_mmap_fixed( addr, size, PROT_NONE, flags, get_fdzero(), 0 ); > #endif > ptr = mmap( addr, size, PROT_NONE, flags, get_fdzero(), 0 ); > - if (ptr != addr && ptr != (void *)-1) munmap( ptr, size ); > + if (ptr != addr && ptr != (void *)-1) { > + munmap( ptr, size ); > + } > return (ptr == addr); > } What's the point of this change? > > @@ -321,8 +323,8 @@ > struct reserved_area *area; > struct list *ptr; > #if defined(__i386__) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__) /* commented out until FreeBSD gets fixed */ > - char stack; > - char * const stack_ptr = &stack; > + //char stack; > + //char * const stack_ptr = &stack - (10*1024*1024); // 10M stack expansion > char *user_space_limit = (char *)0x7ffe0000; No C++ comments please. If you removing something - remove it don't comment it. Vitaliy.

1 0

Re: Slovak translation for shlwapi
by Owen Rudge 09 Jul '08

09 Jul '08

Hi Kario, > btw. if you want that i send to you diff/patch file, > please write me the full command for git You should avoid sending messages in HTML to the mailing lists. Send them in plain text instead. With regards to generating a patch, see this wiki page: http://wiki.winehq.org/GitWine#head-f7a29e7ed999b5924748a60c5a1cd4a019032d26 Regards, -- Owen Rudge http://www.owenrudge.net/

1 0

Re: [1 of 2] comctl32: add test for disabling owner of modal property sheets
by Roy Shea 09 Jul '08

09 Jul '08

Hello Vincent, Looks like you've some DOS line breaks mixed into this patch through the register_parent_wnd_class function. Not sure if you meant to do that. Peace, -Roy On Tue, Jul 8, 2008 at 3:22 PM, Vincent Povirk <vincent(a)codeweavers.com> wrote: > > > > >

2 1

RE: [PATCH 1/4] ddraw: Force surfaces without memory flags to video memory on creation.
by Stefan Dösinger 08 Jul '08

08 Jul '08

I think there's code that does that for render targets. It would be good if those are combined, or the render target flag adjustment just removed if it is not needed any longer > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Alexander Dorofeyev > Sent: Tuesday, July 08, 2008 3:52 PM > To: wine-patches(a)winehq.org > Subject: [PATCH 1/4] ddraw: Force surfaces without memory flags to > video memory on creation. > > This fixes some missing textures in Forsaken, where renderer expects to > see that texture is in video memory and gets confused otherwise. > > Tested in patch 2/4. > --- > dlls/ddraw/ddraw.c | 9 ++++++--- > dlls/ddraw/texture.c | 6 ------ > 2 files changed, 6 insertions(+), 9 deletions(-)

2 1

re: winedos: Support reading from VGA register 0x3ba
by Dan Kegel 08 Jul '08

08 Jul '08

> Title says it all. Not *quite* all. Inquiring minds always want to know what app it will help and/or bugzilla entry it will fix. Codeweavers folks often don't mention that for business reasons, but if you're at liberty to mention it, it's always nice to include that in patch descriptions.

2 1

Re: [PATCH 2/2] user32: Set SWP_NOSIZE for windows with SWP_NOREDRAW.
by Alexandre Julliard 08 Jul '08

08 Jul '08

"Lei Zhang" <thestig(a)google.com> writes: > @@ -1808,6 +1808,10 @@ static BOOL fixup_flags( WINDOWPOS *winpos ) > if ((wndPtr->rectWindow.right - wndPtr->rectWindow.left == winpos->cx) && > (wndPtr->rectWindow.bottom - wndPtr->rectWindow.top == winpos->cy)) > winpos->flags |= SWP_NOSIZE; /* Already the right size */ > + else if (((winpos->flags & (SWP_NOZORDER|SWP_NOREDRAW|SWP_FRAMECHANGED|SWP_NOACTIVATE)) == SWP_NOREDRAW) && > + (wndPtr->rectWindow.right - wndPtr->rectWindow.left == origSize.x) && > + (wndPtr->rectWindow.bottom - wndPtr->rectWindow.top == origSize.y)) > + winpos->flags |= SWP_NOSIZE; /* Already the right size */ It makes no sense to compare the window rect against the original size since the window rect hasn't been changed yet, it will always match. Also I fail to see why this would have anything to do with SWP_NOREDRAW. I think you are on the wrong track with this bug. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: winedos: Support reading from VGA register 0x3ba
by Michael Karcher 08 Jul '08

08 Jul '08

Am Sonntag, den 06.07.2008, 13:45 -0700 schrieb Jon Griffiths: > Title says it all. > + case 0x3ba: > + /* CRT status register (read only) > + * This register is read repeatedly to signal whether a hercules/ > + * monochrome adapter is present, which is signalled by bit 7 > + * changing within 0x8000 reads. The other bits then describe the > + * type of monochrome adapter present. > + */ > + return 0; /* VGA compatible */ That patch seems wrong. As a VGA is able to coexist with a monochrome adapter, it does not respond to reading 0x3ba at all. And ISA is TTL compatible, i.e. open inputs read as one, so reads without responder return 0xFF. Regards, Michael Karcher

2 1

Re: bug 14360: dosmem forgot MAP_FIXED
by Alexandre Julliard 08 Jul '08

08 Jul '08

John Reiser <jreiser(a)BitWagon.com> writes: > Attached is the patch for http://bugs.winehq.org/show_bug.cgi?id=14360 > dosmem forgot MAP_FIXED No, it's not forgotten, that's the way it's supposed to work. What are you trying to fix? -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: gdiplus: Add a test to show that bitmap fonts aren't used for fontfamilies.
by Adam Petaccia 08 Jul '08

08 Jul '08

On Tue, 2008-07-08 at 13:20 +0100, Huw Davies wrote: > --- > dlls/gdiplus/tests/font.c | 7 +++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) On my Windows system I can't find MSSansSerif, only Microsoft Sans Serif. I'm not sure if that's a valid test to prove that point.

2 1

Re: bug 14362: RtlDestroyHeap forgot to notify_free on allocated blocks
by Alexandre Julliard 08 Jul '08

08 Jul '08

John Reiser <jreiser(a)BitWagon.com> writes: > +static void subheap_notify_free_all(SUBHEAP const *const subheap) > +{ > + char const *ptr = (char const *)subheap->base + subheap->headerSize; > + > + //DPRINTF("subheap_notify_free_all heap @%p, arena=%p\n", subheap, ptr); Please clean up that sort of thing before submitting. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: bug 14359: clear new reserved slots in new argv[]
by Alexandre Julliard 08 Jul '08

08 Jul '08

John Reiser <jreiser(a)BitWagon.com> writes: > Attached is the patch for http://bugs.winehq.org/show_bug.cgi?id=14359 > clear new reserved slots in new argv[] I don't see any case where the reserved slots wouldn't be initialized. Please provide more details. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: quartz: Fix deadlock with transform filter, try 2
by Michael Karcher 08 Jul '08

08 Jul '08

Am Montag, den 07.07.2008, 18:22 -0700 schrieb Maarten Lankhorst: > Reworks the code so that the lock is taking in the called procedures now. > + InputPin *pin = (InputPin *)pTransformFilter->ppPins[0]; > + > + EnterCriticalSection(&pTransformFilter->csFilter); > + if (pTransformFilter->state == State_Stopped) > + { > + LeaveCriticalSection(&pTransformFilter->csFilter); > + return VFW_E_WRONG_STATE; > + } I have to admit that I don't know anything about quartz. Are you sure you may access pTransformFilter->ppPins[0] before taking the lock? Regards, Michael Karcher

2 1

Re: [RESEND]MSI:ACTION_AppSearchReg() should return backslash terminated paths - Solves bug 13838
by James Hawkins 08 Jul '08

08 Jul '08

On Mon, Jul 7, 2008 at 10:04 AM, Massimo Del Fedele <max(a)veneto.com> wrote: > I'll repost that one... I'd like some feedback if it looks wrong. > This isn't going to be committed without a test. > To maintain consistence between global MSI path properties (as > CommonAppDataFolder) which are returned with a trailing backslash, and > local MSI path properties (as LOCALAPPDATAFOLDER) which by now where > returned without the trailing backslash. Properties in MSI are just that...properties. Folders loaded from the Folder table just happen to be stored as properties. The AppSearch action looks for a path (in this case) and sets a user-defined property to the path of the directory. You're making a connection between these two completely separated sets of functionality that doesn't exist. > This solves autocad's installer bug 13838. > Ok, we've had tons of patches submitted, some committed, that fix one app and break tons of other apps. This is exactly why this has to be backed up by a test. I'll review your patch for you anyway: @@ -368,6 +368,17 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT switch (type & 0x0f) { case msidbLocatorTypeDirectory: + /* directories should be returned with a trailing backslash + so check for it and append if necessary */ Leave the comment out. + if((LPWSTR)value[sz-1] != L'\\') + { Two things wrong. That first part is casting the result of value[sz-1], which is a BYTE (integer), to LPWSTR (pointer). Second, you can't use L in Wine. + *appValue = (LPWSTR)value; + value = msi_alloc(sz+1); You forgot to check if you're out of memory. + lstrcpyW((LPWSTR)value, *appValue); + lstrcatW(value, L"\\"); Again, can't use L in Wine. + msi_free(*appValue); + *appValue = NULL; + } rc = ACTION_SearchDirectory(package, sig, (LPWSTR)value, 0, appValue); break; case msidbLocatorTypeFileName: Now let's look at the whole thing: *appValue = (LPWSTR)value; value = msi_alloc(sz+1); lstrcpyW((LPWSTR)value, *appValue); lstrcatW(value, L"\\"); msi_free(*appValue); *appValue = NULL; You're using *appValue as a temporary pointer, which is ugly. msi_realloc is your friend. Check out the warnings you get when you compile this, which is the first sign that something is wrong: appsearch.c: In function 'ACTION_AppSearchReg': appsearch.c:373: warning: cast to pointer from integer of different size appsearch.c:373: warning: comparison between pointer and integer appsearch.c:378: warning: passing argument 1 of 'lstrcatW' from incompatible pointer type appsearch.c:378: warning: passing argument 2 of 'lstrcatW' from incompatible pointer type Taking one more step back: @@ -368,6 +368,17 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT switch (type & 0x0f) { case msidbLocatorTypeDirectory: + /* directories should be returned with a trailing backslash + so check for it and append if necessary */ So this 'fix' is only for ACTION_AppSearchReg. What about all the other AppSearch functionalities that also search for a directory? Those will remain unfixed. Also, why are you making it the responsibility of AppSearchReg to add the backslash? You're assuming that ACTION_SearchDirectory never changes the value sent in and only copies it straight back if it finds the path. That's a bad assumption. Plus, if you fix this at the lowest level, you get a fix for all the AppSearch functionalities for free. -- James Hawkins

5 7

Re: bug 14357: undefined edge padding in bitmaps annoys valgrind
by Alexandre Julliard 08 Jul '08

08 Jul '08

John Reiser <jreiser(a)BitWagon.com> writes: > Attached is the patch for http://bugs.winehq.org/show_bug.cgi?id=14357 > undefined edge padding in bitmaps annoys valgrind Please stop filing bugs for your patches. Just submit the patches with a proper changelog entry and explanations, instead of a pointer to bugzilla. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: user32: sizeof DDEPOKE and DDEDATA is six, which is probably not what is expected, so use offsetof instead.
by James Hawkins 08 Jul '08

08 Jul '08

2008/7/8 Huw Davies <huw(a)codeweavers.com>: > > Fixes a todo_wine and a Valgrind warning. @@ -699,10 +699,7 @@ static HDDEDATA CALLBACK server_ddeml_callback(UINT uType, UINT uFmt, HCONV hcon ptr = (LPSTR)DdeAccessData(hdata, &size); ok(!lstrcmpA(ptr, "poke data\r\n"), "Expected 'poke data\\r\\n', got %s\n", ptr); - todo_wine - { - ok(size == 14, "Expected 14, got %d\n", size); - } + ok(size == 12, "Expected 12, got %d\n", size); DdeUnaccessData(hdata); size = DdeQueryStringA(server_pid, hsz2, str, MAX_PATH, CP_WINANSI); You changed the value of the test. Did you mean to do that? -- James Hawkins

2 2

Re: bug 14357: undefined edge padding in bitmaps annoys valgrind
by James Hawkins 08 Jul '08

08 Jul '08

On Tue, Jul 8, 2008 at 12:59 PM, John Reiser <jreiser(a)bitwagon.com> wrote: > Attached is the patch for http://bugs.winehq.org/show_bug.cgi?id=14357 > undefined edge padding in bitmaps annoys valgrind > + memset(image->data, 0, image->bytes_per_line * height); /* valgrind */ I don't think we should add comments like this. The reason for fixing it is because some logic could potentially depend on an undefined value, which valgrind handily warns us about. -- James Hawkins

1 0

programs: add rudimentary dxdiag
by Louis. Lenders 08 Jul '08

08 Jul '08

Hi, any comments on this one? btw, is there a reason i never ever receive any comments on my patches when they are rejected? If so, please tell me, that'll save me a lot of time of sending them in... ----- Forwarded Message ---- From: Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> To: wine-patches(a)winehq.org Sent: Thursday, 26 June, 2008 3:20:04 AM Subject: Re: programs: add rudimentary dxdiag Hi, some apps like Gameshadow (http://www.gameshadow.com/) check for dxdiag.exe, and give an error if it's not found, so wine needs its own. Instead of simple stub, this patch also adds the (simplified) d3d test like seen in native dxdiag, so users can test if their d3d is setup correctly. Screenshot can be seen here: http://bugs.winehq.org/attachment.cgi?id=14342 A few remarks: -patch contains binary code for a bitmap, so to apply again i had to do git apply dx.patch git add programs/dxdiag/ tools/make_makefiles autoconf maybe there's a simpler way, but i dunno - code for spinning cube was partially based on spinning cube code scattered all over the internet -rest was ripped of winecfg - There' s a problem while minizing the d3d-window, but running it in wine-0.9.22 it all goes fine, so this must be a regression somewhere, and not a bug in the attached code. I'll go after that later. - Hopefully you're not to picky on this patch, it 's quite some line's of code,and i'm sure things need to be improved, but this does not affect wine's core code but os rather an enhancement, and it 's not really possible to send it in in small chuncks. ________________________________ Not happy with your email address? Get the one you really want - millions of new email addresses available now at Yahoo! __________________________________________________________ Not happy with your email address?. Get the one you really want - millions of new email addresses available now at Yahoo! http://uk.docs.yahoo.com/ymail/new.html

8 15

Lots of input messages lingering in server slowing down wine tremendously?
by Alexander Dorofeyev 08 Jul '08

08 Jul '08

Hi. There was a problem found recently in a fan-made mod of Forsaken (game), that certain input combinations were slowing wine very seriously. Holding down a keyboard button and moving mouse was found to be especially devastating to performance (200 fps to 10fps in a matter of 10-20 seconds). With help from people who develop this mod, I was able to isolate it in a very small and simplistic testcase, which shows this same problem. It will be included as attachment. Holding a key and moving mouse over the window steadily increases main loop latency from 10 to 50 (and even 100) in a short time, especially so if quickly clicking both mouse buttons as well. In a game this means going from 100 fps to 20 or 10 just because of input messages. Has to be noted that in the actual game the rate of slowdown seemed at least 2-3 times faster for reasons I don't know, but the testcase still should enough to show the problem. Now, I do realize that what the testcase is doing is bad practice, it's basically refusing to process certain types of messages, and PeekMessage just once during a loop is probably bad as well, but that's what the game was originally doing in its main game loop. They do plan to fix it in the game. Still, there are several concerns about it: 1) No slowdown happens of Windows as far as I can tell. No matter how much I move the mouse holding key and clicking madly, it shows same stable 15-16 ticks latency in the testcase. I don't know what it does, but somehow it handles this situation better than Wine. 2) Can this (broken) way of doing things be exposing some inefficiency in message handling, maybe something that could use optimization? I tried to put debug hacks into queue_hardware_message(), it seems that when slowdown is already VERY bad in Forsaken (10fps), message queue in wine server has about 400 or maybe 600 messages. Is that kind of processing overhead per message inevitable? (This is happening on AMD Athlon(tm) 3200+). Perhaps somebody who knows that part of code well may be interested in looking into performance issues in this case. Because, if 400-600 messages in the queue slow down the application to a crawl, then who knows, perhaps it decreases performance of more well-behaved but input-intensive apps as well, just less drastically (holding one or several keys to move, all the while aiming with mouse and abusing mouse buttons is a common thing in games, so there can be quite a few input messages flooding the server). The reason I decided to post it to wine-devel is because I'm not sure if this kind of thing is expected and unavoidable or a bug that can be fixed, so better to hear some comments first, then a bug entry can be opened if needed. #include <windows.h> HWND window; int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { WNDCLASS wc = {0}; MSG msg; DWORD ticks, ticks2; HHOOK kbd_hook, mouse_hook; wc.lpfnWndProc = &DefWindowProc; wc.lpszClassName = "testwc"; RegisterClass(&wc); window = CreateWindow("testwc", "test", WS_OVERLAPPED | WS_VISIBLE | WS_CAPTION , 0, 0, 640, 480, 0, 0, 0, 0); ticks = GetTickCount(); for (;;) { if (PeekMessage(&msg, NULL, WM_NULL, WM_KEYFIRST, PM_REMOVE)) { if (msg.message == WM_QUIT) { DestroyWindow(window); break; } TranslateMessage(&msg); DispatchMessage(&msg); } //simulated work ticks2 = GetTickCount(); for (;;) { UINT i; volatile int dummy = 1; for (; i < 10000 && dummy; i++) ; if (GetTickCount() - ticks2 >= 10) break; } printf("main loop %u tick latency\n", GetTickCount() - ticks); ticks = GetTickCount(); } }

2 1

Re: services: when displayname is absent, the keyname should be used when searching by displayname (fixes bug #13958)
by Alexandre Julliard 08 Jul '08

08 Jul '08

Mikołaj Zalewski <mikolaj(a)zalewski.pl> writes: > diff --git a/programs/services/services.c b/programs/services/services.c > index 36ed117..b166d51 100644 > --- a/programs/services/services.c > +++ b/programs/services/services.c > @@ -344,7 +344,7 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase > > LIST_FOR_EACH_ENTRY(service, &db->services, struct service_entry, entry) > { > - if (strcmpiW(name, service->config.lpDisplayName) == 0) > + if (strcmpiW(name, get_display_name(service)) == 0) > return service; > } You should not change scmdatabase_find_service_by_displayname, it does what its name implies. You should fix the callers where necessary. -- Alexandre Julliard julliard(a)winehq.org

2 1

mscoree:GetCORSystemDirectory. Need advice
by Vitaly Perov 08 Jul '08

08 Jul '08

Hi! I hame implemented mscoree:GetCORSystemDirectory function. (Patch included) It find a folder of the latest .Net installation in the registry. So there are several problems: 1) Registry entry doesn't exist. I don't know how to add it correctly. Now I import it from the Windows registry by regedit. 2) The folder of .Net installation doesn't exist. So, does somebody know how to solve these problems? Thank you! -- Best wishes, Vitaly Perov Russia, Saint-Petersburg. www.etersoft.ru

1 1

[1/3] [d3d8] Add testcase for IDirect3DDevice8::CreateImageSurface
by Tobias Jakobi 08 Jul '08

08 Jul '08

Posted a alternate version of the patchset to wine-patches, now using todo_wine and activating the testcase in the first patch. Patch no. 3 didn't change though, but I reposted it anyway. Greets, Tobias

1 0

Re: [1/3] [d3d8] Add testcase for IDirect3DDevice8::CreateImageSurface (correct)
by H. Verbeet 08 Jul '08

08 Jul '08

Looks ok to me.

1 0

Re: riched20: Fix typo.
by Michael Stefaniuc 08 Jul '08

08 Jul '08

Dylan Smith wrote: > Yes, that is right. > > Thanks for catching that. > > By the way, should I be replying to wine-devel? Or should I only be doing > that if something is wrong with the patch so that Julliard can ignore it? This should do. thanks bye michael > On Tue, Jul 8, 2008 at 8:05 AM, Michael Stefaniuc <mstefani(a)redhat.com> > wrote: > >> This fixes a warning introduced by 69cf4e9a : >> dlls/riched20/editor.c:1647: warning: 'clickMsg.pt.y' is used uninitialized >> in this function >> >> >> --- >> Dylan, please confirm that I have replaced the right 'x'. >> >> >> dlls/riched20/editor.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c >> index 7e90096..c285733 100644 >> --- a/dlls/riched20/editor.c >> +++ b/dlls/riched20/editor.c >> @@ -1643,7 +1643,7 @@ static int ME_CalculateClickCount(HWND hWnd, UINT >> msg, WPARAM wParam, >> clickMsg.lParam = lParam; >> clickMsg.time = GetMessageTime(); >> clickMsg.pt.x = LOWORD(lParam); >> - clickMsg.pt.x = HIWORD(lParam); >> + clickMsg.pt.y = HIWORD(lParam); >> if ((clickNum != 0) && >> (clickMsg.message == prevClickMsg.message) && >> (clickMsg.hwnd == prevClickMsg.hwnd) && >> -- >> 1.5.6.2 >> > -- Michael Stefaniuc Tel.: +49-711-96437-199 Consulting Communications Engineer Fax.: +49-711-96437-111 -------------------------------------------------------------------- Reg. Adresse: Red Hat GmbH, Otto-Hahn-Strasse 20, 85609 Dornach bei Muenchen Handelsregister: Amtsgericht Muenchen HRB 153243 Geschäftsführer: Brendan Lane, Charlie Peters, Michael Cunningham, Werner Knoblich

1 0

Re: ws2_32: Partial implementation of TransmitFile/TransmitPackets
by Alexandre Julliard 08 Jul '08

08 Jul '08

Jon Griffiths <jon_p_griffiths(a)yahoo.com> writes: > + while (send_len) > + { > + wsabuf.len = send_len; > + if (wsabuf.len > chunk_len) > + wsabuf.len = chunk_len; > + if (!ReadFile(packet->u.s.hFile, wsabuf.buf, wsabuf.len, NULL, NULL) || > + WSASendTo(s, &wsabuf, 1, &n, 0, NULL, 0, NULL, NULL) == SOCKET_ERROR) > + goto TransmitPackets_fail; Both ReadFile and WSASendTo will return the number of bytes read/written, you need to take that into account. > + if (WSASendTo(s, &wsabuf, 1, &n, 0, NULL, 0, NULL, NULL) == SOCKET_ERROR) > + goto TransmitPackets_fail; > + send_len -= wsabuf.len; > + wsabuf.buf += wsabuf.len; Same here. > + packet->cLength = total_len; > + /* FIXME: I'm not certain we should always use the current file > + * position (rather than the start of the file), though it works > + * for mapache.exe. > + */ Some test cases would be a good idea. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: mswsock:Implement 3 functions by calling through SIO_GET_EXTENSION_FUNCTION_POINTER (try 3)
by Alexandre Julliard 08 Jul '08

08 Jul '08

Jon Griffiths <jon_p_griffiths(a)yahoo.com> writes: > +BOOL WINAPI AcceptEx(SOCKET listener, SOCKET acceptor, PVOID dest, DWORD dest_len, > + DWORD local_addr_len, DWORD rem_addr_len, LPDWORD received, > + LPOVERLAPPED overlapped) > { > - FIXME("(listen=%ld, accept=%ld, %p, %d, %d, %d, %p, %p), not implemented\n", > - sListenSocket,sAcceptSocket,lpOutputBuffer,dwReceiveDataLength, > - dwLocalAddressLength,dwRemoteAddressLength,lpdwBytesReceived,lpOverlapped > - ); > + EnterCriticalSection(&MSWSOCK_CritSect); > + if (!acceptex_fn) > + { > + /* Get pointers to the ws2_32 implementations. > + * NOTE: This assumes that ws2_32 contains only one implementation > + * of these functions, i.e. that you cannot get different functions > + * back by passing another socket in. If that ever changes, we'll need > + * to think about associating the functions with the socket and > + * exposing that information to this dll somehow. > + */ > + const GUID acceptex_guid = WSAID_ACCEPTEX; > + const GUID acceptexsockaddrs_guid = WSAID_GETACCEPTEXSOCKADDRS; > + DWORD len; > + WSAIoctl(acceptor, SIO_GET_EXTENSION_FUNCTION_POINTER, > + (void*)&acceptex_guid, sizeof(acceptex_guid), > + &acceptex_fn, sizeof(acceptex_fn), &len, NULL, NULL); > + WSAIoctl(acceptor, SIO_GET_EXTENSION_FUNCTION_POINTER, > + (void*)&acceptexsockaddrs_guid, sizeof(acceptexsockaddrs_guid), > + &acceptexsockaddrs_fn, sizeof(acceptexsockaddrs_fn), &len, NULL, NULL); > + } > + LeaveCriticalSection(&MSWSOCK_CritSect); You don't need a crit section since you assume that the pointers are always the same, but you do need to fetch them into local variables and check for error before setting the global ones. > + static const GUID guid = WSAID_TRANSMITFILE; > + LPFN_TRANSMITFILE fn; > + DWORD len; > > - return FALSE; > + /* Use the implementation provided by ws2_32 */ > + if (WSAIoctl(s, SIO_GET_EXTENSION_FUNCTION_POINTER, > + (void*)&guid, sizeof(guid), &fn, sizeof(fn), &len, NULL, NULL)) > + return FALSE; > + > + return fn(s, file, total_len, chunk_len, overlapped, buffers, flags); You should store this one globally too, no need to do the ioctl on every call. -- Alexandre Julliard julliard(a)winehq.org

1 0

[1/3] [d3d8] Add testcase for IDirect3DDevice8::CreateImageSurface
by Tobias Jakobi 08 Jul '08

08 Jul '08

Intended, see patch 2/3 - the testcase is activated there (since it pass then).

1 0

Re: shell32[1/2]: RunFileDlg: allow custom icon
by Alexandre Julliard 08 Jul '08

08 Jul '08

Mikołaj Zalewski <mikolaj(a)zalewski.pl> writes: > diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c > index 0e858b8..a30cf33 100644 > --- a/dlls/shell32/dialogs.c > +++ b/dlls/shell32/dialogs.c > @@ -139,9 +139,11 @@ static INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPAR > if (prfdp->uFlags & RFF_CALCDIRECTORY) > FIXME("RFF_CALCDIRECTORY not supported\n"); > > + if (prfdp->hIcon == NULL) > + prfdp->hIcon = (WPARAM)LoadIconW(NULL, (LPCWSTR)IDI_WINLOGO); > SetClassLongPtrW (hwnd, GCLP_HICON, (LPARAM)prfdp->hIcon) ; > - SendMessageW (GetDlgItem (hwnd, IDC_RUNDLG_ICON), STM_SETICON, > - (WPARAM)LoadIconW (NULL, (LPCWSTR)IDI_WINLOGO), 0); > + SendMessageW(GetDlgItem(hwnd, IDC_RUNDLG_ICON), STM_SETICON, (WPARAM)prfdp->hIcon, 0); > + The SetClassLongPtrW call is very wrong, you should probably fix that too while you're at it. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: GetPrivateProfileString should set buffer to "" if default value is not set (resend)
by Alexandre Julliard 08 Jul '08

08 Jul '08

"Dan Kegel" <dank(a)kegel.com> writes: > diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c > index 9b6b1a1..e52cd66 100644 > --- a/dlls/kernel32/profile.c > +++ b/dlls/kernel32/profile.c > @@ -1114,9 +1114,10 @@ static int PROFILE_GetPrivateProfileString( LPCWSTR section, LPCWSTR entry, > } else if (buffer && def_val) { > lstrcpynW( buffer, def_val, len ); > ret = strlenW( buffer ); > - } > - else > + } else { > + buffer[0] = 0; /* buffer must be a null terminated empty string */ > ret = 0; What if len is 0? What if buffer is NULL? -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: wined3d: Remove const qualifier from output pointers (Resend)
by Alexandre Julliard 08 Jul '08

08 Jul '08

Andrew Talbot <andrew.talbot(a)talbotville.com> writes: > Anything wrong with this patch? It does accord with GL/gl.h. You should fix the other functions too, there are many more similar cases. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/3] [d3d8] Add testcase for IDirect3DDevice8::CreateImageSurface
by H. Verbeet 08 Jul '08

08 Jul '08

2008/7/7 Tobias Jakobi <liquid.acid(a)gmx.net>: > The test doesn't get run this way. If it did it would fail of course, so you should either submit the test after your second patch, or put the ok that tests the pool type inside a todo_wine block and remove it again in your second patch.

1 0

rpcrt4: Compile error
by Austin Lund 08 Jul '08

08 Jul '08

Does anyone else get the following compile error at commit 2734fb44e0f4065179044b9eb93f87a7630f292d: make[2]: Entering directory `/home/lund/src/wine/wine-git/dlls/rpcrt4' make[2]: *** No rule to make target `../../include/wine/rpcss_shared.h', needed by `ndr_contexthandle.o'. Stop. make[2]: Leaving directory `/home/lund/src/wine/wine-git/dlls/rpcrt4' make[1]: *** [rpcrt4] Error 2 make[1]: Leaving directory `/home/lund/src/wine/wine-git/dlls' make: *** [dlls] Error 2

2 1

Re: wintrust/test: Verify array length before calling memcmp in test (RESEND)
by James Hawkins 07 Jul '08

07 Jul '08

On Mon, Jul 7, 2008 at 5:05 PM, Roy Shea <royshea(a)gmail.com> wrote: > This revision uses a more concise check of hash equality than prior > patch archived at: > > http://www.winehq.org/pipermail/wine-patches/2008-June/056139.html > > Call to memcmp in test_calchash assumes length of hash and expectedhash > are the same. This need not be true in general, and is not true for the > current stub implementation of CryptCATAdminCalcHashFromFileHandle. > This patch adds an explicit test of array length. In doing so it > prevents the following Valgrind warning: > @@ -335,7 +335,9 @@ static void test_calchash(void) { ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); - ok(!memcmp(hash, expectedhash, sizeof(expectedhash)), "Hashes didn't match\n"); + ok(hashsize == sizeof(expectedhash) && + !memcmp(hash, expectedhash, sizeof(expectedhash)), + "Hashes didn't match\n"); What's with the weird spacing? It doesn't match the spacing of the ok call right above it. -- James Hawkins

2 1

CUDA wrapper
by Seth Shelnutt 07 Jul '08

07 Jul '08

I just have a makefile. No makefile.in. Perhaps I used winemaker wrong? I simply did "winemaker --dll cuda". On Mon, Jul 7, 2008 at 5:00 PM, John Klehm <xixsimplicityxix(a)gmail.com> wrote: > > > Check the IMPORT variable in Makefile.in and see if everything you > need is listed. > > --John >

1 0

Re: mlang/tests: don't assume output of ConvertStringFromUnicode is null terminated
by James Hawkins 07 Jul '08

07 Jul '08

2008/7/6 Dan Kegel <dank(a)kegel.com>: > The mlang test assumed that the output of ConvertStringFromUnicode > was null terminated, but it seems not to be. > > Fixes the valgrind warning: > Conditional jump or move depends on uninitialised value(s) > at strlen (mc_replace_strmem.c:242) > by lstrlenA (string.c:364) > by ConvertINetMultiByteToUnicode (mlang.c:526) > by ConvertINetString (mlang.c:633) > by fnIMultiLanguage2_ConvertString (mlang.c:2197) > by check_convertible (mlang.c:287) > by test_EnumCodePages (mlang.c:407) > Uninitialised value was created by a stack allocation > at check_convertible (mlang.c:270) > > I believe James was trying to fix this with > http://www.winehq.org/pipermail/wine-patches/2008-June/056454.html > but missed (he thought the problem was on the destination > len, but really it was on the source len?). > No, this is hiding a bug. The test code conforms with the API. The problem is that ConvertINetMultiByteToUnicode uses the value of an out-only parameter (NULL pDstStr, non-NULL pcDstSize). Check out the code block in mlang.c:632. -- James Hawkins

2 2

Re: [6/6] winhttp: main.c: Add stub implementation for WinHttpCloseHandle
by Zac Brown 07 Jul '08

07 Jul '08

Zac Brown wrote: > Add stub implementation for WinHttpCloseHandle > > ignore, forgot patch.

1 0

Incompatible behavior regarding SetCapture/ReleaseCapture & dialogs
by Andreas Rosenberg 07 Jul '08

07 Jul '08

Hi all! About 3 years ago, I reported a few incompatiblities in Wine, that caused problems with an application called IQ-FMEA, that our company is developing. Some things I could fix myself and sent them to wine-patches and they were accepted. One incompatibility between Windows & Wine is still there and causes problems in our app when operating various dialogs (most important the common file dialog, because this happens frequently). To demonstrate the problem, I wrote a small app. It may be included into the conformance test library, but it's a little bit tricky, so I'm unsure how to do something like this. Scenario: Two windows A and B exist. - Window B captures the mouse input. - Window A opens the CommonFileDialog (GetOpenFileName,GetSaveFileName, ChooseFont) - during the open process of the CommonFileDialog the mouse capture is released on Windows (between the 2nd & the 3rd WM_NOTIFY being passed to the OFNHookProc). The dialog is automatically closed by the hook proc, by posting WM_COMMAND with IDCANCEL. On Wine the mouse capture is not release, making it impossible to operate the dialog with the mouse. The same scenario may happen with ChooseFont (and probably more dialog windows). log output of my test app on Windows XP: Testing GetOpenFileName Wnd with capture:000201fe WM_INITDIALOG:000201fe WM_NOTIFY:000201fe - fffffda7 - (0) WM_NOTIFY:000201fe - fffffda5 - (1) WM_NOTIFY:00000000 - fffffda6 - (2) Quitting dialog Wnd with capture:00000000 Testing ChooseFont Wnd with capture:000201fe WM_INITDIALOG:000201fe WM_CTLCOLORDLG:00000000 - (0) Quitting dialog Wnd with capture:00000000 log output of my test app on Wine 1.1.0 (for OpenSuse 10.3) Testing GetOpenFileName Wnd with capture:0001002a WM_INITDIALOG:0001002a WM_NOTIFY:0001002a - fffffda7 - (0) WM_NOTIFY:0001002a - fffffda5 - (1) WM_NOTIFY:0001002a - fffffda6 - (2) CommonFileDialog - mouse capture should have been released now! Quitting dialog Wnd with capture:0001002a Testing ChooseFont Wnd with capture:0001002a WM_INITDIALOG:0001002a WM_CTLCOLORDLG:0001002a - (0) ChooseFontDialog - mouse capture should have been released now! Quitting dialog Wnd with capture:0001002a Maybe someone being more familiar with the internal framework can take a look into this problem. Regards, Andreas

1 0

Re: quartz: Fix deadlock with transform filter
by Alexandre Julliard 07 Jul '08

07 Jul '08

"Maarten Lankhorst" <m.b.lankhorst(a)gmail.com> writes: > diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c > index d877930..22bfb87 100644 > --- a/dlls/quartz/acmwrapper.c > +++ b/dlls/quartz/acmwrapper.c > @@ -186,7 +186,9 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte > } > TRACE("Sample stop time: %u.%03u\n", (DWORD)(tStart/10000000), (DWORD)((tStart/10000)%1000)); > > + LeaveCriticalSection(&This->tf.csFilter); > hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); > + EnterCriticalSection(&This->tf.csFilter); This looks very wrong this the lock wasn't grabbed by this function, it will violate expectations of the caller. It looks like the locking strategy needs some more thought. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [dxdiagn] [resend] Implemented szDeviceIdentifier property in dxdiagn dll
by James Hawkins 07 Jul '08

07 Jul '08

On Mon, Jul 7, 2008 at 12:46 PM, Markus <kde(a)graph-ix.net> wrote: > If d3d9 could not be properly initialized, the value 'n/a' is set. This > behavior has been verified against the native dxdiagn.dll. The > corresponding testcase will follow once I have time. > You forgot the patch. -- James Hawkins

2 1

CUDA wrapper
by Seth Shelnutt 07 Jul '08

07 Jul '08

As a continuation from the question on making the FAH GPU2 Nvidia client run, we have gotten past the detecting the card as we changed Wine's generic output to look like an Nvidia card thanks to a few of you. Now comes the hard part. Even when using the cudart.dll file it does not work. We get an cudastream error about it not being implemented. It then repeats these 5 lines until the client is stopped. Reading file work/wudata_07.tpr, VERSION 3.1.4 (single precision) Reading file work/wudata_07.tpr, VERSION 3.1.4 (single precision) Reading sasa-enabled ir 0 0 Initializing Nvidia gpu library cudaMalloc CUDAStream::Allocate failed feature is not yet implemented Martijn Berger said here ( http://www.winehq.org/pipermail/wine-devel/2008-July/067063.html) that all that should need to be done is right a wrapper to translate the calls from cudart.dll to libcuda.so.2.0. I suppose the place to start would be to download the SDK's and see how much documentation is available on both the Linux and Windows calls. -Seth Shelnutt

4 10

Re: [1/2] Retyped find_in_cache's transformation matrix parameter.
by Michael Karcher 07 Jul '08

07 Jul '08

Am Montag, den 07.07.2008, 17:17 +0200 schrieb Michael Karcher: Sorry for commentless resending. I am too stupid to notice that July had begun and considered the mail lost as it didn't appear in June's archive. Still I wonder why the patch (series) didn't make it in. Any feedback? Regards, Michael Karcher

1 0

Re: [PATCH 2/4] widl: Write out calls to freeing functions for return types on the server in generated code.
by Alexandre Julliard 07 Jul '08

07 Jul '08

"Rob Shearman" <robertshearman(a)gmail.com> writes: > tools/widl/proxy.c | 3 +++ > tools/widl/server.c | 3 +++ > 2 files changed, 6 insertions(+), 0 deletions(-) This one doesn't work: ../../../tools/runtest -q -P wine -M rpcrt4.dll -T ../../.. -p rpcrt4_test.exe.so server.c && touch server.ok err:rpc:I_RpcReceive we got fault packet with status 0x3e6 wine: Unhandled exception 0x000003e6 at address 0x7b8449a0 (thread 001a), starting debugger... Unhandled exception: 0x000003e6 in 32-bit code (0x7b844a16). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:7b844a16 ESP:0033f9f4 EBP:0033fa58 EFLAGS:00000246( - 00 - IZP1) EAX:7b82eb79 EBX:7b8b30e8 ECX:00110048 EDX:00000000 ESI:0033fac4 EDI:00000000 Stack dump: 0x0033f9f4: 00000000 0011fa30 0033fa20 608b0dd4 0x0033fa04: 000003e6 00000000 00000000 7b8449a0 0x0033fa14: 00000000 608abe79 608abd5c 000003e6 0x0033fa24: 0011f840 00000000 608a2567 00110000 0x0033fa34: 00000000 0011fa30 608b0dd4 00000000 0x0033fa44: 0033fba0 0033fa78 60899ea8 0033fba0 Backtrace: =>1 0x7b844a16 RaiseException+0x76(code=0x3e6, flags=0x0, nbargs=0x0, args=0x0) [/home/julliard/wine/wine/dlls/kernel32/except.c:85] in kernel32 (0x0033fa58) 2 0x608a2e75 RpcRaiseException+0x35(exception=0x3e6) [/home/julliard/wine/wine/dlls/rpcrt4/rpcrt4_main.c:184] in rpcrt4 (0x0033fa78) 3 0x60874e30 NdrFreeBuffer(pStubMsg=0x1) [/home/julliard/wine/wine/dlls/rpcrt4/ndr_clientserver.c:184] in rpcrt4 (0x0033faa8) 4 0x6055ecab get_filename+0x7b() [/home/julliard/wine/wine/dlls/rpcrt4/tests/server_c.c:4198] in rpcrt4_test (0x0033fbd8) 5 0x6055c2e1 basic_tests+0xb41() [/home/julliard/wine/wine/dlls/rpcrt4/tests/server.c:850] in rpcrt4_test (0x0033fd58) 6 0x6055cf5d run_tests+0x1d() [/home/julliard/wine/wine/dlls/rpcrt4/tests/server.c:865] in rpcrt4_test (0x0033fe08) 7 0x6055dfd6 func_server+0x586() [/home/julliard/wine/wine/dlls/rpcrt4/tests/server.c:1262] in rpcrt4_test (0x0033fe68) 8 0x6056b0f0 run_test+0x130(name=0x110403) [/home/julliard/wine/wine/dlls/rpcrt4/tests/../../../include/wine/test.h:451] in rpcrt4_test (0x0033fea8) 9 0x6056b2f3 main+0x133(argc=<register ECX not in topmost frame>, argv=<register ECX not in topmost frame>) [/home/julliard/wine/wine/dlls/rpcrt4/tests/../../../include/wine/test.h:499] in rpcrt4_test (0x0033fed8) 10 0x6056ba7b __wine_spec_exe_entry+0x5b(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in rpcrt4_test (0x0033ff08) 11 0x7b876d47 start_process+0xc7(arg=0x0) [/home/julliard/wine/wine/dlls/kernel32/process.c:904] in kernel32 (0x0033ffe8) 12 0x600289c7 wine_switch_to_stack+0x17() in libwine.so.1 (0x00000000) 0x7b844a16 RaiseException+0x76 [/home/julliard/wine/wine/dlls/kernel32/except.c:85] in kernel32: movl 0xfffffffc(%ebp),%ebx -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 1/4] widl: Optimise the generated code by skipping calls calling the type function directly for some reference pointers.
by Alexandre Julliard 07 Jul '08

07 Jul '08

"Rob Shearman" <robertshearman(a)gmail.com> writes: > Skip calling the Pointer marshalling/unmarshalling/buffer > sizing/freeing function in this case. This one doesn't work either: ../../../tools/runtest -q -P wine -M qmgr.dll -T ../../.. -p qmgr_test.exe.so file.c && touch file.ok fixme:qmgr:BITS_IBackgroundCopyJob_AddFile Check for valid filenames and supported protocols file.c:127: Test failed: Got incorrect remote name wine: Unhandled page fault on read access to 0x89fffffe at address 0x60540d3a (thread 0025), starting debugger... Unhandled exception: page fault on read access to 0x89fffffe in 32-bit code (0x60540d3a). Register dump: CS:0023 SS:002b DS:002b ES:002b FS:0063 GS:006b EIP:60540d3a ESP:0032fe00 EBP:0032fe68 EFLAGS:00010202( - 00 - -RI1) EAX:89fffffe EBX:60b5edd4 ECX:c000000d EDX:00000000 ESI:7ffbc000 EDI:00320000 Stack dump: 0x0032fe00: 00122c4c 00000001 60546b54 00000000 0x0032fe10: 60546b48 00000003 605441ac 60546720 0x0032fe20: 605441a2 60546b48 60545398 60545378 0x0032fe30: 0032fe58 60546084 60546b4c 7b876ba4 0x0032fe40: 7bca34cc 00000001 71670f10 11dd4c1e 0x0032fe50: 1a00835a cb923592 00000039 6054621c Backtrace: =>1 0x60540d3a func_file+0x27a() [/home/julliard/wine/wine/dlls/qmgr/tests/file.c:108] in qmgr_test (0x0032fe68) 2 0x6054328a run_test+0x14a(name=0x1103e5) [/home/julliard/wine/wine/dlls/qmgr/tests/../../../include/wine/test.h:451] in qmgr_test (0x0032fea8) 3 0x60543ae2 main+0x142(argc=<register ECX not in topmost frame>, argv=0x1103c8) [/home/julliard/wine/wine/dlls/qmgr/tests/../../../include/wine/test.h:499] in qmgr_test (0x0032fed8) 4 0x60543bbb __wine_spec_exe_entry+0x5b(peb=0x7ffdf000) [/home/julliard/wine/wine/dlls/winecrt0/exe_entry.c:36] in qmgr_test (0x0032ff08) 5 0x7b876d47 start_process+0xc7(arg=0x0) [/home/julliard/wine/wine/dlls/kernel32/process.c:904] in kernel32 (0x0032ffe8) 6 0x600289c7 wine_switch_to_stack+0x17() in libwine.so.1 (0x00000000) 0x60540d3a func_file+0x27a [/home/julliard/wine/wine/dlls/qmgr/tests/file.c:108] in qmgr_test: movl 0x0(%eax),%edx 108 IBackgroundCopyFile_Release(test_file); -- Alexandre Julliard julliard(a)winehq.org

1 0

Support of USB hardware tokens
by Alexander Morozov 07 Jul '08

07 Jul '08

Hello All, I created a patch which adds support of USB hardware tokens with native Windows drivers (.sys): ftp://ftp.etersoft.ru/pub/download/amorozov/0001-Support-of-native-Windows-drivers-for-USB-tokens.txt Now SafeNet UltraPro (driver sntnlusb.sys, vid/pid 04b9:0300) and Eutron SmartKey 3 (driver eusk3usb.sys, vid/pid 073d:0025) are supported. These devices are used by some Windows applications for piracy defense. This patch adds dlls/usbd.sys, dlls/wineusbhub and programs/wineusb. Usbd.sys is exist also in Windows. This is a kernel level DLL exporting some functions required for USB drivers. Wineusbhub plays a role of a lower driver in device stack (under USB token driver). Wineusb is a service calling driver`s AddDevice routine if there is a registry key corresponding to device and device is plugged. Now this check is executed only when wineusb is starting. USB driver is loaded by programs/winedevice. Now AddDevice and some PNP functions are called in addition to DriverEntry. Calling DriverEntry is realized by means of wineserver requests. Some required ntoskrnl.exe functions are added. For using native USB driver should copy HKLM\System\CurrentControlSet\Enum\USB\Vid_<vid>&Pid_<pid> and HKLM\System\CurrentControlSet\Services\<driver_name> from Windows registry. HKLM\System\CurrentControlSet\Services\<driver_name>\Start should be setted to 2. I`d like to add this patch to Wine. What about this? I think should split my patch into many little commits. Should also add some tests or make some changes? Thanks, Alexander Morozov

2 2

Odd valgrind error in imm.c, possible fix
by Dan Kegel 07 Jul '08

07 Jul '08

Today a test got stuck, and I had to kill wineserver. After that, lots of tests seem to have the same error: + Invalid read of size 4 + at IMM_FreeThreadData (imm.c:233) + by DllMain (imm.c:385) + by __wine_spec_dll_entry (dll_entry.c:40) + by (within /home/dank/wine-git/dlls/ntdll/ntdll.dll.so) + by MODULE_InitDLL (loader.c:910) + by process_detach (loader.c:1081) + by LdrShutdownProcess (loader.c:2143) + by ExitProcess (process.c:2101) + by service_run_main_thread (service.c:604) + by StartServiceCtrlDispatcherW (service.c:703) + by wmain (device.c:287) + Address 0x0 is not stack'd, malloc'd or (recently) free'd Presumably this is because killing wineserver also killed the background notepad I run to keep from having to valgrind wineboot etc. over and over again. If the immediate cause is something like imm32's DllMain getting called with DLL_PROCESS_DETACH after being called with DLL_THREAD_DETACH, the following patch might be a sensible fix. Is it? diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 94b7752..bcd11f1 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -230,10 +230,13 @@ static void IMM_InitThreadData(void) static void IMM_FreeThreadData(void) { IMMThreadData* data = TlsGetValue(tlsIndex); - IMM_DestroyContext(data->defaultContext); - DestroyWindow(data->hwndDefault); - HeapFree(GetProcessHeap(),0,data); - TRACE("Thread Data Destroyed\n"); + if (data) + { + IMM_DestroyContext(data->defaultContext); + DestroyWindow(data->hwndDefault); + HeapFree(GetProcessHeap(),0,data); + TRACE("Thread Data Destroyed\n"); + } } static HMODULE LoadDefaultWineIME(void)

1 0

Re: mpr: Add Russian translation
by Vitaliy Margolen 06 Jul '08

06 Jul '08

Aleksey Bragin wrote: > All those things have been translated more than 2 years ago and > submitted here (attaching again). The quality, for example in mpr.dll is > even better (vs. the patch by Vitaliy Margolen which was committed > 7d3a5af43ea0d66a0596a4fac22cf88ae50d2745 in april, 2008). > > Please, Vitaliy, or any other russian here, rework these patches so they > could be applied against recent Wine head, or use them as inspiration > for your work. I don't have time to do this at the moment, unfortunately. > Please send one dll at a time as a patch (plain text attachment, no zips, not binaries). Also the are only few things left untranslated (crypt32 and kernel error messages). Why are you sending shdocvw which is already 100% translated? Same for shlwapi. Vitaliy.

1 0

Patch feedback
by Alexander Nicolaysen Sørnes 06 Jul '08

06 Jul '08

Hello, I would really appreciate any feedback as to how these patches can be improved so that they will be accepted into Wine. regedit: Add support for importing Unicode files http://www.winehq.org/pipermail/wine-patches/2008-June/056856.html I know this patch is a little big, but I'm not sure how it could be split up without possible data loss on import. Is that acceptable? I could for instance make a first patch that merely reads the file as Uncode then converts each line to multibyte characters. user32: Always use old-style colours for Windows 3.x http://www.winehq.org/pipermail/wine-patches/2008-June/056898.html Alexander N. Sørnes

3 2

Alternate shell?
by Dan Kegel 06 Jul '08

06 Jul '08

For a maximal dogfood experience, I was looking around for a way to use a replacement Windows shell with Wine as my desktop environment instead of gnome or kde. So far, all the ones I've found are either broken, hard to use, or just plain weird. I've been working through the list at http://www.dmoz.org/Computers/Software/Operating_Systems/Microsoft_Windows/… http://www.astonshell.com/aston/ - couldn't figure out how to run it? http://www.emergedesktop.org/ - kind of works, but very minimal, no start menu http://www.labyrinth.net.au/~mosses/rob/liteshell.html - works, but very minimal, no start menu http://purels.org - no help, just exits, saying "ha ha, you didn't configure me". Obviously not meant for me :-) http://www.lighttek.com/talisman.htm - pretty, but no Programs menu?! (Maybe that's there but broken, wine bug?) http://www.sky.franken.de/explorer/download.html - ROS explorer - prebuilt binary there is 3 years out of date, doesn't work too well Anyone have a favorite I should try? - Dan

11 19

Re: mswsock:Implement 3 functions by calling through SIO_GET_EXTENSION_FUNCTION_POINTER
by Andrey Turkin 06 Jul '08

06 Jul '08

You should mention somewhere (FIXME or TODO or something) what the code currently rely on socket being not used by WSAIoctl. IIRC Windows won't let you call WSAIoctl(0, ...) Correct way would be to retrieve both AcceptEx and GetAcceptExSockaddrs routine addresses in AcceptEx wrapper and store lpOutputBuffer->fn mapping somewhere. Jon Griffiths wrote: > Hi, > > This is part one of a patch set that implements TransmitFile/Transmit packets and fixes bug 5048. This first part implements AcceptEx/GetAcceptExSockaddrs & TransmitFile by calling them from ws2_32 using SIO_GET_EXTENSION_FUNCTION_POINTER. Next up is the implementation itself. > > Cheers > Jon > > > > > > ------------------------------------------------------------------------ > >

2 1

Pipeline separation preview
by Stefan Dösinger 06 Jul '08

06 Jul '08

Hi, I'm sending a preview of my vertex-fragment-misc pipeline separation patches as discussed a few weeks ago. The patch comments have more descriptions. The relevant patches start at patch 5, the other patches are other junk in my tree. Any comments? Stefan

3 7

Re: richedit: do not read actual scrollbar state for scrollbar update, use internal state instead (RESEND)
by Detlef Riekenberg 06 Jul '08

06 Jul '08

On Fr, 2008-07-04 at 16:32 -0500, Alex Villacís Lasso wrote: > Resending. Please comment on this patch. > dlls/riched20/editor.c | 21 ++ > dlls/riched20/editstr.h | 3 + > dlls/riched20/paint.c | 36 ++- > dlls/riched20/tests/editor.c | 794 > ++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 844 insertions(+), 10 deletions(-) I have no Idea about riched20, but your patch is far to huge. - Do not submit dead code: * reportScrollRanges - Do not submit debugging code: * There is no need to flood the output with trace() Fine during development, but remove that before you create a Patch - The implementation is enough for a seperate Patch - Please add only a basic Test in a Patch - Add more Tests in seperate Patches: * Every "DestroyWindow(hwndRichEdit)" is the end of a Patch Thanks -- By by ... Detlef

1 0

Re: test for RasEnumDevicesA [2/2]
by Stefan Leichter 06 Jul '08

06 Jul '08

Please use this version Am Sunday 06 July 2008 13:49 schrieb Stefan Leichter: ChangeLog --------- added some more tests for RasEnumDevicesA, fix wine not to crash on the tests

1 0

CreateFontIndirectEx and GetCharacterPlacement patches
by Nikolay Sivov 06 Jul '08

06 Jul '08

Is it something wrong with these patches: http://www.winehq.org/pipermail/wine-patches/2008-June/056807.html http://www.winehq.org/pipermail/wine-patches/2008-June/056808.html They are related to bugs #13064 and #13094..

1 0

Yet another person's list of must-have windows apps
by Dan Kegel 06 Jul '08

06 Jul '08

http://www.benjarvis.org/tech/how-to-minimize-your-windows-usage/ lists his must-have windows apps as ---snip--- - Ableton Live 7 (Nothing can replace this yet and the latency is too long under WINE) - VST Instruments (DLL files that are used by Ableton Live) - iTunes (I may move back to Rockbox now that Banshee works better) - World of Warcraft (My video card is too weak to run it in Linux) - Various Emulators (Once I get my Xbox 360 controller to work under Ubuntu, I will be migrating these) - Magic the Gathering (It has issues under WINE, but I barely even play) ---snip--- I guess that's one more vote for schannel.

3 5

Re: Tricking program into seeing actual gfx driver not WINE's
by Seth Shelnutt 06 Jul '08

06 Jul '08

I get the following error when applying your patch via git-am, shelnutt@Ubuntu32-L:~/wine$ git-am 0001-a-hack-to-make-Folding-Home-think-I-am-using-an-NVID.patch cat: .dotest/next: No such file or directory previous dotest directory .dotest still exists but mbox giv I was able to apply it manually though using the patch command. The only difference between your patch and mine was I also changed "display", and I changed it to "nv4_display.dll". I guess that doesn't work. It is compiling now, so thanks for the patch. Also I wasn't aware of the change of name for Wine. I'll stop the all caps now ;). On Sat, Jul 5, 2008 at 9:44 PM, Jeff Zaroyko <jeffzaroyko(a)gmail.com> wrote: > On Sun, Jul 6, 2008 at 11:11 AM, Seth Shelnutt <shelnutt2(a)gmail.com> > wrote: > > After replacing the driver "Display" with "nv4_display.dll" and > desctiption > > with "NVIDIA GeForce 8800" I still get the same problem. It says the card > is > > not supported. > > > > Hi Seth > > I'm not sure of your exact change, but I have attached a patch which > succeeds for me. > > In your git directory, run > > git reset --hard # reverts all changes you have made > git-am 0001-a-hack-to-make-Folding-Home-think-I-am-using-an-NVID.patch > # applies my patch > cd dlls/wined3d > make > > now cd to the Folding@home install directory and run > /path/to/git/wine/wine Folding(a)home.exe > > just on a side note, we say Wine, not WINE since the name changed some > time ago > http://wiki.winehq.org/FAQ#head-8b4fbbe473bd0d51d936bcf298f5b7f0e8d25f2e > > > If you have any other questions, let me know. > > Jeff >

1 0

Re: Update: comctl32: fix listview select-all
by Vitaliy Margolen 06 Jul '08

06 Jul '08

winehq.10.drkshadow(a)spamgourmet.com wrote: > Fixes the Listview control to not individually select and focus each > items. Has the added bugfix that it keeps the same item focused as was > to begin with, and doesn't scroll the list. > > Updated: my if was incorrect and it was handling cases it shouldn't have > handled. It's improved now, and as far as I can tell handles only the > select-all case. Please fix the formatting - 4 spaces indentation. No tabs. Do not reformat the lines that you did not modify. Follow the file style with curly brackets - here they go on the separate line. Is there a reason you added whole new function SelectAll() which is used in only one place and has only 4 lines? And the most important - you missed your real name. Patches from anonymous posters are not accepted. Vitaliy.

1 0

Tricking program into seeing actual gfx driver not WINE's
by Seth Shelnutt 05 Jul '08

05 Jul '08

Hello All, We have run into an interesting problem while trying to get the latest version of Stanford's Folding at Home GPU client to work in Linux via WINE. The programs says it does not detect a compatible GPU. Even when the user has installed the correct Nvidia drivers (with CUDA support) and has a compatible GPU. The problem I believe lies in the fact that the program is not told that there is a Nvidia 8800 installed, instead by the nature of WINE it see that "WINE" is the graphics card, as WINE first translate the direct3d calls into opengl calls that are then passed on to the GPU. So the question is, is it possible to trick programs into believing they are running on the right hardware? (As in fact they are). I remember a while ago the steam system spec survey was used to see how many people run steam via WINE. This was done by noting the graphics driver installed and how the wine one appeared when running WINE. Well this is fine but what we need is a way to make the program to see that it is actually running on Nvidia hardware. Because if the client would just start then the direct3d calls can be translated into opengl calls and the Nvidia linux drivers can then handle them and run it all fine and dandy. Here is the post, with error message about wrong graphics card detected, http://www.ocforums.com/showpost.php?p=5698997&postcount=19 . Thanks, Seth Shelnutt

6 11

New valgrind warnings in NdrComplexArrayUnmarshall (oleaut32/tests/tmarshal)
by Dan Kegel 05 Jul '08

05 Jul '08

Probably triggered by Rob's five rpcrt4 patches on July 3rd, who knows, perhaps the removal of the memset in http://www.winehq.org/pipermail/wine-cvs/2008-July/045025.html Rob, can you have a look? http://kegel.com/wine/valgrind/logs-2008-07-04/vg-oleaut32_tmarshal-diff.txt e.g. + Conditional jump or move depends on uninitialised value(s) + at VARIANT_ValidateType (variant.c:545) + by VariantClear (variant.c:598) + by VARIANT_UserUnmarshal (usrmarshal.c:594) + by NdrUserMarshalUnmarshall (ndr_marshall.c:3772) + by ComplexUnmarshall (ndr_marshall.c:2439) + by NdrComplexArrayUnmarshall (ndr_marshall.c:3505) + by PointerUnmarshall (ndr_marshall.c:1302) + by EmbeddedPointerUnmarshall (ndr_marshall.c:1622) + by NdrSimpleStructUnmarshall (ndr_marshall.c:2059) + by PointerUnmarshall (ndr_marshall.c:1302) + by NdrPointerUnmarshall (ndr_marshall.c:1886) + by IDispatch_RemoteInvoke_Stub (oleaut32_oaidl_p.c:838) + by CStdStubBuffer_Invoke (cstub.c:433) + by RPC_ExecuteCall (rpc.c:1392) + by apartment_wndproc (compobj.c:547) + by ??? (library.h:163) + by call_window_proc (winproc.c:457) + by WINPROC_CallProcAtoW (winproc.c:1011) + by WINPROC_call_window (winproc.c:2209) + by DispatchMessageA (message.c:3067) + Uninitialised value was created by a client request + at mark_block_uninitialized (heap.c:164) + by RtlAllocateHeap (heap.c:1239) + by IMalloc_fnAlloc (ifs.c:186) + by CoTaskMemAlloc (ifs.c:562) + by NdrOleAllocate (ndr_ole.c:359) + by NdrAllocate (ndr_marshall.c:381) + by NdrComplexArrayUnmarshall (ndr_marshall.c:3498) + by PointerUnmarshall (ndr_marshall.c:1302) + by EmbeddedPointerUnmarshall (ndr_marshall.c:1622) + by NdrSimpleStructUnmarshall (ndr_marshall.c:2059) + by PointerUnmarshall (ndr_marshall.c:1302) + by NdrPointerUnmarshall (ndr_marshall.c:1886) + by IDispatch_RemoteInvoke_Stub (oleaut32_oaidl_p.c:838) + by CStdStubBuffer_Invoke (cstub.c:433) + by RPC_ExecuteCall (rpc.c:1392) + by apartment_wndproc (compobj.c:547) + by ??? (library.h:163) + by call_window_proc (winproc.c:457) + by WINPROC_CallProcAtoW (winproc.c:1011) + by WINPROC_call_window (winproc.c:2209) ...

1 0

[Fwd: Re: richedit: Store richedit version rather than boolean bEmulateVersion10 value]
by James McKenzie 04 Jul '08

04 Jul '08

forgot to hit the Reply-All button... -------- Original Message -------- Phil Krylov wrote: > On 03/07/2008, Dylan Smith <dylan.ah.smith(a)gmail.com> wrote: > > On Thu, Jul 3, 2008 at 2:01 PM, Juan Lang <juan.lang(a)gmail.com> wrote: > > > > > Hi Dylan, > > > > > > - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) > > > + if (!editor->dwEmulatedVersion || (editor->nEventMask & ENM_UPDATE)) > > > > > > This change is incorrect, as dwEmulatedVersion is never set to 0. I > > > believe you mean if (editor->dwEmulatedVersion > 0x100 || ... > > > > > > > You're right, that was a mistake. Thanks for catching it. > > > > > I have to ask, though: what bug does this fix? > > > > > > > This doesn't fix a bug, but it allows me to add functionality for > > msftedit.dll without changing the way riched20.dll works when loaded > > directly. Without storing more than a boolean value it will be hard to > > support the multiple versions of richedit controls. > > > > I would like to properly implement tables for richedit controls, which > > greatly differs in how it is implemented between riched20.dll and > > msftedit.dll. Should I only worry about how it is done in the newer > > richedit controls? I am worried that this will cause problems considering > > that amy program that loads msftedit.dll assumes that they are getting a > > specific implementation. > > > IMHO no real applications depend on poverty of table functionality of > versions 2 and 3. If somebody finds one, we could think about it > then... To my knowledge, there is just one thing better in table > support of 2.0 than in 3.0 and IIRC 4.1: better breaking of long > tables on page boundaries when printing. But I consider it a bug in > versions >2.0 which we should not replicate (when EM_FORMATRANGE will > be supported). > I will look into this as time permits. I am now on a three hour commute for my present employment committment, which is through the end of July. I may be extended, picked up by the future company, discarded or find employment closer to my domincile, or any combination. I have looked at Troy Rollo's code and it was current as of 0.9.59. If someone wants it, I can zip up the difference file and send it to them. I can also add it to the issue I was working with. James McKenzie

1 0

Tricking program into seeing actual gfx driver not WINE's
by Martijn Berger 04 Jul '08

04 Jul '08

>* Hello All, *>* *>* We have run into an interesting problem while trying to get the latest *>* version of Stanford's Folding at Home GPU client to work in Linux via WINE. *>* The programs says it does not detect a compatible GPU. Even when the user *>* has installed the correct Nvidia drivers (with CUDA support) and has a *>* compatible GPU. The problem I believe lies in the fact that the program is *>* not told that there is a Nvidia 8800 installed, instead by the nature of *>* WINE it see that "WINE" is the graphics card, as WINE first translate the *>* direct3d calls into opengl calls that are then passed on to the GPU. So the *>* question is, is it possible to trick programs into believing they are *>* running on the right hardware? (As in fact they are). *>* *>* I remember a while ago the steam system spec survey was used to see how many *>* people run steam via WINE. This was done by noting the graphics driver *>* installed and how the wine one appeared when running WINE. Well this is fine *>* but what we need is a way to make the program to see that it is actually *>* running on Nvidia hardware. Because if the client would just start then the *>* direct3d calls can be translated into opengl calls and the Nvidia linux *>* drivers can then handle them and run it all fine and dandy. *>* *>* Here is the post, with error message about wrong graphics card detected, *>* http://www.ocforums.com/showpost.php?p=5698997&postcount=19 . * I think you would have to create wrapper dll's that pass the function calls along to libcudart.so.2.0 The following libraries are in the CUDA download for linux. libcublas.so.2.0 libcublasemu.so.2.0 libcudart.so.2.0 libcufft.so.2.0 libcufftemu.so.2.0 I am unsure if you would need to modify more but I am pretty sure that running the windows veersions of those dlls directly o wine is nto what you want.

1 0

OT: Main website is down / misconfigured
by Paul Chitescu 04 Jul '08

04 Jul '08

http://www.winehq.org/ Fatal error: Call to undefined function () in /home/winehq/opt/website/include/config.php on line 51 Does it ring a bell?

1 0

Re: [1/2] wininet: Add support of INTERNET_FLAG_NO_CACHE_WRITE
by Hans Leidekker 04 Jul '08

04 Jul '08

On Friday 04 July 2008 10:15:57 Alexander Morozov wrote: + if ((lpwhr->hdr.dwFlags & INTERNET_FLAG_NO_CACHE_WRITE) && + CSTR_EQUAL == CompareStringW(LOCALE_SYSTEM_DEFAULT, 0, + lpwhr->lpszVerb, strlenW(lpwhr->lpszVerb), szPOST, strlenW(szPOST))) No need to use CompareStringW here, these are fixed strings, defined by the protocol. -Hans

1 0

Re: quartz: Implement state transitions in video renderer
by Maarten Lankhorst 04 Jul '08

04 Jul '08

2008/7/4 Maarten Lankhorst <m.b.lankhorst(a)gmail.com>: > --- > Fixes video renderer in the same way as directsound renderer Wait with this patch, it doesn't apply. Apparantly I accidentally touched the video renderer in an earlier patch in my tree which messed this one up.

1 0

Re: richedit: Store richedit version rather than boolean bEmulateVersion10 value
by Phil Krylov 03 Jul '08

03 Jul '08

On 03/07/2008, Dylan Smith <dylan.ah.smith(a)gmail.com> wrote: > On Thu, Jul 3, 2008 at 2:01 PM, Juan Lang <juan.lang(a)gmail.com> wrote: > > > Hi Dylan, > > > > - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) > > + if (!editor->dwEmulatedVersion || (editor->nEventMask & ENM_UPDATE)) > > > > This change is incorrect, as dwEmulatedVersion is never set to 0. I > > believe you mean if (editor->dwEmulatedVersion > 0x100 || ... > > > > You're right, that was a mistake. Thanks for catching it. > > > I have to ask, though: what bug does this fix? > > > > This doesn't fix a bug, but it allows me to add functionality for > msftedit.dll without changing the way riched20.dll works when loaded > directly. Without storing more than a boolean value it will be hard to > support the multiple versions of richedit controls. > > I would like to properly implement tables for richedit controls, which > greatly differs in how it is implemented between riched20.dll and > msftedit.dll. Should I only worry about how it is done in the newer > richedit controls? I am worried that this will cause problems considering > that amy program that loads msftedit.dll assumes that they are getting a > specific implementation. IMHO no real applications depend on poverty of table functionality of versions 2 and 3. If somebody finds one, we could think about it then... To my knowledge, there is just one thing better in table support of 2.0 than in 3.0 and IIRC 4.1: better breaking of long tables on page boundaries when printing. But I consider it a bug in versions >2.0 which we should not replicate (when EM_FORMATRANGE will be supported). -- Ph.

1 0

Re: [UPDATE] shell32: Check registry entry for cpl files (in standard control panel)
by Rob Shearman 03 Jul '08

03 Jul '08

2008/7/2 Owen Rudge <owen(a)owenrudge.net>: > This patch fixes bug #12534. It adds a check to the built-in control > panel for any .cpl files in the registry, in addition to those .cpl > files in the system directory. Control Panel applets can also be registered in "HKCU\Control Panel\MMCPL". -- Rob Shearman

4 5

re: gdi32: Implement automatic font substitution
by Dan Kegel 03 Jul '08

03 Jul '08

Liu Qishuai wrote: > This patch appends all fonts on child_list so that if a character is > not available in the font, other fonts will be automatically used. > This is how Windows does to get a CJK character when a latin font is specified. > > A lot of CJK-related bugs will be fixed after applying this patch. Excellent! In case AJ hesitates to apply this patch: Can you write a conformance test that verifies this behavior? Also, can you identify a bug in bugzilla this will fix? - Dan

4 13

Re: msxml3/test: Added test file for ISAXXMLReader (6/6)
by Alistair Leslie-Hughes 03 Jul '08

03 Jul '08

"Piotr Caban" <piotr.caban(a)gmail.com> wrote in message news:200807022156.01609.piotr.caban@gmail.com... > --- > dlls/msxml3/tests/Makefile.in | 3 +- > dlls/msxml3/tests/saxreader.c | 225 > +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 227 insertions(+), 1 deletions(-) > create mode 100644 dlls/msxml3/tests/saxreader.c > What about checking for invalid arguments as well? Best Regards Alistair Leslie-Hughes

2 1

EnterCriticalSection throws exception?
by Huang, Zhangrong 03 Jul '08

03 Jul '08

Hi, According to MSDN http://msdn.microsoft.com/en-us/library/ms682608(VS.85).aspx: EnterCriticalSection can raise EXCEPTION_POSSIBLE_DEADLOCK if a wait operation on the critical section times out. The timeout interval is specified by the following registry value: HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\CriticalSectionTimeout. Currently, WIne doesn't implement this timeout feature, instead wine throws exception only for Wine internal locks after waiting for about 65 seconds, it is useful to check deadlock, see RtlpWaitForCriticalSection in dlls/ntdll/critsection.c But this means a thread can't hold critical section longer than 65 seconds, otherwise app will crash. On some conditions, a thread does need hold critical section more than 65 seconds, for example: wine's implementation of GetAddress uses a critical section to protect non-reentrant gethostbyname() (well maybe need another gethostbyname_r() patch), see dlls/wininet/utility.c As you can see, gethostbyname() may take longtime when DNS setting is wrong or network is broken. If a multi-thread app calls GetAddress simultaneous in many threads, the app will crash. I meet this problem when my network was broken, my app kept crash: fixme:wininet:InternetSetOptionW INTERNET_OPTION_SEND/RECEIVE_TIMEOUT err:ntdll:RtlpWaitForCriticalSection section 0x7e44fa80 "utility.c: cs_gethostbyname" wait timed out in thread 0037, blocked by 003b, retrying (60 sec) fixme:msxml:DllCanUnloadNow wine: Critical section 7e44fa80 wait failed at address 0x7bc3c5bc (thread 0039), starting debugger... WineDbg starting on pid 0008 Unhandled exception: wait failed on critical section 0x7e44fa80 cs_gethostbyname err:seh:raise_exception Unhandled exception code c0000194 flags 0 addr 0x7bc3c5bc So I suggest a feature that EnterCriticalSection throws exception for Wine internal locks only when debug is present. Add the following code dlls/ntdll/critsection.c: NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { ........................... /* Throw exception only for Wine internal locks and debug is present */ if ((!crit->DebugInfo) || (!crit->DebugInfo->Spare[0])) continue; else if (!NtCurrentTeb()->Peb->BeingDebugged) continue; ^^^^^^^^^^^^^^^^^^ add ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ rec.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; ............................ } Any suggestion? Sorry If I'm not clean or missing something, thanks. -- $ apt-get moo (__) (oo) /------\/ / | || * /\---/\ ~~ ~~ ...."Have you mooed today?"...

8 14

Re: richedit: Store richedit version rather than boolean bEmulateVersion10 value
by Juan Lang 03 Jul '08

03 Jul '08

Hi Dylan, - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) + if (!editor->dwEmulatedVersion || (editor->nEventMask & ENM_UPDATE)) This change is incorrect, as dwEmulatedVersion is never set to 0. I believe you mean if (editor->dwEmulatedVersion > 0x100 || ... I have to ask, though: what bug does this fix? --Juan

2 1

Re: wined3d: Fix a deadlock that may occur during initialization
by H. Verbeet 03 Jul '08

03 Jul '08

2008/7/3 Maarten Lankhorst <m.b.lankhorst(a)gmail.com>: > - * Copyright 2007-2008 Stefan Dösinger for CodeWeavers > + * Copyright 2007-2008 Stefan Dï¿½singer for CodeWeavers You shouldn't be changing Stefan's name though.

2 1

Thoughts on implementation of winhttp.dll
by Zac Brown 03 Jul '08

03 Jul '08

Hi, I've been looking at implementing winhttp.dll. Does anyone have thoughts on implementing parts of winhttp in terms of wininet? The primary issue that prevents entirely implementing winhttp in terms of wininet is that there is no direct Win32 API for fetching an SSL certificate in winhttp. To access these, I'd need access to functions defined in wininet/netconnection.c but aren't exported. My current two ideas are to either: 1) Copy the networking sublayer from wininet into winhttp and build on top of that to implement winhttp. Effectively reimplementing mostly from scratch. 2) Implement most winhttp things in terms of wininet and then copying over parts that I need from wininet's network sublayer, like fetching SSL certificates and so on. Thoughts on this are greatly appreciated, as I'd prefer to only have to write the library once. -Zac

3 5

Unable to make crosstest for mlang/tests
by Vitaly Perov 03 Jul '08

03 Jul '08

"make" command works, but when I try "make crosstest" the following message appears: mlang.cross.o: In function `func_mlang': /home/vitperov/Projects/wine/dlls/mlang/tests/mlang.c:831: undefined reference to `_IID_IMultiLanguage2' /home/vitperov/Projects/wine/dlls/mlang/tests/mlang.c:864: undefined reference to `_IID_IMLangFontLink' I've solved this problem by inserting: const GUID IID_IMLangFontLink_n DECLSPEC_HIDDEN; const GUID IID_IMLangFontLink_n = { 0x359f3441, 0xbd4a, 0x11d0, { 0xb1, 0x88, 0x00, 0xaa, 0x00, 0x38, 0xc9, 0x69 } }; const GUID IID_IMultiLanguage2_n DECLSPEC_HIDDEN; const GUID IID_IMultiLanguage2_n = { 0xdccfc164, 0x2b38, 0x11d2, { 0xb7, 0xec, 0x00, 0xc0, 0x4f,0x8f,0x5d,0x9a } }; and then use &IID_IMultiLanguage2_n instead of &IID_IMultiLanguage2. But it is not good decision! Does anybody know the correct way to fix these tests? -- Best wishes, Vitaly Perov Russia, Saint-Petersburg. www.etersoft.ru

3 3

Get Windows-PID for process with known Unix-PID
by Martin Szydlowski 03 Jul '08

03 Jul '08

Hi all, I am starting and stopping some Windows (and also Unix) programs from a shell script. To start, I use fork/exec which gives me the Unix PID. To stop the program I use kill. I have experimented with different signals (TERM, HUP, INT, KILL) and all of them achieve the goal of stopping the program, but it does not shut down cleanly (as opposed to using File->Exit or the red X). I have written a small program (winelib) that enumerates all windows and can send as WM_CLOSE message to a program with a certain Windows PID. Since I have several instances of the same executable running, I cannot distinguish them by name or path, hence I save the PID when starting them, but it's the Unix PID I have. I believe there must be a way to get a mapping of Windows-PIDs <-> Unix-PIDs, but extensive googling only revealed (repeatedly) to me that those two must not be confused. I know I can get the Windows-PIDs using winedbg->info process but there is no trace of Unix PIDs there. Also, I need a scriptable way to do this, best being a small app that gets a Unix PID and prints the matching Windows PID to console. greetz Martin

2 1

Re: Sorry, resend, with patch now. [try 3] gdi32/tests: Add tests for GdiGetCodePage.
by Alexandre Julliard 03 Jul '08

03 Jul '08

"Huang, Zhangrong" <hzhrong(a)gmail.com> writes: > This pacth add tests for GdiGetCodePage, which currently don't pass on WIne. > > ChangeLog > gdi32/tests: Add tests for GdiGetCodePage. It doesn't work here: ../../../tools/runtest -q -P wine -M gdi32.dll -T ../../.. -p gdi32_test.exe.so font.c && touch font.ok font.c:833: Test succeeded inside todo block: data index 2: GdiGetCodePage should have returned 1252, got 1252 font.c:833: Test succeeded inside todo block: data index 3: GdiGetCodePage should have returned 1252, got 1252 font.c:830: Test failed: data index 14: expected font codepage 42, got 1252 font.c:833: Test succeeded inside todo block: data index 15: GdiGetCodePage should have returned 1253, got 1253 font.c:833: Test succeeded inside todo block: data index 16: GdiGetCodePage should have returned 1251, got 1251 font.c:830: Test failed: data index 17: expected font codepage 936, got 1252 font.c:1559: Tests skipped: Symbol or Wingdings is not installed font.c:1575: Tests skipped: Symbol or Wingdings is not installed font.c:1729: Tests skipped: Symbol is not installed font.c:2507: Tests skipped: Arial Black or Symbol/Wingdings is not installed font.c:1955: Tests skipped: Font DejaVu Sans doesn't contain 'x', skipping the test font.c:1955: Tests skipped: Font DejaVu Sans Condensed doesn't contain 'x', skipping the test font.c:1955: Tests skipped: Font OpenSymbol doesn't contain 'x', skipping the test make[2]: *** [font.ok] Error 6 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] wininet: moved cookie loading from HttpOpenRequest() to HttpSendRequest()
by Hans Leidekker 03 Jul '08

03 Jul '08

On Wednesday 02 July 2008 19:27:43 Yann Droneaud wrote: > This patch does the following: > > - Move cookie retrieval code to HTTP_HttpSendRequest() > - Don't allocate memory for url if INTERNET_FLAG_NO_COOKIES is enabled > - Be sure to not overflow lpszCookies: > buffer size was nCookieSize + 1 + 8, > written size is 8 + (nCookieSize - 1) + 2 + 1 > - Optimized request header generation: > sprintfW() replaced by strcpyW() > strcatW() replaced by strcpyW() > removed call to strlenW() for HTTP_HttpAddRequestHeadersW() > - Use HTTP_ADDREQ_FLAG_ADD instead of HTTP_ADDHDR_FLAG_ADD > - Use HTTP_ADDREQ_FLAG_REPLACE to replace the cookie instead of adding Thanks Yann, good to see you move on to fix more bugs. To be accepted in git each of those items should be a separate patch though, and the impact of moving the cookie code is such that it needs a test case. -Hans

2 2

start/stop logs by code... is it possible ?
by Massimo Del Fedele 03 Jul '08

03 Jul '08

I'd like to start some trace log entering a function and stopping it at exit, to isolate just the part I need. Is it possible to add some code inside the function body that do it ? I mean... void aWineFunction(...) { ....... STARTLOG ....... ....... STOPLOG ....... } The purpose is to isolate traces from code called by a single function. Max

4 5

Re: [Gdiplus 03/16] test_getgenerics: Don't use a pointer-to-pointer construct.
by Alexandre Julliard 03 Jul '08

03 Jul '08

Adam Petaccia <adam(a)tpetaccia.com> writes: > diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c > index 59a6cb7..e710c30 100644 > --- a/dlls/gdiplus/tests/font.c > +++ b/dlls/gdiplus/tests/font.c > @@ -189,42 +189,38 @@ static void test_fontfamily (void) > static void test_getgenerics (void) > { > GpStatus stat; > - GpFontFamily** family; > + GpFontFamily* FontFamily; It's a matter of taste, but I think 'family' was a much better name that 'FontFamily' for a local variable. The latter looks like an API call. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [Gdiplus 01/16] Valgrind: fix warnings about using uninitialized memory, and leaking memory
by Alexandre Julliard 03 Jul '08

03 Jul '08

Adam Petaccia <adam(a)tpetaccia.com> writes: > @@ -152,6 +154,8 @@ static void test_fontfamily (void) > WCHAR itsName[LF_FACESIZE]; > GpStatus stat; > > + ZeroMemory(itsName, sizeof(itsName)); > + Clearing buffers is almost always a sign that you are hiding a bug. Please fix it properly instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel