May 2007 - Wine-Devel - list.winehq.org

loading windows DLL in a linux app
by ml May 22, 2007

May 22, 2007

Hi! I have a third party library which is a Windows DLL. Is it possible to use Wine to call its functions under Linux? I tried a simple code #include <library.h> int main(int argc, char**argv) { HMODULE dll; dll = LoadLibrary("atouch32.dll"); return 0; } compiled successfully but runtime fails with "Segmentation fault". Perhaps I missed some initialization. I didn't found any examples of Wine API usage. Can anyone give me any clue? Thank you! David

2 1

re: msi ole automation: where to next?
by Dan Kegel May 22, 2007

May 22, 2007

Misha wrote: > [I have the scripting required by the Vector NTI and the iTunes 7 installers > working. What should I do next?] First off, congratulations! If you're interested in continuing to work on MSI, I'd suggest asking James Hawkins for suggestions. If you're more interested in adding COM interfaces to things, perhaps implementing the iTextServices api to riched20 would be useful. Maarten got started on that, but I think it's not complete enough for say, Google Talk to function. Most useful of all might be for you to look at improving our COM implementation itself. Rob Shearman could give you suggestions on where to start there. - Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

3 9

Re: hnetcfg: [resend 2] 1/6 uuids for INetFwMgr interface
by Robert Shearman May 22, 2007

May 22, 2007

Jeff Latimer wrote: > diff --git a/include/uuids.h b/include/uuids.h > index e3fb41b..cf99672 100644 > --- a/include/uuids.h > +++ b/include/uuids.h > @@ -271,5 +271,7 @@ OUR_GUID_ENTRY(CLSID_VideoProcAmpPropertyPage, 0x71f96464, 0x78f3, 0x11d0, > OUR_GUID_ENTRY(CLSID_CameraControlPropertyPage, 0x71f96465, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) > OUR_GUID_ENTRY(CLSID_AnalogVideoDecoderPropertyPage, 0x71f96466, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) > OUR_GUID_ENTRY(CLSID_VideoStreamConfigPropertyPage, 0x71f96467, 0x78f3, 0x11d0, 0xa1, 0x8c, 0x00, 0xa0, 0xc9, 0x11, 0x89, 0x56) > +OUR_GUID_ENTRY(IID_INetFwMgr, 0xf7898af5, 0xcac4, 0x4632, 0xa2, 0xec, 0xda ,0x06, 0xe5, 0x11, 0x1a, 0xf2) > +OUR_GUID_ENTRY(CLSID_NetFwMgr, 0x304ce942, 0x6e39, 0x40d8, 0x94, 0x3a, 0xb9, 0x13, 0xc4, 0x0c, 0x9c, 0xd4) > > #undef OUR_GUID_ENTRY > This isn't in the PSDK version of uuids.h and also uuid.lib from the PSDK doesn't contain these symbols either (although there are a bunch of IID_INetFwV6... symbols that might be related). -- Rob Shearman

2 1

Re: hnetcfg: [resend 2] 3/6 add local header file
by Michael Stefaniuc May 22, 2007

May 22, 2007

Jeff Latimer wrote: > --- > dlls/hnetcfg/hnetcfg_dll.h | 70 > ++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 70 insertions(+), 0 deletions(-) > create mode 100644 dlls/hnetcfg/hnetcfg_dll.h > > > ------------------------------------------------------------------------ > > diff --git a/dlls/hnetcfg/hnetcfg_dll.h b/dlls/hnetcfg/hnetcfg_dll.h > new file mode 100644 > index 0000000..64b1f0c > --- /dev/null > +++ b/dlls/hnetcfg/hnetcfg_dll.h > @@ -0,0 +1,70 @@ > +/* > + * Copyright (C) 2007 Jeff Latimer > + * > + * 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 > + */ > + > +#ifndef __WINE_HNETCFG_DLL_H > +#define __WINE_HNETCFG_DLL_H > + > +#include "windef.h" > +#include "wine/debug.h" > +#include "winbase.h" > +#include "winnt.h" > + > + > +/* __stdcall HNETCFG_HNetDeleteRasConnection(); */ It's only the comments but why don't you use WINAPI instead of __stdcall? bye michael > +/* __stdcall HNETCFG_HNetFreeSharingServicesPage(); */ > +/* __stdcall HNETCFG_HNetGetSharingServicesPage(); */ > +/* __stdcall HNETCFG_WinBomConfigureWindowsFirewall(); */ > +/* __stdcall HNETCFG_HNetFreeFirewallLoggingSettings(); */ > +/* __stdcall HNETCFG_HNetGetFirewallSettingsPage(); */ > +/* __stdcall HNETCFG_HNetGetShareAndBridgeSettings(); */ > +/* __stdcall HNETCFG_HNetSetShareAndBridgeSettings(); */ > +/* __stdcall HNETCFG_HNetSharedAccessSettingsDlg(); */ > +/* __stdcall HNETCFG_HNetSharingAndFirewallSettingsDlg(); */ > +/* __stdcall HNETCFG_IcfChangeNotificationCreate(); */ > +/* __stdcall HNETCFG_IcfChangeNotificationDestroy(); */ > +/* __stdcall HNETCFG_IcfCheckAppAuthorization(); */ > +/* __stdcall HNETCFG_IcfCloseDynamicFwPort(); */ > +/* __stdcall HNETCFG_IcfConnect(); */ > +/* __stdcall HNETCFG_IcfDisconnect(); */ > +/* __stdcall HNETCFG_IcfFreeAdapters(); */ > +/* __stdcall HNETCFG_IcfFreeDynamicFwPorts(); */ > +/* __stdcall HNETCFG_IcfFreeProfile(); */ > +/* __stdcall HNETCFG_IcfFreeString(); */ > +/* __stdcall HNETCFG_IcfFreeTickets(); */ > +/* __stdcall HNETCFG_IcfGetAdapters(); */ > +/* __stdcall HNETCFG_IcfGetCurrentProfileType(); */ > +/* __stdcall HNETCFG_IcfGetDynamicFwPorts(); */ > +/* __stdcall HNETCFG_IcfGetOperationalMode(); */ > +/* __stdcall HNETCFG_IcfGetProfile(); */ > +/* __stdcall HNETCFG_IcfGetTickets(); */ > +/* __stdcall HNETCFG_IcfIsIcmpTypeAllowed(); */ > +/* __stdcall HNETCFG_IcfIsPortAllowed(); */ > +/* __stdcall HNETCFG_IcfOpenDynamicFwPort(); */ > +/* __stdcall HNETCFG_IcfOpenDynamicFwPortWithoutSocket(); */ > +/* __stdcall HNETCFG_IcfOpenFileSharingPorts(); */ > +/* __stdcall HNETCFG_IcfRefreshPolicy(); */ > +/* __stdcall HNETCFG_IcfRemoveDisabledAuthorizedApp(); */ > +/* __stdcall HNETCFG_IcfSetServicePermission(); */ > +/* __stdcall HNETCFG_IcfSubNetsGetScope(); */ > +/* __stdcall HNETCFG_IcfSubNetsIsStringValid(); */ > +/* __stdcall HNETCFG_IcfSubNetsToString(); */ > + > +HRESULT NetFwMgr_create(IUnknown *, LPVOID *); > + > + > +#endif /* __WINE_HNETCFG_DLL_H */ > > > > ------------------------------------------------------------------------ > > -- Michael Stefaniuc Tel.: +49-711-96437-199 Sr. Network Engineer Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

2 1

Re: ADVAPI32: (1 of 4) Implement EnumServicesStatusExW
by Alexandre Julliard May 22, 2007

May 22, 2007

Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> writes: > + r = QueryServiceStatusEx(handle, SC_STATUS_PROCESS_INFO, (LPBYTE)&svcStatusData, > + sizeof(SERVICE_STATUS_PROCESS), &sz); > + if (r) > + { > + switch (dwServiceType) > + { > + case SERVICE_DRIVER: > + r = SERVICE_KERNEL_DRIVER == svcStatusData.dwServiceType || > + SERVICE_FILE_SYSTEM_DRIVER == svcStatusData.dwServiceType; > + break; > + case SERVICE_WIN32: > + r = SERVICE_WIN32_OWN_PROCESS == svcStatusData.dwServiceType || > + SERVICE_WIN32_SHARE_PROCESS == svcStatusData.dwServiceType; > + break; > + default: > + FIXME("Unknown dwServiceType: %x", dwServiceType); > + r = FALSE; > + break; > + } > + } > + > + if (r) > + { Some sort of 'goto next' would be cleaner than this complex code to set r and then test it again and again. > + } > + sz = sizeof(name); You probably meant namesz here. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH](updated) wined3d: Implemented converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying
by Stefan Dösinger May 22, 2007

May 22, 2007

Am Dienstag 22 Mai 2007 03:32 schrieb hightower(a)tregt.net: Looks ok

1 0

Re: shlwapi: stub implementation for SHSetTimerQueueTimer (try 2)
by Dmitry Timoshkov May 21, 2007

May 21, 2007

