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

Re: Adds NET START to net.exe
by Dmitry Timoshkov May 10, 2007

May 10, 2007

"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 May 10, 2007

May 10, 2007

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 May 10, 2007

May 10, 2007

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 May 10, 2007

May 10, 2007

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 May 10, 2007

May 10, 2007

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 May 10, 2007

May 10, 2007

+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 May 10, 2007

May 10, 2007

"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 May 10, 2007

May 10, 2007

"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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

"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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

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 May 9, 2007

May 9, 2007

"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 May 9, 2007

May 9, 2007

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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

"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 May 8, 2007

May 8, 2007

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 May 8, 2007

May 8, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

"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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

"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 May 7, 2007

May 7, 2007

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 + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/winscard/rsrc.rc b/dlls/winscard/rsrc.rc new file mode 100644 index 0000000..8226e9d --- /dev/null +++ b/dlls/winscard/rsrc.rc @@ -0,0 +1,33 @@ +/* + * Top level resource file for winscard.dll + * + * Copyright 2007 Mounir IDRASSI (mounir.idrassi(a)idrix.fr, for IDRIX) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winver.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Smart Card API" +#define WINE_FILENAME_STR "winscard.dll" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/winscard/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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

> - 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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

"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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

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 May 7, 2007

May 7, 2007

"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 May 7, 2007

May 7, 2007

"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 May 6, 2007

May 6, 2007

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 May 6, 2007

May 6, 2007

"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 May 6, 2007

May 6, 2007

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

Re: Console output with different codepages - the result.
by Kirill K. Smirnov May 6, 2007

May 6, 2007

> just a dummy question... does the different fonts your tests refer to > have all the glyphs required ? (or said differently, isn't this a font > issue about the required glyphs for russian ?) > A+ By default (in 866 OEM codepage) wine console renderer behaves just like windows does, the difference appears iff I change codepage to 1251 ANSI. So it is not missing glyphs problem - I do not change font while changing codepage. -- Kirill

1 0

dbghelp performance
by Markus Amsler May 6, 2007

May 6, 2007

I've played around with dbghelp performance. My test case was breaking at an unknown symbol (break gaga) while WoW was loaded in the debugger (wine winedbg WoW.exe). The time was hand stopped, memory usage measured with ps -AF and looked at the RSS column. Test Time(s) Memory Usage(MB) current git 4.5 54 pool_heap.patch 4.5 63 process_heap.patch 4.5 126 insert_first.patch 4.5 54 current git, r300 115 146 pool_heap.patch, r300 17 119 process_heap.patch, r300 17 260 insert_first.patch, r300 27 167 insert_first is the patch from Eric Pouech. r300 means with the debug version of Mesas r300_dri.so, which has a total compilation unit size of around 9.2M (compared to the second biggest Wines user32 with 1.1M). Conclusions: - current git wins with small debug files (<2M or so), pool_heap wins with bigger files. insert_first, process_heap are out. - small pools have less memory overhead than small heaps - big pools have more memory overhead than big heaps. - big pools are a lot slower than big heaps. IMO the best results would give removing the pools (like in process_heap) and freeing unused memory manually, the other way round it was allocated. But at a first glance it looks like quite a bit of work, which I'm not sure is worth the result. I think the best approach would be to code some destroy functions in storage.c which would free the allocated vector, sparse_array and hash_table memory. And then gradually replace pool_alloc calls with HeapAlloc/HeapFree pairs. Markus

2 6

Re: Initial Mixer support on Mac OS X (1/7)
by Maarten Lankhorst May 6, 2007

May 6, 2007

"Emmanuel Maillard" <mahanuu(a)free.fr> wrote: > Changelog : > - inital Mixer support on Mac OS X > - find all lines and initialize controls Looking through it you seemed to have used OSS as base, which means some of the comments on my earlier code also apply to your code: - 64 bits safety (use DWORD_PTR's) - the code that normalizes to 65535 should be changed by a MulDiv if possible. Also if coreaudio has a way to notify the sound driver that a mixer control has changed you might want to notify the program, see elem_callback in alsa's mixer, and alsa's mix_open. Cheers, Maarten

1 0

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

May 6, 2007

"Vitaly Budovski" <vbudovski(a)gmail.com> wrote: > Make use of the Triangle Inequality Nearest Neighbour algorithm to find the > nearest colour more efficiently than a simple linear search. The improvements > are most noticeable with a palette of 256 colours. Testing shows approximately > 3-4x performance increase for 256 colours. Now that you got rid of sqrt calls usage of float numbers internally doesn't look justified (to me) anymore. -- Dmitry.

1 0

InternetCanonicalizeURLA / W - Missing some flags?
by Chris Howe May 6, 2007

May 6, 2007

I noticed a FIXME cropping up in the logs when working on EQ2, related to InternetCanonicalizeURL not fully parsing the flags that it is called with. Looking a bit closer, it offloads the grunt work to UrlCanonicalize anyway, and the missing flags seem to have analogs defined for UrlCanonicalize to use, and adding support for them makes the message go away: no problems that I can see, either. However, I seem to be having trouble running the test for wininet, as it just hangs for me (before I made the alterations, that is)... would somebody care to check that the attatched patch is correct?

1 0

RE: Initial Mixer support on Mac OS X (2/7)
by Amy Fox May 6, 2007

May 6, 2007

oi >From: Emmanuel Maillard <mahanuu(a)free.fr> >Reply-To: wine-devel(a)winehq.org >To: wine-patches(a)winehq.org >Subject: Initial Mixer support on Mac OS X (2/7) >Date: Sun, 6 May 2007 11:53:48 +0200 > >Changelog : > - implement MIX_Open and MIX_GetNumDevs > ><< 0002-implement-MIX_Open-and-MIX_GetNumDevs.patch >> > _________________________________________________________________ Reserve your place in history - Email Britain! http://www.emailbritain.co.uk/

1 0

Re: winmm: Use a pipe for timer
by Steven Edwards May 6, 2007

May 6, 2007

Hi, On 5/5/07, Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > This avoids expensive server calls in a time critical timer. > > Without priority patch it drops stddev in winmm timer tests to < 2 ms as > compared to ~7 ms before. With priority patch it drops to < .20 ms. > > Backwards compatibility code is kept just in case. Even though backward compatibility is kept I worry about a couple of things. A lot of work was done on WinMM to make it portable to windows for testing and I don't like seeing new code to tie it back to unix even with the old code left in place. Also shouldn't there be a way to speed up the server performance instead? If this is accepted here then what about other areas of wine such as directx where timers similar may be used? Should we make this sort of patch global? I don't think so but then I don't know enough to no what the proper fix would be. 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

3 2

Writing an interactive test
by Andrew Riedi May 6, 2007

May 6, 2007

I would like to know if there is a way to write an interactive test for my cursor code (will add it to dlls/d3d9/tests). The biggest problem I am having is trying to keep a window drawn. Of course I could use sleep(), but then that soft-freezes my computer. I would like to make it part of our test-suite if possible. Perhaps I should use some sort of loop? Anyhow, thanks for any response. -- Andrew Riedi

1 0

Newbie question: WineLib DLLs
by Christian Eggers May 5, 2007

May 5, 2007

Hello, I've created a (very) simple wine dll as described in "Building WineLib DLLs". This dll is a wrapper for the "ct-api" interface used for chipcard readers [1]. With this dll it's possible to use HBCI chipcards (for german online banking, [2]) together with Windows homebanking applications (for example "StarMoney", [3]). Usage: card reader - ct-api driver (hw specific) - symlink (libctapi.so) - wine dll - Windows application Problem: The dll is linked against an external (non-wine) shared lib. How can my dll be integrated in wine without forcing other users to get the external library in order to compile wine? Regards Christian [1] https://www.secure.trusted-site.de/Download/CTAPI/CTAPI11EN.PDF [2] http://www.hbci-zka.de/english/index.htm [3] http://www.starmoney.de

2 1

RE: [PATCH 3/3] winex11: Use TINN algorithm to speed up colour lookups.
by Vitaliy Margolen May 5, 2007

May 5, 2007

Vitaly Budovski wrote: > Make use of the Triangle Inequality Nearest Neighbour algorithm to find the > nearest colour more efficiently than a simple linear search. The improvements > are most noticeable with a palette of 256 colours. Testing shows approximately > 3-4x performance increase for 256 colours. > --- Overall idea looks good, however the big problem with it is use of float point numbers. Fortunately you can get rid of them and use integers instead. Because you never use the distance in the calculations, but only to compare against other distances, you can skip "sqrt" and just compare squares, as the original code does. That will give you even more speed improvements. Few more nitpicks about this and other patches in the series: > +static int compare_distance(const void *left, const void *right) > +{ > + const struct tinn *l = left; > + const struct tinn *r = right; Please don't use void pointers. Use typed pointers, especially that you cast them to a hard-coded type. > +const void *init_tinn(struct tinn *dest, const void *buf, size_t num, > + size_t size, float (*distance)(const void *, const void *)) > +{ > + size_t i; > + size_t ref = rand() % num; I'm not so sure using random reference point really necessary. > +static struct tinn tinnPalette[256]; > + This won't work well with multi-threaded apps. You probably should make it on the stack for each X11DRV_DIB_SetImageBits_* function. Especially that some need only 2 elements. Btw, how big of the gain/loss whill there be for 1-bit and 4-bit DIBs? > + q.rgbRed = srcval.peRed; > + q.rgbGreen = srcval.peGreen; > + q.rgbBlue = srcval.peBlue; Looks much better, if written as: q = srcval; > - ((srcval >> 7) & 0xf8) | /* r */ > - ((srcval >> 12) & 0x07), > - ((srcval >> 2) & 0xf8) | /* g */ > - ((srcval >> 7) & 0x07), > - ((srcval << 3) & 0xf8) | /* b */ > - ((srcval >> 2) & 0x07) ) << (7-(x&7)) ); > + > + q.rgbRed = ((srcval >> 7) & 0xf8) | > + ((srcval >> 12) & 0x07); > + q.rgbGreen = ((srcval >> 2) & 0xf8) | > + ((srcval >> 7) & 0x07); > + q.rgbBlue = ((srcval << 3) & 0xf8) | > + ((srcval >> 2) & 0x07); What happened to the comments and alignment? Vitaliy Margolen.

