wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: ecd0881ba4a46ef8ca7c56ef95975d95d7f9fbba URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd0881ba4a46ef8ca7c56ef9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Aug 19 13:58:46 2015 +0300 po: Update Ukrainian translation. --- po/uk.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/uk.po b/po/uk.po index 1d0229f..4c76869 100644 --- a/po/uk.po +++ b/po/uk.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: 2015-08-03 15:12+0200\n" +"PO-Revision-Date: 2015-08-19 13:56+0200\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -12942,18 +12942,17 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: Застосунок з ідентифікатором '%1' не знайдено\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"uninstaller: Для параметра '--remove' повинен бути вказаний GUID застосунка\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Помилка: невірний параметр '%c'.\n" +msgstr "uninstaller: Невірний параметр [%1]\n" #: view.rc:36 msgid "&Pan"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: ff35d02d7033c0790795e4736d3d860ebeace170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff35d02d7033c0790795e4736… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 19 08:20:07 2015 +0300 po: Update Russian translation. --- po/ru.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 2a899c0..dc1935e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,13 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-22 14:01+0300\n" +"PO-Revision-Date: 2015-08-19 08:15+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.6.10\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -12851,18 +12852,18 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "uninstaller: приложение с идентификатором «%1» не найдено\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"uninstaller: за опцией «--remove» должен следовать GUID идентификатор " +"приложения\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Ошибка: неверная опция «%c».\n" +msgstr "uninstaller: неверная опция [%1]\n" #: view.rc:36 msgid "&Pan"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 88d49b25c8f67cb76f71957af8c17889fb1e544a URL: http://source.winehq.org/git/wine.git/?a=commit;h=88d49b25c8f67cb76f71957af… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Aug 18 20:55:08 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6fb9ff3..7963801 100644 --- a/po/lt.po +++ b/po/lt.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: 2015-07-14 16:31+0300\n" +"PO-Revision-Date: 2015-08-18 20:53+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -198,7 +198,7 @@ msgid "" "Unable to execute the uninstaller, '%s'. Do you want to remove the uninstall " "entry for this program from the registry?" msgstr "" -"Nepavyko įvykdyti programos pašalinimo komandos „%s“. Ar norite pašalinti " +"Nepavyko įvykdyti programos šalinimo komandos „%s“. Ar norite pašalinti " "programos šalinimo įrašą iš registro?" #: appwiz.rc:36 @@ -12864,18 +12864,17 @@ msgstr "" #: uninstaller.rc:31 msgid "uninstaller: The application with GUID '%1' was not found\n" -msgstr "" +msgstr "šalinimo programa: Programa su GUID „%1“ nerasta\n" #: uninstaller.rc:32 msgid "" "uninstaller: The option '--remove' must be followed by an application GUID\n" msgstr "" +"šalinimo programa: Už parametro „--remove“ privalo būti programos GUID\n" #: uninstaller.rc:33 -#, fuzzy -#| msgid "Error: Invalid option '%c'.\n" msgid "uninstaller: Invalid option [%1]\n" -msgstr "Klaida: netinkamas parametras „%c“.\n" +msgstr "šalinimo programa: Netinkamas parametras [%1]\n" #: view.rc:36 msgid "&Pan"

1 0

Thomas Faller : cmd: Implement 'echo/'.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 1d09a3587814b6d6e424641a6274d7877f48cd67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d09a3587814b6d6e424641a6… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Aug 18 15:54:43 2015 +0200 cmd: Implement 'echo/'. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd | 8 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 ++++++++++++++++ programs/cmd/wcmdmain.c | 7 +++++-- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b124876..5661c69 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1465,7 +1465,7 @@ void WCMD_echo (const WCHAR *args) WCHAR *trimmed; if ( args[0]==' ' || args[0]=='\t' || args[0]=='.' - || args[0]==':' || args[0]==';') + || args[0]==':' || args[0]==';' || args[0]=='/') args++; trimmed = WCMD_strtrim(args); @@ -1473,7 +1473,7 @@ void WCMD_echo (const WCHAR *args) count = strlenW(trimmed); if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':' - && origcommand[0]!=';') { + && origcommand[0]!=';' && origcommand[0]!='/') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); heap_free(trimmed); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 5351e9c..0a8a4f4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -15,6 +15,10 @@ echo: echo : echo:word echo :word +echo/ +echo / +echo/word +echo /word echo off now echo word@space@ echo word@space@@space@ @@ -47,6 +51,10 @@ echo: echo : echo:word echo :word +echo/ +echo / +echo/word +echo /word echo on again echo word@space@ echo word@space@@space@ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4dddc71..b222158 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -42,6 +42,18 @@ word @pwd@>echo :word@space@ :word +@pwd@>echo/ + + +@pwd@>echo /@space@ +/ + +@pwd@>echo/word +word + +@pwd@>echo /word@space@ +/word + @pwd@>echo off now@space@ off now @@ -93,6 +105,10 @@ word : word :word + +/ +word +/word on again word@space@ word@space@@space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1e42c47..7666329 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1853,17 +1853,20 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (context && echo_mode && *curPos && (*curPos != '@')) { static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; + static const WCHAR echoSlash[] = {'e','c','h','o','/'}; const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); WCMD_show_prompt(); WCMD_output_asis(curPos); /* I don't know why Windows puts a space here but it does */ - /* Except for lines starting with 'echo.' or 'echo:'. Ask MS why */ + /* Except for lines starting with 'echo.', 'echo:' or 'echo/'. Ask MS why */ if (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, curPos, min_len, echoDot, len) != CSTR_EQUAL && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - curPos, min_len, echoCol, len) != CSTR_EQUAL) + curPos, min_len, echoCol, len) != CSTR_EQUAL + && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + curPos, min_len, echoSlash, len) != CSTR_EQUAL) { WCMD_output_asis(spaceW); }

