February 2009 - Wine-Commits

Alexandre Julliard : dbghelp: Fix pool allocation routines to be able to support arbitrary sizes.
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: ae7490d362e684eb52d15c4351697bfe0b0510e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7490d362e684eb52d15c435… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 12:27:36 2009 +0100 dbghelp: Fix pool allocation routines to be able to support arbitrary sizes. Also move full arenas to a separate list to avoid searching through them again and again. --- dlls/dbghelp/dbghelp_private.h | 10 +++-- dlls/dbghelp/storage.c | 71 ++++++++++++++++++++++++--------------- 2 files changed, 50 insertions(+), 31 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 880aed9..77fb47e 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -29,6 +29,7 @@ #include "objbase.h" #include "oaidl.h" #include "winnls.h" +#include "wine/list.h" #include "wine/unicode.h" #include "cvconst.h" @@ -37,13 +38,14 @@ struct pool /* poor's man */ { - struct pool_arena* first; - unsigned arena_size; + struct list arena_list; + struct list arena_full; + size_t arena_size; }; -void pool_init(struct pool* a, unsigned arena_size); +void pool_init(struct pool* a, size_t arena_size); void pool_destroy(struct pool* a); -void* pool_alloc(struct pool* a, unsigned len); +void* pool_alloc(struct pool* a, size_t len); char* pool_strdup(struct pool* a, const char* str); struct vector diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c index ec8a37d..23a45e1 100644 --- a/dlls/dbghelp/storage.c +++ b/dlls/dbghelp/storage.c @@ -34,14 +34,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); struct pool_arena { - struct pool_arena* next; - char* current; + struct list entry; + char *current; + char *end; }; -void pool_init(struct pool* a, unsigned arena_size) +void pool_init(struct pool* a, size_t arena_size) { + list_init( &a->arena_list ); + list_init( &a->arena_full ); a->arena_size = arena_size; - a->first = NULL; } void pool_destroy(struct pool* pool) @@ -50,58 +52,73 @@ void pool_destroy(struct pool* pool) struct pool_arena* next; #ifdef USE_STATS - unsigned alloc, used, num; - + size_t alloc, used, num; + alloc = used = num = 0; - arena = pool->first; - while (arena) + LIST_FOR_EACH_ENTRY( arena, &pool->arena_list, struct pool_arena, entry ) + { + alloc += arena->end - (char *)arena; + used += arena->current - (char*)arena; + num++; + } + LIST_FOR_EACH_ENTRY( arena, &pool->arena_full, struct pool_arena, entry ) { - alloc += pool->arena_size; + alloc += arena->end - (char *)arena; 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); + FIXME("STATS: pool %p has allocated %u kbytes, used %u kbytes in %u arenas, non-allocation ratio: %.2f%%\n", + pool, (unsigned)(alloc >> 10), (unsigned)(used >> 10), (unsigned)num, + 100.0 - (float)used / (float)alloc * 100.0); #endif - arena = pool->first; - while (arena) + LIST_FOR_EACH_ENTRY_SAFE( arena, next, &pool->arena_list, struct pool_arena, entry ) { - next = arena->next; + list_remove( &arena->entry ); + HeapFree(GetProcessHeap(), 0, arena); + } + LIST_FOR_EACH_ENTRY_SAFE( arena, next, &pool->arena_full, struct pool_arena, entry ) + { + list_remove( &arena->entry ); HeapFree(GetProcessHeap(), 0, arena); - arena = next; } - pool_init(pool, 0); } -void* pool_alloc(struct pool* pool, unsigned len) +void* pool_alloc(struct pool* pool, size_t len) { struct pool_arena* arena; void* ret; + size_t size; len = (len + 3) & ~3; /* round up size on DWORD boundary */ - assert(sizeof(struct pool_arena) + len <= pool->arena_size && len); - for (arena = pool->first; arena; arena = arena->next) + LIST_FOR_EACH_ENTRY( arena, &pool->arena_list, struct pool_arena, entry ) { - if ((char*)arena + pool->arena_size - arena->current >= len) + if (arena->end - arena->current >= len) { ret = arena->current; arena->current += len; + if (arena->current + 16 >= arena->end) + { + list_remove( &arena->entry ); + list_add_tail( &pool->arena_full, &arena->entry ); + } return ret; } } - arena = HeapAlloc(GetProcessHeap(), 0, pool->arena_size); - if (!arena) {ERR("OOM\n");return NULL;} + size = max( pool->arena_size, len + sizeof(struct pool_arena) ); + arena = HeapAlloc(GetProcessHeap(), 0, size); + if (!arena) {ERR("OOM for %u\n", size);return NULL;} - ret = (char*)arena + sizeof(*arena); - arena->next = pool->first; - pool->first = arena; + ret = arena + 1; arena->current = (char*)ret + len; + arena->end = (char *)arena + size; + if (arena->current + 16 >= arena->end) + list_add_tail( &pool->arena_full, &arena->entry ); + else + list_add_head( &pool->arena_list, &arena->entry ); return ret; }

