wine-commits July 2010

wine-commits@winehq.org

2 participants
892 discussions

Paul Vriens : shell32: Fix the Serbian (Latin) translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 653a64e60b1844ca947d2656f3264a7ce8bd9568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=653a64e60b1844ca947d2656f… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 25 10:34:38 2010 +0200 shell32: Fix the Serbian (Latin) translation. --- dlls/shell32/shell32_Sr.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_Sr.rc b/dlls/shell32/shell32_Sr.rc index 11bd799..0c9bb2b 100644 --- a/dlls/shell32/shell32_Sr.rc +++ b/dlls/shell32/shell32_Sr.rc @@ -38,7 +38,7 @@ MENU_002 MENU BEGIN POPUP "" BEGIN - POPUP "Nov" + POPUP "&Pregled" BEGIN MENUITEM "Velik&e Ikone", FCIDM_SHVIEW_BIGICON MENUITEM "M&ale ikone", FCIDM_SHVIEW_SMALLICON @@ -46,7 +46,7 @@ BEGIN MENUITEM "&Detalji", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Nov" + POPUP "Sredi &Ikone" BEGIN MENUITEM "po &Imenu", 0x30 /* column 0 */ MENUITEM "po &Tipu", 0x32 /* column 2 */ @@ -97,13 +97,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&Pomoć" + POPUP "&Fajl" BEGIN MENUITEM SEPARATOR MENUITEM "I&zlaz", IDM_CPANEL_EXIT END - POPUP "&Pomoć" + POPUP "&Pregled" BEGIN MENUITEM "Veli&ke Ikone", FCIDM_SHVIEW_BIGICON MENUITEM "Ma&le Ikone", FCIDM_SHVIEW_SMALLICON

1 0

