Module: wine
Branch: refs/heads/master
Commit: eacc0e3bf74985424d30aa9498736982a96f4251
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eacc0e3bf74985424d30aa9…
Author: Henning Gerhardt <henning.gerhardt(a)web.de>
Date: Thu Mar 30 08:58:09 2006 +0200
twain: Add German resource.
---
dlls/twain/rsrc.rc | 1 +
dlls/twain/twain_De.rc | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 41 insertions(+), 0 deletions(-)
create mode 100644 dlls/twain/twain_De.rc
diff --git a/dlls/twain/rsrc.rc b/dlls/twain/rsrc.rc
index 455cac2..94e1da0 100644
--- a/dlls/twain/rsrc.rc
+++ b/dlls/twain/rsrc.rc
@@ -25,4 +25,5 @@
#include "resource.h"
+#include "twain_De.rc"
#include "twain_En.rc"
diff --git a/dlls/twain/twain_De.rc b/dlls/twain/twain_De.rc
new file mode 100644
index 0000000..b378c29
--- /dev/null
+++ b/dlls/twain/twain_De.rc
@@ -0,0 +1,40 @@
+/*
+ * German resources for Twain
+ *
+ * Copyright 2006 Henning Gerhardt
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND
+CAPTION "Scanne"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "SCANNE.... Bitte warten",IDC_STATIC,53,19,85,8
+END
+
+STRINGTABLE DISCARDABLE
+{
+ 0 ""
+ 1 "px"
+ 2 "b"
+ 3 "mm"
+ 4 "dpi"
+ 5 "%"
+ 6 "ns"
+}
Module: wine
Branch: refs/heads/master
Commit: 8c7706bad04b90f4f9a7c25d94a27309d0347c80
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8c7706bad04b90f4f9a7c25…
Author: Robert Shearman <rob(a)codeweavers.com>
Date: Wed Mar 29 18:40:46 2006 +0100
ole32: Don't process posted messages in CoWaitForMultipleHandles.
Tests with native show that during COM calls posted messages aren't
retrieved other than COM calls so change the PeekMessage parameters in
CoWaitForMultipleHandles to duplicate this.
---
dlls/ole32/compobj.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c
index ab87a5d..a82ed4a 100644
--- a/dlls/ole32/compobj.c
+++ b/dlls/ole32/compobj.c
@@ -2647,8 +2647,8 @@ static BOOL COM_PeekMessage(struct apart
{
/* first try to retrieve messages for incoming COM calls to the apartment window */
return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) ||
- /* next retrieve all other messages */
- PeekMessageW(msg, NULL, 0, 0, PM_REMOVE|PM_NOYIELD);
+ /* next retrieve other messages necessary for the app to remain responsive */
+ PeekMessageW(msg, NULL, 0, WM_USER - 1, PM_REMOVE|PM_NOYIELD);
}
/***********************************************************************