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

Alexandre Julliard : include: Add a few definitions in wdm.h.
by Alexandre Julliard May 16, 2007

May 16, 2007

Module: wine Branch: master Commit: dff6cdfa5094eef2dd7081c9ed6031a720fbb29e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff6cdfa5094eef2dd7081c9e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 15 21:41:21 2007 +0200 include: Add a few definitions in wdm.h. --- include/ddk/wdm.h | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6e2c3b2..7d53a97 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -32,9 +32,17 @@ typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK; struct _KDPC; struct _KAPC; +struct _IRP; +struct _DEVICE_OBJECT; +struct _DRIVER_OBJECT; typedef VOID (WINAPI *PKDEFERRED_ROUTINE)(struct _KDPC *, PVOID, PVOID, PVOID); +typedef NTSTATUS (WINAPI *PDRIVER_INITIALIZE)(struct _DRIVER_OBJECT *, PUNICODE_STRING); +typedef NTSTATUS (WINAPI *PDRIVER_DISPATCH)(struct _DEVICE_OBJECT *, struct _IRP *); +typedef void (WINAPI *PDRIVER_STARTIO)(struct _DEVICE_OBJECT *, struct _IRP *); +typedef void (WINAPI *PDRIVER_UNLOAD)(struct _DRIVER_OBJECT *); + typedef struct _DISPATCHER_HEADER { UCHAR Type; UCHAR Absolute; @@ -77,6 +85,8 @@ typedef struct _KDEVICE_QUEUE { typedef struct _IO_TIMER *PIO_TIMER; typedef struct _ETHREAD *PETHREAD; +typedef struct _KTHREAD *PKTHREAD; +typedef struct _EPROCESS *PEPROCESS; #define MAXIMUM_VOLUME_LABEL_LENGTH (32 * sizeof(WCHAR)) @@ -170,10 +180,10 @@ typedef struct _DRIVER_OBJECT { UNICODE_STRING DriverName; PUNICODE_STRING HardwareDatabase; PVOID FastIoDispatch; - PVOID DriverInit; - PVOID DriverStartIo; - PVOID DriverUnload; - PVOID MajorFunction[IRP_MJ_MAXIMUM_FUNCTION + 1]; + PDRIVER_INITIALIZE DriverInit; + PDRIVER_STARTIO DriverStartIo; + PDRIVER_UNLOAD DriverUnload; + PDRIVER_DISPATCH MajorFunction[IRP_MJ_MAXIMUM_FUNCTION + 1]; } DRIVER_OBJECT; typedef struct _DRIVER_OBJECT *PDRIVER_OBJECT; @@ -770,10 +780,6 @@ typedef struct _MDL { ULONG ByteOffset; } MDL, *PMDL; -typedef NTSTATUS (WINAPI *PDRIVER_DISPATCH)( - IN struct _DEVICE_OBJECT *DeviceObject, - IN struct _IRP *Irp); - typedef struct _KSYSTEM_TIME { ULONG LowPart; LONG High1Time; @@ -854,7 +860,26 @@ NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) -/* Zw function prototypes */ +PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); +PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); +PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); +PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); +void WINAPI ExFreePool(PVOID); + +NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); +NTSTATUS WINAPI IoCreateSymbolicLink(UNICODE_STRING*,UNICODE_STRING*); +void WINAPI IoDeleteDevice(DEVICE_OBJECT*); +NTSTATUS WINAPI IoDeleteSymbolicLink(UNICODE_STRING*); +PEPROCESS WINAPI IoGetCurrentProcess(void); + +PKTHREAD WINAPI KeGetCurrentThread(void); + +#define PsGetCurrentProcess() IoGetCurrentProcess() +#define PsGetCurrentThread() ((PETHREAD)KeGetCurrentThread()) +HANDLE WINAPI PsGetCurrentProcessId(void); +HANDLE WINAPI PsGetCurrentThreadId(void); +BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*); + NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING); NTSTATUS WINAPI ZwAccessCheckAndAuditAlarm(PUNICODE_STRING,HANDLE,PUNICODE_STRING,PUNICODE_STRING,PSECURITY_DESCRIPTOR,ACCESS_MASK,PGENERIC_MAPPING,BOOLEAN,PACCESS_MASK,PBOOLEAN,PBOOLEAN); NTSTATUS WINAPI ZwAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD);

1 0

Markus Amsler : dbghelp: Speed up vector iteration by directly using for().
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: 8bc839a816c0c9eedf561f9f525b62c1a36cfe59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc839a816c0c9eedf561f9f5… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Tue May 15 02:05:12 2007 +0200 dbghelp: Speed up vector iteration by directly using for(). --- dlls/dbghelp/dbghelp_private.h | 3 -- dlls/dbghelp/dwarf.c | 50 +++++++++++++++++++++------------------ dlls/dbghelp/source.c | 6 +++- dlls/dbghelp/storage.c | 36 ---------------------------- dlls/dbghelp/symbol.c | 15 +++++++---- dlls/dbghelp/type.c | 12 ++++---- 6 files changed, 46 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8bc839a816c0c9eedf561…

1 0

Markus Amsler : dbghelp: Speed up vector_add by avoiding pool_realloc calls . Remove no longer needed pool_realloc.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: f94127f2ca4af485bdb4d55128d1d6311048ac33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94127f2ca4af485bdb4d5512… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Tue May 15 02:04:57 2007 +0200 dbghelp: Speed up vector_add by avoiding pool_realloc calls. Remove no longer needed pool_realloc. --- dlls/dbghelp/dbghelp_private.h | 3 +- dlls/dbghelp/storage.c | 47 ++++++++++++++------------------------- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a84d91c..5ee22c3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -44,8 +44,6 @@ struct pool /* poor's man */ void pool_init(struct pool* a, unsigned arena_size); void pool_destroy(struct pool* a); void* pool_alloc(struct pool* a, unsigned len); -/* void* pool_realloc(struct pool* a, void* p, - unsigned old_size, unsigned new_size); */ char* pool_strdup(struct pool* a, const char* str); struct vector @@ -55,6 +53,7 @@ struct vector unsigned shift; unsigned num_elts; unsigned num_buckets; + unsigned buckets_allocated; }; void vector_init(struct vector* v, unsigned elt_sz, unsigned bucket_sz); diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index e196143..602d97f 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -101,33 +101,6 @@ void* pool_alloc(struct pool* pool, unsigned len) return ret; } -static struct pool_arena* pool_is_last(const struct pool* pool, const void* p, unsigned old_size) -{ - struct pool_arena* arena; - - for (arena = pool->first; arena; arena = arena->next) - { - if (arena->current == (const char*)p + old_size) return arena; - } - return NULL; -} - -static void* pool_realloc(struct pool* pool, void* p, unsigned old_size, unsigned new_size) -{ - struct pool_arena* arena; - void* new; - - if ((arena = pool_is_last(pool, p, old_size)) && - (char*)p + new_size <= (char*)arena + pool->arena_size) - { - arena->current = (char*)p + new_size; - return p; - } - if ((new = pool_alloc(pool, new_size)) && old_size) - memcpy(new, p, min(old_size, new_size)); - return new; -} - char* pool_strdup(struct pool* pool, const char* str) { char* ret; @@ -155,6 +128,7 @@ void vector_init(struct vector* v, unsigned esz, unsigned bucket_sz) default: assert(0); } v->num_buckets = 0; + v->buckets_allocated = 0; v->num_elts = 0; } @@ -180,9 +154,22 @@ void* vector_add(struct vector* v, struct pool* pool) assert(v->num_elts > ncurr); if (ncurr == (v->num_buckets << v->shift)) { - v->buckets = pool_realloc(pool, v->buckets, - v->num_buckets * sizeof(void*), - (v->num_buckets + 1) * sizeof(void*)); + if(v->num_buckets == v->buckets_allocated) + { + /* Double the bucket cache, so it scales well with big vectors.*/ + unsigned new_reserved; + void* new; + + new_reserved = 2*v->buckets_allocated; + if(new_reserved == 0) new_reserved = 1; + + /* Don't even try to resize memory. + Pool datastructure is very inefficient with reallocs. */ + new = pool_alloc(pool, new_reserved * sizeof(void*)); + memcpy(new, v->buckets, v->buckets_allocated * sizeof(void*)); + v->buckets = new; + v->buckets_allocated = new_reserved; + } v->buckets[v->num_buckets] = pool_alloc(pool, v->elt_size << v->shift); return v->buckets[v->num_buckets++]; }

