October 2010 - Wine-Commits

Alexandre Julliard : widl: Duplicate the exception handling code between 32-bit and 64-bit.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 4c41dd5fcaa6b2e3cf120794b369eeca2ad073c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c41dd5fcaa6b2e3cf120794b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 19:44:00 2010 +0200 widl: Duplicate the exception handling code between 32-bit and 64-bit. --- tools/widl/client.c | 7 ++++--- tools/widl/server.c | 35 ++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 693227f..b5ac0ae 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -448,8 +448,6 @@ static void init_client(void) print_client( "#define DECLSPEC_HIDDEN\n"); print_client( "#endif\n"); print_client( "\n"); - write_exceptions( client ); - print_client( "\n"); } @@ -503,6 +501,9 @@ static void write_client_routines(const statement_list_t *stmts) unsigned int proc_offset = 0; int expr_eval_routines; + write_exceptions( client ); + print_client( "\n"); + write_formatstringsdecl(client, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(client, client_token); if (expr_eval_routines) @@ -530,7 +531,7 @@ void write_client(const statement_list_t *stmts) if (do_win32 && do_win64) { - fprintf(client, "\n#ifndef _WIN64\n\n"); + fprintf(client, "#ifndef _WIN64\n\n"); pointer_size = 4; write_client_routines( stmts ); fprintf(client, "\n#else /* _WIN64 */\n\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index fd64899..513f37b 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -384,22 +384,6 @@ static void init_server(void) print_server( "#define DECLSPEC_HIDDEN\n"); print_server( "#endif\n"); print_server( "\n"); - write_exceptions( server ); - print_server("\n"); - print_server("struct __server_frame\n"); - print_server("{\n"); - print_server(" __DECL_EXCEPTION_FRAME\n"); - print_server(" MIDL_STUB_MESSAGE _StubMsg;\n"); - print_server("};\n"); - print_server("\n"); - print_server("static int __server_filter( struct __server_frame *__frame )\n"); - print_server( "{\n"); - print_server( " return (__frame->code == STATUS_ACCESS_VIOLATION) ||\n"); - print_server( " (__frame->code == STATUS_DATATYPE_MISALIGNMENT) ||\n"); - print_server( " (__frame->code == RPC_X_BAD_STUB_DATA) ||\n"); - print_server( " (__frame->code == RPC_S_INVALID_BOUND);\n"); - print_server( "}\n"); - print_server( "\n"); } @@ -445,6 +429,23 @@ static void write_server_routines(const statement_list_t *stmts) unsigned int proc_offset = 0; int expr_eval_routines; + write_exceptions( server ); + print_server("\n"); + print_server("struct __server_frame\n"); + print_server("{\n"); + print_server(" __DECL_EXCEPTION_FRAME\n"); + print_server(" MIDL_STUB_MESSAGE _StubMsg;\n"); + print_server("};\n"); + print_server("\n"); + print_server("static int __server_filter( struct __server_frame *__frame )\n"); + print_server( "{\n"); + print_server( " return (__frame->code == STATUS_ACCESS_VIOLATION) ||\n"); + print_server( " (__frame->code == STATUS_DATATYPE_MISALIGNMENT) ||\n"); + print_server( " (__frame->code == RPC_X_BAD_STUB_DATA) ||\n"); + print_server( " (__frame->code == RPC_S_INVALID_BOUND);\n"); + print_server( "}\n"); + print_server( "\n"); + write_formatstringsdecl(server, indent, stmts, need_stub); expr_eval_routines = write_expr_eval_routines(server, server_token); if (expr_eval_routines) @@ -472,7 +473,7 @@ void write_server(const statement_list_t *stmts) if (do_win32 && do_win64) { - fprintf(server, "\n#ifndef _WIN64\n\n"); + fprintf(server, "#ifndef _WIN64\n\n"); pointer_size = 4; write_server_routines( stmts ); fprintf(server, "\n#else /* _WIN64 */\n\n");

1 0

Alexandre Julliard : widl: Duplicate all the proxy data tables between 32-bit and 64-bit.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 575485c6e71d95a038e1a065f6106e7000e39254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=575485c6e71d95a038e1a065f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 19:41:07 2010 +0200 widl: Duplicate all the proxy data tables between 32-bit and 64-bit. --- tools/widl/proxy.c | 99 +++++++++++++++++++++++++-------------------------- 1 files changed, 49 insertions(+), 50 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 8cbdf8f..ca0717b 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -114,20 +114,6 @@ static void init_proxy(const statement_list_t *stmts) print_proxy( "#define DECLSPEC_HIDDEN\n"); print_proxy( "#endif\n"); print_proxy( "\n"); - write_exceptions( proxy ); - print_proxy( "\n"); - print_proxy( "struct __proxy_frame\n"); - print_proxy( "{\n"); - print_proxy( " __DECL_EXCEPTION_FRAME\n"); - print_proxy( " MIDL_STUB_MESSAGE _StubMsg;\n"); - print_proxy( " void *This;\n"); - print_proxy( "};\n"); - print_proxy( "\n"); - print_proxy("static int __proxy_filter( struct __proxy_frame *__frame )\n"); - print_proxy( "{\n"); - print_proxy( " return (__frame->_StubMsg.dwStubPhase != PROXY_SENDRECEIVE);\n"); - print_proxy( "}\n"); - print_proxy( "\n"); } static void clear_output_vars( const var_list_t *args ) @@ -775,6 +761,25 @@ static void write_proxy_routines(const statement_list_t *stmts) { int expr_eval_routines; unsigned int proc_offset = 0; + char *file_id = proxy_token; + int i, count, have_baseiid; + type_t **interfaces; + const type_t * delegate_to; + + write_exceptions( proxy ); + print_proxy( "\n"); + print_proxy( "struct __proxy_frame\n"); + print_proxy( "{\n"); + print_proxy( " __DECL_EXCEPTION_FRAME\n"); + print_proxy( " MIDL_STUB_MESSAGE _StubMsg;\n"); + print_proxy( " void *This;\n"); + print_proxy( "};\n"); + print_proxy( "\n"); + print_proxy("static int __proxy_filter( struct __proxy_frame *__frame )\n"); + print_proxy( "{\n"); + print_proxy( " return (__frame->_StubMsg.dwStubPhase != PROXY_SENDRECEIVE);\n"); + print_proxy( "}\n"); + print_proxy( "\n"); write_formatstringsdecl(proxy, indent, stmts, need_proxy); write_stubdescproto(); @@ -793,42 +798,6 @@ static void write_proxy_routines(const statement_list_t *stmts) write_procformatstring(proxy, stmts, need_proxy); write_typeformatstring(proxy, stmts, need_proxy); -} - -void write_proxies(const statement_list_t *stmts) -{ - char *file_id = proxy_token; - int i, count, have_baseiid; - type_t **interfaces; - const type_t * delegate_to; - - if (!do_proxies) return; - if (do_everything && !need_proxy_file(stmts)) return; - - init_proxy(stmts); - if(!proxy) return; - - if (do_win32 && do_win64) - { - fprintf(proxy, "\n#ifndef _WIN64\n\n"); - pointer_size = 4; - write_proxy_routines( stmts ); - fprintf(proxy, "\n#else /* _WIN64 */\n\n"); - pointer_size = 8; - write_proxy_routines( stmts ); - fprintf(proxy, "#endif /* _WIN64 */\n\n"); - } - else if (do_win32) - { - pointer_size = 4; - write_proxy_routines( stmts ); - } - else if (do_win64) - { - pointer_size = 8; - write_proxy_routines( stmts ); - } - interfaces = sort_interfaces(stmts, &count); fprintf(proxy, "static const CInterfaceProxyVtbl* const _%s_ProxyVtblList[] =\n", file_id); fprintf(proxy, "{\n"); @@ -901,6 +870,36 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, " 0,\n"); fprintf(proxy, " 0\n"); fprintf(proxy, "};\n"); +} + +void write_proxies(const statement_list_t *stmts) +{ + if (!do_proxies) return; + if (do_everything && !need_proxy_file(stmts)) return; + + init_proxy(stmts); + if(!proxy) return; + + if (do_win32 && do_win64) + { + fprintf(proxy, "\n#ifndef _WIN64\n\n"); + pointer_size = 4; + write_proxy_routines( stmts ); + fprintf(proxy, "\n#else /* _WIN64 */\n\n"); + pointer_size = 8; + write_proxy_routines( stmts ); + fprintf(proxy, "\n#endif /* _WIN64 */\n"); + } + else if (do_win32) + { + pointer_size = 4; + write_proxy_routines( stmts ); + } + else if (do_win64) + { + pointer_size = 8; + write_proxy_routines( stmts ); + } fclose(proxy); }

1 0

Alexandre Julliard : widl: Output a format string table and server info structure for servers.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 3593b659351c2ac2875d9de121ec963c88f5b79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3593b659351c2ac2875d9de12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 20:46:00 2010 +0200 widl: Output a format string table and server info structure for servers. --- tools/widl/proxy.c | 13 +------------ tools/widl/server.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- tools/widl/typegen.c | 19 +++++++++++++++++++ tools/widl/typegen.h | 1 + 4 files changed, 64 insertions(+), 16 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3e8be5d..a3ffc33 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -610,18 +610,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) count = count_methods(iface); - /* proc format string offsets */ - print_proxy( "static const unsigned short %s_FormatStringOffsetTable[] =\n", iface->name ); - print_proxy( "{\n" ); - indent++; - STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) - { - var_t *func = stmt->u.var; - if (is_local( func->attrs )) continue; - print_proxy( "%u, /* %s */\n", func->procstring_offset, func->name ); - } - indent--; - print_proxy( "};\n\n" ); + write_procformatstring_offsets( proxy, iface ); /* proxy vtable */ print_proxy( "static %sCINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", diff --git a/tools/widl/server.c b/tools/widl/server.c index 513f37b..d02ffed 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -57,7 +57,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) { - const var_t *func = stmt->u.var; + var_t *func = stmt->u.var; int has_full_pointer = is_full_pointer_function(func); /* check for a defined binding handle */ @@ -243,6 +243,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) fprintf(server, "\n"); /* update proc_offset */ + func->procstring_offset = *proc_offset; *proc_offset += get_size_procformatstring_func( func ); } } @@ -278,6 +279,42 @@ static void write_dispatchtable(type_t *iface) } +static void write_routinetable(type_t *iface) +{ + const statement_t *stmt; + + print_server( "static const SERVER_ROUTINE %s_ServerRoutineTable[] =\n", iface->name ); + print_server( "{\n" ); + indent++; + STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) + { + var_t *func = stmt->u.var; + if (is_local( func->attrs )) continue; + print_server( "(SERVER_ROUTINE)%s,\n", func->name ); + } + indent--; + print_server( "};\n\n" ); +} + + +static void write_serverinfo(type_t *iface) +{ + print_server( "static const MIDL_SERVER_INFO %s_ServerInfo =\n", iface->name ); + print_server( "{\n" ); + indent++; + print_server( "&%s_StubDesc,\n", iface->name ); + print_server( "%s_ServerRoutineTable,\n", iface->name ); + print_server( "__MIDL_ProcFormatString.Format,\n" ); + print_server( "%s_FormatStringOffsetTable,\n", iface->name ); + print_server( "0,\n" ); + print_server( "0,\n" ); + print_server( "0,\n" ); + print_server( "0\n" ); + indent--; + print_server( "};\n\n" ); +} + + static void write_stubdescdecl(type_t *iface) { print_server("static const MIDL_STUB_DESC %s_StubDesc;\n", iface->name); @@ -332,6 +369,7 @@ static void write_serverinterfacedecl(type_t *iface) if (endpoints) write_endpoints( server, iface->name, endpoints ); print_server("static RPC_DISPATCH_TABLE %s_v%d_%d_DispatchTable;\n", iface->name, MAJORVERSION(ver), MINORVERSION(ver)); + print_server( "static const MIDL_SERVER_INFO %s_ServerInfo;\n", iface->name ); fprintf(server, "\n"); print_server("static const RPC_SERVER_INTERFACE %s___RpcServerInterface =\n", iface->name ); print_server("{\n"); @@ -354,7 +392,7 @@ static void write_serverinterfacedecl(type_t *iface) print_server("0,\n"); } print_server("0,\n"); - print_server("0,\n"); + print_server("&%s_ServerInfo,\n", iface->name); print_server("0,\n"); indent--; print_server("};\n"); @@ -417,8 +455,11 @@ static void write_server_stmts(const statement_list_t *stmts, int expr_eval_rout print_server("#endif\n"); fprintf(server, "\n"); + write_procformatstring_offsets( server, iface ); write_stubdescriptor(iface, expr_eval_routines); write_dispatchtable(iface); + write_routinetable(iface); + write_serverinfo(iface); } } } @@ -454,8 +495,6 @@ static void write_server_routines(const statement_list_t *stmts) write_server_stmts(stmts, expr_eval_routines, &proc_offset); - fprintf(server, "\n"); - write_procformatstring(server, stmts, need_stub); write_typeformatstring(server, stmts, need_stub); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index eb305b4..244baea 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -953,6 +953,25 @@ void write_procformatstring(FILE *file, const statement_list_t *stmts, type_pred print_file(file, indent, "\n"); } +void write_procformatstring_offsets( FILE *file, const type_t *iface ) +{ + const statement_t *stmt; + int indent = 0; + + print_file( file, indent, "static const unsigned short %s_FormatStringOffsetTable[] =\n", + iface->name ); + print_file( file, indent, "{\n" ); + indent++; + STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) + { + var_t *func = stmt->u.var; + if (is_local( func->attrs )) continue; + print_file( file, indent, "%u, /* %s */\n", func->procstring_offset, func->name ); + } + indent--; + print_file( file, indent, "};\n\n" ); +} + static int write_base_type(FILE *file, const type_t *type, int convert_to_signed_type, unsigned int *typestring_offset) { unsigned char fc; diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index e519ee0..5d46614 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -65,6 +65,7 @@ typedef int (*type_pred_t)(const type_t *); void write_formatstringsdecl(FILE *f, int indent, const statement_list_t *stmts, type_pred_t pred); void write_procformatstring(FILE *file, const statement_list_t *stmts, type_pred_t pred); void write_typeformatstring(FILE *file, const statement_list_t *stmts, type_pred_t pred); +void write_procformatstring_offsets( FILE *file, const type_t *iface ); void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, enum remoting_phase phase, enum pass pass, const var_t *var, const char *varname); void write_remoting_arguments(FILE *file, int indent, const var_t *func, const char *local_var_prefix,

1 0

Alexandre Julliard : tools: Add some sanity checks in make_makefiles.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 845047eebbeebdcc7ecbb46a54686251bcfa1114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=845047eebbeebdcc7ecbb46a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 23 10:44:05 2010 +0200 tools: Add some sanity checks in make_makefiles. --- tools/make_makefiles | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/tools/make_makefiles b/tools/make_makefiles index bc52c49..4673fea 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -309,6 +309,10 @@ sub parse_makefile($) $make{$1} = \@list; next; } + if (/^\s*(TOPSRCDIR|TOPOBJDIR|SRCDIR|VPATH)\s*=\s*(.*)/) + { + die "Variable $1 in $file.in is obsolete"; + } } return %make; } @@ -363,6 +367,14 @@ sub update_makefiles(@) if ($rules eq $makerules{"MAKE_DLL_RULES"}) { (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; + if ($name =~ /\./) + { + die "Invalid MODULE in $file" unless $make{"MODULE"} eq $name; + } + else + { + die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.dll"; + } my $implib = $make{"IMPORTLIB"} || ""; my $implib_srcs = defined($make{"IMPLIB_SRCS"}) && join( " ", @{$make{"IMPLIB_SRCS"}} ); $args .= "," if $implib || $is_win16; @@ -374,6 +386,14 @@ sub update_makefiles(@) elsif ($rules eq $makerules{"MAKE_PROG_RULES"}) { (my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/; + if ($name =~ /\./) + { + die "Invalid MODULE in $file" unless $make{"MODULE"} eq $name; + } + else + { + die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.exe"; + } my $install = $dont_install{$name} ? "" : "install"; $install .= "bin" if $bin_install{$name}; $args .= "," if $is_win16 || $install;

1 0

Alexandre Julliard : winegstreamer: Fix module name and remove obsolete variables in makefile.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 9db3ccd0ddfd19aabf20807992bd2c52d5768373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db3ccd0ddfd19aabf2080799… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 21:42:58 2010 +0200 winegstreamer: Fix module name and remove obsolete variables in makefile. --- dlls/winegstreamer/Makefile.in | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index b5b16f1..a7064fc 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,8 +1,4 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = winegstreamer +MODULE = winegstreamer.dll IMPORTS = strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 EXTRAINCL = @GSTREAMER_INCL@ EXTRALIBS = @GSTREAMER_LIBS@ @LIBPTHREAD@

1 0

Vincent Povirk : windowscodecs: Implement CopyPalette for the TGA decoder.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: b26d789db2cdcafde16bc7bd3ebc0de634349725 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b26d789db2cdcafde16bc7bd3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 20 16:34:36 2010 -0500 windowscodecs: Implement CopyPalette for the TGA decoder. --- dlls/windowscodecs/tgaformat.c | 164 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 159 insertions(+), 5 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 2e469bf..7570e06 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -193,6 +193,7 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p LARGE_INTEGER seek; tga_footer footer; int attribute_bitcount; + int mapped_depth=0; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); @@ -228,16 +229,19 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p case IMAGETYPE_COLORMAPPED|IMAGETYPE_RLE: if (This->header.colormap_type != 1) hr = E_FAIL; + mapped_depth = This->header.colormap_entrysize; break; case IMAGETYPE_TRUECOLOR: case IMAGETYPE_TRUECOLOR|IMAGETYPE_RLE: if (This->header.colormap_type != 0 && This->header.colormap_type != 1) hr = E_FAIL; + mapped_depth = This->header.depth; break; case IMAGETYPE_GRAYSCALE: case IMAGETYPE_GRAYSCALE|IMAGETYPE_RLE: if (This->header.colormap_type != 0) hr = E_FAIL; + mapped_depth = 0; break; default: hr = E_FAIL; @@ -253,9 +257,8 @@ static HRESULT WINAPI TgaDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p attribute_bitcount = This->header.image_descriptor & IMAGE_ATTRIBUTE_BITCOUNT_MASK; if (attribute_bitcount && - !((This->header.image_type & IMAGETYPE_TRUECOLOR) && - ((This->header.depth == 32 && attribute_bitcount == 8) || - (This->header.depth == 16 && attribute_bitcount == 1)))) + !((mapped_depth == 32 && attribute_bitcount == 8) || + (mapped_depth == 16 && attribute_bitcount == 1))) hr = E_FAIL; if (FAILED(hr)) @@ -573,8 +576,159 @@ static HRESULT WINAPI TgaDecoder_Frame_GetResolution(IWICBitmapFrameDecode *ifac static HRESULT WINAPI TgaDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, IWICPalette *pIPalette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TgaDecoder *This = decoder_from_frame(iface); + HRESULT hr=S_OK; + WICColor colors[256], *color; + BYTE *colormap_data; + WORD *wcolormap_data; + DWORD *dwcolormap_data; + LARGE_INTEGER seek; + ULONG bytesread; + int depth, attribute_bitcount, attribute_type; + int i; + + TRACE("(%p,%p)\n", iface, pIPalette); + + if (!This->colormap_length) + { + WARN("no colormap present in this file\n"); + return WINCODEC_ERR_PALETTEUNAVAILABLE; + } + + if (This->header.colormap_firstentry + This->header.colormap_length > 256) + { + FIXME("cannot read colormap with %i entries starting at %i\n", + This->header.colormap_firstentry + This->header.colormap_length, + This->header.colormap_firstentry); + return E_FAIL; + } + + colormap_data = HeapAlloc(GetProcessHeap(), 0, This->colormap_length); + if (!colormap_data) return E_OUTOFMEMORY; + + wcolormap_data = (WORD*)colormap_data; + dwcolormap_data = (DWORD*)colormap_data; + + EnterCriticalSection(&This->lock); + + seek.QuadPart = This->colormap_offset; + hr = IStream_Seek(This->stream, seek, STREAM_SEEK_SET, NULL); + + if (SUCCEEDED(hr)) + { + hr = IStream_Read(This->stream, colormap_data, This->colormap_length, &bytesread); + if (SUCCEEDED(hr) && bytesread != This->colormap_length) + { + WARN("expected %i bytes in colormap, got %i\n", This->colormap_length, bytesread); + hr = E_FAIL; + } + } + + LeaveCriticalSection(&This->lock); + + if (SUCCEEDED(hr)) + { + attribute_bitcount = This->header.image_descriptor & IMAGE_ATTRIBUTE_BITCOUNT_MASK; + + if (attribute_bitcount && This->extension_area_offset) + attribute_type = This->extension_area.attributes_type; + else if (attribute_bitcount) + attribute_type = ATTRIBUTE_ALPHA; + else + attribute_type = ATTRIBUTE_NO_ALPHA; + + depth = This->header.colormap_entrysize; + if (depth == 15) + { + depth = 16; + attribute_type = ATTRIBUTE_NO_ALPHA; + } + + memset(colors, 0, sizeof(colors)); + + color = &colors[This->header.colormap_firstentry]; + + /* Colormap entries can be in any truecolor format, and we have to convert them. */ + switch (depth) + { + case 16: + switch (attribute_type) + { + case ATTRIBUTE_NO_ALPHA: + case ATTRIBUTE_UNDEFINED: + case ATTRIBUTE_UNDEFINED_PRESERVE: + for (i=0; i<This->header.colormap_length; i++) + { + WORD srcval = wcolormap_data[i]; + *color++=0xff000000 | /* constant 255 alpha */ + ((srcval << 9) & 0xf80000) | /* r */ + ((srcval << 4) & 0x070000) | /* r - 3 bits */ + ((srcval << 6) & 0x00f800) | /* g */ + ((srcval << 1) & 0x000700) | /* g - 3 bits */ + ((srcval << 3) & 0x0000f8) | /* b */ + ((srcval >> 2) & 0x000007); /* b - 3 bits */ + } + break; + case ATTRIBUTE_ALPHA: + case ATTRIBUTE_PALPHA: + for (i=0; i<This->header.colormap_length; i++) + { + WORD srcval = wcolormap_data[i]; + *color++=((srcval & 0x8000) ? 0xff000000 : 0) | /* alpha */ + ((srcval << 9) & 0xf80000) | /* r */ + ((srcval << 4) & 0x070000) | /* r - 3 bits */ + ((srcval << 6) & 0x00f800) | /* g */ + ((srcval << 1) & 0x000700) | /* g - 3 bits */ + ((srcval << 3) & 0x0000f8) | /* b */ + ((srcval >> 2) & 0x000007); /* b - 3 bits */ + } + break; + default: + FIXME("Unhandled 16-bit attribute type %u\n", attribute_type); + hr = E_NOTIMPL; + } + break; + case 24: + for (i=0; i<This->header.colormap_length; i++) + { + *color++=0xff000000 | /* alpha */ + colormap_data[i*3+2] | /* red */ + colormap_data[i*3+1] | /* green */ + colormap_data[i*3]; /* blue */ + } + break; + case 32: + switch (attribute_type) + { + case ATTRIBUTE_NO_ALPHA: + case ATTRIBUTE_UNDEFINED: + case ATTRIBUTE_UNDEFINED_PRESERVE: + for (i=0; i<This->header.colormap_length; i++) + *color++=dwcolormap_data[i]|0xff000000; + break; + case ATTRIBUTE_ALPHA: + for (i=0; i<This->header.colormap_length; i++) + *color++=dwcolormap_data[i]; + break; + case ATTRIBUTE_PALPHA: + /* FIXME: Unpremultiply alpha */ + default: + FIXME("Unhandled 16-bit attribute type %u\n", attribute_type); + hr = E_NOTIMPL; + } + break; + default: + FIXME("Unhandled truecolor depth %u\n", This->header.depth); + hr = E_NOTIMPL; + } + } + + HeapFree(GetProcessHeap(), 0, colormap_data); + + if (SUCCEEDED(hr)) + hr = IWICPalette_InitializeCustom(pIPalette, colors, 256); + + return hr; } static HRESULT TgaDecoder_ReadRLE(TgaDecoder *This, BYTE *imagebits, int datasize)

