January 2013 - Wine-Commits

Ken Thomases : winemac: Add WineEventQueue class for conveying events from Cocoa to Wine threads.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 3c995bb682966aa07728a3174b137076e8da12bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c995bb682966aa07728a3174… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 21 00:07:51 2013 -0600 winemac: Add WineEventQueue class for conveying events from Cocoa to Wine threads. --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_app.h | 10 ++ dlls/winemac.drv/cocoa_app.m | 39 ++++++ dlls/winemac.drv/cocoa_event.h | 36 +++++ dlls/winemac.drv/cocoa_event.m | 283 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 23 +++ 6 files changed, 392 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c995bb682966aa07728a…

1 0

André Hentschel : ntdll: Implement IMAGE_REL_BASED_THUMB_MOV32 relocation on ARM.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 0993f8bb7b138063d6202e2ce4a4a61e4b9fc537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0993f8bb7b138063d6202e2ce… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 20 18:02:10 2013 +0100 ntdll: Implement IMAGE_REL_BASED_THUMB_MOV32 relocation on ARM. --- dlls/ntdll/loader.c | 38 ++++++++++++++++++++++++++++++++++++++ include/winnt.h | 2 ++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fd63e08..28ed9f4 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2175,6 +2175,44 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count case IMAGE_REL_BASED_DIR64: *(INT_PTR *)((char *)page + offset) += delta; break; +#elif defined(__arm__) + case IMAGE_REL_BASED_THUMB_MOV32: + { + DWORD inst = *(INT_PTR *)((char *)page + offset); + DWORD imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + + if ((inst & 0x8000fbf0) != 0x0000f240) + ERR("wrong Thumb2 instruction %08x, expected MOVW\n", inst); + + imm16 += LOWORD(delta); + if (imm16 > 0xffff) + ERR("resulting immediate value won't fit: %08x\n", imm16); + *(INT_PTR *)((char *)page + offset) = (inst & 0x8f00fbf0) + ((imm16 >> 1) & 0x0400) + + ((imm16 >> 12) & 0x000f) + + ((imm16 << 20) & 0x70000000) + + ((imm16 << 16) & 0x0f0000); + + if (delta > 0xffff) + { + inst = *(INT_PTR *)((char *)page + offset + 4); + imm16 = ((inst << 1) & 0x0800) + ((inst << 12) & 0xf000) + + ((inst >> 20) & 0x0700) + ((inst >> 16) & 0x000f); + + if ((inst & 0x8000fbf0) != 0x0000f2c0) + ERR("wrong Thumb2 instruction %08x, expected MOVT\n", inst); + + imm16 += HIWORD(delta); + if (imm16 > 0xffff) + ERR("resulting immediate value won't fit: %08x\n", imm16); + *(INT_PTR *)((char *)page + offset + 4) = (inst & 0x8f00fbf0) + + ((imm16 >> 1) & 0x0400) + + ((imm16 >> 12) & 0x000f) + + ((imm16 << 20) & 0x70000000) + + ((imm16 << 16) & 0x0f0000); + } + } + break; #endif default: FIXME("Unknown/unsupported fixup type %x.\n", type); diff --git a/include/winnt.h b/include/winnt.h index f2bf990..d4e5cb4 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3101,9 +3101,11 @@ typedef struct _IMAGE_RELOCATION #define IMAGE_REL_BASED_HIGHADJ 4 #define IMAGE_REL_BASED_MIPS_JMPADDR 5 #define IMAGE_REL_BASED_ARM_MOV32A 5 /* yes, 5 too */ +#define IMAGE_REL_BASED_ARM_MOV32 5 /* yes, 5 too */ #define IMAGE_REL_BASED_SECTION 6 #define IMAGE_REL_BASED_REL 7 #define IMAGE_REL_BASED_ARM_MOV32T 7 /* yes, 7 too */ +#define IMAGE_REL_BASED_THUMB_MOV32 7 /* yes, 7 too */ #define IMAGE_REL_BASED_MIPS_JMPADDR16 9 #define IMAGE_REL_BASED_IA64_IMM64 9 /* yes, 9 too */ #define IMAGE_REL_BASED_DIR64 10

1 0

