- wine-devel - winehq.org

Compiling tests standalone on windows
by Dan Kegel 25 May '07

25 May '07

(This is more for my own notekeeping, but maybe it'll be of interest to somebody else.) Sometimes it's nice to build a test with visual C++ on Windows without any makefiles or projects. You just have to get a command prompt that has run vcvars32.bat, e.g. by doing Start / All Programs / Visual C++ 2005 Express Edition / Visual Studio Tools / VS 2005 Command Prompt and then do e.g. cd wine-git\dlls\gdi32\tests cl -DSTANDALONE -D_X86_ -I../../../include pen.c gdi32.lib But for some reason today that didn't work for me; cl couldn't find gdi32.lib unless I gave an absolute path, which made no sense (since the same path was already in LIB). To try to track this down, I wrote a tiny batch file to reproduce everything: set PSDK=C:\Program Files\Microsoft Platform SDK set VS8=C:\Program Files\Microsoft Visual Studio 8 set LIB=%VS8%\VC\LIB;%VS8%\SDK\v2.0\lib;%PSDK%\Lib set INCLUDE=%VS8%\VC\INCLUDE;%PSDK%\Include set PATH=%VS8%\VC\BIN;%VS8%\Common7\IDE;%PATH% cd \dank\wine-git\dlls\gdi32\tests cl -DSTANDALONE -D_X86_ -I../../../include pen.c gdi32.lib Oddly enough, that worked fine. I dunno why the problem went away.

1 0

Re: New winetricks: add support for Red Hat's liberation fonts
by Dan Kegel 25 May '07

25 May '07

On 5/24/07, Brian Vincent <brian.vincent(a)gmail.com> wrote: > I haven't even looked at that stuff at all, but does Wine have any > fonts worth contributing to that cause? (Marlett?) Red Hat's Liberation font is a single-source thing done by a pro, so probably not. > Is it worth > creating a link within winecfg to download and install these somehow? > Good fonts can really help the user experience with Wine. No, it would be better to have Wine install the fonts by default once they are proven useful, I think. I added them to winetricks so people could experiment with them (slightly) more easily. - Dan

4 5

Re: RegDeleteTree [10]
by James Hawkins 25 May '07

25 May '07

On 5/25/07, Stefan Leichter <Stefan.Leichter(a)camline.com> wrote: > Am Friday 25 May 2007 00:48 schrieb Juan Lang: > > Hi Stefan, > > > > + /* Find how many subkeys there are */ > > > > This comment is incorrect. > > > > You have also reintroduced tabs in this patch - please don't do that. > > --Juan > ChangeLog > ------------- > added implementation of RegDeleteTreeA/W > + if (lpszSubKey) { + ret = RegDeleteKeyW(hKey, lpszSubKey); + } else { + while (TRUE) { + dwSize = dwMaxLen; + if (RegEnumValueW(hKey, 0, lpszName, &dwSize, + NULL, NULL, NULL, NULL)) break; + + ret = RegDeleteValueW(hKey, lpszName); + if (ret) goto cleanup; + } + } Please stick with the style of the rest of the file, e.g., opening braces on the next line. There is one short function that uses the style you're using, but we don't need to be adding even more variety to the style. -- James Hawkins

2 1

Re: credui: Add stub for CredUIReadSSOCredW
by James Hawkins 25 May '07

25 May '07

On 5/25/07, Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > According to wine's headers, the *A version isn't in there, so not > adding a stub for it. > You forgot to attach the patch. -- James Hawkins

1 0

bugzilla component needed
by James Hawkins 25 May '07

25 May '07

Hey Tony, Can we get a wine-advapi32 component? Thanks, James Hawkins

2 1

Re: crypt32: remove wrong test and parameter check
by Detlef Riekenberg 25 May '07

25 May '07

On Do, 2007-05-24 at 16:45 -0700, Juan Lang wrote: > --Juan No Patch was found in this Message. -- By by ... Detlef

1 0

"Submitted Bug Link rejected" notification is kinda useless
by RusH 25 May '07

25 May '07

Here is my problem : On 5/25/07, AppDB <appdb-noreply(a)winehq.org> wrote: > > Submitted Bug Link rejected > ------------------------------------------------------- > The Bug Link you submitted for eMule 0.46c has been rejected. > We appreciate your help in making the Application Database better for all users. > > Best regards. > The AppDB team > http://appdb.winehq.org/ > > > If you don't want to receive any other e-mail, please change your preferences: > http://appdb.winehq.org/preferences.php as you can see this automatically generated notification is useless, it tells me that one of Bug Links has been deleted, but doesnt tell me which one, and why :( This is bad for people that submit bug links. Now the other end of the equation - Im the maintainer of uTorrent on appdb and had to delete a bug link. Someone submitted a link to a weird bug, there was no mention about utorrent in that bug and I couldnt reproduce it. My actions should be -ask submitter about more details -delete link filling the REASON field with question to submitter about more details but there is no "submitter" field in "Known bugs" list, there is also no "reason" field when I delete bugs. In that particular case I digged up the email from AppDB with info "Link between Bug xxxx and utorrent 1.7 submitted by blabla" and googled for the blabla person, fortunately I was able to find his email and write him a message, but it would be far more user friendly and productive to be able to just do that from the appdb admin form (mail/message bug submitters/ state reason for deletion) -- Who logs in to gdm? Not I, said the duck.

3 2

About Parallel Port Driver
by Zhongli Xu 25 May '07

25 May '07

Hi all, I have a .sys driver for parallel port communication. But it seems wine didn't support loading the driver. My windows program has to be configured as XP version. And directly accessing to parallel port is not allowed on the XP host, therefore _outp() and _inp() are useless. Is there any solution to this problem? Best Regards, Milo Xu

1 0

Re: RegDeleteTree [9]
by Juan Lang 24 May '07

24 May '07

Hi Stefan, + /* Find how many subkeys there are */ This comment is incorrect. You have also reintroduced tabs in this patch - please don't do that. --Juan ____________________________________________________________________________________Pinpoint customers who are looking for what you sell. http://searchmarketing.yahoo.com/

1 0

GIT access fails
by Kirill K. Smirnov 24 May '07

24 May '07

> Did you happen to update curl/libcurl? No, I did not update anything for a few weeks. Git stopped to work a couple of days ago. Should I update curl? My version is 7.15.3.

1 0

GIT access fails
by Kirill K. Smirnov 24 May '07

24 May '07

Hi, Something strange happened to git - fetch fails if uses git:// protocol. In tcpdump I can see my machine and wine.codeweavers.com chating. Thus connection is OK. When I changed protocol to http:// in .git/remotes/origin, I managed to update local git repo. This is very strange - git:// does not work, but http:// does! I did not update git utility on my system. git version is 1.4.2.1. No firewalls too. Any ideas? Thanks, -- Kirill

2 1

problems regression testing/compiling wine
by EA Durbin 24 May '07

24 May '07

I'm having problems regression testing between 0.9.15 and 0.9.37. On 3+ bisects I keep getting the following error and wine won't compile. /home/eric/wine/dlls/winex11.drv/palette.c:866: undefined reference to `GDI_ReleaseObj' palette.o:/home/eric/wine/dlls/winex11.drv/palette.c:881: more undefined references to `GDI_ReleaseObj' follow palette.o: In function `X11DRV_RealizePalette': /home/eric/wine/dlls/winex11.drv/palette.c:1251: undefined reference to `GDI_GetObjPtr' /home/eric/wine/dlls/winex11.drv/palette.c:1253: undefined reference to `GDI_ReleaseObj' collect2: ld returned 1 exit status winegcc: gcc failed. make[2]: *** [winex11.drv.so] Error 2 make[2]: Leaving directory `/home/eric/wine/dlls/winex11.drv' make[1]: *** [winex11.drv] Error 2 make[1]: Leaving directory `/home/eric/wine/dlls' make: *** [dlls] Error 2 _________________________________________________________________ More photos, more messages, more storageget 2GB with Windows Live Hotmail. http://imagine-windowslive.com/hotmail/?locale=en-us&ocid=TXT_TAGHM_migrati…

5 7

Status regarding the recent Appdb vandalism
by Jan Zerebecki 24 May '07

24 May '07

Please do _only_ address replies to this email to wine-devel(a)winehq.org ! Remove all other recipients from To and Cc ! Work is currently underway to restore the state of the Appdb to the backup of May 22 07:00 CST. This morning ( TZ +0200 ) someone used the account "Molle Bestefich" to vandalize the Appdb. He was also seen on IRC and on the wiki. His IP was identified on all three, logs are available. See towards the end of this mail for IRC log snippet and whois on his IP. Please contact me first if you intend to contact abuse or police personal regarding this, so we don't cause headaches or duplicate work. We do not yet know how this person got access to Molle Bestefich his account. I received 4454 emails about deletes or other actions by the account "Molle Bestefich". Send between "Date: Tue, 22 May 2007 21:43:46 -0500" and "Date: Tue, 22 May 2007 22:18:55 -0500". (2 mails sent by the Appdb in that date range were legit actions.) I don't know if these are all, because admin-accounts were explicitly deleted and thus the notification to them stopped. The following applications where mentioned in these notification emails: Adobe Illustrator Battlefield 1942 Battlefield 2 Battlefield 2142 Call of Duty 2 Call of Duty Checkpoint Firewall-1 Policy editor Command & Conquer 3: Tiberium Wars Counter-Strike: Source Day of Defeat: Source Deus Ex Diablo II EVE Online F.E.A.R.: First Encounter Assault Recon Final Fantasy XI Online Guild Wars IDA Pro Photoshop S.T.A.L.K.E.R. : Shadow of Chernobyl Soldat Steam Supreme Commander The Elder Scrolls IV: Oblivion Trillian World of Warcraft PunkBuster Rune Igowin Age of Empires Age of Mythology Black & White Brothers in Arms Flash FlatOut .NET Framework Lotus Notes Some notifcations didn't contain a application of version, here the Message-Id-s of some examples (this is probably a bug in the Appdb code): screen shot Message-Id: <E1HqgpS-0008Ay-OM(a)wine.codeweavers.com> test result Message-Id: <E1Hqgs7-0001iH-S7(a)wine.codeweavers.com> monitor Message-Id: <E1HqgsD-0001mW-It(a)wine.codeweavers.com> bug Message-Id: <E1HqhDT-0003xe-GS(a)wine.codeweavers.com> One message about a rejected bug link seemed like these type of message don't contain any information: Message-Id: <E1Hqh5W-0000QE-UG(a)wine.codeweavers.com> On IRC from the #winehq channel: Mai 23 05:27:14 --> noerrorsfound_ (n=nicholas(a)h10.66.119.64.ip.alltel.net) has joined #winehq [unrelated stuff deleted] Mai 23 06:21:37 --- noerrorsfound_ is now known as molle-molle-moll Mai 23 06:21:41 <molle-molle-moll> molle molle molle Mai 23 06:21:42 <molle-molle-moll> molle Mai 23 06:21:51 <molle-molle-moll> molle Mai 23 06:22:03 <molle-molle-moll> mole string Mai 23 06:22:18 <molle-molle-moll> hello give thank Mai 23 06:22:18 <-- Amorphous has kicked molle-molle-moll from #winehq (Amorphous) /whois output: [06:22:38] --- [molle-molle-moll] (n=nicholas(a)h10.66.119.64.ip.alltel.net) : Nicholas [06:22:38] --- [whoismolle-molle-moll] irc.freenode.net :http://freenode.net/ [06:22:38] --- [molle-molle-moll] End of WHOIS list. 2007-05-23T06:50:15+0200 $ whois 64.119.66.10 OrgName: Windstream Communications Inc OrgID: WINDS-6 Address: 4001 Rodney Parham Rd City: Little Rock StateProv: AR PostalCode: 72212 Country: US NetRange: 64.119.64.0 - 64.119.79.255 CIDR: 64.119.64.0/20 NetName: WINDSTREAM-COMMUNICATIONS NetHandle: NET-64-119-64-0-1 Parent: NET-64-0-0-0-0 NetType: Direct Allocation NameServer: NS1-AUTH.WINDSTREAM.NET NameServer: NS2-AUTH.WINDSTREAM.NET NameServer: NS3-AUTH.WINDSTREAM.NET NameServer: NS4-AUTH.WINDSTREAM.NET Comment: ADDRESSES WITHIN THIS BLOCK ARE NON-PORTABLE RegDate: 2001-08-24 Updated: 2007-02-26 OrgAbuseHandle: WINDS1-ARIN OrgAbuseName: Windstream Abuse OrgAbusePhone: +1-888-292-3827 OrgAbuseEmail: abuse(a)windstream.net OrgTechHandle: WINDS-ARIN OrgTechName: Windstream Communications Inc OrgTechPhone: +1-800-990-4449 OrgTechEmail: ipadmin(a)windstream.net # ARIN WHOIS database, last updated 2007-05-22 19:10 # Enter ? for additional hints on searching ARIN's WHOIS database.

5 4

Re: wininet: Pass -1 into WideCharToMultiByte instead of calling lstrlenW on the string to slightly reduce code size.
by Alexandre Julliard 24 May '07

24 May '07

Robert Shearman <rob(a)codeweavers.com> writes: > @@ -504,8 +504,8 @@ static BOOL HTTP_DoAuthorization( LPWININETHTTPREQW lpwhr, LPCWSTR pszAuthValue > > if (is_basic_auth_value(pszAuthValue)) > { > - 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); > + int userlen = WideCharToMultiByte(CP_UTF8, 0, domain_and_username, -1, NULL, 0, NULL, NULL); > + int passlen = WideCharToMultiByte(CP_UTF8, 0, password, -1, NULL, 0, NULL, NULL); This won't work, -1 is not equivalent to lstrlenW. -- Alexandre Julliard julliard(a)winehq.org

1 0

New winetricks: add support for Red Hat's liberation fonts
by Dan Kegel 24 May '07

24 May '07

As requested by Mark Cox, I've added a verb to winetricks to install Red Hat's Liberation fonts (http://www.redhat.com/promo/fonts/). -- Wine for Windows ISVs: http://kegel.com/wine/isv

1 0

Re: winscard: add pcsc-lite helpers for upcoming implementation (try 2)
by Alexandre Julliard 24 May '07

24 May '07

Mounir IDRASSI <mounir.idrassi(a)idrix.fr> writes: > +/* > + * pcsc-lite functions pointers > + */ > +typedef LONG (*SCardEstablishContextPtr)(DWORD dwScope,LPCVOID pvReserved1, > + LPCVOID pvReserved2, LPSCARDCONTEXT phContext); > +typedef LONG (*SCardReleaseContextPtr)(SCARDCONTEXT hContext); > +typedef LONG (*SCardIsValidContextPtr)(SCARDCONTEXT hContext); > +typedef LONG (*SCardSetTimeoutPtr)(SCARDCONTEXT hContext, DWORD dwTimeout); > +typedef LONG (*SCardConnectPtr)(SCARDCONTEXT hContext,LPCSTR szReader,DWORD dwShareMode, > + DWORD dwPreferredProtocols,LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol); > +typedef LONG (*SCardReconnectPtr)(SCARDHANDLE hCard,DWORD dwShareMode, > + DWORD dwPreferredProtocols,DWORD dwInitialization, LPDWORD pdwActiveProtocol); > +typedef LONG (*SCardDisconnectPtr)(SCARDHANDLE hCard, DWORD dwDisposition); > +typedef LONG (*SCardBeginTransactionPtr)(SCARDHANDLE hCard); > +typedef LONG (*SCardEndTransactionPtr)(SCARDHANDLE hCard, DWORD dwDisposition); > +typedef LONG (*SCardCancelTransactionPtr)(SCARDHANDLE hCard); > +typedef LONG (*SCardStatusPtr)(SCARDHANDLE hCard,LPSTR mszReaderNames, LPDWORD pcchReaderLen, > + LPDWORD pdwState,LPDWORD pdwProtocol,BYTE* pbAtr,LPDWORD pcbAtrLen); > +typedef LONG (*SCardGetStatusChangePtr)(SCARDCONTEXT hContext,DWORD dwTimeout, > + LPSCARD_READERSTATEA rgReaderStates, DWORD cReaders); > +typedef LONG (*SCardControlPtr)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer, > + DWORD cbSendLength,LPVOID pbRecvBuffer, DWORD cbRecvLength, LPDWORD lpBytesReturned); > +typedef LONG (*SCardTransmitPtr)(SCARDHANDLE hCard,LPCSCARD_IO_REQUEST pioSendPci, > + const BYTE* pbSendBuffer, DWORD cbSendLength, > + LPSCARD_IO_REQUEST pioRecvPci, BYTE* pbRecvBuffer, LPDWORD pcbRecvLength); > +typedef LONG (*SCardListReaderGroupsPtr)(SCARDCONTEXT hContext,LPSTR mszGroups, LPDWORD pcchGroups); > +typedef LONG (*SCardListReadersPtr)(SCARDCONTEXT hContext,LPCSTR mszGroups, > + LPSTR mszReaders, LPDWORD pcchReaders); > +typedef LONG (*SCardCancelPtr)(SCARDCONTEXT hContext); > +typedef LONG (*SCardGetAttribPtr)(SCARDHANDLE hCard, DWORD dwAttrId,BYTE* pbAttr, LPDWORD pcbAttrLen); > +typedef LONG (*SCardSetAttribPtr)(SCARDHANDLE hCard, DWORD dwAttrId,const BYTE* pbAttr, DWORD cbAttrLen); I don't think the pcsc-lite library is guaranteed to be binary compatible with the Windows definitions. You'll need to include the correct headers and convert data types between Windows and Unix definitions. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: FWD: Updated/add many Chinese simplified resource
by Detlef Riekenberg 24 May '07

24 May '07

On Mi, 2007-05-23 at 02:17 +0800, Lobster DB wrote: > may i can't mailto: wine-patches(a)winehq.org It was automatic filtered for manual review, because the Mail/Attachment is to large. To get the Patches in the Tree, they must be much smaller! > change all *Zh.rc which is Chinese simplified resource to *Cn.rc > keep some *Zh.rc which is Chinese traditional > user32: user32_Zh.rc slipted for Chinese simplified (user32_Cn.rc) and > Chinese traditional (user32_Zh.rc) > comctl32: update Chinese simplified resource > comdlg32: update Chinese simplified resource > notepad: update Chinese simplified resource > progman: update Chinese simplified resource > user32: update Chinese simplified resource > winefile: update Chinese simplified resource > winhelp: update Chinese simplified resource > credui: add add Chinese simplified resource > clock: add Chinese simplified resource > regedit: add Chinese simplified resource > uninstaller: add Chinese simplified resource > winecfg: add Chinese simplified resource > winemine: add Chinese simplified resource A Changelog, that does not fit in the Subject is the main Hint, that the Patch needs to be split. I Suggest one Patch per DLL. When you need to rename a File, please do not update more than very, very few Tanslations in that Patch. The best way is to send a seperate Patch for the rename. As an Example for multiple Language-Versions in one File, you can read "Pt.rc" for winmine. After a short Talk with Alexandre, we think, that both versions (Traditional and Simplified) can go in a single File. About the encoding (from Alexandre): utf-8 is better, but that really depends on what's most convenient for you. Another Hint: Try the easy translations (Single Chinese Translation) first; wait with the difficult translations, until the easy Patches are in the tree. Thanks for your Help. -- By by ... Detlef

3 3

re: winscard: add pcsc-lite helpers for upcoming implementation
by Dan Kegel 24 May '07

24 May '07

James wrote: > This would be a lot cleaner as: > > if (!(liteSCardEstablishContext = (SCardEstablishContextPtr) > wine_dlsym(g_pcscliteHandle,"SCardEstablishContext",szErr,sizeof(szErr))) > { > ERR("Failed to get SCardEstablishContext from pcsclite library. Error = %s\n",szErr); > goto error; > } I think in C you can skip the cast from void *, can't you? e.g. liteSCardEstablishContext = wine_dlsym(g_pcscliteHandle,"SCardEstablishContext",szErr,sizeof(szErr)); if (!liteSCardEstablishContext) { ERR("Failed to get SCardEstablishContext from pcsclite library. Error = %s\n",szErr); goto error; } -- Wine for Windows ISVs: http://kegel.com/wine/isv

2 1

Re: winscard: add pcsc-lite helpers for upcoming implementation
by Juan Lang 24 May '07

24 May '07

+BOOL InitializePCSCLite(void) You don't use the return value: @@ -42,9 +43,11 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { DisableThreadLibraryCalls(hinstDLL); WINSCARD_hModule = hinstDLL; + InitializePCSCLite(); break; } I suspect it's safer not to fail loading winscard if PCSC-Lite isn't available. Instead, the functions such as SCardListCards should probably return empty lists. But knowing to do so relies on knowing that PCSC-Lite couldn't be initialized, so the return value shouldn't be thrown away. Or, remove the return value, and have every function check the function pointers it needs. --Juan ____________________________________________________________________________________Sick sense of humor? Visit Yahoo! TV's Comedy with an Edge to see what's on, when. http://tv.yahoo.com/collections/222

2 1

Re: help: test subprogram can't be console app
by Misha Koshelev 24 May '07

24 May '07

Ok, never mind. I found a way to fool the Windows shell into allowing me to actually execute the appropriate console app while at the same time picking up the DDE string in a separate server (fail connection when it tries to connect first time in the DDE server in the process calling ShellExecute, then succeed the next time after it has launched the app, thus getting both the command line params and the DDE string; yay) Misha

1 0

Re: winscard: add pcsc-lite helpers for upcoming implementation
by James Hawkins 24 May '07

24 May '07

On 5/23/07, Mounir IDRASSI <mounir.idrassi(a)idrix.fr> wrote: > Hi, > This patch adds helper variables and functions that exposes pcsc-lite > functionalities for the use of the upcoming implementation. > + /* loading entry points*/ + bSuccess = TRUE; + if (bSuccess && + !(liteSCardEstablishContext = (SCardEstablishContextPtr) wine_dlsym(g_pcscliteHandle,"SCardEstablishContext",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardEstablishContext from pcsclite library. Error = %s\n",szErr); + } This would be a lot cleaner as: if (!(liteSCardEstablishContext = (SCardEstablishContextPtr) wine_dlsym(g_pcscliteHandle,"SCardEstablishContext",szErr,sizeof(szErr))) { ERR("Failed to get SCardEstablishContext from pcsclite library. Error = %s\n",szErr); goto error; } .... return TRUE; error: wine_dlclose(g_pcscliteHandle,NULL,0); g_pcscliteHandle = NULL; return FALSE; } -- James Hawkins

1 0

help: test subprogram can't be console app
by Misha Koshelev 24 May '07

24 May '07

Hi all, So I have run into a weird problem. I was writing a conformance test for ShellExecute logic of when to use DDE and a little about how it uses it, as currently the logic is incorrect and fails for some apps, e.g., Vector NTI (the fix is pretty easy, but I'd like to make a nice conformance test to go with it). Anyhow, shlexec.c conformance tests in shell32 have a nice framework where the test program itself is associated with an extension, and I just extended that to also allow a DDE execute and save the results. It didn't seem to work (FILENOTFOUND error) except when the program was already running, and then it worked fine. Just to see what was going on, I made a very simple program (attached) and used the following simple compile script to make 2 versions, one a console program and one a regular windows program (with the -mwindows switch). The -mwindows one allows DDE-based ShellExecute (or just "start" command) opening just fine, whereas withotu -mwindows the shell complains right away that the file trying to be started is not found. So it looks like I need to somehow start a non-console test program from within a test, any ideas on this? Thanks Misha --- Script: i386-mingw32-gcc -o console.exe -lshell32 -lole32 -loleaut32 -lshlwapi -luser32 -lgdi32 -ladvapi32 -lkernel32 -luuid -I. -I../../../include console.c i386-mingw32-gcc -o gui.exe -lshell32 -lole32 -loleaut32 -lshlwapi -luser32 -lgdi32 -ladvapi32 -lkernel32 -luuid -I. -I../../../include console.c -mwindows

1 0

Hello all
by Matthew Larsen 24 May '07

24 May '07

Hello all, I just joined up to the mailing list so thought I would say hello to everyone :-) I am a student studying Computer Science at Manchester University (UK) and am interested in helping the development of Wine. I decided the first step was to hop on the mailing lists and see whats going on! I have experience in writing basic Operating Systems (In ARM Assembler, as well as making ARM's work with FPGA's if your interested) and knowledge of fundamental OS functions so I hope they will come in useful at some stage. Also got a good grasp of C/C++, UNIX and Windows / Windows Server. My motivation with joining Wine was primarily to one-day get Counterstrike:Source working properly. Secondary is the fact I am fed-up completely with Windows but unfortunately have apps that are not supported in Linux / Unix and would like to get them ported onto Wine. Hope to get talking with you all soon, Regards, -- Matthew G Larsen > mat.larsen(a)gmail.com > +44(0)7739 785 249

2 1

tests: show summary and last executed test in case of a crash
by Peter Oberndorfer 23 May '07

23 May '07

Some tests on http://test.winehq.org/data/ seem to crash silently. This patch might be useful for debugging such crashes. It prints out the last ok/trace that was executed before the crash, the exception address and the type of the crash. It also print out the summary that is normally printed at the end of the test instead of exiting silently[1]. On wine it still executes winedbg for better debugging after dumping out the info. My concern now is that it requires a change to the parser which accepts the test reports, so those crashes are not lost. And don't know much about this parser. Suggestions, ideas anyone? Greetings Peter [1] example output: file.c:1228:FileSize: 0 file.c:1229:Unknown2[0]: 0 Test crashed at B7D0DF47 with error c0000005 Last test before crash: file.c:1239 file: 19 tests executed (0 marked as todo, 3 failures), 0 skipped. wine: Unhandled page fault on write access to 0x00001234 at address 0xb7d0df47 (thread 0009), starting debugger... Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b ...

2 2

Re: Bugzilla outcome?
by Robert Shearman 23 May '07

23 May '07

Tom Spear wrote: > Just curious to see if anything was ever done with the offer to > upgrade bugzilla? > > On a side note, it would be nice if there was a crash keyword to make > finding crashes easier Searching for "Unhandled exception" is too hard? -- Rob Shearman

5 8

Re: crypt32: implement CryptSIPLoad (resend)
by Alexandre Julliard 23 May '07

23 May '07

Juan Lang <juan_lang(a)yahoo.com> writes: > Hi, any problems with this one? It's causing test failures: ../../../tools/runtest -q -P wine -M rsaenh.dll -T ../../.. -p rsaenh_test.exe.so rsaenh.c && touch rsaenh.ok rsaenh.c:64: Test failed: 0, 00000057 rsaenh.c:68: Test failed: 00000057 make: *** [rsaenh.ok] Error 2 -- Alexandre Julliard julliard(a)winehq.org

2 3

RE: Application deletion!
by EA Durbin 23 May '07

23 May '07

Someone using Molle Bestefich's account has been attacking the AppDB. I've lost my AppDB admin privileges as well as a bunch of things are being deleted. >From: James Bond <tehstealth(a)yahoo.com> >To: appdb(a)winehq.org >Subject: Application deletion! >Date: Wed, 23 May 2007 04:40:49 -0700 (PDT) > >I'm sorry, I do not know who to contact for this, but the 2 apps I've been >maintaining Soldat, and Battlefield 2 have BOTH been completely deleted! >At first it was Soldat, and I thought maybe since it was a small game made >by a lone developer, it was removed. I e-mailed the person resposnible, toa >ask why. But I just got another mass spam of e-mails this morning saying >this and that were deleted from Battlefield 2, a very popular game! I think >something is wrong. Molle Bestefich (molle.bestefich(a)gmail.com) is the one >whose deleted all of that stuff. What is going on? > >-Brian > > > >____________________________________________________________________________________Ready >for the edge of your seat? >Check out tonight's top picks on Yahoo! TV. >http://tv.yahoo.com/ _________________________________________________________________ More photos, more messages, more storageget 2GB with Windows Live Hotmail. http://imagine-windowslive.com/hotmail/?locale=en-us&ocid=TXT_TAGHM_migrati…

2 1

Re: RegDeleteTree [8]
by Alexandre Julliard 23 May '07

23 May '07

Stefan Leichter <Stefan.Leichter(a)camline.com> writes: > + /* Recursively delete all the subkeys */ > + for (i = 0; i < dwKeyCount; i++) { > + dwSize = dwMaxLen; > + ret = RegEnumKeyExW(hSubKey, 0, lpszName, &dwSize, NULL, > + NULL, NULL, NULL); There's no reason to use the key count, you should enum until you get an error, it's more reliable. > + for (i = 0; i < dwValCount; i++) { > + dwSize = dwMaxLen; > + ret = RegEnumValueW(hKey, 0, lpszName, &dwSize, NULL, NULL, NULL, NULL); Same here. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/3] DDraw: Hold the dll lock in IDirectDrawSurfaceX methods
by Alexandre Julliard 23 May '07

23 May '07

Stefan Dösinger <stefandoesinger(a)gmx.at> writes: > @@ -810,8 +841,12 @@ IDirectDrawSurfaceImpl_AddAttachedSurface(IDirectDrawSurfaceImpl *This, > { > TRACE("(%p)->(%p)\n", This, Surf); > > + EnterCriticalSection(&ddraw_cs); > if(Surf == This) > + { > + LeaveCriticalSection(&ddraw_cs); > return DDERR_CANNOTATTACHSURFACE; /* unchecked */ > + } Parameter checks can be done outside the section, it simplifies the code. There are many more such cases in the patch. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] check return code of ICreateDevEnum_CreateClassEnumerator
by Alexandre Julliard 23 May '07

23 May '07

Marcus Meissner <marcus(a)jet.franken.de> writes: > diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c > index 6adce61..841b130 100644 > --- a/dlls/quartz/filtermapper.c > +++ b/dlls/quartz/filtermapper.c > @@ -966,6 +966,9 @@ static HRESULT WINAPI FilterMapper2_Enum > if (SUCCEEDED(hr)) > hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &CLSID_ActiveMovieCategories, &pEnumCat, 0); > > + if (!SUCCEEDED(hr)) > + return hr; You are potentially leaking an object here. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [1/5] basetsd.h: Fix a typo in the parameter name
by Marcus Meissner 23 May '07

23 May '07

On Wed, May 23, 2007 at 04:35:33PM +0900, Dmitry Timoshkov wrote: > Hello, > > Changelog: > basetsd.h: Fix a typo in the parameter name. > > --- > include/basetsd.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/include/basetsd.h b/include/basetsd.h > index e0d04f6..fe3639f 100644 > --- a/include/basetsd.h > +++ b/include/basetsd.h > @@ -219,7 +219,7 @@ typedef unsigned short UHALF_PTR, *PUHALF_PTR; > #define HandleToULong(h) ((ULONG)(ULONG_PTR)(h)) > #define HandleToLong(h) ((LONG)(LONG_PTR)(h)) > #define ULongToHandle(ul) ((HANDLE)(ULONG_PTR)(ul)) > -#define LongToHandle(h) ((HANDLE)(LONG_PTR)(h)) > +#define LongToHandle(h) ((HANDLE)(LONG_PTR)(l)) I do not think this is right. Ciao, Marcus

2 1

[1/5] basetsd.h: Fix a typo in the parameter name
by Vijay Kiran Kamuju 23 May '07

23 May '07

Hi I think this patch is not correct. -#define LongToHandle(h) ((HANDLE)(LONG_PTR)(h)) +#define LongToHandle(h) ((HANDLE)(LONG_PTR)(l)) I dont see 'l' defined or sent to this macro any where. Thanks, VJ

3 2

APPDB ROGE USER
by Vitaliy Margolen 23 May '07

23 May '07

ANYONE WITH appdb admin rights check into IRC!!!

1 0

Re: winscard: small stub implementation of winscard dll (Try 2)
by Mounir IDRASSI 22 May '07

22 May '07

Hi Alexandre, You are completely right...these variables are definitely useless!! I don't remember when I coded that but it must have been very late at night! Anyway, I'll purge them from the patch. Mounir IDRASSI IDRIX - Cryptography and IT Security Experts http://www.idrix.fr Alexandre Julliard wrote: > Mounir IDRASSI <mounir.idrassi(a)idrix.fr> writes: >> Thank you for your comments Alexandre. >> Concerning the SCARD_PCI_xxx , I implemented them as variables instead >> of defines because it's impossible using winelib to link against the >> exported variables g_rgSCardXXX (please see my discussion with Eric >> Pouech about that). Well, I should create variables with other names to >> achieve the same goal. >> > Linking against SCARD_PCI_xxx would be just as impossible, so I still > don't understand why you need any extra variables. Could you give an > example? >

1 0

Re: RegDeleteTree [7] [resend]
by Laurent Vromman 22 May '07

22 May '07

There is a few tabs in the file : Here (line 92), first blank character : + &dwValCount, NULL, NULL, NULL, NULL); Here (line 103) + } Laurent > Hello, > > any comment on the current version of this patch? > > ChangeLog > ------------- > added implementation of RegDeleteTreeA/W > >

2 2

Re: Bugzilla outcome?
by Tom Spear 22 May '07

22 May '07

I sent this to the wrong list before, sorry for that.. Just curious to see if anything was ever done with the offer to upgrade bugzilla? On a side note, it would be nice if there was a crash keyword to make finding crashes easier -- Thanks Tom

1 0

Re: winscard: small stub implementation of winscard dll (Try 2)
by Alexandre Julliard 22 May '07

22 May '07

Mounir IDRASSI <mounir.idrassi(a)idrix.fr> writes: > +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; AFAICT these are supposed to be macros, not variables. Also your indentation is messed up. -- Alexandre Julliard julliard(a)winehq.org

1 0

loading windows DLL in a linux app
by ml 22 May '07

22 May '07

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 22 May '07

22 May '07

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 22 May '07

22 May '07

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 22 May '07

22 May '07

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 22 May '07

22 May '07

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 22 May '07

22 May '07

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 21 May '07

21 May '07

"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 21 May '07

21 May '07

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 21 May '07

21 May '07

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 21 May '07

21 May '07

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 21 May '07

21 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 20 May '07

20 May '07

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 19 May '07

19 May '07

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 19 May '07

19 May '07

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 19 May '07

19 May '07

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 19 May '07

19 May '07

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 19 May '07

19 May '07

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 19 May '07

19 May '07

"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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 18 May '07

18 May '07

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 17 May '07

17 May '07

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 17 May '07

17 May '07

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 17 May '07

17 May '07

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@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 17 May '07

17 May '07

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 17 May '07

17 May '07

"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 17 May '07

17 May '07

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 17 May '07

17 May '07

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 17 May '07

17 May '07

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 17 May '07

17 May '07

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 17 May '07

17 May '07

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 17 May '07

17 May '07

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 17 May '07

17 May '07

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 16 May '07

16 May '07

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 16 May '07

16 May '07

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 16 May '07

16 May '07

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 + +@MAKE_DLL_RULES@ + +@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 16 May '07

16 May '07

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 15 May '07

15 May '07

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 15 May '07

15 May '07

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 15 May '07

15 May '07

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 15 May '07

15 May '07

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 15 May '07

15 May '07

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 15 May '07

15 May '07

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 15 May '07

15 May '07

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 15 May '07

15 May '07

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 14 May '07

14 May '07

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 14 May '07

14 May '07

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 14 May '07

14 May '07

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 14 May '07

14 May '07

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 13 May '07

13 May '07

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 13 May '07

13 May '07

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 13 May '07

13 May '07

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 13 May '07

13 May '07

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 13 May '07

13 May '07

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 13 May '07

13 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 12 May '07

12 May '07

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 11 May '07

11 May '07

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 11 May '07

11 May '07

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 11 May '07

11 May '07

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 11 May '07

11 May '07

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 11 May '07

11 May '07

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 11 May '07

11 May '07

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 11 May '07

11 May '07

"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 11 May '07

11 May '07

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 10 May '07

10 May '07

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 10 May '07

10 May '07

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 10 May '07

10 May '07

1 1

re: blizzard conference
by Dan Kegel 10 May '07

10 May '07

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 10 May '07

10 May '07

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 10 May '07

10 May '07

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

Re: Adds NET START to net.exe
by Dmitry Timoshkov 10 May '07

10 May '07

"Tim Schwartz" <tim(a)sanityinternet.com> wrote: > + GetServiceDisplayName(SCManager, service_name, NULL, &buffer_size); > + if(!buffer_size) You need to check the GetServiceDisplayName retrun value, not buffer_size. If GetServiceDisplayName succeeds buffer_size contains valid length. Also please numerate your retries, like "Take 3" or something like that. -- Dmitry.

1 0

[3 and 4/4] Some console improvements: console codepages - please, comment.
by Kirill K. Smirnov 10 May '07

10 May '07

Hi, In my serie of four patches the two has not been applied: [kernel32/tests: Add tests for console codepages] http://www.winehq.org/pipermail/wine-patches/2007-May/039092.html [move codepages to server side] http://www.winehq.org/pipermail/wine-patches/2007-May/039093.html Please, comment, what I did wrong? Did I miss something important? Thanks -- Kirill

2 1

Re: [5/5] widl: Remove var_t's ptr_level field and start write_pointers
by Alexandre Julliard 10 May '07

10 May '07

Dan Hipschman <dsh(a)linux.ucla.edu> writes: > 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. Please don't do that. You can gzip the patch if necessary, but please send it by mail. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 02/11] [Kernel32]: ActCtx: Added infrastructure for loading a manifest (app,
by Alexandre Julliard 10 May '07

10 May '07

Eric Pouech <eric.pouech(a)wanadoo.fr> writes: > + hFile = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); > + if (hFile != INVALID_HANDLE_VALUE) > + { > + hMap = CreateFileMappingW(hFile, NULL, PAGE_READONLY, 0, 0, NULL); > + if (hMap != INVALID_HANDLE_VALUE) > + { CreateFileMapping returns 0 on error. > + base = MapViewOfFile(hMap, FILE_MAP_READ, 0, 0, 0); > + if (base) > + { > + HANDLE hModule = (HMODULE)(ULONG_PTR)base; > + > + if (RtlImageNtHeader(hModule)) /* we got a PE file */ > + { > + if (first) > + { > + LPWSTR manifestfile; > + > + manifestfile = HeapAlloc(GetProcessHeap(), 0, > + lstrlenW(name) * sizeof(WCHAR) + sizeof(dotManifestW)); > + if (manifestfile) > + { > + strcpyW(manifestfile, name); > + strcatW(manifestfile, dotManifestW); > + ret = get_manifest_in_file(acl, ai, manifestfile, > + resname, FALSE); > + HeapFree(GetProcessHeap(), 0, manifestfile); > + } > + } > + if (ret) ret = get_manifest_in_module(acl, ai, hModule, resname); You cannot pretend that a file mapping is a module and call resource functions on it. You have to use LOAD_LIBRARY_AS_DATAFILE for that. I don't think this patch series is quite ready to go in; this is the third resend and all patches still have obvious bugs. You need to spend more time on it, this is kernel stuff, it needs to be correct. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 01/11] [Kernel32]: ActCtx: added basic structures for storing assembly information
by Alexandre Julliard 10 May '07

10 May '07

Eric Pouech <eric.pouech(a)wanadoo.fr> writes: > + if (actctx->num_assemblies == actctx->allocated_assemblies) > + { > + if (actctx->allocated_assemblies) > + { > + actctx->allocated_assemblies *= 2; > + actctx->assemblies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > + actctx->assemblies, > + actctx->allocated_assemblies * sizeof(struct assembly)); > + } > + else > + { > + actctx->allocated_assemblies = 1; > + actctx->assemblies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct assembly)); > + } > + } > + if (!actctx->assemblies) return NULL; You will corrupt the previous state if the realloc fails. This is kernel stuff, please try to be rigorous about error handling. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: kernel32: MultiByteToWideChar: MB_USEGLYPHCHARS & incorrect GetLastError() codes fix
by Kirill K. Smirnov 10 May '07

10 May '07

+static void test_MultiByteToWideChar(void) +{ + int i, ret; + static char src[32]; + static WCHAR dst[32]; + static const WCHAR glyphed_dst[32] = { + 0x0000, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2660, 0x2022, + 0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C, + 0x25BA, 0x25C4, 0x2195, 0x203C, 0x00B6, 0x00A7, 0x25AC, 0x21A8, + 0x2191, 0x2193, 0x2192, 0x2190, 0x221F, 0x2194, 0x25B2, 0x25BC + }; + for (i=0;i<32;i++) src[i]=i; + memset(&dst, 0, sizeof(dst)); Char 0x7F should be tested too. + trace("originaldst: %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x\n", + dst[0],dst[1],dst[2],dst[3],dst[4],dst[5],dst[6],dst[7],dst[8],dst[9],dst[10],dst[11],dst[12],dst[13],dst[14],dst[15],dst[16], + dst[17],dst[18],dst[19],dst[20],dst[21],dst[22],dst[23],dst[24],dst[25],dst[26],dst[27],dst[28],dst[29],dst[30],dst[31]); + trace("glyphed_dst: %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x %.4x\n", + glyphed_dst[0],glyphed_dst[1],glyphed_dst[2],glyphed_dst[3],glyphed_dst[4],glyphed_dst[5],glyphed_dst[6],glyphed_dst[7],glyphed_dst[8],glyphed_dst[9],glyphed_dst[10],glyphed_dst[11],glyphed_dst[12],glyphed_dst[13],glyphed_dst[14],glyphed_dst[15],glyphed_dst[16], + glyphed_dst[17],glyphed_dst[18],glyphed_dst[19],glyphed_dst[20],glyphed_dst[21],glyphed_dst[22],glyphed_dst[23],glyphed_dst[24],glyphed_dst[25],glyphed_dst[26],glyphed_dst[27],glyphed_dst[28],glyphed_dst[29],glyphed_dst[30],glyphed_dst[31]); + } +} My notice may look like nitpicking, but these lines are too long.. Is it really necessary to dump entire array instead of just printing error message? -- Kirill

1 0

Re: [PATCH 2/3] winex11: Implement TINN algorithm. (try 3)
by Dmitry Timoshkov 10 May '07

10 May '07

"Vitaly Budovski" <vbudovski(a)gmail.com> wrote: > +struct tinn > +{ > + /* Pointer to an element in the list. */ > + const RGBQUAD *data; > + /* Distance from the reference element. */ > + float distance; > +}; Vitaly, why do you keep resending the same patch which uses float values internally? Again, float neither doesn't allow you to process larger values, nor is acceptable for speed or adds more flexibility. -- Dmitry.

4 5

Re: kernel32: MultiByteToWideChar: MB_USEGLYPHCHARS & incorrectGetLastError() codes fix
by Dmitry Timoshkov 10 May '07

10 May '07

"Andrew O. Shadoura" <bugzilla(a)tut.by> wrote: > if (!src || (!dst && dstlen)) > { > @@ -1774,18 +1773,12 @@ INT WINAPI MultiByteToWideChar( UINT page, DWORD flags, LPCSTR src, INT srclen, > > if (srclen < 0) srclen = strlen(src) + 1; > > - if (!once && (flags & MB_USEGLYPHCHARS)) > - { > - once = 1; > - FIXME("MB_USEGLYPHCHARS not supported\n"); > - } > - > switch(page) > { > case CP_SYMBOL: > - if( flags) > + if(flags) > { If you decided to fix the formatting it would be better to send it as a separate patch, and follow the style of 'if' statements above. > case CP_UTF8: > + if (flags & (~MB_ERR_INVALID_CHARS)) > + { > + SetLastError( ERROR_INVALID_FLAGS ); > + return 0; > + } Mixed tabs/spaces. > --- a/dlls/kernel32/tests/locale.c > +++ b/dlls/kernel32/tests/locale.c > @@ -2255,6 +2255,42 @@ static void test_GetCPInfo(void) > ok(cpinfo.MaxCharSize == 4, "expected 5, got 0x%x\n", cpinfo.MaxCharSize); > } > > +static void test_MultiByteToWideChar(void) This test belongs to dlls/kernel32/tests/codepage.c. > + else > + res = mbstowcs_sbcs_decompose( &table->sbcs, src, srclen, dst, dstlen ); > + if (flags & MB_USEGLYPHCHARS) add_glyphs( dst, dstlen ); > + return res; Mixed tabs/spaces. > - return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen ); > + res = mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen ); > + if (flags & MB_USEGLYPHCHARS) add_glyphs( dst, dstlen ); > + return res; Again mixed tabs/spaces. -- Dmitry.

1 0

Re: Correct VarBstrFromDate for dates between DATE_MIN and 1601
by Bill Medland 09 May '07

09 May '07

On Fri, 2007-04-05 at 11:22 -0700, Bill Medland wrote: > Bill Medland (billmedland(a)shaw.ca) > Correct VarBstrFromDate for dates between DATE_MIN and 1601 > Has this been rejected out of hand or is it still being considered? Bill

2 4

Re: [5/5] WineD3D: Manage private data in a wine linked list
by H. Verbeet 09 May '07

09 May '07

On 09/05/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > Fixes an endless loop in the startup of Traffic Giant. > Shouldn't you free the private data when the resource is destroyed? (MSDN claims you should).

2 2

Re: [1/5] wined3d: Unload vertex weight data in case of EXT_VERTEX_WEIGHTING as well
by Stefan Dösinger 09 May '07

09 May '07

Am Mittwoch 09 Mai 2007 19:07 schrieb H. Verbeet: > This set applies on top of Stefan's > > Changelog: > - Unload vertex weight data in case of EXT_VERTEX_WEIGHTING as well Actually I was thinking about removing the whole (disabled) vertex weighting code since I didn't find any card supporting this extension.

1 0

Re: [msi/tests] Properly cleanup after each test
by James Hawkins 09 May '07

09 May '07

On 5/8/07, Paul Vriens <paul.vriens.wine(a)gmail.com> wrote: > Hi, > > All files in the destination directory (usually 'Program Files') are cleaned up, > but sometimes not the files/directories in the temp directory. We have to make > sure we have a clean start for every test. > > I've also changed a filename from 'path' to a clearer one (me thinks). > - CHAR path[MAX_PATH]; + CHAR msifile2[MAX_PATH]; CreateDirectoryA("msitest", NULL); CreateDirectoryA("msitest\\msitest", NULL); @@ -1451,9 +1460,9 @@ static void test_concurrentinstall(void) create_database(msifile, ci_tables, sizeof(ci_tables) / sizeof(msi_table)); - lstrcpyA(path, CURR_DIR); - lstrcatA(path, "\\msitest\\concurrent.msi"); - create_database(path, ci2_tables, sizeof(ci2_tables) / sizeof(msi_table)); + lstrcpyA(msifile2, CURR_DIR); + lstrcatA(msifile2, "\\msitest\\concurrent.msi"); + create_database(msifile2, ci2_tables, sizeof(ci2_tables) / sizeof(msi_table)); Please don't change the names of variables. I chose the generic name of path (which is used throught Wine), because that's exactly what the variable contains throughout the functions. Also, msifile2 is a poor choice of a variable name. Thanks, James Hawkins

2 1

Re: [PATCH] Uninstaller: Change hardcoded value for maximum subkey name length to a const.
by Dan Hipschman 09 May '07

09 May '07

On Tue, May 08, 2007 at 11:19:16AM -0500, Tom Spear wrote: > static const DWORD MAXSUBKEYNAMELEN = 255; > WCHAR subKeyName[MAXSUBKEYNAMELEN + 1]; I'm not sure what version of C wine is strictly trying to conform to, but it's usually best to go with the lowest common denominator. This is not C89. The const keyword doesn't actually make the variable constant (I know it's not the greatest feature of C). The array size won't be evaluated until runtime, so technically this is a variable length array which weren't added until C99. You can make it C89 simply by using #define instead of declaring it as a variable.

2 1

Re: crypt32: remove hardcoded value AT_SIGNATURE from CertContext_SetKeyProvInfo
by Alexandre Julliard 09 May '07

09 May '07

Mounir IDRASSI <mounir.idrassi(a)idrix.fr> writes: > Hi, > This patch removed a hardcoded value (AT_SIGNATURE) from > CertContext_SetKeyProvInfo. It also corrects a corresponding test. Like I said, the test currently passes on Windows, so you can't simply change it. Tests are supposed to reflect the behavior of Windows, not of Wine. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 3/3] winex11: Use TINN algorithm to speed up colour lookups. (try 2)
by Dmitry Timoshkov 09 May '07

09 May '07

"Vitaly Budovski" <vbudovski(a)gmail.com> wrote: >> Now that you got rid of sqrt calls usage of float numbers internally >> doesn't look justified (to me) anymore. >> > > Only because in this instance it is used with integer data. It doesn't > need to be limited to just integer values. Besides, what would be gained > by changing it to integers as you suggest? What would be gained is an additional speed. Since this code is supposed to be used to handle palette/color data there is no need to use floats at all. -- Dmitry.

5 8

Re: rsaenh: add support for mandatory parameters to RSAENH_CPGetProvParam
by Alexandre Julliard 09 May '07

09 May '07

Mounir IDRASSI <mounir.idrassi(a)idrix.fr> writes: > This patch adds support for mandatory parameters in > RSAENH_CPGetProvParam. It also adds tests for them. > The mandatory parameters are: PP_UNIQUE_CONTAINER, PP_PROVTYPE, > PP_KEYSPEC, PP_KEYSET_TYPE, PP_KEYSTORAGE. Thanks for resending, but unfortunately this breaks make test: ../../../tools/runtest -q -P wine -M crypt32.dll -T ../../.. -p crypt32_test.exe.so cert.c && touch cert.ok cert.c:1215: Test failed: Expected AT_SIGNATURE, got 3 make: *** [cert.ok] Error 1 I know you sent a patch for that test, but since it currently succeeds on Windows the change can't be right. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 05/27] [Kernel32]: ActCtx: now storing path info for app & config in manifest
by Alexandre Julliard 09 May '07

09 May '07

Eric Pouech <eric.pouech(a)wanadoo.fr> writes: > HeapFree(GetProcessHeap(), 0, actctx->assemblies); > - actctx->magic = 0; > + HeapFree(GetProcessHeap(), 0, (void*)actctx->config.info); > + HeapFree(GetProcessHeap(), 0, (void*)actctx->app.info); Please don't cast off const, we are trying to get rid of these warnings. If the strings need to be freed then they cannot be const. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 03/27] [Kernel32]: ActCtx: added basic structures for storing assembly information
by Alexandre Julliard 09 May '07

09 May '07

Eric Pouech <eric.pouech(a)wanadoo.fr> writes: > +static struct assembly* add_assembly(struct actctx* actctx, enum assembly_type at) > +{ > + struct assembly* assembly; > + > + if (!actctx->num_assemblies) > + actctx->assemblies = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct assembly)); > + else > + actctx->assemblies = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > + actctx->assemblies, > + (actctx->num_assemblies + 1) * sizeof(struct assembly)); Growable arrays should be grown by a multiple of the current size. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: hnetcfg: [1:10]Define icftype.idl
by Alexandre Julliard 09 May '07

09 May '07

Jeff Latimer <lats(a)yless4u.com.au> writes: > +typedef enum NET_FW_PROFILE_TYPE_ > +{ > + NET_FW_PROFILE_DOMAIN = 1, > + NET_FW_PROFILE_STANDARD = 2, > + NET_FW_PROFILE_CURRENT = 3, > + NET_FW_PROFILE_TYPE_MAX = 4 > +} NET_FW_PROFILE_TYPE; > + > +typedef enum NET_FW_IP_VERSION_ > +{ > + NET_FW_IP_VERSION_V4 = 1, > + NET_FW_IP_VERSION_V6 = 2, > + NET_FW_IP_VERSION_ANY = 3, > + NET_FW_IP_VERSION_MAX = 4 > +} NET_FW_IP_VERSION; There's no reason to initialize the enum values explicitly, particularly since all your values are wrong... -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: rsaenh: fix bug in RSAENH_CPGetProvParam (corrected again)
by Alexandre Julliard 09 May '07

09 May '07

Mounir IDRASSI <mounir.idrassi(a)idrix.fr> writes: > From: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> > Date: Wed, 9 May 2007 03:33:45 +0200 > Subject: rsaenh: fix bug in RSAENH_CPGetProvParam Could you please provide a more meaningful subject line to describe your patch? "fix bug" applies to just about every commit... -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: shell32: handle invalid cbSize in Shell_NotifyIcon[AW] (fixed, with testcase)
by Alexandre Julliard 09 May '07

09 May '07

Mikołaj Zalewski <mikolaj(a)zalewski.pl> writes: > As I've understood from wine-devel to catch exceptions in tests I > need to write my own handler. My handler is more compilcated than in > ntdll/tests/exception.c as I can't assume the next instruction after > the invalid one will be a 'ret' but is simplier than wine > __TRY/__EXCEPT as I don't try to filter exception but catch all of > them (I hope this is not a problem with stack guard pages or something > like that). I'm also not using siglongjump but longjmp to be able to > compile it with msvcrt. It won't work when not using msvcrt, and it's really too ugly. That sort of thing might be acceptable in an exception test in ntdll, but not in shell32 tests. Please find another way to write the test that doesn't rely on deliberately triggering a crash. -- Alexandre Julliard julliard(a)winehq.org

1 0

RE: Resend of Adds NET START to net.exe
by Rolf Kalbermatter 09 May '07

09 May '07

Tim Schwartz wrote: + if(!strcasecmp(operation, "start")) + { + printf("The %s service is starting.\n", service_display_name); + result = StartService(serviceHandle,0,NULL); + CloseServiceHandle(serviceHandle); + if(!result) printf("The %s service failed to start.\n", service_display_name); + else printf("The %s service was started successfully.\n", service_display_name); + + HeapFree(GetProcessHeap(), 0, service_display_name); + CloseServiceHandle(SCManager); + return result; + } + + CloseServiceHandle(serviceHandle); + CloseServiceHandle(SCManager); + HeapFree(GetProcessHeap(), 0, service_display_name); + return 0; +} I think with a little rearrangment of the code and returning result at the end you could avoid duplicating those CloseServiceHandle() and HeapFree() calls. int main(int argc, char *argv[]) { - int ret = 0; if (argc < 2) { printf("The syntax of this command is:\n\n"); - printf("NET [ HELP ]\n"); + printf("NET [ HELP | START ]\n"); return 1; } @@ -35,7 +88,24 @@ int main(int argc, char *argv[]) printf("The syntax of this command is:\n\n"); printf("NET HELP command\n -or-\nNET command /HELP\n\n"); printf(" Commands available are:\n"); - printf(" NET HELP\n"); + printf(" NET HELP NET START\n"); } - return ret; + + if(!strcasecmp(argv[1], "start")) + { + if(argc < 3) + { + printf("Specify service name to start.\n"); + return 1; + } + + if(!net_service(argv[1], argv[2])) + { + return 1; + } + return 0; + } + + + return 0; } Me thinks it would be cleaner to only string test for the command in the main() and pass in a constant you define somewhere to net_service() that specifies the operation to perform. That will allow you to use a switch statement in net_service() and make the code a lot easier to read. Also adding new commands won't make the whole such a big mess as it would now. Also consider to use TRUE and FALSE as return value. This being a Windows tool and not a Unix one it seems clearer to me. Rolf Kalbermatter

1 0

Drop-in replacement of windows dll's?
by Tom Spear 09 May '07

09 May '07

I just remembered reading somewhere (wiki, perhaps?) that the ultimate goal of wine (aside from documenting the windows api, etc) was to provide open-source drop-in replacements for windows' core dll's. If that is the case, do we have a framework setup for building the wine dlls as windows .dll files, so that we could test the actual status of this? I think it would be interesting to see how much of windows will run with wine's dlls in their current state. Obviously it would be bad to test this with something like user32.dll, etc, but something like riched32 and maybe some of the common controls dlls should be ok to test with? -- Thanks Tom Check out this new 3D Instant Messenger called IMVU. It's the best I have seen yet! http://imvu.com/catalog/web_invitation.php?userId=1547373&from=power-email

4 4

Re: Resend of Adds NET START to net.exe
by Dmitry Timoshkov 09 May '07

09 May '07

"Tim Schwartz" <tim(a)sanityinternet.com> wrote: > + GetServiceDisplayName(SCManager, service_name, NULL, &buffer_size); You need to check GetServiceDisplayName return value here and later. > + /* until GetServiceDisplayName() is implemented, buffer_size will always be zero so the service short name will > be used instead */ GetServiceDisplayName *is* implemented. > + if(!buffer_size) > + { The check above is wrong. -- Dmitry.

1 1

rsaenh: fix bug in RSAENH_CPGetProvParam (corrected)
by Juan Lang 09 May '07

09 May '07

Hi Mounir, + case PP_KEYSTORAGE: + dwTemp = CRYPT_SEC_DESCR; This looks fine.. + result = CryptGetProvParam(prov, PP_KEYSTORAGE, (LPBYTE)&dwParam, &dataLen, 0); + ok(result && dataLen == sizeof(dwParam) && (dwParam == CRYPT_SEC_DESCR), + "Expected CRYPT_SEC_DESCR to be set, got 0x%08X\n",dwParam); but this test will now fail on Win9x, yes? A simple fix would be to check (dwParam & CRYPT_SEC_DESCR) rather than (dwParam == CRYPT_SEC_DESCR). --Juan ____________________________________________________________________________________ Don't pick lemons. See all the new 2007 cars at Yahoo! Autos. http://autos.yahoo.com/new_cars.html

2 3

Re: RSAENH_CPGetProvParam
by Alexandre Julliard 08 May '07

08 May '07

Mounir IDRASSI <mounir.idrassi(a)idrix.fr> writes: > + case PP_KEYSTORAGE: > + dwTemp = GetVersion(); > + /* for Windows NT, 95,98, Me, return CRYPT_PSTORE | CRYPT_UI_PROMPT | CRYPT_SEC_DESCR > + * for the others, return CRYPT_SEC_DESCR > + */ > + if(dwTemp < 0x80000000 && ((dwTemp & 0x000000FF) != 0x00000004)) > + dwTemp = CRYPT_SEC_DESCR; > + else > + dwTemp = CRYPT_PSTORE | CRYPT_UI_PROMPT | CRYPT_SEC_DESCR; You shouldn't add such version checks, unless you have a real life app that depends on the difference. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: Drop-in replacement of windows dll's?
by Tom Spear 08 May '07

08 May '07

On 5/8/07, Thorsten Kani <beebix(a)gmx.net> wrote: > Hi Tom > > Please read through wwn244 and 245. > > If i remenber correctly, at that time common controls from wine wont > work out of the box. > I had to apply reactos patches to them and had to binary patch sfc.dll > on windows. Thanks for the info. I have sfc completely removed from my windows system (as in sfc.dll doesnt even exist) via a nifty little windows component remover. I didnt expect for the common controls to work out of the box, but it would be interesting to see how close we come. I'll try the various things mentioned here when I get time (dont know when that will be), and post results on the wiki, unless someone beats me to the punch. -- Thanks Tom Check out this new 3D Instant Messenger called IMVU. It's the best I have seen yet! http://imvu.com/catalog/web_invitation.php?userId=1547373&from=power-email

1 0

(no subject) (WAS: Re: Drop-in replacement of windows dll's?)
by Tom Spear 08 May '07

08 May '07

On 5/8/07, Brian Vincent <brian.vincent(a)gmail.com> wrote: > On 5/8/07, Tom Spear <speeddymon(a)gmail.com> wrote: > > That would be the framework. I appreciate the response. Is this > > something that either now or in the future will be officially > > supported by wine, or even a true goal of wine, or is it more of a > > side project for you and some others? > > It's not an explicit goal, but it does work, and it is a configuration > that we want to keep working. It's just not a configuration that gets > tested every day, so there might be some little issues. Previously > ReactOS was the big consumer of Wine DLL's as PE. Ok, thanks for the input. Thanks to all of the developers for their hard work, and dedication. Unfortunately I am going to have to mute myself on the list (I can hear the sighs of relief now), as I dont think I am getting anywhere trying to get even trivial patches committed. I sent a patch over a week ago to correct a trace message (not the one for winecfg, but one for uninstaller), and it never got committed. Then I get told to send all of my patches to a developer privately for review before I send them to the patches list, and when I send them to that developer, I _basically_ get told that I should bother submitting them. I know I'm not good enough to even write conformance tests right now, which is why I dont work on the major API's or even on the conformance tests, but sheesh, what do I have to do to get one problematic trace fixed? I'll send that patch one more time, just to make sure it got to the list, and I would appreciate someone offering some comment if there is a reason that it should not be committed. -- Thanks Tom Check out this new 3D Instant Messenger called IMVU. It's the best I have seen yet! http://imvu.com/catalog/web_invitation.php?userId=1547373&from=power-email

1 0

Re: [setupapi/tests] SetupQueryInfOriginalFileInformationA is not available on win98
by Robert Shearman 08 May '07

08 May '07

Paul Vriens wrote: > Hi, > > This makes the setupapi tests run again on win98. > > Changelog > SetupQueryInfOriginalFileInformationA is not available on win98 Weird. From http://msdn2.microsoft.com/en-us/library/aa377417.aspx: "Requires Windows Vista, Windows XP, Windows 2000 Professional, Windows NT Workstation 4.0, Windows Me, Windows 98, or Windows 95" Looks like MSDN is wrong about which versions of Windows support this function and possibly others. -- Rob Shearman

2 1

winegcc: gcc failed
by Zalmay A-khaliq 08 May '07

08 May '07

Respected Developers of the wine My name is Zalmay And I am a BCS student. I have been assigned to port windows(VC++) application into linux. After a thorough searching and researching I found that "wine:" is the resource I can use to port a windows 32 bit application to Linux. I downloaded and installed wine as according to the winehq developers instruction and every thing went well. Then I started to test the winelib samples (notepad) to compile on Redhat Linux 9 according to winelib user guide but in the process I got the following error message -------------------------------------------------------------------------------------------------------------------------- wrc -I. -forsrc.res rsrc.rc winegcc -mwindows -mno-cygwin -o notepad2.exe.so dialog.o main.o rsrc.res -lodbc32 -lole32 -loleaut32 -lwinspool -luuid dialog.o(.text+0x1a5): In function `DIALOG_StringMsgBox': : undefined reference to `wnsprintfW' collect2: ld returned 1 exit status winegcc: gcc failed. make: *** [notepad2.exe.so] Error 2 -------------------------------------------------------------------------------------------------------------- I will be greatefull to you sir for your help in this. That how can I overcome these errors and run my application successfully. thanking you in anticipation Zalmay Gul --------------------------------- Ahhh...imagining that irresistible "new car" smell? Check outnew cars at Yahoo! Autos.

2 1

volume names of mounted iso images
by James Hawkins 08 May '07

08 May '07

Hi all, I have a patch ready to go that fixes a problem with the media switching code in msi. According to tests and msdn, the presence of a required media (usually a CD or DVD) is confirmed using only the volume name listed in the Media table of the msi file. The patch simplifies the existing media checking code and also fixes a few installers. The problem is that, on my system at least, the volume name and serial of mounted ISO files (using a loopback device) are not available, and any call to GetVolumeInformation returns an empty string for the volume name. Because of this, I'm hesitant to get the patch committed for fear of restricting installs to only using physical media. That would include me, because my CD drive is borked. Setting the volume name in winecfg doesn't work, probably because of permissions and the fact that the mount is read only. 'Autodetect from Device' is apparently not implemented. Can someone enlighten me on the situation and possible solutions? Thanks, James Hawkins

2 3

[msi OLE automation] Re: msi patches info pls
by Misha Koshelev 08 May '07

08 May '07

On Fri, 2007-03-09 at 17:27 +0100, Alexandre Julliard wrote: > Sorry for the lack of response, I'm currently waiting for our lawyers > to determine if it's ok to use code based on an oleview dump of a > native typelib, as that situation is not clear from a copyright > POV. I'm afraid I can't do more until they come to a conclusion on > that point. > So it looks like I will have some free time soon (hopefully) and will be able to redo the "IDL" file properly (also another Vector NTI/Linux user has offered up his help). However, I wanted to double check the "proper" way to make such a file as I know this is what is important in copyright (the process, such as dirty-clean room, vs the actual end result). From http://www.winehq.org/pipermail/wine-devel/2007-March/054589.html (posted by Rob Shearman) this is what I understand the correct process to be (I would like to understand the process in detail so I don't do something wrong to "taint" the wine copyright): As one is looking at the oleview output of the native IDL file, one starts a blank document and begins to make the wine IDL file. One defines all the appropriate interfaces, etc. using the UUID's, names, etc. from the native interface. All the function names and parameter types are declared the same, as well as function attributes, but I should use different names for the parameters and try to put the attributes in a different order (although if I understand correctly the order of these attributes comes from our oleview implementation and not from the interface per se so there shouldn't be any reason to change their order??). Also, what does one do for enums? It does not seem like there is anything that can be changed in this case, so it is alright just to re-create them verbatim (without copying and pasting, and of course the indentation will be prettier)? Thank you very much for your help. Misha

5 10

Re: ddraw: DllCanUnloadNow
by Stefan Dösinger 08 May '07

08 May '07

Am Dienstag 08 Mai 2007 02:13 schrieb Christian Gmeiner: > Add support for DllCanUnloadNow and eliminates a FIXME As I understand it, all DirectDraw objects also have to be freed, so you have to check the global ddraw object list too.

1 0

RE: [PATCH] Adds NET START to net.exe
by Rolf Kalbermatter 08 May '07

08 May '07

Tim Schwartz [tim(a)sanityinternet.com] wrote: diff --git a/programs/net/net.c b/programs/net/net.c index f77c820..ef08250 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -18,15 +18,66 @@ #include <stdio.h> #include <string.h> +#include <windows.h> + +int net_service(char *operation, char *service_name) { + SC_HANDLE SCManager, serviceHandle; + int result = 0; + unsigned int *buffer_size = NULL; + char *service_display_name = NULL; + + SCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if(!SCManager) + { + printf("Couldn't get handle to SCManager.\n"); + return 0; + } + serviceHandle = OpenService(SCManager, service_name, SC_MANAGER_ALL_ACCESS); + if(!serviceHandle) + { + printf("Couldn't get handle to service.\n"); + CloseServiceHandle(SCManager); + return 0; + } + + GetServiceDisplayName(SCManager, service_name, NULL, buffer_size); + if(!buffer_size) + { Apart from GetServiceDisplayName() currently not being implemented in Wine, this won't work! *buffer_size won't be allocated by the function but has to be provided by the caller and its pointer shouldn't be NULL ever. It should and proabably will just return with an error if it is a NULL pointer. + service_display_name = HeapAlloc(GetProcessHeap(), 0, strlen(service_name)); + strcpy(service_display_name, service_name); + } + else + { + service_display_name = HeapAlloc(GetProcessHeap(), 0, *buffer_size); MSDN says: When the function returns, lpcchBuffer contains the size of the service's display name, excluding the null-terminating character, so your buffer is in fact one character to small. + GetServiceDisplayName(SCManager, service_name, service_display_name, buffer_size); + } Your mail client wrapped the patch again it seems. Sending as an attachment might work better. Rolf Kalbermatter

1 1

Re: [3/4] Add tests for console codepages
by Dmitry Timoshkov 08 May '07

08 May '07

"Kirill K. Smirnov" <lich(a)math.spbu.ru> wrote: > + /* Try to set invalid CP */ > + ok(!SetConsoleCP(0), "Shouldn't succeed\n"); > + ok(GetLastError()==ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %u\n", ERROR_INVALID_PARAMETER, > GetLastError()); > + ok(!SetConsoleOutputCP(0), "Shouldn't succeed\n"); > + ok(GetLastError()==ERROR_INVALID_PARAMETER, "GetLastError: expecting %u got %u\n", ERROR_INVALID_PARAMETER, > GetLastError()); You need to set last error value to something (usually 0xdeadbeef) before calling an API if you're planning to check last error value after the call. Also keeping code lines in a reasonable limit would be nice. -- Dmitry.

1 0

rsaenh: fix bugs in RSAENH_CPAcquireContext and RSAENH_CPGetProvParam
by Mounir IDRASSI 08 May '07

08 May '07

Hi, We have found few bugs in the MS Enhanced CSP implementation in wine (rsaenh.dll) and you'll find attached a patch that corrects them. Here is a description of the problems we found: - In RSAENH_CPAcquireContext : when specifying CRYPT_DELETEKEYSET, the function always deletes the container for the local user, while it should check the CRYPT_MACHINE_KEYSET flag to see if it should be deleted on the local machine or for the local user. - In RSAENH_CPGetProvParam: The following mandatory parameters were not supported : PP_UNIQUE_CONTAINER, PP_PROVTYPE, PP_KEYSPEC, PP_KEYSET_TYPE, PP_KEYSTORAGE. In order to support the PP_KEYSTORAGE parameter, we added three defined to wincrypt.h. Cheers, Mounir IDRASSI IDRIX - Cryptography and IT Security Experts http://www.idrix.fr >From a7240539a2e3c83291c7cf206d55f1e4e7e75803 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Sat, 5 May 2007 19:01:57 +0200 Subject: rsaenh: fix bugs in RSAENH_CPAcquireContext and RSAENH_CPGetProvParam --- dlls/rsaenh/rsaenh.c | 32 +++++++++++++++++++++++++++++++- include/wincrypt.h | 5 +++++ 2 files changed, 36 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2ace2d5..9f55760 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1473,7 +1473,13 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer, SetLastError(NTE_BAD_KEYSET_PARAM); return FALSE; } else { - if (!RegDeleteKeyA(HKEY_CURRENT_USER, szRegKey)) { + HKEY hRootKey; + if (dwFlags & CRYPT_MACHINE_KEYSET) + hRootKey = HKEY_LOCAL_MACHINE; + else + hRootKey = HKEY_CURRENT_USER; + + if (!RegDeleteKeyA(hRootKey, szRegKey)) { SetLastError(ERROR_SUCCESS); return TRUE; } else { @@ -2899,6 +2905,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, switch (dwParam) { case PP_CONTAINER: + case PP_UNIQUE_CONTAINER:/* MSDN says we can return the same value as PP_CONTAINER */ return copy_param(pbData, pdwDataLen, (CONST BYTE*)pKeyContainer->szName, strlen(pKeyContainer->szName)+1); @@ -2915,6 +2922,29 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, dwTemp = CRYPT_IMPL_SOFTWARE; return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + case PP_PROVTYPE: + dwTemp = PROV_RSA_FULL; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + + case PP_KEYSPEC: + dwTemp = AT_SIGNATURE | AT_KEYEXCHANGE; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + + case PP_KEYSET_TYPE: + dwTemp = pKeyContainer->dwFlags & CRYPT_MACHINE_KEYSET; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + + case PP_KEYSTORAGE: + dwTemp = GetVersion(); + /* for Windows NT, 95,98, Me, return CRYPT_PSTORE | CRYPT_UI_PROMPT | CRYPT_SEC_DESCR + * for the others, return CRYPT_SEC_DESCR + */ + if(dwTemp < 0x80000000 && ((dwTemp & 0x000000FF) != 0x00000004)) + dwTemp = CRYPT_SEC_DESCR; + else + dwTemp = CRYPT_PSTORE | CRYPT_UI_PROMPT | CRYPT_SEC_DESCR; + return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); + case PP_VERSION: dwTemp = 0x00000200; return copy_param(pbData, pdwDataLen, (CONST BYTE*)&dwTemp, sizeof(dwTemp)); diff --git a/include/wincrypt.h b/include/wincrypt.h index 2219bd5..c897e96 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1613,6 +1613,11 @@ static const WCHAR MS_SCARD_PROV_W[] = { 'M','i','c','r','o','s','o',' #define PP_KEYSPEC 39 #define PP_ENUMEX_SIGNING_PROT 40 +/* Values returned by CryptGetProvParam of PP_KEYSTORAGE */ +#define CRYPT_SEC_DESCR 0x00000001 +#define CRYPT_PSTORE 0x00000002 +#define CRYPT_UI_PROMPT 0x00000004 + /* Crypt{Get/Set}KeyParam */ #define KP_IV 1 #define KP_SALT 2 -- 1.4.4.2

3 5

Re: ddraw: DllCanUnloadNow
by James Hawkins 08 May '07

08 May '07

On 5/7/07, Christian Gmeiner <christian.gmeiner(a)gmail.com> wrote: > Add support for DllCanUnloadNow and eliminates a FIXME > You need to add (Un)LockModule calls to all the objects in ddraw. See [1] et al. [1] http://www.winehq.org/pipermail/wine-cvs/2005-January/013741.html -- James Hawkins

1 0

Serial port working with +relay but not normal
by Aleš Rom 07 May '07

07 May '07

Hello, again. Two months ago I posted a message http://www.winehq.org/pipermail/wine-devel/2007-March/054710.html to this list. Now I'm using wine-0.9.36, but the serial port problem is still the same. After port initialization (19200,8N1-it's OK I think) no data is received from serial device. (snip) trace:file:get_dos_device L"COM1" -> "/home/romcek/.wine/dosdevices/com1" trace:file:CreateFileW returning 0x13c trace:comm:GetCommState handle 0x13c, ptr 0x34f9b8 trace:comm:io_control 0x13c IOCTL_SERIAL_GET_BAUD_RATE (nil) 0 0x34f988 4 0x34f914 trace:comm:io_control 0x13c IOCTL_SERIAL_GET_LINE_CONTROL (nil) 0 0x34f98d 3 0x34f914 trace:comm:io_control 0x13c IOCTL_SERIAL_GET_HANDFLOW (nil) 0 0x34f970 16 0x34f914 trace:comm:io_control 0x13c IOCTL_SERIAL_GET_CHARS (nil) 0 0x34f982 6 0x34f914 trace:comm:GetCommState OK trace:comm:dump_dcb bytesize=8 baudrate=19200 fParity=0 Parity=0 stopbits=1 trace:comm:dump_dcb ~IXON ~IXOFF trace:comm:dump_dcb fOutxCtsFlow=0 fRtsControl=0 trace:comm:dump_dcb fOutxDsrFlow=0 fDtrControl=1 trace:comm:dump_dcb ~CRTSCTS trace:comm:dump_dcb bytesize=8 baudrate=19200 fParity=0 Parity=0 stopbits=1 trace:comm:dump_dcb ~IXON ~IXOFF trace:comm:dump_dcb fOutxCtsFlow=0 fRtsControl=1 trace:comm:dump_dcb fOutxDsrFlow=0 fDtrControl=1 trace:comm:dump_dcb ~CRTSCTS trace:comm:io_control 0x13c IOCTL_SERIAL_SET_BAUD_RATE 0x34f988 4 (nil) 0 0x34f914 trace:comm:io_control 0x13c IOCTL_SERIAL_SET_LINE_CONTROL 0x34f98d 3 (nil) 0 0x34f914 trace:comm:io_control 0x13c IOCTL_SERIAL_SET_HANDFLOW 0x34f970 16 (nil) 0 0x34f914 trace:comm:io_control 0x13c IOCTL_SERIAL_SET_CHARS 0x34f982 6 (nil) 0 0x34f914 trace:comm:io_control 0x13c IOCTL_SERIAL_SET_QUEUE_SIZE 0x34f98c 8 (nil) 0 0x34f930 fixme:comm:set_queue_size insize 1024 outsize 1024 unimplemented stub trace:comm:io_control 0x13c IOCTL_SERIAL_GET_COMMSTATUS (nil) 0 0x61a236b8 20 0x61a23650 trace:file:ReadFile 0x13c 0x61a2377c 0 0x61a23708 0xede5bc trace:file:WriteFile 0x13c 0xede5d0 18 0x61b327e8 0x61b327d4 trace:file:WriteFile 0x13c 0xede5d0 19 0x61b327e8 0x61b327d4 trace:comm:io_control 0x13c IOCTL_SERIAL_GET_COMMSTATUS (nil) 0 0x61a236b8 20 0x61a23650 trace:file:ReadFile 0x13c 0x61a2377c 0 0x61a23708 0xede5bc trace:comm:io_control 0x13c IOCTL_SERIAL_GET_COMMSTATUS (nil) 0 0x61a236b8 20 0x61a23650 trace:file:ReadFile 0x13c 0x61a2377c 0 0x61a23708 0xede5bc trace:comm:io_control 0x13c IOCTL_SERIAL_GET_COMMSTATUS (nil) 0 0x61a236b8 20 0x61a23650 Last two lines repeats... The interesting part is that if I run wine with +relay option, I can transfer data from serial device to PC. Has this set_queue_size message anything to do with this problem? Can someone please help and put me to the right direction. Aleš Rom

1 0

Re: Initial Mixer support on Mac OS X (1/7)
by Dmitry Timoshkov 07 May '07

07 May '07

"Emmanuel Maillard" <mahanuu(a)free.fr> wrote: > Changelog : > - inital Mixer support on Mac OS X > - find all lines and initialize controls Could you please while you are working on winecoreaudio.drv make all public entry points (CoreAudio_widMessage, CoreAudio_wodMessage, CoreAudio_midMessage, CoreAudio_modMessage) 64-bit safe (by using a proper DRVCALLBACK prototype for the driver callback, and using proper data types for passing in/out parameters around)? -- Dmitry.

2 1

blizzard conference
by Robert Millan 07 May '07

07 May '07

Sorry for the OT, but I thought this might be of your interest, considering some of the Blizzard game developers will attend: http://www.blizzard.com/press/070412.shtml Maybe someone in California feels like dropping by to do some lobbying about that itchy /etc/hosts bug? :-) -- Robert Millan My spam trap is honeypot(a)aybabtu.com. Note: this address is only intended for spam harvesters. Writing to it will get you added to my black list.

3 2

Re: dbghelp[2]: Speed up vector_add. Remove no longer needed pool_realloc.
by Eric Pouech 07 May '07

07 May '07

Markus Amsler a écrit : > Thanks to Eric for the idea. > --- > dlls/dbghelp/dbghelp_private.h | 3 +- > dlls/dbghelp/storage.c | 47 > ++++++++++++++------------------------- > 2 files changed, 18 insertions(+), 32 deletions(-) Markus, could you try what gives starting the bucket array size at 2, 4, or 8 instead of 1 ? given the amount of memory improvement we have with this patch, this would certainly help the large debug file (and perhaps hurt a little the small ones) A+ -- Eric Pouech "The problem with designing something completely foolproof is to underestimate the ingenuity of a complete idiot." (Douglas Adams)

1 0

Re: [5/5] D3D: Move Clippers from DDraw to wined3d
by H. Verbeet 07 May '07

07 May '07

On 07/05/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > Needed to handle them properly there What exactly was the problem?

1 0

Re: "Installer already running"
by Tom Spear 07 May '07

07 May '07

On 5/7/07, Pavel Troller <patrol(a)sinus.cz> wrote: > > Hi Tom, > there is the installer file. > With regards, Pavel Troller Hi Pavel, I looked into the file. It is a 7-zip compressed Nullsoft installer. What that means is that if you decide to file a bug on bugzilla (highly recommended), make sure to include that information in the summary or body of the bug somewhere, so that others with the same problem with this type of installer can find your bug easily, and so that developers who are looking for this type of installer to test patches against can contact you to get it... With that being said: I downloaded the file on my linux box, and was able to run it all the way up to the point of hitting next to actually install, without any problems. Here are a couple of things you can try: - Run wineboot to make sure all runonce entries are cleared from the registry, and then restart the computer, to make sure that all running copies of wine are cleared. - If that does not work, rename ~/.wine to something like ~/.wine.bak and then run winecfg and re-setup all of your options. Then try running the PhysX installer again. If that does not fix it, you will probably have to do a fully clean install of wine, where you need to delete all copies of wine on your system, and everything that you have installed in wine (I'm trying to avoid you having to do this, for obvious reasons), and then reinstall it all, starting with JTF2 and the PhysX drivers. If that still does not fix the problem, then there is a misconfig somewhere else in the system, or you somehow have a stale wineserver process hanging around.. Hope that helps, and maybe someone else has some other things for you to try..? -- Thanks Tom Check out this new 3D Instant Messenger called IMVU. It's the best I have seen yet! http://imvu.com/catalog/web_invitation.php?userId=1547373&from=power-email

1 0

"Installer already running"
by Pavel Troller 07 May '07

07 May '07

Hi! I was trying to install the Joint Task Force game, which was packaged as a bonus with my new graphics card. The game itself seems to install well using the standard InstallShield, but then it tries to install a PhysX driver/library, which is necessary to run it. The PhysX package is provided as a single executable on the CD. When the executable (called PhysX_2.5.1_SystemSoftware.exe) is run by wine, it immediately pops a dialog saying "The installer is already running" and pressing its OK button terminates the installation. The game then complains that the PhysX driver is not installed and requires reinstallation (for anybody who would like to try this too, the game itself has to be patched by nocd crack first, otherwise it chokes on SECDRV.SYS). The dialog appears not only when the PhysX installer is launched from the game installer, but also when the executable is run directly from the command line. Intuitively I was trying to discover more about it by running wine with WINEDEBUG=+file, and it has shown that the installer created some files in c:\windows\temp first, then it played with explorer.exe (tried to run it ?), there was a search for a lot of fonts, libs etc., win.ini was consulted several times, and the dialog then appeared. Possibly all the stuff starting with explorer.exe was there to display the dialog box ? After accepting the box, it just deleted the stuff in the temp directory and terminated. I didn't find anything related to this in bugzilla. I would like to find the real cause of the problem, but I don't know exactly, how to proceed. Any hints ? It's the current git wine, but the same is observed on 0.9.33 or so. With regards, Pavel Troller

3 7

Re: wine-patch implement ClassFactory_LockServer in browseui dll
by James Hawkins 07 May '07

07 May '07

On 5/7/07, Bernard Ladenthin <bernard(a)ladenthin.net> wrote: > Hello, > sorry about the patch before, it was the false one. > > This one is the right. > Your first patch was already committed, so you might want to send in another patch fixing the mistake. -- James Hawkins

1 0

rsaenh: fix critical bug in read_key_container
by Mounir IDRASSI 07 May '07

07 May '07

Hi, We have found a critical bug in rsaenh dll. This bug prevents CryptAcquireContext from correctly loading the key associated with the container from the registry, and thus CryptGetUserKey become unusable. This bug is located in the internal function read_key_container. Attached with this email is a patch correcting this bug and adding a test that demonstrate it. Cheers, Mounir IDRASSI IDRIX - Cryptography and IT Security Experts http://www.idrix.fr >From 8da78d912c0a709a641ae4082ee6df270f644a08 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Mon, 7 May 2007 17:04:46 +0200 Subject: rsaenh: fix critical bug in read_key_container --- dlls/rsaenh/rsaenh.c | 11 +++++++---- dlls/rsaenh/tests/rsaenh.c | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2ace2d5..7723157 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1050,6 +1050,7 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, PVTa KEYCONTAINER *pKeyContainer; HCRYPTPROV hKeyContainer; DATA_BLOB blobIn, blobOut; + HCRYPTKEY hCryptKey; sprintf(szRSABase, RSAENH_REGKEY, pszContainerName); @@ -1089,8 +1090,9 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, PVTa if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL, (dwFlags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0, &blobOut)) { - RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, - &pKeyContainer->hKeyExchangeKeyPair); + if(RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, + &hCryptKey)) + pKeyContainer->hKeyExchangeKeyPair = hCryptKey; HeapFree(GetProcessHeap(), 0, blobOut.pbData); } } @@ -1113,8 +1115,9 @@ static HCRYPTPROV read_key_container(PCHAR pszContainerName, DWORD dwFlags, PVTa if (CryptUnprotectData(&blobIn, NULL, NULL, NULL, NULL, (dwFlags & CRYPT_MACHINE_KEYSET) ? CRYPTPROTECT_LOCAL_MACHINE : 0, &blobOut)) { - RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, - &pKeyContainer->hSignatureKeyPair); + if(RSAENH_CPImportKey(hKeyContainer, blobOut.pbData, blobOut.cbData, 0, 0, + &hCryptKey)) + pKeyContainer->hSignatureKeyPair = hCryptKey; HeapFree(GetProcessHeap(), 0, blobOut.pbData); } } diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index fe27f4b..0832e0f 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1603,6 +1603,25 @@ static void test_null_provider(void) CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, CRYPT_DELETEKEYSET); + + + /* test for the bug in accessing the user key in a container + */ + result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_NEWKEYSET); + ok(result, "CryptAcquireContext failed: %08x\n", GetLastError()); + result = CryptGenKey(prov, AT_KEYEXCHANGE, 0, &key); + ok(result, "CryptGenKey with AT_KEYEXCHANGE failed with error %08x\n", GetLastError()); + CryptDestroyKey(key); + CryptReleaseContext(prov,0); + result = CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL,0); + ok(result, "CryptAcquireContext failed: 0x%08x\n", GetLastError()); + result = CryptGetUserKey(prov, AT_KEYEXCHANGE, &key); + ok (result, "CryptGetUserKey failed with error %08x\n", GetLastError()); + CryptDestroyKey(key); + + CryptAcquireContext(&prov, szContainer, NULL, PROV_RSA_FULL, + CRYPT_DELETEKEYSET); } START_TEST(rsaenh) -- 1.4.4.2

3 4

Linuxtag 2007 in Berlin
by Stefan Munz 07 May '07

07 May '07

Hi, finally we got a Wine booth at Linuxtag 2007 in Berlin. Everybody who wants to participate is welcome. I have to order exhibitor passes, so anyone you wants to help out please contact me :-) And maybe if anyone has a draft for Wine-posters, this would help too. cu at linuxtag :-) Stefan -- Dipl.-Inform. Stefan Munz. . . . . . . . . . stefan.munz(a)itomig.de ITOMIG GbR . . . . . . . . . . . . . . . . . www.itomig.de Sand 14 . . . . . . . . . . . . . . . . . . mobil: +49 178 729 72 72 D-72076 Tübingen . . . . . . . . . . . . . .

3 3

Re: [wine.inf] move explorer to the windows directory
by Detlef Riekenberg 07 May '07

07 May '07

On Mo, 2007-05-07 at 08:28 +0200, Damjan Jovanovic wrote: > * Moved explorer.exe to the windows directory, because that's where > some apps expect to find it. You should also modify GetDesktopWindow in "dlls/user32/win.c": GetSystemDirecoryW => GetWindowsDirectoryW -- By by ... Detlef

1 0

Re: [PATCH] Adds NET START to net.exe
by Dmitry Timoshkov 07 May '07

07 May '07

"Tim Schwartz" <tim(a)sanityinternet.com> wrote: > +int net_service(char *operation, char *service_name) Please add 'static' since it isn't used outside of this .c file. > +{ > + SC_HANDLE SCManager, serviceHandle; > + int result = 0; > + unsigned int *buffer_size = NULL; > + char *service_display_name = NULL; ... > + GetServiceDisplayName(SCManager, service_name, NULL, buffer_size); > + if(!buffer_size) How buffer_size is supposed to become not NULL here? Also please follow parameter types used by win32 APIs (in this case GetServiceDisplayName). > + if(!strcasecmp(operation, "start")) > + { > + printf("The %s service is starting.\n", service_display_name); > + result = StartService(serviceHandle,0,NULL); > + CloseServiceHandle(serviceHandle); > + if(!result) printf("The %s service failed to start.\n", > service_display_name); > + else printf("The %s service was started successfully.\n", > service_display_name); > + > + HeapFree(GetProcessHeap(), 0, service_display_name); > + return result; > + } SCManager is still leaked. And The patch is wrapped again. -- Dmitry.

1 0

Re: Winscard support (for smart cards)
by Mounir IDRASSI 07 May '07

07 May '07

Hi all, We have managed to integrate our winscard source code into the wine source tree, including the configure.ac and Makefine.in files. As described in the developer's guide, I am attaching with this email the output of the command "git format-patch origin". Can someone please check if I have done it the right way? If this is ok, should I post it also to the patches mailing list. For your information, our implementation uses pcsc-lite through wine_dlopen and wine_dlsym, so pcsc-lite is not required at compile time. We have not included test files as they include the use of smart cards with proprietary applications. I will try in the near future to include a wine implementation of a graphical tool that can manipulate smart cards using the wine winscard dll. Thanks for your help. Cheers, Mounir IDRASSI IDRIX - Cryptography and IT Security Experts http://www.idrix.fr >From d0a45c9347a4462b56e6deac0bcf1b37a815f541 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Sun, 29 Apr 2007 22:31:09 +0200 Subject: [PATCH] First version of wine implementation of Smart Card API based on pcsc-lite --- Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 5 + dlls/winscard/Makefile.in | 17 + dlls/winscard/rsrc.rc | 33 + dlls/winscard/winscard.c | 1991 +++++++++++++++++++++++++++++++++++++++++++ dlls/winscard/winscard.spec | 63 ++ include/Makefile.in | 3 + include/scarderr.h | 111 +++ include/winscard.h | 381 +++++++++ include/winsmcrd.h | 207 +++++ 12 files changed, 2817 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 1f8f0c9..fd825a7 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 \ @@ -762,6 +763,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 71a66ae..1a11b08 100755 --- a/configure +++ b/configure @@ -20839,6 +20839,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" @@ -21806,6 +21808,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 ddec5f4..19026c6 100644 --- a/configure.ac +++ b/configure.ac @@ -1744,6 +1744,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..7dbf3c4 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 100755 index 0000000..7f08a02 --- /dev/null +++ b/dlls/winscard/Makefile.in @@ -0,0 +1,17 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = winscard.dll +IMPORTLIB = libwinscard.$(IMPLIBEXT) +IMPORTS = advapi32 kernel32 + +C_SRCS = \ + winscard.c + +RC_SRCS = \ + rsrc.rc + +@MAKE_DLL_RULES@ + +@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/winscard.c b/dlls/winscard/winscard.c new file mode 100755 index 0000000..4b0ce38 --- /dev/null +++ b/dlls/winscard/winscard.c @@ -0,0 +1,1991 @@ +/* + * 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 "wine/debug.h" +#include "wine/library.h" +#include "wine/unicode.h" +#include <winscard.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 }; + + +#define MAX_PCSCLITE_READERNAME 52 + +/* + * pcsc-lite functions pointers + */ +typedef LONG (*SCardEstablishContextPtr)(DWORD dwScope,LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext); +typedef LONG (*SCardReleaseContextPtr)(SCARDCONTEXT hContext); +typedef LONG (*SCardIsValidContextPtr)(SCARDCONTEXT hContext); +typedef LONG (*SCardSetTimeoutPtr)(SCARDCONTEXT hContext, DWORD dwTimeout); +typedef LONG (*SCardConnectPtr)(SCARDCONTEXT hContext,LPCSTR szReader,DWORD dwShareMode,DWORD dwPreferredProtocols,LPSCARDHANDLE phCard, LPDWORD pdwActiveProtocol); +typedef LONG (*SCardReconnectPtr)(SCARDHANDLE hCard,DWORD dwShareMode,DWORD dwPreferredProtocols,DWORD dwInitialization, LPDWORD pdwActiveProtocol); +typedef LONG (*SCardDisconnectPtr)(SCARDHANDLE hCard, DWORD dwDisposition); +typedef LONG (*SCardBeginTransactionPtr)(SCARDHANDLE hCard); +typedef LONG (*SCardEndTransactionPtr)(SCARDHANDLE hCard, DWORD dwDisposition); +typedef LONG (*SCardCancelTransactionPtr)(SCARDHANDLE hCard); +typedef LONG (*SCardStatusPtr)(SCARDHANDLE hCard,LPSTR mszReaderNames, LPDWORD pcchReaderLen,LPDWORD pdwState,LPDWORD pdwProtocol,BYTE* pbAtr,LPDWORD pcbAtrLen); +typedef LONG (*SCardGetStatusChangePtr)(SCARDCONTEXT hContext,DWORD dwTimeout,LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders); +typedef LONG (*SCardControlPtr)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer, DWORD cbSendLength,LPVOID pbRecvBuffer, DWORD cbRecvLength, LPDWORD lpBytesReturned); +typedef LONG (*SCardTransmitPtr)(SCARDHANDLE hCard,LPCSCARD_IO_REQUEST pioSendPci,const BYTE* pbSendBuffer, DWORD cbSendLength,LPSCARD_IO_REQUEST pioRecvPci,BYTE* pbRecvBuffer, LPDWORD pcbRecvLength); +typedef LONG (*SCardListReaderGroupsPtr)(SCARDCONTEXT hContext,LPSTR mszGroups, LPDWORD pcchGroups); +typedef LONG (*SCardListReadersPtr)(SCARDCONTEXT hContext,LPCSTR mszGroups,LPSTR mszReaders, LPDWORD pcchReaders); +typedef LONG (*SCardCancelPtr)(SCARDCONTEXT hContext); +typedef LONG (*SCardGetAttribPtr)(SCARDHANDLE hCard, DWORD dwAttrId,BYTE* pbAttr, LPDWORD pcbAttrLen); +typedef LONG (*SCardSetAttribPtr)(SCARDHANDLE hCard, DWORD dwAttrId,const BYTE* pbAttr, DWORD cbAttrLen); + +SCardEstablishContextPtr liteSCardEstablishContext = NULL; +SCardReleaseContextPtr liteSCardReleaseContext = NULL; +SCardIsValidContextPtr liteSCardIsValidContext = NULL; +SCardSetTimeoutPtr liteSCardSetTimeout = NULL; +SCardConnectPtr liteSCardConnect = NULL; +SCardReconnectPtr liteSCardReconnect = NULL; +SCardDisconnectPtr liteSCardDisconnect = NULL; +SCardBeginTransactionPtr liteSCardBeginTransaction = NULL; +SCardEndTransactionPtr liteSCardEndTransaction = NULL; +SCardCancelTransactionPtr liteSCardCancelTransaction = NULL; +SCardStatusPtr liteSCardStatus = NULL; +SCardGetStatusChangePtr liteSCardGetStatusChange = NULL; +SCardControlPtr liteSCardControl = NULL; +SCardTransmitPtr liteSCardTransmit = NULL; +SCardListReaderGroupsPtr liteSCardListReaderGroups = NULL; +SCardListReadersPtr liteSCardListReaders = NULL; +SCardCancelPtr liteSCardCancel = NULL; +SCardGetAttribPtr liteSCardGetAttrib = NULL; +SCardSetAttribPtr liteSCardSetAttrib = NULL; + +static void* g_pcscliteHandle = NULL; +static BOOL InitializePCSCLite(); + + + + +HANDLE g_startedEvent = 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; + InitializePCSCLite(); + // FIXME: for now, we act as if the pcsc daemon is always started + g_startedEvent = CreateEventA(NULL,TRUE,TRUE,NULL); + break; + } + case DLL_PROCESS_DETACH: + { + + CloseHandle(g_startedEvent); + + /* release PCSC-lite */ + if(g_pcscliteHandle) + { + liteSCardEstablishContext = NULL; + liteSCardReleaseContext = NULL; + liteSCardIsValidContext = NULL; + liteSCardSetTimeout = NULL; + liteSCardConnect = NULL; + liteSCardReconnect = NULL; + liteSCardDisconnect = NULL; + liteSCardBeginTransaction = NULL; + liteSCardEndTransaction = NULL; + liteSCardCancelTransaction = NULL; + liteSCardStatus = NULL; + liteSCardGetStatusChange = NULL; + liteSCardControl = NULL; + liteSCardTransmit = NULL; + liteSCardListReaderGroups = NULL; + liteSCardListReaders = NULL; + liteSCardCancel = NULL; + liteSCardGetAttrib = NULL; + liteSCardSetAttrib = NULL; + wine_dlclose(g_pcscliteHandle,NULL,0); + g_pcscliteHandle = NULL; + } + break; + } + } + + return TRUE; +} + +/* + * Initialize pcsc-lite pointers + */ + +static BOOL InitializePCSCLite() +{ + BOOL bStatus = FALSE; + if(g_pcscliteHandle) + bStatus = TRUE; /*already loaded*/ + else + { + /* try to load pcsc-lite */ + char szErr[256]; + g_pcscliteHandle = wine_dlopen("libpcsclite.so",RTLD_LAZY | RTLD_GLOBAL,szErr,sizeof(szErr)); + if(!g_pcscliteHandle) + { + /* error occured*/ + WARN("loading libpcsclite.so failed.Error = %s \n",szErr); + } + else + { + /* loading entry points*/ + BOOL bSuccess = TRUE; + if(bSuccess && !(liteSCardEstablishContext = (SCardEstablishContextPtr) wine_dlsym(g_pcscliteHandle,"SCardEstablishContext",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardEstablishContext from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardReleaseContext = (SCardReleaseContextPtr) wine_dlsym(g_pcscliteHandle,"SCardReleaseContext",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardReleaseContext from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardIsValidContext = (SCardIsValidContextPtr) wine_dlsym(g_pcscliteHandle,"SCardIsValidContext",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardIsValidContext from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardSetTimeout = (SCardSetTimeoutPtr) wine_dlsym(g_pcscliteHandle,"SCardSetTimeout",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardSetTimeout from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardConnect = (SCardConnectPtr) wine_dlsym(g_pcscliteHandle,"SCardConnect",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardConnect from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardReconnect = (SCardReconnectPtr) wine_dlsym(g_pcscliteHandle,"SCardReconnect",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardReconnect from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardDisconnect = (SCardDisconnectPtr) wine_dlsym(g_pcscliteHandle,"SCardDisconnect",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardDisconnect from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardBeginTransaction = (SCardBeginTransactionPtr) wine_dlsym(g_pcscliteHandle,"SCardBeginTransaction",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardBeginTransaction from pcsclite library. Error = %s\n",szErr); + } + + + if(bSuccess && !(liteSCardEndTransaction = (SCardEndTransactionPtr) wine_dlsym(g_pcscliteHandle,"SCardEndTransaction",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardEndTransaction from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardCancelTransaction = (SCardCancelTransactionPtr) wine_dlsym(g_pcscliteHandle,"SCardCancelTransaction",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardCancelTransaction from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardStatus = (SCardStatusPtr) wine_dlsym(g_pcscliteHandle,"SCardStatus",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardStatus from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardGetStatusChange = (SCardGetStatusChangePtr) wine_dlsym(g_pcscliteHandle,"SCardGetStatusChange",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardGetStatusChange from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardControl = (SCardControlPtr) wine_dlsym(g_pcscliteHandle,"SCardControl",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardControl from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardTransmit = (SCardTransmitPtr) wine_dlsym(g_pcscliteHandle,"SCardTransmit",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardTransmit from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardListReaderGroups = (SCardListReaderGroupsPtr) wine_dlsym(g_pcscliteHandle,"SCardListReaderGroups",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardListReaderGroups from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardListReaders = (SCardListReadersPtr) wine_dlsym(g_pcscliteHandle,"SCardListReaders",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardListReaders from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardCancel = (SCardCancelPtr) wine_dlsym(g_pcscliteHandle,"SCardCancel",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardCancel from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardGetAttrib = (SCardGetAttribPtr) wine_dlsym(g_pcscliteHandle,"SCardGetAttrib",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardGetAttrib from pcsclite library. Error = %s\n",szErr); + } + + if(bSuccess && !(liteSCardSetAttrib = (SCardSetAttribPtr) wine_dlsym(g_pcscliteHandle,"SCardSetAttrib",szErr,sizeof(szErr)))) + { + bSuccess = FALSE; + ERR("Failed to get SCardSetAttrib from pcsclite library. Error = %s\n",szErr); + } + + + if(!bSuccess) + { + /* a entry point is missing. unload the library */ + wine_dlclose(g_pcscliteHandle,NULL,0); + g_pcscliteHandle = NULL; + } + + bStatus = bSuccess; + + } + } + + return bStatus; +} + + +static size_t wstrlen(LPCWSTR szwStr) +{ + if(!szwStr) + return 0; + else + { + size_t result = 0; + while(*szwStr++ != (WCHAR) '\0') result++; + return result; + } +} + +/* + * Convert a wide-char multi-string to an ANSI multi-string + */ +static LONG ConvertListToANSI(LPCWSTR szListW,LPSTR* pszListA,LPDWORD pdwLength) +{ + if(!szListW) + { + *pszListA = NULL; + *pdwLength = 0; + } + else if(!*szListW) /* empty multi-string case */ + { + *pdwLength = 2; + *pszListA = (LPSTR) malloc(2); + if(!*pszListA) + return SCARD_E_NO_MEMORY; + *pszListA[0] = '\0'; + *pszListA[1] = '\0'; + } + else + { + + LPWSTR ptr = (LPWSTR) szListW; + LPSTR szStr = NULL,aptr; + DWORD alen = 0,tmp; + + /* compute the wide-char list length */ + for(;*ptr;ptr += wstrlen(ptr) + 1) + { + int aclen = WideCharToMultiByte(CP_ACP,0,ptr,-1,NULL,0,NULL,NULL); + if(!aclen) + return SCARD_F_INTERNAL_ERROR; + alen += aclen; + } + + alen++; /* add the final null character */ + + /* allocate memory */ + szStr = (LPSTR) malloc(alen); + if(!szStr) + return SCARD_F_INTERNAL_ERROR; + + aptr = szStr; + tmp = alen; + + /* do the conversion */ + for( ptr = (LPWSTR) szListW;*ptr;ptr += wstrlen(ptr) + 1) + { + int aclen = WideCharToMultiByte(CP_ACP,0,ptr,-1,aptr,tmp,NULL,NULL); + tmp -= aclen; + aptr += aclen; + } + + *aptr = '\0'; + + *pszListA = szStr; + *pdwLength = alen; + } + + return SCARD_S_SUCCESS; +} + + + +/* + * Convert a ANSII multi-string to a wide-char multi-string + */ +static LONG ConvertListToWideChar(LPCSTR szListA,LPWSTR* pszListW,LPDWORD pdwLength) +{ + if(!szListA) + { + *pszListW = NULL; + *pdwLength = 0; + } + else if(!*szListA) /* empty multi-string case */ + { + *pdwLength = 2; + *pszListW = (LPWSTR) malloc(2*sizeof(WCHAR)); + if(!*pszListW) + return SCARD_E_NO_MEMORY; + *pszListW[0] = '\0'; + *pszListW[1] = '\0'; + } + else + { + + LPSTR ptr = (LPSTR) szListA; + LPWSTR szStr = NULL,wptr; + DWORD wlen = 0,tmp; + + /* compute the wide-char list length */ + for(;*ptr;ptr += strlen(ptr) + 1) + { + int wclen = MultiByteToWideChar(CP_ACP,0,ptr,-1,NULL,0); + if(!wclen) + return SCARD_F_INTERNAL_ERROR; + wlen += wclen; + } + + wlen++; /* add the final null character */ + + /* allocate memory */ + szStr = (LPWSTR) malloc(wlen*sizeof(WCHAR)); + if(!szStr) + return SCARD_F_INTERNAL_ERROR; + + wptr = szStr; + tmp = wlen; + + /* do the conversion */ + for( ptr = (LPSTR) szListA;*ptr;ptr += strlen(ptr) + 1) + { + int wclen = MultiByteToWideChar(CP_ACP,0,ptr,-1,wptr,tmp); + tmp -= wclen; + wptr += wclen; + } + + *wptr = '\0'; + + *pszListW = szStr; + *pdwLength = wlen; + } + + return SCARD_S_SUCCESS; +} + + +/* + * translate PCSC-lite errors to equivalent MS ones + * Actually, the only difference is for SCARD_W_INSERTED_CARD(0x8010006A) and + * SCARD_E_UNSUPPORTED_FEATURE (0x8010001F) + */ + +#define PCSCLITE_SCARD_W_INSERTED_CARD 0x8010006A +#define PCSCLITE_SCARD_E_UNSUPPORTED_FEATURE 0x8010001F + +static LONG TranslateToWin32(LONG lRet) +{ + if(lRet == PCSCLITE_SCARD_E_UNSUPPORTED_FEATURE) + return SCARD_E_UNSUPPORTED_FEATURE; + else if(lRet == PCSCLITE_SCARD_W_INSERTED_CARD) + return SCARD_F_UNKNOWN_ERROR; /* FIXME: is there a better WIN32 error code */ + else + return lRet; +} + + +/* + * events 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"); + + return SCARD_S_SUCCESS; +} + +HANDLE WINAPI SCardAccessStartedEvent() +{ + return g_startedEvent; +} + +void WINAPI SCardReleaseStartedEvent(HANDLE hStartedEventHandle) +{ + /* do nothing because we don't implement yet reference couting for the event handle*/ +} + + +LONG WINAPI SCardFreeMemory( SCARDCONTEXT hContext,LPCVOID pvMem) +{ + if(pvMem) + free((void*) pvMem); + return SCARD_S_SUCCESS; +} + +/* + * smar cards database functions. Almost all of them are stubs + */ + +LONG WINAPI SCardListCardsA( + SCARDCONTEXT hContext, + const BYTE* pbAtr, + LPCGUID rgquidInterfaces, + DWORD cguidInterfaceCount, + LPSTR mszCards, + LPDWORD pcchCards) +{ + TRACE("0x%08X %p %p %d %p %p - stub\n",(unsigned int) hContext,pbAtr,rgquidInterfaces,cguidInterfaceCount,mszCards,pcchCards); + + /* we simuate the fact that no cards are enregistred on the system by returning an empty multi-string*/ + if(!pcchCards) + return SCARD_E_INVALID_PARAMETER; + else if(!mszCards) + *pcchCards = 2; + else + { + DWORD len = *pcchCards; + if(SCARD_AUTOALLOCATE == len) + { + if(!mszCards) + return SCARD_E_INVALID_PARAMETER; + else + { + /* allocate memory */ + LPSTR* pmszCards = (LPSTR*) mszCards; + LPSTR szResult = (LPSTR) malloc(2); + if(!szResult) + return SCARD_E_NO_MEMORY; + szResult[0] = '\0'; + szResult[1] = '\0'; + *pcchCards = 2; + *pmszCards = szResult; + } + } + else + { + if(len < 2) + { + *pcchCards = 2; + return SCARD_E_INSUFFICIENT_BUFFER; + } + else + { + /* return a empty multi string */ + mszCards[0] = '\0'; + mszCards[1] = '\0'; + *pcchCards = 2; + } + } + } + + return SCARD_S_SUCCESS; +} + +LONG WINAPI SCardListCardsW( + SCARDCONTEXT hContext, + const BYTE* pbAtr, + LPCGUID rgquidInterfaces, + DWORD cguidInterfaceCount, + LPWSTR mszCards, + LPDWORD pcchCards) +{ + TRACE("0x%08X %p %p %d %p %p - stub\n",(unsigned int)hContext,pbAtr,rgquidInterfaces,cguidInterfaceCount,mszCards,pcchCards); + + /* we simuate the fact that no cards are enregistred on the system by returning an empty multi-string*/ + if(!pcchCards) + return SCARD_E_INVALID_PARAMETER; + else if(!mszCards) + *pcchCards = 2; + else + { + DWORD len = *pcchCards; + if(SCARD_AUTOALLOCATE == len) + { + if(!mszCards) + return SCARD_E_INVALID_PARAMETER; + else + { + /* allocate memory */ + LPSTR* pmszCards = (LPSTR*) mszCards; + LPSTR szResult = (LPSTR) malloc(2*sizeof(WCHAR)); + if(!szResult) + return SCARD_E_NO_MEMORY; + szResult[0] = '\0'; + szResult[1] = '\0'; + *pcchCards = 2; + *pmszCards = szResult; + } + } + else + { + if(len < 2) + { + *pcchCards = 2; + return SCARD_E_INSUFFICIENT_BUFFER; + } + else + { + /* return a empty multi string */ + mszCards[0] = '\0'; + mszCards[1] = '\0'; + *pcchCards = 2; + } + } + } + + return SCARD_S_SUCCESS; +} + +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)); + + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardIntroduceReaderGroupW( + SCARDCONTEXT hContext, + LPCWSTR szGroupName) +{ + FIXME("0x%08X %s - stub\n",(unsigned int)hContext,debugstr_w(szGroupName)); + + 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)); + + 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)); + + 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)); + + 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)); + + 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, + const BYTE* pbAtr, + const BYTE* 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); + + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardIntroduceCardTypeW( + SCARDCONTEXT hContext, + LPCWSTR szCardName, + LPCGUID pguidPrimaryProvider, + LPCGUID rgguidInterfaces, + DWORD dwInterfaceCount, + const BYTE* pbAtr, + const BYTE* 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); + + 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)); + + 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)); + + 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); + + 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); + + return SCARD_F_UNKNOWN_ERROR; +} + +LONG WINAPI SCardListReaderGroupsA( + SCARDCONTEXT hContext, + LPSTR mszGroups, + LPDWORD pcchGroups) +{ + LONG lRet = SCARD_F_UNKNOWN_ERROR; + DWORD len ; + + if(!pcchGroups) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardListReaderGroups) + lRet = SCARD_F_INTERNAL_ERROR; + else if(mszGroups && *pcchGroups == SCARD_AUTOALLOCATE) + { + LPSTR* pmszGroups = (LPSTR*) mszGroups; + LPSTR szList = NULL; + len = 0; + + /* ask for the length */ + lRet = liteSCardListReaderGroups(hContext,NULL,&len); + if(SCARD_S_SUCCESS == lRet) + { + /* allocate memory for the list */ + szList = (LPSTR) malloc(len); + if(!szList) + lRet = SCARD_E_NO_MEMORY; + else + { + /* fill the list */ + lRet = liteSCardListReaderGroups(hContext,szList,&len); + if(SCARD_S_SUCCESS != lRet) + free(szList); + else + { + *pmszGroups = szList; + *pcchGroups = len; + } + } + } + + } + else + lRet = liteSCardListReaderGroups(hContext,mszGroups,pcchGroups); + + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardListReaderGroupsW( + SCARDCONTEXT hContext, + LPWSTR mszGroups, + LPDWORD pcchGroups) +{ + LONG lRet = SCARD_F_UNKNOWN_ERROR; + LPSTR szList = NULL; + LPWSTR szListW = NULL; + DWORD alen = 0,wlen = 0; + + if(!pcchGroups) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardListReaderGroups) + lRet = SCARD_F_INTERNAL_ERROR; + else + { + if(!mszGroups) + { + /* asking for length only + * get the length in ANSI and multiply by sizeof(WCHAR) + */ + alen = 0; + lRet = SCardListReaderGroupsA(hContext,NULL,&alen); + if(lRet == SCARD_S_SUCCESS || lRet == SCARD_E_INSUFFICIENT_BUFFER) + { + *pcchGroups = alen ; + } + goto end_label; + } + + /* get the ASCII list from pcsclite */ + alen = SCARD_AUTOALLOCATE; + lRet = SCardListReaderGroupsA(hContext,(LPSTR) &szList,&alen); + if(SCARD_S_SUCCESS != lRet) + goto end_label; + + /* now convert the list to a wide char list */ + lRet = ConvertListToWideChar(szList,&szListW,&wlen); + + /* free the ASCII list, we don't need it any more */ + SCardFreeMemory(hContext,(LPCVOID) szList); + + if(SCARD_S_SUCCESS != lRet) + goto end_label; + + if(SCARD_AUTOALLOCATE == *pcchGroups) + { + LPWSTR* pmszGroups = (LPWSTR*) mszGroups; + *pmszGroups = szListW; + *pcchGroups = wlen; + szListW = NULL; + lRet = SCARD_S_SUCCESS; + } + else + { + DWORD cchGroups = *pcchGroups; + if(cchGroups < wlen) + { + *pcchGroups = wlen; + lRet = SCARD_E_INSUFFICIENT_BUFFER; + } + else + { + *pcchGroups = wlen; + memcpy(mszGroups,szListW,wlen*sizeof(WCHAR)); + lRet = SCARD_S_SUCCESS; + } + } + } + +end_label: + if(szListW) + free(szListW); + return TranslateToWin32(lRet); + +} + + + +LONG WINAPI SCardListReadersA( + SCARDCONTEXT hContext, + LPCSTR mszGroups, + LPSTR mszReaders, + LPDWORD pcchReaders) +{ + LONG lRet; + if(!pcchReaders) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardListReaders) + lRet = SCARD_F_INTERNAL_ERROR; + else if(mszReaders && SCARD_AUTOALLOCATE == *pcchReaders) + { + /* get list from pcsc-lite */ + LPSTR* pmszReaders = (LPSTR*) mszReaders; + LPSTR szList = NULL; + DWORD dwListLength = 0; + + lRet = liteSCardListReaders(hContext,mszGroups,NULL,&dwListLength); + if(SCARD_S_SUCCESS != lRet && lRet != SCARD_E_INSUFFICIENT_BUFFER) + goto end_label; + + szList = (LPSTR) malloc(dwListLength); + if(!szList) + { + lRet = SCARD_E_NO_MEMORY; + goto end_label; + } + + lRet = liteSCardListReaders(hContext,mszGroups,szList,&dwListLength); + if(SCARD_S_SUCCESS != lRet) + free(szList); + else + { + *pmszReaders = szList; + *pcchReaders = dwListLength; + } + } + else + lRet = liteSCardListReaders(hContext,mszGroups,mszReaders,pcchReaders); + +end_label: + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardListReadersW( + SCARDCONTEXT hContext, + LPCWSTR mszGroups, + LPWSTR mszReaders, + LPDWORD pcchReaders) +{ + LONG lRet; + if(!pcchReaders) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardListReaders) + lRet = SCARD_F_INTERNAL_ERROR; + else + { + /* call the ANSI version */ + LPSTR mszGroupsA = NULL; + LPSTR mszReadersA = NULL; + LPWSTR szListW = NULL; + DWORD dwLength ; + if(mszGroups) + { + lRet = ConvertListToANSI(mszGroups,&mszGroupsA,&dwLength); + if(SCARD_S_SUCCESS != lRet) + goto end_label; + } + + if(!mszReaders) + { + /* asking for length only + * Assume that number of wide char is the same + * as the number f ANSI characters + */ + dwLength = 0; + lRet = SCardListReadersA(hContext,mszGroupsA,NULL,&dwLength); + if(lRet == SCARD_S_SUCCESS || lRet == SCARD_E_INSUFFICIENT_BUFFER) + { + *pcchReaders = dwLength; + } + if(mszGroupsA) + free(mszGroupsA); + goto end_label; + } + + dwLength = SCARD_AUTOALLOCATE; + lRet = SCardListReadersA(hContext,mszGroupsA,(LPSTR) &mszReadersA,&dwLength); + + /* free the ANSI list of groups : no more needed */ + if(mszGroupsA) + free(mszGroupsA); + + if(SCARD_S_SUCCESS != lRet) + goto end_label; + + /* we now have the list in ANSI. Covert it to wide-char format*/ + lRet = ConvertListToWideChar(mszReadersA,&szListW,&dwLength); + + /* ANSI list of readers no more needed */ + SCardFreeMemory(hContext,(LPCVOID) mszReadersA); + + if(SCARD_S_SUCCESS != lRet) + goto end_label; + + if(SCARD_AUTOALLOCATE == *pcchReaders) + { + LPWSTR* pmszReaders = (LPWSTR*) mszReaders; + *pmszReaders = szListW; + szListW = NULL; + *pcchReaders = dwLength; + } + else + { + DWORD inputLength = *pcchReaders; + if(inputLength < dwLength) + lRet = SCARD_E_INSUFFICIENT_BUFFER; + else + memcpy(mszReaders,szListW,dwLength*sizeof(WCHAR)); + *pcchReaders = dwLength; + } + + if(szListW) + free(szListW); + } +end_label: + return TranslateToWin32(lRet); +} + +/* + * PCS/SC communication functions + */ +LONG WINAPI SCardEstablishContext(DWORD dwScope,LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext) +{ + LONG lRet; + TRACE(" 0x%08X %p %p %p\n",dwScope,pvReserved1,pvReserved2,phContext); + if(!phContext) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardEstablishContext) + lRet = SCARD_F_INTERNAL_ERROR; + else + lRet = liteSCardEstablishContext(dwScope,pvReserved1,pvReserved2,phContext); + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + + +LONG WINAPI SCardReleaseContext(SCARDCONTEXT hContext) +{ + LONG lRet; + TRACE(" 0x%08X\n", (unsigned int) hContext); + if(!liteSCardReleaseContext) + lRet = SCARD_F_INTERNAL_ERROR; + else + lRet = liteSCardReleaseContext(hContext); + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardIsValidContext(SCARDCONTEXT hContext) +{ + if(!liteSCardIsValidContext) + return SCARD_F_INTERNAL_ERROR; + else + return TranslateToWin32(liteSCardIsValidContext(hContext)); +} + + +#define PCSCLITE_SCARD_PROTOCOL_RAW 0x00000004 + +LONG WINAPI SCardConnectA(SCARDCONTEXT hContext, + LPCSTR szReader, + DWORD dwShareMode, + DWORD dwPreferredProtocols, + LPSCARDHANDLE phCard, + LPDWORD pdwActiveProtocol) +{ + LONG lRet; + TRACE(" 0x%08X %s 0x%08X 0x%08X %p %p\n",(unsigned int) hContext,debugstr_a(szReader),dwShareMode,dwPreferredProtocols,phCard,pdwActiveProtocol); + if(!szReader || !phCard || !pdwActiveProtocol) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardConnect) + lRet = SCARD_F_INTERNAL_ERROR; + else + { + /* the value of SCARD_PROTOCOL_RAW is different between MS implementation and + * pcsc-lite implementation. We must change its value + */ + if(dwPreferredProtocols & SCARD_PROTOCOL_RAW) + { + dwPreferredProtocols ^= SCARD_PROTOCOL_RAW; + dwPreferredProtocols |= PCSCLITE_SCARD_PROTOCOL_RAW; + } + + lRet = liteSCardConnect(hContext,szReader,dwShareMode,dwPreferredProtocols,phCard,pdwActiveProtocol); + if(SCARD_S_SUCCESS == lRet) + { + /* if PCSCLITE_SCARD_PROTOCOL_RAW is set, put back the MS corresponding value */ + if(*pdwActiveProtocol & PCSCLITE_SCARD_PROTOCOL_RAW) + { + *pdwActiveProtocol ^= PCSCLITE_SCARD_PROTOCOL_RAW; + *pdwActiveProtocol |= SCARD_PROTOCOL_RAW; + } + + } + } + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardConnectW(SCARDCONTEXT hContext, + LPCWSTR szReader, + DWORD dwShareMode, + DWORD dwPreferredProtocols, + LPSCARDHANDLE phCard, + LPDWORD pdwActiveProtocol) +{ + LONG lRet; + TRACE(" 0x%08X %s 0x%08X 0x%08X %p %p\n",(unsigned int) hContext,debugstr_w(szReader),dwShareMode,dwPreferredProtocols,phCard,pdwActiveProtocol); + if(!szReader || !phCard || !pdwActiveProtocol) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardConnect) + lRet = SCARD_F_INTERNAL_ERROR; + else + { + LPSTR szReaderA = NULL; + int dwLen = WideCharToMultiByte(CP_ACP,0,szReader,-1,NULL,0,NULL,NULL); + if(!dwLen) + { + lRet = SCARD_F_UNKNOWN_ERROR; + goto end_label; + } + + szReaderA = (LPSTR) malloc(dwLen); + if(!szReaderA) + { + lRet = SCARD_E_NO_MEMORY; + goto end_label; + } + + dwLen = WideCharToMultiByte(CP_ACP,0,szReader,-1,szReaderA,dwLen,NULL,NULL); + if(!dwLen) + { + free(szReaderA); + lRet = SCARD_F_UNKNOWN_ERROR; + goto end_label; + } + + /* the value of SCARD_PROTOCOL_RAW is different between MS implementation and + * pcsc-lite implementation. We must change its value + */ + if(dwPreferredProtocols & SCARD_PROTOCOL_RAW) + { + dwPreferredProtocols ^= SCARD_PROTOCOL_RAW; + dwPreferredProtocols |= PCSCLITE_SCARD_PROTOCOL_RAW; + } + + lRet = liteSCardConnect(hContext,szReaderA,dwShareMode,dwPreferredProtocols,phCard,pdwActiveProtocol); + if(SCARD_S_SUCCESS == lRet) + { + /* if PCSCLITE_SCARD_PROTOCOL_RAW is set, put back the MS corresponding value */ + if(*pdwActiveProtocol & PCSCLITE_SCARD_PROTOCOL_RAW) + { + *pdwActiveProtocol ^= PCSCLITE_SCARD_PROTOCOL_RAW; + *pdwActiveProtocol |= SCARD_PROTOCOL_RAW; + } + } + + /* free the allocate ANSI string */ + free(szReaderA); + } +end_label: + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardReconnect(SCARDHANDLE hCard, + DWORD dwShareMode, + DWORD dwPreferredProtocols, + DWORD dwInitialization, + LPDWORD pdwActiveProtocol) +{ + LONG lRet; + TRACE(" 0x%08X 0x%08X 0x%08X 0x%08X %p\n",(unsigned int) hCard,dwShareMode,dwPreferredProtocols,dwInitialization,pdwActiveProtocol); + if(!pdwActiveProtocol) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardReconnect) + lRet = SCARD_F_INTERNAL_ERROR; + else + { + /* the value of SCARD_PROTOCOL_RAW is different between MS implementation and + * pcsc-lite implementation. We must change its value + */ + if(dwPreferredProtocols & SCARD_PROTOCOL_RAW) + { + dwPreferredProtocols ^= SCARD_PROTOCOL_RAW; + dwPreferredProtocols |= PCSCLITE_SCARD_PROTOCOL_RAW; + } + + lRet = liteSCardReconnect(hCard,dwShareMode,dwPreferredProtocols,dwInitialization,pdwActiveProtocol); + if(SCARD_S_SUCCESS == lRet) + { + /* if PCSCLITE_SCARD_PROTOCOL_RAW is set, put back the MS corresponding value */ + if(*pdwActiveProtocol & PCSCLITE_SCARD_PROTOCOL_RAW) + { + *pdwActiveProtocol ^= PCSCLITE_SCARD_PROTOCOL_RAW; + *pdwActiveProtocol |= SCARD_PROTOCOL_RAW; + } + } + } + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition) +{ + LONG lRet; + TRACE(" 0x%08X 0x%08X\n",(unsigned int) hCard,dwDisposition); + if(!liteSCardDisconnect) + lRet = SCARD_F_INTERNAL_ERROR; + else + lRet = liteSCardDisconnect(hCard,dwDisposition); + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardBeginTransaction(SCARDHANDLE hCard) +{ + LONG lRet; + TRACE(" 0x%08X\n",(unsigned int) hCard); + if(!liteSCardBeginTransaction) + lRet = SCARD_F_INTERNAL_ERROR; + else + lRet = liteSCardBeginTransaction(hCard); + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition) +{ + LONG lRet; + TRACE(" 0x%08X 0x%08X\n",(unsigned int) hCard,dwDisposition); + if(!liteSCardEndTransaction) + lRet = SCARD_F_INTERNAL_ERROR; + else + lRet = liteSCardEndTransaction(hCard,dwDisposition); + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardCancelTransaction(SCARDHANDLE hCard) +{ + LONG lRet; + TRACE(" 0x%08X\n",(unsigned int) hCard); + if(!liteSCardCancelTransaction) + lRet = SCARD_F_INTERNAL_ERROR; + else + lRet = liteSCardCancelTransaction(hCard); + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardState( + SCARDHANDLE hCard, + LPDWORD pdwState, + LPDWORD pdwProtocol, + LPBYTE pbAtr, + LPDWORD pcbAtrLen) +{ + LONG lRet ; + LPSTR szName = NULL; + DWORD cchReaderLen = SCARD_AUTOALLOCATE;; + TRACE(" 0x%08X %p %p %p %p\n",(unsigned int) hCard,pdwState,pdwProtocol,pbAtr,pcbAtrLen); + lRet = SCardStatusA(hCard,(LPSTR) &szName,&cchReaderLen,pdwState,pdwProtocol,pbAtr,pcbAtrLen); + + /* free szName is allocated by SCardStatusA */ + if(szName) + free((void*) szName); + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardStatusA( + SCARDHANDLE hCard, + LPSTR mszReaderNames, + LPDWORD pcchReaderLen, + LPDWORD pdwState, + LPDWORD pdwProtocol, + LPBYTE pbAtr, + LPDWORD pcbAtrLen) +{ + LONG lRet; + TRACE(" 0x%08X %p %p %p %p %p %p\n",(unsigned int) hCard,mszReaderNames,pcchReaderLen,pdwState,pdwProtocol,pbAtr,pcbAtrLen); + if(!pcchReaderLen || !pdwState || !pdwProtocol || !pcbAtrLen) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardStatus) + lRet = SCARD_F_INTERNAL_ERROR; + else + { + if(!mszReaderNames || !pbAtr + || (*pcchReaderLen == SCARD_AUTOALLOCATE) || (*pcbAtrLen == SCARD_AUTOALLOCATE)) + { + /* retreive the information from pcsc-lite */ + BOOL bHasAutoAllocated = FALSE; + DWORD dwNameLen = 0,dwAtrLen=MAX_ATR_SIZE; + BYTE atr[MAX_ATR_SIZE]; + LPSTR szNames = NULL; + lRet = liteSCardStatus(hCard,NULL,&dwNameLen,pdwState,pdwProtocol,atr,&dwAtrLen); + if(lRet != SCARD_S_SUCCESS && lRet != SCARD_E_INSUFFICIENT_BUFFER) + goto end_label; + + /* case 1: asking for reader names length */ + if(!mszReaderNames) + { + lRet = SCARD_S_SUCCESS; + *pcchReaderLen = dwNameLen; + if(!pbAtr) + *pcbAtrLen = dwAtrLen; + else if(*pcbAtrLen == SCARD_AUTOALLOCATE) + { + LPBYTE* ppbAtr = (LPBYTE*) pbAtr; + *ppbAtr = (LPBYTE) malloc(dwAtrLen); + *pcbAtrLen = dwAtrLen; + memcpy(*ppbAtr,atr,dwAtrLen); + } + else if(*pcbAtrLen < dwAtrLen) + { + *pcbAtrLen = dwAtrLen; + lRet = SCARD_E_INSUFFICIENT_BUFFER; + } + else + { + *pcbAtrLen = dwAtrLen; + memcpy(pbAtr,atr,dwAtrLen); + } + + goto end_label; + } + + /* case 2: reader names pointer provided but its length is unsufficient */ + if(*pcchReaderLen < dwNameLen) + { + *pcchReaderLen = dwNameLen; + lRet = SCARD_E_INSUFFICIENT_BUFFER; + goto end_label; + } + + bHasAutoAllocated = (*pcchReaderLen == SCARD_AUTOALLOCATE)? TRUE : FALSE; + if(bHasAutoAllocated) + szNames = (LPSTR) malloc(dwNameLen); + else + szNames = mszReaderNames; + + lRet = liteSCardStatus(hCard,szNames,&dwNameLen,pdwState,pdwProtocol,atr,&dwAtrLen); + if(lRet != SCARD_S_SUCCESS) + { + if(bHasAutoAllocated) + free(szNames); + goto end_label; + } + + *pcchReaderLen = dwNameLen; + if(bHasAutoAllocated) + { + LPSTR* pmszReaderNames = (LPSTR*) mszReaderNames; + *pmszReaderNames = szNames; + szNames = NULL; + } + + + /* now fill the ATR parameter */ + if(!pbAtr) + *pcbAtrLen = dwAtrLen; + else if(*pcbAtrLen == SCARD_AUTOALLOCATE) + { + LPBYTE* ppbAtr = (LPBYTE*) pbAtr; + *ppbAtr = (LPBYTE) malloc(dwAtrLen); + *pcbAtrLen = dwAtrLen; + memcpy(*ppbAtr,atr,dwAtrLen); + } + else if(*pcbAtrLen < dwAtrLen) + { + *pcbAtrLen = dwAtrLen; + lRet = SCARD_E_INSUFFICIENT_BUFFER; + } + else + { + *pcbAtrLen = dwAtrLen; + memcpy(pbAtr,atr,dwAtrLen); + } + + if(bHasAutoAllocated && szNames) + free(szNames); + } + else + lRet = liteSCardStatus(hCard,mszReaderNames,pcchReaderLen,pdwState,pdwProtocol,pbAtr,pcbAtrLen); + } + +end_label: + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardStatusW( + SCARDHANDLE hCard, + LPWSTR mszReaderNames, + LPDWORD pcchReaderLen, + LPDWORD pdwState, + LPDWORD pdwProtocol, + LPBYTE pbAtr, + LPDWORD pcbAtrLen) +{ + LONG lRet; + TRACE(" 0x%08X %p %p %p %p %p %p\n",(unsigned int) hCard,mszReaderNames,pcchReaderLen,pdwState,pdwProtocol,pbAtr,pcbAtrLen); + if(!pcchReaderLen || !pdwState || !pdwProtocol || !pcbAtrLen) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardStatus) + lRet = SCARD_F_INTERNAL_ERROR; + else + { + /* call the ANSI version with SCARD_AUTOALLOCATE */ + LPSTR mszReaderNamesA = NULL; + DWORD dwAnsiNamesLength = SCARD_AUTOALLOCATE; + lRet = SCardStatusA(hCard,(LPSTR) &mszReaderNamesA,&dwAnsiNamesLength,pdwState,pdwProtocol,pbAtr,pcbAtrLen); + if(lRet == SCARD_S_SUCCESS) + { + /* convert mszReaderNamesA to a wide char multi-string */ + LPWSTR mszWideNamesList = NULL; + DWORD dwWideNamesLength = 0; + lRet = ConvertListToWideChar(mszReaderNamesA,&mszWideNamesList,&dwWideNamesLength); + + /* no more needed */ + if(mszReaderNamesA) + free(mszReaderNamesA); + + if(lRet == SCARD_S_SUCCESS) + { + if(!mszReaderNames) + *pcchReaderLen = dwWideNamesLength; + else if(*pcchReaderLen == SCARD_AUTOALLOCATE) + { + LPWSTR* pmszReaderNames = (LPWSTR*) mszReaderNames; + *pmszReaderNames = mszWideNamesList; + *pcchReaderLen = dwWideNamesLength; + mszWideNamesList = NULL; + } + else if(*pcchReaderLen < dwWideNamesLength) + { + *pcchReaderLen = dwWideNamesLength; + lRet = SCARD_E_INSUFFICIENT_BUFFER; + } + else + { + *pcchReaderLen = dwWideNamesLength; + memcpy(mszReaderNames,mszWideNamesList,dwWideNamesLength); + } + } + + if(mszWideNamesList) + free(mszWideNamesList); + } + } + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardGetStatusChangeA( + SCARDCONTEXT hContext, + DWORD dwTimeout, + LPSCARD_READERSTATEA rgReaderStates, + DWORD cReaders) +{ + LONG lRet; + TRACE(" 0x%08X 0x%08X %p 0x%08X\n",(unsigned int) hContext, dwTimeout,rgReaderStates,cReaders); + if(!liteSCardGetStatusChange) + lRet = SCARD_F_INTERNAL_ERROR; + else if(!rgReaderStates && cReaders) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!cReaders) + { + if(liteSCardIsValidContext) + lRet = liteSCardIsValidContext(hContext); + else + lRet = SCARD_S_SUCCESS; + } + else + { + /* in pcsclite, dwTimeout = 0 is equivalent to dwTimeout = INFINITE + * In Windows, dwTimeout = 0 means return immediately + * We will simulate an immediate return + */ + if(dwTimeout == 0) + { + /* get the current state of readers and compare it with input + * Return SCARD_S_SUCCESS if a change is detected and + * SCARD_E_TIMEOUT otherwide + */ + + DWORD i; + LPSCARD_READERSTATEA pStates = (LPSCARD_READERSTATEA) malloc(cReaders * sizeof(SCARD_READERSTATEA)); + memset(pStates,0,cReaders * sizeof(SCARD_READERSTATEA)); + for(i=0;i<cReaders;i++) + pStates[i].szReader = rgReaderStates[i].szReader; + + lRet = liteSCardGetStatusChange(hContext,0,pStates,cReaders); + if(lRet == SCARD_S_SUCCESS) + { + BOOL bStateChanges = FALSE; + for(i=0;i<cReaders;i++) + { + DWORD dwState = pStates[i].dwEventState & (~SCARD_STATE_CHANGED); + rgReaderStates[i].cbAtr = pStates[i].cbAtr; + memcpy(rgReaderStates[i].rgbAtr,pStates[i].rgbAtr,MAX_ATR_SIZE); + + if(dwState != rgReaderStates[i].dwCurrentState) + { + rgReaderStates[i].dwEventState = pStates[i].dwEventState; + bStateChanges = TRUE; + } + else + rgReaderStates[i].dwEventState = dwState; + } + + + if(!bStateChanges) + lRet = SCARD_E_TIMEOUT; + } + + free(pStates); + } + else + lRet = liteSCardGetStatusChange(hContext,dwTimeout,rgReaderStates,cReaders); + } + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardGetStatusChangeW( + SCARDCONTEXT hContext, + DWORD dwTimeout, + LPSCARD_READERSTATEW rgReaderStates, + DWORD cReaders) +{ + LONG lRet; + TRACE(" 0x%08X 0x%08X %p 0x%08X\n",(unsigned int) hContext, dwTimeout,rgReaderStates,cReaders); + if(!rgReaderStates && cReaders) + lRet = SCARD_E_INVALID_PARAMETER; + else if(!liteSCardGetStatusChange) + lRet = SCARD_F_INTERNAL_ERROR; + else if(!cReaders) + { + if(liteSCardIsValidContext) + lRet = liteSCardIsValidContext(hContext); + else + lRet = SCARD_S_SUCCESS; + } + else + { + /* create an ANSI array of readers states* */ + DWORD i; + LPSCARD_READERSTATEA rgReaderStatesAnsi = (LPSCARD_READERSTATEA) malloc(cReaders * sizeof(SCARD_READERSTATEA)); + if(!rgReaderStatesAnsi) + return SCARD_E_NO_MEMORY; + memset(rgReaderStatesAnsi,0,cReaders * sizeof(SCARD_READERSTATEA)); + for(i=0;i<cReaders;i++) + { + int alen = WideCharToMultiByte(CP_ACP,0,rgReaderStates[i].szReader,-1,NULL,0,NULL,NULL); + if(!alen) + break; + rgReaderStatesAnsi[i].szReader = (LPSTR) malloc(alen); + WideCharToMultiByte(CP_ACP,0,rgReaderStates[i].szReader,-1,(LPSTR) rgReaderStatesAnsi[i].szReader,alen,NULL,NULL); + rgReaderStatesAnsi[i].pvUserData = rgReaderStates[i].pvUserData; + rgReaderStatesAnsi[i].dwCurrentState = rgReaderStates[i].dwCurrentState; + rgReaderStatesAnsi[i].dwEventState = rgReaderStates[i].dwEventState; + rgReaderStatesAnsi[i].cbAtr = rgReaderStates[i].cbAtr; + memcpy(rgReaderStatesAnsi[i].rgbAtr,rgReaderStates[i].rgbAtr,MAX_ATR_SIZE); + } + + if(i < cReaders) + lRet = SCARD_F_UNKNOWN_ERROR; + else + { + lRet = SCardGetStatusChangeA(hContext,dwTimeout,rgReaderStatesAnsi,cReaders); + if(lRet == SCARD_S_SUCCESS) + { + /* copy back the information */ + for(i=0;i<cReaders;i++) + { + rgReaderStates[i].dwEventState = rgReaderStatesAnsi[i].dwEventState; + rgReaderStates[i].cbAtr = rgReaderStatesAnsi[i].cbAtr; + memcpy(rgReaderStates[i].rgbAtr,rgReaderStatesAnsi[i].rgbAtr,MAX_ATR_SIZE); + } + } + } + /* free memory */ + for(i=0;i<cReaders;i++) + { + if(rgReaderStatesAnsi[i].szReader) + free((void*) rgReaderStatesAnsi[i].szReader); + } + free(rgReaderStatesAnsi); + } + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardControl( + SCARDHANDLE hCard, + DWORD dwControlCode, + LPCVOID pbSendBuffer, + DWORD cbSendLength, + LPVOID pbRecvBuffer, + DWORD cbRecvLength, + LPDWORD lpBytesReturned) +{ + if(!liteSCardControl) + return SCARD_F_INTERNAL_ERROR; + else + return TranslateToWin32(liteSCardControl(hCard,dwControlCode,pbSendBuffer,cbSendLength,pbRecvBuffer,cbRecvLength,lpBytesReturned)); +} + +LONG WINAPI SCardTransmit( + SCARDHANDLE hCard, + LPCSCARD_IO_REQUEST pioSendPci, + const BYTE* pbSendBuffer, + DWORD cbSendLength, + LPSCARD_IO_REQUEST pioRecvPci, + LPBYTE pbRecvBuffer, + LPDWORD pcbRecvLength) +{ + LONG lRet; + if(!liteSCardTransmit) + lRet = SCARD_F_INTERNAL_ERROR; + else + { + if(!pioSendPci) + { + /* In MS PC/SC, pioSendPci can be NULL. But not in pcsc-lite */ + /* Get the protocol and set the correct value for pioSendPci*/ + DWORD protocol,dwState; + DWORD dwAtrLen,dwNameLen; + lRet = SCardStatusA(hCard,NULL,&dwNameLen,&dwState,&protocol,NULL,&dwAtrLen); + if(lRet == SCARD_S_SUCCESS) + { + if(protocol == SCARD_PROTOCOL_T0) + pioSendPci = SCARD_PCI_T0; + else if(protocol == SCARD_PROTOCOL_T1) + pioSendPci = SCARD_PCI_T1; + else if(protocol == SCARD_PROTOCOL_RAW) + pioSendPci = SCARD_PCI_RAW; + } + } + + lRet = liteSCardTransmit(hCard,pioSendPci,pbSendBuffer,cbSendLength,pioRecvPci,pbRecvBuffer,pcbRecvLength); + } + + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardCancel(SCARDCONTEXT hContext) +{ + LONG lRet; + TRACE(" 0x%08X \n",(unsigned int) hContext); + if(!liteSCardCancel) + lRet = SCARD_F_INTERNAL_ERROR; + else + lRet = liteSCardCancel(hContext); + + TRACE(" returned 0x%08X\n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardGetAttrib( + SCARDHANDLE hCard, + DWORD dwAttrId, + LPBYTE pbAttr, + LPDWORD pcbAttrLen) +{ + LONG lRet; + TRACE(" 0x%08X 0x%08X %p %p \n",(unsigned int) hCard, dwAttrId,pbAttr,pcbAttrLen); + if(!liteSCardGetAttrib) + lRet = SCARD_F_INTERNAL_ERROR; + else if(!pcbAttrLen) + lRet = SCARD_E_INVALID_PARAMETER; + else + { + LPBYTE ptr = NULL; + DWORD dwLength = 0; + lRet = liteSCardGetAttrib(hCard,dwAttrId,NULL,&dwLength); + if(lRet == SCARD_S_SUCCESS || lRet == SCARD_E_INSUFFICIENT_BUFFER) + { + if(!pbAttr) + *pcbAttrLen = dwLength; + else if(*pcbAttrLen < dwLength) + { + *pcbAttrLen = dwLength; + lRet = SCARD_E_INSUFFICIENT_BUFFER; + } + else + { + BOOL bHasAutoAllocate = (*pcbAttrLen == SCARD_AUTOALLOCATE)? TRUE : FALSE; + if(bHasAutoAllocate) + ptr = (LPBYTE) malloc(dwLength); + else + ptr = pbAttr; + lRet = liteSCardGetAttrib(hCard,dwAttrId,ptr,&dwLength); + if(lRet == SCARD_S_SUCCESS) + { + *pcbAttrLen = dwLength; + if(bHasAutoAllocate) + { + LPBYTE *ppbAttr = (LPBYTE*) pbAttr; + *ppbAttr = ptr; + ptr = NULL; + } + } + + if(bHasAutoAllocate && ptr) + free(ptr); + } + } + + if(SCARD_E_UNSUPPORTED_FEATURE == TranslateToWin32(lRet)) + { + /* in case of one of these attributes , do it our selves */ + if(SCARD_ATTR_ICC_PRESENCE == dwAttrId || SCARD_ATTR_CURRENT_PROTOCOL_TYPE == dwAttrId + || SCARD_ATTR_ATR_STRING == dwAttrId || SCARD_ATTR_DEVICE_FRIENDLY_NAME_A == dwAttrId + || SCARD_ATTR_DEVICE_FRIENDLY_NAME_W == dwAttrId + || SCARD_ATTR_DEVICE_SYSTEM_NAME_A == dwAttrId + || SCARD_ATTR_DEVICE_SYSTEM_NAME_W == dwAttrId) + { + DWORD dwState; + DWORD dwProtocol; + BYTE pbAtr[MAX_ATR_SIZE]; + DWORD dwAtrLen =MAX_ATR_SIZE; + LPVOID pszReaderNames = NULL; + DWORD dwNameLength = SCARD_AUTOALLOCATE; + LONG status; + + if(SCARD_ATTR_DEVICE_SYSTEM_NAME_W == dwAttrId + || SCARD_ATTR_DEVICE_FRIENDLY_NAME_W == dwAttrId) + status = SCardStatusW(hCard,(LPWSTR) &pszReaderNames, &dwNameLength, &dwState,&dwProtocol, pbAtr,&dwAtrLen); + else + status = SCardStatusA(hCard,(LPSTR) &pszReaderNames, &dwNameLength, &dwState,&dwProtocol, pbAtr,&dwAtrLen); + if(SCARD_S_SUCCESS == status) + { + BYTE pbValue[MAX_ATR_SIZE]; + DWORD dwValueLen = 0; + LPBYTE pValuePtr = &pbValue[0]; + if(SCARD_ATTR_ICC_PRESENCE == dwAttrId) + { + dwValueLen = 1; + pbValue[0] = 1; /* present by default */ + if(dwState == SCARD_ABSENT) + pbValue[0] = 0; + else if(dwState == SCARD_SWALLOWED) + pbValue[0] = 2; + } + else if(SCARD_ATTR_CURRENT_PROTOCOL_TYPE == dwAttrId) + { + dwValueLen = 4; + memcpy(pbValue,&dwProtocol,4); + } + else if(SCARD_ATTR_DEVICE_FRIENDLY_NAME_A == dwAttrId || + SCARD_ATTR_DEVICE_SYSTEM_NAME_A == dwAttrId) + { + pValuePtr = (LPBYTE) pszReaderNames; + dwValueLen = dwNameLength ; + } + else if(SCARD_ATTR_DEVICE_FRIENDLY_NAME_W == dwAttrId || + SCARD_ATTR_DEVICE_SYSTEM_NAME_W == dwAttrId) + { + pValuePtr = (LPBYTE) pszReaderNames; + dwValueLen = dwNameLength * sizeof(WCHAR); + } + else /* ATR case */ + { + dwValueLen = dwAtrLen; + memcpy(pbValue,pbAtr,dwAtrLen); + } + + lRet = SCARD_S_SUCCESS; + if(!pbAttr) + *pcbAttrLen =dwValueLen; + else if(*pcbAttrLen == SCARD_AUTOALLOCATE) + { + LPBYTE *ppbAttr = (LPBYTE*) pbAttr; + *ppbAttr = (LPBYTE) malloc(dwValueLen); + memcpy(*ppbAttr,pValuePtr,dwValueLen); + *pcbAttrLen = dwValueLen; + } + else if(*pcbAttrLen < dwValueLen) + { + *pcbAttrLen = dwValueLen; + lRet = SCARD_E_INSUFFICIENT_BUFFER; + } + else + { + *pcbAttrLen = dwValueLen; + memcpy(pbAttr,pValuePtr,dwValueLen); + } + + free(pszReaderNames); + } + } + } + } + TRACE(" returned 0x%08X \n",lRet); + return TranslateToWin32(lRet); +} + +LONG WINAPI SCardSetAttrib( + SCARDHANDLE hCard, + DWORD dwAttrId, + const BYTE* pbAttr, + DWORD cbAttrLen) +{ + LONG lRet; + TRACE(" 0x%08X 0x%08X %p 0x%08X \n",(unsigned int) hCard,dwAttrId,pbAttr,cbAttrLen); + if(!liteSCardSetAttrib) + lRet = SCARD_F_INTERNAL_ERROR; + else + lRet = liteSCardSetAttrib(hCard,dwAttrId,pbAttr,cbAttrLen); + + TRACE(" returned 0x%08X \n",lRet); + return TranslateToWin32(lRet); +} + + diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec new file mode 100755 index 0000000..2eb0681 --- /dev/null +++ b/dlls/winscard/winscard.spec @@ -0,0 +1,63 @@ +@ stub ClassInstall32 +@ stdcall SCardAccessNewReaderEvent() +@ stdcall SCardReleaseAllEvents() +@ stdcall SCardReleaseNewReaderEvent() +@ 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 SCardForgetReaderGroupA(long str) +@ stdcall SCardForgetReaderGroupW(long wstr) +@ stdcall SCardForgetReaderW(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 SCardIntroduceReaderGroupA(long str) +@ stdcall SCardIntroduceReaderGroupW(long wstr) +@ stdcall SCardIntroduceReaderW(long wstr 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 SCardListReaderGroupsA(long str ptr) +@ stdcall SCardListReaderGroupsW(long wstr ptr) +@ stdcall SCardListReadersA(long str str ptr) +@ stdcall SCardListReadersW(long wstr wstr ptr) +@ stdcall SCardLocateCardsA(long str ptr long) +@ stdcall SCardLocateCardsByATRA(long ptr long ptr long) +@ stdcall SCardLocateCardsByATRW(long ptr long ptr long) +@ stdcall SCardLocateCardsW(long wstr ptr long) +@ stdcall SCardReconnect(long long long long ptr) +@ stdcall SCardReleaseContext(long) +@ 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 diff --git a/include/Makefile.in b/include/Makefile.in index 2577872..7dc0cc3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -293,6 +293,7 @@ SRCDIR_INCLUDES = \ rpcndr.h \ rpcnterr.h \ rpcproxy.h \ + scarderr.h \ schannel.h \ schemadef.h \ schnlsp.h \ @@ -351,6 +352,8 @@ SRCDIR_INCLUDES = \ winreg.h \ winres.h \ winresrc.h \ + winscard.h \ + winsmcrd.h \ winsock.h \ winsock2.h \ winspool.h \ diff --git a/include/scarderr.h b/include/scarderr.h new file mode 100755 index 0000000..b956b6d --- /dev/null +++ b/include/scarderr.h @@ -0,0 +1,111 @@ +/* + * 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 + */ + + +#ifndef _WINE_SCARDERR_H +#define _WINE_SCARDERR_H + + + +#define SCARD_S_SUCCESS 0x00000000 +#define SCARD_F_INTERNAL_ERROR 0x80100001 /**< An internal consistency check failed. */ +#define SCARD_E_CANCELLED 0x80100002 /**< The action was cancelled by an SCardCancel request. */ +#define SCARD_E_INVALID_HANDLE 0x80100003 /**< The supplied handle was invalid. */ +#define SCARD_E_INVALID_PARAMETER 0x80100004 /**< One or more of the supplied parameters could not be properly interpreted. */ +#define SCARD_E_INVALID_TARGET 0x80100005 /**< Registry startup information is missing or invalid. */ +#define SCARD_E_NO_MEMORY 0x80100006 /**< Not enough memory available to complete this command. */ +#define SCARD_F_WAITED_TOO_LONG 0x80100007 /**< An internal consistency timer has expired. */ +#define SCARD_E_INSUFFICIENT_BUFFER 0x80100008 /**< The data buffer to receive returned data is too small for the returned data. */ +#define SCARD_E_UNKNOWN_READER 0x80100009 /**< The specified reader name is not recognized. */ +#define SCARD_E_TIMEOUT 0x8010000A /**< The user-specified timeout value has expired. */ +#define SCARD_E_SHARING_VIOLATION 0x8010000B /**< The smart card cannot be accessed because of other connections outstanding. */ + +#ifndef SCARD_E_NO_SMARTCARD +#define SCARD_E_NO_SMARTCARD 0x8010000C /**< The operation requires a Smart Card, but no Smart Card is currently in the device. */ +#endif + +#define SCARD_E_UNKNOWN_CARD 0x8010000D /**< The specified smart card name is not recognized. */ +#define SCARD_E_CANT_DISPOSE 0x8010000E /**< The system could not dispose of the media in the requested manner. */ +#define SCARD_E_PROTO_MISMATCH 0x8010000F /**< The requested protocols are incompatible with the protocol currently in use with the smart card. */ +#define SCARD_E_NOT_READY 0x80100010 /**< The reader or smart card is not ready to accept commands. */ +#define SCARD_E_INVALID_VALUE 0x80100011 /**< One or more of the supplied parameters values could not be properly interpreted. */ +#define SCARD_E_SYSTEM_CANCELLED 0x80100012 /**< The action was cancelled by the system, presumably to log off or shut down. */ +#define SCARD_F_COMM_ERROR 0x80100013 /**< An internal communications error has been detected. */ +#define SCARD_F_UNKNOWN_ERROR 0x80100014 /**< An internal error has been detected, but the source is unknown. */ +#define SCARD_E_INVALID_ATR 0x80100015 /**< An ATR obtained from the registry is not a valid ATR string. */ +#define SCARD_E_NOT_TRANSACTED 0x80100016 /**< An attempt was made to end a non-existent transaction. */ +#define SCARD_E_READER_UNAVAILABLE 0x80100017 /**< The specified reader is not currently available for use. */ +#define SCARD_P_SHUTDOWN 0x80100018/**The operation has been aborted to allow the server application to exit.*/ +#define SCARD_E_PCI_TOO_SMALL 0x80100019 /**< The PCI Receive buffer was too small. */ +#define SCARD_E_READER_UNSUPPORTED 0x8010001A /**< The reader driver does not meet minimal requirements for support. */ +#define SCARD_E_DUPLICATE_READER 0x8010001B /**< The reader driver did not produce a unique reader name. */ +#define SCARD_E_CARD_UNSUPPORTED 0x8010001C /**< The smart card does not meet minimal requirements for support. */ +#define SCARD_E_NO_SERVICE 0x8010001D /**< The Smart card resource manager is not running. */ +#define SCARD_E_SERVICE_STOPPED 0x8010001E /**< The Smart card resource manager has shut down. */ +#define SCARD_E_UNEXPECTED 0x8010001F /** An unexpected card error has occurred. */ +#define SCARD_E_ICC_INSTALLATION 0x80100020 /** No Primary Provider can be found for the smart card.*/ +#define SCARD_E_ICC_CREATEORDER 0x80100021 /** The requested order of object creation is not supported.*/ +#define SCARD_E_UNSUPPORTED_FEATURE 0x80100022 /** This smart card does not support the requested feature.*/ +#define SCARD_E_DIR_NOT_FOUND 0x80100023 /** The identified directory does not exist in the smart card. */ +#define SCARD_E_FILE_NOT_FOUND 0x80100024 /** The identified file does not exist in the smart card.*/ +#define SCARD_E_NO_DIR 0x80100025 /** The supplied path does not represent a smart card directory.*/ +#define SCARD_E_NO_FILE 0x80100026 /** The supplied path does not represent a smart card file.*/ +#define SCARD_E_NO_ACCESS 0x80100027 /** Access is denied to this file.*/ +#define SCARD_E_WRITE_TOO_MANY 0x80100028 /** The smartcard does not have enough memory to store the information.*/ +#define SCARD_E_BAD_SEEK 0x80100029 /** There was an error trying to set the smart card file object pointer.*/ +#define SCARD_E_INVALID_CHV 0x8010002A /** The supplied PIN is incorrect.*/ +#define SCARD_E_UNKNOWN_RES_MNG 0x8010002B /** An unrecognized error code was returned from a layered component.*/ + +#ifndef SCARD_E_NO_SUCH_CERTIFICATE +#define SCARD_E_NO_SUCH_CERTIFICATE 0x8010002C /** The requested certificate does not exist.*/ +#endif + +#define SCARD_E_CERTIFICATE_UNAVAILABLE 0x8010002D /** The requested certificate could not be obtained.*/ +#define SCARD_E_NO_READERS_AVAILABLE 0x8010002E /**< Cannot find a smart card reader. */ + +#ifndef SCARD_E_COMM_DATA_LOST +#define SCARD_E_COMM_DATA_LOST 0x8010002F /** A communications error with the smart card has been detected. Retry the operation.*/ +#endif + +#define SCARD_E_NO_KEY_CONTAINER 0x80100030 /** The requested key container does not exist on the smart card. */ +#define SCARD_E_SERVER_TOO_BUSY 0x80100031 /** The Smart card resource manager is too busy to complete this operation. */ + +#define SCARD_W_UNSUPPORTED_CARD 0x80100065 /**< The reader cannot communicate with the card, due to ATR string configuration conflicts. */ +#define SCARD_W_UNRESPONSIVE_CARD 0x80100066 /**< The smart card is not responding to a reset. */ +#define SCARD_W_UNPOWERED_CARD 0x80100067 /**< Power has been removed from the smart card, so that further communication is not possible. */ +#define SCARD_W_RESET_CARD 0x80100068 /**< The smart card has been reset, so any shared state information is invalid. */ +#define SCARD_W_REMOVED_CARD 0x80100069 /**< The smart card has been removed, so further communication is not possible. */ +#define SCARD_W_SECURITY_VIOLATION 0x8010006A /** Access was denied because of a security violation.*/ + +#ifndef SCARD_W_WRONG_CHV +#define SCARD_W_WRONG_CHV 0x8010006B /** The card cannot be accessed because the wrong PIN was presented.*/ +#endif + +#ifndef SCARD_W_CHV_BLOCKED +#define SCARD_W_CHV_BLOCKED 0x8010006C /** The card cannot be accessed because the maximum number of PIN entry attempts has been reached.*/ +#endif + +#define SCARD_W_EOF 0x8010006D /** The end of the smart card file has been reached.*/ +#define SCARD_W_CANCELLED_BY_USER 0x8010006E /** The action was cancelled by the user.*/ + +#ifndef SCARD_W_CARD_NOT_AUTHENTICATED +#define SCARD_W_CARD_NOT_AUTHENTICATED 0x8010006F /**No PIN was presented to the smart card.*/ +#endif + + +#endif diff --git a/include/winscard.h b/include/winscard.h new file mode 100755 index 0000000..bf1fe8a --- /dev/null +++ b/include/winscard.h @@ -0,0 +1,381 @@ +/* + * 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 + */ + + + +#ifndef _WINE_WINSCARD_H +#define _WINE_WINSCARD_H + +#include "winsmcrd.h" +#include "scarderr.h" + +extern SCARD_IO_REQUEST g_rgSCardT0Pci; +extern SCARD_IO_REQUEST g_rgSCardT1Pci; +extern SCARD_IO_REQUEST g_rgSCardRawPci; + +#define SCARD_PCI_T0 (&g_rgSCardT0Pci) +#define SCARD_PCI_T1 (&g_rgSCardT1Pci) +#define SCARD_PCI_RAW (&g_rgSCardRawPci) + +#ifdef __cplusplus +extern "C" { +#endif + + +LONG WINAPI SCardEstablishContext(DWORD dwScope,LPCVOID pvReserved1, LPCVOID pvReserved2, LPSCARDCONTEXT phContext); + +LONG WINAPI SCardReleaseContext(SCARDCONTEXT hContext); + +LONG WINAPI SCardIsValidContext(SCARDCONTEXT hContext); + + +LONG WINAPI SCardListReaderGroupsA( + SCARDCONTEXT hContext, + LPSTR mszGroups, + LPDWORD pcchGroups); +LONG WINAPI SCardListReaderGroupsW( + SCARDCONTEXT hContext, + LPWSTR mszGroups, + LPDWORD pcchGroups); + +#define SCardListReaderGroups WINELIB_NAME_AW(SCardListReaderGroups) + + +LONG WINAPI SCardListReadersA( + SCARDCONTEXT hContext, + LPCSTR mszGroups, + LPSTR mszReaders, + LPDWORD pcchReaders); +LONG WINAPI SCardListReadersW( + SCARDCONTEXT hContext, + LPCWSTR mszGroups, + LPWSTR mszReaders, + LPDWORD pcchReaders); + +#define SCardListReaders WINELIB_NAME_AW(SCardListReaders) + +LONG WINAPI SCardListCardsA( + SCARDCONTEXT hContext, + const BYTE* pbAtr, + LPCGUID rgquidInterfaces, + DWORD cguidInterfaceCount, + LPSTR mszCards, + LPDWORD pcchCards); +LONG WINAPI SCardListCardsW( + SCARDCONTEXT hContext, + const BYTE* pbAtr, + LPCGUID rgquidInterfaces, + DWORD cguidInterfaceCount, + LPWSTR mszCards, + LPDWORD pcchCards); + +#define SCardListCards WINELIB_NAME_AW(SCardListCards) + +LONG WINAPI SCardListInterfacesA( + SCARDCONTEXT hContext, + LPCSTR szCard, + LPGUID pguidInterfaces, + LPDWORD pcguidInterfaces); +LONG WINAPI SCardListInterfacesW( + SCARDCONTEXT hContext, + LPCWSTR szCard, + LPGUID pguidInterfaces, + LPDWORD pcguidInterfaces); + +#define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) + +LONG WINAPI SCardGetProviderIdA( + SCARDCONTEXT hContext, + LPCSTR szCard, + LPGUID pguidProviderId); +LONG WINAPI SCardGetProviderIdW( + SCARDCONTEXT hContext, + LPCWSTR szCard, + LPGUID pguidProviderId); + +#define SCardGetProviderId WINELIB_NAME_AW(SCardGetProviderId) + +LONG WINAPI SCardGetCardTypeProviderNameA( + SCARDCONTEXT hContext, + LPCSTR szCardName, + DWORD dwProviderId, + LPSTR szProvider, + LPDWORD pcchProvider); +LONG WINAPI SCardGetCardTypeProviderNameW( + SCARDCONTEXT hContext, + LPCWSTR szCardName, + DWORD dwProviderId, + LPWSTR szProvider, + LPDWORD pcchProvider); + +#define SCardGetCardTypeProviderName WINELIB_NAME_AW(SCardGetCardTypeProviderName) + +// +// Database functions +// + +LONG WINAPI SCardIntroduceReaderGroupA( + SCARDCONTEXT hContext, + LPCSTR szGroupName); +LONG WINAPI SCardIntroduceReaderGroupW( + SCARDCONTEXT hContext, + LPCWSTR szGroupName); + +#define SCardIntroduceReaderGroup WINELIB_NAME_AW(SCardIntroduceReaderGroup) + +LONG WINAPI SCardForgetReaderGroupA( + SCARDCONTEXT hContext, + LPCSTR szGroupName); +LONG WINAPI SCardForgetReaderGroupW( + SCARDCONTEXT hContext, + LPCWSTR szGroupName); + +#define SCardForgetReaderGroup WINELIB_NAME_AW(SCardForgetReaderGroup) + + +LONG WINAPI SCardIntroduceReaderA( + SCARDCONTEXT hContext, + LPCSTR szReaderName, + LPCSTR szDeviceName); +LONG WINAPI SCardIntroduceReaderW( + SCARDCONTEXT hContext, + LPCWSTR szReaderName, + LPCWSTR szDeviceName); + +#define SCardIntroduceReader WINELIB_NAME_AW(SCardIntroduceReader) + +LONG WINAPI SCardForgetReaderA( + SCARDCONTEXT hContext, + LPCSTR szReaderName); +LONG WINAPI SCardForgetReaderW( + SCARDCONTEXT hContext, + LPCWSTR szReaderName); + +#define SCardForgetReader WINELIB_NAME_AW(SCardForgetReader) + +LONG WINAPI SCardAddReaderToGroupA( + SCARDCONTEXT hContext, + LPCSTR szReaderName, + LPCSTR szGroupName); +LONG WINAPI SCardAddReaderToGroupW( + SCARDCONTEXT hContext, + LPCWSTR szReaderName, + LPCWSTR szGroupName); + +#define SCardAddReaderToGroup WINELIB_NAME_AW(SCardAddReaderToGroup) + +LONG WINAPI SCardRemoveReaderFromGroupA( + SCARDCONTEXT hContext, + LPCSTR szReaderName, + LPCSTR szGroupName); +LONG WINAPI SCardRemoveReaderFromGroupW( + SCARDCONTEXT hContext, + LPCWSTR szReaderName, + LPCWSTR szGroupName); + +#define SCardRemoveReaderFromGroup WINELIB_NAME_AW(SCardRemoveReaderFromGroup) + +LONG WINAPI SCardIntroduceCardTypeA( + SCARDCONTEXT hContext, + LPCSTR szCardName, + LPCGUID pguidPrimaryProvider, + LPCGUID rgguidInterfaces, + DWORD dwInterfaceCount, + const BYTE* pbAtr, + const BYTE* pbAtrMask, + DWORD cbAtrLen); +LONG WINAPI SCardIntroduceCardTypeW( + SCARDCONTEXT hContext, + LPCWSTR szCardName, + LPCGUID pguidPrimaryProvider, + LPCGUID rgguidInterfaces, + DWORD dwInterfaceCount, + const BYTE* pbAtr, + const BYTE* pbAtrMask, + DWORD cbAtrLen); + +#define SCardIntroduceCardType WINELIB_NAME_AW(SCardIntroduceCardType) + +LONG WINAPI SCardSetCardTypeProviderNameA( + SCARDCONTEXT hContext, + LPCSTR szCardName, + DWORD dwProviderId, + LPCSTR szProvider); +LONG WINAPI SCardSetCardTypeProviderNameW( + SCARDCONTEXT hContext, + LPCWSTR szCardName, + DWORD dwProviderId, + LPCWSTR szProvider); + +#define SCardSetCardTypeProviderName WINELIB_NAME_AW(SCardSetCardTypeProviderName) + +LONG WINAPI SCardForgetCardTypeA( + SCARDCONTEXT hContext, + LPCSTR szCardName); +LONG WINAPI SCardForgetCardTypeW( + SCARDCONTEXT hContext, + LPCWSTR szCardName); + +#define SCardForgetCardType WINELIB_NAME_AW(SCardForgetCardType) + +LONG WINAPI SCardLocateCardsA( + SCARDCONTEXT hContext, + LPCSTR mszCards, + LPSCARD_READERSTATEA rgReaderStates, + DWORD cReaders); +LONG WINAPI SCardLocateCardsW( + SCARDCONTEXT hContext, + LPCWSTR mszCards, + LPSCARD_READERSTATEW rgReaderStates, + DWORD cReaders); + +#define SCardLocateCards WINELIB_NAME_AW(SCardLocateCards) + +LONG WINAPI SCardLocateCardsByATRA( + SCARDCONTEXT hContext, + LPSCARD_ATRMASK rgAtrMasks, + DWORD cAtrs, + LPSCARD_READERSTATEA rgReaderStates, + DWORD cReaders); +LONG WINAPI SCardLocateCardsByATRW( + SCARDCONTEXT hContext, + LPSCARD_ATRMASK rgAtrMasks, + DWORD cAtrs, + LPSCARD_READERSTATEW rgReaderStates, + DWORD cReaders); + +#define SCardLocateCardsByATR WINELIB_NAME_AW(SCardLocateCardsByATR) + +/* + * Service Manager Support Routines + */ + +LONG WINAPI SCardFreeMemory( SCARDCONTEXT hContext,LPCVOID pvMem); + +HANDLE WINAPI SCardAccessStartedEvent(void); + +void WINAPI SCardReleaseStartedEvent(HANDLE hStartedEventHandle); + + +LONG WINAPI SCardConnectA(SCARDCONTEXT hContext, + LPCSTR szReader, + DWORD dwShareMode, + DWORD dwPreferredProtocols, + LPSCARDHANDLE phCard, + LPDWORD pdwActiveProtocol); +LONG WINAPI SCardConnectW(SCARDCONTEXT hContext, + LPCWSTR szReader, + DWORD dwShareMode, + DWORD dwPreferredProtocols, + LPSCARDHANDLE phCard, + LPDWORD pdwActiveProtocol); + +#define SCardConnect WINELIB_NAME_AW(SCardConnect) + +LONG WINAPI SCardReconnect(SCARDHANDLE hCard, + DWORD dwShareMode, + DWORD dwPreferredProtocols, + DWORD dwInitialization, + LPDWORD pdwActiveProtocol); + +LONG WINAPI SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition); + +LONG WINAPI SCardBeginTransaction(SCARDHANDLE hCard); + +LONG WINAPI SCardEndTransaction(SCARDHANDLE hCard, DWORD dwDisposition); + +LONG WINAPI SCardCancelTransaction(SCARDHANDLE hCard); + +LONG WINAPI SCardState( + SCARDHANDLE hCard, + LPDWORD pdwState, + LPDWORD pdwProtocol, + LPBYTE pbAtr, + LPDWORD pcbAtrLen); + +LONG WINAPI SCardStatusA( + SCARDHANDLE hCard, + LPSTR mszReaderNames, + LPDWORD pcchReaderLen, + LPDWORD pdwState, + LPDWORD pdwProtocol, + LPBYTE pbAtr, + LPDWORD pcbAtrLen); +LONG WINAPI SCardStatusW( + SCARDHANDLE hCard, + LPWSTR mszReaderNames, + LPDWORD pcchReaderLen, + LPDWORD pdwState, + LPDWORD pdwProtocol, + LPBYTE pbAtr, + LPDWORD pcbAtrLen); + +#define SCardStatus WINELIB_NAME_AW(SCardStatus) + +LONG WINAPI SCardGetStatusChangeA( + SCARDCONTEXT hContext, + DWORD dwTimeout, + LPSCARD_READERSTATEA rgReaderStates, + DWORD cReaders); +LONG WINAPI SCardGetStatusChangeW( + SCARDCONTEXT hContext, + DWORD dwTimeout, + LPSCARD_READERSTATEW rgReaderStates, + DWORD cReaders); + +#define SCardGetStatusChange WINELIB_NAME_AW(SCardGetStatusChange) + +LONG WINAPI SCardControl( + SCARDHANDLE hCard, + DWORD dwControlCode, + LPCVOID pbSendBuffer, + DWORD cbSendLength, + LPVOID pbRecvBuffer, + DWORD cbRecvLength, + LPDWORD lpBytesReturned); + +LONG WINAPI SCardTransmit( + SCARDHANDLE hCard, + LPCSCARD_IO_REQUEST pioSendPci, + const BYTE* pbSendBuffer, + DWORD cbSendLength, + LPSCARD_IO_REQUEST pioRecvPci, + LPBYTE pbRecvBuffer, + LPDWORD pcbRecvLength); + +LONG WINAPI SCardCancel(SCARDCONTEXT hContext); + +LONG WINAPI SCardGetAttrib( + SCARDHANDLE hCard, + DWORD dwAttrId, + LPBYTE pbAttr, + LPDWORD pcbAttrLen); + +LONG WINAPI SCardSetAttrib( + SCARDHANDLE hCard, + DWORD dwAttrId, + const BYTE* pbAttr, + DWORD cbAttrLen); + + +#ifdef __cplusplus +} +#endif + +#endif + diff --git a/include/winsmcrd.h b/include/winsmcrd.h new file mode 100755 index 0000000..ccef4a3 --- /dev/null +++ b/include/winsmcrd.h @@ -0,0 +1,207 @@ +/* + * 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 + */ + + +#ifndef _WINE_WINSCMCRD_H +#define _WINE_WINSCMCRD_H + + +#define MAX_ATR_SIZE 36 /**< Maximum ATR size */ + +#ifndef SCARD_ATR_LENGTH +#define SCARD_ATR_LENGTH MAX_ATR_SIZE /**< Maximum ATR size */ +#endif + + +#define SCARD_PROTOCOL_UNDEFINED 0x00000000 // There is no active protocol. +#define SCARD_PROTOCOL_T0 0x00000001 // T=0 is the active protocol. +#define SCARD_PROTOCOL_T1 0x00000002 // T=1 is the active protocol. +#define SCARD_PROTOCOL_RAW 0x00010000 // Raw is the active protocol. +#define SCARD_PROTOCOL_Tx (SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1) + +#define SCARD_AUTOALLOCATE (DWORD)(-1) + +#define SCARD_SCOPE_USER 0x0000 /**< Scope in user space */ +#define SCARD_SCOPE_TERMINAL 0x0001 /**< Scope in terminal */ +#define SCARD_SCOPE_SYSTEM 0x0002 /**< Scope in system */ + +#define SCARD_STATE_UNAWARE 0x0000 /**< App wants status */ +#define SCARD_STATE_IGNORE 0x0001 /**< Ignore this reader */ +#define SCARD_STATE_CHANGED 0x0002 /**< State has changed */ +#define SCARD_STATE_UNKNOWN 0x0004 /**< Reader unknown */ +#define SCARD_STATE_UNAVAILABLE 0x0008 /**< Status unavailable */ +#define SCARD_STATE_EMPTY 0x0010 /**< Card removed */ +#define SCARD_STATE_PRESENT 0x0020 /**< Card inserted */ +#define SCARD_STATE_ATRMATCH 0x0040 /**< ATR matches card */ +#define SCARD_STATE_EXCLUSIVE 0x0080 /**< Exclusive Mode */ +#define SCARD_STATE_INUSE 0x0100 /**< Shared Mode */ +#define SCARD_STATE_MUTE 0x0200 /**< Unresponsive card */ +#define SCARD_STATE_UNPOWERED 0x0400 /**< Unpowered card */ + + + +#define SCARD_SHARE_EXCLUSIVE 0x0001 /**< Exclusive mode only */ +#define SCARD_SHARE_SHARED 0x0002 /**< Shared mode only */ +#define SCARD_SHARE_DIRECT 0x0003 /**< Raw mode only */ + +#define SCARD_LEAVE_CARD 0x0000 /**< Do nothing on close */ +#define SCARD_RESET_CARD 0x0001 /**< Reset on close */ +#define SCARD_UNPOWER_CARD 0x0002 /**< Power down on close */ +#define SCARD_EJECT_CARD 0x0003 /**< Eject on close */ + +#define SCARD_UNKNOWN 0x0001 /**< Unknown state */ +#define SCARD_ABSENT 0x0002 /**< Card is absent */ +#define SCARD_PRESENT 0x0004 /**< Card is present */ +#define SCARD_SWALLOWED 0x0008 /**< Card not powered */ +#define SCARD_POWERED 0x0010 /**< Card is powered */ +#define SCARD_NEGOTIABLE 0x0020 /**< Ready for PTS */ +#define SCARD_SPECIFIC 0x0040 /**< PTS has been set */ + +/* + * Tags for requesting card and reader attributes + */ + +#define SCARD_ATTR_VALUE(Class, Tag) ((((ULONG)(Class)) << 16) | ((ULONG)(Tag))) + +#define SCARD_CLASS_VENDOR_INFO 1 /**< Vendor information definitions */ +#define SCARD_CLASS_COMMUNICATIONS 2 /**< Communication definitions */ +#define SCARD_CLASS_PROTOCOL 3 /**< Protocol definitions */ +#define SCARD_CLASS_POWER_MGMT 4 /**< Power Management definitions */ +#define SCARD_CLASS_SECURITY 5 /**< Security Assurance definitions */ +#define SCARD_CLASS_MECHANICAL 6 /**< Mechanical characteristic definitions */ +#define SCARD_CLASS_VENDOR_DEFINED 7 /**< Vendor specific definitions */ +#define SCARD_CLASS_IFD_PROTOCOL 8 /**< Interface Device Protocol options */ +#define SCARD_CLASS_ICC_STATE 9 /**< ICC State specific definitions */ +#define SCARD_CLASS_SYSTEM 0x7fff /**< System-specific definitions */ + +#define SCARD_ATTR_VENDOR_NAME SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0100) +#define SCARD_ATTR_VENDOR_IFD_TYPE SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0101) +#define SCARD_ATTR_VENDOR_IFD_VERSION SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0102) +#define SCARD_ATTR_VENDOR_IFD_SERIAL_NO SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_INFO, 0x0103) +#define SCARD_ATTR_CHANNEL_ID SCARD_ATTR_VALUE(SCARD_CLASS_COMMUNICATIONS, 0x0110) +#define SCARD_ATTR_ASYNC_PROTOCOL_TYPES SCARD_ATTR_VALUE(SCARD_CLASS_PROTOCOL, 0x0120) +#define SCARD_ATTR_DEFAULT_CLK SCARD_ATTR_VALUE(SCARD_CLASS_PROTOCOL, 0x0121) +#define SCARD_ATTR_MAX_CLK SCARD_ATTR_VALUE(SCARD_CLASS_PROTOCOL, 0x0122) +#define SCARD_ATTR_DEFAULT_DATA_RATE SCARD_ATTR_VALUE(SCARD_CLASS_PROTOCOL, 0x0123) +#define SCARD_ATTR_MAX_DATA_RATE SCARD_ATTR_VALUE(SCARD_CLASS_PROTOCOL, 0x0124) +#define SCARD_ATTR_MAX_IFSD SCARD_ATTR_VALUE(SCARD_CLASS_PROTOCOL, 0x0125) +#define SCARD_ATTR_SYNC_PROTOCOL_TYPES SCARD_ATTR_VALUE(SCARD_CLASS_PROTOCOL, 0x0126) +#define SCARD_ATTR_POWER_MGMT_SUPPORT SCARD_ATTR_VALUE(SCARD_CLASS_POWER_MGMT, 0x0131) +#define SCARD_ATTR_USER_TO_CARD_AUTH_DEVICE SCARD_ATTR_VALUE(SCARD_CLASS_SECURITY, 0x0140) +#define SCARD_ATTR_USER_AUTH_INPUT_DEVICE SCARD_ATTR_VALUE(SCARD_CLASS_SECURITY, 0x0142) +#define SCARD_ATTR_CHARACTERISTICS SCARD_ATTR_VALUE(SCARD_CLASS_MECHANICAL, 0x0150) + +#define SCARD_ATTR_CURRENT_PROTOCOL_TYPE SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x0201) +#define SCARD_ATTR_CURRENT_CLK SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x0202) +#define SCARD_ATTR_CURRENT_F SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x0203) +#define SCARD_ATTR_CURRENT_D SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x0204) +#define SCARD_ATTR_CURRENT_N SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x0205) +#define SCARD_ATTR_CURRENT_W SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x0206) +#define SCARD_ATTR_CURRENT_IFSC SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x0207) +#define SCARD_ATTR_CURRENT_IFSD SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x0208) +#define SCARD_ATTR_CURRENT_BWT SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x0209) +#define SCARD_ATTR_CURRENT_CWT SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x020a) +#define SCARD_ATTR_CURRENT_EBC_ENCODING SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x020b) +#define SCARD_ATTR_EXTENDED_BWT SCARD_ATTR_VALUE(SCARD_CLASS_IFD_PROTOCOL, 0x020c) + +#define SCARD_ATTR_ICC_PRESENCE SCARD_ATTR_VALUE(SCARD_CLASS_ICC_STATE, 0x0300) +#define SCARD_ATTR_ICC_INTERFACE_STATUS SCARD_ATTR_VALUE(SCARD_CLASS_ICC_STATE, 0x0301) +#define SCARD_ATTR_CURRENT_IO_STATE SCARD_ATTR_VALUE(SCARD_CLASS_ICC_STATE, 0x0302) +#define SCARD_ATTR_ATR_STRING SCARD_ATTR_VALUE(SCARD_CLASS_ICC_STATE, 0x0303) +#define SCARD_ATTR_ICC_TYPE_PER_ATR SCARD_ATTR_VALUE(SCARD_CLASS_ICC_STATE, 0x0304) + +#define SCARD_ATTR_ESC_RESET SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_DEFINED, 0xA000) +#define SCARD_ATTR_ESC_CANCEL SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_DEFINED, 0xA003) +#define SCARD_ATTR_ESC_AUTHREQUEST SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_DEFINED, 0xA005) +#define SCARD_ATTR_MAXINPUT SCARD_ATTR_VALUE(SCARD_CLASS_VENDOR_DEFINED, 0xA007) + +#define SCARD_ATTR_DEVICE_UNIT SCARD_ATTR_VALUE(SCARD_CLASS_SYSTEM, 0x0001) +#define SCARD_ATTR_DEVICE_IN_USE SCARD_ATTR_VALUE(SCARD_CLASS_SYSTEM, 0x0002) +#define SCARD_ATTR_DEVICE_FRIENDLY_NAME_A SCARD_ATTR_VALUE(SCARD_CLASS_SYSTEM, 0x0003) +#define SCARD_ATTR_DEVICE_SYSTEM_NAME_A SCARD_ATTR_VALUE(SCARD_CLASS_SYSTEM, 0x0004) +#define SCARD_ATTR_DEVICE_FRIENDLY_NAME_W SCARD_ATTR_VALUE(SCARD_CLASS_SYSTEM, 0x0005) +#define SCARD_ATTR_DEVICE_SYSTEM_NAME_W SCARD_ATTR_VALUE(SCARD_CLASS_SYSTEM, 0x0006) +#define SCARD_ATTR_SUPRESS_T1_IFS_REQUEST SCARD_ATTR_VALUE(SCARD_CLASS_SYSTEM, 0x0007) + + +#define SCARD_ATTR_DEVICE_FRIENDLY_NAME WINELIB_NAME_AW(SCARD_ATTR_DEVICE_FRIENDLY_NAME_) +#define SCARD_ATTR_DEVICE_SYSTEM_NAME WINELIB_NAME_AW(SCARD_ATTR_DEVICE_SYSTEM_NAME_) + +typedef long SCARDCONTEXT; +typedef SCARDCONTEXT *PSCARDCONTEXT; +typedef SCARDCONTEXT *LPSCARDCONTEXT; +typedef long SCARDHANDLE; +typedef SCARDHANDLE *PSCARDHANDLE; +typedef SCARDHANDLE *LPSCARDHANDLE; + +typedef struct +{ + LPCSTR szReader; + void *pvUserData; + unsigned long dwCurrentState; + unsigned long dwEventState; + unsigned long cbAtr; + unsigned char rgbAtr[MAX_ATR_SIZE]; +} +SCARD_READERSTATEA; + +typedef struct +{ + LPCWSTR szReader; + void *pvUserData; + unsigned long dwCurrentState; + unsigned long dwEventState; + unsigned long cbAtr; + unsigned char rgbAtr[MAX_ATR_SIZE]; +} +SCARD_READERSTATEW; + +typedef SCARD_READERSTATEA *PSCARD_READERSTATEA, *LPSCARD_READERSTATEA; + +typedef SCARD_READERSTATEW *PSCARD_READERSTATEW, *LPSCARD_READERSTATEW; + +DECL_WINELIB_TYPE_AW(SCARD_READERSTATE) +DECL_WINELIB_TYPE_AW(PSCARD_READERSTATE) +DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE) + +// Backwards compatibility macros +#define SCARD_READERSTATE_A SCARD_READERSTATEA +#define SCARD_READERSTATE_W SCARD_READERSTATEW +#define PSCARD_READERSTATE_A PSCARD_READERSTATEA +#define PSCARD_READERSTATE_W PSCARD_READERSTATEW +#define LPSCARD_READERSTATE_A LPSCARD_READERSTATEA +#define LPSCARD_READERSTATE_W LPSCARD_READERSTATEW + +typedef struct _SCARD_IO_REQUEST +{ + unsigned long dwProtocol; /* Protocol identifier */ + unsigned long cbPciLength; /* Protocol Control Inf Length */ +} +SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; + +typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; + +typedef struct _SCARD_ATRMASK { + DWORD cbAtr; // Number of bytes in the ATR and the mask. + BYTE rgbAtr[36]; // Atr of card (extra alignment bytes) + BYTE rgbMask[36]; // Mask for the Atr (extra alignment bytes) +} SCARD_ATRMASK, *PSCARD_ATRMASK, *LPSCARD_ATRMASK; + + +#endif + -- 1.4.4.2

4 15

Re: dbghelp[2]: Speed up vector_add. Remove no longer needed pool_realloc.
by Detlef Riekenberg 07 May '07

07 May '07

On Mo, 2007-05-07 at 05:46 +0200, Markus Amsler wrote: > + /* Don't even try to resize memory. Memory gain would be > minimal > + but speed hit significant with big vecotrs. * I have no Idea about the code, but found this Typo: vecotrs => vectors -- By by ... Detlef

1 0

Re: crypt32: fix a wrong test
by Laurent Vromman 07 May '07

07 May '07

> - ok(info->dwKeySpec == AT_SIGNATURE, > + ok(info->dwKeySpec == (AT_SIGNATURE|AT_KEYEXCHANGE), > "Expected AT_SIGNATURE, got %d\n", info->dwKeySpec); It could be a good idea to correct the error text "Expected AT_SIGNATURE" to add AT_KEYEXCHANGE in it. Laurent Vromman On Mon, 07 May 2007 16:05:35 +0200, Mounir IDRASSI <mounir.idrassi(a)idrix.fr> wrote: > Hi, > This patch corrects a test in crypt32 that was incorrectly written to > accommodate the bug in rsaenh dll we corrected in our previous patch. > > Mounir IDRASSI > IDRIX - Cryptography and IT Security Experts > http://www.idrix.fr > > >

1 0

crypt32: fix a wrong test
by Mounir IDRASSI 07 May '07

07 May '07

Hi, In the tests of the crypt32 dll, a test was written in a way that accommodates the bug we have corrected previously in the patch for rsaenh dll. The attached small patch corrects the value expected from this test to be consistent with the correct output. Cheers, Mounir IDRASSI IDRIX - Cryptography and IT Security Experts http://www.idrix.fr >From b2059ab820a37ef3129cd52c4a4048c9081d3bb9 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Mon, 7 May 2007 15:33:36 +0200 Subject: crypt32: fix a wrong test --- dlls/crypt32/tests/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 345c9f5..bec65de 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1212,7 +1212,7 @@ static void testCreateSelfSignCert(void) "Unexpected key container\n"); ok(!lstrcmpW(info->pwszProvName, MS_DEF_PROV_W), "Unexpected provider\n"); - ok(info->dwKeySpec == AT_SIGNATURE, + ok(info->dwKeySpec == (AT_SIGNATURE|AT_KEYEXCHANGE), "Expected AT_SIGNATURE, got %d\n", info->dwKeySpec); } HeapFree(GetProcessHeap(), 0, info); -- 1.4.4.2

1 0

[try 2] Move console input/output codepages to server - what's wrong?
by Kirill K. Smirnov 07 May '07

07 May '07

Hi, A week ago I've sent a patch which fixes console input/output codepages handling. http://www.winehq.org/pipermail/wine-patches/2007-April/038429.html It is still not applied, so please, explain, what is wrong with it? It even fixes 2 tests: $wine kernel32_test.exe.so process before: process: 510 tests executed (0 marked as todo, 6 failures), 0 skipped. after: process: 510 tests executed (0 marked as todo, 4 failures), 0 skipped. Thanks, -- Kirill

1 1

Can we catch access violation exceptions in tests?
by Mikołaj Zalewski 07 May '07

07 May '07

I'm trying to write a tests for invalid cbSize in Shell_NotifyIcon. The behaviour under Windows XP is to assume in such a case that the size is NOTIFYICONDATA_V1_SIZE. AFAIK Shell_NotifyIcon doesn't provide a way to read icon data to check that the data introduced after Win95 is not modified. So I'm using VirtualAlloc+VirtualProtect to make Shell_NotifyIcon fail if it tries to access this data. I'd like to catch the exception to make a tests fail if something goes wrong instead of crashing the testsuite. However __try doesn't work under gcc and using wine/exception.h gives an unresolved symbol '__wine_handle_exception'. Is it possible to catch exceptions in tests? Mikolaj Zalewski

3 2

Re: Implements NET START to control system services
by Dmitry Timoshkov 07 May '07

07 May '07

"Tim Schwartz" <tim(a)sanityinternet.com> wrote: > #include <stdio.h> > #include <string.h> > +#include <windows.h> > + > +int net_service(char *operation, char *service_name); It's better to properly arrange the code to avoid forward declarations. > +int net_service(char *operation, char *service_name) > +{ > + SC_HANDLE SCManager, serviceHandle; > + int result = 0; > + char service_display_name[4096]; service_display_name should be queried and dynamically allocated. > + > + SCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); > + if(!SCManager) > + { > + printf("Couldn't get handle to SCManager.\n"); > + return 0; > + } > + serviceHandle = OpenService(SCManager, service_name, > SC_MANAGER_ALL_ACCESS); > + if(!serviceHandle) > + { > + printf("Couldn't get handle to service.\n"); > + return 0; > + } You are leaking SCManager handle here. > + > + if(!GetServiceDisplayName(SCManager, service_name, > service_display_name, NULL)) Are you sure that last parameter can be NULL here? MSDN seems to disagree. Also did you test your code under Windows? This kind of application can be and should be IMO developed/tested in Windows. > + if(!strcasecmp(operation, "start")) > + { > + printf("The %s service is starting.\n", service_display_name); > + result = StartService(serviceHandle,0,NULL); > + CloseServiceHandle(serviceHandle); > + if(!result) printf("The %s service failed to start.\n", > service_display_name); > + else printf("The %s service was started successfully.\n", > service_display_name); > + return result; > + } > + > + return 0; > } You are leaking the SCManager handle here as well, and both serviceHandle and SCManager are leaked if operation is not "start". Also the patch was wrapped by your mailer. -- Dmitry.

1 0

Re: [New]: Added wrapper dll for ct-api (CardTerminal API)
by Steven Edwards 07 May '07

07 May '07

I forgot to mention the inclusion of config.h and port.h should come before other headers in your source. Thanks Steven On 5/6/07, Christian Eggers <ceggers(a)gmx.de> wrote: > Hello, > > this wrapper dll permits access to chipcard readers which provides a ct-api (CardTerminal > API). > -- 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: [New]: Added wrapper dll for ct-api (CardTerminal API)
by Steven Edwards 07 May '07

07 May '07

On 5/6/07, Christian Eggers <ceggers(a)gmx.de> wrote: > Hello, > > this wrapper dll permits access to chipcard readers which provides a ct-api (CardTerminal It looks really good. A couple of quick comments for future patches. Please use a standard LGPL license header in your patch for the header, don't use C++ comments and you don't have to add a Changelog entry. Alexandre's patch tools automatically adds it from your email/changeset. 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: msi [3/4]: Set the text limit of the edit control if the limit isgiven
by Dmitry Timoshkov 07 May '07

07 May '07

"James Hawkins" <truiken(a)gmail.com> wrote: > + text = MSI_RecordGetString( rec, 10 ); > + if ( text ) > + { > + begin = strchrW( text, '{' ); > + end = strchrW( text, '}' ); Perhaps it would be cleaner to use end = strchrW( begin, '}' ); -- Dmitry.

1 0

Re: Fix keyboard focus issues
by Dmitry Timoshkov 07 May '07

07 May '07

"Bernhard Rosenkraenzer" <bero(a)arklinux.org> wrote: > The attached patch fixes bug #1798 (also known as 6986, 4042, 2819, 2149, and > 2926) -- some fullscreen applications not getting focus correctly. As I already pointed out in the bug using window/screen width in comparisons should allow to avoid that -1/+1 shift in left/top coordinate. -- Dmitry.

1 0

Old Autocad trials?
by Dan Kegel 06 May '07

06 May '07

http://wiki.winehq.org/LinuxApplicatonRequestSurvey says that Autocad is the #2 most requested application on Linux. The latest version might be a challenge to support, since it depends on .net 2.0, but we could start by supporting older versions. http://appdb.winehq.org/appview.php?iAppId=86 shows that R14 ran ok at one point, and I've seen a tutorial for how to run 2000 on wine, so there's hope. I couldn't find any source of Autocad R14 or '97, but looking on amazon.com I think books with trial CD-ROMs are available from autocad 2000 on (if only for LT and other hacked down variants, but I'm not picky). Before I go wild buying old autocad books from Amazon, does anyone out there have old copies of Autocad (full or trial) they'd be willing to send me for testing? Thanks, Dan -- Wine for Windows ISVs: http://kegel.com/wine/isv

3 3

Re: shell32: check cbSize in Shell_NotifyIconW to make apps sending garbage work (fixes bug #7940)
by Dmitry Timoshkov 06 May '07

06 May '07

"Mikolaj Zalewski" <mikolaj(a)zalewski.pl> wrote: > + /* The validation is also done in explorer. However we must also do it > + * on the client size so that WM_COPYDATA doesn't crash the application > + */ > + if (nid->cbSize != NOTIFYICONDATAW_V1_SIZE && > + nid->cbSize != NOTIFYICONDATAW_V2_SIZE && > + nid->cbSize != NOTIFYICONDATAW_V3_SIZE && > + nid->cbSize != sizeof(NOTIFYICONDATAW)) > + { > + WARN("Invalid size\n"); > + return FALSE; > + } Do you have a test case for this? -- Dmitry.

2 1

change generic.ppd file
by Alisson Gomes 06 May '07

06 May '07

Mrs, I do can recompile wine with change generic.ppd file? only change the generic.ppd? Or exist a version of wine i can configure? thanks, Alisson Gomes

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel