November 2017 - Wine-commits

Dmitry Timoshkov : widl: Generate header macros even for aggregate return methods.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: b63274f30fcf5bc654b331d840486d6de5156a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b63274f30fcf5bc654b331d84… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 14 10:29:38 2017 +0800 widl: Generate header macros even for aggregate return methods. A generated macro has a clear suggestion what to do (#define WIDL_C_INLINE_WRAPPERS) instead of completely omitting the macro and leaving one wondering what is going on. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index b5fe232..9f92127 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -960,7 +960,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * if (is_override_method(iface, child, func)) continue; - if (!is_callas(func->attrs) && !is_aggregate_return(func)) { + if (!is_callas(func->attrs)) { const var_t *arg; fprintf(header, "#define %s_%s(This", name, get_name(func)); @@ -969,6 +969,12 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t * fprintf(header, ",%s", arg->name); fprintf(header, ") "); + if (is_aggregate_return(func)) + { + fprintf(header, "%s_%s_define_WIDL_C_INLINE_WRAPPERS_for_aggregate_return_support\n", name, get_name(func)); + continue; + } + fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func)); if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry )

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: f2c49c0490c24cb63beb56f838b14535290c8c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2c49c0490c24cb63beb56f83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 15 17:26:32 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 58 ++++++++++++++-------------------------------------------- 1 file changed, 14 insertions(+), 44 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1f8bb23..7d35265 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +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: 2017-08-21 15:10+0300\n" +"PO-Revision-Date: 2017-11-15 17:25+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 2.0.3\n" +"X-Generator: Poedit 2.0.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -10589,6 +10589,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Создаёт символическую ссылку.\n" +"\n" +"Синтаксис: MKLINK [опции] имя_ссылки цель\n" +"\n" +"Опции:\n" +"/d Создать ссылку на директорию.\n" +"/h Создать жёсткую ссылку.\n" +"/j Создать точку соединения директорий.\n" +"Имя новой ссылки задаётся с помощью «имя_ссылки».\n" +"Созданная ссылка указывает на путь «цель».\n" #: cmd.rc:312 msgid "" @@ -10599,47 +10609,6 @@ msgstr "" "или оболочку из которой был запущен cmd.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10698,6 +10667,7 @@ msgstr "" "FTYPE\t\tВыводит или изменяет команды открытия, связанные с типами файлов\n" "HELP\t\tПоказывает краткую подсказку по команде\n" "MD (MKDIR)\tСоздаёт каталог\n" +"MKLINK\tСоздаёт символическую ссылку\n" "MORE\t\tВыводит данные по страницам\n" "MOVE\t\tПеремещает файл, несколько файлов или дерево каталогов\n" "PATH\t\tПоказывает или изменяет путь поиска программ\n" @@ -14986,7 +14956,7 @@ msgstr "Число мин" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Все результаты будут утеряны. Вы уверены?" #: winemine.rc:30 msgid "WineMine"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: 2d49ba4f29a0f146099d98b356e7ce7335262cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d49ba4f29a0f146099d98b35… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Nov 15 21:44:33 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 54 ++++++++++++------------------------------------------ 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/po/lt.po b/po/lt.po index e7dd526..2a51195 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: 2017-11-14 22:09+0300\n" +"PO-Revision-Date: 2017-11-15 21:43+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" @@ -10594,6 +10594,16 @@ msgid "" "link_name is the name of the new symbolic link.\n" "target is the path that link_name points to.\n" msgstr "" +"Sukurti simbolinę nuorodą.\n" +"\n" +"Sintaksė: MKLINK [parametrai] nuorodos_vardas paskirtis\n" +"\n" +"Parametrai:\n" +"/d Sukurti katalogo simbolinę nuorodą.\n" +"/h Sukurti nuorodą.\n" +"/j Sukurti katalogo jungtį.\n" +"nuorodos_vardas yra naujos simbolinės nuorodos vardas.\n" +"paskirtis yra kelias į kurį rodo nuorodos_vardas.\n" #: cmd.rc:312 msgid "" @@ -10604,47 +10614,6 @@ msgstr "" "apvalkalą iš kur CMD iškviestas.\n" #: cmd.rc:364 -#, fuzzy -#| msgid "" -#| "CMD built-in commands are:\n" -#| "ASSOC\t\tShow or modify file extension associations\n" -#| "ATTRIB\t\tShow or change DOS file attributes\n" -#| "CALL\t\tInvoke a batch file from inside another\n" -#| "CD (CHDIR)\tChange current default directory\n" -#| "CHOICE\t\tWait for an keypress from a selectable list\n" -#| "CLS\t\tClear the console screen\n" -#| "COPY\t\tCopy file\n" -#| "CTTY\t\tChange input/output device\n" -#| "DATE\t\tShow or change the system date\n" -#| "DEL (ERASE)\tDelete a file or set of files\n" -#| "DIR\t\tList the contents of a directory\n" -#| "ECHO\t\tCopy text directly to the console output\n" -#| "ENDLOCAL\tEnd localization of environment changes in a batch file\n" -#| "FTYPE\t\tShow or modify open commands associated with file types\n" -#| "HELP\t\tShow brief help details on a topic\n" -#| "MD (MKDIR)\tCreate a subdirectory\n" -#| "MORE\t\tDisplay output in pages\n" -#| "MOVE\t\tMove a file, set of files or directory tree\n" -#| "PATH\t\tSet or show the search path\n" -#| "PAUSE\t\tSuspend execution of a batch file\n" -#| "POPD\t\tRestore the directory to the last one saved with PUSHD\n" -#| "PROMPT\t\tChange the command prompt\n" -#| "PUSHD\t\tChange to a new directory, saving the current one\n" -#| "REN (RENAME)\tRename a file\n" -#| "RD (RMDIR)\tDelete a subdirectory\n" -#| "SET\t\tSet or show environment variables\n" -#| "SETLOCAL\tStart localization of environment changes in a batch file\n" -#| "START\t\tStart a program, or open a document in the associated program\n" -#| "TIME\t\tSet or show the current system time\n" -#| "TITLE\t\tSet the window title for the CMD session\n" -#| "TYPE\t\tType the contents of a text file\n" -#| "VER\t\tShow the current version of CMD\n" -#| "VOL\t\tShow the volume label of a disk device\n" -#| "XCOPY\t\tCopy source files or directory trees to a destination\n" -#| "EXIT\t\tClose down CMD\n" -#| "\n" -#| "Enter HELP <command> for further information on any of the above " -#| "commands.\n" msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -10703,6 +10672,7 @@ msgstr "" "FTYPE\t\tRodyti ar modifikuoti atvėrimo komandas susietas su failų tipais\n" "HELP\t\tParodyti trumpą pagalbą apie temą\n" "MD (MKDIR)\tSukurti pakatalogį\n" +"MKLINK\t\tSukurti simbolinę nuorodą\n" "MORE\t\tRodyti išvedimą puslapiais\n" "MOVE\t\tPerkelti failą, failų rinkinį ar katalogų medį\n" "PATH\t\tNustatyti ar parodyti paieškos kelią\n"

1 0

Marcus Meissner : mshtml: Fixed a crash due to missing typelib marshalling on 64bit.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: ac7768bfcee02f6e88475aca3e5237cb8f9c195b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac7768bfcee02f6e88475aca3… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Nov 14 15:50:02 2017 +0100 mshtml: Fixed a crash due to missing typelib marshalling on 64bit. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 7ec3f60..a03d010 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -6301,6 +6301,10 @@ static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) CHECK_CALLED(EvaluateNewWindow); ok(hres == S_OK, "open failed: %08x\n", hres); + if (hres != S_OK) { + IHTMLWindow2_Release(window); + return; + } if(do_block) { ok(!new_window, "new_window != NULL\n");

1 0

Henri Verbeet : wined3d: Introduce a blitter based on ARB_copy_image.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: wine Branch: master Commit: 786ebbdec3081aebba451ef100b41ee6768bcbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=786ebbdec3081aebba451ef10… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 01:01:00 2017 +0330 wined3d: Introduce a blitter based on ARB_copy_image. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 8 ++ dlls/wined3d/device.c | 1 + dlls/wined3d/directx.c | 4 + dlls/wined3d/surface.c | 164 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 3 + 6 files changed, 176 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=786ebbdec3081aebba451…

1 0

Alexandre Julliard : testbot: Add In-Reply-To header on the TestBot replies.
by Alexandre Julliard 15 Nov '17

15 Nov '17

Module: tools Branch: master Commit: ad353ded45601dd3b42d8ccab2358f11e0deddea URL: http://source.winehq.org/git/tools.git/?a=commit;h=ad353ded45601dd3b42d8cca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 12:01:53 2017 +0100 testbot: Add In-Reply-To header on the TestBot replies. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 10 ++++++++++ testbot/ddl/update27.sql | 5 +++++ testbot/ddl/winetestbot.sql | 1 + testbot/lib/WineTestBot/Patches.pm | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 922811d..e00c276 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -189,6 +189,11 @@ sub SendLog($) $Subject .= ": " . $Description; } print SENDMAIL "Subject: $Subject\n"; + if ($Job->Patch->MessageId) + { + print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print SENDMAIL "References: ", $Job->Patch->MessageId, "\n"; + } print SENDMAIL <<"EOF"; MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="==13F70BD1-BA1B-449A-9CCB-B6A8E90CED47==" @@ -424,6 +429,11 @@ EOF print SENDMAIL "To: $To\n"; print SENDMAIL "Cc: $WinePatchCc\n"; print SENDMAIL "Subject: Re: ", $Job->Patch->Subject, "\n"; + if ($Job->Patch->MessageId) + { + print SENDMAIL "In-Reply-To: ", $Job->Patch->MessageId, "\n"; + print SENDMAIL "References: ", $Job->Patch->MessageId, "\n"; + } print SENDMAIL <<"EOF"; Hi, diff --git a/testbot/ddl/update27.sql b/testbot/ddl/update27.sql new file mode 100644 index 0000000..0dc2b89 --- /dev/null +++ b/testbot/ddl/update27.sql @@ -0,0 +1,5 @@ +USE winetestbot; + +ALTER TABLE Patches + ADD MessageId VARCHAR(256) NULL + AFTER Subject; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index 5e79bd3..f8d590f 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -70,6 +70,7 @@ CREATE TABLE Patches FromName VARCHAR(40) NULL, FromEMail VARCHAR(40) NULL, Subject VARCHAR(120) NULL, + MessageId VARCHAR(256) NULL, PRIMARY KEY (Id), INDEX PatchesWebPatchId (WebPatchId) ) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d5de05e..b5320dc 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -100,6 +100,11 @@ sub FromSubmission($$) my $PropertyDescriptor = $self->GetPropertyDescriptorByName("Subject"); $self->Subject(substr($Subject, 0, $PropertyDescriptor->GetMaxLength())); + my $MessageId = $Head->get("Message-Id"); + $MessageId =~ s/\s*\n\s*/ /gs; + $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); + $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + $self->Disposition("Processing"); } @@ -371,6 +376,7 @@ BEGIN CreateBasicPropertyDescriptor("FromName", "Author", !1, !1, "A", 40), CreateBasicPropertyDescriptor("FromEMail", "Author's email address", !1, !1, "A", 40), CreateBasicPropertyDescriptor("Subject", "Subject", !1, !1, "A", 120), + CreateBasicPropertyDescriptor("MessageId", "Message id", !1, !1, "A", 256), CreateBasicPropertyDescriptor("Disposition", "Disposition", !1, 1, "A", 40), ); }

1 0

Akihiro Sagawa : winex11: Keep the result string in the IME UI window procedure.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: b8dc1e7cde64c212882958c0806b50911a360fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8dc1e7cde64c212882958c08… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 15 00:18:51 2017 +0900 winex11: Keep the result string in the IME UI window procedure. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/tests/imm32.c | 1 - dlls/winex11.drv/ime.c | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index bf0f4b2..12e8f99 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -380,7 +380,6 @@ static LRESULT WINAPI test_ime_wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPAR imc = ImmGetContext(hWnd); size = ImmGetCompositionStringW(imc, GCS_RESULTSTR, wstring, sizeof(wstring)); - todo_wine ok(size > 0, "ImmGetCompositionString(GCS_RESULTSTR) is %d\n", size); ImmReleaseContext(hwnd, imc); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 0f4d2b2..d0746c5 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -906,6 +906,11 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp, myPrivate->bInComposition = TRUE; } + /* clear existing result */ + newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = newCompStr; + flags = GCS_COMPSTR; if (dwCompLen && lpComp) @@ -1256,7 +1261,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) LPCOMPOSITIONSTRING compstr; LPBYTE compdata; LPWSTR ResultStr; - HIMCC newCompStr; LPINPUTCONTEXT lpIMC; lpIMC = LockRealIMC(hIMC); @@ -1269,11 +1273,6 @@ static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam) ResultStr = (LPWSTR)(compdata + compstr->dwResultStrOffset); GenerateIMECHARMessages(hIMC, ResultStr, compstr->dwResultStrLen); ImmUnlockIMCC(lpIMC->hCompStr); - - /* clear the buffer */ - newCompStr = updateResultStr(lpIMC->hCompStr, NULL, 0); - ImmDestroyIMCC(lpIMC->hCompStr); - lpIMC->hCompStr = newCompStr; UnlockRealIMC(hIMC); } else

