January 2012 - Wine-Commits

Eric Pouech : dbghelp: Correctly return flags in SYMBOL_INFO structure for local variables stored in a register .
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 28bb6f954a1207f669f37b327cff69821c635ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bb6f954a1207f669f37b327… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Jan 2 21:28:04 2012 +0100 dbghelp: Correctly return flags in SYMBOL_INFO structure for local variables stored in a register. --- dlls/dbghelp/symbol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index add3a1a..d9227ea 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -690,6 +690,7 @@ static void symt_fill_sym_info(struct module_pair* pair, sym_info->Flags |= SYMFLAG_PARAMETER; /* fall through */ case DataIsLocal: + sym_info->Flags |= SYMFLAG_LOCAL; { struct location loc = data->u.var; @@ -712,7 +713,6 @@ static void symt_fill_sym_info(struct module_pair* pair, { case loc_error: /* for now we report error cases as a negative register number */ - sym_info->Flags |= SYMFLAG_LOCAL; /* fall through */ case loc_register: sym_info->Flags |= SYMFLAG_REGISTER; @@ -720,7 +720,7 @@ static void symt_fill_sym_info(struct module_pair* pair, sym_info->Address = 0; break; case loc_regrel: - sym_info->Flags |= SYMFLAG_LOCAL | SYMFLAG_REGREL; + sym_info->Flags |= SYMFLAG_REGREL; sym_info->Register = loc.reg; if (loc.reg == CV_REG_NONE || (int)loc.reg < 0 /* error */) FIXME("suspicious register value %x\n", loc.reg);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DSHADEMODE typedef.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 16e9d728f4f2b40dbed4a5c332da1931ccf6eb94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16e9d728f4f2b40dbed4a5c33… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 2 21:45:29 2012 +0100 wined3d: Get rid of the WINED3DSHADEMODE typedef. --- dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4c64261..034fd34 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -155,19 +155,19 @@ static void state_shademode(struct wined3d_context *context, const struct wined3 { switch (state->render_states[WINED3D_RS_SHADEMODE]) { - case WINED3DSHADE_FLAT: + case WINED3D_SHADE_FLAT: glShadeModel(GL_FLAT); checkGLcall("glShadeModel(GL_FLAT)"); break; - case WINED3DSHADE_GOURAUD: + case WINED3D_SHADE_GOURAUD: glShadeModel(GL_SMOOTH); checkGLcall("glShadeModel(GL_SMOOTH)"); break; - case WINED3DSHADE_PHONG: - FIXME("WINED3DSHADE_PHONG isn't supported\n"); + case WINED3D_SHADE_PHONG: + FIXME("WINED3D_SHADE_PHONG isn't supported.\n"); break; default: - FIXME("Unrecognized/Unhandled WINED3DSHADEMODE value %#x.\n", + FIXME("Unrecognized shade mode %#x.\n", state->render_states[WINED3D_RS_SHADEMODE]); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 8a6bad8..4399446 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1124,7 +1124,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) else state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; state->render_states[WINED3D_RS_FILLMODE] = WINED3DFILL_SOLID; - state->render_states[WINED3D_RS_SHADEMODE] = WINED3DSHADE_GOURAUD; + state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD; lp.lp.repeat_factor = 0; lp.lp.line_pattern = 0; state->render_states[WINED3D_RS_LINEPATTERN] = lp.d; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 312f978..9ff53784 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -448,13 +448,12 @@ enum wined3d_fog_mode WINED3D_FOG_LINEAR = 3, }; -typedef enum _WINED3DSHADEMODE +enum wined3d_shade_mode { - WINED3DSHADE_FLAT = 1, - WINED3DSHADE_GOURAUD = 2, - WINED3DSHADE_PHONG = 3, - WINED3DSHADE_FORCE_DWORD = 0x7fffffff -} WINED3DSHADEMODE; + WINED3D_SHADE_FLAT = 1, + WINED3D_SHADE_GOURAUD = 2, + WINED3D_SHADE_PHONG = 3, +}; typedef enum _WINED3DFILLMODE {

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DFILLMODE typedef.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: a03eeb5cac77fdbfd893889ccec9fca568823b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03eeb5cac77fdbfd893889cc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 2 21:45:30 2012 +0100 wined3d: Get rid of the WINED3DFILLMODE typedef. --- dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/stateblock.c | 2 +- include/wine/wined3d.h | 11 +++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 034fd34..a392f1f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -49,24 +49,24 @@ static void state_nop(struct wined3d_context *context, const struct wined3d_stat static void state_fillmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - WINED3DFILLMODE mode = state->render_states[WINED3D_RS_FILLMODE]; + enum wined3d_fill_mode mode = state->render_states[WINED3D_RS_FILLMODE]; switch (mode) { - case WINED3DFILL_POINT: + case WINED3D_FILL_POINT: glPolygonMode(GL_FRONT_AND_BACK, GL_POINT); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_POINT)"); break; - case WINED3DFILL_WIREFRAME: + case WINED3D_FILL_WIREFRAME: glPolygonMode(GL_FRONT_AND_BACK, GL_LINE); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)"); break; - case WINED3DFILL_SOLID: + case WINED3D_FILL_SOLID: glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); checkGLcall("glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)"); break; default: - FIXME("Unrecognized WINED3D_RS_FILLMODE %d.\n", mode); + FIXME("Unrecognized fill mode %#x.\n", mode); } } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4399446..feabe3d 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1123,7 +1123,7 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_TRUE; else state->render_states[WINED3D_RS_ZENABLE] = WINED3D_ZB_FALSE; - state->render_states[WINED3D_RS_FILLMODE] = WINED3DFILL_SOLID; + state->render_states[WINED3D_RS_FILLMODE] = WINED3D_FILL_SOLID; state->render_states[WINED3D_RS_SHADEMODE] = WINED3D_SHADE_GOURAUD; lp.lp.repeat_factor = 0; lp.lp.line_pattern = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9ff53784..312b63c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -455,13 +455,12 @@ enum wined3d_shade_mode WINED3D_SHADE_PHONG = 3, }; -typedef enum _WINED3DFILLMODE +enum wined3d_fill_mode { - WINED3DFILL_POINT = 1, - WINED3DFILL_WIREFRAME = 2, - WINED3DFILL_SOLID = 3, - WINED3DFILL_FORCE_DWORD = 0x7fffffff -} WINED3DFILLMODE; + WINED3D_FILL_POINT = 1, + WINED3D_FILL_WIREFRAME = 2, + WINED3D_FILL_SOLID = 3, +}; typedef enum _WINED3DCULL {

1 0

Marcus Meissner : wshom.ocx: Mark one function as static, one as hidden.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: eaae8f840069d6ea9176aa727b21b68df74856b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaae8f840069d6ea9176aa727… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:47 2012 +0100 wshom.ocx: Mark one function as static, one as hidden. --- dlls/wshom.ocx/wshom_main.c | 1 + dlls/wshom.ocx/wshom_private.h | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wshom.ocx/wshom_main.c b/dlls/wshom.ocx/wshom_main.c index 6493d86..1c6bb44 100644 --- a/dlls/wshom.ocx/wshom_main.c +++ b/dlls/wshom.ocx/wshom_main.c @@ -80,6 +80,7 @@ HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) return S_OK; } +static void release_typelib(void) { unsigned i; diff --git a/dlls/wshom.ocx/wshom_private.h b/dlls/wshom.ocx/wshom_private.h index b39299f..5bf7403 100644 --- a/dlls/wshom.ocx/wshom_private.h +++ b/dlls/wshom.ocx/wshom_private.h @@ -33,6 +33,6 @@ typedef enum tid_t { LAST_tid } tid_t; -HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo); +HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) DECLSPEC_HIDDEN; HRESULT WINAPI WshShellFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;

