October 2010 - Wine-Commits

Hans Leidekker : msi: Don' t inline msi_feature_set_state and msi_component_set_state.
by Alexandre Julliard Oct. 22, 2010

Oct. 22, 2010

Module: wine Branch: master Commit: ded22a58c0f6b47a2e9de10d6d414182e7153ffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded22a58c0f6b47a2e9de10d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 22 10:35:59 2010 +0200 msi: Don't inline msi_feature_set_state and msi_component_set_state. --- dlls/msi/action.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 98 +-------------------------------------------------- 2 files changed, 94 insertions(+), 96 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c47e68a..80e1418 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -169,6 +169,98 @@ static const WCHAR szWriteEnvironmentStrings[] = * helper functions ********************************************************/ +void msi_feature_set_state( MSIPACKAGE *package, MSIFEATURE *feature, INSTALLSTATE state ) +{ + if (!package->ProductCode) + { + feature->ActionRequest = state; + feature->Action = state; + } + else if (state == INSTALLSTATE_ABSENT) + { + switch (feature->Installed) + { + case INSTALLSTATE_ABSENT: + feature->ActionRequest = INSTALLSTATE_UNKNOWN; + feature->Action = INSTALLSTATE_UNKNOWN; + break; + default: + feature->ActionRequest = state; + feature->Action = state; + } + } + else if (state == INSTALLSTATE_SOURCE) + { + switch (feature->Installed) + { + case INSTALLSTATE_ABSENT: + case INSTALLSTATE_SOURCE: + feature->ActionRequest = state; + feature->Action = state; + break; + case INSTALLSTATE_LOCAL: + feature->ActionRequest = INSTALLSTATE_LOCAL; + feature->Action = INSTALLSTATE_LOCAL; + break; + default: + feature->ActionRequest = INSTALLSTATE_UNKNOWN; + feature->Action = INSTALLSTATE_UNKNOWN; + } + } + else + { + feature->ActionRequest = state; + feature->Action = state; + } + if (feature->Attributes & msidbFeatureAttributesUIDisallowAbsent) + { + feature->Action = INSTALLSTATE_UNKNOWN; + } +} + +void msi_component_set_state( MSIPACKAGE *package, MSICOMPONENT *comp, INSTALLSTATE state ) +{ + if (!package->ProductCode) + { + comp->ActionRequest = state; + comp->Action = state; + } + else if (state == INSTALLSTATE_ABSENT) + { + switch (comp->Installed) + { + case INSTALLSTATE_LOCAL: + case INSTALLSTATE_SOURCE: + case INSTALLSTATE_DEFAULT: + comp->ActionRequest = state; + comp->Action = state; + break; + default: + comp->ActionRequest = INSTALLSTATE_UNKNOWN; + comp->Action = INSTALLSTATE_UNKNOWN; + } + } + else if (state == INSTALLSTATE_SOURCE) + { + if (comp->Installed == INSTALLSTATE_ABSENT || + (comp->Installed == INSTALLSTATE_SOURCE && comp->hasLocalFeature)) + { + comp->ActionRequest = state; + comp->Action = state; + } + else + { + comp->ActionRequest = INSTALLSTATE_UNKNOWN; + comp->Action = INSTALLSTATE_UNKNOWN; + } + } + else + { + comp->ActionRequest = state; + comp->Action = state; + } +} + static void ui_actionstart(MSIPACKAGE *package, LPCWSTR action) { static const WCHAR Query_t[] = diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 6f0b551..30910de 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -888,102 +888,6 @@ extern UINT ACTION_PerformUIAction(MSIPACKAGE *package, const WCHAR *action, UIN extern void ACTION_FinishCustomActions( const MSIPACKAGE* package); extern UINT ACTION_CustomAction(MSIPACKAGE *package,const WCHAR *action, UINT script, BOOL execute); -static inline void msi_feature_set_state(MSIPACKAGE *package, - MSIFEATURE *feature, - INSTALLSTATE state) -{ - if (!package->ProductCode) - { - feature->ActionRequest = state; - feature->Action = state; - } - else if (state == INSTALLSTATE_ABSENT) - { - switch (feature->Installed) - { - case INSTALLSTATE_ABSENT: - feature->ActionRequest = INSTALLSTATE_UNKNOWN; - feature->Action = INSTALLSTATE_UNKNOWN; - break; - default: - feature->ActionRequest = state; - feature->Action = state; - } - } - else if (state == INSTALLSTATE_SOURCE) - { - switch (feature->Installed) - { - case INSTALLSTATE_ABSENT: - case INSTALLSTATE_SOURCE: - feature->ActionRequest = state; - feature->Action = state; - break; - case INSTALLSTATE_LOCAL: - feature->ActionRequest = INSTALLSTATE_LOCAL; - feature->Action = INSTALLSTATE_LOCAL; - break; - default: - feature->ActionRequest = INSTALLSTATE_UNKNOWN; - feature->Action = INSTALLSTATE_UNKNOWN; - } - } - else - { - feature->ActionRequest = state; - feature->Action = state; - } - if (feature->Attributes & msidbFeatureAttributesUIDisallowAbsent) - { - feature->Action = INSTALLSTATE_UNKNOWN; - } -} - -static inline void msi_component_set_state(MSIPACKAGE *package, - MSICOMPONENT *comp, - INSTALLSTATE state) -{ - if (!package->ProductCode) - { - comp->ActionRequest = state; - comp->Action = state; - } - else if (state == INSTALLSTATE_ABSENT) - { - switch (comp->Installed) - { - case INSTALLSTATE_LOCAL: - case INSTALLSTATE_SOURCE: - case INSTALLSTATE_DEFAULT: - comp->ActionRequest = state; - comp->Action = state; - break; - default: - comp->ActionRequest = INSTALLSTATE_UNKNOWN; - comp->Action = INSTALLSTATE_UNKNOWN; - } - } - else if (state == INSTALLSTATE_SOURCE) - { - if (comp->Installed == INSTALLSTATE_ABSENT || - (comp->Installed == INSTALLSTATE_SOURCE && comp->hasLocalFeature)) - { - comp->ActionRequest = state; - comp->Action = state; - } - else - { - comp->ActionRequest = INSTALLSTATE_UNKNOWN; - comp->Action = INSTALLSTATE_UNKNOWN; - } - } - else - { - comp->ActionRequest = state; - comp->Action = state; - } -} - /* actions in other modules */ extern UINT ACTION_AppSearch(MSIPACKAGE *package); extern UINT ACTION_CCPSearch(MSIPACKAGE *package); @@ -1035,6 +939,8 @@ extern UINT msi_set_last_used_source(LPCWSTR product, LPCWSTR usersid, MSIINSTALLCONTEXT context, DWORD options, LPCWSTR value); extern UINT msi_get_local_package_name(LPWSTR path, LPCWSTR suffix); extern UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace); +extern void msi_component_set_state(MSIPACKAGE *, MSICOMPONENT *, INSTALLSTATE); +extern void msi_feature_set_state(MSIPACKAGE *, MSIFEATURE *, INSTALLSTATE); /* media */