"Nigel Liang" <ncliang(a)gmail.com> wrote: > +HANDLE WINAPI SHSetTimerQueueTimer(HANDLE hQueue, > + WAITORTIMERCALLBACK pfnCallback, LPVOID pContext, DWORD dwDueTime, > + DWORD dwPeriod, LPCSTR lpszLibrary, DWORD dwFlags) > +{ ... > + return CreateTimerQueueTimer(&hNewTimer, hQueue, pfnCallback, pContext, > + dwDueTime, dwPeriod, dwFlags)?hNewTimer:NULL; This can't work: CreateTimerQueueTimer and SHSetTimerQueueTimer return different things. -- Dmitry.

3 2

localui/tests: Add tests for ConfigurePortUI (try 2)
by Detlef Riekenberg May 21, 2007

May 21, 2007

Changelog: localui/tests: Add tests for ConfigurePortUI Removed the implicit import of msvcrt, as suggested by Alexandre (Replaced swprintf by sprintf with MultiByteToWideChar as Alexandre did in serialui/tests) -- By by ... Detlef

1 0

Re: [PATCH 2/2] wininet: Implement basic non-proxy authentiction.
by Detlef Riekenberg May 21, 2007

May 21, 2007

On Mo, 2007-05-21 at 14:28 +0100, Robert Shearman wrote: > + int userlen = WideCharToMultiByte(CP_UTF8, 0, > domain_and_username, lstrlenW(domain_and_username), NULL, 0, NULL, > NULL); > + int passlen = WideCharToMultiByte(CP_UTF8, 0, password, > lstrlenW(password), NULL, 0, NULL, NULL); What is the advantage to use lstrlenW() here over -1, as used below? > + > + WideCharToMultiByte(CP_UTF8, 0, domain_and_username, -1, > auth_data, userlen, NULL, NULL); > + auth_data[userlen] = ':'; > + WideCharToMultiByte(CP_UTF8, 0, password, -1, > &auth_data[userlen+1], passlen, NULL, NULL); Using -1 has the advantage to reduce the code-size. Thanks. -- By by ... Detlef

1 0

review: add Video Memory text input to winecfg Graphics/Direct3D tab
by Vit Hrachovy May 21, 2007

May 21, 2007

Hi, the attached patch adds new editable combobox input 'Video Memory size' for Graphics/Direct3D tab of winecfg. I've tried to implement Frank's comments to English language only. Please consider this patch as a proposal, so if it gets positive review, I'll propagate the changes to all remaining language resources. May I kindly ask someone for the patch review? Regards Vit

3 6

Re: localui/tests: Add tests for ConfigurePortUI
by Alexandre Julliard May 21, 2007

May 21, 2007

Detlef Riekenberg <wine.dev(a)web.de> writes: > diff --git a/dlls/localui/tests/Makefile.in b/dlls/localui/tests/Makefile.in > index 191a312..634060b 100644 > --- a/dlls/localui/tests/Makefile.in > +++ b/dlls/localui/tests/Makefile.in > @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. > SRCDIR = @srcdir@ > VPATH = @srcdir@ > TESTDLL = localui.dll > -IMPORTS = kernel32 > +IMPORTS = kernel32 msvcrt winspool You can't import msvcrt without using the headers and the appropriate compiler flags. It would be much better to avoid it though. -- Alexandre Julliard julliard(a)winehq.org

1 0

msi ole automation: where to next?
by Misha Koshelev May 20, 2007

May 20, 2007

Hi everybody, Hope you are all having a nice Sunday. Since MSI OLE automation is a bit overwhelming, I have been using installers that have JScript/VBScript actions to guide me as to what specific functions/objects to implement next. I started out by implementing all the functions used by the Vector NTI installer (which is how I got into wine programming at all; and which was actually dependent on one of these actions for installing at the time), and for the past few weeks I have been following the functions required by the iTunes 7 installer. However, now that I have implemented all the functions used by both of these (yay), I am having trouble finding another installer that uses a lot of scripting, so I was wondering if anyone had any suggestions? It really helps to have something like that to guide/motivate me. (I googled "UNHANDLED ACTION TYPE" and tried the installers I found but all the installers I actually tried out didn't seem to use scripting or maybe just unimplmeneted scripting functions anymore). Alternately, is there any other use for MSI OLE automation besides installers with scriptable actions? If so, what functions would be important for that use? (I know Mike McCormack talked at one point about using these interfaces to run custom actions in a separate process, but I am not really clear as to why automation is really necessary for this and, if so, how exactly it would be used, since all the automation functions are just wrappers around existing functions anyway.) Thanks a lot Misha

2 1

Small Direct3D milestone
by Stefan Dösinger May 20, 2007

May 20, 2007

Hi! With Wine 0.9.37 we've archieved something that I allow myself to call a small milestone - All Direct3D7 Immediate mode SDK demos successfully perform their intended rendering. I have some screenshots on my university junk server: http://stud4.tuwien.ac.at/~e0526822/sdkdemos1.png http://stud4.tuwien.ac.at/~e0526822/sdkdemos2.png Two major problems are left though, namely windowed opengl rendering(see the junk where a menu bar should be) and GetDC(there should be a little bit of text rendered, I disabled render target locking to get proper performance). Some demos have a few smaller problems too. The bump earth and bump waves need vendor specific extensions(GL_NV_texture_shader2 / GL_ATI_envmap_bumpmap) and the bend demo needs GL_ARB_vertex_blend which nvidia does not support. So I took that screenshot on my mac running linux(ati radeon X1600. The mipmap demo renders the mipmaped texture garbled, although this works on nvidia cards. The Z buffer demo says w buffers aren't supported, but the normal z buffer does what the w buffer is supposed to do. What does that mean for gamers? Nothing fancy really, the features used by games are implemented since a long time, the ones that used to miss(fixed function bump mapping, vertex blending) aren't really important for games. Other DirectDraw features like Overlays aren't implemented either, but we are Direct3D 7 feature complete. Where to go from here? I am currently fixing the DirectDraw rewrite regressions I can get hold of, and I am trying to make D3D thread safe finally. From the application point of view my focus will stay on fixing older apps first, which somewhat includes getting thread safety, render target locking and GetDC working properly. My hope is also to fix the other related DX7 sdk demos, like the DDraw demos(except overlays, they are highly tricky with the current wined3d-x11drv integration) and getting native d3drm.dll working. I also want to say thanks to all the small and big helpers who help with technical advise, debugging and regression testing. Special thanks goes to Henri without whom I'd be totally lost and who has to be credited for a huge majority of the shader work in the last half year, and a lot of other things too. Thanks and continue the good work :-) Stefan PS: As for the screenshots, my space on that server is limited, so they will be gone sooner or later. I didn't want to send huge screenshots as attachments, not even as jpgs.

10 17

Re: [localui} New Korean Resource
by Detlef Riekenberg May 20, 2007

May 20, 2007

On So, 2007-05-20 at 19:54 +0900, Hwang YunSong(황윤성) wrote: > +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT > + > +STRINGTABLE DISCARDABLE > +{ > + IDS_LOCALPORT " Ʈ" > + IDS_NOTHINGTOCONFIG " Ʈ ɼ ϴ" > +} localui.dll has much more resources now. Please update your Translation-Patch. Thanks -- By by ... Detlef

1 0

user32: Exclude unused headers
by Andrew Talbot May 20, 2007

May 20, 2007

Apologies for the duplicates: the originals were slow to arrive, so I presumed they got lost and sent them again. -- Andy.

1 0

ADVAPI32: service tests
by Rolf Kalbermatter May 20, 2007

May 20, 2007

While working on some advapi32.service functions I found that having some tests for those APIs could be very useful. However nbot having added completely new tests so far there are a few issues I feel intimidated about. The actual task of adding a new test file service.c does seem fairly straightforward to me, considering I can just take some other test file and copy the framework from it, adding the new service.c to the Makefile.in. However there are a few issues I see. First almost any test won't make much sense without at least one service installed and activated. As it is now there seem to be no services installed by default in a clean Wine install. So I guess I would also need an extra executable somehow that implements a basic service that could for instance communicate through a pipe with the service test. It could be as simple as an executable that implements all the necessary communication with the service manager and offers some sort of pipe loopback as main service activity. But how am I going to add such an extra executable to the make logic of the advapi32 test? Also under real Windows installing a service will in many cases fail since that requires administrative privileges for the current process and I'm not sure we can and want to enforce something like that especially for the unattended wine test service if that is still working. I would really appreciate some help about adding an extra executable to the creation to the advapi32 make logic so that meaningful tests could be done on Wine. Or maybe someone knows of a service that is going to be added to a standard Wine installation soon? Rolf Kalbermatter

3 4

Wine keyboard driver+XKB. What am I to do?
by Oleh R. Nykyforchyn May 20, 2007

May 20, 2007

Hello, I need an advice on what to do with some piece of code that I have written for about 3 years. I started to make changes in Wine keyboard driver because I was not able to use MS Office under it on my Linux box (3 or 4 XKB groups, 2 overlay groups used, English, Russian, Ukrainian, Belarusian, German and Polish layouts). First I submitted a patch that adds koi8-u encoding to Wine, and it was happily introduced. But my changes to X11DRV (now winex11) keyboard driver were large and I understand Wine people who didn't want to risk. Meanwhile I continued to polish my implementation to correct bugs and improve performance. I am heavily indebted to people that tested my patches, wrote me about problems with them and suggested possible solutions. I thank to L.Rahyen that supported me in my efforts. Now patched keyboard driver allows user to: 1) have up to 4 XKB groups working (current code uses 1 or 2); 2) detect and use XKB overlays to put 2 or 3 close layouts (e.g. Russian, Ukrainian and Belarusian) into one XKB group; 3) freely combine available XKB layouts in any order, e.g. "en,ru,fr"; 4) list all layouts available at the system, and implement ActivateKeyboardLayout(); 5) notify an application (e.g. MS Word) about change of layout, and make GetKeyboardLayout() work really, not just return LCID for current locale of Unix box; 6) input characters that do not fit into current Unix locale, e.g. German and French accented letters at a system with Cyrillic (not UTF) locale; 7) override any of detected layouts via registry, if user is not satisfied with Wine driver choice. In fact I made cosmetic changes to 3 files in winex11.drv directory: x11drv.h, x11drv_main.c, event.c, but the fourth file keyboard.c was changed much more. About half of functions in it were rewritten, and it now easier to read new keyboard.c than diff output to understand the changes. I got very reasonable advice from L.Rahyen to broke the patch into smaller parts. The problem is that I preserved the driver logic, but changed data structures, so any such patch (even very small one) will touch hundreds if lines across the whole file, probably introducing new bugs and being difficult to read and understand. Also, there is no reason to change code by a patch if we can benefit of it only after next patch. Now I will be grateful to any help. How can such big changes be introduced in Wine tree? I also attach a patch against wine-0.9.37 and copies of original and changed files. Perhaps somebody, who is interested in multilingual keyboard input, can test it and write me about results. Oleh

3 2

Re: msxml3 [1/4]: Add initial implementations of IXMLElement and IXMLElementCollection
by Huw Davies May 20, 2007

May 20, 2007

On Thu, May 17, 2007 at 04:40:06PM -0500, James Hawkins wrote: > > Changelog: > * Add initial implementations of IXMLElement and IXMLElementCollection. I can't help thinking that it would have been cleaner to implement the IXML stuff using the IXMLDOM interfaces rather than straight on top of libxml. That way we only get one set of interfaces that depend on libxml. It may not be possible, but I think it would be worth a look. Huw. -- Huw Davies huw(a)codeweavers.com

2 1

Re: gdi32: check for null-pointer in CreateDIBSection
by Jesse Allen May 20, 2007

May 20, 2007

On 5/19/07, Louis. Lenders <xerox_xerox2000(a)yahoo.co.uk> wrote: > Hi , this fixes bug 8066, > http://bugs.winehq.org/show_bug.cgi?id=8066 > > See the crash log here: > http://bugs.winehq.org/attachment.cgi?id=5800&action=view , > CreateDIBSection is called with bitmapinfo = null. > > The program should be passing in a correctly initialized BITMAPINFO. We need to make sure this isn't hiding another bug. Could you provide a test case?

2 1

Success: Sim City 4 using DirectX
by Markus May 20, 2007

May 20, 2007

Hello, just wanted to let you know that with Wine 0.9.37, Sim City 4 is running successfully in DirectX mode for the first time in the 3 years I've been playing it under Wine. Previously, to be able to play at all, one had to force the game to use OpenGL calls. The visual artifacts triggered by scrolling the map under that mode are now gone under DirectX as well. So all in all great work :) The only issue remaining seems to be related to the Z-buffer. Cars and pedestrians are always drawn on top of buildings. See http://bugs.winehq.org/show_bug.cgi?id=7260#c3 Regards, -- Markus

1 0

Re: Patch [1/4]:Implement D3DRMColorGetRed
by Stefan Dösinger May 20, 2007

May 20, 2007

Am Samstag 19 Mai 2007 22:01 schrieb David.Adam(a)math.cnrs.fr: + color=2949120; + expected=45.0/255.0; Maybe it would be easier to read if you write the color as a hex value(the D3DCOLOR one). Also try to set blue and green to something different than 0.

1 0

Error compiling wine during git regression test
by Austin English May 20, 2007

May 20, 2007

Howdy, I was attempting to run a regression test, and kept running into errors when trying to compile a bisect between wine 0.9.34 and 0.9.35. After trying all sorts of things to fix it, I tried compiling between wine 0.9.34 and the current git, which worked fine, eventually leading me to the troubled patch. However, building between 0.9.34 and 0.9.35 still does not work. Below is the output from terminal of where it fails, seemingly on the cmd program, and more specifically, in the directory function. make[2]: Entering directory `/home/austin/wine-git/programs/cmd' gcc -c -I. -I. -I../../include -I../../include -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -g -O2 -o batch.o batch.c gcc -c -I. -I. -I../../include -I../../include -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -g -O2 -o builtins.o builtins.c gcc -c -I. -I. -I../../include -I../../include -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith -g -O2 -o directory.o directory.c directory.c:36: error: expected ) before * token directory.c: In function WCMD_directory: directory.c:409: warning: implicit declaration of function WCMD_list_directory directory.c: At top level: directory.c:443: warning: conflicting types for WCMD_list_directory directory.c:443: error: static declaration of WCMD_list_directory follows non-static declaration directory.c:409: error: previous implicit declaration of WCMD_list_directory was here make[2]: *** [directory.o] Error 1 make[2]: Leaving directory `/home/austin/wine-git/programs/cmd' make[1]: *** [cmd] Error 2 make[1]: Leaving directory `/home/austin/wine-git/programs' make: *** [programs] Error 2 Please CC me in any replies, as I am not subscribed to this mailing list. Austin

1 0

configure error on OpenBSD
by Vortechz Anderson May 19, 2007

May 19, 2007

I am trying to port wine to OpenBSD, or at least trying to make it build and not segfault upon execution... (This bug is a minor issue compared to some ld.so trouble I have run into. I'd be happy to know about differences between Net/Free/OpenBSD ld.so) configure output: configure: WARNING: sys/sysctl.h: present but cannot be compiled configure: WARNING: sys/sysctl.h: check for missing prerequisite headers? configure: WARNING: sys/sysctl.h: see the Autoconf documentation configure: WARNING: sys/sysctl.h: section "Present But Cannot Be Compiled" configure: WARNING: sys/sysctl.h: proceeding with the preprocessor's result configure: WARNING: sys/sysctl.h: in the future, the compiler will take precedence configure: WARNING: ## ------------------------------------ ## configure: WARNING: ## Report this to wine-devel(a)winehq.org ## configure: WARNING: ## ------------------------------------ ## Some rows from config.log: In file included from /usr/include/sys/sysctl.h:46, from conftest.c:106: /usr/include/sys/ucred.h:49: error: `NGROUPS' undeclared here (not in a function ) In file included from /usr/include/sys/sysctl.h:47, from conftest.c:106: /usr/include/sys/proc.h:65: error: `MAXLOGNAME' undeclared here (not in a functi on) /usr/include/sys/proc.h:91: error: syntax error before "int" /usr/include/sys/proc.h:215: error: syntax error before "sigset_t" /usr/include/sys/proc.h:230: error: `MAXCOMLEN' undeclared here (not in a function) In file included from conftest.c:106: /usr/include/sys/sysctl.h:327: error: `MAXLOGNAME' undeclared here (not in a function) I managed to get around this by including sys/param.h in the sys/proc.h and sys/ucred.h headers but I'm not sure that's the right approach. Wine developers wouldn't benefit from such patches anyway. I have tried to change configure.ac properly but it seems that I can't get it right... // V.A. P.S. Adding sys/proc and sys/ucred to header list and checking for param.h dependency is not sufficient: AC_CHECK_HEADERS([sys/proc.h],,, [#if HAVE_SYS_PARAM_H # include <sys/param.h> #endif]) AC_CHECK_HEADERS([sys/ucred.h],,, [#if HAVE_SYS_PARAM_H # include <sys/param.h> #endif]) With these addons, both proc and ucred fails. D.S. _________________________________________________________ Flyger tiden iväg? Fånga dagen med Yahoo! Mails inbyggda kalender. Dessutom 250 MB gratis, virusscanning och antispam. Få den på: http://se.mail.yahoo.com _________________________________________________________ Ont om plats? Skaffa gratis Yahoo! Mail med obegränsat, lagringsutrymme, kalender, virusscan och antispamfunktion. http://se.mail.yahoo.com

1 0

Re: Direct3D thread safety review
by H. Verbeet May 19, 2007

May 19, 2007

On 18/05/07, Stefan Dösinger <stefandoesinger(a)gmx.at> wrote: > * When a method needs locking, the lock is aquired after printing the trace, > but before checking error conditions(like windows). > * If a method doesn't need locking(e.g. unimplemented, or just a getter for > static info(GetCaps), or QI / AddRef / Release), then the lock is not held > > Since ddraw, d3d8 and d3d9 need their own locking anyway, my plan is to > implement locking in them and assume synchronised calls in wined3d - ie no > wined3d locking. No 2 threads may call wined3d at the same time, and > ddraw/d3d8/d3d9 have to take care of that. That keeps the code simpler. > Makes sense to me.

1 0

Re: [PATCH] wined3d: IWineD3DDeviceImpl_Clear: list Color parameter in the trace.
by H. Verbeet May 19, 2007

May 19, 2007

On 12/05/07, Erik Inge Bolsø <knan-wine(a)anduin.net> wrote: > - TRACE("(%p) Count (%d), pRects (%p), Flags (%x), Z (%f), Stencil (%d)\n", This, > - Count, pRects, Flags, Z, Stencil); > + TRACE("(%p) Count (%d), pRects (%p), Flags (%x), Color (%f %f %f %f), Z (%f), Stencil (%d)\n", This, > + Count, pRects, Flags, D3DCOLOR_R(Color), D3DCOLOR_G(Color), D3DCOLOR_B(Color), D3DCOLOR_A(Color), Z, Stencil); > Tracing the color is fine, but there's no reason to convert it do individual float components. Printing it as 0x%08x should be fine.

1 0

Re: [PATCH] wined3d: debug_d3dusage: prettyprint a flag combination
by H. Verbeet May 19, 2007

May 19, 2007

On 12/05/07, Erik Inge Bolsø <knan-wine(a)anduin.net> wrote: > --- > dlls/wined3d/utils.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c > index c444232..4db0622 100644 > --- a/dlls/wined3d/utils.c > +++ b/dlls/wined3d/utils.c > @@ -238,6 +238,7 @@ const char* debug_d3dusage(DWORD usage) { > WINED3DUSAGE_TO_STR(WINED3DUSAGE_SOFTWAREPROCESSING); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DONOTCLIP); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_POINTS); > + WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY|WINED3DUSAGE_POINTS); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_RTPATCHES); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_NPATCHES); > WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); > -- > 1.4.4.2 > That's not a proper fix, debug_d3dusage() should be changed to print all the flags in "usage", not just exact matches.

1 0

Re: [PATCH] dlls/wined3d: Implemented converting X1R5G5B5 format to R5G5B5A1 to emulate color-keying.
by Stefan Dösinger May 19, 2007

May 19, 2007

Am Samstag 19 Mai 2007 15:33 schrieb hightower(a)tregt.net: Looks good to me, although I wonder if the maskin in "*Dest = (color & 0x7FFF) << 1" is really needed or if we can just shift out the highest bit.

1 0

Re: shlwapi: stub implementation for SHSetTimerQueueTimer
by Dmitry Timoshkov May 19, 2007

May 19, 2007

"Nigel Liang" <ncliang(a)gmail.com> wrote: > + CreateTimerQueueTimer(phNewTimer, hQueue, pfnCallback, pContext, > + dwDueTime, dwPeriod, dwFlags); > + > + return *phNewTimer; You have to check the return value of CreateTimerQueueTimer before returning a possible garbage. -- Dmitry.

1 0

Re: RegDeleteTree [6]
by Juan Lang May 18, 2007

May 18, 2007

Hi Stefan, + if (!lpszName) { + ret = ERROR_NOT_ENOUGH_MEMORY; + goto cleanup; + } Now you're mixing tabs and spaces (here and elsewhere.) Please honor the existing formatting. --Juan ____________________________________________________________________________________Yahoo! oneSearch: Finally, mobile search that gives answers, not web links. http://mobile.yahoo.com/mobileweb/onesearch?refer=1ONXIC

1 0

Re: [PATCH 3/4] msi: automation: Generalize list implementation.
by Alexandre Julliard May 18, 2007

May 18, 2007