3 4

Re: Fix xcopy so output is either unicode (console) or oem (file)
by Kirill K. Smirnov May 5, 2007

May 5, 2007

В сообщении от 23 апреля 2007 16:11 вы написали: > "Kirill K. Smirnov" <lich(a)math.spbu.ru> wrote: > >> >> The written strings in 866 and 1251 code pages are only readable > >> >> when output console code page matches the string encoding. > >> > > >> > This is in wine. > >> > In windows only cp866 is readable regardless of ConsoleOutputCP. > >> > >> As I said I tested under Windows (XP) only, and SetConsoleOutputCP > >> does change the behaviour of WriteConsoleA for me. If it wouldn't > >> I'd call it a bug. > > > > I tested under Windows 2003 and SetConsoleOutputCP does NOT change the > > behaviour of WriteConsoleA for me. > > Does Windows play us a trick? > > No the difference in observed behaviour was caused by the fact that I ran > the test under FAR, once I run it under cmd.exe I see what you do. Ahhh, I understood!!! You test does not return codepage back to 866. My version of your test does it. Far Manager somehow checks codepage and converts characters accordingly. I've removed the last convertion back to cp866 and observed the same behaviur as you. Thus, I can proclaim WriteConsoleA buggy. -- Kirill

2 2

RE: wine.inf: Add AllUsersProfile and associated entries to the registry [try 2].
by Vitaliy Margolen May 5, 2007