1 0

Carlo Bramini : msvcrt: SEEK_* macros from GLIBC should be replaced with safer MSVCRT_SEEK_* macros.
by Alexandre Julliard 19 Aug '15

19 Aug '15

Module: wine Branch: master Commit: 21a14e9612e10bd1427fa044512c736434d34f55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a14e9612e10bd1427fa0445… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Tue Aug 18 12:55:12 2015 +0200 msvcrt: SEEK_* macros from GLIBC should be replaced with safer MSVCRT_SEEK_* macros. --- dlls/msvcrt/file.c | 40 ++++++++++++++++++++-------------------- dlls/msvcrt/msvcrt.h | 4 ++++ 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 6cace71..f304ec4 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1224,9 +1224,9 @@ __int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) TRACE(":fd (%d) to %s pos %s\n", fd,wine_dbgstr_longlong(offset), - (whence==SEEK_SET)?"SEEK_SET": - (whence==SEEK_CUR)?"SEEK_CUR": - (whence==SEEK_END)?"SEEK_END":"UNKNOWN"); + (whence==MSVCRT_SEEK_SET)?"SEEK_SET": + (whence==MSVCRT_SEEK_CUR)?"SEEK_CUR": + (whence==MSVCRT_SEEK_END)?"SEEK_END":"UNKNOWN"); /* The MoleBox protection scheme expects msvcrt to use SetFilePointer only, * so a LARGE_INTEGER offset cannot be passed directly via SetFilePointerEx. */ @@ -1357,8 +1357,8 @@ int CDECL MSVCRT__fseeki64_nolock(MSVCRT_FILE* file, __int64 offset, int whence) { int ret; - if(whence == SEEK_CUR && file->_flag & MSVCRT__IOREAD ) { - whence = SEEK_SET; + if(whence == MSVCRT_SEEK_CUR && file->_flag & MSVCRT__IOREAD ) { + whence = MSVCRT_SEEK_SET; offset += MSVCRT__ftelli64_nolock(file); } @@ -1409,10 +1409,10 @@ int CDECL MSVCRT__chsize_s(int fd, __int64 size) if (info->handle != INVALID_HANDLE_VALUE) { /* save the current file pointer */ - cur = MSVCRT__lseeki64(fd, 0, SEEK_CUR); + cur = MSVCRT__lseeki64(fd, 0, MSVCRT_SEEK_CUR); if (cur >= 0) { - pos = MSVCRT__lseeki64(fd, size, SEEK_SET); + pos = MSVCRT__lseeki64(fd, size, MSVCRT_SEEK_SET); if (pos >= 0) { ret = SetEndOfFile(info->handle); @@ -1420,7 +1420,7 @@ int CDECL MSVCRT__chsize_s(int fd, __int64 size) } /* restore the file pointer */ - MSVCRT__lseeki64(fd, cur, SEEK_SET); + MSVCRT__lseeki64(fd, cur, MSVCRT_SEEK_SET); } } @@ -1457,7 +1457,7 @@ void CDECL MSVCRT_rewind(MSVCRT_FILE* file) TRACE(":file (%p) fd (%d)\n",file,file->_file); MSVCRT__lock_file(file); - MSVCRT__fseek_nolock(file, 0L, SEEK_SET); + MSVCRT__fseek_nolock(file, 0L, MSVCRT_SEEK_SET); MSVCRT_clearerr(file); MSVCRT__unlock_file(file); } @@ -1623,14 +1623,14 @@ MSVCRT_FILE* CDECL MSVCRT__wfdopen(int fd, const MSVCRT_wchar_t *mode) */ LONG CDECL MSVCRT__filelength(int fd) { - LONG curPos = MSVCRT__lseek(fd, 0, SEEK_CUR); + LONG curPos = MSVCRT__lseek(fd, 0, MSVCRT_SEEK_CUR); if (curPos != -1) { - LONG endPos = MSVCRT__lseek(fd, 0, SEEK_END); + LONG endPos = MSVCRT__lseek(fd, 0, MSVCRT_SEEK_END); if (endPos != -1) { if (endPos != curPos) - MSVCRT__lseek(fd, curPos, SEEK_SET); + MSVCRT__lseek(fd, curPos, MSVCRT_SEEK_SET); return endPos; } } @@ -1642,14 +1642,14 @@ LONG CDECL MSVCRT__filelength(int fd) */ __int64 CDECL MSVCRT__filelengthi64(int fd) { - __int64 curPos = MSVCRT__lseeki64(fd, 0, SEEK_CUR); + __int64 curPos = MSVCRT__lseeki64(fd, 0, MSVCRT_SEEK_CUR); if (curPos != -1) { - __int64 endPos = MSVCRT__lseeki64(fd, 0, SEEK_END); + __int64 endPos = MSVCRT__lseeki64(fd, 0, MSVCRT_SEEK_END); if (endPos != -1) { if (endPos != curPos) - MSVCRT__lseeki64(fd, curPos, SEEK_SET); + MSVCRT__lseeki64(fd, curPos, MSVCRT_SEEK_SET); return endPos; } } @@ -3145,7 +3145,7 @@ int CDECL MSVCRT__wstat64i32(const MSVCRT_wchar_t *path, struct MSVCRT__stat64i3 */ MSVCRT_long CDECL MSVCRT__tell(int fd) { - return MSVCRT__lseek(fd, 0, SEEK_CUR); + return MSVCRT__lseek(fd, 0, MSVCRT_SEEK_CUR); } /********************************************************************* @@ -3153,7 +3153,7 @@ MSVCRT_long CDECL MSVCRT__tell(int fd) */ __int64 CDECL _telli64(int fd) { - return MSVCRT__lseeki64(fd, 0, SEEK_CUR); + return MSVCRT__lseeki64(fd, 0, MSVCRT_SEEK_CUR); } /********************************************************************* @@ -4415,7 +4415,7 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) file->_flag &= ~(MSVCRT__IOREAD|MSVCRT__IOWRT); } - ret = (MSVCRT__lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0; + ret = (MSVCRT__lseeki64(file->_file,*pos,MSVCRT_SEEK_SET) == -1) ? -1 : 0; MSVCRT__unlock_file(file); return ret; } @@ -4456,7 +4456,7 @@ __int64 CDECL MSVCRT__ftelli64_nolock(MSVCRT_FILE* file) pos++; } } else if(!file->_cnt) { /* nothing to do */ - } else if(MSVCRT__lseeki64(file->_file, 0, SEEK_END)==pos) { + } else if(MSVCRT__lseeki64(file->_file, 0, MSVCRT_SEEK_END)==pos) { int i; pos -= file->_cnt; @@ -4468,7 +4468,7 @@ __int64 CDECL MSVCRT__ftelli64_nolock(MSVCRT_FILE* file) } else { char *p; - if(MSVCRT__lseeki64(file->_file, pos, SEEK_SET) != pos) + if(MSVCRT__lseeki64(file->_file, pos, MSVCRT_SEEK_SET) != pos) return -1; pos -= file->_bufsiz; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 88f35b3..8c07b94 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -666,6 +666,10 @@ struct MSVCRT__stat64 { #define MSVCRT_RAND_MAX 0x7fff #define MSVCRT_BUFSIZ 512 +#define MSVCRT_SEEK_SET 0 +#define MSVCRT_SEEK_CUR 1 +#define MSVCRT_SEEK_END 2 + #define MSVCRT_STDIN_FILENO 0 #define MSVCRT_STDOUT_FILENO 1 #define MSVCRT_STDERR_FILENO 2

1 0

Jacek Caban : ieframe: Fixed and improved navigation command state tests.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: cfbc37c699e3b3b27df4c566014e6dde9c7194b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfbc37c699e3b3b27df4c5660… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:01:21 2015 +0200 ieframe: Fixed and improved navigation command state tests. --- dlls/ieframe/navigate.c | 13 +-- dlls/ieframe/tests/webbrowser.c | 219 ++++++++++++++++++++++++---------------- 2 files changed, 132 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cfbc37c699e3b3b27df4c…

1 0

Jacek Caban : ieframe: Update back/ forward navigation state in CMDID_EXPLORER_UPDATEHISTORY handler.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 5a2aa4a8a8d407b56f8836e94b7dfec1e237dbd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2aa4a8a8d407b56f8836e94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:01:08 2015 +0200 ieframe: Update back/forward navigation state in CMDID_EXPLORER_UPDATEHISTORY handler. --- dlls/ieframe/dochost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index a6582b1..0823797 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -749,6 +749,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, switch(nCmdID) { case CMDID_EXPLORER_UPDATEHISTORY: update_travellog(This); + update_navigation_commands(This); return S_OK; default:

1 0

Jacek Caban : ieframe: Update back/ forward command state in FireNavigateComplete2.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 670459b7bc1d98e263d3875c91849a340982f5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=670459b7bc1d98e263d3875c9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:01:01 2015 +0200 ieframe: Update back/forward command state in FireNavigateComplete2. --- dlls/ieframe/dochost.c | 29 +++++++++++++++++++++++++++++ dlls/ieframe/ieframe.h | 1 + dlls/ieframe/navigate.c | 21 --------------------- dlls/ieframe/shellbrowser.c | 2 ++ 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 3de1d21..a6582b1 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -80,6 +80,35 @@ void abort_dochost_tasks(DocHost *This, task_proc_t proc) } } +void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable) +{ + DISPPARAMS dispparams; + VARIANTARG params[2]; + + TRACE("command=%d enable=%d\n", command, enable); + + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = params; + + V_VT(params) = VT_BOOL; + V_BOOL(params) = enable; + + V_VT(params+1) = VT_I4; + V_I4(params+1) = command; + + call_sink(doc_host->cps.wbe2, DISPID_COMMANDSTATECHANGE, &dispparams); +} + +void update_navigation_commands(DocHost *dochost) +{ + unsigned pos = dochost->travellog.loading_pos == -1 ? dochost->travellog.position : dochost->travellog.loading_pos; + + on_commandstate_change(dochost, CSC_NAVIGATEBACK, pos > 0 ? VARIANT_TRUE : VARIANT_FALSE); + on_commandstate_change(dochost, CSC_NAVIGATEFORWARD, pos < dochost->travellog.length ? VARIANT_TRUE : VARIANT_FALSE); +} + static void notif_complete(DocHost *This, DISPID dispid) { DISPPARAMS dispparams; diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 057c2f6..5806107 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -278,6 +278,7 @@ void deactivate_document(DocHost*) DECLSPEC_HIDDEN; void create_doc_view_hwnd(DocHost*) DECLSPEC_HIDDEN; void on_commandstate_change(DocHost*,LONG,VARIANT_BOOL) DECLSPEC_HIDDEN; void notify_download_state(DocHost*,BOOL) DECLSPEC_HIDDEN; +void update_navigation_commands(DocHost *dochost) DECLSPEC_HIDDEN; #define WM_DOCHOSTTASK (WM_USER+0x300) void push_dochost_task(DocHost*,task_header_t*,task_proc_t,task_destr_t,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 74d1bc5..36915e4 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -781,27 +781,6 @@ static void doc_navigate_task_destr(task_header_t *t) heap_free(task); } -void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable) -{ - DISPPARAMS dispparams; - VARIANTARG params[2]; - - TRACE("command=%d enable=%d\n", command, enable); - - dispparams.cArgs = 2; - dispparams.cNamedArgs = 0; - dispparams.rgdispidNamedArgs = NULL; - dispparams.rgvarg = params; - - V_VT(params) = VT_BOOL; - V_BOOL(params) = enable; - - V_VT(params+1) = VT_I4; - V_I4(params+1) = command; - - call_sink(doc_host->cps.wbe2, DISPID_COMMANDSTATECHANGE, &dispparams); -} - static void doc_navigate_proc(DocHost *This, task_header_t *t) { task_doc_navigate_t *task = (task_doc_navigate_t*)t; diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 8145536..f75689e 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -748,6 +748,8 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2( TRACE("%p %p %x\n", This, pHTMLWindow2, dwFlags); + update_navigation_commands(This->doc_host); + if(doc_host->travellog.loading_pos != -1) { WARN("histupdate not notified\n"); doc_host->travellog.position = doc_host->travellog.loading_pos;

1 0

Jacek Caban : ieframe: Don't add about: URLs to travellog.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: 16bfe07639a179f686e389221564df981d5c09e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16bfe07639a179f686e389221… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:00:47 2015 +0200 ieframe: Don't add about: URLs to travellog. --- dlls/ieframe/dochost.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 3c7afb6..3de1d21 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -395,6 +395,13 @@ static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; + static const WCHAR about_schemeW[] = {'a','b','o','u','t',':'}; + + if(This->url && !strncmpiW(This->url, about_schemeW, sizeof(about_schemeW)/sizeof(*about_schemeW))) { + TRACE("Skipping about URL\n"); + return; + } + if(!This->travellog.log) { This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); if(!This->travellog.log)

1 0

Adam Stachowicz : po: Update Polish translation.
by Alexandre Julliard 18 Aug '15

18 Aug '15

Module: wine Branch: master Commit: bc051b9f33ba7d3007c5232c3ea699b1ddb5aa52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc051b9f33ba7d3007c5232c3… Author: Adam Stachowicz <saibamenppl(a)gmail.com> Date: Mon Aug 17 13:36:13 2015 +0200 po: Update Polish translation. --- po/pl.po | 87 +++++++++++++++++++--------------------------------------------- 1 file changed, 25 insertions(+), 62 deletions(-) diff --git a/po/pl.po b/po/pl.po index 89b18af..dc7d51c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,21 +1,21 @@ # Polish translations for Wine # # Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. +# Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-11-29 07:31+0100\n" -"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" +"PO-Revision-Date: 2015-08-16 21:14+0200\n" +"Last-Translator: Adam Stachowicz <saibamenppl(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.8.4\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -2738,11 +2738,6 @@ msgstr "" "Czy jesteś pewien, że chcesz usunąć ten certyfikat?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -3155,10 +3150,8 @@ msgid "&View Source" msgstr "&Pokaż źródło" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Właściwości" +msgstr "&Właściwości" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -7472,10 +7465,8 @@ msgid "Add Control" msgstr "Dodaj kontrolkę" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Czcionka..." +msgstr "&Konwertuj..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8602,10 +8593,8 @@ msgid "Duplex:" msgstr "Dupleks:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "U&stawienia" +msgstr "Ustawienia" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -8928,10 +8917,6 @@ msgstr "" "lub czy połączenie sieciowe jest wciąż aktywne." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." @@ -9250,24 +9235,20 @@ msgstr "" "czy połączenie sieciowe jest aktywne." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Instalator Wine Mono" +msgstr "Mapper dźwięku Wine" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "kolumna" +msgstr "Głośność" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Główna głośność" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Wycisz" #: winspool.rc:37 msgid "Print to File" @@ -11585,10 +11566,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Błąd: Niewłaściwe parametry wiersza poleceń\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Błąd: Nie można dodać kluczy do zdalnej maszyny\n" +msgstr "Błąd: Błąd dostępu do zdalnej maszyny\n" #: reg.rc:38 msgid "" @@ -11596,10 +11575,8 @@ msgid "" msgstr "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Niewspierany typ.\n" +msgstr "Błąd: Niewspierany typ\n" #: regedit.rc:34 msgid "&Registry" @@ -13198,14 +13175,12 @@ msgid "&Test Sound" msgstr "Próba dźwięku" #: winecfg.rc:277 winecfg.rc:90 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Ustawienia Wine" +msgstr "Konfiguracja głośników" #: winecfg.rc:280 msgid "Speakers:" -msgstr "" +msgstr "Głośniki:" #: winecfg.rc:288 msgid "Appearance" @@ -13313,21 +13288,19 @@ msgstr "(Domyślne systemowe)" #: winecfg.rc:91 msgid "5.1 Surround" -msgstr "" +msgstr "Dźwięk przestrzenny w układzie 5.1" #: winecfg.rc:92 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "grafika" +msgstr "Kwadrofonia" #: winecfg.rc:93 msgid "Stereo" -msgstr "" +msgstr "Stereo" #: winecfg.rc:94 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid "" @@ -13588,16 +13561,12 @@ msgid "Command history" msgstr "Historia poleceń" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Strefa bufora" +msgstr "Rozmiar &bufora:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Usuń powtórzenia" +msgstr "&Usuń duplikaty" #: wineconsole.rc:74 msgid "Popup menu" @@ -13612,22 +13581,16 @@ msgid "S&hift" msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Zamknij konsolę" +msgstr "Konsola" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Szybka edycja" +msgstr "Tryb szybkiej edycji" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "Tryb &eksperta" +msgstr "Tryb wstaw&iania" #: wineconsole.rc:88 msgid "&Font"

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015