1 0

Alexandre Julliard : dbghelp: Allocate enough memory initially for regexps instead of growing the buffer .
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: e9610f674ca1e2a923e8f56ccf4b0238e5065b7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9610f674ca1e2a923e8f56cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 4 13:00:31 2009 +0100 dbghelp: Allocate enough memory initially for regexps instead of growing the buffer. --- dlls/dbghelp/symbol.c | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 4df69d1..5a05928 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -67,12 +67,6 @@ int symt_cmp_addr(const void* p1, const void* p2) return cmp_addr(a1, a2); } -static inline void re_append(char** mask, unsigned* len, char ch) -{ - *mask = HeapReAlloc(GetProcessHeap(), 0, *mask, ++(*len)); - (*mask)[*len - 2] = ch; -} - /* transforms a dbghelp's regular expression into a POSIX one * Here are the valid dbghelp reg ex characters: * * 0 or more characters @@ -84,42 +78,44 @@ static inline void re_append(char** mask, unsigned* len, char ch) */ static void compile_regex(const char* str, int numchar, regex_t* re, BOOL _case) { - char* mask = HeapAlloc(GetProcessHeap(), 0, 1); - unsigned len = 1; + char *mask, *p; BOOL in_escape = FALSE; unsigned flags = REG_NOSUB; - re_append(&mask, &len, '^'); + if (numchar == -1) numchar = strlen( str ); + + p = mask = HeapAlloc( GetProcessHeap(), 0, 2 * numchar + 3 ); + *p++ = '^'; while (*str && numchar--) { /* FIXME: this shouldn't be valid on '-' */ if (in_escape) { - re_append(&mask, &len, '\\'); - re_append(&mask, &len, *str); + *p++ = '\\'; + *p++ = *str; in_escape = FALSE; } else switch (*str) { case '\\': in_escape = TRUE; break; - case '*': re_append(&mask, &len, '.'); re_append(&mask, &len, '*'); break; - case '?': re_append(&mask, &len, '.'); break; - case '#': re_append(&mask, &len, '*'); break; + case '*': *p++ = '.'; *p++ = '*'; break; + case '?': *p++ = '.'; break; + case '#': *p++ = '*'; break; /* escape some valid characters in dbghelp reg exp:s */ - case '$': re_append(&mask, &len, '\\'); re_append(&mask, &len, '$'); break; + case '$': *p++ = '\\'; *p++ = '$'; break; /* +, [, ], - are the same in dbghelp & POSIX, use them as any other char */ - default: re_append(&mask, &len, *str); break; + default: *p++ = *str; break; } str++; } if (in_escape) { - re_append(&mask, &len, '\\'); - re_append(&mask, &len, '\\'); + *p++ = '\\'; + *p++ = '\\'; } - re_append(&mask, &len, '$'); - mask[len - 1] = '\0'; + *p++ = '$'; + *p = 0; if (_case) flags |= REG_ICASE; if (regcomp(re, mask, flags)) FIXME("Couldn't compile %s\n", mask); HeapFree(GetProcessHeap(), 0, mask);

1 0

David Adam : d3dx9_36: Remove useless traces.
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: 55d6f07e3199cfe6c5145adbda7aa021a7dd7ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d6f07e3199cfe6c5145adbd… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Wed Feb 4 08:52:52 2009 +0100 d3dx9_36: Remove useless traces. --- dlls/d3dx9_36/math.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index b8416c6..2bf301b 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -222,7 +222,7 @@ D3DXPLANE* WINAPI D3DXPlaneTransformArray( CONST D3DXMATRIX* matrix, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXPlaneTransform( (D3DXPLANE*)((char*)out + outstride * i), @@ -242,7 +242,7 @@ D3DXVECTOR4* WINAPI D3DXVec2TransformArray( CONST D3DXMATRIX* matrix, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXVec2Transform( (D3DXVECTOR4*)((char*)out + outstride * i), @@ -260,7 +260,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformCoordArray( CONST D3DXMATRIX* matrix, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXVec2TransformCoord( (D3DXVECTOR2*)((char*)out + outstride * i), @@ -278,7 +278,7 @@ D3DXVECTOR2* WINAPI D3DXVec2TransformNormalArray( CONST D3DXMATRIX *matrix, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXVec2TransformNormal( (D3DXVECTOR2*)((char*)out + outstride * i), @@ -299,7 +299,7 @@ D3DXVECTOR3* WINAPI D3DXVec3ProjectArray( CONST D3DXMATRIX* view, CONST D3DXMATRIX* world, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXVec3Project( (D3DXVECTOR3*)((char*)out + outstride * i), @@ -317,7 +317,7 @@ D3DXVECTOR4* WINAPI D3DXVec3TransformArray( CONST D3DXMATRIX* matrix, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXVec3Transform( (D3DXVECTOR4*)((char*)out + outstride * i), @@ -335,7 +335,7 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformCoordArray( CONST D3DXMATRIX* matrix, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXVec3TransformCoord( (D3DXVECTOR3*)((char*)out + outstride * i), @@ -353,7 +353,7 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray( CONST D3DXMATRIX* matrix, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXVec3TransformNormal( (D3DXVECTOR3*)((char*)out + outstride * i), @@ -372,7 +372,7 @@ D3DXVECTOR3* WINAPI D3DXVec3UnprojectArray( CONST D3DXMATRIX* view, CONST D3DXMATRIX* world, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXVec3Unproject( (D3DXVECTOR3*)((char*)out + outstride * i), @@ -390,7 +390,7 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray( CONST D3DXMATRIX* matrix, UINT elements) { UINT i; - TRACE("\n"); + for (i = 0; i < elements; ++i) { D3DXVec4Transform( (D3DXVECTOR4*)((char*)out + outstride * i),

1 0

Christian Costa : d3dxof: Fix object files size limitation by mapping them into memory.
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: 5bc9da3411cf2730186132f6d13643d0d5fa7972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc9da3411cf2730186132f6d… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Tue Feb 3 22:58:34 2009 +0100 d3dxof: Fix object files size limitation by mapping them into memory. --- dlls/d3dxof/d3dxof.c | 52 ++++++++++++++++++++++------------------- dlls/d3dxof/d3dxof_private.h | 2 + 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 6aa0032..fb52a19 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); #define XOFFILE_FORMAT_FLOAT_BITS_32 MAKEFOUR('0','0','3','2') #define XOFFILE_FORMAT_FLOAT_BITS_64 MAKEFOUR('0','0','6','4') -#define MAX_INPUT_SIZE 2000000 - static const struct IDirectXFileVtbl IDirectXFile_Vtbl; static const struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; static const struct IDirectXFileDataVtbl IDirectXFileData_Vtbl; @@ -130,8 +128,11 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV IDirectXFileEnumObjectImpl* object; HRESULT hr; DWORD header[4]; - DWORD size; HANDLE hFile = INVALID_HANDLE_VALUE; + HANDLE file_mapping = 0; + LPBYTE buffer = NULL; + DWORD file_size = 0; + LPDXFILELOADMEMORY lpdxflm = NULL; TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); @@ -150,17 +151,27 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV return DXFILEERR_FILENOTFOUND; } - if (!ReadFile(hFile, header, 16, &size, NULL)) + file_size = GetFileSize(hFile, NULL); + if (file_size < 16) { - hr = DXFILEERR_BADVALUE; + hr = DXFILEERR_BADFILETYPE; + goto error; + } + + file_mapping = CreateFileMappingA(hFile, NULL, PAGE_READONLY, 0, 0, NULL); + if (!file_mapping) + { + hr = DXFILEERR_BADFILETYPE; goto error; } - if (size < 16) + buffer = MapViewOfFile(file_mapping, FILE_MAP_READ, 0, 0, 0); + if (!buffer) { hr = DXFILEERR_BADFILETYPE; goto error; } + memcpy(header, buffer, 16); } else if (dwLoadOptions == DXFILELOAD_FROMMEMORY) { @@ -224,6 +235,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV object->source = dwLoadOptions; object->hFile = hFile; + object->file_mapping = file_mapping; + object->buffer = buffer; object->pDirectXFile = This; object->buf.pdxf = This; object->buf.txt = (header[2] == XOFFILE_FORMAT_TEXT); @@ -232,22 +245,8 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV if (dwLoadOptions == DXFILELOAD_FROMFILE) { - object->buf.buffer = HeapAlloc(GetProcessHeap(), 0, MAX_INPUT_SIZE+1); - if (!object->buf.buffer) - { - ERR("Out of memory\n"); - hr = DXFILEERR_BADALLOC; - goto error; - } - - ReadFile(hFile, object->buf.buffer, MAX_INPUT_SIZE+1, &object->buf.rem_bytes, NULL); - if (object->buf.rem_bytes > MAX_INPUT_SIZE) - { - FIXME("File size > %d not supported yet\n", MAX_INPUT_SIZE); - HeapFree(GetProcessHeap(), 0, object->buf.buffer); - hr = DXFILEERR_PARSEERROR; - goto error; - } + object->buf.buffer = buffer + 16; + object->buf.rem_bytes = file_size - 16; } else { @@ -255,7 +254,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV object->buf.rem_bytes = lpdxflm->dSize; } - TRACE("Read %d bytes\n", object->buf.rem_bytes); + TRACE("Object size is %d bytes\n", object->buf.rem_bytes + 16); *ppEnumObj = (LPDIRECTXFILEENUMOBJECT)object; @@ -286,6 +285,10 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV return DXFILE_OK; error: + if (buffer) + UnmapViewOfFile(buffer); + if (file_mapping) + CloseHandle(file_mapping); if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); *ppEnumObj = NULL; @@ -972,7 +975,8 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i } if (This->source == DXFILELOAD_FROMFILE) { - HeapFree(GetProcessHeap(), 0, This->buf.buffer); + UnmapViewOfFile(This->buffer); + CloseHandle(This->file_mapping); CloseHandle(This->hFile); } HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 585f9d5..978b312 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -149,6 +149,8 @@ typedef struct { LONG ref; DXFILELOADOPTIONS source; HANDLE hFile; + HANDLE file_mapping; + LPBYTE buffer; parse_buffer buf; IDirectXFileImpl* pDirectXFile; ULONG nb_xobjects;

1 0

Dmitry Timoshkov : mlang: Get rid of ICOM_THIS_MULTI macro.
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: 0d65421b993e4e056d408b15a96530c097d6eaae URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d65421b993e4e056d408b15a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Feb 4 15:25:19 2009 +0800 mlang: Get rid of ICOM_THIS_MULTI macro. --- dlls/mlang/mlang.c | 166 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 111 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d65421b993e4e056d408…

1 0

Florian Tobias Schandinat : winedos: Improve PIT emulation.
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: edbd4885542e4545439906df950a68dc48e70839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edbd4885542e4545439906df9… Author: Florian Tobias Schandinat <FlorianSchandinat(a)gmx.de> Date: Tue Feb 3 18:26:04 2009 +0100 winedos: Improve PIT emulation. --- dlls/winedos/ioports.c | 193 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 139 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=edbd4885542e454543990…

1 0

Michael Stefaniuc : include: Change some DWORD to DWORD_PTR in mmddk.h.
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: 3415f7788cb01a83f798cf8a0e617306c33329fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3415f7788cb01a83f798cf8a0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 4 00:56:28 2009 +0100 include: Change some DWORD to DWORD_PTR in mmddk.h. This matches the DDK and removes 14 Win64 compile warnings. --- dlls/wineoss.drv/audio.c | 2 +- dlls/winmm/mci.c | 6 +++--- dlls/winmm/winemm.h | 2 +- dlls/winmm/winmm.c | 2 +- include/mmddk.h | 19 ++++++++++--------- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index d4c9095..f512510 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -1965,7 +1965,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) audio_buf_info info; DWORD ret; - TRACE("(%u, %p[cb=%08x], %08X);\n", wDevID, lpDesc, lpDesc->dwCallback, dwFlags); + TRACE("(%u, %p[cb=%08lx], %08X);\n", wDevID, lpDesc, lpDesc->dwCallback, dwFlags); if (lpDesc == NULL) { WARN("Invalid Parameter !\n"); return MMSYSERR_INVALPARAM; diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index dfb0ba7..b231159 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -2185,7 +2185,7 @@ BOOL WINAPI mciDriverNotify(HWND hWndCallBack, MCIDEVICEID wDevID, UINT wStatus) /************************************************************************** * mciGetDriverData [WINMM.@] */ -DWORD WINAPI mciGetDriverData(MCIDEVICEID uDeviceID) +DWORD_PTR WINAPI mciGetDriverData(MCIDEVICEID uDeviceID) { LPWINE_MCIDRIVER wmd; @@ -2204,11 +2204,11 @@ DWORD WINAPI mciGetDriverData(MCIDEVICEID uDeviceID) /************************************************************************** * mciSetDriverData [WINMM.@] */ -BOOL WINAPI mciSetDriverData(MCIDEVICEID uDeviceID, DWORD data) +BOOL WINAPI mciSetDriverData(MCIDEVICEID uDeviceID, DWORD_PTR data) { LPWINE_MCIDRIVER wmd; - TRACE("(%04x, %08x)\n", uDeviceID, data); + TRACE("(%04x, %08lx)\n", uDeviceID, data); wmd = MCI_GetDriver(uDeviceID); diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 3ddff08..ce6a649 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -141,7 +141,7 @@ typedef struct tagWINE_MCIDRIVER { LPWSTR lpstrDeviceType; LPWSTR lpstrAlias; HDRVR hDriver; - DWORD dwPrivate; + DWORD_PTR dwPrivate; YIELDPROC lpfnYieldProc; DWORD dwYieldData; BOOL bIs32; diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index d9bd190..02dd5ed 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -2096,7 +2096,7 @@ UINT WAVE_Open(HANDLE* lphndl, UINT uDeviceID, UINT uType, wod.dwInstance = dwInstance; wod.dnDevNode = 0L; - TRACE("cb=%08x\n", wod.dwCallback); + TRACE("cb=%08lx\n", wod.dwCallback); for (;;) { if (dwFlags & WAVE_MAPPED) { diff --git a/include/mmddk.h b/include/mmddk.h index c2ed4fc..33a93b2 100644 --- a/include/mmddk.h +++ b/include/mmddk.h @@ -389,10 +389,10 @@ typedef struct { typedef struct { HWAVE hWave; LPWAVEFORMATEX lpFormat; - DWORD dwCallback; - DWORD dwInstance; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; UINT uMappedDeviceID; - DWORD dnDevNode; + DWORD_PTR dnDevNode; } WAVEOPENDESC, *LPWAVEOPENDESC; typedef struct { @@ -402,9 +402,9 @@ typedef struct { typedef struct { HMIDI hMidi; - DWORD dwCallback; - DWORD dwInstance; - DWORD dnDevNode; + DWORD_PTR dwCallback; + DWORD_PTR dwInstance; + DWORD_PTR dnDevNode; DWORD cIds; MIDIOPENSTRMID rgIds; } MIDIOPENDESC, *LPMIDIOPENDESC; @@ -415,6 +415,7 @@ typedef struct tMIXEROPENDESC LPVOID pReserved0; DWORD_PTR dwCallback; DWORD_PTR dwInstance; + DWORD_PTR dnDevNode; } MIXEROPENDESC, *LPMIXEROPENDESC; typedef struct { @@ -433,8 +434,8 @@ typedef struct { DECL_WINELIB_TYPE_AW(MCI_OPEN_DRIVER_PARMS) DECL_WINELIB_TYPE_AW(LPMCI_OPEN_DRIVER_PARMS) -DWORD WINAPI mciGetDriverData(UINT uDeviceID); -BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD dwData); +DWORD_PTR WINAPI mciGetDriverData(UINT uDeviceID); +BOOL WINAPI mciSetDriverData(UINT uDeviceID, DWORD_PTR dwData); UINT WINAPI mciDriverYield(UINT uDeviceID); BOOL WINAPI mciDriverNotify(HWND hwndCallback, UINT uDeviceID, UINT uStatus); @@ -453,7 +454,7 @@ BOOL WINAPI mciFreeCommandResource(UINT uTable); BOOL WINAPI DriverCallback(DWORD_PTR dwCallBack, DWORD uFlags, HDRVR hDev, DWORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2); -typedef VOID (*LPTASKCALLBACK)(DWORD dwInst); +typedef VOID (*LPTASKCALLBACK)(DWORD_PTR dwInst); #define TASKERR_NOTASKSUPPORT 1 #define TASKERR_OUTOFMEMORY 2

1 0

Michael Stefaniuc : twain_32/tests: Don't leak memory on an error path ( Smatch).
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: f02f39f60c9843e16b741ce69a7361dc5e831d0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02f39f60c9843e16b741ce69… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 4 00:56:39 2009 +0100 twain_32/tests: Don't leak memory on an error path (Smatch). --- dlls/twain_32/tests/dsm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index cf9acef..8f8e926 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -87,7 +87,10 @@ static TW_HANDLE alloc_and_set_onevalue(TW_UINT32 val, TW_UINT16 type) GlobalUnlock(hcontainer); } else + { + GlobalFree(hcontainer); hcontainer = 0; + } } return hcontainer; }

1 0

Aric Stewart : advapi32: Add Security Label sids used by IE7.
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: 8dc84666a67171670f722513a4fd84625145ebba URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc84666a67171670f722513a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 3 12:55:14 2009 -0600 advapi32: Add Security Label sids used by IE7. --- dlls/advapi32/security.c | 4 ++++ include/winnt.h | 25 ++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 43d6d07..ee06270 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -130,6 +130,10 @@ static const WELLKNOWNSID WellKnownSids[] = { {0,0}, WinBuiltinAuthorizationAccessSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS } } }, { {0,0}, WinBuiltinTerminalServerLicenseServersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS } } }, { {0,0}, WinBuiltinDCOMUsersSid, { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_DCOM_USERS } } }, + { {'L','W'}, WinLowLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_LOW_RID} } }, + { {'M','E'}, WinMediumLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_MEDIUM_RID } } }, + { {'H','I'}, WinHighLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_HIGH_RID } } }, + { {'S','I'}, WinSystemLabelSid, { SID_REVISION, 1, { SECURITY_MANDATORY_LABEL_AUTHORITY}, { SECURITY_MANDATORY_SYSTEM_RID } } }, }; /* these SIDs must be constructed as relative to some domain - only the RID is well-known */ diff --git a/include/winnt.h b/include/winnt.h index 6dadf9e..69c4b10 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3885,6 +3885,14 @@ typedef struct _SID_AND_ATTRIBUTES { #define DOMAIN_GROUP_RID_ENTERPRISE_ADMINS 0x00000207L #define DOMAIN_GROUP_RID_POLICY_ADMINS 0x00000208L +#define SECURITY_MANDATORY_LABEL_AUTHORITY {0,0,0,0,0,16} +#define SECURITY_MANDATORY_UNTRUSTED_RID 0x00000000L +#define SECURITY_MANDATORY_LOW_RID 0x00001000L +#define SECURITY_MANDATORY_MEDIUM_RID 0x00002000L +#define SECURITY_MANDATORY_HIGH_RID 0x00003000L +#define SECURITY_MANDATORY_SYSTEM_RID 0x00004000L +#define SECURITY_MANDATORY_PROTECTED_PROCESS_RID 0x00005000L + #define DOMAIN_ALIAS_RID_ADMINS 0x00000220L #define DOMAIN_ALIAS_RID_USERS 0x00000221L #define DOMAIN_ALIAS_RID_GUESTS 0x00000222L @@ -3975,7 +3983,22 @@ typedef enum { WinBuiltinPerfLoggingUsersSid = 58, WinBuiltinAuthorizationAccessSid = 59, WinBuiltinTerminalServerLicenseServersSid = 60, - WinBuiltinDCOMUsersSid = 61 + WinBuiltinDCOMUsersSid = 61, + WinBuiltinIUsersSid = 62, + WinIUserSid = 63, + WinBuiltinCryptoOperatorsSid = 64, + WinUntrustedLabelSid = 65, + WinLowLabelSid = 66, + WinMediumLabelSid = 67, + WinHighLabelSid = 68, + WinSystemLabelSid = 69, + WinWriteRestrictedCodeSid = 70, + WinCreatorOwnerRightsSid = 71, + WinCacheablePrincipalsGroupSid = 72, + WinNonCacheablePrincipalsGroupSid = 73, + WinEnterpriseReadonlyControllersSid = 74, + WinAccountReadonlyControllersSid = 75, + WinBuiltinEventLogReadersGroup = 76, } WELL_KNOWN_SID_TYPE; /*

1 0

Juan Lang : wintrust: Use GetSystemDirectory rather than GetWindowsDirectory to find the CatRoot directories .
by Alexandre Julliard Feb. 4, 2009

Feb. 4, 2009

Module: wine Branch: master Commit: 2d0e58642510129569a966c94dd781c0868a1b26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d0e58642510129569a966c94… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 3 08:04:15 2009 -0800 wintrust: Use GetSystemDirectory rather than GetWindowsDirectory to find the CatRoot directories. --- dlls/wintrust/tests/crypt.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 64211f1..1d7f30e 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -1079,7 +1079,7 @@ START_TEST(crypt) { int myARGC; char** myARGV; - char windir[MAX_PATH]; + char sysdir[MAX_PATH]; InitFunctionPtrs(); @@ -1089,11 +1089,11 @@ START_TEST(crypt) return; } - GetWindowsDirectoryA(windir, MAX_PATH); - lstrcpyA(catroot, windir); - lstrcatA(catroot, "\\system32\\CatRoot"); - lstrcpyA(catroot2, windir); - lstrcatA(catroot2, "\\system32\\CatRoot2"); + GetSystemDirectoryA(sysdir, MAX_PATH); + lstrcpyA(catroot, sysdir); + lstrcatA(catroot, "\\CatRoot"); + lstrcpyA(catroot2, sysdir); + lstrcatA(catroot2, "\\CatRoot2"); myARGC = winetest_get_mainargs(&myARGV); strcpy(selfname, myARGV[0]);

1 0