May 5, 2007

Anything wrong with this 3 liner? Vitaliy Margolen wrote: > --- > tools/wine.inf | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) >

2 3

USB device support in wine
by Jon Burgess May 5, 2007

May 5, 2007

Hi, I have found some talk of implementing USB device support in wine in this list some time ago (2005), but as far as I know, nothing ever came of it. I would perhaps be interested in getting this going again, as I have an application (Serato Scratch Live: http://www.rane.com/scratch.html) for which the software appears to run ok under wine (not that I am able to test much of its functionality on the other hand), but is utterly useless without support for its associated USB hardware device. Any ideas, or anyone else who would be interested in helping me? Regards, Jono

6 12

RE: Linuxworld San Francisco?
by Scott Ritchie May 4, 2007

May 4, 2007

Oooh, I'll do it! Now I just need to come up with a specific topic other than "Wine" Thanks, Scott Ritchie On Fri, 2007-05-04 at 10:30 -0500, Jeremy White wrote: > Well, we'll be there with a booth. > > I think I've given enough Wine talks through the years at LinuxWorld > that they're tired of me :-/. But, to be honest, I don't think I submitted > a proposal this year. I think if someone else wanted to give the talk, > they'd probably appreciate a fresh face. > > Cheers, > > Jeremy > > > -----Original Message----- > > From: wine-devel-bounces(a)winehq.org > > [mailto:wine-devel-bounces(a)winehq.org] On Behalf Of Dan Kegel > > Sent: Friday, May 04, 2007 10:13 AM > > To: wine-devel(a)winehq.org > > Subject: Linuxworld San Francisco? > > > > Is anyone going to Linuxworld, August 6-9 in San Francisco? > > A guy working on a possible large migration > > said he'd be there, and was wondering if there's > > going to be a Wine BOF. > > I might go just to chat with him. > > > > Also, I see no Wine-related talks on the program. > > http://www.linuxworldexpo.com/live/12/events/12SFO07A/conferen > > ce/tracks > > If all the great stuff I expect actually happens > > this summer, there's going to be a lot to talk about, > > seems like a good year for a Wine talk there...? > > > > > > > > >

3 2

Re: [1/5] WineD3D: Software vertex blending
by H. Verbeet May 4, 2007

May 4, 2007

On 04/05/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > This patch makes a copy of the strided data from the device if needed, and it > explicitly fixes the fixed function data. > I still think messing with the strided data like that is rather hacky :-/

2 1

Re: [PATCH 2/3] Implement TINN algorithm.
by Michael Stefaniuc May 4, 2007

May 4, 2007

Vitaly Budovski wrote: > > Implement the Triangle Inequality Nearest Neighbour algorithm as > described in > http://post.queensu.ca/~greensm/papers/tinn.pdf > --- > include/wine/tinn.h | 154 Do you need that somewhere else then in the X driver? If not putting that directly into dlls/winex11.drv/ makes more sense. > +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 154 insertions(+), 0 deletions(-) bye michael -- 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

3 2

Linuxworld San Francisco?
by Dan Kegel May 4, 2007

May 4, 2007

Is anyone going to Linuxworld, August 6-9 in San Francisco? A guy working on a possible large migration said he'd be there, and was wondering if there's going to be a Wine BOF. I might go just to chat with him. Also, I see no Wine-related talks on the program. http://www.linuxworldexpo.com/live/12/events/12SFO07A/conference/tracks If all the great stuff I expect actually happens this summer, there's going to be a lot to talk about, seems like a good year for a Wine talk there...?

2 2

re: Implement MsiBreak Feature - Bug 8243
by Dan Kegel May 4, 2007

May 4, 2007

> Do we really need to write out unix pid? > AFAIK Winedbg can attach to windows process IDs just fine. Hrmph. The author did say in http://bugs.winehq.org/show_bug.cgi?id=8243 that he needed Windows PIDs, didn't say he needed Unix pids. so maybe you're right. Let's ask him. Hey, Anastasius, do you really need the unix pid? - Dan

1 1

OLE2A
by Bill Medland May 4, 2007

May 4, 2007

Does anyone know where a call to OLE2A is going to enter wine? Presumably OLE2A returning null means that the thread ran out of stack space? Bill Medland

3 5

kernel32: MultiByteToWideChar: MB_USEGLYPHCHARS & incorrect GetLastError() codes fix
by Kirill K. Smirnov May 4, 2007

May 4, 2007

+/* 0x00..0x1f chars glyph map */ +static const WCHAR glyph_xlat[32] = { + 0x0000, 0x263A, 0x263B, 0x2665, 0x2666, 0x2663, 0x2662, 0x2219, + 0x25D8, 0x25CB, 0x25D9, 0x2642, 0x2640, 0x266A, 0x266B, 0x263C, + 0x25BA, 0x25C4, 0x2195, 0x203C, 0x00B6, 0x00A7, 0x25AC, 0x21A8, + 0x2191, 0x2193, 0x2192, 0x2190, 0x221F, 0x2194, 0x25B2, 0x25BC +}; + +/* adds glyphs to the string */ +static inline void add_glyphs( WCHAR *str, unsigned int length ) +{ + unsigned int i; + for (i=0; i!=length; i++) { + if (str[i]<0x20) str[i]=glyph_xlat[str[i]]; + } +} I propose to make this routine extern, because it is the simpliest way to make console renderer (I mean user backend of wineconsole) display the characters below 0x20 correct. The test: #include <windows.h> int main(void) { DWORD d; char str[32]; int i; GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &d); d &= ~ENABLE_PROCESSED_OUTPUT; SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), d); for (i = 0; i < 32; i++) str[i] = i; WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), str, 32, &d, 0); d |= ENABLE_PROCESSED_OUTPUT; SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), d); return 0; } Under wine we get strange symbols, under windows we get correct glyphs. If we perform the same character conversion in wineconsole/user.c just before actual text output, we get almost the same result that Windows does. The only difference is handling \0 symbol. -- Kirill

1 1

Re: [05/10] d3d: Fix the surface locking rectangle validation
by Stefan Dösinger May 4, 2007

May 4, 2007

Am Donnerstag 03 Mai 2007 20:58 schrieb H. Verbeet: > Validation on the rectangle passed to LockRect/Lock is inconsistent > across ddraw/d3d8/d3d9. D3d9 doesn't do any validation at all, d3d8 > doesn't allow empty, flipped, mirrored, or out of bounds rectangles, > while ddraw does allow empty rectangles, but not flipped, mirrored or > out of bounds ones. Tests for this are in the next few patches in this > set. You have to take care for IDirectDrawSurface::Blt and BltFast too, because parts of the Blt rectangle checks were done by Lock()

1 0

Re: [4/5] WineD3D: Implement vertex blending using GL_ARB_vertex_blend
by H. Verbeet May 4, 2007

May 4, 2007

Actually, I only thought about this just now, but you should also call glDisableClientState(GL_WEIGHT_ARRAY); in unloadVertexData().

2 1

Re: Unsecured API functions
by Tom Spear May 4, 2007

May 4, 2007

On 5/3/07, Robert Shearman <rob(a)codeweavers.com> wrote: > Tom Spear wrote: > > I was writing up a Hello World with input program for a demonstration > > for a non-developer coworker last week, and used the unsecured getch() > > and got the standard warning about how it was unsecured and dangerous > > to use that. That prompted me to look up the basic secured functions > > on the MS website, and compare to wine code. According to MSDN, > > things like gets have been replaced with gets_s. However, as far as I > > can tell, wine still only implements gets for Windows programs to > > use.. Do we implement secured versions of other functions, and if > > not, how come? > > Q: Why doesn't Wine implement X? > A: Because not many programs use it and no-one has felt interested in > implementing it for fun. So in other words, most programs use insecure functions (like gets) instead of using secure functions (like gets_s), leaving themselves vulnerable to all sorts of buffer overflows? I wonder if microsoft doesn't silently convert gets calls to gets_s calls, then, and maybe didn't document that? Otherwise I assume there would be thousands of buffer overflows that (malicious) people would exploit. I understand that most programs dont use either of those functions, but there are others that are used by nearly every program that ms deprecated in favor of secure versions. -- 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

5 6

Re: kernel32: MultiByteToWideChar: MB_USEGLYPHCHARS & incorrectGetLastError() codes fix
by Dmitry Timoshkov May 4, 2007

May 4, 2007

"Andrew O. Shadoura" <bugzilla(a)tut.by> wrote: > This patch implements MB_USEGLYPHCHARS flag in MultiByteToWideChar function > and fixes incorrect error codes (in case of CP_SYMBOL charset non-zero dwFlags > should give ERROR_INVALID_FLAGS, not ERROR_INVALID_PARAMETER, almost the same > with CP_UTF8, but "dwFlags must be set to either 0 or MB_ERR_INVALID_CHARS" > according to MSDN: http://msdn2.microsoft.com/en-us/library/ms776413.aspx > Also, test case is added. Please follow the existing code style of the files you're changing (indentation, braces, spaces), don't mix tabs and spaces. > + for (i=0; i!=length; i++) { > + if (str[i]<0x20) str[i]=glyph_xlat[str[i]]; > + } This is rather an unusual style of breaking out of the loop, 'i < length' is less confusing IMO. -- Dmitry.

1 0

dinput : crash of Pro Evolution Soccer 3 with a joystick
by Sébastien GRIPON May 4, 2007

May 4, 2007

Hi, I try to play to Pro Evolution Soccer 3 on my Ubuntu Fesity Fawn and it's not far to be possible. Every wine release brings a lots of wined3d improvements and pes3 is almost playable. Many textures are missing, but it's on a good way. Congratulations ! However, I have a problem with my joystick. I have a Microsoft Sidewinder and a Thrustmaster and when any of them is plugged on an USB port, the exe pes3.exe or the PES configuration tool setting.exe crash. This crash doesn't occur when joysticks are not pluggued. I tried to debug this crash, but it is a very hard work. I think dinput is involved but I can't be sure. If you're interesting in this game, this is the crash dump. Thank you, Seb. $ wine setting.exe fixme:win:WIN_CreateWindowEx Parent is HWND_MESSAGE wine: Unhandled page fault on read access to 0x00000000 at address (nil) (thread 0009), starting debugger... Unhandled exception: page fault on read access to 0x00000000 in 32-bit code (0x00000000). Register dump: CS:0073 SS:007b DS:007b ES:007b FS:0033 GS:003b EIP:00000000 ESP:0033f518 EBP:0058b2a8 EFLAGS:00210246( - 00 -RIZP1) EAX:00182c18 EBX:00000000 ECX:7da5bc00 EDX:00181bfc ESI:0058ad38 EDI:00000000 Stack dump: 0x0033f518: 00407eab 00182c18 004363fc 00000000 0x0033f528: 0043e4c0 0043fac4 00000000 0040814e 0x0033f538: 00181bf8 00000003 7da58b08 0033fa20 0x0033f548: 7da5af6c 0058ad38 00007734 90234a8d 0x0033f558: f7bdb63f 00003020 0033f658 7da4bc9f 0x0033f568: 7e4fa15f 7e4c2cd0 0033fa78 0042f0bb Backtrace: =>1 0x00000000 (0x0058b2a8) 2 0x00000000 (0x00182c18) 3 0x00000001 (0x7da5bc00) 4 0x00000000 (0x00000000) 0x00000000: addb %al,0x0(%eax) Modules: Module Address Debug info Name (96 modules) PE 400000- 464000 Deferred setting ELF 7b800000-7b927000 Deferred kernel32<elf> \-PE 7b820000-7b927000 \ kernel32 ELF 7bc00000-7bc96000 Deferred ntdll<elf> \-PE 7bc10000-7bc96000 \ ntdll ELF 7bf00000-7bf03000 Deferred <wine-loader> ELF 7ccdb000-7ccf0000 Deferred midimap<elf> \-PE 7cce0000-7ccf0000 \ midimap ELF 7ccf0000-7cd16000 Deferred msacm32<elf> \-PE 7cd00000-7cd16000 \ msacm32 ELF 7cd16000-7cd2e000 Deferred msacm32<elf> \-PE 7cd20000-7cd2e000 \ msacm32 ELF 7cd2e000-7cd6a000 Deferred wineoss<elf> \-PE 7cd40000-7cd6a000 \ wineoss ELF 7cd6a000-7cdbb000 Deferred libgcrypt.so.11 ELF 7cdbb000-7cdd0000 Deferred libtasn1.so.3 ELF 7cdd0000-7cdfe000 Deferred libcrypt.so.1 ELF 7ce11000-7ce81000 Deferred libgnutls.so.13 ELF 7ce81000-7ceb2000 Deferred libcups.so.2 ELF 7d1e7000-7d1eb000 Deferred libgpg-error.so.0 ELF 7d1eb000-7d21d000 Deferred uxtheme<elf> \-PE 7d1f0000-7d21d000 \ uxtheme ELF 7d21f000-7d224000 Deferred libxfixes.so.3 ELF 7d224000-7d22d000 Deferred libxcursor.so.1 ELF 7d22d000-7d233000 Deferred libxrandr.so.2 ELF 7d233000-7d23b000 Deferred libxrender.so.1 ELF 7d23b000-7d23e000 Deferred libxinerama.so ELF 7d764000-7d7f3000 Deferred winex11<elf> \-PE 7d770000-7d7f3000 \ winex11 ELF 7d89c000-7d8bc000 Deferred libexpat.so.1 ELF 7d8bc000-7d8e7000 Deferred libfontconfig.so.1 ELF 7d8e7000-7d8fb000 Deferred libz.so.1 ELF 7d8fb000-7d966000 Deferred libfreetype.so.6 ELF 7d966000-7d97a000 Deferred oleacc<elf> \-PE 7d970000-7d97a000 \ oleacc ELF 7d97a000-7d997000 Deferred imm32<elf> \-PE 7d980000-7d997000 \ imm32 ELF 7d997000-7da26000 Deferred winmm<elf> \-PE 7d9a0000-7da26000 \ winmm ELF 7da26000-7da5c000 Deferred dinput<elf> \-PE 7da30000-7da5c000 \ dinput ELF 7da5c000-7da75000 Deferred dinput8<elf> \-PE 7da60000-7da75000 \ dinput8 ELF 7dad8000-7e35e000 Deferred libglcore.so.1 ELF 7e35e000-7e3de000 Deferred libglu.so.1 ELF 7e3de000-7e46a000 Deferred libgl.so.1 ELF 7e46a000-7e55b000 Deferred libx11.so.6 ELF 7e55b000-7e569000 Deferred libxext.so.6 ELF 7e569000-7e581000 Deferred libice.so.6 ELF 7e581000-7e642000 Deferred wined3d<elf> \-PE 7e590000-7e642000 \ wined3d ELF 7e642000-7e66a000 Deferred d3d8<elf> \-PE 7e650000-7e66a000 \ d3d8 ELF 7e66a000-7e705000 Deferred oleaut32<elf> \-PE 7e680000-7e705000 \ oleaut32 ELF 7e705000-7e718000 Deferred libresolv.so.2 ELF 7e718000-7e736000 Deferred iphlpapi<elf> \-PE 7e720000-7e736000 \ iphlpapi ELF 7e736000-7e78b000 Deferred rpcrt4<elf> \-PE 7e740000-7e78b000 \ rpcrt4 ELF 7e78b000-7e828000 Deferred ole32<elf> \-PE 7e7a0000-7e828000 \ ole32 ELF 7e828000-7e84a000 Deferred oledlg<elf> \-PE 7e830000-7e84a000 \ oledlg ELF 7e84a000-7e87d000 Deferred winspool<elf> \-PE 7e850000-7e87d000 \ winspool ELF 7e87d000-7e939000 Deferred comctl32<elf> \-PE 7e890000-7e939000 \ comctl32 ELF 7e939000-7e991000 Deferred shlwapi<elf> \-PE 7e950000-7e991000 \ shlwapi ELF 7e991000-7ea8c000 Deferred shell32<elf> \-PE 7e9a0000-7ea8c000 \ shell32 ELF 7ea8c000-7eb2c000 Deferred comdlg32<elf> \-PE 7ea90000-7eb2c000 \ comdlg32 ELF 7eb2c000-7eb73000 Deferred advapi32<elf> \-PE 7eb40000-7eb73000 \ advapi32 ELF 7eb73000-7eb7f000 Deferred libgcc_s.so.1 ELF 7eb81000-7eb86000 Deferred libxdmcp.so.6 ELF 7eb86000-7eb89000 Deferred libxau.so.6 ELF 7eb89000-7eb92000 Deferred libsm.so.6 ELF 7ec7c000-7ed3a000 Deferred gdi32<elf> \-PE 7ec90000-7ed3a000 \ gdi32 ELF 7ed3a000-7ee76000 Deferred user32<elf> \-PE 7ed60000-7ee76000 \ user32 ELF 7efa4000-7efaf000 Deferred libnss_files.so.2 ELF 7efaf000-7efc6000 Deferred libnsl.so.1 ELF 7efc6000-7efed000 Deferred libm.so.6 ELF 7efed000-7eff7000 Deferred libnss_nis.so.2 ELF 7eff7000-7f000000 Deferred libnss_compat.so.2 ELF b7d51000-b7d56000 Deferred libxxf86vm.so.1 ELF b7d57000-b7d5b000 Deferred libdl.so.2 ELF b7d5b000-b7e9c000 Deferred libc.so.6 ELF b7e9d000-b7eb4000 Deferred libpthread.so.0 ELF b7eb4000-b7eb6000 Deferred libnvidia-tls.so.1 ELF b7ec7000-b7fd8000 Deferred libwine.so.1 ELF b7fda000-b7ff5000 Deferred ld-linux.so.2 Threads: process tid prio (all id:s are in hex) 0000000a 0000000c 0 0000000b 0 00000008 (D) C:\Program Files\KONAMI\Pro Evolution Soccer 3\setting.exe 0000000d 0 00000009 0 <==

2 1

Unsecured API functions
by Tom Spear May 4, 2007

May 4, 2007

I was writing up a Hello World with input program for a demonstration for a non-developer coworker last week, and used the unsecured getch() and got the standard warning about how it was unsecured and dangerous to use that. That prompted me to look up the basic secured functions on the MS website, and compare to wine code. According to MSDN, things like gets have been replaced with gets_s. However, as far as I can tell, wine still only implements gets for Windows programs to use.. Do we implement secured versions of other functions, and if not, how come? -- 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

3 2

Re: Boundary test cases for SystemTimeToFileTime and GetDateFormat
by James Hawkins May 3, 2007

May 3, 2007

On 5/3/07, Bill Medland <billmedland(a)shaw.ca> wrote: > Bill Medland (billmedland(a)shaw.ca) > Lower boundary test cases for SystemTimeToFileTime and GetDateFormat > > Index: wine/dlls/kernel32/tests/locale.c > =================================================================== > RCS file: /home/wine/wine/dlls/kernel32/tests/locale.c,v > retrieving revision 1.11 > diff -u -r1.11 locale.c > --- wine/dlls/kernel32/tests/locale.c 2 Apr 2007 11:24:36 -0000 1.11 > +++ wine/dlls/kernel32/tests/locale.c 3 May 2007 22:21:55 -0000 > @@ -424,6 +424,34 @@ > STRINGSW("dddd d MMMM yyyy","Wednesday 23 October 2002"); /* Incorrect DOW and time */ > ret = GetDateFormatW (lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); > EXPECT_VALID; EXPECT_LENW; EXPECT_EQW; > + > + /* Limit tests */ > + > + curtime.wYear = 1601; > + curtime.wMonth = 1; > + curtime.wDay = 1; > + curtime.wDayOfWeek = 0; /* Irrelevant */ > + curtime.wHour = 0; > + curtime.wMinute = 0; > + curtime.wSecond = 0; > + curtime.wMilliseconds = 0; > + STRINGSW("dddd d MMMM yyyy","Monday 1 January 1601"); > + SetLastError(0xdeadbeef); > + ret = GetDateFormatW (lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); > + EXPECT_VALID; EXPECT_LENW; EXPECT_EQW; > + > + curtime.wYear = 1600; > + curtime.wMonth = 12; > + curtime.wDay = 31; > + curtime.wDayOfWeek = 0; /* Irrelevant */ > + curtime.wHour = 23; > + curtime.wMinute = 59; > + curtime.wSecond = 59; > + curtime.wMilliseconds = 999; > + STRINGSW("dddd d MMMM yyyy","Friday 31 December 1600"); > + SetLastError(0xdeadbeef); > + ret = GetDateFormatW (lcid, 0, &curtime, input, buffer, COUNTOF(buffer)); > + EXPECT_INVALID; > } > > > Index: wine/dlls/kernel32/tests/time.c > =================================================================== > RCS file: /home/wine/wine/dlls/kernel32/tests/time.c,v > retrieving revision 1.3 > diff -u -r1.3 time.c > --- wine/dlls/kernel32/tests/time.c 4 Jan 2007 10:46:26 -0000 1.3 > +++ wine/dlls/kernel32/tests/time.c 3 May 2007 22:22:04 -0000 > @@ -73,6 +73,23 @@ > (st).wSecond = 32; \ > (st).wMilliseconds = 123; > > +#define SETUP_ZEROTIME(st) \ > + (st).wYear = 1601; \ > + (st).wMonth = 1; \ > + (st).wDay = 1; \ > + (st).wHour = 0; \ > + (st).wMinute = 0; \ > + (st).wSecond = 0; \ > + (st).wMilliseconds = 0; > + > +#define SETUP_EARLY(st) \ > + (st).wYear = 1600; \ > + (st).wMonth = 12; \ > + (st).wDay = 31; \ > + (st).wHour = 23; \ > + (st).wMinute = 59; \ > + (st).wSecond = 59; \ > + (st).wMilliseconds = 999; > > > static void test_conversions(void) > @@ -82,6 +99,12 @@ > > memset(&ft,0,sizeof ft); > > + SETUP_EARLY(st) > + ok ((!SystemTimeToFileTime(&st, &ft) && GetLastError() == ERROR_INVALID_PARAMETER), "Conversion failed EARLY\n"); > + > + SETUP_ZEROTIME(st) > + ok (SystemTimeToFileTime(&st, &ft) && ft.dwHighDateTime == 0 && ft.dwLowDateTime == 0, "Conversion failed ZERO_TIME\n"); > + You need to check each part of those conditions separately in their own ok()'s. -- James Hawkins

1 0

tools/winegcc solaris link options patch
by sol11x86＠comcast.net May 3, 2007

May 3, 2007

Please comment on this patch: This patch adds two options to toool/winegcc to allow Solaris linker flags to be passed through and recognized. Prior to this patch, libraries compiled with winegcc (despite overloading every link related env variable I could think of), had a single RPATH when evaulated with elfdump (which was the primary library from the compiler). The effect was that I was required to set an LD_LIBRARY_PATH prior to running any of the wine applications, since the RPATH was not fully populated. With this patch, and proper configuration of LDFLAGS, I am now able to build wine on Solaris without having to resort to an LD_LIBRARY_PATH when I run wine. The two flags that are added to winegcc.c are: -R <libdir> -z <linker flags> (-z allows me to control the link phase a little better for performance reasons). Thanks to Steleman who quickly recognized the problem, despite the facts were staring me in the face. Ben

1 0

Re: Implement MsiBreak Feature - Bug 8243
by James Hawkins May 3, 2007

May 3, 2007

On 5/2/07, EA Durbin <ead1234(a)hotmail.com> wrote: > patch created by Anastasius Focht for Bug 8243. > + /* check "MsiBreak" environment variable */ + if( GetEnvironmentVariableW( envMsiBreakW, envMsiBreakValueW, MAX_PATH)) + { I think we need more investigation into this before accepting this patch. One of the things that needs to be checked is whether the windows installer checks the environment variable every single time a custom action is called, or if the environment variable is stored at the beginning of the installation and just the custom action name is checked every time a custom action is called. This can be tested on windows by setting MsiBreak to a certain custom action, and then change the environment variable to a different custom action while the message box is still asking to break. If the installer breaks on the next custom action, we'll know that it checks the environment variable each time. -- James Hawkins

1 0

Re: Implement MsiBreak Feature - Bug 8243
by Peter Oberndorfer May 3, 2007

May 3, 2007

On Thursday 03 May 2007 05:45, EA Durbin wrote: Hi, > patch created by Anastasius Focht for Bug 8243. > >+#include <sys/types.h> /* for getpid() */ >+#include <unistd.h> /* for getpid() */ Do we really need to write out unix pid? AFAIK Winedbg can attach to windows process IDs just fine. >+ if( MessageBoxW( NULL, dbgMsgW, CustomActionName, MB_OKCANCEL) == IDOK) >+ { >+ return TRUE; >+ } nitpick: maybe remove {} to be consistent with rest of file? >+ if( IsMsiBreak( info->target)) >+ DebugBreak(); extra nitpick: maybe remove space before argument or place additional space before closing ) like foo( baz ); / foo(baz); It also seems like the patch is line wrapped. Greetings Peter

1 0

Re: Some Spanish translation updates
by Alexandre Julliard May 3, 2007

May 3, 2007

José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es> writes: > By the way, I've changed the license of the files > 'oledlg/oledlg_Es.rc' and 'shdoclc/Es.rc' (I was the creator of > these two files) to LPGL version 2.1 (and not any later). Please don't do that. All of Wine should be under the same license, otherwise it will create major confusion. -- Alexandre Julliard julliard(a)winehq.org

1 0

What's the long term plan for 64 bit support?
by Scott Ritchie May 3, 2007

May 3, 2007

In the (distant) future, will we support building Wine with both 64 bit and 32 bit libraries, and then the same Wine installation will run both 64 bit and 32 bit apps? As I understand it, this is the way Windows does in its 64 bit versions. I ask because there's a question of how to name the Wine packages for the 64 bit distribution - there's a standard of naming 32 bit packages something like "wine32", but if we're eventually going to have a unified multiarch package then we can still go with just keeping it as "wine" Thanks, Scott Ritchie

3 3

Re: [5/5] WineD3D: Software vertex blending
by H. Verbeet May 3, 2007

May 3, 2007

>+ for(i = 0; i < 16 /* Max vertex attribs */; i++) { I think you should be using MAX_ATTRIBS there. Changing the strided data like that in drawPrimitive looks rather hacky to me.

2 2

Bug in Advapi32: CryptEnumProviderTypesA and CryptEnumProvidersA
by Mounir IDRASSI May 2, 2007

May 2, 2007

Hi, During our tests of wine with our cryptographic suite, we have found a bug in the functions CryptEnumProviderTypesA and CryptEnumProvidersA in advapi32 dll: In case of failure, they both report a wrong last error through GetLastError. We have found and corrected the source of the bug: They both call their wide-char counterpart but they don't test the success of this call. The correction is simple: add an if statement and return immediately in case of error. I have attached a small patch with our correction. Should we fill a bugzilla report before submitting the patch? Thanks. Mounir IDRASSI IDRIX - Cryptography and IT Security Experts http://www.idrix.fr >From ab7323952138e725700ded1bad4afd17e42717e7 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI <mounir.idrassi(a)idrix.fr> Date: Wed, 2 May 2007 20:20:59 +0200 Subject: Correct bug in CryptEnumProviderTypesA and CryptEnumProvidersA: They report wrong last error in case of failure --- dlls/advapi32/crypt.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 1fd16c3..a7273b9 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1139,7 +1139,8 @@ BOOL WINAPI CryptEnumProvidersA (DWORD dwIndex, DWORD *pdwReserved, TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszProvName, pcbProvName); - CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen); + if(!CryptEnumProvidersW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen)) + return FALSE; if ( pszProvName && !(str = CRYPT_Alloc(strlen)) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); @@ -1267,7 +1268,8 @@ BOOL WINAPI CryptEnumProviderTypesA (DWORD dwIndex, DWORD *pdwReserved, TRACE("(%d, %p, %08x, %p, %p, %p)\n", dwIndex, pdwReserved, dwFlags, pdwProvType, pszTypeName, pcbTypeName); - CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen); + if(!CryptEnumProviderTypesW(dwIndex, pdwReserved, dwFlags, pdwProvType, NULL, &strlen)) + return FALSE; if ( pszTypeName && !(str = CRYPT_Alloc(strlen)) ) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); -- 1.4.4.2

2 1

Any way to get the current code besides git?
by Tom Spear May 2, 2007

May 2, 2007

I'm having an issue using git at work, where it will start downloading the packs, and then just stalls out at the same pack every time.. This has occurred since I first started working here Maybe someone knows the problem, and a solution? If not, is there a way to get git to show file names instead of md5 sums, like cvs did, back when we used it, so I can at least know what file is causing the problem? If there is no solution, then maybe someone does know where I can get current code aside from git? -- 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

3 7

Patch question
by Tom Spear May 2, 2007

May 2, 2007

Just curious if there was something wrong with the regedit patch I sent on Friday, or if maybe there is a particular reason that the /C was left out of the code in the first place, that I am missing, and would help me to understand. http://www.winehq.org/pipermail/wine-patches/2007-April/038652.html -- 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: Adding header files for the implementation of Winscard dll (Smart Cards support)
by Dmitry Timoshkov May 2, 2007

May 2, 2007

"Mounir IDRASSI" <mounir.idrassi(a)idrix.fr> wrote: > diff --git a/include/scarderr.h b/include/scarderr.h > new file mode 100755 > index 0000000..c07833e > --- /dev/null > +++ b/include/scarderr.h ... > diff --git a/include/winscard.h b/include/winscard.h > new file mode 100755 > index 0000000..f302a9f > --- /dev/null > +++ b/include/winscard.h ... > diff --git a/include/winsmcrd.h b/include/winsmcrd.h > new file mode 100755 > index 0000000..cc03a35 > --- /dev/null > +++ b/include/winsmcrd.h This is a notice more for Alexandre this time, but next time please make sure to send the files with exec bits turned off (755 -> 644). -- Dmitry.

2 1