1 0

Aric Stewart : qcap: Make use of a few more strmbase implementations.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: ae7e5b145f28caa32afb9e30a69ee51488ce9dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7e5b145f28caa32afb9e30a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Oct 22 16:21:10 2010 -0500 qcap: Make use of a few more strmbase implementations. --- dlls/qcap/vfwcapture.c | 36 ++++-------------------------------- 1 files changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 1dc2e0f..93542f4 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -753,16 +753,6 @@ static HRESULT WINAPI VfwPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * return E_NOINTERFACE; } -static ULONG WINAPI VfwPin_AddRef(IPin * iface) -{ - VfwPinImpl *This = (VfwPinImpl *)iface; - ULONG refCount = InterlockedIncrement(&This->pin.pin.refCount); - - TRACE("() -> new refcount: %u\n", refCount); - - return refCount; -} - static ULONG WINAPI VfwPin_Release(IPin * iface) { @@ -802,24 +792,6 @@ VfwPin_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) return E_NOTIMPL; } -static HRESULT WINAPI VfwPin_EndOfStream(IPin * iface) -{ - TRACE("()\n"); - return E_UNEXPECTED; -} - -static HRESULT WINAPI VfwPin_BeginFlush(IPin * iface) -{ - TRACE("(%p)->()\n", iface); - return E_UNEXPECTED; -} - -static HRESULT WINAPI VfwPin_EndFlush(IPin * iface) -{ - TRACE("(%p)->()\n", iface); - return E_UNEXPECTED; -} - static HRESULT WINAPI VfwPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) @@ -832,7 +804,7 @@ VfwPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, static const IPinVtbl VfwPin_Vtbl = { VfwPin_QueryInterface, - VfwPin_AddRef, + BasePinImpl_AddRef, VfwPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, @@ -845,8 +817,8 @@ static const IPinVtbl VfwPin_Vtbl = BasePinImpl_QueryAccept, VfwPin_EnumMediaTypes, VfwPin_QueryInternalConnections, - VfwPin_EndOfStream, - VfwPin_BeginFlush, - VfwPin_EndFlush, + BaseOutputPinImpl_EndOfStream, + BaseOutputPinImpl_BeginFlush, + BaseOutputPinImpl_EndFlush, VfwPin_NewSegment };