Matteo Bruni : windowscodecs: Reset the stream pointer when initializing JPEG decoder.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 23e173109dd4ee2fa6c7a5a600233825289bf57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e173109dd4ee2fa6c7a5a60… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon May 24 23:40:58 2010 +0200 windowscodecs: Reset the stream pointer when initializing JPEG decoder. --- dlls/windowscodecs/jpegformat.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index b5676ea..41abe24 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -226,6 +226,7 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * { JpegDecoder *This = (JpegDecoder*)iface; int ret; + LARGE_INTEGER seek; TRACE("(%p,%p,%u)\n", iface, pIStream, cacheOptions); EnterCriticalSection(&This->lock); @@ -245,6 +246,9 @@ static HRESULT WINAPI JpegDecoder_Initialize(IWICBitmapDecoder *iface, IStream * This->stream = pIStream; IStream_AddRef(pIStream); + seek.QuadPart = 0; + IStream_Seek(This->stream, seek, STREAM_SEEK_SET, NULL); + This->source_mgr.bytes_in_buffer = 0; This->source_mgr.init_source = source_mgr_init_source; This->source_mgr.fill_input_buffer = source_mgr_fill_input_buffer;

1 0

Igor Paliychuk : cmd: Add Ukrainian translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 5d6baf644d191c1e80049a477ff0114ebf41c31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d6baf644d191c1e80049a477… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Sat Jul 24 19:07:30 2010 +0300 cmd: Add Ukrainian translation. --- programs/cmd/Makefile.in | 1 + programs/cmd/Uk.rc | 287 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 288 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d6baf644d191c1e80049…

1 0

Sven Baars : shdocvw: Add the Dutch translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 56838a70620e2c0a3a9aa4e22f0310159879b215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56838a70620e2c0a3a9aa4e22… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Jul 24 18:07:49 2010 +0200 shdocvw: Add the Dutch translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Nl.rc | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index f18b08d..53eb435 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ RC_SRCS = \ En.rc \ + Nl.rc \ Uk.rc \ shdocvw.rc diff --git a/dlls/shdocvw/Nl.rc b/dlls/shdocvw/Nl.rc new file mode 100644 index 0000000..d01c579 --- /dev/null +++ b/dlls/shdocvw/Nl.rc @@ -0,0 +1,57 @@ +/* + * Copyright 2010 Sven Baars + * + * 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" + +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Open URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Specificeer de URL die u wilt openen in Internet Explorer",-1,25, 5, 150,15 + LTEXT "Open:", -1, 2, 32, 20, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 25, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 25, 50, 50, 15 + PUSHBUTTON "&Annuleren", IDCANCEL, 85, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Bestand" + { + POPUP "&Nieuw" + { + MENUITEM "&Venster" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Openen...", ID_BROWSE_OPEN + MENUITEM "Op&slaan", ID_BROWSE_SAVE + MENUITEM "Ops&laan als...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Pa&gina-instellingen...", ID_BROWSE_PRINT_FORMAT + MENUITEM "Af&drukken...", ID_BROWSE_PRINT + MENUITEM "Afdruk&voorbeeld...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Eigenschappen...", ID_BROWSE_PROPERTIES + } + POPUP "&Help" + { + MENUITEM "&Over Internet Explorer...", ID_BROWSE_ABOUT + } +}

1 0

Piotr Caban : wininet: Commit URL cache entry when cache file is closed.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 75481bde85b5da5b33f6a0fd09fd279547bbfcac URL: http://source.winehq.org/git/wine.git/?a=commit;h=75481bde85b5da5b33f6a0fd0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 24 17:56:41 2010 +0200 wininet: Commit URL cache entry when cache file is closed. --- dlls/wininet/http.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 80bacb4..e74c974 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1539,6 +1539,20 @@ static DWORD HTTP_ResolveName(http_request_t *lpwhr) return ERROR_SUCCESS; } +static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) +{ + LPHTTPHEADERW host_header; + + static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; + + host_header = HTTP_GetHeader(req, hostW); + if(!host_header) + return FALSE; + + sprintfW(buf, formatW, host_header->lpszValue, req->lpszPath); /* FIXME */ + return TRUE; +} + /*********************************************************************** * HTTPREQ_Destroy (internal) @@ -1553,9 +1567,19 @@ static void HTTPREQ_Destroy(object_header_t *hdr) TRACE("\n"); - if(lpwhr->hCacheFile) + if(lpwhr->hCacheFile) { + WCHAR url[INTERNET_MAX_URL_LENGTH]; + FILETIME ft; + CloseHandle(lpwhr->hCacheFile); + memset(&ft, 0, sizeof(FILETIME)); + if(HTTP_GetRequestURL(lpwhr, url)) { + CommitUrlCacheEntryW(url, lpwhr->lpszCacheFile, ft, ft, + NORMAL_CACHE_ENTRY, NULL, 0, NULL, 0); + } + } + HeapFree(GetProcessHeap(), 0, lpwhr->lpszCacheFile); DeleteCriticalSection( &lpwhr->read_section ); @@ -1606,20 +1630,6 @@ static void HTTPREQ_CloseConnection(object_header_t *hdr) INTERNET_STATUS_CONNECTION_CLOSED, 0, 0); } -static BOOL HTTP_GetRequestURL(http_request_t *req, LPWSTR buf) -{ - LPHTTPHEADERW host_header; - - static const WCHAR formatW[] = {'h','t','t','p',':','/','/','%','s','%','s',0}; - - host_header = HTTP_GetHeader(req, hostW); - if(!host_header) - return FALSE; - - sprintfW(buf, formatW, host_header->lpszValue, req->lpszPath); /* FIXME */ - return TRUE; -} - static BOOL HTTP_KeepAlive(http_request_t *lpwhr) { WCHAR szVersion[10];

1 0

Piotr Caban : wininet: Fixed CreateUrlCacheEntryA implementation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 54bdf622a0269600afc40374ab815c5827be7cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=54bdf622a0269600afc40374a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 24 17:55:18 2010 +0200 wininet: Fixed CreateUrlCacheEntryA implementation. --- dlls/wininet/urlcache.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index c617a93..2fe488a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2184,14 +2184,17 @@ BOOL WINAPI CreateUrlCacheEntryA( ) { WCHAR *url_name; - WCHAR *file_extension; + WCHAR *file_extension = NULL; WCHAR file_name[MAX_PATH]; BOOL bSuccess = FALSE; DWORD dwError = 0; + TRACE("(%s %d %s %p %d)\n", debugstr_a(lpszUrlName), dwExpectedFileSize, + debugstr_a(lpszFileExtension), lpszFileName, dwReserved); + if (lpszUrlName && (url_name = heap_strdupAtoW(lpszUrlName))) { - if (lpszFileExtension && (file_extension = heap_strdupAtoW(lpszFileExtension))) + if (!lpszFileExtension || (file_extension = heap_strdupAtoW(lpszFileExtension))) { if (CreateUrlCacheEntryW(url_name, dwExpectedFileSize, file_extension, file_name, dwReserved)) {

1 0

Alexandre Julliard : configure: Disable the unused result warnings when Fortify is enabled.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 83676d721fc6a981f025eda5b9626ea3137c4213 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83676d721fc6a981f025eda5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 24 11:42:59 2010 +0200 configure: Disable the unused result warnings when Fortify is enabled. --- configure | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 11 +++++++++++ 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6f8fca2..437fb20 100755 --- a/configure +++ b/configure @@ -11875,6 +11875,63 @@ $as_echo "$ac_cv_c_string_h_warnings" >&6; } EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" fi + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken unused result warnings" >&5 +$as_echo_n "checking for broken unused result warnings... " >&6; } +if test "${ac_cv_c_unused_result_warnings+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <unistd.h> +int +main () +{ +write(2,"a",1) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_unused_result_warnings=no +else + ac_cv_c_unused_result_warnings=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_unused_result_warnings" >&5 +$as_echo "$ac_cv_c_unused_result_warnings" >&6; } + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_c_unused_result_warnings" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-unused-result" >&5 +$as_echo_n "checking whether the compiler supports -Wno-unused-result... " >&6; } +if test "${ac_cv_cflags__Wno_unused_result+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-unused-result" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_unused_result=yes +else + ac_cv_cflags__Wno_unused_result=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_unused_result" >&5 +$as_echo "$ac_cv_cflags__Wno_unused_result" >&6; } +if test $ac_cv_cflags__Wno_unused_result = yes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-unused-result" +fi + fi + if test "x$enable_maintainer_mode" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror" >&5 diff --git a/configure.ac b/configure.ac index 5638f2b..0c3a212 100644 --- a/configure.ac +++ b/configure.ac @@ -1604,6 +1604,17 @@ then EXTRACFLAGS="$EXTRACFLAGS -Wpointer-arith" fi + dnl Fortify enables unused result warnings on a gazillion functions, making it useless + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + AC_CACHE_CHECK([for broken unused result warnings], ac_cv_c_unused_result_warnings, + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[write(2,"a",1)]])],[ac_cv_c_unused_result_warnings=no],[ac_cv_c_unused_result_warnings=yes])) + CFLAGS="$saved_CFLAGS" + if test "$ac_cv_c_unused_result_warnings" = "yes" + then + WINE_TRY_CFLAGS([-Wno-unused-result]) + fi + dnl Enable -Werror for maintainer mode if test "x$enable_maintainer_mode" = "xyes" then

1 0

Igor Paliychuk : shdocvw: Add Ukrainian translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: f31428e107f3f2e8f616e4de727f59326a84d4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31428e107f3f2e8f616e4de7… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Jul 23 21:49:27 2010 +0300 shdocvw: Add Ukrainian translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Uk.rc | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 8326b78..f18b08d 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ RC_SRCS = \ En.rc \ + Uk.rc \ shdocvw.rc IDL_TLB_SRCS = shdocvw_v1.idl diff --git a/dlls/shdocvw/Uk.rc b/dlls/shdocvw/Uk.rc new file mode 100644 index 0000000..6af3f3b --- /dev/null +++ b/dlls/shdocvw/Uk.rc @@ -0,0 +1,61 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Igor Paliychuk + * + * 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" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_BROWSE_OPEN DIALOG 10, 10, 200, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Відкрити URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Вкажіть URL, що ви хочете відкрити в Internet Explorer",-1,25, 5, 150,15 + LTEXT "Відкрити:", -1, 2, 32, 30, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 45, 50, 50, 15 + PUSHBUTTON "&Скасувати", IDCANCEL, 105, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Файл" + { + POPUP "&Створити" + { + MENUITEM "&Вікно" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Відкрити...", ID_BROWSE_OPEN + MENUITEM "&Зберегти", ID_BROWSE_SAVE + MENUITEM "Зберегти &як...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Формат друку...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Друк...", ID_BROWSE_PRINT + MENUITEM "Попередній пе&регляд...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "В&ластивості...", ID_BROWSE_PROPERTIES + } + POPUP "&Довідка" + { + MENUITEM "&Про Internet Explorer...", ID_BROWSE_ABOUT + } +}

1 0

Igor Paliychuk : start: Add Ukrainian translation.
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: f784998bfab11725121602a25bf0e31886d69588 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f784998bfab11725121602a25… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Fri Jul 23 21:48:43 2010 +0300 start: Add Ukrainian translation. --- programs/start/Makefile.in | 3 +- programs/start/Uk.rc | 74 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/programs/start/Makefile.in b/programs/start/Makefile.in index e3ceade..fc3b54e 100644 --- a/programs/start/Makefile.in +++ b/programs/start/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ - Tr.rc + Tr.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/start/Uk.rc b/programs/start/Uk.rc new file mode 100644 index 0000000..c42d877 --- /dev/null +++ b/programs/start/Uk.rc @@ -0,0 +1,74 @@ +/* + * Start + * Ukrainian Language Support + * + * Copyright 2003 Dan Kegel + * Copyright 2010 Igor Paliychuk + * + * 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 "resources.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ +STRING_USAGE, "Запустити програму чи відкрити документ в програмі, яка\n\ +зазвичай використовується для файлів з цим розширенням.\n\ +Використання:\n\ +start [опції] ім'я_файлу_програми [...]\n\ +start [опції] ім'я_файлу_документу\n\ +\n\ +Опції:\n\ +/M[inimized] Запустити програму згорнутою.\n\ +/MAX[imized] Запустити програму на весь екран.\n\ +/R[estored] Запустити програму зі звичайним розміром вікна.\n\ +/W[ait] Очікувати завершення запущеної програми і вийти з кодом її виходу.\n\ +/Unix Сприймати шлях до документу записаним в Unix-форматі.\n\ +/ProgIDOpen Відкрити документ, використовуючи зазначений progID.\n\ +/L Показати ліцензію кінцевого користувача.\n\ +\n\ +start.exe версія 0.2 Copyright (C) 2003, Dan Kegel\n\ +Start надається БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ; для подробиць запустіть з опцією /L.\n\ +Це є вільне ПЗ, ви можете розповсюджувати його згідно\n\ +певних умов; запустіть 'start /L' для подробиць.\n\ +" + +STRING_LICENSE, "start.exe версія 0.2 Copyright (C) 2003, Dan Kegel\n\ +Ця програма є вільним ПЗ; ви можете поширювати її та/або\n\ +змінювати згідно умов GNU Lesser General Public License,\n\ +яка опублікована Free Software Foundation; версії 2.1\n\ +Ліцензії, чи (на ваш розсуд) новішої версії.\n\ +\n\ +Ця програма розповсюджується з надією, що буде корисною,\n\ +але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ; навіть без непрямих гарантій щодо\n\ +ПРОДАЖУ чи ПРИДАТНОСТІ ДЛЯ ПЕВНИХ ЦІЛЕЙ. Дивіться GNU\n\ +Lesser General Public License для детальної інформації.\n\ +\n\ +Ви повинні були отримати копію GNU Lesser General Public License\n\ +разом з програмою; якщо ні, напишіть до Free Software\n\ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ +\n\ +Ліцензійна інформація знаходитьься в файлі COPYING.LIB.\n\ +" + +STRING_EXECFAIL, "Програма не може бути запущена або немає асоційованих з типом даного документа додатків.\nВиклик ShellExecuteEx провалився" + +STRING_UNIXFAIL "Неможливо перетворити ім'я файлу UNIX в ім'я файлу DOS." +}

1 0

Andrew Eikum : notepad: Don't specify initial dir for save and open dialogs .
by Alexandre Julliard 26 Jul '10

26 Jul '10

Module: wine Branch: master Commit: 7854f191bb3d374946c2e74f587a3f6364a709b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7854f191bb3d374946c2e74f5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 23 13:13:11 2010 -0500 notepad: Don't specify initial dir for save and open dialogs. --- programs/notepad/dialog.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index ff5df75..e9a650d 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -597,13 +597,11 @@ VOID DIALOG_FileOpen(VOID) { OPENFILENAMEW openfilename; WCHAR szPath[MAX_PATH]; - WCHAR szDir[MAX_PATH]; static const WCHAR szDefaultExt[] = { 't','x','t',0 }; static const WCHAR txt_files[] = { '*','.','t','x','t',0 }; ZeroMemory(&openfilename, sizeof(openfilename)); - GetCurrentDirectoryW(ARRAY_SIZE(szDir), szDir); lstrcpyW(szPath, txt_files); openfilename.lStructSize = sizeof(openfilename); @@ -612,7 +610,6 @@ VOID DIALOG_FileOpen(VOID) openfilename.lpstrFilter = Globals.szFilter; openfilename.lpstrFile = szPath; openfilename.nMaxFile = ARRAY_SIZE(szPath); - openfilename.lpstrInitialDir = szDir; openfilename.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_ENABLESIZING; @@ -647,13 +644,11 @@ BOOL DIALOG_FileSaveAs(VOID) { OPENFILENAMEW saveas; WCHAR szPath[MAX_PATH]; - WCHAR szDir[MAX_PATH]; static const WCHAR szDefaultExt[] = { 't','x','t',0 }; static const WCHAR txt_files[] = { '*','.','t','x','t',0 }; ZeroMemory(&saveas, sizeof(saveas)); - GetCurrentDirectoryW(ARRAY_SIZE(szDir), szDir); lstrcpyW(szPath, txt_files); saveas.lStructSize = sizeof(OPENFILENAMEW); @@ -662,7 +657,6 @@ BOOL DIALOG_FileSaveAs(VOID) saveas.lpstrFilter = Globals.szFilter; saveas.lpstrFile = szPath; saveas.nMaxFile = ARRAY_SIZE(szPath); - saveas.lpstrInitialDir = szDir; saveas.Flags = OFN_ENABLETEMPLATE | OFN_ENABLEHOOK | OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY | OFN_ENABLESIZING;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
90
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 July 2010