1 0

Markus Amsler : dbghelp: Speed up pool_alloc. Patch by Eric Pouech.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: a2968c8fab67bb6fd22ffeed87570e0578d35224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2968c8fab67bb6fd22ffeed8… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Tue May 15 02:05:05 2007 +0200 dbghelp: Speed up pool_alloc. Patch by Eric Pouech. --- dlls/dbghelp/storage.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 602d97f..4e682ce 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -73,30 +73,28 @@ void pool_destroy(struct pool* pool) void* pool_alloc(struct pool* pool, unsigned len) { - struct pool_arena** parena; struct pool_arena* arena; void* ret; len = (len + 3) & ~3; /* round up size on DWORD boundary */ assert(sizeof(struct pool_arena) + len <= pool->arena_size && len); - for (parena = &pool->first; *parena; parena = &(*parena)->next) + for (arena = pool->first; arena; arena = arena->next) { - if ((char*)(*parena) + pool->arena_size - (*parena)->current >= len) + if ((char*)arena + pool->arena_size - arena->current >= len) { - ret = (*parena)->current; - (*parena)->current += len; + ret = arena->current; + arena->current += len; return ret; } } - + arena = HeapAlloc(GetProcessHeap(), 0, pool->arena_size); if (!arena) {FIXME("OOM\n");return NULL;} - *parena = arena; - ret = (char*)arena + sizeof(*arena); - arena->next = NULL; + arena->next = pool->first; + pool->first = arena; arena->current = (char*)ret + len; return ret; }