1 0

Alexandre Julliard : mofcomp: Remove obsolete variables in makefile.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 38da464ed1396a2612afca0216301016c673a8d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38da464ed1396a2612afca021… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 23 10:44:43 2010 +0200 mofcomp: Remove obsolete variables in makefile. --- programs/mofcomp/Makefile.in | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/programs/mofcomp/Makefile.in b/programs/mofcomp/Makefile.in index f1dd447..e86a9ee 100644 --- a/programs/mofcomp/Makefile.in +++ b/programs/mofcomp/Makefile.in @@ -1,7 +1,3 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ MODULE = mofcomp.exe APPMODE = -mconsole -municode IMPORTS = kernel32

1 0

Alexandre Julliard : widl: Output a format string table and server info structure for stubs.
by Alexandre Julliard Oct. 25, 2010

Oct. 25, 2010

Module: wine Branch: master Commit: 955152430896da6f72e669e8baa7f083e44daa5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=955152430896da6f72e669e8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 20:22:57 2010 +0200 widl: Output a format string table and server info structure for stubs. --- tools/widl/proxy.c | 36 ++++++++++++++++++++++++++++++++---- tools/widl/widltypes.h | 1 + 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index ca0717b..3e8be5d 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -579,7 +579,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) /* FIXME: check for [oleautomation], shouldn't generate proxies/stubs if specified */ STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { - const var_t *func = stmt->u.var; + var_t *func = stmt->u.var; if (first_func) { fprintf(proxy, "/*****************************************************************************\n"); fprintf(proxy, " * %s interface\n", iface->name); @@ -601,6 +601,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) } } } + func->procstring_offset = *proc_offset; gen_proxy(iface, func, idx, *proc_offset); gen_stub(iface, func, cname, *proc_offset); *proc_offset += get_size_procformatstring_func( func ); @@ -609,6 +610,19 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) count = count_methods(iface); + /* proc format string offsets */ + print_proxy( "static const unsigned short %s_FormatStringOffsetTable[] =\n", iface->name ); + print_proxy( "{\n" ); + indent++; + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + var_t *func = stmt->u.var; + if (is_local( func->attrs )) continue; + print_proxy( "%u, /* %s */\n", func->procstring_offset, func->name ); + } + indent--; + print_proxy( "};\n\n" ); + /* proxy vtable */ print_proxy( "static %sCINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", need_delegation_indirect(iface) ? "" : "const ", count, iface->name); @@ -626,8 +640,22 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) indent--; print_proxy( "}\n"); indent--; - print_proxy( "};\n"); - fprintf(proxy, "\n\n"); + print_proxy( "};\n\n"); + + /* server info */ + print_proxy( "static const MIDL_SERVER_INFO %s_ServerInfo =\n", iface->name ); + print_proxy( "{\n" ); + indent++; + print_proxy( "&Object_StubDesc,\n" ); + print_proxy( "0,\n" ); + print_proxy( "__MIDL_ProcFormatString.Format,\n" ); + print_proxy( "&%s_FormatStringOffsetTable[-3],\n", iface->name ); + print_proxy( "0,\n" ); + print_proxy( "0,\n" ); + print_proxy( "0,\n" ); + print_proxy( "0\n" ); + indent--; + print_proxy( "};\n\n" ); /* stub vtable */ print_proxy( "static const PRPC_STUB_FUNCTION %s_table[] =\n", iface->name); @@ -645,7 +673,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "{\n"); indent++; print_proxy( "&IID_%s,\n", iface->name); - print_proxy( "0,\n"); + print_proxy( "&%s_ServerInfo,\n", iface->name ); print_proxy( "%d,\n", count); print_proxy( "&%s_table[-3],\n", iface->name); indent--; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 89b19e5..40962ed 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -420,6 +420,7 @@ struct _var_t { attr_list_t *attrs; expr_t *eval; enum storage_class stgclass; + unsigned int procstring_offset; struct _loc_info_t loc_info;

1 0

Louis Lenders : kernel32: Fix GetTempFileName with invalid path.
by Alexandre Julliard Oct. 22, 2010

Oct. 22, 2010

Module: wine Branch: master Commit: 8819ae1e66fb0d4181594510431eee7c8d158af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8819ae1e66fb0d41815945104… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Wed Oct 20 20:27:38 2010 +0200 kernel32: Fix GetTempFileName with invalid path. Found by Oskar Eisemuth. --- dlls/kernel32/path.c | 10 ++++++++++ dlls/kernel32/tests/path.c | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 294ea1c..e72848c 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -660,6 +660,7 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR int i; LPWSTR p; + DWORD attr; if ( !path || !buffer ) { @@ -667,6 +668,15 @@ UINT WINAPI GetTempFileNameW( LPCWSTR path, LPCWSTR prefix, UINT unique, LPWSTR return 0; } + /* ensure that the provided directory exists */ + attr = GetFileAttributesW(path); + if (attr == INVALID_FILE_ATTRIBUTES || !(attr & FILE_ATTRIBUTE_DIRECTORY)) + { + TRACE("path not found %s\n", debugstr_w(path)); + SetLastError( ERROR_DIRECTORY ); + return 0; + } + strcpyW( buffer, path ); p = buffer + strlenW(buffer); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0200fc4..0065ebf 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -364,9 +364,7 @@ static void test_InitPathA(CHAR *newdir, CHAR *curDrive, CHAR *otherDrive) /* Non-existent path */ sprintf(invalid_dir, "%s\%s",tmppath,"non_existent_dir_1jwj3y32nb3"); SetLastError(0xdeadbeef); - todo_wine ok(!GetTempFileNameA(invalid_dir,"tfn",unique,newdir),"GetTempFileNameA should have failed\n"); - todo_wine ok(GetLastError()==ERROR_DIRECTORY || broken(GetLastError()==ERROR_PATH_NOT_FOUND)/*win98*/, "got %d, expected ERROR_DIRECTORY\n", GetLastError());

1 0