Misha Koshelev <mk144210(a)bcm.edu> writes: > if (wFlags & DISPATCH_PROPERTYGET) { > V_VT(pVarResult) = VT_I4; > - V_I4(pVarResult) = data->iCount; > + V_I4(pVarResult) = data->ulCount; I committed this patch, but I can't resist pointing out that if you had simply named the field "count" instead of using the (idiotic) Hungarian notation, the code would be just as clear, and you wouldn't need to rename it everywhere when making it unsigned... -- Alexandre Julliard julliard(a)winehq.org

4 3

RE: advapi32: Route all 4 EnumServicesStatus[Ex] calls to a single stubto avoid code duplication
by Rolf Kalbermatter May 18, 2007

May 18, 2007

Paul Chitescu wrote: >Changelog: advapi32: Route all 4 EnumServicesStatus[Ex] calls to a single >stub to avoid code duplication > >Most of the actual enumeration is common code so it makes sense to implement it only once. This is a possible approach. I had intended to just make use of EnumServicesStatusExW from all other functions with some translation in them. Your approach avoids translations at the cost of making the common enumeration function quite a bit more complicated. I'm not sure which one I like more. Rolf Kalbermatter

1 0

Re: RegDeleteTree [5]
by Juan Lang May 18, 2007

May 18, 2007

Hi Stefan, + if (ret) return ret; + + ret = RegDeleteTreeW(hSubKey, lpszName); + if (ret) return ret; you've followed James's advice, but now you leak hSubKey (when it isn't hKey) and lpszName (when it isn't szNameBuf.) A goto would be better. --Juan ____________________________________________________________________________________Got a little couch potato? Check out fun summer activities for kids. http://search.yahoo.com/search?fr=oni_on_mail&p=summer+activities+for+kids&…

1 0

Re: ntdll: Protect RtlAllocateHeap and RtlReAllocateHeap against integer overflows with large values of size.
by Chris Robinson May 18, 2007

May 18, 2007

On Friday 18 May 2007 04:01:19 am Robert Shearman wrote: > + ULONGLONG llret = (ULONGLONG)a + b; > + if ((sizeof(SIZE_T) < sizeof(ULONGLONG)) && (llret > 0xffffffff)) > + return FALSE; WOuldn't this be more correct (as well as function when sizeof(SIZE_T) >= sizeof(ULONGLONG)): SIZE_T res = a + b; return (res >= a);

2 3

Re: wininet: Add support for SSPI authentication for HTTP.
by Alexandre Julliard May 18, 2007

May 18, 2007

Robert Shearman <rob(a)codeweavers.com> writes: > + if (strncmpiW(pszAuthValue, szBasic, sizeof(szBasic)/sizeof(szBasic[0])-1)) > + { When using strncmp you need to also check that you reached the end of the first string. > + /* compare against last character to be set to avoid a race */ > + if (HTTP_Base64Dec['/'] != 63) > + { This won't avoid the race, you'll still get garbage if two threads get here at the same time. -- Alexandre Julliard julliard(a)winehq.org

2 4

Re: 3/4 setupapi: Correctly handle an empty filename in SetupGetSourceFileLocationA.
by James Hawkins May 18, 2007

May 18, 2007

On 5/18/07, Hans Leidekker <hans(a)it.vu.nl> wrote: > > -Hans > > Changelog > Correctly handle an empty filename in SetupGetSourceFileLocationA. > Please add a test case. -- James Hawkins

2 1

Re: 2/4 setupapi: Don't return ERROR_WRONG_INF_STYLE when there is no version section.
by James Hawkins May 18, 2007

May 18, 2007

On 5/18/07, Hans Leidekker <hans(a)it.vu.nl> wrote: > > -Hans > > Changelog > Don't return ERROR_WRONG_INF_STYLE when there is no version section. > This is a change that is begging for a test case. -- James Hawkins

1 0

Re: hhctrl.ocx: Parse HTML entities in the table of contents.
by Alexandre Julliard May 18, 2007

May 18, 2007

Robert Shearman <rob(a)codeweavers.com> writes: > + /* hexadecimal entity */ > + while ((*p >= '0' && *p <= '9') || (*p >= 'a' && *p <= 'f') || > + (*p >= 'A' && *p <= 'F') || (*p == ';')) > + p++; You should exit the loop at the first ';'. Also you have to increment p first. > + while (isalpha(*p)) > + p++; You can't use ASCII ctype functions on Unicode chars. > + for (i = 0; i < sizeof(char_refs)/sizeof(char_refs[0]); i++) > + if (p - start - 1 <= sizeof(char_refs[i].name)) > + { > + if (!strncmpW(char_refs[i].name, start + 1, p - start - 1)) > + break; > + } The sizeof check doesn't make much sense, especially inside the loop. What you need is to check that you reached the end of the string if the strncmpW succeeded. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: mshtml: Change the binding flags when silent operation is requested by the DISPID_AMBIENT_SILENT property.
by Alexandre Julliard May 18, 2007

May 18, 2007

Robert Shearman <rob(a)codeweavers.com> writes: > The binding flags should be have BINDF_SILENTOPERATION and BIND_NO_UI added. This breaks the tests: ../../../tools/runtest -q -P wine -M shdocvw.dll -T ../../.. -p shdocvw_test.exe.so webbrowser.c && touch webbrowser.ok webbrowser.c:197: Test failed: unexpected call Invoke_AMBIENT_DLCONTROL make[2]: *** [webbrowser.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: wininet: Add support for SSPI authentication for HTTP.
by Juan Lang May 18, 2007

May 18, 2007

Hi Rob, +static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); Do we really have to keep proliferating base64 implementations? Could you not implement CryptStringToBinaryW instead? Should be mostly a copy-paste job.. --Juan ____________________________________________________________________________________Get the Yahoo! toolbar and be alerted to new email wherever you're surfing. http://new.toolbar.yahoo.com/toolbar/features/mail/index.php

2 1

New winetricks: added pdh, cc580; msxml3 now supports -q
by Dan Kegel May 18, 2007

May 18, 2007

Thanks to Hans Leidekker for the pdh and common controls hunks! And thanks to Rob and James for whipping the msxml3 installer into shape; it now works even with -q. As always, it's up at http://kegel.com/wine/winetricks

1 0

Re: RegDeleteTree [4th] [resend]
by James Hawkins May 17, 2007

May 17, 2007

On 5/17/07, Stefan Leichter <Stefan.Leichter(a)camline.com> wrote: > Hello, > > is anything wrong with this patch? > +#if (_WIN32_WINNT >= 0x0600) +LONG WINAPI RegDeleteTreeA(HKEY,LPCSTR); +LONG WINAPI RegDeleteTreeW(HKEY,LPCWSTR); +#define RegDeleteTree WINELIB_NAME_AW(RegDeleteTree) +#endif /* (_WIN32_WINNT >= 0x0600) */ I don't think that's necessary. +static const WCHAR emptyW[] = {0}; You don't use this anywhere. + if (!ret) { You'll save a lot of indentation if you just return on error, for each error. -- James Hawkins

1 0

Re: Direct X 10 game demo
by Tom Spear May 17, 2007

May 17, 2007

On 5/17/07, Michael Lothian <mike(a)fireburn.co.uk> wrote: > In my opinion games will check for DX version on Windows version. > Eventually once enough people have vista they will release DX10 on XP. > Probably about a month before the wine version is ready for XP. > > What do you guys think? Am I just being cynical? I think so. According to everything I have read DX10 is going to be tied in with the low level stuff even more so than DX9 was, and theres a lot of new low-level stuff for it to tie into that was not there with XP.. They would have to backport all of that stuff from Vista to XP, release it as either a Service Pack 3 or as XP Second Edition (groan), and then release DX10 for XP.. Now what they could/might do is offer a scaled down version of DX10 for XP, but there wouldnt be much real benefit over DX9.. Just SM4.0 etc -- Thanks Tom

1 0

debugging problem - winedbg: single stepping until exit from function, which has no line number information
by marcel busse May 17, 2007

May 17, 2007

hello i'm on a project with wine but i can't get it debugged. not even a small hello world. here is the output of the hello world. My system opensuse 10.2 anyone help plz? Winedbg - Output: marcel(a)marcel-laptop-lan:~/prog/m5/m5/debug/src> winedbg m5.exe.so preloader: Warning: failed to reserve range 00000000-60000000 WineDbg starting on pid 000a 0x7b870749: movl %edi,0x0(%esp) Wine-dbg>step Single stepping until exit from function, which has no line number information. Invalid address (0x7b87074e) for breakpoint 0, disabling it Process of pid=000a has terminated Wine-dbg> Code: #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <windows.h> int __stdcall WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) { MessageBox (NULL, "Hello, Windows!", "Hello", MB_OK); int test = 0; test = 1000; test += 100; return 0; } Configure-Output: cd '/home/marcel/prog/m5/m5/debug' && CC="winegcc" CXX="wineg++" LD="ld" CXXFLAGS="-O0 -gdwarf-2 -g3" "/home/marcel/prog/m5/m5/configure" --enable-debug=full checking for a BSD-compatible install... /usr/bin/install -c checking whether build environment is sane... yes checking for gawk... gawk checking whether make sets $(MAKE)... yes checking for C++ compiler default output file name... a.out checking whether the C++ compiler works... yes checking whether we are cross compiling... no checking for suffix of executables... checking for suffix of object files... o checking whether we are using the GNU C++ compiler... yes checking whether wineg++ accepts -g... yes checking for style of include used by make... GNU checking dependency style of wineg++... gcc3 checking build system type... i686-pc-linux-gnu checking host system type... i686-pc-linux-gnu checking for gcc... winegcc checking whether we are using the GNU C compiler... yes checking whether winegcc accepts -g... yes checking for winegcc option to accept ISO C89... none needed checking dependency style of winegcc... gcc3 checking for a sed that does not truncate output... /usr/bin/sed checking for grep that handles long lines and -e... /usr/bin/grep checking for egrep... /usr/bin/grep -E checking for ld used by winegcc... ld checking if the linker (ld) is GNU ld... yes checking for ld option to reload object files... -r checking for BSD-compatible nm... /usr/bin/nm -B checking whether ln -s works... yes checking how to recognise dependent libraries... pass_all checking how to run the C preprocessor... winegcc -E checking for ANSI C header files... yes checking for sys/types.h... yes checking for sys/stat.h... yes checking for stdlib.h... yes checking for string.h... yes checking for memory.h... yes checking for strings.h... yes checking for inttypes.h... yes checking for stdint.h... yes checking for unistd.h... yes checking dlfcn.h usability... yes checking dlfcn.h presence... yes checking for dlfcn.h... yes checking how to run the C++ preprocessor... wineg++ -E checking for g77... no checking for f77... no checking for xlf... no checking for frt... no checking for pgf77... no checking for cf77... no checking for fort77... no checking for fl32... no checking for af77... no checking for f90... no checking for xlf90... no checking for pgf90... no checking for pghpf... no checking for epcf90... no checking for gfortran... no checking for g95... no checking for f95... no checking for fort... no checking for xlf95... no checking for ifort... no checking for ifc... no checking for efc... no checking for pgf95... no checking for lf95... no checking for ftn... no checking whether we are using the GNU Fortran 77 compiler... no checking whether accepts -g... no checking the maximum length of command line arguments... 32768 checking command to parse /usr/bin/nm -B output from winegcc object... ok checking for objdir... .libs checking for ar... ar checking for ranlib... ranlib checking for strip... strip checking if winegcc supports -fno-rtti -fno-exceptions... no checking for winegcc option to produce PIC... -fPIC checking if winegcc PIC flag -fPIC works... yes checking if winegcc static flag -static works... no checking if winegcc supports -c -o file.o... yes checking whether the winegcc linker (ld) supports shared libraries... yes checking whether -lc should be explicitly linked in... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes checking whether to build shared libraries... yes checking whether to build static libraries... yes configure: creating libtool appending configuration tag "CXX" to libtool checking for ld used by wineg++... ld checking if the linker (ld) is GNU ld... yes checking whether the wineg++ linker (ld) supports shared libraries... yes checking for wineg++ option to produce PIC... -fPIC checking if wineg++ PIC flag -fPIC works... yes checking if wineg++ static flag -static works... no checking if wineg++ supports -c -o file.o... yes checking whether the wineg++ linker (ld) supports shared libraries... yes checking dynamic linker characteristics... GNU/Linux ld.so checking how to hardcode library paths into programs... immediate appending configuration tag "F77" to libtool configure: creating ./config.status config.status: creating Makefile config.status: creating src/Makefile config.status: creating config.h config.status: config.h is unchanged config.status: executing depfiles commands *** Erfolg *** Make Output: cd '/home/marcel/prog/m5/m5/debug/src' && WANT_AUTOCONF_2_5="1" WANT_AUTOMAKE_1_6="1" gmake m5 if wineg++ -DHAVE_CONFIG_H -I. -I/home/marcel/prog/m5/m5/src -I.. -O0 -gdwarf-2 -g3 -MT m5.o -MD -MP -MF ".deps/m5.Tpo" -c -o m5.o /home/marcel/prog/m5/m5/src/m5.cpp; then mv -f ".deps/m5.Tpo" ".deps/m5.Po"; else rm -f ".deps/m5.Tpo"; exit 1; fi /bin/sh ../libtool --tag=CXX --mode=link wineg++ -O0 -gdwarf-2 -g3 -o m5 -mwindows m5.o wineg++ -O0 -gdwarf-2 -g3 -o m5 -mwindows m5.o *** Erfolg *** --------------------------------- Kennt man wirklich jeden über 3 Ecken? Die Antworten gibt's bei Yahoo! Clever.

1 0

Re: hnetcfg: [3/8] uuids for INetFwMgr interface
by Jeff L May 17, 2007

May 17, 2007

For dlls, should the GUID's be put in uuids.h or kept local to the dll. In this case I don't think anything else cares about them, so they could be local. Jeff Latimer Jeff Latimer wrote: > Add public uuids for the interface. > > ------------------------------------------------------------------------ > > diff --git a/include/uuids.h b/include/uuids.h > +OUR_GUID_ENTRY(IID_INetFwMgr, 0xf7898af5, 0xcac4, 0x4632, 0xa2, 0xec, 0xda ,0x06, 0xe5, 0x11, 0x1a, 0xf2) > +OUR_GUID_ENTRY(CLSID_NetFwMgr, 0x304ce942, 0x6e39, 0x40d8, 0x94, 0x3a, 0xb9, 0x13, 0xc4, 0x0c, 0x9c, 0xd4) >

1 0

Re: msxml3 [2/6]: Add initial implementation of IXMLElement
by Alexandre Julliard May 17, 2007

May 17, 2007

"James Hawkins" <truiken(a)gmail.com> writes: > Changelog: > * Add initial implementation of IXMLElement. > > dlls/msxml3/Makefile.in | 1 + > dlls/msxml3/msxml_private.h | 2 + > dlls/msxml3/xmlelem.c | 426 ++++++++++++++++++++++++++++++++++++++ > dlls/msxml3/xmlelem_collection.c | 41 ++++- It's suggest to put everything inside xmlelem.c, there's no need to create a new file for every interface. -- Alexandre Julliard julliard(a)winehq.org

1 0

New Gecko package
by Jacek Caban May 17, 2007

May 17, 2007

Hi all, It's time to update our Gecko package. I've prepared a new one. I'd like to avoid any regression, esp. ones that would require changing the package again. That's why I'd like to do a good test. I'm interested in regressions, so just a simple test if app that worked before still works will be fine. To do so download: http://gerwazy.lo3.wroc.pl/~jcaban/wine/wine_gecko.tar.bz2 1) if you already have installed Gecko, simply extract the package and replace c:\windows\wine_gecko with it. 2) otherwise extract the package and set GeckoPath variable of HKCU\Software\Winde\MSHTML registry key to its location. Then run an app and check if it still works. Note that you have to use current Git, older Wine is not compatible with the new Gecko. Expected visible difference should be: - Working scrollbars (still not perfect, they will be visible even if app sets it to not be, but it's better than before - I will work on it later) - Pages that require plugins will render like there was no plugin instead of offering downloading one (that doesn't work anyway) >From technical point of view this version differs much from previous one. Previous version was just a SeaMonkey with manually removed and changed some files. This one is my built from source (I will create a page on wiki about how to do so). It's based on XUL Runner 1.8.1.3, which has the same source as Firefox 2.0.0.3. After testing it, I will change Gecko installer a bit to be able to deal with different Gecko versions for different Wine version and upload it to SourceForge. Thanks, Jacek

1 0

Set background image for virtual desktop
by Vijay Kiran Kamuju May 17, 2007

May 17, 2007

Hi, Is it possible to set background image for the virtual desktop in wine? If so how do we set it? (I am bored see same old single color virtual desktop ;) ) Cheers, VJ PS: ----- Any new areas I could work on since d3drm work is complete

2 1

Re: ntoskrnl.exe: Import MSVCRT which we are forwarding to.
by James Hawkins May 17, 2007

May 17, 2007

On 5/17/07, Saulius Krasuckas <saulius.krasuckas(a)ieee.org> wrote: > I am testing "Microsoft Virtual CD-ROM Control Panel" from [*]. It > searches for "msvcrt._local_unwind2" and "msvcrt._except_handler3", but > doesn't find them and then makes stack overflow: > > 000d:trace:loaddll:load_native_dll Loaded module L"Z:\\mnt\\antras\\usr\\src\\wine-git\\VCDxp\\VCdRom.sys" : native > 000d:trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\ntoskrnl.exe" : builtin > 000d:err:module:find_forwarded_export module not found for forward 'msvcrt._local_unwind2' used by L"c:\\windows\\system32\\ntoskrnl.exe" > 000d:err:module:find_forwarded_export module not found for forward 'msvcrt._except_handler3' used by L"c:\\windows\\system32\\ntoskrnl.exe" > 000d:trace:loaddll:load_builtin_dll Loaded module L"c:\\windows\\system32\\hal.dll" : builtin > 000d:trace:process:set_entry_point setting FT_Thunk at 0x7b8ac080 to 00000000 > 000d:trace:loaddll:MODULE_LoadModule16 Loaded module "krnl386.exe" : builtin > 000d:trace:loaddll:MODULE_LoadModule16 Loaded module "system.drv" : builtin > 000d:trace:ntoskrnl:IoCreateDevice (0x7ffdf000, 48, L"\\Device\\VirtualCdRom", 2, 3, 0, 0x34fee8) > wine: Call from 0x7b840d20 to unimplemented function ntoskrnl.exe.ExAllocatePoolWithTag, aborting > wine: Call from 0x7bc56dd5 to unimplemented function ntoskrnl.exe._except_handler3, aborting > wine: Call from 0x7bc56dd5 to unimplemented function ntoskrnl.exe._except_handler3, aborting > wine: Call from 0x7bc56dd5 to unimplemented function ntoskrnl.exe._except_handler3, aborting > ... > > Could that be a simple typo in Makefile.in? > > This is from bug 8408: ------- Additional Comments From julliard(a)winehq.com 2007-16-05 12:17 ------- That stuff is not supposed to work yet. ntoskrnl needs to be loaded from a service process that will take care of importing msvcrt. Currently the driver is executed directly which cannot work. -- James Hawkins

1 0

Re: ntoskrnl.exe: Import MSVCRT which we are forwarding to.
by Alexandre Julliard May 17, 2007

May 17, 2007

Saulius Krasuckas <saulius.krasuckas(a)ieee.org> writes: > Could that be a simple typo in Makefile.in? No, it's deliberate. Importing msvcrt here will cause lots of trouble, it will be imported in the process that loads the driver. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: ntoskrnl.exe: Implemented IoCreateSymbolicLink
by Vitaliy Margolen May 17, 2007

May 17, 2007

Alexandre Julliard wrote: > + attr.Attributes = OBJ_CASE_INSENSITIVE | OBJ_OPENIF; > + attr.SecurityDescriptor = NULL; > + attr.SecurityQualityOfService = NULL; > + > + TRACE( "%s -> %s\n", debugstr_us(name), debugstr_us(target) ); > + /* FIXME: store handle somewhere */ > + return NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, target ); How are you planning on removing them if you don't keep a handle to this symlink? Also why OBJ_CASE_INSENSITIVE? This is kernel, and last time I've checked NT kernel's name space was case-sensitive. Vitaliy.

2 1

Bug 219 and some bugzilla in general.
by Vitaliy Margolen May 17, 2007

May 17, 2007

Is it just me or did anyone else have a feeling that our bugilla turned into some kind of forum by selected individuals? I understand all the excitement from this new shiny ntoskrnl, but what _exactly_ does it have to do with safedisk in general? And what all the "other" apps this person claims that ntoskrnl is too limited to support? What's that have to do with bug 219?! Please if you post information to bugzilla, discuss the bug related matters *only*. All general stuff should go here! And unless you have any useful information to provide that will help the resolution of the bug, don't! And the reason this bug is still the only bug open for safedisk, is because Wine still a long way away from running _any_ safedisk protected game (of course I'm talking about 1.2+ versions that do have kernel driver). I'm sorry, but please can we use things in the way they were meant to be used? Vitaliy > ------- Additional Comments From ead1234(a)hotmail.com 2007-16-05 20:20 ------- > ntoskrnl.exe has been added to wine now, though it may not be ready to handle > safedisc v1 as of yet there are several versions of safedisc and other > technologies and once safedisc 1.0 is supported there will be hundreds of other > apps that don't work with later versions of safedisc and other copy protection > technologies. 1 catch-all bug is hardly sufficient to deal with all the > bugs/limitations of ntoskrnl.exe that will eventually arise as not all copyright > technologies are going to fault at the same point in ntoskrnl and other areas of > wine. Is it not time to add an ntoskrnl component now that it has been partially > implemented in wine, especially for the safedisc 2+ versions that won't work > after this initial wave of stubs? >

1 0

Re: [PATCH 4/8, try3] msi: automation: Implement Installer::ProductInfo.
by Alexandre Julliard May 17, 2007

May 17, 2007

Misha Koshelev <mk144210(a)bcm.edu> writes: > --- > dlls/msi/automation.c | 36 +++++++++++++++++++- > dlls/msi/msiserver.idl | 4 ++ > dlls/msi/msiserver_dispids.h | 1 + > dlls/msi/tests/automation.c | 74 ++++++++++++++++++++---------------------- This one fails make test for me: ../../../tools/runtest -q -P wine -M msi.dll -T ../../.. -p msi_test.exe.so automation.c && touch automation.ok automation.c:1944: Test failed: Installer_ProductInfo failed, hresult 0x00000000 make[2]: *** [automation.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

3 4

Direct X 10 game demo
by EA Durbin May 16, 2007

May 16, 2007

The lost planet demo utilizing Direct X 10 is out, for those of you interested in developing/testing Direct X 10. http://www.fileshack.com/file.x/10513/Lost+Planet:+Extreme+Condition+Demo+-… _________________________________________________________________ Make every IM count. Download Messenger and join the im Initiative now. Its free. http://im.live.com/messenger/im/home/?source=TAGHM_MAY07

5 6

Re: ADVAPI32: Fix return value to indicate error when NULL string is passed in
by Alexandre Julliard May 16, 2007

May 16, 2007

Rolf Kalbermatter <r.kalbermatter(a)hccnet.nl> writes: > - if (ret) > + if (ret || (!lpDisplayName && size)) > { > if (lpDisplayName && *lpcchBuffer) *lpDisplayName = 0; > > - if (ret == ERROR_MORE_DATA) > + if ((!ret && !lpDisplayName) || ret == ERROR_MORE_DATA) These complex conditions make it really hard to figure out what the code is doing. You should probably handle the NULL pointer as a separate case. -- Alexandre Julliard julliard(a)winehq.org

1 0

winscard stub dll
by Francois Gouget May 16, 2007

May 16, 2007

As I was working on the winscard headers, I also did small tweaks on the winscard stub implementation. I admit it's mostly whitespace changes: * removed unneeded #includes. They should be added back when the implementation actually requires them. * use LPCBYTE like in the headers instead of 'const BYTE*' * standardize the stub traces * use 4-space indentation for functions * I would really have liked to get rid of the (unsigneg int) casts, but as the handle types are ULONG_PTRs it seems like it won't be possible. That's quite annoying. If anyone has suggestions... So I'm posting it here for review and so Mounir IDRASSI gets a chance to tweak it further and submit it so he gets the credit (since it's his work much more then mine). Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 5 + dlls/winscard/Makefile.in | 20 +++ dlls/winscard/rsrc.rc | 33 ++++ dlls/winscard/scardcomm.c | 133 +++++++++++++++++ dlls/winscard/scarddb.c | 325 +++++++++++++++++++++++++++++++++++++++++ dlls/winscard/scardtracking.c | 104 +++++++++++++ dlls/winscard/winscard.c | 109 ++++++++++++++ dlls/winscard/winscard.spec | 66 +++++++++ 11 files changed, 801 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 30e0581..eb5307f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -417,6 +417,7 @@ ALL_MAKEFILES = \ dlls/winmm/Makefile \ dlls/winmm/tests/Makefile \ dlls/winnls32/Makefile \ + dlls/winscard/Makefile \ dlls/winspool.drv/Makefile \ dlls/winspool.drv/tests/Makefile \ dlls/wintab32/Makefile \ @@ -763,6 +764,7 @@ dlls/wininet/tests/Makefile: dlls/wininet/tests/Makefile.in dlls/Maketest.rules dlls/winmm/Makefile: dlls/winmm/Makefile.in dlls/Makedll.rules dlls/winmm/tests/Makefile: dlls/winmm/tests/Makefile.in dlls/Maketest.rules dlls/winnls32/Makefile: dlls/winnls32/Makefile.in dlls/Makedll.rules +dlls/winscard/Makefile: dlls/winscard/Makefile.in dlls/Makedll.rules dlls/winspool.drv/Makefile: dlls/winspool.drv/Makefile.in dlls/Makedll.rules dlls/winspool.drv/tests/Makefile: dlls/winspool.drv/tests/Makefile.in dlls/Maketest.rules dlls/wintab32/Makefile: dlls/wintab32/Makefile.in dlls/Makedll.rules diff --git a/configure b/configure index d322b0e..712a3be 100755 --- a/configure +++ b/configure @@ -20903,6 +20903,8 @@ ac_config_files="$ac_config_files dlls/winmm/tests/Makefile" ac_config_files="$ac_config_files dlls/winnls32/Makefile" +ac_config_files="$ac_config_files dlls/winscard/Makefile" + ac_config_files="$ac_config_files dlls/winspool.drv/Makefile" ac_config_files="$ac_config_files dlls/winspool.drv/tests/Makefile" @@ -21872,6 +21874,7 @@ do "dlls/winmm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/Makefile" ;; "dlls/winmm/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winmm/tests/Makefile" ;; "dlls/winnls32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winnls32/Makefile" ;; + "dlls/winscard/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winscard/Makefile" ;; "dlls/winspool.drv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/Makefile" ;; "dlls/winspool.drv/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/winspool.drv/tests/Makefile" ;; "dlls/wintab32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/wintab32/Makefile" ;; diff --git a/configure.ac b/configure.ac index 52323c7..6ad89eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1747,6 +1747,7 @@ AC_CONFIG_FILES([dlls/wininet/tests/Makefile]) AC_CONFIG_FILES([dlls/winmm/Makefile]) AC_CONFIG_FILES([dlls/winmm/tests/Makefile]) AC_CONFIG_FILES([dlls/winnls32/Makefile]) +AC_CONFIG_FILES([dlls/winscard/Makefile]) AC_CONFIG_FILES([dlls/winspool.drv/Makefile]) AC_CONFIG_FILES([dlls/winspool.drv/tests/Makefile]) AC_CONFIG_FILES([dlls/wintab32/Makefile]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index f9707e7..31f3ef8 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -205,6 +205,7 @@ BASEDIRS = \ wininet \ winmm \ winnls32 \ + winscard \ winspool.drv \ wintab32 \ wintrust \ @@ -571,6 +572,7 @@ IMPORT_LIBS = \ wininet/libwininet.$(IMPLIBEXT) \ winmm/libwinmm.$(IMPLIBEXT) \ winnls32/libwinnls32.$(IMPLIBEXT) \ + winscard/libwinscard.$(IMPLIBEXT) \ winspool.drv/libwinspool.$(IMPLIBEXT) \ wintab32/libwintab32.$(IMPLIBEXT) \ wintrust/libwintrust.$(IMPLIBEXT) \ @@ -920,6 +922,9 @@ winmm/libwinmm.$(IMPLIBEXT): winmm/winmm.spec $(WINEBUILD) winnls32/libwinnls32.$(IMPLIBEXT): winnls32/winnls32.spec $(WINEBUILD) @cd winnls32 && $(MAKE) libwinnls32.$(IMPLIBEXT) + +winscard/libwinscard.$(IMPLIBEXT): winscard/winscard.spec $(WINEBUILD) + @cd winscard && $(MAKE) libwinscard.$(IMPLIBEXT) winspool.drv/libwinspool.$(IMPLIBEXT): winspool.drv/winspool.drv.spec $(WINEBUILD) @cd winspool.drv && $(MAKE) libwinspool.$(IMPLIBEXT) diff --git a/dlls/winscard/Makefile.in b/dlls/winscard/Makefile.in new file mode 100644 index 0000000..9ce7ad6 --- /dev/null +++ b/dlls/winscard/Makefile.in @@ -0,0 +1,20 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = winscard.dll +IMPORTLIB = libwinscard.$(IMPLIBEXT) +IMPORTS = kernel32 + +C_SRCS = \ + scarddb.c \ + scardcomm.c \ + scardtracking.c \ + winscard.c + +RC_SRCS = \ + rsrc.rc + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winscard/rsrc.rc b/dlls/winscard/rsrc.rc new file mode 100644 index 0000000..8226e9d --- /dev/null +++ b/dlls/winscard/rsrc.rc @@ -0,0 +1,33 @@ +/* + * Top level resource file for winscard.dll + * + * Copyright 2007 Mounir IDRASSI (mounir.idrassi(a)idrix.fr, for IDRIX) + * + * 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 + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Smart Card API" +#define WINE_FILENAME_STR "winscard.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/winscard/scardcomm.c b/dlls/winscard/scardcomm.c new file mode 100644 index 0000000..4a5fd16 --- /dev/null +++ b/dlls/winscard/scardcomm.c @@ -0,0 +1,133 @@ +/* + * Copyright 2007 Mounir IDRASSI (mounir.idrassi(a)idrix.fr, for IDRIX) + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <stdlib.h> +#include <wchar.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winscard.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winscard); + + +LONG WINAPI SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1, + LPCVOID pvReserved2, + LPSCARDCONTEXT phContext) +{ + FIXME("(0x%08x %p %p %p): stub\n", dwScope, pvReserved1, pvReserved2, phContext); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + + +LONG WINAPI SCardReleaseContext(SCARDCONTEXT hContext) +{ + FIXME("(0x%08x): stub\n", (unsigned int)hContext); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardIsValidContext(SCARDCONTEXT hContext) +{ + FIXME("(0x%08x): stub\n", (unsigned int)hContext); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + + +LONG WINAPI SCardConnectA(SCARDCONTEXT hContext, LPCSTR szReader, + DWORD dwShareMode, DWORD dwPreferredProtocols, + LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) +{ + FIXME("(0x%08x %s 0x%08x 0x%08x %p %p): stub\n", (unsigned int)hContext, debugstr_a(szReader), dwShareMode, dwPreferredProtocols, phCard, pdwActiveProtocol); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardConnectW(SCARDCONTEXT hContext, LPCWSTR szReader, + DWORD dwShareMode, DWORD dwPreferredProtocols, + LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol) +{ + FIXME("(0x%08x %s 0x%08x 0x%08x %p %p): stub\n", (unsigned int)hContext, debugstr_w(szReader), dwShareMode, dwPreferredProtocols, phCard, pdwActiveProtocol); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode, + DWORD dwPreferredProtocols, DWORD dwInitialization, + LPDWORD pdwActiveProtocol) +{ + FIXME("(0x%08x 0x%08x 0x%08x 0x%08x %p): stub\n", (unsigned int)hCard, dwShareMode, dwPreferredProtocols, dwInitialization, pdwActiveProtocol); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition) +{ + FIXME("(0x%08x 0x%08x): stub\n", (unsigned int)hCard, dwDisposition); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardBeginTransaction(SCARDHANDLE hCard) +{ + FIXME("(0x%08x): stub\n", (unsigned int)hCard); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition) +{ + FIXME("(0x%08x 0x%08x): stub\n", (unsigned int)hCard, dwDisposition); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardCancelTransaction(SCARDHANDLE hCard) +{ + FIXME("(0x%08x): stub\n", (unsigned int)hCard); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardControl(SCARDHANDLE hCard, DWORD dwControlCode, + LPCVOID pbSendBuffer, DWORD cbSendLength, + LPVOID pbRecvBuffer, DWORD cbRecvLength, + LPDWORD lpBytesReturned) +{ + FIXME("(0x%08x 0x%08x %p %d %p %d %p): stub\n", (unsigned int)hCard, dwControlCode, pbSendBuffer, cbSendLength, pbRecvBuffer, cbRecvLength, lpBytesReturned); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardTransmit(SCARDHANDLE hCard, LPCSCARD_IO_REQUEST pioSendPci, + LPCBYTE pbSendBuffer, DWORD cbSendLength, + LPSCARD_IO_REQUEST pioRecvPci, LPBYTE pbRecvBuffer, + LPDWORD pcbRecvLength) +{ + FIXME("(0x%08x %p %p %d %p %p %p): stub\n", (unsigned int)hCard, pioSendPci, pbSendBuffer, cbSendLength, pioRecvPci, pbRecvBuffer, pcbRecvLength); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} diff --git a/dlls/winscard/scarddb.c b/dlls/winscard/scarddb.c new file mode 100644 index 0000000..ffe7727 --- /dev/null +++ b/dlls/winscard/scarddb.c @@ -0,0 +1,325 @@ +/* + * Copyright 2007 Mounir IDRASSI (mounir.idrassi(a)idrix.fr, for IDRIX) + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <stdlib.h> +#include <wchar.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winscard.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winscard); + + +/* Smart cards database functions. Almost all of them are stubs but they need + * to be present as many applications call them and are not affected if they + * return an error + */ +LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, + LPCGUID rgquidInterfaces, + DWORD cguidInterfaceCount, LPSTR mszCards, + LPDWORD pcchCards) +{ + FIXME("(0x%08x %p %p %d %p %p): stub\n", (unsigned int)hContext, pbAtr, rgquidInterfaces, cguidInterfaceCount, mszCards, pcchCards); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardListCardsW(SCARDCONTEXT hContext, LPCBYTE pbAtr, + LPCGUID rgquidInterfaces,DWORD cguidInterfaceCount, + LPWSTR mszCards, LPDWORD pcchCards) +{ + FIXME("(0x%08x %p %p %d %p %p): stub\n", (unsigned int)hContext, pbAtr, rgquidInterfaces, cguidInterfaceCount, mszCards, pcchCards); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardListInterfacesA(SCARDCONTEXT hContext, LPCSTR szCard, + LPGUID pguidInterfaces, + LPDWORD pcguidInterfaces) +{ + FIXME("(0x%08x %s %p %p): stub\n", (unsigned int)hContext, debugstr_a(szCard), pguidInterfaces, pcguidInterfaces); + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardListInterfacesW(SCARDCONTEXT hContext, LPCWSTR szCard, + LPGUID pguidInterfaces, + LPDWORD pcguidInterfaces) +{ + FIXME("(0x%08x %s %p %p): stub\n", (unsigned int)hContext, debugstr_w(szCard), pguidInterfaces, pcguidInterfaces); + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT hContext, LPCSTR szCard, + LPGUID pguidProviderId) +{ + FIXME("(0x%08x %s %p): stub\n", (unsigned int)hContext, debugstr_a(szCard), pguidProviderId); + if(!pguidProviderId) + return SCARD_E_INVALID_PARAMETER; + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT hContext, LPCWSTR szCard, + LPGUID pguidProviderId) +{ + FIXME("(0x%08x %s %p): stub\n", (unsigned int)hContext, debugstr_w(szCard), pguidProviderId); + if(!pguidProviderId) + return SCARD_E_INVALID_PARAMETER; + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT hContext, + LPCSTR szCardName, + DWORD dwProviderId, LPSTR szProvider, + LPDWORD pcchProvider) +{ + FIXME("(0x%08x %s 0x%08x %p %p): stub\n", (unsigned int)hContext, debugstr_a(szCardName), dwProviderId, szProvider, pcchProvider); + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT hContext, + LPCWSTR szCardName, + DWORD dwProviderId, + LPWSTR szProvider, + LPDWORD pcchProvider) +{ + FIXME("(0x%08x %s 0x%08x %p %p): stub\n", (unsigned int)hContext, debugstr_w(szCardName), dwProviderId, szProvider, pcchProvider); + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT hContext, + LPCSTR szGroupName) +{ + FIXME("(0x%08x %s): stub\n", (unsigned int)hContext, debugstr_a(szGroupName)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT hContext, + LPCWSTR szGroupName) +{ + FIXME("(0x%08x %s): stub\n", (unsigned int)hContext, debugstr_w(szGroupName)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT hContext, + LPCSTR szGroupName) +{ + FIXME("(0x%08x %s): stub\n", (unsigned int)hContext, debugstr_a(szGroupName)); + return SCARD_S_SUCCESS; +} + +LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT hContext, + LPCWSTR szGroupName) +{ + FIXME("(0x%08x %s): stub\n", (unsigned int)hContext, debugstr_w(szGroupName)); + return SCARD_S_SUCCESS; +} + +LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT hContext, + LPCSTR szReaderName, LPCSTR szDeviceName) +{ + FIXME("(0x%08x %s %s): stub\n", (unsigned int)hContext, debugstr_a(szReaderName), debugstr_a(szDeviceName)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT hContext, + LPCWSTR szReaderName, LPCWSTR szDeviceName) +{ + FIXME("(0x%08x %s %s): stub\n", (unsigned int)hContext, debugstr_w(szReaderName), debugstr_w(szDeviceName)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardForgetReaderA(SCARDCONTEXT hContext, LPCSTR szReaderName) +{ + FIXME("(0x%08x %s): stub\n", (unsigned int)hContext, debugstr_a(szReaderName)); + return SCARD_S_SUCCESS; +} + +LONG WINAPI SCardForgetReaderW(SCARDCONTEXT hContext, LPCWSTR szReaderName) +{ + FIXME("(0x%08x %s): stub\n", (unsigned int)hContext, debugstr_w(szReaderName)); + return SCARD_S_SUCCESS; +} + +LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT hContext, + LPCSTR szReaderName, LPCSTR szGroupName) +{ + FIXME("(0x%08x %s %s): stub\n", (unsigned int) hContext, debugstr_a(szReaderName), debugstr_a(szGroupName)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT hContext, + LPCWSTR szReaderName, LPCWSTR szGroupName) +{ + FIXME("(0x%08x %s %s): stub\n", (unsigned int)hContext, debugstr_w(szReaderName), debugstr_w(szGroupName)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT hContext, + LPCSTR szReaderName, + LPCSTR szGroupName) +{ + FIXME("(0x%08x %s %s): stub\n", (unsigned int)hContext, debugstr_a(szReaderName), debugstr_a(szGroupName)); + return SCARD_S_SUCCESS; +} + +LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT hContext, + LPCWSTR szReaderName, + LPCWSTR szGroupName) +{ + FIXME("(0x%08x %s %s): stub\n", (unsigned int)hContext, debugstr_w(szReaderName), debugstr_w(szGroupName)); + return SCARD_S_SUCCESS; +} + +LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT hContext, + LPCSTR szCardName, + LPCGUID pguidPrimaryProvider, + LPCGUID rgguidInterfaces, + DWORD dwInterfaceCount, + LPCBYTE pbAtr, LPCBYTE pbAtrMask, + DWORD cbAtrLen) +{ + FIXME("(0x%08x %s %p %p %d %p %p %d): stub\n", (unsigned int)hContext, debugstr_a(szCardName), pguidPrimaryProvider, rgguidInterfaces, dwInterfaceCount, pbAtr, pbAtrMask, cbAtrLen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT hContext, + LPCWSTR szCardName, + LPCGUID pguidPrimaryProvider, + LPCGUID rgguidInterfaces, + DWORD dwInterfaceCount, + LPCBYTE pbAtr, LPCBYTE pbAtrMask, + DWORD cbAtrLen) +{ + FIXME("(0x%08x %s %p %p %d %p %p %d): stub\n", (unsigned int)hContext, debugstr_w(szCardName), pguidPrimaryProvider, rgguidInterfaces, dwInterfaceCount, pbAtr, pbAtrMask, cbAtrLen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT hContext, + LPCSTR szCardName, + DWORD dwProviderId, + LPCSTR szProvider) +{ + FIXME("(0x%08x %s 0x%08x %s): stub\n", (unsigned int)hContext, debugstr_a(szCardName), dwProviderId, debugstr_a(szProvider)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT hContext, + LPCWSTR szCardName, + DWORD dwProviderId, + LPCWSTR szProvider) +{ + FIXME("(0x%08x %s 0x%08x %s): stub\n", (unsigned int)hContext, debugstr_w(szCardName), dwProviderId, debugstr_w(szProvider)); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT hContext, LPCSTR szCardName) +{ + FIXME("(0x%08x %s): stub\n", (unsigned int)hContext, debugstr_a(szCardName)); + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT hContext, LPCWSTR szCardName) +{ + FIXME("(0x%08x %s): stub\n", (unsigned int)hContext, debugstr_w(szCardName)); + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardLocateCardsA(SCARDCONTEXT hContext, LPCSTR mszCards, + LPSCARD_READERSTATEA rgReaderStates, + DWORD cReaders) +{ + FIXME("(0x%08x %s %p %d): stub\n", (unsigned int)hContext, debugstr_a(mszCards), rgReaderStates, cReaders); + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardLocateCardsW(SCARDCONTEXT hContext, LPCWSTR mszCards, + LPSCARD_READERSTATEW rgReaderStates, + DWORD cReaders) +{ + FIXME("(0x%08x %s %p %d): stub\n", (unsigned int)hContext, debugstr_w(mszCards), rgReaderStates, cReaders); + return SCARD_E_UNKNOWN_CARD; +} + +LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT hContext, + LPSCARD_ATRMASK rgAtrMasks, DWORD cAtrs, + LPSCARD_READERSTATEA rgReaderStates, + DWORD cReaders) +{ + FIXME("(0x%08x %p %d %p %d): stub\n", (unsigned int)hContext, rgAtrMasks, cAtrs, rgReaderStates, cReaders); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT hContext, + LPSCARD_ATRMASK rgAtrMasks, DWORD cAtrs, + LPSCARD_READERSTATEW rgReaderStates, + DWORD cReaders) +{ + FIXME("(0x%08x %p %d %p %d): stub\n", (unsigned int)hContext, rgAtrMasks, cAtrs, rgReaderStates, cReaders); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT hContext, LPSTR mszGroups, + LPDWORD pcchGroups) +{ + FIXME("(0x%08x %p %p): stub\n", (unsigned int)hContext, mszGroups, pcchGroups); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT hContext, + LPWSTR mszGroups, LPDWORD pcchGroups) +{ + FIXME("(0x%08x %p %p): stub\n", (unsigned int)hContext, mszGroups, pcchGroups); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardListReadersA(SCARDCONTEXT hContext, LPCSTR mszGroups, + LPSTR mszReaders, LPDWORD pcchReaders) +{ + FIXME("(0x%08x %p %p %p): stub\n", (unsigned int)hContext, mszGroups, mszReaders, pcchReaders); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardListReadersW(SCARDCONTEXT hContext, LPCWSTR mszGroups, + LPWSTR mszReaders, LPDWORD pcchReaders) +{ + FIXME("(0x%08x %p %p %p): stub\n", (unsigned int)hContext, mszGroups, mszReaders, pcchReaders); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} diff --git a/dlls/winscard/scardtracking.c b/dlls/winscard/scardtracking.c new file mode 100644 index 0000000..8b109ac --- /dev/null +++ b/dlls/winscard/scardtracking.c @@ -0,0 +1,104 @@ +/* + * Copyright 2007 Mounir IDRASSI (mounir.idrassi(a)idrix.fr, for IDRIX) + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <stdlib.h> +#include <wchar.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winscard.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winscard); + + +LONG WINAPI SCardState(SCARDHANDLE hCard, LPDWORD pdwState, + LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) +{ + FIXME("(0x%08x %p %p %p %p): stub\n", (unsigned int)hCard, pdwState, pdwProtocol, pbAtr, pcbAtrLen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardStatusA(SCARDHANDLE hCard, LPSTR mszReaderNames, + LPDWORD pcchReaderLen, LPDWORD pdwState, + LPDWORD pdwProtocol, + LPBYTE pbAtr, LPDWORD pcbAtrLen) +{ + FIXME("(0x%08x %p %p %p %p %p %p): stub\n", (unsigned int)hCard, mszReaderNames, pcchReaderLen, pdwState, pdwProtocol, pbAtr, pcbAtrLen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardStatusW(SCARDHANDLE hCard, LPWSTR mszReaderNames, + LPDWORD pcchReaderLen, LPDWORD pdwState, + LPDWORD pdwProtocol, + LPBYTE pbAtr, LPDWORD pcbAtrLen) +{ + FIXME("(0x%08x %p %p %p %p %p %p): stub\n", (unsigned int)hCard, mszReaderNames, pcchReaderLen, pdwState, pdwProtocol, pbAtr, pcbAtrLen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT hContext, + DWORD dwTimeout, + LPSCARD_READERSTATEA rgReaderStates, + DWORD cReaders) +{ + FIXME("(0x%08x 0x%08x %p 0x%08x): stub\n", (unsigned int)hContext, dwTimeout, rgReaderStates, cReaders); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT hContext, DWORD dwTimeout, + LPSCARD_READERSTATEW rgReaderStates, + DWORD cReaders) +{ + FIXME("(0x%08x 0x%08x %p 0x%08x): stub\n", (unsigned int)hContext, dwTimeout, rgReaderStates, cReaders); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + + +LONG WINAPI SCardCancel(SCARDCONTEXT hContext) +{ + FIXME("(0x%08x): stub\n",(unsigned int) hContext); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, + LPBYTE pbAttr, LPDWORD pcbAttrLen) +{ + FIXME("(0x%08x 0x%08x %p %p): stub\n", (unsigned int)hCard, dwAttrId, pbAttr, pcbAttrLen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardSetAttrib(SCARDHANDLE hCard, DWORD dwAttrId, + const BYTE* pbAttr, DWORD cbAttrLen) +{ + FIXME("(0x%08x 0x%08x %p 0x%08x): stub\n", (unsigned int)hCard, dwAttrId, pbAttr, cbAttrLen); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c new file mode 100644 index 0000000..9ed5930 --- /dev/null +++ b/dlls/winscard/winscard.c @@ -0,0 +1,109 @@ +/* + * Copyright 2007 Mounir IDRASSI (mounir.idrassi(a)idrix.fr, for IDRIX) + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <stdarg.h> +#include <stdlib.h> +#include <wchar.h> + +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winscard.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(winscard); + + +static HMODULE WINSCARD_hModule; + +SCARD_IO_REQUEST g_rgSCardT0Pci = { SCARD_PROTOCOL_T0, 8 }; +SCARD_IO_REQUEST g_rgSCardT1Pci = { SCARD_PROTOCOL_T1, 8 }; +SCARD_IO_REQUEST g_rgSCardRawPci = { SCARD_PROTOCOL_RAW, 8 }; + +SCARD_IO_REQUEST* SCARD_PCI_T0 = NULL; +SCARD_IO_REQUEST* SCARD_PCI_T1 = NULL; +SCARD_IO_REQUEST* SCARD_PCI_RAW = NULL; + + +BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + WINSCARD_hModule = hinstDLL; + /* initialize protocol requests pointers */ + SCARD_PCI_T0 = &g_rgSCardT0Pci; + SCARD_PCI_T1 = &g_rgSCardT1Pci; + SCARD_PCI_RAW = &g_rgSCardRawPci; + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} + + +/* + * event functions + */ + +HANDLE WINAPI SCardAccessNewReaderEvent() +{ + FIXME("stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +long WINAPI SCardReleaseAllEvents() +{ + FIXME("stub\n"); + return SCARD_S_SUCCESS; +} + +long WINAPI SCardReleaseNewReaderEvent(HANDLE hNewReaderEventHandle) +{ + FIXME("stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_S_SUCCESS; +} + +HANDLE WINAPI SCardAccessStartedEvent() +{ + FIXME("stub\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} + +void WINAPI SCardReleaseStartedEvent(void) +{ + FIXME("stub\n"); +} + + +LONG WINAPI SCardFreeMemory( SCARDCONTEXT hContext,LPCVOID pvMem) +{ + FIXME("(0x%08X %p): stub\n", (unsigned int)hContext, pvMem); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_UNKNOWN_ERROR; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec new file mode 100644 index 0000000..c2bbe55 --- /dev/null +++ b/dlls/winscard/winscard.spec @@ -0,0 +1,66 @@ +@ stub ClassInstall32 +@ stdcall SCardAccessNewReaderEvent() +@ stdcall SCardAccessStartedEvent() +@ stdcall SCardAddReaderToGroupA(long str str) +@ stdcall SCardAddReaderToGroupW(long wstr wstr) +@ stdcall SCardBeginTransaction(long) +@ stdcall SCardCancel(long) +@ stdcall SCardConnectA(long str long long ptr ptr) +@ stdcall SCardConnectW(long wstr long long ptr ptr) +@ stdcall SCardControl(long long ptr long ptr long ptr) +@ stdcall SCardDisconnect(long long) +@ stdcall SCardEndTransaction(long long) +@ stdcall SCardEstablishContext(long ptr ptr ptr) +@ stdcall SCardForgetCardTypeA(long str) +@ stdcall SCardForgetCardTypeW(long wstr) +@ stdcall SCardForgetReaderA(long str) +@ stdcall SCardForgetReaderW(long wstr) +@ stdcall SCardForgetReaderGroupA(long str) +@ stdcall SCardForgetReaderGroupW(long wstr) +@ stdcall SCardFreeMemory(long ptr) +@ stdcall SCardGetAttrib(long long ptr ptr) +@ stdcall SCardGetCardTypeProviderNameA(long str long str ptr) +@ stdcall SCardGetCardTypeProviderNameW(long wstr long wstr ptr) +@ stdcall SCardGetProviderIdA(long str ptr) +@ stdcall SCardGetProviderIdW(long wstr ptr) +@ stdcall SCardGetStatusChangeA(long long ptr long) +@ stdcall SCardGetStatusChangeW(long long ptr long) +@ stdcall SCardIntroduceCardTypeA(long str ptr ptr long ptr ptr long) +@ stdcall SCardIntroduceCardTypeW(long wstr ptr ptr long ptr ptr long) +@ stdcall SCardIntroduceReaderA(long str str) +@ stdcall SCardIntroduceReaderW(long wstr wstr) +@ stdcall SCardIntroduceReaderGroupA(long str) +@ stdcall SCardIntroduceReaderGroupW(long wstr) +@ stdcall SCardIsValidContext(long) +@ stdcall SCardListCardsA(long ptr ptr long str ptr) +@ stdcall SCardListCardsW(long ptr ptr long wstr ptr) +@ stdcall SCardListInterfacesA(long str ptr ptr) +@ stdcall SCardListInterfacesW(long wstr ptr ptr) +@ stdcall SCardListReadersA(long str str ptr) +@ stdcall SCardListReadersW(long wstr wstr ptr) +@ stdcall SCardListReaderGroupsA(long str ptr) +@ stdcall SCardListReaderGroupsW(long wstr ptr) +@ stdcall SCardLocateCardsA(long str ptr long) +@ stdcall SCardLocateCardsW(long wstr ptr long) +@ stdcall SCardLocateCardsByATRA(long ptr long ptr long) +@ stdcall SCardLocateCardsByATRW(long ptr long ptr long) +@ stdcall SCardReconnect(long long long long ptr) +@ stdcall SCardReleaseAllEvents() +@ stdcall SCardReleaseContext(long) +@ stdcall SCardReleaseNewReaderEvent() +@ stdcall SCardReleaseStartedEvent() +@ stdcall SCardRemoveReaderFromGroupA(long str str) +@ stdcall SCardRemoveReaderFromGroupW(long wstr wstr) +@ stdcall SCardSetAttrib(long long ptr long) +@ stdcall SCardSetCardTypeProviderNameA(long str long str) +@ stdcall SCardSetCardTypeProviderNameW(long wstr long wstr) +@ stdcall SCardState(long ptr ptr ptr ptr) +@ stdcall SCardStatusA(long str ptr ptr ptr ptr ptr) +@ stdcall SCardStatusW(long wstr ptr ptr ptr ptr ptr) +@ stdcall SCardTransmit(long ptr ptr long ptr ptr ptr) +@ extern g_rgSCardRawPci +@ extern g_rgSCardT0Pci +@ extern g_rgSCardT1Pci +@ extern SCARD_PCI_RAW +@ extern SCARD_PCI_T0 +@ extern SCARD_PCI_T1 -- 1.4.4.4

3 6

Re: [PATCH 1/6] msi: automation: Condense a few loops.
by James Hawkins May 16, 2007

May 16, 2007

On 5/15/07, Misha Koshelev <mk144210(a)bcm.edu> wrote: > --- > dlls/msi/automation.c | 30 ++++++++++++------------------ > 1 files changed, 12 insertions(+), 18 deletions(-) > --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -580,16 +580,13 @@ static HRESULT WINAPI RecordImpl_Invoke( if (FAILED(hr)) return hr; V_VT(pVarResult) = VT_BSTR; V_BSTR(pVarResult) = NULL; - ret = MsiRecordGetStringW(This->msiHandle, V_I4(&varg0), NULL, &dwLen); - if (ret == ERROR_SUCCESS) + if ((ret = MsiRecordGetStringW(This->msiHandle, V_I4(&varg0), NULL, &dwLen)) == ERROR_SUCCESS) { Did you mean to mix tabs and spaces in your own file? You should probably stick with one or the other (preferably spaces to keep with the rest of msi). -- James Hawkins

2 1

ntoskrnl.exe: Initial stub version with forwards to existing functions.
by EA Durbin May 15, 2007

May 15, 2007

Nice! : ) _________________________________________________________________ PC Magazines 2007 editors choice for best Web mailaward-winning Windows Live Hotmail. http://imagine-windowslive.com/hotmail/?locale=en-us&ocid=TXT_TAGHM_migrati…

1 0

Re: [PATCH 2/6] msi/tests: automation: Remove unnecessary if (SUCCEEDED(hr)) statements.
by Jacek Caban May 15, 2007

May 15, 2007

Hi Misha, While you are at it, it's worth to directly compare the result to S_OK in tests instead of using SUCCEEDED macro as it's a more strict test. Jacek

1 0

Re: wined3d: Add hardware cursor support.
by Stefan Dösinger May 15, 2007

May 15, 2007

Am Dienstag 15 Mai 2007 00:40 schrieb Andrew Riedi: > Ok, I think the patch is finally ready to go in. I applied what Stefan > wanted me to apply. > > changelog: wined3d: Add hardware cursor support. Looks ok to me

1 0

How works pGetAsyncKeyState?
by Rafał Miłecki May 15, 2007

May 15, 2007

Hello, It's my first time I look into source of Wine. I found a bug near dlls/user32/input.c. You can find here this code: SHORT WINAPI GetAsyncKeyState(INT nKey) { return USER_Driver->pGetAsyncKeyState( nKey ); } The problem is that this function don't return right value in every case. Could someone explain me how it works, please? I can not find anywhere code writing any value to "pGetAsyncKeyState" nor function that is executed when "pGetAsyncKeyState" is called. -- Rafał Miłecki

2 2

Re: crypt32(5/5): Implement CryptSIPLoad
by Alexandre Julliard May 15, 2007

May 15, 2007

Juan Lang <juan_lang(a)yahoo.com> writes: > +static struct list providers; > +CRITICAL_SECTION providers_cs; > + > +void crypt_sip_init(void) > +{ > + InitializeCriticalSection(&providers_cs); > + list_init(&providers); > + providers_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": providers_cs"); > +} Lists and critical sections can be initialized statically, this is more efficient and avoids having to export a bunch of init functions. -- Alexandre Julliard julliard(a)winehq.org

1 0

mentoring
by Tom Spear May 15, 2007

May 15, 2007

Hi all, just wanted to know if anyone would _mind_ helping me with my (small) todo list. I know I've been somewhat of an annoyance lately, and for that I sincerely apologize. I'd really like to get the wine uninstaller program up to speed with the patch I have been working on, but it is not going as I had hoped. One person offered to review my patches, but I am admittedly impatient sometimes (I haven't been able to get a response from him since Thursday, and I had hoped for one by Friday night), and all in all, I just dont like having something so small take so long. I am making changes to code I didn't intend to change, which I don't mind doing, but then when I make the change, I get told to do it 3 different ways, and none of the ways I submit gets committed, even after being told that it looks ready to go in. I'd like someone who is really in touch with what Alexandre is looking for to help me. I only have 4 patches, all less than 50 lines each to get this thing in, and I will be done submitting patches for a while, until I learn more about the code (maybe months or even years).. I will take whatever advice is given me (unless it is to not bother with the patch), and really appreciate the help. If you dont mind helping me, please post a note on my bug about the patch http://bugs.winehq.org/show_bug.cgi?id=8364 -- Thanks Tom

5 8

Re: [tools] add winecfg to XDG menus
by Marcus Meissner May 15, 2007

May 15, 2007

On Tue, May 15, 2007 at 07:36:38AM +0200, Damjan Jovanovic wrote: > Changelog: > * When installing wine, add an entry for winecfg to the XDG menus > > Damjan Jovanovic > diff -Nur a/tools/Makefile.in b/tools/Makefile.in > --- a/tools/Makefile.in 2007-05-03 08:46:44.000000000 +0200 > +++ b/tools/Makefile.in 2007-05-14 21:59:17.646137077 +0200 > @@ -82,7 +82,11 @@ > install install-lib:: wineprefixcreate $(INSTALLDIRS) > $(INSTALL_SCRIPT) wineprefixcreate $(DESTDIR)$(bindir)/wineprefixcreate > $(INSTALL_DATA) $(SRCDIR)/wine.inf $(DESTDIR)$(datadir)/wine/wine.inf > + mkdir -p /etc/xdg/menus &> /dev/null || true > + mkdir -p ~/.config/menus/applications-merged > + if ! $(INSTALL_DATA) $(SRCDIR)/wine.menu /etc/xdg/menus &> /dev/null; then $(INSTALL_DATA) $(SRCDIR)/wine.menu ~/.config/menus/applications-merged; fi Please do not use ~. You are not supposed to put stuff into any kind of $HOMEs. Please use $(DESTDIR) for global paths. Ciao, Marcus

2 1

Install fail on 64bit syst Q
by wkpickett0154＠comcast.net May 15, 2007

May 15, 2007

Hello, I am aware that wine currently installs on 32 bit only according to numerous blogentries. Here is my congif.log on this attempt to better assist in a X86_64 generic compile. I suppose, on my ignorance- that this compile needs to be put in a different location to be called for? I am new to Linux/Ubuntu and programming language-speak, so any help here, non-tech type would be a help. William Pickett Albuquerque NM WINE Installer v0.75 Running configure... configure: creating cache config.cache checking build system type... x86_64-unknown-linux-gnu checking host system type... x86_64-unknown-linux-gnu checking whether make sets $(MAKE)... yes checking for gcc... gcc -m32 checking for C compiler default output file name... configure: error: C compiler cannot create executables See `config.log' for more details. Configure failed, aborting install. This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by Wine configure 0.9.37, which was generated by GNU Autoconf 2.61. Invocation command line was $ ./configure -C --prefix=/usr/local ## --------- ## ## Platform. ## ## --------- ## hostname = c21william-desktop uname -m = x86_64 uname -r = 2.6.20-15-generic uname -s = Linux uname -v = #2 SMP Sun Apr 15 06:17:24 UTC 2007 /usr/bin/uname -p = unknown /bin/uname -X = unknown /bin/arch = x86_64 /usr/bin/arch -k = unknown /usr/convex/getsysinfo = unknown /usr/bin/hostinfo = unknown /bin/machine = unknown /usr/bin/oslevel = unknown /bin/universe = unknown PATH: /usr/local/sbin PATH: /usr/local/bin PATH: /usr/sbin PATH: /usr/bin PATH: /sbin PATH: /bin PATH: /usr/bin/X11 PATH: /usr/games ## ----------- ## ## Core tests. ## ## ----------- ## configure:1737: creating cache config.cache configure:1888: checking build system type configure:1906: result: x86_64-unknown-linux-gnu configure:1928: checking host system type configure:1943: result: x86_64-unknown-linux-gnu configure:2008: checking whether make sets $(MAKE) configure:2029: result: yes configure:2086: checking for gcc configure:2113: result: gcc -m32 configure:2351: checking for C compiler version configure:2358: gcc -m32 --version >&5 gcc (GCC) 4.1.2 (Ubuntu 4.1.2-0ubuntu4) Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. configure:2361: $? = 0 configure:2368: gcc -m32 -v >&5 Using built-in specs. Target: x86_64-linux-gnu Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release x86_64-linux-gnu Thread model: posix gcc version 4.1.2 (Ubuntu 4.1.2-0ubuntu4) configure:2371: $? = 0 configure:2378: gcc -m32 -V >&5 gcc: '-V' must come at the start of the command line configure:2381: $? = 1 configure:2404: checking for C compiler default output file name configure:2431: gcc -m32 conftest.c >&5 /usr/bin/ld: skipping incompatible /usr/bin/../lib/libc.so when searching for -lc /usr/bin/ld: skipping incompatible /usr/bin/../lib/libc.a when searching for -lc /usr/bin/ld: skipping incompatible /usr/lib/libc.so when searching for -lc /usr/bin/ld: skipping incompatible /usr/lib/libc.a when searching for -lc /usr/bin/ld: cannot find -lc collect2: ld returned 1 exit status configure:2434: $? = 1 configure:2472: result: configure: failed program was: | /* confdefs.h. */ | #define PACKAGE_NAME "Wine" | #define PACKAGE_TARNAME "wine" | #define PACKAGE_VERSION "0.9.37" | #define PACKAGE_STRING "Wine 0.9.37" | #define PACKAGE_BUGREPORT "wine-devel(a)winehq.org" | /* end confdefs.h. */ | | int | main () | { | | ; | return 0; | } configure:2479: error: C compiler cannot create executables See `config.log' for more details. ## ---------------- ## ## Cache variables. ## ## ---------------- ## ac_cv_build=x86_64-unknown-linux-gnu ac_cv_env_CCC_set= ac_cv_env_CCC_value= ac_cv_env_CC_set= ac_cv_env_CC_value= ac_cv_env_CFLAGS_set= ac_cv_env_CFLAGS_value= ac_cv_env_CPPFLAGS_set= ac_cv_env_CPPFLAGS_value= ac_cv_env_CPP_set= ac_cv_env_CPP_value= ac_cv_env_CXXFLAGS_set= ac_cv_env_CXXFLAGS_value= ac_cv_env_CXX_set= ac_cv_env_CXX_value= ac_cv_env_LDFLAGS_set= ac_cv_env_LDFLAGS_value= ac_cv_env_LIBS_set= ac_cv_env_LIBS_value= ac_cv_env_XMKMF_set= ac_cv_env_XMKMF_value= ac_cv_env_build_alias_set= ac_cv_env_build_alias_value= ac_cv_env_host_alias_set= ac_cv_env_host_alias_value= ac_cv_env_target_alias_set= ac_cv_env_target_alias_value= ac_cv_host=x86_64-unknown-linux-gnu ac_cv_prog_ac_ct_CC='gcc -m32' ac_cv_prog_make_make_set=yes ## ----------------- ## ## Output variables. ## ## ----------------- ## ALSALIBS='' AR='' AS='as --32' AUDIOIOLIBS='' BISON='' BUILTINFLAG='' CARBONLIB='' CC='gcc -m32' CFLAGS='' COREAUDIO='' COREFOUNDATIONLIB='' CPP='' CPPBIN='' CPPFLAGS='' CROSSCC='' CROSSTEST='' CROSSWINDRES='' CRTLIBS='' CXX='' CXXFLAGS='' DEFS='' DEPENDENCIES='' DISKARBITRATIONLIB='' DLLEXT='' DLLFLAGS='' DLLTOOL='' DLLWRAP='' ECHO_C='' ECHO_N='-n' ECHO_T='' EGREP='' ESDCONFIG='' ESDINCL='' ESDLIBS='' EXEEXT='' EXTRACFLAGS='' EXTRA_BINARIES='' FLEX='' FONTFORGE='' FONTSSUBDIRS='' FREETYPEINCL='' FREETYPELIBS='' GLU32FILES='' GPHOTO2INCL='' GPHOTO2LIBS='' GREP='' HALINCL='' ICULIBS='' IMPLIBEXT='' INSTALL_DATA='' INSTALL_PROGRAM='' INSTALL_SCRIPT='' IOKITLIB='' LCMSLIBS='' LD='ld -m elf_i386' LDAPLIBS='' LDCONFIG='' LDD='' LDDLLFLAGS='' LDEXECFLAGS='' LDFLAGS='' LDPATH='' LDSHARED='' LIBDL='' LIBEXT='' LIBOBJS='' LIBPOLL='' LIBPTHREAD='' LIBS='' LIBWINE_LDFLAGS='' LINT='' LINTFLAGS='' LN='' LN_S='' LTLIBOBJS='' MAIN_BINARY='' MINGWAR='' NASLIBS='' OBJEXT='' OPENGLFILES='' OPENGL_LIBS='' PACKAGE_BUGREPORT='wine-devel(a)winehq.org' PACKAGE_NAME='Wine' PACKAGE_STRING='Wine 0.9.37' PACKAGE_TARNAME='wine' PACKAGE_VERSION='0.9.37' PATH_SEPARATOR=':' PKG_CONFIG='' PRELINK='' QUARTZFILES='' RANLIB='' RESOLVLIBS='' SANEINCL='' SET_MAKE='' SHELL='/bin/bash' SOCKETLIBS='' STRIP='' TOOLSDIR='' WIN16_FILES='$(WIN16_FILES)' WIN16_INSTALL='$(WIN16_INSTALL)' WINDRES='' XFILES='' XLIB='' XMKMF='' XML2INCL='' XML2LIBS='' XSLTINCL='' XSLTLIBS='' X_CFLAGS='' X_EXTRA_LIBS='' X_LIBS='' X_PRE_LIBS='' ac_ct_AS='' ac_ct_CC='gcc -m32' ac_ct_CXX='' bindir='${exec_prefix}/bin' build='x86_64-unknown-linux-gnu' build_alias='' build_cpu='x86_64' build_os='linux-gnu' build_vendor='unknown' datadir='${datarootdir}' datarootdir='${prefix}/share' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' dvidir='${docdir}' exec_prefix='NONE' ft_devel2='' ft_devel='' gphoto2_devel='' gphoto2port_devel='' host='x86_64-unknown-linux-gnu' host_alias='' host_cpu='i386' host_os='linux-gnu' host_vendor='unknown' htmldir='${docdir}' includedir='${prefix}/include' infodir='${datarootdir}/info' libdir='${exec_prefix}/lib' libexecdir='${exec_prefix}/libexec' localedir='${datarootdir}/locale' localstatedir='${prefix}/var' mandir='${datarootdir}/man' oldincludedir='/usr/include' pdfdir='${docdir}' prefix='/usr/local' program_transform_name='s,x,x,' psdir='${docdir}' sane_devel='' sbindir='${exec_prefix}/sbin' sharedstatedir='${prefix}/com' sysconfdir='${prefix}/etc' target_alias='' ## ------------------- ## ## File substitutions. ## ## ------------------- ## MAKE_DLL_RULES='' MAKE_IMPLIB_RULES='' MAKE_PROG_RULES='' MAKE_RULES='' MAKE_TEST_RULES='' ## ----------- ## ## confdefs.h. ## ## ----------- ## #define PACKAGE_NAME "Wine" #define PACKAGE_TARNAME "wine" #define PACKAGE_VERSION "0.9.37" #define PACKAGE_STRING "Wine 0.9.37" #define PACKAGE_BUGREPORT "wine-devel(a)winehq.org" configure: exit 77

5 4

OpenAL32 dll thunk test
by Chris Robinson May 14, 2007

May 14, 2007

After the previous attempt by Nick Burns was more or less abandoned, I decided to try making an acceptable version myself. This is the current result. I used the original version Nick had and got rid a lot of the macro abuse. It still uses macros to declare/define and load the functions, but it isn't nearly as bad as it was. I know AJ isn't very thrilled with macro use, but I believe the current method is a nice balance between flexibility and clarity. Note that this IS NOT FINISHED. It should be good enough to work, however. The main reason for this is to get some testing to make sure it works as expected on other machines (especially OSX). The things I still need to work on are: a) Skip building the DLL if OpenAL headers aren't found on the system durring ./configure (any autotools experts want to help?) b) Properly handle the autotools stuff (any autotools experts want to help?) c) Fix up extension handling to use al[c]GetProcAddress instead of dlsym (for the sake of being proper; I don't believe this would pose a problem currently) The OpenAL lib is dynamicly loaded, so the lib doesn't need to be present when building. If the lib is not present when the DLL is loaded however, then the DLL will fail to load. Because of this, it might be a good idea to include OpenAL headers with Wine, so they will always be available to build the DLL with (the headers are LGPL licensed, AFAIK). Won't have to worry about skipping building or configure checking that way. On my Linux machine, the OpenAL 1.1 SDK demos work*. I'm curious about how they work for other people on other machines, and for other apps. * Not quite true. EnumerateWin32.exe doesn't wait for a key press before exiting, and OpenALDemo.exe won't wait for key presses when trying to pick a test (it loops endlessly on the "main menu"). These problems are not related to OpenAL. PlayStaticWin32.exe and PlayStreamWin32.exe both work perfectly, and EnumerateWin32.exe does do what it's supposed to, with the exception of the wait-for-key-before-exit problem. Note that if you're using the Sample Implementation, you must get a recent (as in today/yesterday) SVN checkout of it. It was missing a couple somewhat obscure 1.1 functions I sent in a patch for and got applied. After patching, you'll need to run autoconf (or autogen if you use that script) to generate a new configure. Reconfigure, then rebuild Wine. PS. I did get permission from Nick before posting this as I used his "un-licensed" patch as a starting point. It's all okay with him. PPS. I know not everyone likes the idea of this thunk, because the native implementations aren't "up to par" with the Windows version that backends on DSound. However, the only way they'll get better is with use (they've already got several patches from me because of this thunk, with more pending, and more in planning), and if worse comes to worse, you can use a DLL override to use the Windows native OpenAL. Creative is planning on releasing hardware OpenAL Linux drivers for some of their cards later this year, and this would be the best way to take advantage of them.

3 2

How works pGetAsyncKeyState?
by Rafał Miłecki May 14, 2007

May 14, 2007

Hello, It's my first time I look into source of Wine. I found a bug near dlls/user32/input.c. You can find here this code: SHORT WINAPI GetAsyncKeyState(INT nKey) { return USER_Driver->pGetAsyncKeyState( nKey ); } The problem is that this function don't return right value in every case. Could someone explain me how it works, please? I can not find anywhere code writing any value to "pGetAsyncKeyState" nor function that is executed when "pGetAsyncKeyState" is called. -- Rafał Miłecki

1 0

Re: [PATCH 2/8] msi/tests: automation: Add test for Installer::InstallProduct.
by James Hawkins May 14, 2007

May 14, 2007

On 5/14/07, Misha Koshelev <mk144210(a)bcm.edu> wrote: > --- > dlls/msi/tests/automation.c | 307 ++++++++++++++++++++++++++++++++++++++++++- > 1 files changed, 300 insertions(+), 7 deletions(-) > + /* Installer::ProductState for our product code, which has been installed */ + hr = Installer_ProductState(szProductCode, &iValue); + ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); + if (SUCCEEDED(hr)) + todo_wine ok(iValue == INSTALLSTATE_DEFAULT, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_DEFAULT); If you're assuming that hr SUCCEEDED (which you are by putting that check in ok), then you shouldn't condition the next ok on SUCCEEDED(hr). -- James Hawkins

2 1

Re: dinput: Prevent race between destroying the hook window and unloading the dll.
by Alexandre Julliard May 14, 2007

May 14, 2007

Vitaliy Margolen <wine-patches(a)kievinfo.com> writes: > else ERR("Error creating message window\n"); > > + UnregisterClassW(classW, DINPUT_instance); > return 0; You need to clear the class atom if you unregister the class, otherwise the next window creation will fail. -- Alexandre Julliard julliard(a)winehq.org

1 0

LinuxConf Europe
by Kai Blin May 13, 2007

May 13, 2007

Hi folks, I'm considering to send in a paper proposal for LinuxConf Europe 2007 (http://www.linuxconf.eu/2007/cfp/) talking about (my plans for) Wine / Samba integration. Is there anybody else planning to go there? How about a small meeting there, to practice for WineConf? ;) As far as my plans go, the wiki already lists some of the things, I'm planning to flesh this out a little more. Cheers, Kai -- Kai Blin WorldForge developer http://www.worldforge.org/ Wine developer http://wiki.winehq.org/KaiBlin Samba team member http://us1.samba.org/samba/team/ -- Will code for cotton.

1 0

Re: [PATCH] some alsa midi fixes
by James Hawkins May 13, 2007

May 13, 2007

On 5/13/07, Ralf Beck <musical_snake(a)gmx.de> wrote: > Hello, > this patch fixes: > - Bug 8096 > - incorrect handling of pitchbender on midi-in > - add midi-in midiclock/start/stop/continue/spp/song sel > - make midi-out midiclock/start/stop/continue/spp/song sel handling same > style as on midi-in > One fix per patch please. -- James Hawkins

1 0

Re: shell32: check result of HeapAlloc(), revised
by James Hawkins May 13, 2007

May 13, 2007

On 5/13/07, hto(a)mail.cnt.ru <hto(a)mail.cnt.ru> wrote: > Add an ERR() messages, save an indentation level. > > --- wine-0.9.37-orig/dlls/shell32/dataobject.c 2007-05-13 10:16:18.000000000 +0000 > +++ wine-0.9.37/dlls/shell32/dataobject.c 2007-05-13 10:51:50.000000000 +0000 > @@ -169,27 +169,29 @@ static const IEnumFORMATETCVtbl efvt = > > LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) > { > - IEnumFORMATETCImpl* ef; > - DWORD size=cfmt * sizeof(FORMATETC); > + IEnumFORMATETCImpl* ef; > + DWORD size=cfmt * sizeof(FORMATETC); > Please don't change the indentation. You have to stick with whatever indentation exists for the file you're editing. -- James Hawkins

2 1

Re: shell32: check result of HeapAlloc()
by James Hawkins May 13, 2007

May 13, 2007

On 5/12/07, hto(a)mail.cnt.ru <hto(a)mail.cnt.ru> wrote: > > --- wine-0.9.37-orig/dlls/shell32/folders.c 2007-05-12 22:53:06.000000000 +0000 > +++ wine-0.9.37/dlls/shell32/folders.c 2007-05-13 00:17:00.000000000 +0000 > @@ -81,11 +81,15 @@ IExtractIconW* IExtractIconW_Constructor > TRACE("%p\n", pidl); > > ei = HeapAlloc(GetProcessHeap(),0,sizeof(IExtractIconWImpl)); > - ei->ref=1; > - ei->lpVtbl = &eivt; > - ei->lpvtblPersistFile = &pfvt; > - ei->lpvtblExtractIconA = &eiavt; > - ei->pidl=ILClone(pidl); > + > + if (ei) > + { > + ei->ref=1; > + ei->lpVtbl = &eivt; > + ei->lpvtblPersistFile = &pfvt; > + ei->lpvtblExtractIconA = &eiavt; > + ei->pidl=ILClone(pidl); > + } > If a HeapAlloc call fails, you need to return with the appropriate error. -- James Hawkins

2 2

Re: check for This->clipper before unreferencing in dlls/ddraw/surface.c
by Andrew Riedi May 13, 2007

May 13, 2007

Perhaps give an example? "Please include a one-liner in your email stating what you did. Example: changelog: I fixed function X that was causing bug Y. Note: There is no need to edit the ChangeLog file itself." How is the above? -- Andrew Riedi

2 1

Re: check for This->clipper before unreferencing in dlls/ddraw/surface.c
by Tony Lambregts May 13, 2007

May 13, 2007

Vincent Fourmond wrote: > Stefan Dösinger wrote: >> also you do not have to >> modify the ChangeLog file, git does that automatically when AJ commits the >> patch. > > I just followed the instructions on > http://winehq.org/site/sending_patches. If they are not correct, please > update this page. > >From that page ----8<--- When submitting patches, please: * Include a ChangeLog entry with your real name, email address and a description of what your patch does. ---->8---- Thats says nothings about a diff of the ChangeLog. I do not know how I would change the wording of that. -- Tony Lambregts

1 0

msi: undo RegisterProduct/PublishProduct
by Misha Koshelev May 12, 2007

May 12, 2007

Hi, I am starting to write some automation conformance tests for things that I could check only after a package has been installed (and before it was removed) like ProductInfo and RelatedProducts. I've added the install functionality into the conformance test, and it works beautifully on Windows, cleaning up after itself every time both by deleting all the installed files and also doing an MsiInstallPackage/Installer::InstallPackage call with REMOVE=ALL options which gets rid of all the information published by RegisterProduct/PublishProduct, thus allowing the ProductState to go back to being INSTALLSTATE_UNKNOWN afterwards. However, in wine the tests run fine the first time, but then the REMOVE=ALL call does not seem to remove the registry data (in fact I'm not sure this functionality is present under Wine msi yet). Is there any way to properly remove the registry data about the application under Wine MSI in my conformance test without just manually clearing out the appropriate registry values, and would this be considered to be kosher? Thanks Misha

2 2

Internet explorer not detected
by Louis Lenders May 12, 2007

May 12, 2007

Hi, i tried help this dude on IRC channel getting an application to run called MegaSpoof. Even after creating fake registry key it kept complaining about missing Internet Explorer. After looking through the +relay log i found this: 000d:Call KERNEL32.CreateProcessW(00000000,0034f428 L"c:\\Program Files\\Internet Explorer\\iexplore.exe -Embedding",0000000 0,00000000,00000000,00000000,00000000,00000000,0034f7d8,0034f828) ret=77f1d75f 000d:Ret KERNEL32.CreateProcessW() retval=00000000 ret=77f1d75f In current wine a simple "wine "c:\Program Files\Internet Explorer\iexplore.exe"" just fails , because we don't have that directory. After manually creating it , and copy iexplore.exe.so to /Program Files/Internet Explorer/iexplore.exe, the application didn't complain anymore, and got further. Question: do we need to mimic windows behaviour, and create that directory + put wine's iexplore in it, or is the policy that in this case we just have to download MS ie6, and install that (as the application suggested)

5 5

Re: check for This->clipper before unreferencing in dlls/ddraw/surface.c
by Stefan Dösinger May 12, 2007

May 12, 2007

Am Samstag 12 Mai 2007 15:00 schrieb Vincent Fourmond: > (IDirectDrawSurfaceImpl_SetClipper): fixes segfault at HMMIV startup. > --- > ChangeLog | 6 ++++++ > dlls/ddraw/surface.c | 5 +++-- > 2 files changed, 9 insertions(+), 2 deletions(-) Now that wined3d stores the clipper, the surface->clipper member should be removed and GetClipper and SetClipper should use wined3dsurface::getclipper and Setclipper(like setpalette and getpalette does). also you do not have to modify the ChangeLog file, git does that automatically when AJ commits the patch. Also please stick to the formating of the rest of the file / function. Here you used tabs instead of spaces for indention.

2 1

Re: PATCH - implement LockWorkStation using xdg-screensaver
by Steven Edwards May 12, 2007

May 12, 2007

Hi Hans, On 5/12/07, Hans Leidekker <hans(a)it.vu.nl> wrote: > How about the following patch? I added an option --lock to wineboot > which does an execvp using the Unix search path. LockWorkStation > then calls CreateProcess on "wineboot --lock", analogous to what > ExitWindowsEx does. Thanks a lot. I just checked and LockWorkStation now properly handles the call from ProcessExplorer. -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: PATCH - implement LockWorkStation using xdg-screensaver
by Steven Edwards May 12, 2007

May 12, 2007

Hi Hans, On 5/12/07, Hans Leidekker <hans(a)it.vu.nl> wrote: > How about the following patch? I added an option --lock to wineboot > which does an execvp using the Unix search path. LockWorkStation > then calls CreateProcess on "wineboot --lock", analogous to what > ExitWindowsEx does. > > When running in a virtual desktop we should probably give precedence > to a Windows screensaver. > > Changelog > Implement LockWorkStation using xdg-screensaver. Your patch seems like a much better method to me. I'll merge in to my tree and test with Process Explorer tonight. Thanks -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

1 0

Re: [PATCH] no wined3ddevice - no surface
by Stefan Dösinger May 12, 2007

May 12, 2007

Am Samstag 12 Mai 2007 16:20 schrieb Marcus Meissner: > Hi, > > If wineD3DDevice is not set, than do return > failure (and do not reference NULL ifaces). Actually the ddraw object shouldn't be createable in the first place without a wined3d device object. Or do you want to modify ddraw to do something without wined3d?

2 1

include: Include local not system sql.h header
by Andrew Talbot May 12, 2007

May 12, 2007

I have just sent in a patch to use Wine's sql.h instead of the system one, because I noticed that the latter includes <sqltypes.h>, which appears to redefine DWORD as unsigned long, based on its reckoning that the size of a long integer is four bytes on default platforms, whereas - with _MSC_VER undefined - DWORD is an unsigned int. However, I now see that Wine's sql.h includes sqltypes.h, too. So my patch may be unnecessary or wrong, but should odbcinst.h preceed its inclusion of sql.h with some sort of definition of SIZEOF_LONG to prevent this redefinition? Please advise. Thanks, -- Andy.

1 1

Re: PATCH - implement LockWorkStation using xdg-screensaver
by Marcus Meissner May 12, 2007

May 12, 2007

On Sat, May 12, 2007 at 06:13:42AM -0400, Steven Edwards wrote: > Hi, > This patch was an attempt to implemented LockWorkStation using > xdg-screensaver. It works for my simple test app that calls the > function but my real world application Process Explorer ends up > hanging now rather than crashing and still does not properly lock the > workstation. I am not quite sure why. Perhaps someone else is > interested in this to help improve wine usability. Also I guess I > should use HeapAlloc rather than malloc. > > -- > Steven Edwards > > "There is one thing stronger than all the armies in the world, and > that is an idea whose time has come." - Victor Hugo > From 8e7001c9e3309492c881e9c1f717f26e3e379dfb Mon Sep 17 00:00:00 2001 > From: Steven Edwards <winehacker(a)gmail.com> > Date: Sat, 12 May 2007 05:49:52 -0400 > Subject: [PATCH] Implemented LockWorkStation using xdg-screensaver > > + * LockWorkStation (USER32.@) > + */ > +BOOL WINAPI LockWorkStation(void) > +{ > + /* Use xdg-screensaver */ > + static const char screensaver[] = "/usr/bin/xdg-screensaver"; > + static const char lock_command[] = "lock"; > + char **argv; > + > + FILE *f = fopen( screensaver, "r" ); > + if (!f) > + { > + FIXME_(graphics)( "no support for xdg-screensaver detected\n"); > + return 0; > + } You should use either stat/lstat or just check for failure from execve. > + argv = xmalloc(sizeof(lock_command)); > + memcpy( argv[1] , lock_command, sizeof(lock_command)); This is not going to work. char *argv[2]; argv[0] = "/usr/bin/xdg-screensaver"; argv[1] = "lock"; argv[2] = NULL; > + execv( screensaver, argv ); And actually you cannot use execve(), since it replaces the current process with the new one. Use system("/usr/bin/xdg-screensaver lock") or CreateProcess(). Ciao, Marcus

1 0

Fast events
by Maarten Lankhorst May 12, 2007

May 12, 2007

Hi all, Since I'm trying to improve on winmm's timing scheduling, the best improvement I can find is getting rid of the wineserver calls, they add a huge delay to the timer and that is bad for something that should sleep all the time to get better scheduling. I tried sending in a patch that used linux sockets but it was rejected. Similar patches already do exist: winealsa and wineoss use them, some other sound drivers might use them too. Instead of duplicating that code everywhere I think it's better to add a generic implementation of it that can very easily be changed back to a win32 implementation. What are your thoughts on this? Maarten fevent patch attached. >From 5e5cb0a326f51dc2edef245fcaab4a071f9e0c42 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat, 12 May 2007 15:19:45 +0200 Subject: [PATCH] wine headers: introduce fevent interface --- include/wine/fevent.h | 145 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/include/wine/fevent.h b/include/wine/fevent.h new file mode 100644 index 0000000..e80391d --- /dev/null +++ b/include/wine/fevent.h @@ -0,0 +1,145 @@ +/* + * Fast event interface + * Use this for when default wineserver calls are extremely bad for time critical usages + * This is also REALLY *ONLY* useful in case of 1 thread doing a 'WaitForSingleObject' + * else weird effects might occur. If someone wants to use this in any other way, results + * are undetermined. + * + * Copyright (C) 2007 Maarten Lankhorst + * + * 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 + */ + +#ifndef __WINESRC__ +#error This should only be used internally +#endif + +#ifndef __WINE_WINE_FEVENT_H +#define __WINE_WINE_FEVENT_H + +#if (defined(HAVE_POLL_H) || defined(HAVE_SYS_POLL_H)) && !defined(WINE_FEVENT_USE_EVENT) + +#ifdef HAVE_POLL_H +#include <poll.h> +#endif +#ifdef HAVE_SYS_POLL_H +#include <sys/poll.h> +#endif + +#include <errno.h> + +WINE_DECLARE_DEBUG_CHANNEL(fevent); + +struct TAGfevent { + int fd[2]; + DWORD manreset; +}; + +typedef struct TAGfevent *FEVENT; + +static void reset_fd(FEVENT fev) +{ + char readme; + struct pollfd pfd; + pfd.fd = fev->fd[0]; + pfd.events = POLLIN; + while (poll(&pfd, 1, 0) > 0) + read(fev->fd[0], &readme, sizeof(readme)); +} + +static void set_fd(FEVENT fev) +{ + char foo = 'A'; + + write(fev->fd[1], &foo, sizeof(foo)); +} + +static FEVENT create_fd(LPSECURITY_ATTRIBUTES lpEventAttributes, BOOL bManualReset, BOOL bInitialState, LPCWSTR lpName) +{ + FEVENT fev = HeapAlloc(GetProcessHeap(), 0, sizeof(*fev)); + + if (!fev) + goto err; + + if (lpEventAttributes || lpName) + FIXME_(fevent)("FEVENTS are meant to be internal and shouldn't have security attributes or a name\n"); + + if (pipe(fev->fd) < 0) + { + fev->fd[0] = fev->fd[1] = -1; + goto err; + } + fev->manreset = bManualReset; + if (bInitialState) + set_fd(fev); + return fev; + + err: + if (fev) + { + close(fev->fd[0]); + close(fev->fd[1]); + HeapFree(GetProcessHeap(), 0, fev); + } + return NULL; +} + +static void close_fd(FEVENT fev) +{ + close(fev->fd[0]); + close(fev->fd[1]); + fev->fd[0] = fev->fd[1] = -1; + HeapFree(GetProcessHeap(), 0, fev); +} + +static DWORD poll_fd(FEVENT fev, DWORD timeout) +{ + int err; + struct pollfd pfd; + pfd.fd = fev->fd[0]; + pfd.events = POLLIN; + + while ((err = poll(&pfd, 1, (int)timeout)) == -1) + if (errno != EAGAIN && errno != EINTR) + break; + switch (err) + { + case 0: return WAIT_TIMEOUT; + case -1: return WAIT_FAILED; + default: + if (!fev->manreset) + reset_fd(fev); + return WAIT_OBJECT_0; + } +} + +#define RESETEVENT reset_fd +#define SETEVENT set_fd +#define CREATEEVENT create_fd +#define CLOSEEVENT close_fd +#define WAITEVENT poll_fd + +#else + +#define FEVENT HANDLE +#define RESETEVENT ResetEvent +#define SETEVENT SetEvent +#define CREATEEVENT CreateEventW +#define CLOSEEVENT CloseHandle +#define WAITEVENT WaitForSingleObject + +#endif + +#endif /* __WINE_WINE_FEVENT_H */ -- 1.4.4.2

1 0

Re: PATCH - implement LockWorkStation using xdg-screensaver
by Stefan Dösinger May 12, 2007

May 12, 2007

Am Samstag 12 Mai 2007 12:13 schrieb Steven Edwards: > Hi, > This patch was an attempt to implemented LockWorkStation using > xdg-screensaver. It works for my simple test app that calls the > function but my real world application Process Explorer ends up > hanging now rather than crashing and still does not properly lock the > workstation. I am not quite sure why. Perhaps someone else is > interested in this to help improve wine usability. Also I guess I > should use HeapAlloc rather than malloc. Yeah, you should use HeapAlloc, and perhaps remove the xmalloc() wrapper :-) . If you test for the existence of xdg-screensaver that way you should close the opened file afterwards. If I remember correctly execvp would check $PATH for the file, so you don't have to hardcode /usr/bin/xdg-screensaver, but I think some "winescreensaver" program simmilar to winebrowser which is configureable via a registry setting would be even better. Also you should return TRUE and FALSE instead of 1 and 0.

1 0

Re: [PATCH] initialize pSurface, since we process it on failure
by Stefan Dösinger May 12, 2007

May 12, 2007

Am Samstag 12 Mai 2007 11:39 schrieb Marcus Meissner: > Hi, > > Not sure if we should perhaps not do the ICOM CAST magic on a failing > CreateSurface call here. > > But initializing pSurface to NULL also helps. The ICOM_CAST thing should set the output to NULL of the surface returned by ddraw7_CreateSurface is NULL, but ddraw7 doesn't always set it to NULL. I wanted to write a test for this because some calls leave the output pointer untouched if they fail and some set it to NULL. AJ also says we should replace transgamings com casting macros with inline functions.

1 0

Current behavior of netapi32-access tests on W2K3 and Vista
by Paul Vriens May 12, 2007

May 12, 2007

Hi, Not so long ago some tests where added for NetUserAdd and friends. While browsing I found that I have about 6 testuser home directories on W2K3 and 4 on Vista (which is the amount of tests I ran on those platforms). Bottom-line is that NetUserDel doesn't delete the home-directory on W2K3 and Vista (which is a good thing) but has no option to delete it explicitly (which is a bad thing IMHO). Any idea how to cleanup after these tests? Just remove the home directory? Cheers, Paul.

2 1

mandriva rpm wine 0.9.37
by marco May 11, 2007

May 11, 2007

As I have still no way to upload the mandriva wine rpm to the official winehq download server. I put it on my own website. So mandriva users you can download the latest wine binaries here: http://www.xs4all.nl/~meijer2/wine/ kind regard, Marco

1 0

Re: [PATCH] Uninstaller: Use a define'd length instead of a magic number
by James Hawkins May 11, 2007

May 11, 2007

On 5/10/07, Tom Spear <speeddymon(a)gmail.com> wrote: > MAX_STRING_LEN is defined in resource.h at 255. According to > http://msdn2.microsoft.com/en-us/library/ms724872.aspx the limit for > the length of a subkey name is 255. > > >> Please let me know if I should make a new define instead of using > MAX_STRING_LEN. > Yes, you should make a new define. MAX_STRING_LEN is the maximum length for a string from the resource file, which is totally unrelated to the limit for the length of a subkey name. -- James Hawkins

8 8

re: kernel32: Implement most of CopyFileEx
by Dan Kegel May 11, 2007

May 11, 2007

Nice to see somebody filling in the gaps like this. A few nits based on a superficial reading: CopyFileA leaks a string. (I know, it did before your change, too.) copy_file_open_dest's interface comment has the wrong name. + for(i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) + { + if(for_write) { Please use the same whitespace conventions as in the rest of the file (in particular, leave a space after keywords like for and if). + if ((h1 = copy_file_open_source(source, copyFlags & COPY_FILE_OPEN_SOURCE_FOR_WRITE)) == INVALID_HANDLE_VALUE) That line's too long... try to keep them under 80 chars. + // FIXME: total_file_size should include the sum of all streams Use C comments, not C++ comments. + DWORD result = progressRoutine(total_file_size, total_bytes_transferred, stream_size, stream_bytes_transferred, + stream_number, CALLBACK_STREAM_SWITCH, h1, h2, appData); Another instance of line longer than 80 chars. (You have several.) You don't have a conformance test, nor was there one for CopyFile. Maybe you should consider writing one, and making sure it passes both on Wine and Windows. Say, what app is this for? - Dan

4 5

Re: wined3d: Add hardware cursor support.
by Stefan Dösinger May 11, 2007

May 11, 2007

Am Freitag 11 Mai 2007 02:34 schrieb Andrew Riedi: > I made a test to figure out the exact Windows behavior, and Stefand helped > me out in telling me what to test. This code behaves how it should. I > will send the test in later once I have cleaned it up. > > changelog: wined3d: Add hardware cursor support. > + if (This->hardwareCursor) DestroyCursor(This->hardwareCursor); > + if (This->haveHardwareCursor) This->haveHardwareCursor = FALSE; Is there a specific reason to test if This->haveHardwareCursor is true before setting it to false? Or would a plain This->haveHardwareCursor = FALSE work too? Otherwise looked fine to me

1 0

Re: [8/8] DDraw: Make IDirectDrawImpl thread safe
by Alexandre Julliard May 11, 2007

May 11, 2007

Stefan Dösinger <stefan(a)codeweavers.com> writes: > @@ -2731,9 +2792,13 @@ IDirectDrawImpl_EnumSurfaces(IDirectDraw7 *iface, > desc = surf->surface_desc; > IDirectDrawSurface7_AddRef(ICOM_INTERFACE(surf, IDirectDrawSurface7)); > if(Callback( ICOM_INTERFACE(surf, IDirectDrawSurface7), &desc, Context) != DDENUMRET_OK) > + { > + DDOBJ_UNLOCK(This); > return DD_OK; > + } It don't think you can call an arbitrary callback function with the lock held. -- Alexandre Julliard julliard(a)winehq.org

2 1

sprintfW formatting in lib\wine\string.c
by Ann & Jason Edmeades May 11, 2007

May 11, 2007

Whilst trying to convert cmd to Unicode, I've stumbled across a problem which I either need to work around or fix, and I am not sure which. WCHAR h[] = {'h','e','l','l','o','\0'}; WCHAR fmt[] = {':', '%', '1', '0','s',':','\0'}; char test[255]; WCHAR result[255]; sprintf(test, "'%10s'", "hello"); sprintfW(result, fmt, h); WINE_FIXME("%s vs %s\n", test, wine_dbgstr_w(result)); Gives: fixme:cmd:WCMD_list_directory ' hello' vs L":hello:" ie sprintf of %10s means right justified field of 10 characters sprintfW of %10s gives left justified field of n characters (I haven't tried if the string is > 10, as I don't care...) Basically, the format strings in cmd rely on the padding behaviour. Is this a bug in sprintfW which needs fixing, or should I work around it? Unfortunately, looking in the code to lib\wine\string.c, it just copies the field and ignores justification or min/max width precisions for strings, and as it is used all over the place there's also a concern of what would be changed by fixing it. Any suggestions for a workable alternative? Jason

2 1

Re: Adds NET START to net.exe
by Alexandre Julliard May 11, 2007

May 11, 2007

"Tim Schwartz" <tim(a)sanityinternet.com> writes: > + if(!strcasecmp(argv[1], "start")) > + { > + if(argc < 3) > + { > + printf("Specify service name to start.\n"); > + return TRUE; > + } > + > + if(!net_service(NET_START, argv[2])) > + { > + return TRUE; > + } > + return FALSE; > + } > + > + return FALSE; The previous version was better here, TRUE and FALSE are not appropriate return values for main(), it's supposed to return an error code not a boolean. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: crypt32: implement CryptSIPLoad (try 3)
by Paul Vriens May 11, 2007

May 11, 2007

Juan Lang wrote: > - todo_wine > - { > - ok ( ret, "Expected CryptSIPLoad to succeed\n"); > - /* This error will always be there as native searches for the function DllCanUnloadNow > - * in WINTRUST.DLL (in this case). This function is not available in WINTRUST.DLL. > - * For now there's no need to implement this is Wine as I doubt any program will rely on > - * this last error when the call succeeded. > - */ > - ok ( GetLastError() == ERROR_PROC_NOT_FOUND, > - "Expected ERROR_PROC_NOT_FOUND, got 0x%08x\n", GetLastError()); > - ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); > - } > + ok ( ret, "Expected CryptSIPLoad to succeed\n"); > + ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); > > /* The function addresses returned by CryptSIPLoad are actually the addresses of > * crypt32's own functions. A function calling these addresses will end up first > @@ -348,18 +337,8 @@ static void test_SIPLoad(void) > sdi.cbSize = sizeof(SIP_DISPATCH_INFO); > sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef; > ret = CryptSIPLoad(&unknown2, 0, &sdi); > - todo_wine > - { > - ok ( ret, "Expected CryptSIPLoad to succeed\n"); > - /* This call on it's own would have resulted in a ERROR_PROC_NOT_FOUND, but the previous > - * call to CryptSIPLoad already loaded wintrust.dll. As this information is cached, > - * CryptSIPLoad will not try to search for the already mentioned DllCanUnloadNow. > - */ > - } > - ok ( GetLastError() == 0xdeadbeef, > - "Expected 0xdeadbeef, got 0x%08x\n", GetLastError()); > - todo_wine > - ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); > + ok ( ret, "Expected CryptSIPLoad to succeed\n"); > + ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n"); > > /* All OK, but other SIP */ > SetLastError(0xdeadbeef); > > > ------------------------------------------------------------------------ > > Hi Juan, Why did you remove all the comments from the test? It does explain (a little bit) how native does get to this specific lasterror. I agree that the lasterror is not very valuable. I've spent quite some time figuring this stuff out and it seems that (at least to my perception) information gets lost. Cheers, Paul.