1 0

Alistair Leslie-Hughes : cmd: Implement builtin mklink command.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: 21ade8538de0a92ef4903f9b2ed0867bc266e30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ade8538de0a92ef4903f9b2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 7 23:26:42 2017 +0000 cmd: Implement builtin mklink command. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 148 +++++++++++++++++++++++++++++++++--------------- po/bg.po | 107 +++++++++++++++++++--------------- po/ca.po | 148 +++++++++++++++++++++++++++++++++--------------- po/cs.po | 107 +++++++++++++++++++--------------- po/da.po | 148 +++++++++++++++++++++++++++++++++--------------- po/de.po | 148 +++++++++++++++++++++++++++++++++--------------- po/el.po | 107 +++++++++++++++++++--------------- po/en.po | 118 +++++++++++++++++++++++--------------- po/en_US.po | 118 +++++++++++++++++++++++--------------- po/eo.po | 107 +++++++++++++++++++--------------- po/es.po | 148 +++++++++++++++++++++++++++++++++--------------- po/fa.po | 107 +++++++++++++++++++--------------- po/fi.po | 148 +++++++++++++++++++++++++++++++++--------------- po/fr.po | 148 +++++++++++++++++++++++++++++++++--------------- po/he.po | 107 +++++++++++++++++++--------------- po/hi.po | 107 +++++++++++++++++++--------------- po/hr.po | 107 +++++++++++++++++++--------------- po/hu.po | 148 +++++++++++++++++++++++++++++++++--------------- po/it.po | 148 +++++++++++++++++++++++++++++++++--------------- po/ja.po | 148 +++++++++++++++++++++++++++++++++--------------- po/ko.po | 148 +++++++++++++++++++++++++++++++++--------------- po/lt.po | 148 +++++++++++++++++++++++++++++++++--------------- po/ml.po | 107 +++++++++++++++++++--------------- po/nb_NO.po | 148 +++++++++++++++++++++++++++++++++--------------- po/nl.po | 107 +++++++++++++++++++--------------- po/or.po | 107 +++++++++++++++++++--------------- po/pa.po | 107 +++++++++++++++++++--------------- po/pl.po | 148 +++++++++++++++++++++++++++++++++--------------- po/pt_BR.po | 148 +++++++++++++++++++++++++++++++++--------------- po/pt_PT.po | 148 +++++++++++++++++++++++++++++++++--------------- po/rm.po | 107 +++++++++++++++++++--------------- po/ro.po | 148 +++++++++++++++++++++++++++++++++--------------- po/ru.po | 148 +++++++++++++++++++++++++++++++++--------------- po/sk.po | 107 +++++++++++++++++++--------------- po/sl.po | 148 +++++++++++++++++++++++++++++++++--------------- po/sr_RS(a)cyrillic.po | 107 +++++++++++++++++++--------------- po/sr_RS(a)latin.po | 107 +++++++++++++++++++--------------- po/sv.po | 148 +++++++++++++++++++++++++++++++++--------------- po/te.po | 107 +++++++++++++++++++--------------- po/th.po | 107 +++++++++++++++++++--------------- po/tr.po | 148 +++++++++++++++++++++++++++++++++--------------- po/uk.po | 148 +++++++++++++++++++++++++++++++++--------------- po/wa.po | 107 +++++++++++++++++++--------------- po/wine.pot | 107 +++++++++++++++++++--------------- po/zh_CN.po | 148 +++++++++++++++++++++++++++++++++--------------- po/zh_TW.po | 148 +++++++++++++++++++++++++++++++++--------------- programs/cmd/builtins.c | 58 +++++++++++++++++++ programs/cmd/cmd.rc | 14 ++++- programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 3 + 50 files changed, 3889 insertions(+), 2118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21ade8538de0a92ef4903…

