October 2010 - Wine-commits

Vincent Povirk : windowscodecs: Add support for 32-bit TGA images.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: a64400ec988ffc43f70eab3a0f868d00a484a083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a64400ec988ffc43f70eab3a0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 20 15:04:10 2010 -0500 windowscodecs: Add support for 32-bit TGA images. --- dlls/windowscodecs/tgaformat.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index 9de35c2..e088bbc 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -517,6 +517,25 @@ static HRESULT WINAPI TgaDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *ifa case 24: memcpy(pPixelFormat, &GUID_WICPixelFormat24bppBGR, sizeof(GUID)); break; + case 32: + switch (attribute_type) + { + case ATTRIBUTE_NO_ALPHA: + case ATTRIBUTE_UNDEFINED: + case ATTRIBUTE_UNDEFINED_PRESERVE: + memcpy(pPixelFormat, &GUID_WICPixelFormat32bppBGR, sizeof(GUID)); + break; + case ATTRIBUTE_ALPHA: + memcpy(pPixelFormat, &GUID_WICPixelFormat32bppBGRA, sizeof(GUID)); + break; + case ATTRIBUTE_PALPHA: + memcpy(pPixelFormat, &GUID_WICPixelFormat32bppPBGRA, sizeof(GUID)); + break; + default: + FIXME("Unhandled 32-bit attribute type %u\n", attribute_type); + return E_NOTIMPL; + } + break; default: FIXME("Unhandled truecolor depth %u\n", This->header.depth); return E_NOTIMPL;

1 0