Nikolay Sivov : advapi32: Make it possible to free data buffer returned from LsaLookupSids().
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: af641dc94ca0e2cd0afa8aa3ad625e79345bfde4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af641dc94ca0e2cd0afa8aa3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 19 23:26:05 2013 +0400 advapi32: Make it possible to free data buffer returned from LsaLookupSids(). --- dlls/advapi32/advapi32_misc.h | 18 +++++ dlls/advapi32/lsa.c | 169 +++++++++++++++++++++++++++++++++-------- dlls/advapi32/tests/lsa.c | 52 +++++++++++++ 3 files changed, 208 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af641dc94ca0e2cd0afa8…

1 0

André Hentschel : include: Fix __int64 definition for ARM64.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 0066f31ef7c27a45968441c17fe270fb3fa2f4c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0066f31ef7c27a45968441c17… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 18 17:51:46 2013 +0100 include: Fix __int64 definition for ARM64. --- include/wine/port.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 1bcc0e5..bd6f513 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -55,7 +55,7 @@ */ #if !defined(_MSC_VER) && !defined(__int64) -# if defined(__x86_64__) || defined(_WIN64) +# if defined(__x86_64__) || defined(__aarch64__) || defined(_WIN64) # define __int64 long # else # define __int64 long long

1 0

Alexandre Julliard : winapi: Add arm64 architecture.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: dadcacf99a6d6dfb5fcb3e90644f39d85a77b64f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dadcacf99a6d6dfb5fcb3e906… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 21 12:26:11 2013 +0100 winapi: Add arm64 architecture. --- tools/winapi/winapi.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/winapi.pm b/tools/winapi/winapi.pm index 2ce998f..2eac716 100644 --- a/tools/winapi/winapi.pm +++ b/tools/winapi/winapi.pm @@ -279,7 +279,7 @@ sub parse_spec_file($$) { } my $ordinal; - my $ARCHES="arm|i386|powerpc|sparc|win32|win64|x86_64"; + my $ARCHES="arm|i386|powerpc|sparc|win32|win64|x86_64|arm64"; if(/^(\d+|@)\s+ (cdecl|pascal|stdcall|varargs|thiscall)\s+ ((?:(?:-arch=(?:$ARCHES)(?:,(?:$ARCHES))*|-noname|-norelay|-ordinal|-i386|-ret16|-ret64|-register|-interrupt|-private)\s+)*)(\S+)\s*$\s*(.*?)\s*$\s*(\S*)$/x)

1 0

