March 2005 - Wine-Devel - list.winehq.org

Re: combo - implement GetComboBoxInfo
by Steven Edwards March 16, 2005

March 16, 2005

Hi, --- Alexandre Julliard <julliard(a)winehq.org> wrote: > The IsWindow check is useless, what you need is to verify that it's > really a combobox. The right way to do that is probably to send a > CB_GETCOMBOBOXINFO message instead. How about something like this instead? Index: dlls/user/combo.c =================================================================== RCS file: /home/wine/wine/dlls/user/combo.c,v retrieving revision 1.8 diff -u -r1.8 combo.c --- dlls/user/combo.c 23 Dec 2004 17:21:05 -0000 1.8 +++ dlls/user/combo.c 15 Mar 2005 19:09:52 -0000 @@ -27,7 +27,6 @@ * If you discover missing features, or bugs, please note them below. * * TODO: - * - GetComboBoxInfo() * - ComboBox_[GS]etMinVisible() * - CB_GETCOMBOBOXINFO * - CB_GETMINVISIBLE, CB_SETMINVISIBLE @@ -2293,10 +2292,27 @@ /************************************************************************* * GetComboBoxInfo (USER32.@) */ -BOOL WINAPI GetComboBoxInfo(HWND hwndCombo, /* [in] handle to combo box */ - PCOMBOBOXINFO pcbi /* [in/out] combo box information */) -{ - FIXME("\n"); - return FALSE; - +BOOL WINAPI +GetComboBoxInfo(HWND hwndCombo, /* [in] handle to combo box */ + PCOMBOBOXINFO pcbi /* [in/out] combo box information */) +{ + static const WCHAR ComboBoxW[] = { 'C', 'o', 'm', 'b', 'o', 'B', 'o', 'x', 0 }; + CHAR szBuffer[MAX_PATH + 1]; + int dwSize; + LPHEADCOMBO lphc; + + dwSize = GetClassNameW(hwndCombo, szBuffer, sizeof(szBuffer)/sizeof(szBuffer[0])-1); + + if (lstrcmpiW(szBuffer, ComboBoxW) != 0) + return FALSE; + + lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwndCombo, 0 ); + + pcbi->hwndCombo = hwndCombo; + pcbi->hwndList = lphc->hWndLBox; + pcbi->hwndItem = lphc->hWndEdit; + pcbi->rcItem = lphc->textRect; + pcbi->rcButton = lphc->buttonRect; + pcbi->stateButton = lphc->wState; + return TRUE; } __________________________________ Do you Yahoo!? Read only the mail you want - Yahoo! Mail SpamGuard. http://promotions.yahoo.com/new_mail

5 5

Debugging idiosyncrasy
by Paul Millar March 16, 2005

March 16, 2005

