July 2011 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : oleaut32: Implement ICreateTypeInfo2 SetHelpStringContext.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 1a74194f9ed29ea2fbaa8b2df3632c0c69e8c016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a74194f9ed29ea2fbaa8b2df… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Jun 27 22:26:30 2011 +1000 oleaut32: Implement ICreateTypeInfo2 SetHelpStringContext. --- dlls/oleaut32/typelib2.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 3cbd4b5..d319ede 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3070,10 +3070,15 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeCustData( */ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpStringContext( ICreateTypeInfo2* iface, /* [I] The typeinfo on which to set the help string context. */ - ULONG dwHelpStringContext) /* [I] The help string context. */ + ULONG helpcontext) /* [I] The help string context. */ { - FIXME("(%p,%d), stub!\n", iface, dwHelpStringContext); - return E_OUTOFMEMORY; + ICreateTypeInfo2Impl *This = impl_from_ICreateTypeInfo2(iface); + + TRACE("(%p, %d)\n", iface, helpcontext); + + This->typelib->typelib_header.helpcontext = helpcontext; + + return S_OK; } /******************************************************************************

1 0

Alexandre Julliard : wineps.drv: Pass a generic PHYSDEV to all graphics functions.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 10dcba499faeb6788201f443fa86f7cd74f87291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10dcba499faeb6788201f443f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 7 13:29:17 2011 +0200 wineps.drv: Pass a generic PHYSDEV to all graphics functions. --- dlls/wineps.drv/bitblt.c | 33 +++--- dlls/wineps.drv/bitmap.c | 100 ++++++++++---------- dlls/wineps.drv/brush.c | 109 +++++++++++---------- dlls/wineps.drv/builtin.c | 29 ++++-- dlls/wineps.drv/clipping.c | 26 +++--- dlls/wineps.drv/color.c | 14 ++- dlls/wineps.drv/download.c | 45 +++++---- dlls/wineps.drv/escape.c | 55 ++++++---- dlls/wineps.drv/font.c | 17 ++-- dlls/wineps.drv/graphics.c | 234 ++++++++++++++++++++++---------------------- dlls/wineps.drv/init.c | 12 ++- dlls/wineps.drv/pen.c | 21 +++-- dlls/wineps.drv/ps.c | 234 +++++++++++++++++++++++--------------------- dlls/wineps.drv/psdrv.h | 124 ++++++++++++------------ dlls/wineps.drv/text.c | 50 +++++----- dlls/wineps.drv/type1.c | 19 ++-- dlls/wineps.drv/type42.c | 50 +++++----- 17 files changed, 612 insertions(+), 560 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10dcba499faeb6788201f…

1 0

Alexandre Julliard : wineps.drv: Use the HDC from the gdi_physdev structure .
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: b49aaf1fed69ce9c2e259bb2f7fc9fbd76b4bc4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49aaf1fed69ce9c2e259bb2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 7 12:47:05 2011 +0200 wineps.drv: Use the HDC from the gdi_physdev structure. --- dlls/wineps.drv/brush.c | 8 ++++---- dlls/wineps.drv/builtin.c | 6 +++--- dlls/wineps.drv/clipping.c | 6 +++--- dlls/wineps.drv/download.c | 20 ++++++++++---------- dlls/wineps.drv/escape.c | 2 +- dlls/wineps.drv/graphics.c | 4 ++-- dlls/wineps.drv/init.c | 5 ++--- dlls/wineps.drv/pen.c | 4 ++-- dlls/wineps.drv/ps.c | 4 ++-- dlls/wineps.drv/psdrv.h | 1 - 10 files changed, 29 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b49aaf1fed69ce9c2e259…

1 0

Austin Lund : include: Added OBJECT_TYPE_INFORMATION to winternl.h.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 84e9a23d8d6f45610e3538971c2caf546736494e URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e9a23d8d6f45610e3538971… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Jul 6 20:46:16 2011 +1000 include: Added OBJECT_TYPE_INFORMATION to winternl.h. --- include/winternl.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 21879d0..cba5171 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1040,6 +1040,11 @@ typedef struct _OBJECT_NAME_INFORMATION { UNICODE_STRING Name; } OBJECT_NAME_INFORMATION, *POBJECT_NAME_INFORMATION; +typedef struct __OBJECT_TYPE_INFORMATION { + UNICODE_STRING TypeName; + ULONG Reserved [22]; +} OBJECT_TYPE_INFORMATION, *POBJECT_TYPE_INFORMATION; + typedef struct _PROCESS_BASIC_INFORMATION { #ifdef __WINESRC__ DWORD_PTR ExitStatus;

1 0

Austin Lund : ntdll/tests: Added tests for ObjectTypeInformation class in NtQueryObject.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 55946e3cce1014996bffe3fc94320260da3ef89b URL: http://source.winehq.org/git/wine.git/?a=commit;h=55946e3cce1014996bffe3fc9… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Jul 6 20:46:17 2011 +1000 ntdll/tests: Added tests for ObjectTypeInformation class in NtQueryObject. --- dlls/ntdll/tests/om.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 7c03886..b13d9d1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -658,6 +658,8 @@ static void test_query_object(void) { static const WCHAR name[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', '\\','t','e','s','t','_','e','v','e','n','t'}; + static const WCHAR type_event[] = {'E','v','e','n','t'}; + static const WCHAR type_file[] = {'F','i','l','e'}; HANDLE handle; char buffer[1024]; NTSTATUS status; @@ -673,11 +675,21 @@ static void test_query_object(void) ok( len >= sizeof(UNICODE_STRING) + sizeof(name) + sizeof(WCHAR), "unexpected len %u\n", len ); len = 0; + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, 0, &len ); + todo_wine ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + todo_wine ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); + + len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(UNICODE_STRING), &len ); ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); ok( len >= sizeof(UNICODE_STRING) + sizeof(name) + sizeof(WCHAR), "unexpected len %u\n", len ); len = 0; + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(OBJECT_TYPE_INFORMATION), &len ); + todo_wine ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + todo_wine ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); + + len = 0; status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); @@ -693,6 +705,21 @@ static void test_query_object(void) ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); ok( len >= sizeof(UNICODE_STRING) + sizeof(name) + sizeof(WCHAR), "unexpected len %u\n", len ); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + todo_wine ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + todo_wine ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); + todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_event, sizeof(type_file) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + + len -= sizeof(WCHAR); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, len, &len ); + todo_wine ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); + todo_wine ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); + pNtClose( handle ); handle = CreateEventA( NULL, FALSE, FALSE, NULL ); @@ -733,6 +760,17 @@ static void test_query_object(void) ok( len == expected_len || broken(!len), "unexpected len %u\n", len ); + len = 0; + memset( buffer, 0, sizeof(buffer) ); + status = pNtQueryObject( handle, ObjectTypeInformation, buffer, sizeof(buffer), &len ); + todo_wine ok( status == STATUS_SUCCESS, "NtQueryObject failed %x\n", status ); + todo_wine ok( len > sizeof(OBJECT_TYPE_INFORMATION), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR); + todo_wine ok( len >= expected_len, "unexpected len %u\n", len ); + todo_wine ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), + "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + pNtClose( handle ); }

1 0

Alexandre Julliard : winebuild: Output cfi data for relay thunks on i386.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 37dba06ed31a2e9541f9c5abb9657458bbfe6d9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37dba06ed31a2e9541f9c5abb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 6 21:53:37 2011 +0200 winebuild: Output cfi data for relay thunks on i386. --- tools/winebuild/spec32.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index a5b4118..2cfeb99 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -161,6 +161,7 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment(4) ); output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output_cfi( ".cfi_startproc" ); args = get_args_size(odp) / get_ptr_size(); flags = 0; @@ -179,9 +180,11 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tpushl %%eax\n" ); else output( "\tpushl %%esp\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); if (odp->flags & FLAG_RET64) flags |= 1; output( "\tpushl $%u\n", (flags << 24) | (args << 16) | (i - spec->base) ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); if (UsePIC) { @@ -190,6 +193,7 @@ static void output_relay_debug( DLLSPEC *spec ) } else output( "\tmovl $.L__wine_spec_relay_descr,%%eax\n" ); output( "\tpushl %%eax\n" ); + output_cfi( ".cfi_adjust_cfa_offset 4" ); if (odp->flags & FLAG_REGISTER) { @@ -198,6 +202,7 @@ static void output_relay_debug( DLLSPEC *spec ) else { output( "\tcall *4(%%eax)\n" ); + output_cfi( ".cfi_adjust_cfa_offset -12" ); if (odp->type == TYPE_STDCALL || odp->type == TYPE_THISCALL) output( "\tret $%u\n", args * get_ptr_size() ); else @@ -206,9 +211,8 @@ static void output_relay_debug( DLLSPEC *spec ) break; case CPU_x86_64: - output( "\t.cfi_startproc\n" ); output( "\tsubq $40,%%rsp\n" ); - output( "\t.cfi_adjust_cfa_offset 40\n" ); + output_cfi( ".cfi_adjust_cfa_offset 40" ); switch (args) { default: output( "\tmovq %%%s,72(%%rsp)\n", is_float_arg( odp, 3 ) ? "xmm3" : "r9" ); @@ -226,14 +230,14 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tleaq .L__wine_spec_relay_descr(%%rip),%%rcx\n" ); output( "\tcallq *8(%%rcx)\n" ); output( "\taddq $40,%%rsp\n" ); - output( "\t.cfi_adjust_cfa_offset -40\n" ); + output_cfi( ".cfi_adjust_cfa_offset -40" ); output( "\tret\n" ); - output( "\t.cfi_endproc\n" ); break; default: assert(0); } + output_cfi( ".cfi_endproc" ); } }

1 0

Aric Stewart : usp10: Implement ScriptBreak using the Unicode Line Breaking Algorithm.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 95166855bbf82870dee0402a911f7d0b83637f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95166855bbf82870dee0402a9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 27 11:01:24 2011 -0500 usp10: Implement ScriptBreak using the Unicode Line Breaking Algorithm. --- dlls/usp10/Makefile.in | 2 + dlls/usp10/breaking.c | 410 ++++++++ dlls/usp10/linebreak.c | 2315 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/usp10.c | 16 +- dlls/usp10/usp10_internal.h | 2 + libs/wine/cpmap.pl | 90 ++ 6 files changed, 2820 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95166855bbf82870dee04…

1 0

Aric Stewart : usp10: Shift to using the unicode data for most of the indic lexical functions.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 7339c04b7b48daccf04b5489422a2989e8a26f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7339c04b7b48daccf04b54894… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jun 27 11:02:39 2011 -0500 usp10: Shift to using the unicode data for most of the indic lexical functions. --- dlls/usp10/Makefile.in | 1 + dlls/usp10/indicsyllable.c | 684 ++++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/shape.c | 265 +++++------------- libs/wine/cpmap.pl | 125 ++++++++ 4 files changed, 878 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7339c04b7b48daccf04b5…

1 0

Alexandre Julliard : tools: Move the cpmap.pl script to tools/make_unicode.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 704a330a8e3e928529193d30d60bb2e0a5ccd835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=704a330a8e3e928529193d30d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 7 15:05:52 2011 +0200 tools: Move the cpmap.pl script to tools/make_unicode. --- libs/wine/cpmap.pl => tools/make_unicode | 36 ++++++++++++++----------- libs/wine/defaults => tools/unicode-defaults | 0 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/libs/wine/cpmap.pl b/tools/make_unicode similarity index 98% rename from libs/wine/cpmap.pl rename to tools/make_unicode index 3d09f10..7e6beef 100755 --- a/libs/wine/cpmap.pl +++ b/tools/make_unicode @@ -29,7 +29,7 @@ my $UNIDATA = "http://www.unicode.org/Public/6.0.0/ucd"; my $SORTKEYS = "http://www.unicode.org/reports/tr10/allkeys.txt"; # Defaults mapping -my $DEFAULTS = "./defaults"; +my $DEFAULTS = "tools/unicode-defaults"; # Default char for undefined mappings my $DEF_CHAR = ord '?'; @@ -1716,7 +1716,7 @@ sub handle_bestfit_file($$$) } close $INPUT; - my $output = sprintf "c_%03d.c", $codepage; + my $output = sprintf "libs/wine/c_%03d.c", $codepage; open OUTPUT,">$output.new" or die "Cannot create $output"; printf "Building %s from %s (%s)\n", $output, $filename, $comment; @@ -1757,7 +1757,7 @@ sub HANDLE_FILE(@) ADD_DEFAULT_MAPPINGS(); - my $output = sprintf "c_%03d.c", $codepage; + my $output = sprintf "libs/wine/c_%03d.c", $codepage; open OUTPUT,">$output.new" or die "Cannot create $output"; printf "Building %s from %s (%s)\n", $output, $filename || "hardcoded data", $comment; @@ -1801,10 +1801,13 @@ sub save_file($) ################################################################ # output the list of codepage tables into the cptable.c file -sub OUTPUT_CPTABLE() +sub output_cptable($) { + my $output = shift; my @tables_decl = (); + printf "Building %s\n", $output; + foreach my $file (@allfiles) { my ($codepage,$filename,$comment) = @$file; @@ -1818,7 +1821,7 @@ sub OUTPUT_CPTABLE() push @tables_decl, sprintf(" &cptable_%03d,\n", $codepage); } push @tables_decl, "};"; - REPLACE_IN_FILE( "cptable.c", @tables_decl ); + REPLACE_IN_FILE( $output, @tables_decl ); } ################################################################ @@ -1850,23 +1853,24 @@ sub REPLACE_IN_FILE($@) ################################################################ # main routine +chdir ".." if -f "./make_unicode"; READ_DEFAULTS( $DEFAULTS ); -DUMP_CASE_MAPPINGS( "casemap.c" ); -DUMP_SORTKEYS( "collation.c", READ_SORTKEYS_FILE() ); -DUMP_COMPOSE_TABLES( "compose.c" ); -DUMP_CTYPE_TABLES( "wctype.c" ); -dump_mirroring( "../../dlls/usp10/mirror.c" ); -dump_shaping( "../../dlls/usp10/shaping.c" ); -dump_linebreak( "../../dlls/usp10/linebreak.c" ); -dump_indic( "../../dlls/usp10/indicsyllable.c" ); -dump_intl_nls("../../tools/l_intl.nls"); +DUMP_CASE_MAPPINGS( "libs/wine/casemap.c" ); +DUMP_SORTKEYS( "libs/wine/collation.c", READ_SORTKEYS_FILE() ); +DUMP_COMPOSE_TABLES( "libs/wine/compose.c" ); +DUMP_CTYPE_TABLES( "libs/wine/wctype.c" ); +dump_mirroring( "dlls/usp10/mirror.c" ); +dump_shaping( "dlls/usp10/shaping.c" ); +dump_linebreak( "dlls/usp10/linebreak.c" ); +dump_indic( "dlls/usp10/indicsyllable.c" ); +dump_intl_nls("tools/l_intl.nls"); foreach my $file (@allfiles) { HANDLE_FILE( @{$file} ); } -OUTPUT_CPTABLE(); +output_cptable("libs/wine/cptable.c"); exit 0; # Local Variables: -# compile-command: "./cpmap.pl && make -k" +# compile-command: "./make_unicode" # End: diff --git a/libs/wine/defaults b/tools/unicode-defaults similarity index 100% rename from libs/wine/defaults rename to tools/unicode-defaults

1 0

Hans Leidekker : msi: Avoid using an uninitialized value (clang).
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 7f199e81e1f50852829fdccd2ef070a908bda710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f199e81e1f50852829fdccd2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:22:07 2011 +0200 msi: Avoid using an uninitialized value (clang). --- dlls/msi/package.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 5d6523d..c5094b5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1514,7 +1514,7 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, MSIPACKAGE **pPackage) si = MSI_GetSummaryInformationW( db->storage, 0 ); if (!si) { - WARN("failed to load summary info %u\n", r); + WARN("failed to load summary info\n"); msiobj_release( &package->hdr ); return ERROR_INSTALL_PACKAGE_INVALID; }

1 0