Vincent Povirk : windowscodecs: Support Run-length encoded TGA images.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: a5a7d6c9f0ad400338dffb7714e9536f23765daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a7d6c9f0ad400338dffb771… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 20 15:36:35 2010 -0500 windowscodecs: Support Run-length encoded TGA images. --- dlls/windowscodecs/tgaformat.c | 60 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tgaformat.c b/dlls/windowscodecs/tgaformat.c index e088bbc..2e469bf 100644 --- a/dlls/windowscodecs/tgaformat.c +++ b/dlls/windowscodecs/tgaformat.c @@ -577,6 +577,63 @@ static HRESULT WINAPI TgaDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface, return E_NOTIMPL; } +static HRESULT TgaDecoder_ReadRLE(TgaDecoder *This, BYTE *imagebits, int datasize) +{ + int i=0, j, bytesperpixel; + ULONG bytesread; + HRESULT hr=S_OK; + + bytesperpixel = This->header.depth / 8; + + while (i<datasize) + { + BYTE rc; + int count, size; + BYTE pixeldata[4]; + + hr = IStream_Read(This->stream, &rc, 1, &bytesread); + if (bytesread != 1) hr = E_FAIL; + if (FAILED(hr)) break; + + count = (rc&0x7f)+1; + size = count * bytesperpixel; + + if (size + i > datasize) + { + WARN("RLE packet too large\n"); + hr = E_FAIL; + break; + } + + if (rc&0x80) + { + /* Run-length packet */ + hr = IStream_Read(This->stream, pixeldata, bytesperpixel, &bytesread); + if (bytesread != bytesperpixel) hr = E_FAIL; + if (FAILED(hr)) break; + + if (bytesperpixel == 1) + memset(&imagebits[i], pixeldata[0], count); + else + { + for (j=0; j<count; j++) + memcpy(&imagebits[i+j*bytesperpixel], pixeldata, bytesperpixel); + } + } + else + { + /* Raw packet */ + hr = IStream_Read(This->stream, &imagebits[i], size, &bytesread); + if (bytesread != size) hr = E_FAIL; + if (FAILED(hr)) break; + } + + i += size; + } + + return hr; +} + static HRESULT TgaDecoder_ReadImage(TgaDecoder *This) { HRESULT hr=S_OK; @@ -614,8 +671,7 @@ static HRESULT TgaDecoder_ReadImage(TgaDecoder *This) { if (This->header.image_type & IMAGETYPE_RLE) { - FIXME("RLE decoding not implemented\n"); - hr = E_NOTIMPL; + hr = TgaDecoder_ReadRLE(This, This->imagebits, datasize); } else {

1 0

André Hentschel : winedump: Ignore case when detecting void.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 1da4f8bf4ae4a0ffb69eae05bf0c31d86fc0cd15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da4f8bf4ae4a0ffb69eae05b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 21 20:00:52 2010 +0200 winedump: Ignore case when detecting void. --- tools/winedump/output.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index 69c7eed..93faca7 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -330,7 +330,7 @@ void output_c_symbol (const parsed_symbol *sym) return; } - is_void = !strcmp (sym->return_text, "void"); + is_void = !strcasecmp (sym->return_text, "void"); output_prototype (cfile, sym); fputs ("\n{\n", cfile);

1 0

André Hentschel : winemaker: Let winebuild use the default specfile name.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: ae91158ee0918658a31310b066155a8c570b56d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae91158ee0918658a31310b06… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 21 20:02:37 2010 +0200 winemaker: Let winebuild use the default specfile name. --- tools/winemaker | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 99e60ba..317b07a 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1010,7 +1010,7 @@ sub source_scan_project_file($$$) push @local_depends,"$prj_name.so"; push @local_dlls,$prj_name; my $canon=canonize($prj_name); - push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:%=%.spec)"); + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); } @$target[$T_NAME]=$prj_name; @@ -1504,7 +1504,7 @@ sub source_scan_directory($$$$) push @local_depends,"$target_name.so"; push @local_dlls,$target_name; my $canon=canonize($target_name); - push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:%=%.spec)"); + push @{@$target[$T_LDFLAGS]},("-shared","\$(${canon}_MODULE:.dll=.spec)"); } else { @$target[$T_TYPE]=$opt_target_type; push @exe_list,$target;

1 0

Juan Lang : secur32: Trace flags as hex values.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 30435a59511579e5222be74b87f9de9c0a5aa996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30435a59511579e5222be74b8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 21 16:37:53 2010 -0700 secur32: Trace flags as hex values. --- dlls/secur32/negotiate.c | 2 +- dlls/secur32/ntlm.c | 2 +- dlls/secur32/schannel.c | 2 +- dlls/secur32/wrapper.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index 2b3ce0c..830bc5d 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -136,7 +136,7 @@ static SECURITY_STATUS SEC_ENTRY nego_InitializeSecurityContextA( { SECURITY_STATUS ret; - TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); if(phCredential){ diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 53de199..7317e91 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -443,7 +443,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( SEC_CHAR *domain = NULL; SEC_CHAR *password = NULL; - TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 2d244d1..7c385e7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -693,7 +693,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct schan_transport transport; int err; - TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 3d678a5..590a7da 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -251,7 +251,7 @@ SECURITY_STATUS WINAPI InitializeSecurityContextA( PCredHandle cred = NULL; PCredHandle ctxt = NULL; - TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry);

1 0

Yaron Shahrabani : wordpad: Added Hebrew translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: e084c6cfeef90fab0585babb6d50425341cb569b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e084c6cfeef90fab0585babb6… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 21 17:44:46 2010 +0200 wordpad: Added Hebrew translation. --- programs/wordpad/He.rc | 273 ++++++++++++++++++++++++++++++++++++++++++ programs/wordpad/Makefile.in | 1 + 2 files changed, 274 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e084c6cfeef90fab0585b…

1 0

Konstantin Kondratyuk : jscript: Update Russian translation.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 018eabfa8c62a9387690792d3f6b13e1818cf190 URL: http://source.winehq.org/git/wine.git/?a=commit;h=018eabfa8c62a9387690792d3… Author: Konstantin Kondratyuk <kondratyuk(a)etersoft.ru> Date: Thu Oct 21 11:03:16 2010 +0400 jscript: Update Russian translation. --- dlls/jscript/jscript_Ru.rc | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Ru.rc b/dlls/jscript/jscript_Ru.rc index ce58b44..934f9e4 100644 --- a/dlls/jscript/jscript_Ru.rc +++ b/dlls/jscript/jscript_Ru.rc @@ -27,8 +27,10 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Ошибка конвертирования объекта в примитивный тип" IDS_INVALID_CALL_ARG "Неверный вызов процедуры или аргумент" + IDS_SUBSCRIPT_OUT_OF_RANGE "Индекс вне диапазона" IDS_CREATE_OBJ_ERROR "Сервер автоматизации не может создать объект" IDS_NO_PROPERTY "Объект не поддерживает это свойство или метод" + IDS_UNSUPPORTED_ACTION "Объект не поддерживает это действие" IDS_ARG_NOT_OPT "Отсутствует обязательный аргумент" IDS_SYNTAX_ERROR "Синтаксическая ошибка" IDS_SEMICOLON "Ожидается ';'" @@ -42,6 +44,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Неверное присваивание" IDS_UNDEFINED "'|' не определён" IDS_NOT_BOOL "Ожидается объект типа 'bool'" + IDS_NOT_VBARRAY "Ожидается объект типа 'VBArray'" IDS_JSCRIPT_EXPECTED "Ожидается объект типа 'JScript'" IDS_REGEXP_SYNTAX_ERROR "Синтаксическая ошибка в регулярном выражении" IDS_URI_INVALID_CHAR "URI содержит неверные символы"

1 0

Alexandre Julliard : widl: Add some more attribute keywords.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 537773fbf4ef4d90f8e39e06f68b12c31ec1d829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537773fbf4ef4d90f8e39e06f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 14:13:38 2010 +0200 widl: Add some more attribute keywords. --- tools/widl/parser.l | 28 +++++++++++++++++ tools/widl/parser.y | 76 +++++++++++++++++++++++++++++++++++++++--------- tools/widl/widltypes.h | 23 ++++++++++++++ 3 files changed, 113 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=537773fbf4ef4d90f8e39…

1 0

Alexandre Julliard : widl: Add support for some more typelib flags based on the added attributes.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 2debb114e3f1a926962ef4f9a0ac2db3556fd778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2debb114e3f1a926962ef4f9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 21:34:33 2010 +0200 widl: Add support for some more typelib flags based on the added attributes. --- tools/widl/write_msft.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 1ac34d0..da4eb25 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1312,7 +1312,9 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) case ATTR_BINDABLE: funcflags |= 0x4; /* FUNCFLAG_FBINDABLE */ break; - /* FIXME: FUNCFLAG_FDEFAULTBIND */ + case ATTR_DEFAULTBIND: + funcflags |= 0x20; /* FUNCFLAG_FDEFAULTBIND */ + break; case ATTR_DEFAULTCOLLELEM: funcflags |= 0x100; /* FUNCFLAG_FDEFAULTCOLLELEM */ break; @@ -1373,8 +1375,12 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) case ATTR_SOURCE: funcflags |= 0x2; /* FUNCFLAG_FSOURCE */ break; - /* FIXME: FUNCFLAG_FUIDEFAULT */ - /* FIXME: FUNCFLAG_FUSESGETLASTERROR */ + case ATTR_UIDEFAULT: + funcflags |= 0x200; /* FUNCFLAG_FUIDEFAULT */ + break; + case ATTR_USESGETLASTERROR: + funcflags |= 0x80; /* FUNCFLAG_FUSESGETLASTERROR */ + break; case ATTR_VARARG: if (num_optional || num_defaults) warning("add_func_desc: ignoring vararg in function with optional or defaultvalue params\n"); @@ -1612,7 +1618,9 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) case ATTR_BINDABLE: varflags |= 0x04; /* VARFLAG_FBINDABLE */ break; - /* FIXME: VARFLAG_FDEFAULTBIND */ + case ATTR_DEFAULTBIND: + varflags |= 0x20; /* VARFLAG_FDEFAULTBIND */ + break; case ATTR_DEFAULTCOLLELEM: varflags |= 0x100; /* VARFLAG_FDEFAULTCOLLELEM */ break; @@ -1644,7 +1652,9 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) case ATTR_SOURCE: varflags |= 0x02; /* VARFLAG_FSOURCE */ break; - /* FIXME: VARFLAG_FUIDEFAULT */ + case ATTR_UIDEFAULT: + varflags |= 0x0200; /* VARFLAG_FUIDEFAULT */ + break; default: break; } @@ -1869,7 +1879,9 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ typeinfo->flags |= 0x10; /* TYPEFLAG_FHIDDEN */ break; - /* FIXME: TYPEFLAG_FLICENSED */ + case ATTR_LICENSED: + typeinfo->flags |= 0x04; /* TYPEFLAG_FLICENSED */ + break; case ATTR_NONCREATABLE: typeinfo->flags &= ~0x2; /* TYPEFLAG_FCANCREATE */ @@ -1885,7 +1897,9 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ /* FIXME: TYPEFLAG_FPREDCLID */ - /* FIXME: TYPEFLAG_FPROXY */ + case ATTR_PROXY: + typeinfo->flags |= 0x4000; /* TYPEFLAG_FPROXY */ + break; /* FIXME: TYPEFLAG_FREPLACEABLE */

1 0

Alexandre Julliard : widl: Use get_size_procformatstring_func() for clients too instead of duplicating the code.
by Alexandre Julliard 22 Oct '10

22 Oct '10

Module: wine Branch: master Commit: 226e96342925b6c17d61f0ed16c1ec95a9700d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=226e96342925b6c17d61f0ed1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 21 21:35:21 2010 +0200 widl: Use get_size_procformatstring_func() for clients too instead of duplicating the code. --- tools/widl/client.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 569a18b..693227f 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -76,7 +76,6 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { const statement_t *stmt; const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); - const var_t *var; int method_count = 0; if (!implicit_handle) @@ -297,15 +296,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) } /* update proc_offset */ - if (args) - { - LIST_FOR_EACH_ENTRY( var, args, const var_t, entry ) - *proc_offset += get_size_procformatstring_type(var->name, var->type, var->attrs); - } - if (!is_void(type_function_get_rettype(func->type))) - *proc_offset += get_size_procformatstring_type("return value", type_function_get_rettype(func->type), NULL); - else - *proc_offset += 2; /* FC_END and FC_PAD */ + *proc_offset += get_size_procformatstring_func( func ); indent--; print_client("}\n");

1 0