1 0

Marcus Meissner : msvcrt: Mark various internal functions as hidden.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: b057a3e898f9583053db97eae17bfb56ab9e28dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b057a3e898f9583053db97eae… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:56 2012 +0100 msvcrt: Mark various internal functions as hidden. --- dlls/msvcrt/msvcrt.h | 62 +++++++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7ea0067..76f558c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -174,7 +174,7 @@ typedef struct MSVCRT_localeinfo_struct /* TLS data */ -extern DWORD msvcrt_tls_index; +extern DWORD msvcrt_tls_index DECLSPEC_HIDDEN; /* Keep in sync with msvcr90/tests/msvcr90.c */ struct __thread_data { @@ -214,15 +214,15 @@ struct __thread_data { typedef struct __thread_data thread_data_t; -extern thread_data_t *msvcrt_get_thread_data(void); +extern thread_data_t *msvcrt_get_thread_data(void) DECLSPEC_HIDDEN; -LCID MSVCRT_locale_to_LCID(const char *); -extern MSVCRT__locale_t MSVCRT_locale; +LCID MSVCRT_locale_to_LCID(const char *) DECLSPEC_HIDDEN; +extern MSVCRT__locale_t MSVCRT_locale DECLSPEC_HIDDEN; extern unsigned int MSVCRT___lc_codepage; extern int MSVCRT___lc_collate_cp; extern WORD MSVCRT__ctype [257]; -void msvcrt_set_errno(int); +void msvcrt_set_errno(int) DECLSPEC_HIDDEN; void __cdecl _purecall(void); void __cdecl _amsg_exit(int errnum); @@ -230,10 +230,10 @@ void __cdecl _amsg_exit(int errnum); extern char **MSVCRT__environ; extern MSVCRT_wchar_t **MSVCRT__wenviron; -extern char ** msvcrt_SnapshotOfEnvironmentA(char **); -extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **); +extern char ** msvcrt_SnapshotOfEnvironmentA(char **) DECLSPEC_HIDDEN; +extern MSVCRT_wchar_t ** msvcrt_SnapshotOfEnvironmentW(MSVCRT_wchar_t **) DECLSPEC_HIDDEN; -MSVCRT_wchar_t *msvcrt_wstrdupa(const char *); +MSVCRT_wchar_t *msvcrt_wstrdupa(const char *) DECLSPEC_HIDDEN; /* FIXME: This should be declared in new.h but it's not an extern "C" so * it would not be much use anyway. Even for Winelib applications. @@ -250,21 +250,21 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int); /* Setup and teardown multi threaded locks */ -extern void msvcrt_init_mt_locks(void); -extern void msvcrt_free_mt_locks(void); - -extern BOOL msvcrt_init_locale(void); -extern void msvcrt_init_math(void); -extern void msvcrt_init_io(void); -extern void msvcrt_free_io(void); -extern void msvcrt_init_console(void); -extern void msvcrt_free_console(void); -extern void msvcrt_init_args(void); -extern void msvcrt_free_args(void); -extern void msvcrt_init_signals(void); -extern void msvcrt_free_signals(void); - -extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**); +extern void msvcrt_init_mt_locks(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_mt_locks(void) DECLSPEC_HIDDEN; + +extern BOOL msvcrt_init_locale(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_math(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_io(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_io(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_console(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_console(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_args(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_args(void) DECLSPEC_HIDDEN; +extern void msvcrt_init_signals(void) DECLSPEC_HIDDEN; +extern void msvcrt_free_signals(void) DECLSPEC_HIDDEN; + +extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern unsigned int __cdecl _control87(unsigned int, unsigned int); @@ -902,12 +902,12 @@ int __cdecl MSVCRT_raise(int sig); #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 extern MSVCRT__locale_t MSVCRT_locale; -MSVCRT_pthreadlocinfo get_locinfo(void); -MSVCRT_pthreadmbcinfo get_mbcinfo(void); +MSVCRT_pthreadlocinfo get_locinfo(void) DECLSPEC_HIDDEN; +MSVCRT_pthreadmbcinfo get_mbcinfo(void) DECLSPEC_HIDDEN; void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); -void free_locinfo(MSVCRT_pthreadlocinfo); -void free_mbcinfo(MSVCRT_pthreadmbcinfo); -int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo); +void free_locinfo(MSVCRT_pthreadlocinfo) DECLSPEC_HIDDEN; +void free_mbcinfo(MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; +int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int); @@ -972,10 +972,10 @@ typedef union _printf_arg } printf_arg; typedef printf_arg (*args_clbk)(void*, int, int, __ms_va_list*); int pf_printf_a(puts_clbk_a, void*, const char*, MSVCRT__locale_t, - BOOL, BOOL, args_clbk, void*, __ms_va_list*); + BOOL, BOOL, args_clbk, void*, __ms_va_list*) DECLSPEC_HIDDEN; int pf_printf_w(puts_clbk_w, void*, const MSVCRT_wchar_t*, MSVCRT__locale_t, - BOOL, BOOL, args_clbk, void*, __ms_va_list*); -printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*); + BOOL, BOOL, args_clbk, void*, __ms_va_list*) DECLSPEC_HIDDEN; +printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; #define MSVCRT__OVERFLOW 3 #define MSVCRT__UNDERFLOW 4

1 0

Jacek Caban : ieframe: Improved test traces.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: ddbda376e82522f00bc244f95820bbe3d218fcf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbda376e82522f00bc244f95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 2 16:46:29 2012 +0100 ieframe: Improved test traces. --- dlls/ieframe/tests/webbrowser.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index cc84f27..8c12d39 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3125,13 +3125,14 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) ok(doc == doc2, "doc != doc2\n"); IDispatch_Release(doc2); + trace("Navigate2 repeated...\n"); test_Navigate2(unk); test_download(DWL_EXPECT_BEFORE_NAVIGATE); test_TranslateAccelerator(unk); doc2 = get_document(unk); ok(doc == doc2, "doc != doc2\n"); IDispatch_Release(doc2); - IDispatch_Release(doc2); + IDispatch_Release(doc); test_dochost_qs(unk); } @@ -3196,6 +3197,7 @@ START_TEST(webbrowser) test_WebBrowser(FALSE, TRUE); trace("Testing WebBrowser...\n"); test_WebBrowser(TRUE, FALSE); + trace("Testing WebBrowser (with close)...\n"); test_WebBrowser(TRUE, TRUE); trace("Testing WebBrowser w/o container-based olecmd...\n"); test_WebBrowser_NoContainerOlecmd();

1 0

Nikolay Sivov : po: Update Russian translations.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 2c9595c0395f29b40336a9acb71e6aaff78c4fe6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c9595c0395f29b40336a9acb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 2 15:12:51 2012 +0300 po: Update Russian translations. --- po/ru.po | 76 ++++++++++++++++++++----------------------------------------- 1 files changed, 25 insertions(+), 51 deletions(-) diff --git a/po/ru.po b/po/ru.po index 972eb5b..294f9b1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-21 23:30+0300\n" +"PO-Revision-Date: 2011-12-31 13:50+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: none\n" "Language: Russian\n" @@ -2124,9 +2124,8 @@ msgid "Certification Path" msgstr "Путь сертификации" #: cryptui.rc:211 -#, fuzzy msgid "Certification path" -msgstr "П&уть сертификации" +msgstr "Путь сертификации" #: cryptui.rc:214 msgid "&View Certificate" @@ -3331,9 +3330,8 @@ msgid "Asking for %s" msgstr "Запрос %s" #: inetcpl.rc:46 -#, fuzzy msgid "Home page" -msgstr " Домашняя страница " +msgstr "Домашняя страница" #: inetcpl.rc:47 msgid "You can choose the address that will be used as your home page." @@ -3352,9 +3350,8 @@ msgid "&Blank page" msgstr "Пу&стая страница" #: inetcpl.rc:53 -#, fuzzy msgid "Browsing history" -msgstr " История использования браузера " +msgstr "История использования браузера" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -3530,11 +3527,11 @@ msgstr "Незавершённая строковая константа" #: jscript.rc:38 msgid "Can't have 'break' outside of loop" -msgstr "" +msgstr "Выражение 'break' не может находится вне цикла" #: jscript.rc:39 msgid "Can't have 'continue' outside of loop" -msgstr "" +msgstr "Выражение 'continue' не может находится вне цикла" #: jscript.rc:40 msgid "Conditional compilation is turned off" @@ -10367,9 +10364,8 @@ msgid "&Footer:" msgstr "Н&ижний колонтитул:" #: notepad.rc:112 -#, fuzzy msgid "Margins (millimeters)" -msgstr "Поля (мм):" +msgstr "Поля (мм)" #: notepad.rc:113 msgid "&Left:" @@ -11747,31 +11743,26 @@ msgid "&Show processes from all users" msgstr "&Отображать процессы всех пользователей" #: taskmgr.rc:376 -#, fuzzy msgid "CPU usage" msgstr "Загрузка ЦП" #: taskmgr.rc:377 -#, fuzzy msgid "MEM usage" -msgstr "Файл подкачки" +msgstr "использование памяти" #: taskmgr.rc:378 msgid "Totals" msgstr "Всего" #: taskmgr.rc:379 -#, fuzzy msgid "Commit charge (K)" -msgstr "Выделение памяти (КБ)" +msgstr "Выделено памяти (КБ)" #: taskmgr.rc:380 -#, fuzzy msgid "Physical memory (K)" msgstr "Физическая память (КБ)" #: taskmgr.rc:381 -#, fuzzy msgid "Kernel memory (K)" msgstr "Память ядра (КБ)" @@ -11812,14 +11803,12 @@ msgid "Nonpaged" msgstr "Невыгруж." #: taskmgr.rc:418 -#, fuzzy msgid "CPU usage history" msgstr "Хронология загрузки ЦП" #: taskmgr.rc:419 -#, fuzzy msgid "Memory usage history" -msgstr "Хронология использования файла подкачки" +msgstr "Хронология использования памяти" #: taskmgr.rc:432 taskmgr.rc:327 msgid "Debug Channels" @@ -12493,9 +12482,8 @@ msgstr "" "option) any later version." #: winecfg.rc:140 -#, fuzzy msgid "Windows registration information" -msgstr " Регистрационная информация Windows " +msgstr "Регистрационная информация Windows" #: winecfg.rc:141 msgid "&Owner:" @@ -12506,9 +12494,8 @@ msgid "Organi&zation:" msgstr "Организация:" #: winecfg.rc:151 -#, fuzzy msgid "Application settings" -msgstr " Настройка приложений " +msgstr "Настройка приложений" #: winecfg.rc:152 msgid "" @@ -12533,9 +12520,8 @@ msgid "&Windows Version:" msgstr "&Версия Windows:" #: winecfg.rc:166 -#, fuzzy msgid "Window settings" -msgstr " Настройки окна " +msgstr "Настройки окон" #: winecfg.rc:167 msgid "Automatically capture the &mouse in full-screen windows" @@ -12558,9 +12544,8 @@ msgid "Desktop &size:" msgstr "Размер рабочего стола:" #: winecfg.rc:177 -#, fuzzy msgid "Direct3D" -msgstr " Direct3D " +msgstr "Direct3D" #: winecfg.rc:178 msgid "&Vertex Shader Support: " @@ -12571,18 +12556,16 @@ msgid "Allow &Pixel Shader (if supported by hardware)" msgstr "Включить Pixel Shader (если поддерживается оборудованием)" #: winecfg.rc:182 -#, fuzzy msgid "Screen resolution" -msgstr " Разрешение экрана " +msgstr "Разрешение экрана" #: winecfg.rc:186 msgid "This is a sample text using 10 point Tahoma" msgstr "Пример текста (This is a sample text), шрифт Tahoma 10 пунктов" #: winecfg.rc:193 -#, fuzzy msgid "DLL overrides" -msgstr " Замещения DLL " +msgstr "Замещения DLL" #: winecfg.rc:194 msgid "" @@ -12614,9 +12597,8 @@ msgid "Edit Override" msgstr "Изменить замещение" #: winecfg.rc:210 -#, fuzzy msgid "Load order" -msgstr " Порядок загрузки " +msgstr "Порядок загрузки" #: winecfg.rc:211 msgid "&Builtin (Wine)" @@ -12643,9 +12625,8 @@ msgid "Select Drive Letter" msgstr "Выберите букву диска" #: winecfg.rc:234 -#, fuzzy msgid "Drive mappings" -msgstr " Настройка дисков " +msgstr "Настройка дисков" #: winecfg.rc:235 msgid "" @@ -12692,14 +12673,12 @@ msgid "Show &dot files" msgstr "Показывать файлы, начинающиеся с точки" #: winecfg.rc:267 -#, fuzzy msgid "Driver diagnostics" -msgstr " Диагностика драйвера " +msgstr "Диагностика драйвера" #: winecfg.rc:269 -#, fuzzy msgid "Defaults" -msgstr " По умолчанию " +msgstr "По умолчанию" #: winecfg.rc:270 msgid "Output device:" @@ -12722,13 +12701,12 @@ msgid "&Test Sound" msgstr "&Проверить звук" #: winecfg.rc:285 -#, fuzzy msgid "Appearance" -msgstr " Внешний вид " +msgstr "Внешний вид" #: winecfg.rc:286 msgid "&Theme:" -msgstr "Тема:" +msgstr "&Тема:" #: winecfg.rc:288 msgid "&Install theme..." @@ -12743,13 +12721,12 @@ msgid "C&olor:" msgstr "Цвет:" #: winecfg.rc:301 -#, fuzzy msgid "Folders" -msgstr "Стандартные папки" +msgstr "Папки" #: winecfg.rc:304 msgid "&Link to:" -msgstr "Направить в:" +msgstr "Привязать к:" #: winecfg.rc:31 msgid "Libraries" @@ -13444,7 +13421,6 @@ msgid "By File Type" msgstr "По типу файлов" #: winefile.rc:146 -#, fuzzy msgid "File type" msgstr "Тип файла" @@ -13505,9 +13481,8 @@ msgid "&Compressed" msgstr "С&жатый" #: winefile.rc:184 -#, fuzzy msgid "Version information" -msgstr "&Информация о версии" +msgstr "Информация о версии" #: winefile.rc:93 msgid "Applying font settings" @@ -13613,7 +13588,6 @@ msgid "Fastest Times" msgstr "Лучшее время" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Лучшее время"

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 7346b9cf05de1cbeecd55e9a87a11763540e1f25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7346b9cf05de1cbeecd55e9a8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 1 17:39:22 2012 +0100 po: Update German translation. --- po/de.po | 68 +++++++++++++++++++------------------------------------------ 1 files changed, 21 insertions(+), 47 deletions(-) diff --git a/po/de.po b/po/de.po index 03697d1..2083839 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-29 17:17+0100\n" +"PO-Revision-Date: 2012-01-01 16:28+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2124,9 +2124,8 @@ msgid "Certification Path" msgstr "Zertifizierungspfad" #: cryptui.rc:211 -#, fuzzy msgid "Certification path" -msgstr "&Zertifizierungspfad" +msgstr "Zertifizierungspfad" #: cryptui.rc:214 msgid "&View Certificate" @@ -3329,9 +3328,8 @@ msgid "Asking for %s" msgstr "Frage nach %s" #: inetcpl.rc:46 -#, fuzzy msgid "Home page" -msgstr " Startseite " +msgstr "Startseite" #: inetcpl.rc:47 msgid "You can choose the address that will be used as your home page." @@ -3350,9 +3348,8 @@ msgid "&Blank page" msgstr "&Leere Seite" #: inetcpl.rc:53 -#, fuzzy msgid "Browsing history" -msgstr " Browserverlauf " +msgstr "Browserverlauf" #: inetcpl.rc:54 msgid "You can delete cached pages, cookies and other data." @@ -3527,11 +3524,11 @@ msgstr "konstante Zeichenkette nicht terminiert" #: jscript.rc:38 msgid "Can't have 'break' outside of loop" -msgstr "" +msgstr "Unerwartetes 'break' außerhalb der Schleife" #: jscript.rc:39 msgid "Can't have 'continue' outside of loop" -msgstr "" +msgstr "Unerwartetes 'continue' außerhalb der Schleife" #: jscript.rc:40 msgid "Conditional compilation is turned off" @@ -10432,9 +10429,8 @@ msgid "&Footer:" msgstr "&Fußzeile:" #: notepad.rc:112 -#, fuzzy msgid "Margins (millimeters)" -msgstr "&Ränder (Millimeter):" +msgstr "Ränder (Millimeter):" #: notepad.rc:113 msgid "&Left:" @@ -11822,12 +11818,10 @@ msgid "&Show processes from all users" msgstr "P&rozesse aller Benutzern anzeigen" #: taskmgr.rc:376 -#, fuzzy msgid "CPU usage" -msgstr "CPU-Auslastung" +msgstr "CPU Auslastung" #: taskmgr.rc:377 -#, fuzzy msgid "MEM usage" msgstr "Speicherausl." @@ -11836,17 +11830,14 @@ msgid "Totals" msgstr "Insgesamt" #: taskmgr.rc:379 -#, fuzzy msgid "Commit charge (K)" msgstr "Zugesicherter Speicher (K)" #: taskmgr.rc:380 -#, fuzzy msgid "Physical memory (K)" msgstr "Physikalischer Speicher (K)" #: taskmgr.rc:381 -#, fuzzy msgid "Kernel memory (K)" msgstr "Kernelspeicher (K)" @@ -11887,12 +11878,10 @@ msgid "Nonpaged" msgstr "Nicht ausgelagert" #: taskmgr.rc:418 -#, fuzzy msgid "CPU usage history" msgstr "Verlauf der CPU-Auslastung" #: taskmgr.rc:419 -#, fuzzy msgid "Memory usage history" msgstr "Verlauf der Speicherauslastung" @@ -12573,9 +12562,8 @@ msgstr "" "Version 2.1 der Lizenz oder (nach Ihrer Option) jeder späteren Version." #: winecfg.rc:140 -#, fuzzy msgid "Windows registration information" -msgstr " Windows-Registrierungs-Informationen " +msgstr "Windows Registrierungs Informationen" #: winecfg.rc:141 msgid "&Owner:" @@ -12586,9 +12574,8 @@ msgid "Organi&zation:" msgstr "&Organisation:" #: winecfg.rc:151 -#, fuzzy msgid "Application settings" -msgstr " Anwendungseinstellungen " +msgstr "Anwendungseinstellungen" #: winecfg.rc:152 msgid "" @@ -12614,9 +12601,8 @@ msgid "&Windows Version:" msgstr "&Windows Version:" #: winecfg.rc:166 -#, fuzzy msgid "Window settings" -msgstr " Fenstereinstellungen " +msgstr "Fenstereinstellungen" #: winecfg.rc:167 msgid "Automatically capture the &mouse in full-screen windows" @@ -12639,9 +12625,8 @@ msgid "Desktop &size:" msgstr "Desktop-&Größe:" #: winecfg.rc:177 -#, fuzzy msgid "Direct3D" -msgstr " Direct3D " +msgstr "Direct3D" #: winecfg.rc:178 msgid "&Vertex Shader Support: " @@ -12652,18 +12637,16 @@ msgid "Allow &Pixel Shader (if supported by hardware)" msgstr "&Pixel Shader aktivieren (wenn von Hardware unterstützt)" #: winecfg.rc:182 -#, fuzzy msgid "Screen resolution" -msgstr " Bildschi&rmauflösung " +msgstr "Bildschirmauflösung" #: winecfg.rc:186 msgid "This is a sample text using 10 point Tahoma" msgstr "Dies ist ein Beispieltext in 10 Punkt Tahoma" #: winecfg.rc:193 -#, fuzzy msgid "DLL overrides" -msgstr " DLL Überschreibung " +msgstr "DLL Überschreibungen" #: winecfg.rc:194 msgid "" @@ -12696,9 +12679,8 @@ msgid "Edit Override" msgstr "Bearbeite Überschreibung" #: winecfg.rc:210 -#, fuzzy msgid "Load order" -msgstr " Ladereihenfolge " +msgstr "Ladereihenfolge" #: winecfg.rc:211 msgid "&Builtin (Wine)" @@ -12725,9 +12707,8 @@ msgid "Select Drive Letter" msgstr "Laufwerksbuchstaben wählen" #: winecfg.rc:234 -#, fuzzy msgid "Drive mappings" -msgstr " Laufwerksz&uordnung " +msgstr "Laufwerkszuordnung" #: winecfg.rc:235 msgid "" @@ -12774,14 +12755,12 @@ msgid "Show &dot files" msgstr "Zeige D&ot-Dateien an" #: winecfg.rc:267 -#, fuzzy msgid "Driver diagnostics" -msgstr " Treiber Diagnose " +msgstr "Treiber Diagnose" #: winecfg.rc:269 -#, fuzzy msgid "Defaults" -msgstr " Standards " +msgstr "Standards" #: winecfg.rc:270 msgid "Output device:" @@ -12804,9 +12783,8 @@ msgid "&Test Sound" msgstr "Sound &testen" #: winecfg.rc:285 -#, fuzzy msgid "Appearance" -msgstr " Darstellung " +msgstr "Darstellung" #: winecfg.rc:286 msgid "&Theme:" @@ -12825,9 +12803,8 @@ msgid "C&olor:" msgstr "F&arbe:" #: winecfg.rc:301 -#, fuzzy msgid "Folders" -msgstr "Shell-Ordner" +msgstr "Ordner" #: winecfg.rc:304 msgid "&Link to:" @@ -13529,7 +13506,6 @@ msgid "By File Type" msgstr "Angaben auswählen" #: winefile.rc:146 -#, fuzzy msgid "File type" msgstr "Dateityp" @@ -13590,9 +13566,8 @@ msgid "&Compressed" msgstr "&Komprimiert" #: winefile.rc:184 -#, fuzzy msgid "Version information" -msgstr "&Versionsinformationen" +msgstr "Versionsinformationen" #: winefile.rc:93 msgid "Applying font settings" @@ -13698,7 +13673,6 @@ msgid "Fastest Times" msgstr "Beste Zeiten" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Beste Zeiten"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 68968419ecceb3f9ba348b04df18170f7806532d URL: http://source.winehq.org/git/wine.git/?a=commit;h=68968419ecceb3f9ba348b04d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Dec 31 10:23:25 2011 +0100 po: Update French translation. --- po/fr.po | 46 +++++++++++++++++----------------------------- 1 files changed, 17 insertions(+), 29 deletions(-) diff --git a/po/fr.po b/po/fr.po index c725ea6..d6db593 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-12-29 21:39+0100\n" +"PO-Revision-Date: 2011-12-30 10:22+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -12618,9 +12618,8 @@ msgstr "" "Licence, soit (à votre gré) toute version ultérieure." #: winecfg.rc:140 -#, fuzzy msgid "Windows registration information" -msgstr "Informations d'enregistrement de Windows " +msgstr "Informations d'enregistrement de Windows" #: winecfg.rc:141 msgid "&Owner:" @@ -12631,9 +12630,8 @@ msgid "Organi&zation:" msgstr "&Organisation:" #: winecfg.rc:151 -#, fuzzy msgid "Application settings" -msgstr " Paramètres des applications " +msgstr "Paramètres des applications" #: winecfg.rc:152 msgid "" @@ -12659,9 +12657,8 @@ msgid "&Windows Version:" msgstr "Version de &Windows :" #: winecfg.rc:166 -#, fuzzy msgid "Window settings" -msgstr " Paramètres des fenêtres " +msgstr "Paramètres des fenêtres" #: winecfg.rc:167 msgid "Automatically capture the &mouse in full-screen windows" @@ -12684,9 +12681,8 @@ msgid "Desktop &size:" msgstr "Taille du bureau:" #: winecfg.rc:177 -#, fuzzy msgid "Direct3D" -msgstr " Direct3D " +msgstr "Direct3D" #: winecfg.rc:178 msgid "&Vertex Shader Support: " @@ -12697,18 +12693,16 @@ msgid "Allow &Pixel Shader (if supported by hardware)" msgstr "Utiliser le Pixel Shader (si supporté par le matériel)" #: winecfg.rc:182 -#, fuzzy msgid "Screen resolution" -msgstr " Résolution de l'écran " +msgstr "Résolution de l'écran" #: winecfg.rc:186 msgid "This is a sample text using 10 point Tahoma" msgstr "Ceci est un exemple utilisant du Tahoma 10 points" #: winecfg.rc:193 -#, fuzzy msgid "DLL overrides" -msgstr " Remplacement de DLL " +msgstr "Remplacement de DLL" #: winecfg.rc:194 msgid "" @@ -12742,9 +12736,8 @@ msgid "Edit Override" msgstr "Éditer le remplacement" #: winecfg.rc:210 -#, fuzzy msgid "Load order" -msgstr " Ordre de chargement " +msgstr "Ordre de chargement" #: winecfg.rc:211 msgid "&Builtin (Wine)" @@ -12771,9 +12764,8 @@ msgid "Select Drive Letter" msgstr "Sélectionnez la lettre du lecteur" #: winecfg.rc:234 -#, fuzzy msgid "Drive mappings" -msgstr " Assignation des lecteurs " +msgstr "Assignation des lecteurs" #: winecfg.rc:235 msgid "" @@ -12820,39 +12812,36 @@ msgid "Show &dot files" msgstr "Montrer les fichiers cachés" #: winecfg.rc:267 -#, fuzzy msgid "Driver diagnostics" -msgstr " Driver Diagnostics " +msgstr "Diagnostic de pilotes" #: winecfg.rc:269 -#, fuzzy msgid "Defaults" -msgstr " Defaults " +msgstr "Valeurs par défaut" #: winecfg.rc:270 msgid "Output device:" -msgstr "Output device:" +msgstr "Périphérique de sortie :" #: winecfg.rc:271 msgid "Voice output device:" -msgstr "Voice output device:" +msgstr "Périphérique de sortie voix :" #: winecfg.rc:272 msgid "Input device:" -msgstr "Input device:" +msgstr "Périphérique d'entrée :" #: winecfg.rc:273 msgid "Voice input device:" -msgstr "Voice input device:" +msgstr "Périphérique d'entrée voix :" #: winecfg.rc:278 msgid "&Test Sound" msgstr "&Tester le son" #: winecfg.rc:285 -#, fuzzy msgid "Appearance" -msgstr " Apparence " +msgstr "Apparence" #: winecfg.rc:286 msgid "&Theme:" @@ -12871,9 +12860,8 @@ msgid "C&olor:" msgstr "Couleu&r :" #: winecfg.rc:301 -#, fuzzy msgid "Folders" -msgstr "Dossier" +msgstr "Dossiers" #: winecfg.rc:304 msgid "&Link to:"

1 0

Marcus Meissner : mshtml: Mark function as hidden.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 3a58d2842757aef00193d891ac0965d5d569dc2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a58d2842757aef00193d891a… Author: Marcus Meissner <meissner(a)suse.de> Date: Mon Jan 2 21:57:22 2012 +0100 mshtml: Mark function as hidden. --- dlls/mshtml/binding.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index a392037..0d7a3a7 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -112,4 +112,4 @@ HRESULT super_navigate(HTMLWindow*,IUri*,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDD HRESULT create_channelbsc(IMoniker*,const WCHAR*,BYTE*,DWORD,nsChannelBSC**) DECLSPEC_HIDDEN; HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; -IUri *nsuri_get_uri(nsWineURI*); +IUri *nsuri_get_uri(nsWineURI*) DECLSPEC_HIDDEN;

1 0