1 0

Vincent Povirk : sane.ds: Send events to applications through the DSM.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: 870c4f3e99e373063978ba833fa201e78d7bd73e URL: http://source.winehq.org/git/wine.git/?a=commit;h=870c4f3e99e373063978ba833… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 14 15:14:11 2017 -0600 sane.ds: Send events to applications through the DSM. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/ds_ctrl.c | 19 ++++--------------- dlls/sane.ds/sane_i.h | 5 +++-- dlls/sane.ds/sane_main.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/sane.ds/ui.c | 6 ++---- include/twain.h | 24 ++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 22 deletions(-) diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 713f311..b7d2837 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -184,13 +184,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); activeDS.twCC = TWCC_SUCCESS; - if (pMsg->message == activeDS.windowMessage && activeDS.windowMessage) - { - twRC = TWRC_DSEVENT; - pEvent->TWMessage = pMsg->wParam; - } - else - pEvent->TWMessage = MSG_NULL; /* no message to the application */ + pEvent->TWMessage = MSG_NULL; /* no message to the application */ if (activeDS.currentState < 5 || activeDS.currentState > 7) { @@ -232,8 +226,7 @@ TW_UINT16 SANE_PendingXfersEndXfer (pTW_IDENTITY pOrigin, pPendingXfers->Count = 0; activeDS.currentState = 5; /* Notify the application that it can close the data source */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } else activeDS.sane_started = TRUE; @@ -403,8 +396,6 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, else { activeDS.hwndOwner = pUserInterface->hParent; - if (! activeDS.windowMessage) - activeDS.windowMessage = RegisterWindowMessageA("SANE.DS ACTIVITY MESSAGE"); if (pUserInterface->ShowUI) { BOOL rc; @@ -413,8 +404,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, pUserInterface->ModalUI = TRUE; if (!rc) { - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); } #ifdef SONAME_LIBSANE else @@ -428,8 +418,7 @@ TW_UINT16 SANE_EnableDSUserInterface (pTW_IDENTITY pOrigin, { /* no UI will be displayed, so source is ready to transfer data */ activeDS.currentState = 6; /* Transitions to state 6 directly */ - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } twRC = TWRC_SUCCESS; diff --git a/dlls/sane.ds/sane_i.h b/dlls/sane.ds/sane_i.h index ae58159..941e8b9 100644 --- a/dlls/sane.ds/sane_i.h +++ b/dlls/sane.ds/sane_i.h @@ -62,10 +62,10 @@ extern HINSTANCE SANE_instance DECLSPEC_HIDDEN; struct tagActiveDS { struct tagActiveDS *next; /* next active DS */ - TW_IDENTITY identity; /* identity */ + TW_IDENTITY identity; /* identity of the DS */ TW_UINT16 currentState; /* current state */ - UINT windowMessage; /* message to use to send status */ TW_UINT16 twCC; /* condition code */ + TW_IDENTITY appIdentity; /* identity of the app */ HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ #ifdef SONAME_LIBSANE @@ -89,6 +89,7 @@ struct tagActiveDS /* Helper functions */ extern TW_UINT16 SANE_SaneCapability (pTW_CAPABILITY pCapability, TW_UINT16 action) DECLSPEC_HIDDEN; extern TW_UINT16 SANE_SaneSetDefaults (void) DECLSPEC_HIDDEN; +extern void SANE_Notify (TW_UINT16 message) DECLSPEC_HIDDEN; /* Implementation of operation triplets * From Application to Source (Control Information) */ diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 5c0f56f..7af0a23 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +DSMENTRYPROC SANE_dsmentry; + #ifdef SONAME_LIBSANE HINSTANCE SANE_instance; @@ -113,6 +115,8 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY, pTW_IDENTITY); #endif /* SONAME_LIBSANE */ +static TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData); + static TW_UINT16 SANE_SourceControlHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, @@ -181,6 +185,17 @@ static TW_UINT16 SANE_SourceControlHandler ( } break; + case DAT_ENTRYPOINT: + if (MSG == MSG_SET) + twRC = SANE_SetEntryPoint (pOrigin, pData); + else + { + twRC = TWRC_FAILURE; + activeDS.twCC = TWCC_CAPBADOPERATION; + FIXME("unrecognized operation triplet\n"); + } + break; + case DAT_EVENT: if (MSG == MSG_PROCESSEVENT) twRC = SANE_ProcessEvent (pOrigin, pData); @@ -380,6 +395,21 @@ DS_Entry ( pTW_IDENTITY pOrigin, return twRC; } +void SANE_Notify (TW_UINT16 message) +{ + SANE_dsmentry (&activeDS.identity, &activeDS.appIdentity, DG_CONTROL, DAT_NULL, message, NULL); +} + +/* DG_CONTROL/DAT_ENTRYPOINT/MSG_SET */ +TW_UINT16 SANE_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData) +{ + TW_ENTRYPOINT *entry = (TW_ENTRYPOINT*)pData; + + SANE_dsmentry = entry->DSM_Entry; + + return TWRC_SUCCESS; +} + #ifdef SONAME_LIBSANE /* Sane returns device names that are longer than the 32 bytes allowed by TWAIN. However, it colon separates them, and the last bit is @@ -432,7 +462,7 @@ SANE_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { return TWRC_FAILURE; self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; - self->SupportedGroups = DG_CONTROL | DG_IMAGE; + self->SupportedGroups = DG_CONTROL | DG_IMAGE | DF_DS2; copy_sane_short_name(sane_devlist[cursanedev]->name, self->ProductName, sizeof(self->ProductName) - 1); lstrcpynA (self->Manufacturer, sane_devlist[cursanedev]->vendor, sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, sane_devlist[cursanedev]->model, sizeof(self->ProductFamily) - 1); @@ -451,6 +481,21 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { SANE_Status status; int i; + if (SANE_dsmentry == NULL) + { + static const WCHAR twain32W[] = {'t','w','a','i','n','_','3','2',0}; + HMODULE moddsm = GetModuleHandleW(twain32W); + + if (moddsm) + SANE_dsmentry = (void*)GetProcAddress(moddsm, "DSM_Entry"); + + if (!SANE_dsmentry) + { + ERR("can't find DSM entry point\n"); + return TWRC_FAILURE; + } + } + detect_sane_devices(); if (!sane_devlist[0]) { ERR("No scanners? We should not get to OpenDS?\n"); @@ -481,6 +526,8 @@ static TW_UINT16 SANE_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { activeDS.twCC = SANE_SaneSetDefaults(); if (activeDS.twCC == TWCC_SUCCESS) { activeDS.currentState = 4; + activeDS.identity.Id = self->Id; + activeDS.appIdentity = *pOrigin; return TWRC_SUCCESS; } else diff --git a/dlls/sane.ds/ui.c b/dlls/sane.ds/ui.c index 9a9bcb0..fe1988a 100644 --- a/dlls/sane.ds/ui.c +++ b/dlls/sane.ds/ui.c @@ -1034,13 +1034,11 @@ static INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (psn->lParam) { activeDS.currentState = 6; - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_XFERREADY, 0); + SANE_Notify(MSG_XFERREADY); } break; case PSN_QUERYCANCEL: - if (activeDS.windowMessage) - PostMessageA(activeDS.hwndOwner, activeDS.windowMessage, MSG_CLOSEDSREQ, 0); + SANE_Notify(MSG_CLOSEDSREQ); break; case PSN_SETACTIVE: InitializeDialog(hwndDlg); diff --git a/include/twain.h b/include/twain.h index bdbda47..28eaddf 100644 --- a/include/twain.h +++ b/include/twain.h @@ -1843,6 +1843,30 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDENTITY, } #endif /* cplusplus */ +/* Definitions from TWAIN 2.x used by our builtin data sources */ +#define DAT_ENTRYPOINT 0x0403 +#define DF_DS2 0x40000000 + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ +typedef TW_HANDLE (PASCAL *DSM_MEMALLOCATE)(TW_UINT32 _size); +typedef void (PASCAL *DSM_MEMFREE)(TW_HANDLE _handle); +typedef TW_MEMREF (PASCAL *DSM_MEMLOCK)(TW_HANDLE _handle); +typedef void (PASCAL *DSM_MEMUNLOCK)(TW_HANDLE _handle); +#ifdef __cplusplus +} +#endif /* cplusplus */ + +typedef struct { + TW_UINT32 Size; + DSMENTRYPROC DSM_Entry; + DSM_MEMALLOCATE DSM_MemAllocate; + DSM_MEMFREE DSM_MemFree; + DSM_MEMLOCK DSM_MemLock; + DSM_MEMUNLOCK DSM_MemUnlock; +} TW_ENTRYPOINT; + /* The Twain structures must be packed on 2 byte alignment */ #include "poppack.h"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Nov '17

14 Nov '17

Module: wine Branch: master Commit: 206162365df629f1fce5ffc3e30161dc6f6430f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=206162365df629f1fce5ffc3e… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Nov 14 22:10:18 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 396f9f1..e7dd526 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: 2017-11-08 09:01+0300\n" +"PO-Revision-Date: 2017-11-14 22:09+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" @@ -14997,7 +14997,7 @@ msgstr "Minos" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Visi rezultatai bus prarasti. Ar tikrai?" #: winemine.rc:30 msgid "WineMine"

1 0