Hi, Something I've noticed whilst playing with winedbg (and its auto mode). If there's no AeDebug key in the registry, then the default is to run the debugger in non-interactive mode: paul(a)scaramanga:~/CVS/wine$ grep cmdline.*winedbg dlls/kernel/except.c sprintf(cmdline, "winedbg --auto %ld %ld", Yet, if there's no registry at all, then the default registry values are configured to run the debugger in interactive mode: paul(a)scaramanga:~/CVS/wine$ grep AeDebug.*Debugger tools/wine.inf HKLM,Software\Microsoft\Windows NT\CurrentVersion\AeDebug,"Debugger",,"winedbg %ld %ld" I think we should be consistent here, no? Cheers, Paul

1 0

Got message form ./configure to send this e-mail
by Lauris Misa March 16, 2005

March 16, 2005

Hello! I'm trying to compile wine on my AMD64 system and I got this message on STDERR: configure: WARNING: valgrind/memcheck.h: present but cannot be compiled configure: WARNING: valgrind/memcheck.h: check for missing prerequisite headers? configure: WARNING: valgrind/memcheck.h: see the Autoconf documentation configure: WARNING: valgrind/memcheck.h: section "Present But Cannot Be Compiled" configure: WARNING: valgrind/memcheck.h: proceeding with the preprocessor's result configure: WARNING: valgrind/memcheck.h: in the future, the compiler will take precedence configure: WARNING: ## ------------------------------------ ## configure: WARNING: ## Report this to wine-devel(a)winehq.org ## configure: WARNING: ## ------------------------------------ ## and of course it crashes when I run make depend.;( Is there some way to get wine compiled? Thank You! Lauris >LMP< -- For people who like peace and quiet: a phoneless cord.

1 0

Re: shell32: set %AllUsersProfile%, and fix shell folder registration
by Juan Lang March 16, 2005

March 16, 2005

--- Alexandre Julliard <julliard(a)winehq.org> wrote: > > ChangeLog: > > - %AllUsersProfile% was not getting set in the environment, spotted by > > Vitaly Lipatov > > This should be done in wine.inf, not in the code. Okay, but it's a subdirectory of the windows directory, and that's no longer getting set in wine.inf either. I rely on GetWindowsDirectory to find it. If you want it back here though I'll move it. --Juan __________________________________ Do you Yahoo!? Yahoo! Mail - You care about security. So do we. http://promotions.yahoo.com/new_mail

2 1

Wine's Documentation in French
by Francois Gouget March 16, 2005

March 16, 2005

The Wine documentation has been translated to French by students from the Insa of Rouen. The credits for the translation go to: * Wine User Guide Romain CONSEIL Damien GIRAUDEAU Guillaume LEFEBVRE Yvon BENOIST (proofreading) http://fgouget.free.fr/wine/wine-user.html * Wine FAQ Romuald VIEUX Yvon BENOIST (proofreading) http://fgouget.free.fr/wine/wine-faq.html * WineLib User Guide José CARRENO Yvon BENOIST (proofreading) http://fgouget.free.fr/wine/winelib-user.html And believe me, this is a lot of work so they really deserve our kudos. You probably noticed that the Wine Developer's Guide was not translated but that makes sense: if you want to work on Wine it's really best if you speak English anyway. So what's needed now is to integrate the translation with Wine. This is what I have done by converting the translation to .po format to make it easier to maintain and tweaking the Makefiles accordingly. The patch is pretty big (even compressed it's more than 200KB) so I did not attach it to this email. Instead I have set up a page on my web site and you can the patch using this URL: http://fgouget.free.fr/wine/docfr.diff.gz Here is what the patch does: Add a Makedoc.rules.in file which handles the conversion of SGML files to the final documentation format. Modify documentation/Makefile.in to use Makedoc.rules.in. Add documentation/fr with the po files of the French translation. Use po4a to generate a translated Sgml file from the original sgml documentation and then let Makedoc.rules.in generate the documentation. Detect po4a in configure.ac. The translation appears to have been made from a snapshot of the documentation taken in the summer of 2004. Now, a bit more than 6 months later, the translation is still more than 90% complete. IMHO this proves that maintaining the translation is quite feasible. If you see any bits of English in the documents above, this is precisely because the translation is not 100% complete anymore: in that case po4a-translate keeps the original version rather than use the outdated translation. For more information about po4a: http://po4a.alioth.debian.org/ I will upload anything new to the following page: http://fgouget.free.fr/wine/docfr.shtml Now you pretty much know everything. Let me know if you have concerns, suggestions, etc. I'm hoping we can get this in place soon. -- Francois Gouget fgouget(a)codeweavers.com

2 2

Re: SHELL32: add defines for SLDF flags
by Dmitry Timoshkov March 16, 2005

March 16, 2005

"Mike McCormack" <mike(a)codeweavers.com> wrote: > +typedef struct { > + DWORD cbSize; > + DWORD cbSignature; > + CHAR szTarget[MAX_PATH]; > + WCHAR szwTarget[MAX_PATH]; > +} EXP_SZ_LINK, EXP_SZ_LINK_SIG; It's for sure a typo: EXP_SZ_LINK_SIG was supposed to be *LPEXP_SZ_LINK. -- Dmitry.

1 0

Regression (SimCity 3000 is Broke )
by Tony Lambregts March 16, 2005

March 16, 2005

After working prefectly for over 2 years SimCity 3000 is broken. The patch that broke it is http://www.winehq.org/hypermail/wine-cvs/2005/03/0098.html basicly the problem is simple. The source and the destination are both the same surface in DIB_DirectDrawSurface_Blt() and with the new locking in place the destination never gets updated. So althought it might fix Picasa2 it is definatly not correct. -- Tony Lambregts

5 12

Re: flexible-mmap breaks application
by Michael Ost March 16, 2005

March 16, 2005

On Tue, 2005-03-15 at 15:55, Uwe Bonnes (bon_at_elektron.ikp.physik.tu-darmstadt.de) wrote: > The definition of the task is clear: > Have a way to tell the kernel to not mmap memory above 0x7fffffff > However the implementation is unclear to me: > - Should this be a new syscall? > - Or should we set some kernel parameter? Per task or global? There is a related problem in that Wine's VirtualAlloc won't allocate the full 2GB it should. As I understand it the problem is the different memory ranges that linux and windows allocate from --- the intersection of the two platforms is only 1GB (not the 2GB it should be) from 0x4000,0000 to 0x8000,0000. Could this patch also include a lower limit, letting linux mmap from addresses in the same range that win32 does? - mo PS: the thread on this issue starts at http://www.winehq.com/hypermail/wine-devel/2005/03/0643.html. It also covers the issue of Wine's lack of mlock/munlock functionality.

1 0

winsock conformance test - added tests for sendto, recvfrom, and getservbyname
by Thomas Kho March 16, 2005

March 16, 2005

Hi, We're working to add conformance tests to winsock, and we've currently added tests for sendto, recvfrom, and getservbyname. Before we post to wine-patches, we'd appreciate any critiques/input. We chose these previously untested functions to test for the following reasons: - UDP is often used and was not previously tested - getservbyname uses the same critical section code as the other database functions; we thought it would be useful to stress tests this. We ran gcov to see how much of dlls/winsock/socket.c we tested, and found: Before: 41.16% of file dlls/winsock/socket.c After: 46.38% of file dlls/winsock/socket.c http://hkn.icsl.ucla.edu/~tom/socket_c_2.gcov.txt We'd also appreciate other targets to test. Thanks for your help, Thomas Kho Files available at: http://www.geekymedia.com/viewcvs/cgi/viewcvs.cgi/wine4/wine/dlls/winsock/t… Changelog: * dlls/winsock/tests/sock.c added tests for sendto, recvfrom, and getservbyname # Signed-off-by: Thomas Kho <tkho(a)ucla.edu> # --- wine_cvs/dlls/winsock/tests/sock.c 2005-03-15 07:49:01.000000000 -0800 +++ wine_build/dlls/winsock/tests/sock.c 2005-03-15 15:14:52.000000000 -0800 @@ -37,6 +37,14 @@ #define TEST_TIMEOUT 30 /* seconds to wait before killing child threads after server initialization, if something hangs */ +#define NUM_UDP_PEERS 3 /* Number of UDP sockets to create and test > 1 */ + +#define NUM_THREADS 3 /* Number of threads to run getservbyname */ +#define NUM_QUERIES 250 /* Number of getservbyname queries per thread */ + +#define SERVERIP "127.0.0.1" /* IP to bind to */ +#define SERVERPORT 9374 /* Port number to bind to */ + #define wsa_ok(op, cond, msg) \ do { \ int tmp, err = 0; \ @@ -862,8 +870,8 @@ #define STD_STREAM_SOCKET \ SOCK_STREAM, \ 0, \ - "127.0.0.1", \ - 9374 + SERVERIP, \ + SERVERPORT static test_setup tests [NUM_TESTS] = { @@ -932,6 +940,105 @@ } }; +static void test_UDP() +{ + /* This function tests UDP sendto() and recvfrom(). UDP is unreliable, so it is + possible that this test fails due to dropped packets. */ + + /* peer 0 receives data from all other peers */ + struct sock_info peer[NUM_UDP_PEERS]; + char buf[16]; + int ss, i, n_recv, n_sent; + + for ( i = NUM_UDP_PEERS - 1; i >= 0; i-- ) { + ok ( ( peer[i].s = socket ( AF_INET, SOCK_DGRAM, 0 ) ) != INVALID_SOCKET, "UDP: socket failed\n" ); + + peer[i].addr.sin_family = AF_INET; + peer[i].addr.sin_addr.s_addr = inet_addr ( SERVERIP ); + + if ( i == 0 ) { + peer[i].addr.sin_port = htons ( SERVERPORT ); + } else { + peer[i].addr.sin_port = htons ( 0 ); + } + + do_bind ( peer[i].s, (struct sockaddr *) &peer[i].addr, sizeof( peer[i].addr ) ); + + /* test getsockname() to get peer's port */ + ss = sizeof ( peer[i].addr ); + ok ( getsockname ( peer[i].s, (struct sockaddr *) &peer[i].addr, &ss ) != SOCKET_ERROR, "UDP: could not getsockname()\n" ); + ok ( peer[i].addr.sin_port != htons ( 0 ), "UDP: bind() did not associate port\n" ); + } + + /* test getsockname() */ + ok ( peer[0].addr.sin_port == htons ( SERVERPORT ), "UDP: getsockname returned incorrect peer port\n" ); + + for ( i = 1; i < NUM_UDP_PEERS; i++ ) { + /* send client's ip */ + memcpy( buf, &peer[i].addr.sin_port, sizeof(peer[i].addr.sin_port) ); + n_sent = sendto ( peer[i].s, buf, sizeof(buf), 0, (struct sockaddr*) &peer[0].addr, sizeof(peer[0].addr) ); + ok ( n_sent == sizeof(buf), "UDP: sendto() sent wrong amount of data or socket error: %d\n", n_sent ); + } + + for ( i = 1; i < NUM_UDP_PEERS; i++ ) { + n_recv = recvfrom ( peer[0].s, buf, sizeof(buf), 0,(struct sockaddr *) &peer[0].peer, &ss ); + ok ( n_recv == sizeof(buf), "UDP: recvfrom() received wrong amount of data or socket error: %d\n", n_recv ); + ok ( memcmp ( &peer[0].peer.sin_port, buf, sizeof(peer[0].addr.sin_port) ) == 0, "UDP: port numbers do not match\n" ); + } +} + +static void WINAPI do_getservbyname( HANDLE *starttest ) +{ + struct { + char *name; + char *proto; + int port; + } serv[2] = { {"domain", "udp", 53}, {"telnet", "tcp", 23} }; + + int i, j; + struct servent *pserv[2]; + + ok ( WaitForSingleObject ( *starttest, TEST_TIMEOUT * 1000 ) != WAIT_TIMEOUT, "test_getservbyname: timeout waiting for start signal\n"); + + // ensure that necessary buffer resizes are completed + for ( j = 0; j < 2; j++) { + pserv[j] = getservbyname ( serv[j].name, serv[j].proto ); + } + + for ( i = 0; i < NUM_QUERIES / 2; i++ ) { + for ( j = 0; j < 2; j++ ) { + pserv[j] = getservbyname ( serv[j].name, serv[j].proto ); + ok ( pserv[j] != NULL, "getservbyname could not retreive information for %s: %d\n", serv[j].name, WSAGetLastError() ); + ok ( pserv[j]->s_port == htons(serv[j].port), "getservbyname returned the wrong port for %s: %d\n", serv[j].name, ntohs(pserv[j]->s_port) ); + ok ( !strcmp ( pserv[j]->s_proto, serv[j].proto ), "getservbyname returned the wrong protocol for %s: %s\n", serv[j].name, pserv[j]->s_proto ); + ok ( !strcmp ( pserv[j]->s_name, serv[j].name ), "getservbyname returned the wrong name for %s: %s\n", serv[j].name, pserv[j]->s_name ); + } + + ok ( pserv[0] == pserv[1], "getservbyname: winsock resized servent buffer when not necessary\n" ); + } +} + +static void test_getservbyname() +{ + int i; + HANDLE starttest, thread[NUM_THREADS]; + DWORD thread_id[NUM_THREADS]; + + starttest = CreateEvent ( NULL, 1, 0, "test_getservbyname_starttest" ); + + /* create threads */ + for ( i = 0; i < NUM_THREADS; i++ ) { + thread[i] = CreateThread ( NULL, 0, (LPTHREAD_START_ROUTINE) &do_getservbyname, &starttest, 0, &thread_id[i] ); + } + + /* signal threads to start */ + SetEvent ( starttest ); + + for ( i = 0; i < NUM_THREADS; i++) { + WaitForSingleObject ( thread[i], TEST_TIMEOUT * 1000 ); + } +} + static void test_WSAAddressToStringA() { INT ret; @@ -1191,6 +1298,10 @@ trace ( " **** TEST %d COMPLETE **** \n", i ); } + test_UDP(); + + test_getservbyname(); + test_WSAAddressToStringA(); test_WSAAddressToStringW();

1 0

World Of Warcraft
by cyrix12＠cox.net March 15, 2005

March 15, 2005

Hi, I'm the maintainer for World of Warcraft, and I've noticed a few things which have been pointed out before (on irc, bugzilla, mailing list) but have not really gotten any attention. As this is one of the most popular, if not THE most popular pc game at the moment, it seems as though it would be worthwhile to look into getting this to work if it does not require a complete rewrite of wine to do so. There are currently two things preventing operation of the game. Firstly, I'll start off by saying that there are two separate modes to run the game in. d3d9, and opengl. The d3d9 mode doesn't currently work since the support for this dll is not complete. I have been following it closely though, and I constantly find myself impressed with the amount of work being poured into it lately. It's really coming along, and I've even gotten it to run a few demos. Unfortunately, even with the latest patches it still comes up with a blank screen. I don't want to rush anything in this department since I know there's a massive transition from the d3d* architecture to wine3d, and I think it's a really great idea to funnel everything through opengl and only need one rendering library. It's hard for me to say as a WoW addict myself, but I would rather have a complete implementation of d3d9 than one that is only able to play WoW. So I guess what I'd like to say on this front is this: awesome work guys! As for the opengl mode, it crashes strangely just after the character loading screen, but before actually getting into the game. I'm not really sure exactly what is causing the crash. I've run several traces, and all that comes up is a large group of fixmes which look like this: fixme:thread:GetThreadTimes Cannot get kerneltime or usertime of other threads fixme:thread:NtQueryInformationThread info class 9 not supported yet The error I am able to get (when I change my winver to win2k) is an actual game error (not given by wine). This one looks like this: ERROR #0 (0x85100000) Program: C:\Program Files\World of Warcraft\WoW.exe File: C:\build\buildWoW\WoW\Source\Ui\MinimapFrame.cpp Line: 1287 Expr: !("CGMinimapFrame::Initialize(): can't get render target for minimap") I posted a bug about this on December 7, 2004 at this location: http://bugs.winehq.org/show_bug.cgi?id=2603 Nothing has happened yet with this bug except for someone else confirming it. I'd appreciate it if someone could give me one of two pieces of information (both would be spectacular!): 1) What exactly is causing the problem with the opengl version, and is it easy to fix? 2) Is there any sort of goal that the people working on d3d9 dlls have set as far as a date they would like to have it done by? Or is it just one of those "It will be done when it's done" sort of things? Thanks in advance, Darckness -- Stop searching forever. Happiness is unattainable.

14 57

Re: combo - implement GetComboBoxInfo
by Alexandre Julliard March 15, 2005

March 15, 2005

Steven Edwards <steven_ed4153(a)yahoo.com> writes: > @@ -2296,7 +2295,18 @@ > BOOL WINAPI GetComboBoxInfo(HWND hwndCombo, /* [in] handle to combo box */ > PCOMBOBOXINFO pcbi /* [in/out] combo box information */) > { > - FIXME("\n"); > - return FALSE; > + if (IsWindow(hwndCombo)) > + { > + LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwndCombo, 0 ); The IsWindow check is useless, what you need is to verify that it's really a combobox. The right way to do that is probably to send a CB_GETCOMBOBOXINFO message instead. -- Alexandre Julliard julliard(a)winehq.org

2 1

Clipboard regression
by Stefan Dösinger March 15, 2005

March 15, 2005

Hello List, This patch from 2005/03/07 causes a Clipboard regression: http://www.winehq.org/hypermail/wine-cvs/2005/03/0111.html Whenever the clipboard is used the process crashes with an X error. To reproduce it just start notepad and right click into the text area: err:x11drv:error_handler X protocol error: serial=271, request_code=1 - breaking into debugger wine: Unhandled exception (thread 0009), starting debugger... WineDbg starting on pid 0x8 In 32 bit mode. 0x4034e014 DebugBreak+0x4 [/windows/c/wine/dlls/kernel/debugger.c:307] in kernel32: popl %ebp Unable to open file '/windows/c/wine/dlls/kernel/debugger.c' Wine-dbg>bt Backtrace: =>1 0x4034e014 DebugBreak [/windows/c/wine/dlls/kernel/debugger.c:307] in kernel32 (0x4075f5f0) 2 0x40e46f38 error_handler(display=0x780c6938, error_evt=0x4075f654) [x11drv_main.c:194] in x11drv (0x4075f61c) 3 0x40ee33a4 ?? in libx11.so.6 (0x4075f6cc) 4 0x40ee18c3 ?? in libx11.so.6 (0x4075f70c) 5 0x40edc9f4 ?? in libx11.so.6 (0x4075f74c) 6 0x40edcab5 ?? in libx11.so.6 (0x4075f76c) 7 0x40edf0db ?? in libx11.so.6 (0x4075f79c) 8 0x40e11a0f thread_selection_wnd [/windows/c/sonstiges/wine/dlls/x11drv/x11drv.h:521] in x11drv (0x4075f7e0) 9 0x40e14185 X11DRV_CLIPBOARD_QueryAvailableData+0x55(lpcbinfo=0x4075f8e8) [/windows/c/sonstiges/wine/dlls/x11drv/clipboard.c:1636] in x11drv (0x4075f8a4) 10 0x40e12800 X11DRV_CLIPBOARD_UpdateCache(lpcbinfo=0x4075f8e8) [/windows/c/sonstiges/wine/dlls/x11drv/clipboard.c:801] in x11drv (0x4075f8c8) 11 0x40e15935 X11DRV_IsClipboardFormatAvailable+0x35(wFormat=0xd) [/windows/c/sonstiges/wine/dlls/x11drv/clipboard.c:2312] in x11drv (0x4075f914) 12 0x40a21bac IsClipboardFormatAvailable(wFormat=0xd) [/windows/c/sonstiges/wine/dlls/user/../../windows/clipboard.c:614] in user32 (0x4075f940) 13 0x40a6de38 EDIT_WM_ContextMenu+0x138(es=0x4023d968, x=0x2fb, y=0x17d) [/windows/c/sonstiges/wine/dlls/user/edit.c:3900] in user32 (0x4075f97c) 14 0x40a6660c EditWndProc_common+0x3fc(hwnd=0x10024, msg=0x7b, wParam=0x10024, lParam=0x17d02fb, unicode=0x1) [/windows/c/sonstiges/wine/dlls/user/edit.c:835] in user32 (0x4075f9f8) 15 0x40a6759f EditWndProcW(hWnd=0x10024, uMsg=0x7b, wParam=0x10024, lParam=0x17d02fb) [/windows/c/sonstiges/wine/dlls/user/edit.c:1008] in user32 (0x4075fa14) 16 0x40a4b71f WINPROC_wrapper+0x17 in user32 (0x4075fa38) 17 0x40a4ba8d WINPROC_CallWndProc+0x7d(proc=0x40a67570, hwnd=0x10024, msg=0x7b, wParam=0x10024, lParam=0x17d02fb) [/windows/c/sonstiges/wine/dlls/user/../../windows/winproc.c:419] in user32 (0x4075fa74) 18 0x40a52b43 CallWindowProcW+0x103(func=0x40a67570, hwnd=0x10024, msg=0x7b, wParam=0x10024, lParam=0x17d02fb) [/windows/c/sonstiges/wine/dlls/user/../../windows/winproc.c:3283] in user32 (0x4075faa8) 19 0x40a8bb80 call_window_proc+0xe0(hwnd=0x10024, msg=0x7b, wparam=0x10024, lparam=0x17d02fb, unicode=0x1, same_thread=0x1) [/windows/c/sonstiges/wine/dlls/user/message.c:1518] in user32 (0x4075fb04) 20 0x40a8d9d1 SendMessageTimeoutW+0x161(hwnd=0x10024, msg=0x7b, wparam=0x10024, lparam=0x17d02fb, flags=0x0, timeout=0xffffffff, res_ptr=0x4075fb8c) [/windows/c/sonstiges/wine/dlls/user/message.c:2346] in user32 (0x4075fb68) 21 0x40a8dca1 SendMessageW+0x51(hwnd=0x10024, msg=0x7b, wparam=0x10024, lparam=0x17d02fb) [/windows/c/sonstiges/wine/dlls/user/message.c:2427] in user32 (0x4075fb94) 22 0x40a29ef6 DEFWND_DefWinProc+0x6a6(hwnd=0x10024, msg=0x205, wParam=0x0, lParam=0x14c02f4) [/windows/c/sonstiges/wine/dlls/user/../../windows/defwnd.c:696]in user32 (0x4075fc38) 23 0x40a2acbd DefWindowProcW+0x9d(hwnd=0x10024, msg=0x205, wParam=0x0, lParam=0x14c02f4) [/windows/c/sonstiges/wine/dlls/user/../../windows/defwnd.c:946] in user32 (0x4075fc68) 24 0x40a66f64 EditWndProc_common+0xd54(hwnd=0x10024, msg=0x205, wParam=0x0, lParam=0x14c02f4, unicode=0x1) [/windows/c/sonstiges/wine/dlls/user/edit.c:405] in user32 (0x4075fce4) 25 0x40a6759f EditWndProcW(hWnd=0x10024, uMsg=0x205, wParam=0x0, lParam=0x14c02f4) [/windows/c/sonstiges/wine/dlls/user/edit.c:1008] in user32 (0x4075fd00) 26 0x40a4b71f WINPROC_wrapper+0x17 in user32 (0x4075fd24) 27 0x40a4ba8d WINPROC_CallWndProc+0x7d(proc=0x40a67570, hwnd=0x10024, msg=0x205, wParam=0x0, lParam=0x14c02f4) [/windows/c/sonstiges/wine/dlls/user/../../windows/winproc.c:419] in user32 (0x4075fd60) 28 0x40a52b43 CallWindowProcW+0x103(func=0x40b006e8, hwnd=0x10024, msg=0x205,wParam=0x0, lParam=0x14c02f4) [/windows/c/sonstiges/wine/dlls/user/../../windows/winproc.c:3283] in user32 (0x4075fd94) 29 0x40a8f078 DispatchMessageW+0xe8(msg=0x4075fe64) [/windows/c/sonstiges/wine/dlls/user/message.c:2992] in user32 (0x4075fdc8) 30 0x40648c70 WinMain+0x2e0(hInstance=0x40640000, prev=0x0, cmdline=0x4020141b, show=0x1) [main.c:357] in notepad (0x4075fe90) 31 0x40646403 __wine_exe_main+0x13b in notepad (0x4075ff20) 32 0x4037d262 start_process+0xf2(arg=0x0) [/windows/c/sonstiges/wine/dlls/kernel/process.c:1047] in kernel32 (0x4075fff4) 33 0x4001ffa1 ?? +0x11 in libwine.so.1 (0x00000000) Wine-dbg>

1 0

Re: shell32: set %AllUsersProfile%, and fix shell folder registration
by Alexandre Julliard March 15, 2005

March 15, 2005

Juan Lang <juan_lang(a)yahoo.com> writes: > ChangeLog: > - %AllUsersProfile% was not getting set in the environment, spotted by > Vitaly Lipatov This should be done in wine.inf, not in the code. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: make_ctests - convert make_ctests to C
by Steven Edwards March 15, 2005

March 15, 2005

Hi, --- Andreas Mohr <andi(a)rhlx01.fht-esslingen.de> wrote: > That one contains DOS line endings (^M). I have asked Royce to make a version that creates the testlist.c file with Unix line endings by default and provides a command line option for dos line endings for people developing on Windows. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

3 2

[badpenguin79@hotmail.com: [Full-disclosure] [ZH2005-02SA] Insecure tmp file creation in Wine]
by Marcus Meissner March 15, 2005

March 15, 2005

Hi, >From full-disclosure, a security mailing list. Fix seems trivial, just use 0600. (untested, uncompiled ;) Ciao, Marcus Changelog: Temporary registries exported only user read/writeable to avoid information leaks. Index: server/registry.c =================================================================== RCS file: /home/wine/wine/server/registry.c,v retrieving revision 1.63 diff -u -r1.63 registry.c --- server/registry.c 10 Mar 2005 11:18:31 -0000 1.63 +++ server/registry.c 14 Mar 2005 16:38:54 -0000 @@ -1610,7 +1610,7 @@ for (;;) { sprintf( p, "reg%lx%04x.tmp", (long) getpid(), count++ ); - if ((fd = open( tmp, O_CREAT | O_EXCL | O_WRONLY, 0666 )) != -1) break; + if ((fd = open( tmp, O_CREAT | O_EXCL | O_WRONLY, 0600 )) != -1) break; if (errno != EEXIST) goto done; close( fd ); } Index: misc/registry.c =================================================================== RCS file: /home/wine/wine/misc/registry.c,v retrieving revision 1.149 diff -u -r1.149 registry.c --- misc/registry.c 25 Aug 2004 00:48:47 -0000 1.149 +++ misc/registry.c 14 Mar 2005 16:38:55 -0000 @@ -1227,7 +1227,7 @@ ret = _xmalloc(50); for (count = 0;;) { sprintf(ret,"/tmp/reg%lx%04x.tmp",(long)getpid(),count++); - if ((tmp_fd = open(ret,O_CREAT | O_EXCL | O_WRONLY,0666)) != -1) break; + if ((tmp_fd = open(ret,O_CREAT | O_EXCL | O_WRONLY,0600)) != -1) break; if (errno != EEXIST) { ERR("Unexpected error while open() call: %s\n",strerror(errno)); free(ret);

3 4

Re: dinput.diff
by Alexandre Julliard March 15, 2005

March 15, 2005

Tom Wickline <twickline(a)gmail.com> writes: > Changelog: increase the maximum number of devices to 16 Why do you need this? -- Alexandre Julliard julliard(a)winehq.org

1 0

Are mailslots implemented?
by Kuba Ober March 15, 2005

March 15, 2005

Hi, Is the one-way mailslot IPC implemented in wine? I'm getting fixme:sync:CreateMailslotW(...): stub messages. Is this a simple thing to implement, or would it require additions to the server protocol? Thanks, Kuba Ober

4 5

Re: make_ctests - convert make_ctests to C
by Andreas Mohr March 15, 2005

March 15, 2005

Hi, On Mon, Mar 14, 2005 at 08:35:19PM -0800, Steven Edwards wrote: > Convert make_ctests script to C That one contains DOS line endings (^M). Andreas Mohr

1 0

Re: [DSOUND] little patch
by Robert Reif March 15, 2005

March 15, 2005

Raphael wrote: >Hi > >Changelog: > - try to have better match caps with hw caps so games can active more hw >support > >Regards, >Raphael > > > >- This->lock.DebugInfo->Spare[1] = 0; >+ /*This->lock.DebugInfo->Spare[1] = 0;*/ > DeleteCriticalSection(&(This->lock)); > > You have to zero this out or DeleteCriticalSection will try to delete that static memory. >+ if (pDS->drvcaps.dwFlags | DSCAPS_PRIMARYMONO) pDS->pwfx->nChannels = 1; >+ if (pDS->drvcaps.dwFlags | DSCAPS_PRIMARY16BIT) pDS->pwfx->wBitsPerSample = 16; >+ pDS->pwfx->nBlockAlign = pDS->pwfx->wBitsPerSample * pDS->pwfx->nChannels / 8; >+ pDS->pwfx->nAvgBytesPerSec = pDS->pwfx->nSamplesPerSec * pDS->pwfx->nBlockAlign; >+ > You can't do this and be compatible with windows. > >+#ifndef __WINE_DSOUND_PRIVATE_H >+#define __WINE_DSOUND_PRIVATE_H > You can't include this more than once because there is only one .h file so it's not really necessary. >+#define WINE_SET_CS_NAME(cs, name) (cs)->DebugInfo->Spare[1] = (DWORD) name >+#define WINE_GET_CS_NAME(cs) (const char*) (cs)->lock.DebugInfo->Spare[1] > > This is a wine specific trick and should probably be put somewhere global so all users can be consistent. The name should have DEBUG in it somewhere.

3 5

Re: wine/ misc/registry.c documentation/samples/co ...
by Dimitrie O. Paun March 15, 2005

March 15, 2005

On Mon, Mar 14, 2005 at 11:18:40AM -0600, Alexandre Julliard wrote: > Log message: > Get rid of the remaining registry configuration parameters. Any plans on getting the global registry back? -- Dimi.

2 1

Problems with VirtualAlloc/Lock
by MIchael Ost March 15, 2005

March 15, 2005

There are major differences in the handling of virtual memory in Wine vs WinXP that are causing problems for my winelib application. Can someone provide background and/or workarounds for these issues? As near as I can tell the main differences are: * VirtualLock does nothing in Wine * Wine makes no distinction between MEM_RESERVE and MEM_COMMIT * Wine has no implementation of Windows' process working sets * Wine limits MEM_RESERVE to 1GB, but WinXP goes up to 2GB The above problems seem relatively harmless on systems with < 1GB RAM. But when our units go greater than 1GB we are seeing spectacular crash-and-burn failures. The code-only DLLs we are running on such systems are crashing at a stage when I suspect they are attempting to lock RAM. I suspect that they are confused by the report from GlobalMemoryStatus that more than 1GB of RAM is installed, but that they are only able to VirtualLock up to 1GB. And in this unexpected situation, they are crashing. Further, these DLLs are audio processing plugins. The apparent fact that VirtualLock doesn't _actually_ lock memory into RAM for real time processing is a disaster for our system, in that it causes audio glitches when a page fault is handled. But that is not a problem which crashes the system. Any suggestions on what to do? Is there any pending work on this area out there? I've attached a little table that describes what I found. It shows the differences in how Wine and WinXP handle memory related calls. I have also attached a simple program which can be run to see these differences. Thanks for any help... mo

4 4

Re: combo - implement GetComboBoxInfo
by Dimitrie O. Paun March 15, 2005

March 15, 2005

On Mon, Mar 14, 2005 at 08:02:00PM -0800, Steven Edwards wrote: > - FIXME("\n"); > - return FALSE; > + LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongA( hwndCombo, 0 ); Please use GetWindowLongW(), the combo box is fully Unicode. > + pcbi->hwndCombo = hwndCombo; > + pcbi->hwndList = lphc->hWndLBox; > + pcbi->hwndItem = lphc->hWndEdit; > + pcbi->rcItem = lphc->textRect; > + pcbi->rcButton = lphc->buttonRect; > + pcbi->stateButton = (DWORD) lphc->wState; Fancy formatting... Bit yucky, no? -- Dimi.

2 1

Re: combo - implement GetComboBoxInfo
by Dmitry Timoshkov March 15, 2005

March 15, 2005

"Steven Edwards" <steven_ed4153(a)yahoo.com> wrote: > BOOL WINAPI GetComboBoxInfo(HWND hwndCombo, /* [in] handle to combo box */ > PCOMBOBOXINFO pcbi /* [in/out] combo box information */) > { > - FIXME("\n"); > - return FALSE; > + LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongA( hwndCombo, 0 ); > + > + pcbi->hwndCombo = hwndCombo; > + pcbi->hwndList = lphc->hWndLBox; > + pcbi->hwndItem = lphc->hWndEdit; > + pcbi->rcItem = lphc->textRect; > + pcbi->rcButton = lphc->buttonRect; > + pcbi->stateButton = (DWORD) lphc->wState; > > + return TRUE; > } Is it possible to do a check for lphc being NULL and keep indentation/spacing similar to the rest of the file? Also (DWORD) cast should not be needed. -- Dmitry.

1 0

Re: combo - implement GetComboBoxInfo
by Steven Edwards March 15, 2005

March 15, 2005

--- "Dimitrie O. Paun" <dpaun(a)rogers.com> wrote: > Please use GetWindowLongW(), the combo box is fully Unicode. OK I will hack it for him. This guy is new to C programing and I should have caught that. He has a bunch of VB apps that he uses this function in. > > + pcbi->hwndCombo = hwndCombo; > > + pcbi->hwndList = lphc->hWndLBox; > > + pcbi->hwndItem = lphc->hWndEdit; > > + pcbi->rcItem = lphc->textRect; > > + pcbi->rcButton = lphc->buttonRect; > > + pcbi->stateButton = (DWORD) lphc->wState; > > Fancy formatting... Bit yucky, no? Argh. Welcome to the Visual Studio 2005 Beta1, It even fscks your formatting in all sorta nice new ways. Thanks Steven __________________________________ Do you Yahoo!? Yahoo! Small Business - Try our new resources site! http://smallbusiness.yahoo.com/resources/

1 0

Re: MSN Webcam patch
by Jasper van Veghel March 15, 2005

March 15, 2005

I have to be off somewhere in a few minutes (hence me being up this early), so I'll make this quick ;-) I wrote a couple of patches for webcam support too a while back, and gave these to some people who were asking for them, so I thought I'd share them here now, to also provide some input on it - mind you that I haven't worked on this for a while now, so it's not really as fresh in my memory anymore, but with this rece- nt interest in it I guess I'll start looking into it again too. Of course MSN still crashes after it's signed in .. but that's beside the point here, really now ;-) Would be nice to get the webcam preview stuff working tho, and make some headway with V4L and Wine along the way. Some of the things that you've changed I've changed, but aren't in the patches below - I really should document what I change as I go along ;-) Most of the major changes are there though. I also got stuck at qcap, but ended up simply using a native DLL for that. Again, I was really just tinkering along, seeing how far I could go without having to implement some major interface, using both native and builtin DLLs. Anyway, I'll see if I can find some time tomorrow to look back into it; I did have a lot of fun hacking on Wine, and indespite of my inexperience regarding DirectX, I'll try to contribute back some more useful patches, hopefully ulti- mately getting that webcam support working. Kind regards, Jasper ----- Forwarded message from Jasper van Veghel <vanveghel(a)home.nl> ----- Date: Sat, 15 Jan 2005 14:18:47 +0100 From: Jasper van Veghel <vanveghel(a)home.nl> To: xerox_xerox2000(a)yahoo.co.uk, lgvlenders(a)yahoo.co.uk Subject: Re: video4linux - wine Hey Luis, Robbert, It's been a few weeks ago since I've worked on this stuff; I wrote some note- worthy patches and some hacks to get MSN working; I'll let you decide what's what ;-) In dlls/wininet/ I made the following two changes; The first is to get it to connect to MSN (not camera-related), as it tries to send text over SSL for some reason.. not sure if this is necessary (anymore) though, with rsabase and all: --- netconnection.c.old 2005-01-15 13:46:46.000000000 +0100 +++ netconnection.c 2004-12-14 22:38:19.000000000 +0100 @@ -104,7 +104,7 @@ void NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) { - connection->useSSL = useSSL; + connection->useSSL = /*useSSL*/0; connection->socketFD = -1; if (connection->useSSL) { Note the date on those files by the way; they were taken from CVS around 12/14/04, so it's not a complete diff to the recent CVS. This one takes care of an unknown / undocumented optionId in InternetSetOptionAW that MSN uses in dlls/wininet/: --- internet.c.old 2005-01-15 13:55:56.000000000 +0100 +++ internet.c 2004-12-14 17:29:42.000000000 +0100 @@ -1962,6 +1962,9 @@ case INTERNET_OPTION_CONNECTED_STATE: FIXME("Option INTERNET_OPTION_CONNECTED_STATE: STUB\n"); break; + case 87: + FIXME("Undocumented option 87: STUB\n"); + break; default: FIXME("Option %ld STUB\n",dwOption); INTERNET_SetLastError(ERROR_INVALID_PARAMETER); Of more interest might be this change to dlls/devenum/createdevenum.c: --- createdevenum.c.old 2005-01-15 14:02:24.000000000 +0100 +++ createdevenum.c 2004-12-27 22:07:27.000000000 +0100 @@ -117,7 +117,8 @@ if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory)) { hbasekey = HKEY_CURRENT_USER; strcpyW(wszRegKey, wszActiveMovieKey); @@ -142,7 +143,8 @@ { if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory) || + IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory)) { HRESULT hr = DEVENUM_CreateSpecialCategories(); if (FAILED(hr)) @@ -411,6 +413,55 @@ CoTaskMemFree(pTypes); } } + + res = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory); + if (SUCCEEDED(res)) { /* can register device(s) in this category */ + for (i = 0; i < 10; i++) { // the index can range from 0 thru 9 + WCHAR szDeviceName[80], szDeviceVersion[80]; + + if (capGetDriverDescriptionW ((WORD) i, + szDeviceName, sizeof (szDeviceName), + szDeviceVersion, sizeof (szDeviceVersion))) { + IMoniker * pMoniker = NULL; + + TRACE("\nSuccess !\n"); + + rfp2.nMediaTypes = 1; + pTypes = CoTaskMemAlloc(rfp2.nMediaTypes * + sizeof(REGPINTYPES)); + if (!pTypes) { + IFilterMapper2_Release(pMapper); + + return E_OUTOFMEMORY; + } + + /* FIXME: Not sure if these are correct */ + pTypes[0].clsMajorType = &MEDIATYPE_Video; + pTypes[0].clsMinorType = &MEDIASUBTYPE_RGB24; + + rfp2.lpMediaType = pTypes; + + res = IFilterMapper2_RegisterFilter(pMapper, + // &CLSID_VideoRenderer, + &CLSID_VfwCapture, + szDeviceName, + &pMoniker, + &CLSID_VideoInputDeviceCategory, + szDeviceName, + &rf2); + + /* FIXME: do additional stuff with IMoniker here, depending on what RegisterFilter does */ + + if (pMoniker) + IMoniker_Release(pMoniker); + + if (i == iDefaultDevice) + FIXME("Default device\n"); + + CoTaskMemFree(pTypes); + } + } + } } if (pMapper) And a small addition to devenum_private.h: --- devenum_private.h.old 2005-01-15 14:06:39.000000000 +0100 +++ devenum_private.h 2004-12-26 22:01:19.000000000 +0100 @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "winuser.h" #include "winreg.h" #include "winerror.h" @@ -38,6 +39,7 @@ #include "olectl.h" #include "wine/unicode.h" #include "uuids.h" +#include "vfw.h" /********************************************************************** * Dll lifetime tracking declaration for devenum.dll And the Makefile (dlls/devenum/Makefile.in): --- Makefile.in.old 2005-01-15 14:11:31.000000000 +0100 +++ Makefile.in 2005-01-15 14:13:36.000000000 +0100 @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = devenum.dll -IMPORTS = ole32 oleaut32 winmm user32 advapi32 kernel32 +IMPORTS = ole32 oleaut32 winmm avicap32 user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid C_SRCS = \ And so we add some to capGetDriverDescrptionAW aswell (dlls/avicap32/); I just added some static labels, not really getting these anywhere yet: --- avicap32_main.c.old 2005-01-15 14:15:43.000000000 +0100 +++ avicap32_main.c 2004-12-27 22:21:22.000000000 +0100 @@ -69,11 +69,22 @@ BOOL VFWAPI capGetDriverDescriptionA(WORD wDriverIndex, LPSTR lpszName, INT cbName, LPSTR lpszVer, INT cbVer) { - FIXME("(%d, %p, %d, %p, %d) stub!\n", wDriverIndex, lpszName, cbName, + FIXME("stub: (%d, %p, %d, %p, %d) stub!\n", wDriverIndex, lpszName, cbName, lpszVer, cbVer); - return FALSE; + + // FIXME: Make use of Video4Linux here + + strncpy (lpszName, "Logitech QuickCam Pro 4000", cbName); + strncpy (lpszVer, "Wine Video4Linux Driver", cbVer); + + return TRUE; } +WCHAR x1[] = {'L','o','g','i','t','e','c','h',' ','Q','u','i','c','k','c','a', + 'm',' ','P','r','o',' ','4','0','0','0',0}, + x2[] = {'W','i','n','e',' ','V','i','d','e','o','4','L','i','n','u','x', + ' ','d','r','i','v','e','r',0}; + /*********************************************************************** * capGetDriverDescriptionW (AVICAP32.@) */ @@ -82,5 +93,11 @@ { FIXME("(%d, %p, %d, %p, %d) stub!\n", wDriverIndex, lpszName, cbName, lpszVer, cbVer); - return FALSE; + + // FIXME: Make use of Video4Linux here + + lstrcpynW (lpszName, x1, cbName); + lstrcpynW (lpszVer, x2, cbVer); + + return TRUE; } And the dlls/avicap32/Makefile.in changes for the strcpy stuff: --- Makefile.in.old 2005-01-15 14:15:34.000000000 +0100 +++ Makefile.in 2004-12-26 22:55:13.000000000 +0100 @@ -3,7 +3,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = avicap32.dll -IMPORTS = ntdll +IMPORTS = unicows ntdll C_SRCS = avicap32_main.c Next up is dlls/quartz, which seemed to handle the DirectShow filter thingies; first off there's include/config.idl: --- control.idl.old 2005-01-15 15:07:23.000000000 +0100 +++ control.idl 2004-12-27 04:25:25.000000000 +0100 @@ -26,6 +26,7 @@ interface IBasicAudio; interface IBasicVideo; interface IVideoWindow; +interface IAMStreamConfig; interface IMediaEvent; interface IMediaEventEx; @@ -123,6 +124,22 @@ HRESULT IsCursorHidden( [out] long *CursorHidden ); } +/***************************************************************************** + * IAMStreamConfig interface + */ +[ + object, + uuid(c6e13340-30ac-11d0-a18c-00a0c9118956), + pointer_default(unique) +] +interface IAMStreamConfig : IUnknown +{ + HRESULT SetFormat( [in] AM_MEDIA_TYPE *pmt); + HRESULT GetFormat( [in] AM_MEDIA_TYPE **pmt); + HRESULT GetNumberOfCapabilities( [out] int *piCount, [out] int *piSize); + HRESULT GetStreamCaps( [in] int iIndex, [out] AM_MEDIA_TYPE **pmt, + [out] BYTE *pSCC); +} /***************************************************************************** * IBasicVideo interface And of course the generated interface from this, added to videorenderer.c, plus some partial implementation stuff (if someone could finish this, plus add an implementation for IKsPin, they'd probably be well on their way (provided that is that it's actually coupled to a capturing device, rather then have bogus data in it as I've done here)) --- videorenderer.c.old 2005-01-15 14:39:24.000000000 +0100 +++ videorenderer.c 2004-12-27 21:15:01.000000000 +0100 @@ -48,12 +48,14 @@ static IBasicVideoVtbl IBasicVideo_VTable; static IVideoWindowVtbl IVideoWindow_VTable; static const IPinVtbl VideoRenderer_InputPin_Vtbl; +static IAMStreamConfigVtbl IAMStreamConfig_VTable; typedef struct VideoRendererImpl { const IBaseFilterVtbl * lpVtbl; IBasicVideoVtbl * IBasicVideo_vtbl; IVideoWindowVtbl * IVideoWindow_vtbl; + IAMStreamConfigVtbl * IAMStreamConfig_vtbl; ULONG refCount; CRITICAL_SECTION csFilter; @@ -327,6 +329,7 @@ pVideoRenderer->lpVtbl = &VideoRenderer_Vtbl; pVideoRenderer->IBasicVideo_vtbl = &IBasicVideo_VTable; pVideoRenderer->IVideoWindow_vtbl = &IVideoWindow_VTable; + pVideoRenderer->IAMStreamConfig_vtbl = &IAMStreamConfig_VTable; pVideoRenderer->refCount = 1; InitializeCriticalSection(&pVideoRenderer->csFilter); @@ -378,6 +381,8 @@ *ppv = (LPVOID)&(This->IBasicVideo_vtbl); else if (IsEqualIID(riid, &IID_IVideoWindow)) *ppv = (LPVOID)&(This->IVideoWindow_vtbl); + else if (IsEqualIID(riid, &IID_IAMStreamConfig)) + *ppv = (LPVOID)&(This->IAMStreamConfig_vtbl); if (*ppv) { @@ -1556,3 +1561,172 @@ Videowindow_HideCursor, Videowindow_IsCursorHidden }; + + +/*** IAMStreamConfig methods ***/ +static HRESULT WINAPI AMStreamConfig_QueryInterface(IAMStreamConfig *iface, + REFIID riid, + LPVOID*ppvObj) { + ICOM_THIS_MULTI(VideoRendererImpl, IAMStreamConfig_vtbl, iface); + + TRACE("(%p/%p)->(%s (%p), %p)\n", This, iface, debugstr_guid(riid), riid, ppvObj); + + // return AMStreamConfig_QueryInterface((IUnknown*)This, riid, ppvObj); + return S_OK; +} + +static ULONG WINAPI AMStreamConfig_AddRef(IAMStreamConfig *iface) { + ICOM_THIS_MULTI(VideoRendererImpl, IAMStreamConfig_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + // return AMStreamConfig_AddRef((IUnknown*)This); + return S_OK; +} + +static ULONG WINAPI AMStreamConfig_Release(IAMStreamConfig *iface) { + ICOM_THIS_MULTI(VideoRendererImpl, IAMStreamConfig_vtbl, iface); + + TRACE("(%p/%p)->()\n", This, iface); + + // return AMStreamConfig_Release((IUnknown*)This); + return S_OK; +} + +static HRESULT WINAPI AMStreamConfig_SetFormat(IAMStreamConfig *iface, + AM_MEDIA_TYPE *pmt) { + ICOM_THIS_MULTI(VideoRendererImpl, IAMStreamConfig_vtbl, iface); + + TRACE("(%p/%p): stub !!\n", This, iface); + + return S_OK; +} + +static HRESULT WINAPI AMStreamConfig_GetFormat(IAMStreamConfig *iface, + AM_MEDIA_TYPE **pmt) { + ICOM_THIS_MULTI(VideoRendererImpl, IAMStreamConfig_vtbl, iface); + + TRACE("(%p/%p): stub !!\n", This, iface); + + return S_OK; +} + +typedef struct _VIDEO_STREAM_CONFIG_CAPS { + GUID guid; + ULONG VideoStandard; + SIZE InputSize; + SIZE MinCroppingSize; + SIZE MaxCroppingSize; + int CropGranularityX; + int CropGranularityY; + int CropAlignX; + int CropAlignY; + SIZE MinOutputSize; + SIZE MaxOutputSize; + int OutputGranularityX; + int OutputGranularityY; + int StretchTapsX; + int StretchTapsY; + int ShrinkTapsX; + int ShrinkTapsY; + LONGLONG MinFrameInterval; + LONGLONG MaxFrameInterval; + LONG MinBitsPerSecond; + LONG MaxBitsPerSecond; +} VIDEO_STREAM_CONFIG_CAPS; + +static HRESULT WINAPI AMStreamConfig_GetNumberOfCapabilities(IAMStreamConfig *iface, + int *piCount, + int *piSize) { + ICOM_THIS_MULTI(VideoRendererImpl, IAMStreamConfig_vtbl, iface); + + TRACE("((%p/%p): %p %p): semi-stub !!\n", This, iface, piCount, piSize); + + *piCount = 1; + *piSize = sizeof(VIDEO_STREAM_CONFIG_CAPS); + + return S_OK; +} + +static HRESULT WINAPI AMStreamConfig_GetStreamCaps(IAMStreamConfig *iface, + int iIndex, + AM_MEDIA_TYPE **pmt, + BYTE *pSCC) { + ICOM_THIS_MULTI(VideoRendererImpl, IAMStreamConfig_vtbl, iface); + VIDEOINFOHEADER *pvi; + VIDEO_STREAM_CONFIG_CAPS *vsc; + + TRACE("((%p/%p) %d %p %p): semi-stub !!\n", This, iface, iIndex, pmt, pSCC); + + // FIXME: Get actual stream information in here (IEnumMediaTypes ?) + + pmt[0] = CoTaskMemAlloc(sizeof (AM_MEDIA_TYPE)); + memcpy (&pmt[0]->formattype, &FORMAT_VideoInfo, sizeof (GUID)); + memcpy (&pmt[0]->majortype, &MEDIATYPE_Video, sizeof (GUID)); + memcpy (&pmt[0]->subtype, &MEDIASUBTYPE_RGB24, sizeof (GUID)); + pmt[0]->bTemporalCompression = 0; + pmt[0]->bFixedSizeSamples = 1; + pmt[0]->lSampleSize = 1; + + // FIXME: The stuff below is just there so it contains something + + pmt[0]->cbFormat = sizeof(VIDEOINFOHEADER); + pmt[0]->pbFormat = CoTaskMemAlloc(pmt[0]->cbFormat); + ZeroMemory(pmt[0]->pbFormat, pmt[0]->cbFormat); + pvi = (VIDEOINFOHEADER *)pmt[0]->pbFormat; + pvi->rcSource.right = 640; pvi->rcSource.bottom = 480; + pvi->rcTarget.right = 640; pvi->rcTarget.bottom = 480; + pvi->dwBitRate = 10; + pvi->dwBitErrorRate = 0; + pvi->AvgTimePerFrame = (LONGLONG)(10000000.0 / 25); // 25 is hardcoded + + // FIXME: The stuff below is just there so it contains something + + pvi->bmiHeader.biWidth = 640; + pvi->bmiHeader.biHeight = 480; + pvi->bmiHeader.biBitCount = 24; + pvi->bmiHeader.biCompression = BI_RGB; + pvi->bmiHeader.biSizeImage = 0; + pvi->bmiHeader.biXPelsPerMeter = 640; + pvi->bmiHeader.biYPelsPerMeter = 480; + pvi->bmiHeader.biClrUsed = 0; + pvi->bmiHeader.biClrImportant = 0; + + // FIXME: Blahblahblah + + vsc = (VIDEO_STREAM_CONFIG_CAPS *)pSCC; + memcpy (&vsc->guid, &FORMAT_VideoInfo, sizeof (GUID)); + vsc->VideoStandard = 0; + vsc->InputSize.cx = 640; vsc->InputSize.cy = 480; + vsc->MinCroppingSize.cx = 320; vsc->MinCroppingSize.cy = 240; + vsc->MaxCroppingSize.cx = 640; vsc->MaxCroppingSize.cy = 480; + vsc->CropGranularityX = 10; + vsc->CropGranularityY = 10; + vsc->CropAlignX = 0; + vsc->CropAlignY = 0; + vsc->MinOutputSize.cx = 320; vsc->MinOutputSize.cy = 240; + vsc->MaxOutputSize.cx = 640; vsc->MaxOutputSize.cy = 480; + vsc->OutputGranularityX = 10; + vsc->OutputGranularityY = 10; + vsc->StretchTapsX = 1; + vsc->StretchTapsY = 1; + vsc->ShrinkTapsX = 1; + vsc->ShrinkTapsY = 1; + vsc->MinFrameInterval = (LONGLONG)(10000000.0 / 25); + vsc->MaxFrameInterval = (LONGLONG)(10000000.0 / 25); + vsc->MinBitsPerSecond = 24; + vsc->MaxBitsPerSecond = 24; + + return S_OK; +} + +static IAMStreamConfigVtbl IAMStreamConfig_VTable = +{ + AMStreamConfig_QueryInterface, + AMStreamConfig_AddRef, + AMStreamConfig_Release, + AMStreamConfig_SetFormat, + AMStreamConfig_GetFormat, + AMStreamConfig_GetNumberOfCapabilities, + AMStreamConfig_GetStreamCaps +}; As for Quartz; there's been a lot of development over the last couple of weeks on this, especially on the FilterMapper, regsvr, AVI stuff, videorenderer, etc., so that aswell as future development might prove to be quite useful in getting this to work. Anyway, that's pretty much all there is; I wrote some other hacks to various DLLs, but eventually ended up using native DLLs instead as the hacking proved too extensive (sorry to say, my goal at that point was getting my webcam to work under MSN with Wine, not to add anything useful to Wine itself (though it would have been a nice side-effect)) Hopefully the patches were of some use to you, and perhaps someone can get V4L/VFW working under WINE. I, for one, would cer- tainly appreciate it :-) Best Regards, Jasper Robbert Xerox wrote: > Hi, i was wondering if you could post your > hacks/patches you talk about in the message (involving > this webcam/MSN messenger etc. stuff) either to the > wine developement mailinglist or to me. I would be > very gratefull as i really would like to have a look > at it, to see if i could get any further. Thanks in > advance, Robbert > > > > > > ___________________________________________________________ > ALL-NEW Yahoo! Messenger - all new features - even more fun! http://uk.messenger.yahoo.com > ----- End forwarded message -----

1 0