1 0

Paul Vriens : browseui: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard Oct. 22, 2010

Oct. 22, 2010

Module: wine Branch: master Commit: 06cc8ff6b50a94c2649fc8d74a74fd5f69129b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06cc8ff6b50a94c2649fc8d74… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 22 10:19:32 2010 +0200 browseui: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/browseui/Makefile.in | 1 + dlls/browseui/rsrc_Sr.rc | 63 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/Makefile.in b/dlls/browseui/Makefile.in index 1ccf833..68f9f01 100644 --- a/dlls/browseui/Makefile.in +++ b/dlls/browseui/Makefile.in @@ -29,6 +29,7 @@ RC_SRCS = \ rsrc_Ro.rc \ rsrc_Ru.rc \ rsrc_Si.rc \ + rsrc_Sr.rc \ rsrc_Sv.rc \ rsrc_Uk.rc \ rsrc_Zh.rc \ diff --git a/dlls/browseui/rsrc_Sr.rc b/dlls/browseui/rsrc_Sr.rc new file mode 100644 index 0000000..8ff45cb --- /dev/null +++ b/dlls/browseui/rsrc_Sr.rc @@ -0,0 +1,63 @@ +/* + * Copyright 2007 Mikolaj Zalewski + * Copyright 2010 Đorđe Vasiljević + * Translated by Rancher + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resids.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_CANCELLING "Отказивање..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Откажи", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_CANCELLING "Otkazivanje..." +} + +IDD_PROGRESS_DLG DIALOG 0, 0, 260, 85 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX + LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX + CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 + PUSHBUTTON "&Otkaži", IDCANCEL, 205, 65, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + LTEXT "", IDC_TEXT_LINE + 2, 7, 75, 190, 10, SS_LEFT|SS_NOPREFIX +}

1 0

Yaron Shahrabani : mshtml: Added Hebrew translation.
by Alexandre Julliard Oct. 22, 2010

Oct. 22, 2010

Module: wine Branch: master Commit: 081f055aa04eabaa58d9f09a2f3dd5a1cc3debf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=081f055aa04eabaa58d9f09a2… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 22 00:24:48 2010 +0200 mshtml: Added Hebrew translation. --- dlls/mshtml/He.rc | 80 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/Makefile.in | 1 + 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/He.rc b/dlls/mshtml/He.rc new file mode 100644 index 0000000..abf4beb --- /dev/null +++ b/dlls/mshtml/He.rc @@ -0,0 +1,80 @@ +/* + * Copyright 2005-2006 Jacek Caban + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_STATUS_DONE "הסתיימה" + IDS_STATUS_DOWNLOADINGFROM "הורדה מהכתובת %s..." +} + +STRINGTABLE +{ + IDS_HTMLDISABLED "עיבוד HTML מנוטרל כעת." + IDS_HTMLDOCUMENT "מסמך HTML" + IDS_DOWNLOADING "הורדה..." + IDS_INSTALLING "התקנה..." +} + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "התקנת Gecko על Wine" +FONT 8, "MS Shell Dlg" +{ + LTEXT "אין באפשרות Wine למצוא את החבילה של Gecko הדרושה לצורך פעולה תקינה של יישומים המפענחים HTML." \ + "באפשרות Wine להוריד ולהתקין אותה אוטומטית עבורך.\n\n" \ + "לתשומת לבך: מומלץ להשתמש בחבילות ההפצה במקום. ניתן לעיין בכתובת http://wiki.winehq.org/Gecko לפרטים נוספים.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "התקדמות", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "ה&תקנה", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&ביטול", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "קישור" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "פרטי הקישור", -1, 5, 5, 190, 55 + LTEXT "&סוג:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&כתובת:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "אישור", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "אישור", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "ביטול", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 391e20b..403514a 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -75,6 +75,7 @@ RC_SRCS = \ Es.rc \ Fi.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ja.rc \

1 0

Yaron Shahrabani : mapi32: Added Hebrew translation.
by Alexandre Julliard Oct. 22, 2010

Oct. 22, 2010

Module: wine Branch: master Commit: 5474811fe127dff139a10a1324dbe87b704ce552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5474811fe127dff139a10a132… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 22 08:54:04 2010 +0200 mapi32: Added Hebrew translation. --- dlls/mapi32/He.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/He.rc b/dlls/mapi32/He.rc index 72d84e9..93fa755 100644 --- a/dlls/mapi32/He.rc +++ b/dlls/mapi32/He.rc @@ -22,10 +22,12 @@ #include "res.h" +#pragma code_page(65001) + LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT STRINGTABLE { - IDS_NO_MAPI_CLIENT, "�� MAPI ��." - IDS_SEND_MAIL, "�� " + IDS_NO_MAPI_CLIENT, "שליחת הודעת הדוא״ל נכשלה כיוון שאין לך לקוח דוא״ל MAPI מותקן." + IDS_SEND_MAIL, "שליחת דוא״ל" }

1 0

Yaron Shahrabani : winefile: Added Hebrew translation.
by Alexandre Julliard Oct. 22, 2010

Oct. 22, 2010

Module: wine Branch: master Commit: e332f8442e6bcd3c2e46dbb50fe5c3ce51cc922a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e332f8442e6bcd3c2e46dbb50… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 22 08:45:08 2010 +0200 winefile: Added Hebrew translation. --- programs/winefile/He.rc | 253 +++++++++++++++++++++++++++++++++++++++++ programs/winefile/Makefile.in | 1 + 2 files changed, 254 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e332f8442e6bcd3c2e46d…

1 0

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

Oct. 22, 2010

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

Alexandre Julliard : widl: Output some comments for proc format strings.
by Alexandre Julliard Oct. 22, 2010

Oct. 22, 2010

Module: wine Branch: master Commit: 63d5217fd674cba049d1a6a3519ea21507067f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d5217fd674cba049d1a6a35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 16 12:37:39 2010 +0200 widl: Output some comments for proc format strings. --- tools/widl/typegen.c | 32 +++++++++++++++++++++----------- tools/widl/typegen.h | 1 - 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 717e2c8..fdc0989 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -823,7 +823,6 @@ int decl_indirect(const type_t *t) } static unsigned int write_procformatstring_type(FILE *file, int indent, - const char *name, const type_t *type, const attr_list_t *attrs, int is_return) @@ -873,13 +872,15 @@ static unsigned int write_procformatstring_type(FILE *file, int indent, print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); print_file(file, indent, "0x01,\n"); - print_file(file, indent, "NdrFcShort(0x%hx),\n", (unsigned short)type->typestring_offset); + print_file(file, indent, "NdrFcShort(0x%x), /* type offset = %u */\n", + type->typestring_offset, type->typestring_offset); size = 4; /* includes param type prefix */ } return size; } -static void write_procformatstring_stmts(FILE *file, int indent, const statement_list_t *stmts, type_pred_t pred) +static void write_procformatstring_stmts(FILE *file, int indent, const statement_list_t *stmts, + type_pred_t pred, unsigned int *offset) { const statement_t *stmt; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) @@ -898,27 +899,36 @@ static void write_procformatstring_stmts(FILE *file, int indent, const statement { const var_t *var; LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - write_procformatstring_type(file, indent, var->name, var->type, var->attrs, FALSE); + { + print_file( file, 0, "/* %u (parameter %s) */\n", *offset, var->name ); + *offset += write_procformatstring_type(file, indent, var->type, var->attrs, FALSE); + } } /* emit return value data */ if (is_void(type_function_get_rettype(func->type))) { + print_file( file, 0, "/* %u (void) */\n", *offset ); print_file(file, indent, "0x5b, /* FC_END */\n"); print_file(file, indent, "0x5c, /* FC_PAD */\n"); + *offset += 2; } else - write_procformatstring_type(file, indent, "return value", type_function_get_rettype(func->type), NULL, TRUE); + { + print_file( file, 0, "/* %u (return value) */\n", *offset ); + *offset += write_procformatstring_type(file, indent, type_function_get_rettype(func->type), NULL, TRUE); + } } } else if (stmt->type == STMT_LIBRARY) - write_procformatstring_stmts(file, indent, stmt->u.lib->stmts, pred); + write_procformatstring_stmts(file, indent, stmt->u.lib->stmts, pred, offset); } } void write_procformatstring(FILE *file, const statement_list_t *stmts, type_pred_t pred) { int indent = 0; + unsigned int offset = 0; print_file(file, indent, "static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_file(file, indent, "{\n"); @@ -927,7 +937,7 @@ void write_procformatstring(FILE *file, const statement_list_t *stmts, type_pred print_file(file, indent, "{\n"); indent++; - write_procformatstring_stmts(file, indent, stmts, pred); + write_procformatstring_stmts(file, indent, stmts, pred, &offset); print_file(file, indent, "0x0\n"); indent--; @@ -3857,9 +3867,9 @@ void write_remoting_arguments(FILE *file, int indent, const var_t *func, const c } -unsigned int get_size_procformatstring_type(const char *name, const type_t *type, const attr_list_t *attrs) +static unsigned int get_size_procformatstring_type(const type_t *type, const attr_list_t *attrs) { - return write_procformatstring_type(NULL, 0, name, type, attrs, FALSE); + return write_procformatstring_type(NULL, 0, type, attrs, FALSE); } @@ -3871,13 +3881,13 @@ unsigned int get_size_procformatstring_func(const var_t *func) /* argument list size */ if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - size += get_size_procformatstring_type(var->name, var->type, var->attrs); + size += get_size_procformatstring_type(var->type, var->attrs); /* return value size */ if (is_void(type_function_get_rettype(func->type))) size += 2; /* FC_END and FC_PAD */ else - size += get_size_procformatstring_type("return value", type_function_get_rettype(func->type), NULL); + size += get_size_procformatstring_type(type_function_get_rettype(func->type), NULL); return size; } diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 57a914a..e519ee0 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -69,7 +69,6 @@ void print_phase_basetype(FILE *file, int indent, const char *local_var_prefix, 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, enum pass pass, enum remoting_phase phase); -unsigned int get_size_procformatstring_type(const char *name, const type_t *type, const attr_list_t *attrs); unsigned int get_size_procformatstring_func(const var_t *func); unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_t pred); unsigned int get_size_typeformatstring(const statement_list_t *stmts, type_pred_t pred);

1 0

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

Oct. 22, 2010

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

Yaron Shahrabani : wordpad: Added Hebrew translation.
by Alexandre Julliard Oct. 22, 2010

Oct. 22, 2010

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

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

Oct. 22, 2010

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