Andrew Talbot : gdi32: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: f98f70fb418dff1cd0c906ed9bcd2232fba47a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f98f70fb418dff1cd0c906ed9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Jan 19 23:12:49 2013 +0000 gdi32: Avoid signed-unsigned integer comparisons. --- dlls/gdi32/bidi.c | 5 +++-- dlls/gdi32/dib.c | 2 +- dlls/gdi32/font.c | 7 ++++--- dlls/gdi32/freetype.c | 2 +- dlls/gdi32/painting.c | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 00dce45..1d6be53 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -358,7 +358,8 @@ BOOL BIDI_Reorder( { WORD *chartype; BYTE *levels; - unsigned i, done, glyph_i; + INT i, done; + unsigned glyph_i; BOOL is_complex; int maxItems; @@ -501,7 +502,7 @@ BOOL BIDI_Reorder( glyph_i = 0; while (done < uCount) { - unsigned j; + INT j; classify(lpString + done, chartype, uCount - done); /* limit text to first block */ i = resolveParagraphs(chartype, uCount - done); diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index e5361c1..ad2a4dc 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -305,7 +305,7 @@ static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y ) static BOOL build_rle_bitmap( const BITMAPINFO *info, struct gdi_image_bits *bits, HRGN *clip ) { - int i = 0; + DWORD i = 0; int left, right; int x, y, width = info->bmiHeader.biWidth, height = info->bmiHeader.biHeight; HRGN run = NULL; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index fdd16e3..68559f1 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -1734,7 +1734,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, { static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; UINT indices[3] = {0, 0, 0x20}; - int i; + unsigned int i; DWORD ret, size; int stride; @@ -1775,7 +1775,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags, static RECT get_total_extents( HDC hdc, INT x, INT y, UINT flags, UINT aa_flags, LPCWSTR str, UINT count, const INT *dx ) { - int i; + UINT i; RECT rect, bounds; reset_bounds( &bounds ); @@ -1814,7 +1814,8 @@ static void draw_glyph( HDC hdc, INT origin_x, INT origin_y, const GLYPHMETRICS const struct gdi_image_bits *image, const RECT *clip ) { static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; - UINT x, y, i, count, max_count; + UINT i, count, max_count; + LONG x, y; BYTE *ptr = image->ptr; int stride = get_dib_stride( metrics->gmBlackBoxX, 1 ); POINT *pts; diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 639fb63..40cf080 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5316,7 +5316,7 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha ENUMLOGFONTEXW elf; NEWTEXTMETRICEXW ntm; DWORD type = 0; - int i; + DWORD i; GetEnumStructs(face, face->family->FamilyName, &elf, &ntm, &type); for(i = 0; i < list->total; i++) { diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 354bea9..f978001 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -140,7 +140,8 @@ BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) { POINT *line_pts = NULL, *bzr_pts = NULL, bzr[4]; - INT i, num_pts, num_bzr_pts, space, size; + DWORD i; + INT num_pts, num_bzr_pts, space, size; /* check for valid point types */ for (i = 0; i < count; i++)

1 0

Aric Stewart : usp10: Group the GDEF table loading with the other opentype tables.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: 287243a9b9d4b99236d6953dab4fd08f03ab4b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=287243a9b9d4b99236d6953da… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 18 10:35:24 2013 -0600 usp10: Group the GDEF table loading with the other opentype tables. --- dlls/usp10/opentype.c | 20 +------------------- dlls/usp10/shape.c | 39 +++++++++++++++++++++++++++------------ dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 29 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=287243a9b9d4b99236d69…

1 0

Aric Stewart : usp10: GPOS Mark to Base seeks back in the string to the first glyph that is not a mark for its base .
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: c1f190a0c5e2f61cb9ed3ba923116c307df9ac55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f190a0c5e2f61cb9ed3ba92… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 18 10:35:32 2013 -0600 usp10: GPOS Mark to Base seeks back in the string to the first glyph that is not a mark for its base. --- dlls/usp10/opentype.c | 53 ++++++++++++++++++++++++++++-------------- dlls/usp10/shape.c | 7 ++--- dlls/usp10/usp10_internal.h | 3 +- 3 files changed, 39 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1f190a0c5e2f61cb9ed3…

1 0

Nikolay Sivov : advapi32: Fix LsaLookupNames2() regarding referenced domain list allocation.
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: f8aabe2247e6b899f9360be69a56c919513b6e87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8aabe2247e6b899f9360be69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 19 23:39:12 2013 +0400 advapi32: Fix LsaLookupNames2() regarding referenced domain list allocation. --- dlls/advapi32/lsa.c | 58 ++++++++++++-------------------------------------- 1 files changed, 14 insertions(+), 44 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 45cc48e..5c3ffc4 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -311,39 +311,6 @@ static BOOL lookup_name( LSA_UNICODE_STRING *name, SID *sid, DWORD *sid_size, WC return ret; } -static INT build_domain(PLSA_REFERENCED_DOMAIN_LIST currentList, PLSA_UNICODE_STRING domain) -{ - ULONG count; - ULONG sid_size = 0,domain_size = 0; - BOOL handled = FALSE; - SID_NAME_USE use; - - for (count = 0; count < currentList->Entries; count ++) - { - if ((currentList->Domains[count].Name.Length == domain->Length) && - (strncmpiW(currentList->Domains[count].Name.Buffer,domain->Buffer,(domain->Length / sizeof(WCHAR))) == 0)) - { - HeapFree(GetProcessHeap(),0,domain->Buffer); - return count; - } - } - - if (currentList->Entries > 0) - currentList->Domains = HeapReAlloc(GetProcessHeap(),0,currentList->Domains, (currentList->Entries + 1) * sizeof(LSA_TRUST_INFORMATION)); - else - currentList->Domains = HeapAlloc(GetProcessHeap(),0,sizeof(LSA_TRUST_INFORMATION)); - - currentList->Domains[currentList->Entries].Name = *domain; - - lookup_name( domain, NULL, &sid_size, NULL, &domain_size, &use, &handled ); - domain_size = 0; - currentList->Domains[currentList->Entries].Sid = HeapAlloc(GetProcessHeap(),0,sid_size); - lookup_name( domain, currentList->Domains[currentList->Entries].Sid, &sid_size, NULL, &domain_size, &use, &handled ); - - currentList->Entries++; - return currentList->Entries-1; -} - /* Adds domain info to referenced domain list. Domain list is stored as plain buffer, layout is: @@ -402,9 +369,10 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, PLSA_UNICODE_STRING names, PLSA_REFERENCED_DOMAIN_LIST *domains, PLSA_TRANSLATED_SID2 *sids ) { - ULONG i, sid_size_total = 0, domain_size_max = 0, size; + ULONG i, sid_size_total = 0, domain_size_max = 0, size, domainname_size_total = 0; ULONG sid_size, domain_size, mapped; BOOL handled = FALSE; + char *domain_data; SID_NAME_USE use; SID *sid; @@ -419,6 +387,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, if (handled) { sid_size_total += sid_size; + domainname_size_total += domain_size; if (domain_size) { if (domain_size > domain_size_max) @@ -430,17 +399,20 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, TRACE("mapped %u out of %u\n", mapped, count); size = sizeof(LSA_TRANSLATED_SID2) * count + sid_size_total; - if (!(*sids = HeapAlloc( GetProcessHeap(), 0, size) )) return STATUS_NO_MEMORY; + if (!(*sids = heap_alloc(size))) return STATUS_NO_MEMORY; sid = (SID *)(*sids + count); - if (!(*domains = HeapAlloc( GetProcessHeap(), 0, sizeof(LSA_REFERENCED_DOMAIN_LIST) ))) + /* use maximum domain count */ + if (!(*domains = heap_alloc(sizeof(LSA_REFERENCED_DOMAIN_LIST) + sizeof(LSA_TRUST_INFORMATION)*count + + sid_size_total + domainname_size_total))) { - HeapFree( GetProcessHeap(), 0, *sids ); + heap_free(*sids); return STATUS_NO_MEMORY; } (*domains)->Entries = 0; - (*domains)->Domains = NULL; + (*domains)->Domains = (LSA_TRUST_INFORMATION*)((char*)*domains + sizeof(LSA_REFERENCED_DOMAIN_LIST)); + domain_data = (char*)(*domains)->Domains + sizeof(LSA_TRUST_INFORMATION)*count; for (i = 0; i < count; i++) { @@ -448,7 +420,7 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, domain.Length = domain_size_max*sizeof(WCHAR); domain.MaximumLength = domain_size_max*sizeof(WCHAR); - domain.Buffer = HeapAlloc(GetProcessHeap(),0,domain.Length); + domain.Buffer = heap_alloc(domain.Length); (*sids)[i].Use = SidTypeUnknown; (*sids)[i].DomainIndex = -1; @@ -468,13 +440,11 @@ NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, if (domain_size) { domain.Length = domain_size * sizeof(WCHAR); - (*sids)[i].DomainIndex = build_domain(*domains, &domain); + (*sids)[i].DomainIndex = lsa_reflist_add_domain(*domains, &domain, &domain_data); } - else - HeapFree(GetProcessHeap(),0,domain.Buffer); } - else - HeapFree(GetProcessHeap(),0,domain.Buffer); + + heap_free(domain.Buffer); } if (mapped == count) return STATUS_SUCCESS;

1 0

Marcus Meissner : dmusic: Actually return the allocated interface (Coverity ).
by Alexandre Julliard Jan. 21, 2013

Jan. 21, 2013

Module: wine Branch: master Commit: dfa88a21c95c55f0bf7ca659f852315b08499647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa88a21c95c55f0bf7ca659f… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 13:09:41 2013 +0100 dmusic: Actually return the allocated interface (Coverity). --- dlls/dmusic/download.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index b306513..cc2b024 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -101,6 +101,6 @@ HRESULT DMUSIC_CreateDirectMusicDownloadImpl(const GUID *guid, void **ret_iface, download->IDirectMusicDownload_iface.lpVtbl = &DirectMusicDownload_Vtbl; download->ref = 1; - + *ret_iface = download; return S_OK; }

1 0