1 0

Markus Amsler : dbghelp: Late init hash_table.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: 6f8a67f01825e765de8303d1fbec7a5d07fafcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f8a67f01825e765de8303d1f… Author: Markus Amsler <markus.amsler(a)oribi.org> Date: Tue May 15 02:05:21 2007 +0200 dbghelp: Late init hash_table. --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/storage.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index a108360..99b8b54 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -83,6 +83,7 @@ struct hash_table unsigned num_elts; unsigned num_buckets; struct hash_table_elt** buckets; + struct pool* pool; }; void hash_table_init(struct pool* pool, struct hash_table* ht, diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index 91cb0ed..88c9b1d 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -52,21 +52,27 @@ void pool_destroy(struct pool* pool) #ifdef USE_STATS unsigned alloc, used, num; - for (alloc = used = num = 0, arena = pool->first; arena; arena = arena->next) + alloc = used = num = 0; + arena = pool->first; + while (arena) { alloc += pool->arena_size; used += arena->current - (char*)arena; num++; + arena = arena->next; } + if (alloc == 0) alloc = 1; /* avoid division by zero */ FIXME("STATS: pool %p has allocated %u kbytes, used %u kbytes in %u arenas,\n" "\t\t\t\tnon-allocation ratio: %.2f%%\n", pool, alloc >> 10, used >> 10, num, 100.0 - (float)used / (float)alloc * 100.0); #endif - for (arena = pool->first; arena; arena = next) + arena = pool->first; + while (arena) { next = arena->next; HeapFree(GetProcessHeap(), 0, arena); + arena = next; } pool_init(pool, 0); } @@ -310,10 +316,9 @@ unsigned hash_table_hash(const char* name, unsigned num_buckets) void hash_table_init(struct pool* pool, struct hash_table* ht, unsigned num_buckets) { ht->num_elts = 0; - ht->buckets = pool_alloc(pool, num_buckets * sizeof(struct hash_table_elt*)); - assert(ht->buckets); ht->num_buckets = num_buckets; - memset(ht->buckets, 0, num_buckets * sizeof(struct hash_table_elt*)); + ht->pool = pool; + ht->buckets = NULL; } void hash_table_destroy(struct hash_table* ht) @@ -358,6 +363,13 @@ void hash_table_add(struct hash_table* ht, struct hash_table_elt* elt) unsigned hash = hash_table_hash(elt->name, ht->num_buckets); struct hash_table_elt** p; + if (!ht->buckets) + { + ht->buckets = pool_alloc(ht->pool, ht->num_buckets * sizeof(struct hash_table_elt*)); + assert(ht->buckets); + memset(ht->buckets, 0, ht->num_buckets * sizeof(struct hash_table_elt*)); + } + /* in some cases, we need to get back the symbols of same name in the order * in which they've been inserted. So insert new elements at the end of the list. */ @@ -372,6 +384,8 @@ void* hash_table_find(const struct hash_table* ht, const char* name) unsigned hash = hash_table_hash(name, ht->num_buckets); struct hash_table_elt* elt; + if(!ht->buckets) return NULL; + for (elt = ht->buckets[hash]; elt; elt = elt->next) if (!strcmp(name, elt->name)) return elt; return NULL; @@ -396,6 +410,8 @@ void hash_table_iter_init(const struct hash_table* ht, void* hash_table_iter_up(struct hash_table_iter* hti) { + if(!hti->ht->buckets) return NULL; + if (hti->element) hti->element = hti->element->next; while (!hti->element && hti->index < hti->last) hti->element = hti->ht->buckets[++hti->index];

1 0

Francois Gouget : winscard: Adding the missing SCARD_E_XXX and SCARD_W_XXX error codes.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: 91c81395dcde2d61ca2a3aa0680eea55c299298d URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c81395dcde2d61ca2a3aa06… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 15 13:48:29 2007 +0200 winscard: Adding the missing SCARD_E_XXX and SCARD_W_XXX error codes. Adding scarderr.h with the same definitions. --- include/Makefile.in | 1 + include/scarderr.h | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/winerror.h | 59 +++++++++++++++++++++++++++++++- 3 files changed, 155 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91c81395dcde2d61ca2a3…

1 0

Francois Gouget : mshtml: Fix '\n' typo.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: 51b81a60a0c294ac5b31b75b338641ea0dd39b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51b81a60a0c294ac5b31b75b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 14:00:40 2007 +0200 mshtml: Fix '\n' typo. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e7cf487..a47bb1d 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1733,7 +1733,7 @@ static nsresult NSAPI nsProtocolHandler_QueryInterface(nsIProtocolHandler *iface return NS_OK; } - WARN("(%s %p)\nn", debugstr_guid(riid), result); + WARN("(%s %p)\n", debugstr_guid(riid), result); return NS_NOINTERFACE; }

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: 0acb5810bfb899e7c3a1dd965b28163fa4f97d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0acb5810bfb899e7c3a1dd965… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 15 14:01:05 2007 +0200 Assorted spelling fixes. --- dlls/comctl32/listview.c | 2 +- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/dsurface.c | 6 +++--- dlls/msi/tests/automation.c | 2 +- dlls/wined3d/device.c | 2 +- programs/regedit/regedit.c | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6861504..161a5c8 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3263,7 +3263,7 @@ static BOOL LISTVIEW_GetItemAtPt(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVIte * over the item for a certain period of time. * */ -static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKyes, INT x, INT y) +static LRESULT LISTVIEW_MouseHover(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, INT y) { if (infoPtr->dwLvExStyle & LVS_EX_TRACKSELECT) { diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index dd1b078..2d8dc8a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2026,7 +2026,7 @@ IDirectDrawImpl_CreateNewSurface(IDirectDrawImpl *This, * count: number of surfaces to create * DDSD: Description of the surface. Intentionally not a pointer to avoid side * effects on the caller - * CubeFaceRoot: Wether the new surface is a root of a cube map face. This + * CubeFaceRoot: Whether the new surface is a root of a cube map face. This * creates an additional surface without the mipmapping flags * *****************************************************************************/ diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 565a390..2d3f620 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1045,7 +1045,7 @@ static void AttachmentTest7(void) IDirectDrawSurface7_Release(surface2); num = 0; IDirectDrawSurface7_EnumAttachedSurfaces(surface3, &num, SurfaceCounter); - ok(num == 0, "Secound mip level has %d surfaces attached, expected 1\n", num); + ok(num == 0, "Second mip level has %d surfaces attached, expected 1\n", num); /* Done level 2 */ /* Mip level 3 is still needed */ @@ -1263,7 +1263,7 @@ static void AttachmentTest(void) hr = IDirectDraw_SetCooperativeLevel(lpDD, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "SetCooperativeLevel returned %08x\n", hr); - /* Creating a back buffer as-is is not allowed, no need to perform attachment tests */ + /* Creating a back buffer as-is, is not allowed. No need to perform attachment tests */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); ddsd.dwFlags = DDSD_CAPS; @@ -1907,7 +1907,7 @@ static void CompressedTest(void) skip("Hardware DXTN textures not supported\n"); } - /* What happens to managed textures? Interestingly, Windows reports them as beeing in system + /* What happens to managed textures? Interestingly, Windows reports them as being in system * memory. The linear size fits again. */ ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 98014fd..7a616a3 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1510,7 +1510,7 @@ static void test_Installer_RegistryValue(void) ok(SUCCEEDED(hr), "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); ok_w2("Default registry value \"%s\" does not match expected \"%s\"\n", szString, szOne); - /* Ask for the value of a non-existent key */ + /* Ask for the value of a nonexistent key */ memset(szString, 0, sizeof(szString)); hr = Installer_RegistryValueW(HKEY_CURRENT_USER, szKey, szExpand, szString); ok(hr == DISP_E_BADINDEX, "Installer_RegistryValueW failed, hresult 0x%08x\n", hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 223cdb4..9b9a1e9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4059,7 +4059,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD } /** NOTE: MSDN says that setTexture increases the reference count, - * and the the application nust set the texture back to null (or have a leaky application), + * and the the application must set the texture back to null (or have a leaky application), * This means we should pass the refcount up to the parent *******************************/ if (NULL != This->updateStateBlock->textures[Stage]) { diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 116be3d..68b11df 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -32,8 +32,8 @@ static const char *usage = "filename - registry file name\n" "regpath - name of the registry key\n" "\n" - "When regedit is called without any switches, it adds the contents of the\n" - "specified registry file to the registry\n" + "When called without any switches, adds the content of the specified\n" + "file to the registry\n" "\n" "Switches:\n" " /E - exports contents of the specified registry key to the specified\n"

1 0

Francois Gouget : winscard: Add headers for the upcoming implementation of the winscard dll.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: c7d5cfe98cbc50e878dcdc076894dc511c3426dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d5cfe98cbc50e878dcdc076… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 15 13:51:44 2007 +0200 winscard: Add headers for the upcoming implementation of the winscard dll. --- include/Makefile.in | 2 + include/winscard.h | 150 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/winsmcrd.h | 37 +++++++++++++ 3 files changed, 189 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index d218856..7dc0cc3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -352,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/winscard.h b/include/winscard.h new file mode 100644 index 0000000..8da8e7f --- /dev/null +++ b/include/winscard.h @@ -0,0 +1,150 @@ +/* + * Winscard definitions + * + * 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 <wtypes.h> +#include <winioctl.h> +#include <winsmcrd.h> +#include <scarderr.h> + +#ifndef _LPCBYTE_DEFINED +#define _LPCBYTE_DEFINED +typedef const BYTE *LPCBYTE; +#endif + +typedef ULONG_PTR SCARDCONTEXT, *PSCARDCONTEXT, *LPSCARDCONTEXT; +typedef ULONG_PTR SCARDHANDLE, *PSCARDHANDLE, *LPSCARDHANDLE; + +typedef struct _SCARD_ATRMASK +{ + DWORD cbAtr; + BYTE rgbAtr[36]; + BYTE rgbMask[36]; +} SCARD_ATRMASK, *PSCARD_ATRMASK, *LPSCARD_ATRMASK; + +typedef struct +{ + LPCSTR szReader; + LPVOID pvUserData; + DWORD dwCurrentState; + DWORD dwEventState; + DWORD cbAtr; + BYTE rgbAtr[36]; +} SCARD_READERSTATEA, *PSCARD_READERSTATEA, *LPSCARD_READERSTATEA; +typedef struct +{ + LPCWSTR szReader; + LPVOID pvUserData; + DWORD dwCurrentState; + DWORD dwEventState; + DWORD cbAtr; + BYTE rgbAtr[36]; +} SCARD_READERSTATEW, *PSCARD_READERSTATEW, *LPSCARD_READERSTATEW; +DECL_WINELIB_TYPE_AW(SCARD_READERSTATE) +DECL_WINELIB_TYPE_AW(PSCARD_READERSTATE) +DECL_WINELIB_TYPE_AW(LPSCARD_READERSTATE) + + +#ifdef __cplusplus +extern "C" { +#endif + +HANDLE WINAPI SCardAccessStartedEvent(void); +LONG WINAPI SCardAddReaderToGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); +LONG WINAPI SCardAddReaderToGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardAddReaderToGroup WINELIB_NAME_AW(SCardAddReaderToGroup) +LONG WINAPI SCardBeginTransaction(SCARDHANDLE); +LONG WINAPI SCardCancel(SCARDCONTEXT); +LONG WINAPI SCardConnectA(SCARDCONTEXT,LPCSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); +LONG WINAPI SCardConnectW(SCARDCONTEXT,LPCWSTR,DWORD,DWORD,LPSCARDHANDLE,LPDWORD); +#define SCardConnect WINELIB_NAME_AW(SCardConnect) +LONG WINAPI SCardControl(SCARDHANDLE,DWORD,LPCVOID,DWORD,LPVOID,DWORD,LPDWORD); +LONG WINAPI SCardDisconnect(SCARDHANDLE,DWORD); +LONG WINAPI SCardEndTransaction(SCARDHANDLE,DWORD); +LONG WINAPI SCardEstablishContext(DWORD,LPCVOID,LPCVOID,LPSCARDCONTEXT); +LONG WINAPI SCardForgetCardTypeA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardForgetCardTypeW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetCardType WINELIB_NAME_AW(SCardForgetCardType) +LONG WINAPI SCardForgetReaderA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardForgetReaderW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetReader WINELIB_NAME_AW(SCardForgetReader) +LONG WINAPI SCardForgetReaderGroupA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardForgetReaderGroupW(SCARDCONTEXT,LPCWSTR); +#define SCardForgetReaderGroup WINELIB_NAME_AW(SCardForgetReaderGroup) +LONG WINAPI SCardFreeMemory(SCARDCONTEXT,LPCVOID); +LONG WINAPI SCardGetAttrib(SCARDHANDLE,DWORD,LPBYTE,LPDWORD); +LONG WINAPI SCardGetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPSTR,LPDWORD); +LONG WINAPI SCardGetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPWSTR,LPDWORD); +#define SCardGetCardTypeProviderName WINELIB_NAME_AW(SCardGetCardTypeProviderName) +LONG WINAPI SCardGetProviderIdA(SCARDCONTEXT,LPCSTR,LPGUID); +LONG WINAPI SCardGetProviderIdW(SCARDCONTEXT,LPCWSTR,LPGUID); +#define SCardGetProviderId WINELIB_NAME_AW(SCardGetProviderId) +LONG WINAPI SCardGetStatusChangeA(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEA,DWORD); +LONG WINAPI SCardGetStatusChangeW(SCARDCONTEXT,DWORD,LPSCARD_READERSTATEW,DWORD); +#define SCardGetStatusChange WINELIB_NAME_AW(SCardGetStatusChange) +LONG WINAPI SCardIntroduceCardTypeA(SCARDCONTEXT,LPCSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); +LONG WINAPI SCardIntroduceCardTypeW(SCARDCONTEXT,LPCWSTR,LPCGUID,LPCGUID,DWORD,LPCBYTE,LPCBYTE,DWORD); +#define SCardIntroduceCardType WINELIB_NAME_AW(SCardIntroduceCardType) +LONG WINAPI SCardIntroduceReaderA(SCARDCONTEXT,LPCSTR,LPCSTR); +LONG WINAPI SCardIntroduceReaderW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardIntroduceReader WINELIB_NAME_AW(SCardIntroduceReader) +LONG WINAPI SCardIntroduceReaderGroupA(SCARDCONTEXT,LPCSTR); +LONG WINAPI SCardIntroduceReaderGroupW(SCARDCONTEXT,LPCWSTR); +#define SCardIntroduceReaderGroup WINELIB_NAME_AW(SCardIntroduceReaderGroup) +LONG WINAPI SCardIsValidContext(SCARDCONTEXT); +LONG WINAPI SCardListCardsA(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPSTR,LPDWORD); +LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPDWORD); +#define SCardListCards WINELIB_NAME_AW(SCardListCards) +LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD); +LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD); +#define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) +LONG WINAPI SCardListReadersA(SCARDCONTEXT,LPCSTR,LPSTR,LPDWORD); +LONG WINAPI SCardListReadersW(SCARDCONTEXT,LPCWSTR,LPWSTR,LPDWORD); +#define SCardListReaders WINELIB_NAME_AW(SCardListReaders) +LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD); +LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD); +#define SCardListReaderGroups WINELIB_NAME_AW(SCardListReaderGroups) +LONG WINAPI SCardLocateCardsA(SCARDCONTEXT,LPCSTR,LPSCARD_READERSTATEA,DWORD); +LONG WINAPI SCardLocateCardsW(SCARDCONTEXT,LPCWSTR,LPSCARD_READERSTATEW,DWORD); +#define SCardLocateCards WINELIB_NAME_AW(SCardLocateCards) +LONG WINAPI SCardLocateCardsByATRA(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEA,DWORD); +LONG WINAPI SCardLocateCardsByATRW(SCARDCONTEXT,LPSCARD_ATRMASK,DWORD,LPSCARD_READERSTATEW,DWORD); +#define SCardLocateCardsByATR WINELIB_NAME_AW(SCardLocateCardsByATR) +LONG WINAPI SCardReconnect(SCARDHANDLE,DWORD,DWORD,DWORD,LPDWORD); +LONG WINAPI SCardReleaseContext(SCARDCONTEXT); +void WINAPI SCardReleaseStartedEvent(void); +LONG WINAPI SCardRemoveReaderFromGroupA(SCARDCONTEXT,LPCSTR,LPCSTR); +LONG WINAPI SCardRemoveReaderFromGroupW(SCARDCONTEXT,LPCWSTR,LPCWSTR); +#define SCardRemoveReaderFromGroup WINELIB_NAME_AW(SCardRemoveReaderFromGroup) +LONG WINAPI SCardSetAttrib(SCARDHANDLE,DWORD,LPCBYTE,DWORD); +LONG WINAPI SCardSetCardTypeProviderNameA(SCARDCONTEXT,LPCSTR,DWORD,LPCSTR); +LONG WINAPI SCardSetCardTypeProviderNameW(SCARDCONTEXT,LPCWSTR,DWORD,LPCWSTR); +#define SCardSetCardTypeProviderName WINELIB_NAME_AW(SCardSetCardTypeProviderName) +LONG WINAPI SCardState(SCARDHANDLE,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +LONG WINAPI SCardStatusA(SCARDHANDLE,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +LONG WINAPI SCardStatusW(SCARDHANDLE,LPWSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD); +#define SCardStatus WINELIB_NAME_AW(SCardStatus) +LONG WINAPI SCardTransmit(SCARDHANDLE,LPCSCARD_IO_REQUEST,LPCBYTE,DWORD,LPSCARD_IO_REQUEST,LPBYTE,LPDWORD); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINSCARD_H */ diff --git a/include/winsmcrd.h b/include/winsmcrd.h new file mode 100644 index 0000000..60fdd3e --- /dev/null +++ b/include/winsmcrd.h @@ -0,0 +1,37 @@ +/* + * Winscard definitions + * + * 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_WINSMCRD_H +#define __WINE_WINSMCRD_H + +#define SCARD_PROTOCOL_UNDEFINED 0x00000000 +#define SCARD_PROTOCOL_OPTIMAL 0x00000000 +#define SCARD_PROTOCOL_T0 0x00000001 +#define SCARD_PROTOCOL_T1 0x00000002 +#define SCARD_PROTOCOL_RAW 0x00010000 +#define SCARD_PROTOCOL_DEFAULT 0x80000000 +#define SCARD_PROTOCOL_Tx (SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1) + +typedef struct _SCARD_IO_REQUEST +{ + DWORD dwProtocol; + DWORD cbPciLength; +} SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST; +typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST; + +#endif /* __WINE_WINSMCRD_H */

1 0

Vitaliy Margolen : dinput: Prevent race between destroying the hook window and unloading the dll.
by Alexandre Julliard May 15, 2007

May 15, 2007

Module: wine Branch: master Commit: 4659f98314ca7b97f17bcafe0eae965b94eaeb5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4659f98314ca7b97f17bcafe0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Mon May 14 19:56:48 2007 -0600 dinput: Prevent race between destroying the hook window and unloading the dll. --- dlls/dinput/dinput_main.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 789e6e7..402855e 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -753,6 +753,7 @@ static LRESULT CALLBACK dinput_hook_WndProc(HWND hWnd, UINT message, WPARAM wPar static HWND hook_thread_hwnd; static LONG hook_thread_refcount; +static HANDLE hook_thread; static const WCHAR classW[]={'H','o','o','k','_','L','L','_','C','L',0}; @@ -776,6 +777,7 @@ static DWORD WINAPI hook_thread_proc(void *param) } else ERR("Error creating message window\n"); + UnregisterClassW(classW, DINPUT_instance); return 0; } @@ -791,39 +793,36 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static BOOL create_hook_thread(void) { LONG ref; - static ATOM class_atom; EnterCriticalSection(&dinput_hook_crit); - if (!class_atom) + ref = ++hook_thread_refcount; + TRACE("Refcount %d\n", ref); + if (ref == 1) { + DWORD tid; + HANDLE event; + + /* Create window class */ WNDCLASSEXW wcex; memset(&wcex, 0, sizeof(wcex)); wcex.cbSize = sizeof(wcex); wcex.lpfnWndProc = dinput_hook_WndProc; wcex.lpszClassName = classW; - wcex.hInstance = GetModuleHandleW(0); - if (!(class_atom = RegisterClassExW(&wcex))) ERR("Error registering window class\n"); - } - - ref = ++hook_thread_refcount; - TRACE("Refcount %d\n", ref); - if (ref == 1) - { - DWORD tid; - HANDLE thread, event; + wcex.hInstance = DINPUT_instance; + if (!RegisterClassExW(&wcex)) + ERR("Error registering window class\n"); event = CreateEventW(NULL, FALSE, FALSE, NULL); - thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &tid); - if (event && thread) + hook_thread = CreateThread(NULL, 0, hook_thread_proc, &event, 0, &tid); + if (event && hook_thread) { HANDLE handles[2]; handles[0] = event; - handles[1] = thread; + handles[1] = hook_thread; WaitForMultipleObjects(2, handles, FALSE, INFINITE); } CloseHandle(event); - CloseHandle(thread); } LeaveCriticalSection(&dinput_hook_crit); @@ -842,6 +841,9 @@ static void release_hook_thread(void) HWND hwnd = hook_thread_hwnd; hook_thread_hwnd = 0; SendMessageW(hwnd, WM_USER+0x10, 0, 0); + /* wait for hook thread to exit */ + WaitForSingleObject(hook_thread, INFINITE); + CloseHandle(hook_thread); } LeaveCriticalSection(&dinput_hook_crit); }

1 0