1 0

Re: [4/8] WineD3D: Destroying the resource frees all private data
by H. Verbeet May 10, 2007

May 10, 2007

On 10/05/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > - } > + }; Any particular reason for this change? > + if (Flags & WINED3DSPD_IUNKNOWN) { > + if(SizeOfData != 4) { > + WARN("IUnknown data with size %d, returning WINED3DERR_INVALIDCALL\n", SizeOfData); > + return WINED3DERR_INVALIDCALL; This looks rather questionable to me. Are you making an assumption about the size of a pointer here or is 4 some magic constant? > - list_add_tail(&This->resource.privateData, &data->entry); > - return WINED3D_OK; > - ... > + list_init(&data->entry); > + list_add_tail(&This->resource.privateData, &data->entry); > > return WINED3D_OK; Is the added list_init() intentional here? Looks redundant to me, if you're doing a list_add_tail() right afterwards anyway.

2 1

Re: [PATCH 2/2] msi: automation: Implement Installer::RegistryValue.
by Alexandre Julliard May 10, 2007

May 10, 2007

Misha Koshelev <mk144210(a)bcm.edu> writes: > + case VT_BSTR: /* Return value of specified key if it exists */ > + if (ret == ERROR_SUCCESS) > + { > + ret = RegQueryValueExW(hkey, V_BSTR(&varg2), NULL, NULL, NULL, &dwSize); > + if (ret == ERROR_SUCCESS) > + { > + szString = msi_alloc(dwSize); > + if (szString) > + { > + LPWSTR szNewString = NULL; > + DWORD dwType, dwNewSize = 0; > + int idx; > + > + ret = RegQueryValueExW(hkey, V_BSTR(&varg2), NULL, &dwType, (LPBYTE)szString, &dwSize); > + switch (dwType) > + { > + /* Registry strings may not be null terminated */ > + case REG_MULTI_SZ: > + idx = (dwSize/sizeof(WCHAR))-1; > + while (idx >= 0 && !szString[idx]) idx--; > + for (; idx >= 0; idx--) > + if (!szString[idx]) szString[idx] = '\n'; > [...] This stuff clearly needs to be split out into a few helper functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

[5/8] WineD3D: Implement DDBLT_DEPTHFILL on the active depth stencil target
by Stefan Dösinger May 10, 2007

May 10, 2007

1 1

re: blizzard conference
by Dan Kegel May 10, 2007

May 10, 2007

Hey, that's only an hour away, maybe I / Lei / Nigel can drop by. But what's the "itchy /etc/hosts bug"? Is that http://bugs.winehq.org/show_bug.cgi?id=7929 ? - Dan

8 12

Re: [5/5] widl: Remove var_t's ptr_level field and start write_pointers
by Dan Hipschman May 10, 2007

May 10, 2007

On Thu, May 10, 2007 at 10:39:31AM -0700, Duane Clark wrote: > Dan Hipschman wrote: > >Well, I sent this quite a while ago and it hasn't shown up on the list yet. > >It's probably too big, so here's a link to the patch instead of inlining > >it. > > > > Patches over 80KB will go to a queue for moderation. I am the only one > moderating, so just be patient. I'll get around to it eventually. OK, I didn't know that and assumed it just got nuked. It appears to have just shown up on the list. :-) Thanks

1 0

Re: [3/5] widl: Simplify make_safearray
by Robert Shearman May 10, 2007

May 10, 2007

Dan Hipschman wrote: > This patch just simplifies the make_safearray function. It didn't need > to be that complicated. I tested the generated headers and typelibs > with this patch applied (well, I do that with every patch in this series), > and this doesn't change anything. > Is dlls/oleaut32/tests/tmarshal.tlb identical compared to before this patch is applied? If not, you won't get test failures in Wine, but you will when running tests in Windows. -- Rob Shearman

2 1