February 2013 - Wine-Commits

Roman Dadkov : ole32/tests: Add test for OleRun.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 665717ae75e01817da468055c30dfa9c7f09e6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=665717ae75e01817da468055c… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Wed Feb 13 18:03:53 2013 +0400 ole32/tests: Add test for OleRun. --- dlls/ole32/tests/ole2.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 4ef6638..ef3a0a6 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1926,6 +1926,14 @@ static const IUnknownVtbl UnknownVtbl = static IUnknown unknown = { &UnknownVtbl }; +static void test_OleRun(void) +{ + HRESULT hr; + + hr = OleRun(&unknown); + ok(hr == S_OK, "OleRun failed 0x%08x\n", hr); +} + static void test_OleLockRunning(void) { HRESULT hr; @@ -1984,6 +1992,7 @@ START_TEST(ole2) test_data_cache(); test_default_handler(); test_runnable(); + test_OleRun(); test_OleLockRunning(); test_OleDraw();

1 0

Francois Gouget : d3d11: Make debug_d3d_driver_type() static.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: aaabd02cffc1789a39c0bf7819cf2082db660a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaabd02cffc1789a39c0bf781… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 15 11:13:48 2013 +0100 d3d11: Make debug_d3d_driver_type() static. --- dlls/d3d11/d3d11_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 4091bca..b5bf8cd 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) +static const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) { switch(driver_type) {

1 0

Jacek Caban : vbscript: Added support for a few more constants.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 97f2912965fae9aa33f10308ef5dc551c9f086b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97f2912965fae9aa33f10308e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 15 10:29:42 2013 +0100 vbscript: Added support for a few more constants. --- dlls/vbscript/global.c | 32 ++++---------------------------- dlls/vbscript/tests/api.vbs | 9 +++++++++ dlls/vbscript/vbdisp.c | 11 ++++++++--- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 39b75ab..1a3dae7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1771,30 +1771,6 @@ static HRESULT Global_vbVerticalTab(vbdisp_t *This, VARIANT *arg, unsigned args_ return E_NOTIMPL; } -static HRESULT Global_vbMsgBoxHelpButton(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMsgBoxSetForeground(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMsgBoxRight(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbMsgBoxRtlReading(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, 0}, {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, NULL, BP_GET, 0}, @@ -1984,10 +1960,10 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_EXECUTE, Global_Execute, 0, 1}, {DISPID_GLOBAL_EXECUTEGLOBAL, Global_ExecuteGlobal, 0, 1}, {DISPID_GLOBAL_GETREF, Global_GetRef, 0, 1}, - {DISPID_GLOBAL_VBMSGBOXHELPBUTTON, Global_vbMsgBoxHelpButton, BP_GET}, - {DISPID_GLOBAL_VBMSGBOXSETFOREGROUND, Global_vbMsgBoxSetForeground, BP_GET}, - {DISPID_GLOBAL_VBMSGBOXRIGHT, Global_vbMsgBoxRight, BP_GET}, - {DISPID_GLOBAL_VBMSGBOXRTLREADING, Global_vbMsgBoxRtlReading, BP_GET} + {DISPID_GLOBAL_VBMSGBOXHELPBUTTON, NULL, BP_GET, MB_HELP}, + {DISPID_GLOBAL_VBMSGBOXSETFOREGROUND, NULL, BP_GET, MB_SETFOREGROUND}, + {DISPID_GLOBAL_VBMSGBOXRIGHT, NULL, BP_GET, MB_RIGHT}, + {DISPID_GLOBAL_VBMSGBOXRTLREADING, NULL, BP_GET, MB_RTLREADING} }; HRESULT init_global(script_ctx_t *ctx) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 966b256..6472b95 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -43,6 +43,11 @@ Sub TestConstant(name, val, exval) Call ok(getVT(val) = "VT_I2*", "getVT(" & name & ") = " & getVT(val)) End Sub +Sub TestConstantI4(name, val, exval) + Call ok(val = exval, name & " = " & val & " expected " & exval) + Call ok(getVT(val) = "VT_I4*", "getVT(" & name & ") = " & getVT(val)) +End Sub + TestConstant "vbEmpty", vbEmpty, 0 TestConstant "vbNull", vbNull, 1 TestConstant "vbLong", vbLong, 3 @@ -76,6 +81,10 @@ TestConstant "vbFirstFourDays", vbFirstFourDays, 2 TestConstant "vbFirstFullWeek", vbFirstFullWeek, 3 TestConstant "vbTrue", vbTrue, -1 TestConstant "vbFalse", vbFalse, 0 +TestConstantI4 "vbMsgBoxHelpButton", vbMsgBoxHelpButton, 16384 +TestConstantI4 "vbMsgBoxSetForeground", vbMsgBoxSetForeground, 65536 +TestConstantI4 "vbMsgBoxRight", vbMsgBoxRight, 524288 +TestConstantI4 "vbMsgBoxRtlReading", vbMsgBoxRtlReading, 1048576 Sub TestCStr(arg, exval) dim x diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index b37caf6..843d5c8 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -150,9 +150,14 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f break; case DISPATCH_PROPERTYGET|DISPATCH_METHOD: if(!prop->proc && prop->flags == BP_GET) { - assert((INT16)prop->min_args == prop->min_args); - V_VT(res) = VT_I2; - V_I2(res) = prop->min_args; + int val = prop->min_args; + if(val < 0x4000) { + V_VT(res) = VT_I2; + V_I2(res) = val; + }else { + V_VT(res) = VT_I4; + V_I4(res) = val; + } return S_OK; } break;

1 0

Jeff Latimer : wmvcore: Fix a typo.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 2b5babc3994219c867d8288d9e87dfa632ac3d30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b5babc3994219c867d8288d9… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Feb 15 23:32:02 2013 +1100 wmvcore: Fix a typo. --- dlls/wmvcore/wmvcore_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index 8d928ca..b9cdd22 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -61,7 +61,7 @@ HRESULT WINAPI WMCreateEditor(IWMMetadataEditor **editor) return E_NOTIMPL; } -HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMSyncReader **reader) +HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **reader) { FIXME("(%p, %x, %p): stub\n", reserved, rights, reader);

1 0

Piotr Caban : vbscript: Added IRegExp2_QueryInterface tests.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: b0ef29595a8c3f37e2a0952e33319b99af697ff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0ef29595a8c3f37e2a0952e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:09:57 2013 +0100 vbscript: Added IRegExp2_QueryInterface tests. --- .gitignore | 1 + dlls/vbscript/tests/Makefile.in | 2 + dlls/vbscript/tests/vbscript.c | 37 +++++ dlls/vbscript/tests/vbscript_defs.h | 33 +++++ dlls/vbscript/tests/vbsregexp55.idl | 271 +++++++++++++++++++++++++++++++++++ 5 files changed, 344 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0ef29595a8c3f37e2a09…

1 0

Piotr Caban : vbscript: Added IRegExp2 stub.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: wine Branch: master Commit: 63d27b5420f2836fbf6147546b4baf6859990d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=63d27b5420f2836fbf6147546… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Feb 15 15:09:28 2013 +0100 vbscript: Added IRegExp2 stub. --- .gitignore | 1 + dlls/vbscript/Makefile.in | 4 +- dlls/vbscript/vbregexp.c | 372 +++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript_main.c | 14 ++ 5 files changed, 391 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63d27b5420f2836fbf614…

1 0

Francois Gouget : winetest: Ignore the time it took to run the tests.
by Alexandre Julliard Feb. 15, 2013

Feb. 15, 2013

Module: tools Branch: master Commit: 36855cf5572b8c88251b896ada35d4a3578eb4c6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=36855cf5572b8c88251b896a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 15 11:18:17 2013 +0100 winetest: Ignore the time it took to run the tests. --- winetest/dissect | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 605292d..f2e18a2 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -288,7 +288,7 @@ while (<IN>) { if ($failed) { $class .= " failed"; } elsif ($todo) { $class .= " todo"; } $testbox->{data} .= sprintf "<div class=\"%s\">%s</div>\n", $class, escapeHTML($_); - } elsif (/$dll:$unit done $(-?\d+)$\r?$/) { + } elsif (/$dll:$unit done $(-?\d+)$(?:\r?$| in)/) { chomp; # current test ended if ($lines==0 || $1 < 0) { $result = "failed $1 - -";

1 0

Henri Verbeet : configure: Include Xlib.h before Xrandr.h.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: e89edd60fefafd6440b155b49d43b06b7d7b778f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e89edd60fefafd6440b155b49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 14 21:16:11 2013 +0100 configure: Include Xlib.h before Xrandr.h. --- configure | 1 + configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 2998c6a..223ec5d 100755 --- a/configure +++ b/configure @@ -8824,6 +8824,7 @@ _ACEOF cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> int main () diff --git a/configure.ac b/configure.ac index d6fccaa..fd7d0b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1076,8 +1076,8 @@ then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func; if (func) return 0;]])], [WINE_CHECK_SONAME(Xrandr,XRRQueryExtension, - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/extensions/Xrandr.h>]], - [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> +#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])], [AC_DEFINE(HAVE_XRRGETSCREENRESOURCES, 1, [Define if Xrandr has the XRRGetScreenResources function])])],, [$X_LIBS $XLIB $X_EXTRA_LIBS])])

1 0

Alexandre Julliard : usp10: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 6af3e91cf893de730cdd8059ce75c9b521fe79ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6af3e91cf893de730cdd8059c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:37:25 2013 +0100 usp10: Remove an unnecessary DllMain entry point. --- dlls/usp10/usp10.c | 17 ----------------- 1 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0b14e9e..8bfe156 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -999,23 +999,6 @@ int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) } /*********************************************************************** - * DllMain - * - */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - -/*********************************************************************** * ScriptFreeCache (USP10.@) * * Free a script cache.

1 0

Alexandre Julliard : dpnhpast: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 79e1723e72a196c614e1dc4467c036ce9f1f6c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e1723e72a196c614e1dc446… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:36:39 2013 +0100 dpnhpast: Remove an unnecessary DllMain entry point. --- dlls/dpnhpast/main.c | 23 ----------------------- 1 files changed, 0 insertions(+), 23 deletions(-) diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 5ff5f72..4e46608 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -28,29 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dpnhpast); /****************************************************************** - * DllMain - * - * - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); - - if (fdwReason == DLL_PROCESS_ATTACH) - { - DisableThreadLibraryCalls(hinstDLL); - /* FIXME: Initialisation */ - } - else if (fdwReason == DLL_PROCESS_DETACH) - { - /* FIXME: Cleanup */ - } - - return TRUE; -} - - -/****************************************************************** * DirectPlayNATHelpCreate (DPNHPAST.1) * *

1 0

Alexandre Julliard : twain_32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 731a3fea91c13082d0d051274f34acc2a9df7c34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731a3fea91c13082d0d051274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:35:40 2013 +0100 twain_32: Remove an unnecessary DllMain entry point. --- dlls/twain_32/dsm_ctrl.c | 14 +++++--------- dlls/twain_32/twain32_main.c | 19 ------------------- dlls/twain_32/twain_i.h | 1 - 3 files changed, 5 insertions(+), 29 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index b50dbc5..db57d08 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -207,7 +207,7 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) TRACE("DG_CONTROL/DAT_IDENTITY/MSG_OPENDS\n"); TRACE("pIdentity is %s\n", pIdentity->ProductName); - if (DSM_currentState != 3) { + if (!DSM_initialized) { FIXME("seq error\n"); DSM_twCC = TWCC_SEQERROR; return TWRC_FAILURE; @@ -281,10 +281,9 @@ TW_UINT16 TWAIN_CloseDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData) TRACE("DG_CONTROL/DAT_PARENT/MSG_CLOSEDSM\n"); - if (DSM_currentState == 3) + if (DSM_initialized) { DSM_initialized = FALSE; - DSM_currentState = 2; /* If there are data sources still open, close them now. */ while (currentDS != NULL) @@ -309,12 +308,9 @@ TW_UINT16 TWAIN_OpenDSM (pTW_IDENTITY pOrigin, TW_MEMREF pData) TW_UINT16 twRC = TWRC_SUCCESS; TRACE("DG_CONTROL/DAT_PARENT/MSG_OPENDSM\n"); - if (DSM_currentState == 2) { - if (!DSM_initialized) { - DSM_currentDevice = 0; - DSM_initialized = TRUE; - } - DSM_currentState = 3; + if (!DSM_initialized) { + DSM_currentDevice = 0; + DSM_initialized = TRUE; DSM_twCC = TWCC_SUCCESS; twRC = TWRC_SUCCESS; } else { diff --git a/dlls/twain_32/twain32_main.c b/dlls/twain_32/twain32_main.c index 9eb2754..f7b8f58 100644 --- a/dlls/twain_32/twain32_main.c +++ b/dlls/twain_32/twain32_main.c @@ -43,25 +43,6 @@ static activeDS *TWAIN_LookupSource (const TW_IDENTITY *pDest) return pSource; } -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - DSM_currentState = 2; - break; - - case DLL_PROCESS_DETACH: - DSM_currentState = 1; - break; - } - - return TRUE; -} - static TW_UINT16 TWAIN_SourceManagerHandler ( pTW_IDENTITY pOrigin, TW_UINT16 DAT, diff --git a/dlls/twain_32/twain_i.h b/dlls/twain_32/twain_i.h index ffe6bd9..a8fa2fb 100644 --- a/dlls/twain_32/twain_i.h +++ b/dlls/twain_32/twain_i.h @@ -39,7 +39,6 @@ typedef struct tagActiveDS DSENTRYPROC dsEntry; } activeDS; -TW_UINT16 DSM_currentState DECLSPEC_HIDDEN; /* current state of Source Manager */ TW_UINT16 DSM_twCC DECLSPEC_HIDDEN; /* current condition code of Source Manager */ activeDS *activeSources DECLSPEC_HIDDEN; /* list of active data sources */

1 0

Alexandre Julliard : odbccu32: Remove an unnecessary source file.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 981f79dbf862b8d46014061f043a1992cc76842f URL: http://source.winehq.org/git/wine.git/?a=commit;h=981f79dbf862b8d46014061f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:35:21 2013 +0100 odbccu32: Remove an unnecessary source file. --- dlls/odbccu32/Makefile.in | 3 -- dlls/odbccu32/odbccu32_main.c | 42 ----------------------------------------- 2 files changed, 0 insertions(+), 45 deletions(-) diff --git a/dlls/odbccu32/Makefile.in b/dlls/odbccu32/Makefile.in index cc8bf71..36737ce 100644 --- a/dlls/odbccu32/Makefile.in +++ b/dlls/odbccu32/Makefile.in @@ -1,8 +1,5 @@ MODULE = odbccu32.dll -C_SRCS = \ - odbccu32_main.c - RC_SRCS = version.rc @MAKE_DLL_RULES@ diff --git a/dlls/odbccu32/odbccu32_main.c b/dlls/odbccu32/odbccu32_main.c deleted file mode 100644 index 09abf2b..0000000 --- a/dlls/odbccu32/odbccu32_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * ODBC Cursor Library - * - * Copyright 2012 Alistair Leslie-Hughes - * - * 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 "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - - return TRUE; -}

1 0

Aric Stewart : usp10: Correct error with ScriptLayout log2vis.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 9a59d81f7254cd6e4b99822e2f0cf997ae80e9f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a59d81f7254cd6e4b99822e2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 14 12:10:31 2013 -0600 usp10: Correct error with ScriptLayout log2vis. Issue found and test written by Huw Davies. --- dlls/usp10/bidi.c | 6 ++++-- dlls/usp10/tests/usp10.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index a2edfa6..3b1823f 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -872,11 +872,13 @@ int BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, B reverse(pIndexs, ich); } - if (newlevel > 1) + if (newlevel >= 0) { ich = 0; for (; ich < cch; ich++) - if (plevel[ich] > level) + if (plevel[ich] < level) + break; + else if (plevel[ich] > level) ich += BIDI_ReorderL2vLevel(level + 1, pIndexs + ich, plevel + ich, cch - ich, fReverse) - 1; } diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7752f2c..354bc23 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2786,6 +2786,11 @@ static void test_ScriptLayout(void) { 0, 0, 1, 1, 2, 2, 1, 1, 0, 1 }, { 1, 0, 1, 2, 2, 1, 2, 1, 0, 1 }, + + { 1, 2, 0, 0, 0, 0, 0, 0, 0, 0 }, + { 2, 2, 2, 0, 0, 0, 0, 0, 0, 0 }, + { 2, 2, 2, 4, 4, 4, 1, 1, 0, 0 }, + { 1, 2, 3, 0, 3, 2, 1, 0, 0, 0 } }; static const int expect_l2v[][10] = { @@ -2802,6 +2807,11 @@ static void test_ScriptLayout(void) { 0, 1, 7, 6, 4, 5, 3 ,2 ,8, 9}, /**/ { 0, 1, 7, 5, 6, 4, 3 ,2 ,8, 9}, + + { 1, 0, 2, 3, 4, 5, 6, 7, 8, 9}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, + { 2, 3, 4, 5, 6, 7, 1, 0, 8, 9}, + { 2, 0, 1, 3, 5, 6, 4, 7, 8, 9} }; static const int expect_v2l[][10] = { @@ -2818,6 +2828,11 @@ static void test_ScriptLayout(void) { 0, 1, 7, 6, 4, 5, 3 ,2 ,8, 9}, { 0, 1, 7, 6, 5, 3, 4 ,2 ,8, 9}, + + { 1, 0, 2, 3, 4, 5, 6, 7, 8, 9}, + { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, + { 7, 6, 0, 1, 2, 3, 4, 5, 8, 9}, + { 1, 2, 0, 3, 6, 4, 5, 7, 8, 9} }; int i, j, vistolog[sizeof(levels[0])], logtovis[sizeof(levels[0])];

1 0

Alexandre Julliard : wtsapi32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 102f5085efc5d9ac9e3190c721c08a2eeb917e20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102f5085efc5d9ac9e3190c72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:37:37 2013 +0100 wtsapi32: Remove an unnecessary DllMain entry point. --- dlls/wtsapi32/wtsapi32.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index c25f75b..898b95d 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -26,25 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} - /************************************************************ * WTSCloseServer (WTSAPI32.@) */

1 0

Alexandre Julliard : cryptnet: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: a4cdc0e90d3f3ad1b1ade84d352a8239d70771ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4cdc0e90d3f3ad1b1ade84d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:36:26 2013 +0100 cryptnet: Remove an unnecessary DllMain entry point. --- dlls/cryptnet/cryptnet_main.c | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index c7511d7..46eac4e 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -42,22 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptnet); #define IS_INTOID(x) (((ULONG_PTR)(x) >> 16) == 0) -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - /* Do uninitialisation here */ - break; - default: break; - } - return TRUE; -} - static const WCHAR cryptNet[] = { 'c','r','y','p','t','n','e','t','.', 'd','l','l',0 };

1 0

Alexandre Julliard : iphlpapi: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 4468a0122f70fd4ac23417f766a5e8c96af025c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4468a0122f70fd4ac23417f76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:36:51 2013 +0100 iphlpapi: Remove an unnecessary DllMain entry point. --- dlls/iphlpapi/iphlpapi_main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9cffe06..600bf8c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -71,19 +71,6 @@ static void initialise_resolver(void) res_init(); } -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - /****************************************************************** * AddIPAddress (IPHLPAPI.@) *

1 0

Jacek Caban : wininet: Set available bytes in InternetQueryDataAvailable even if it ends up in async call .
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 851866e22a731141da7e3cbd2550c67c59968959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851866e22a731141da7e3cbd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 14 18:05:14 2013 +0100 wininet: Set available bytes in InternetQueryDataAvailable even if it ends up in async call. --- dlls/wininet/http.c | 24 ++++++++++++++++-------- dlls/wininet/tests/http.c | 9 ++++++++- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d4c822d..81439ca 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2763,7 +2763,7 @@ static void send_request_complete(http_request_t *req, DWORD_PTR result, DWORD e sizeof(INTERNET_ASYNC_RESULT)); } -static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) +static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif, DWORD *ret_size) { DWORD res, read = 0, avail = 0; read_mode_t mode; @@ -2776,6 +2776,8 @@ static void HTTP_ReceiveRequestData(http_request_t *req, BOOL first_notif) res = refill_read_buffer(req, mode, &read); if(res == ERROR_SUCCESS && !first_notif) avail = get_avail_data(req); + if(ret_size) + *ret_size = get_avail_data(req); LeaveCriticalSection( &req->read_section ); @@ -2993,11 +2995,16 @@ static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD s return res; } -static void AsyncQueryDataAvailableProc(task_header_t *task) +typedef struct { + task_header_t hdr; + DWORD *ret_size; +} http_data_available_task_t; + +static void AsyncQueryDataAvailableProc(task_header_t *hdr) { - http_request_t *req = (http_request_t*)task->hdr; + http_data_available_task_t *task = (http_data_available_task_t*)hdr; - HTTP_ReceiveRequestData(req, FALSE); + HTTP_ReceiveRequestData((http_request_t*)task->hdr.hdr, FALSE, task->ret_size); } static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, DWORD flags, DWORD_PTR ctx) @@ -3008,7 +3015,7 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, if (req->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { - task_header_t *task; + http_data_available_task_t *task; /* never wait, if we can't enter the section we queue an async request right away */ if (TryEnterCriticalSection( &req->read_section )) @@ -3020,7 +3027,8 @@ static DWORD HTTPREQ_QueryDataAvailable(object_header_t *hdr, DWORD *available, } task = alloc_async_task(&req->hdr, AsyncQueryDataAvailableProc, sizeof(*task)); - INTERNET_AsyncCall(task); + task->ret_size = available; + INTERNET_AsyncCall(&task->hdr); return ERROR_IO_PENDING; } @@ -4923,7 +4931,7 @@ lend: { if (res == ERROR_SUCCESS) { if(bEndRequest && request->contentLength && request->bytesWritten == request->bytesToWrite) - HTTP_ReceiveRequestData(request, TRUE); + HTTP_ReceiveRequestData(request, TRUE, NULL); else send_request_complete(request, request->session->hdr.dwInternalFlags & INET_OPENURL ? (DWORD_PTR)request->hdr.hInternet : 1, 0); @@ -5034,7 +5042,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ create_cache_entry(request); if (res == ERROR_SUCCESS && request->contentLength) - HTTP_ReceiveRequestData(request, TRUE); + HTTP_ReceiveRequestData(request, TRUE, NULL); else send_request_complete(request, res == ERROR_SUCCESS, res); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ba4ec4d..6083900 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -448,7 +448,7 @@ static void InternetReadFile_test(int flags, const test_data_t *test) char *post_data = NULL; BOOL res, on_async = TRUE; CHAR buffer[4000]; - DWORD length, post_len = 0; + DWORD length, exlen = 0, post_len = 0; const char *types[2] = { "*", NULL }; HINTERNET hi, hic = 0, hor = 0; @@ -649,12 +649,17 @@ static void InternetReadFile_test(int flags, const test_data_t *test) { if (flags & INTERNET_FLAG_ASYNC) SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + length = 0; res = InternetQueryDataAvailable(hor,&length,0x0,0x0); if (flags & INTERNET_FLAG_ASYNC) { if (res) { CHECK_NOT_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + if(exlen) { + ok(length >= exlen, "length %u < exlen %u\n", length, exlen); + exlen = 0; + } } else if (GetLastError() == ERROR_IO_PENDING) { @@ -663,6 +668,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) if(!(test->flags & TESTF_CHUNKED)) ok(!length, "InternetQueryDataAvailable returned ERROR_IO_PENDING and %u length\n", length); WaitForSingleObject(hCompleteEvent, INFINITE); + exlen = length; + ok(exlen, "length = 0\n"); CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); ok(req_error, "req_error = 0\n"); continue;

1 0

Alexandre Julliard : ktmw32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 94038dd67a7b4adcc75aa6a5bfde0d243a01f04e URL: http://source.winehq.org/git/wine.git/?a=commit;h=94038dd67a7b4adcc75aa6a5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:37:03 2013 +0100 ktmw32: Remove an unnecessary DllMain entry point. --- dlls/ktmw32/ktmw32_main.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/ktmw32/ktmw32_main.c b/dlls/ktmw32/ktmw32_main.c index 6aee549..328ddb5 100644 --- a/dlls/ktmw32/ktmw32_main.c +++ b/dlls/ktmw32/ktmw32_main.c @@ -28,21 +28,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ktmw32); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - - switch (fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - - return TRUE; -} - /*********************************************************************** * CommitTransaction (ktmw32.@) */

1 0

Alexandre Julliard : sensapi: Remove an unnecessary DllMain entry point.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: a5c4f231cab8867f988439e3e7b5b47e34a9aee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c4f231cab8867f988439e3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 14 21:37:17 2013 +0100 sensapi: Remove an unnecessary DllMain entry point. --- dlls/sensapi/sensapi.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-) diff --git a/dlls/sensapi/sensapi.c b/dlls/sensapi/sensapi.c index 75d07a8..0d2f212 100644 --- a/dlls/sensapi/sensapi.c +++ b/dlls/sensapi/sensapi.c @@ -44,25 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sensapi); -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} - BOOL WINAPI IsDestinationReachableA(LPCSTR lpszDestination, LPQOCINFO lpQOCInfo) { FIXME("%s,%p\n", lpszDestination, lpQOCInfo);

1 0

Jacek Caban : urlmon: Allow available_bytes to be set before protocol_continue call.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 5f14eb564ee35c7f47814cee107982ab5c43bc7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f14eb564ee35c7f47814cee1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 14 18:04:53 2013 +0100 urlmon: Allow available_bytes to be set before protocol_continue call. --- dlls/urlmon/protocol.c | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 5bd16dd..e404e4d 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -338,32 +338,38 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) protocol->flags |= FLAG_FIRST_CONTINUE_COMPLETE; } - if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA) && !protocol->available_bytes) { - BOOL res; - - /* InternetQueryDataAvailable may immediately fork and perform its asynchronous - * read, so clear the flag _before_ calling so it does not incorrectly get cleared - * after the status callback is called */ - protocol->flags &= ~FLAG_REQUEST_COMPLETE; - res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); - if(res) { - if(!protocol->available_bytes) { - if(is_start) { - TRACE("empty file\n"); - all_data_read(protocol); - }else { - WARN("unexpected end of file?\n"); - report_result(protocol, INET_E_DOWNLOAD_FAILURE); + if(data->pData >= UlongToPtr(BINDSTATUS_DOWNLOADINGDATA)) { + if(!protocol->available_bytes) { + BOOL res; + + /* InternetQueryDataAvailable may immediately fork and perform its asynchronous + * read, so clear the flag _before_ calling so it does not incorrectly get cleared + * after the status callback is called */ + protocol->flags &= ~FLAG_REQUEST_COMPLETE; + res = InternetQueryDataAvailable(protocol->request, &protocol->available_bytes, 0, 0); + if(res) { + TRACE("available %u bytes\n", protocol->available_bytes); + if(!protocol->available_bytes) { + if(is_start) { + TRACE("empty file\n"); + all_data_read(protocol); + }else { + WARN("unexpected end of file?\n"); + report_result(protocol, INET_E_DOWNLOAD_FAILURE); + } + return S_OK; } + }else if(GetLastError() != ERROR_IO_PENDING) { + protocol->flags |= FLAG_REQUEST_COMPLETE; + WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); + report_result(protocol, INET_E_DATA_NOT_AVAILABLE); return S_OK; } + protocol->flags |= FLAG_REQUEST_COMPLETE; - report_data(protocol); - }else if(GetLastError() != ERROR_IO_PENDING) { - protocol->flags |= FLAG_REQUEST_COMPLETE; - WARN("InternetQueryDataAvailable failed: %d\n", GetLastError()); - report_result(protocol, INET_E_DATA_NOT_AVAILABLE); } + + report_data(protocol); } return S_OK;

1 0

Dmitry Timoshkov : gdi32: ExcludeClipRect should update actual clipping region for a EMF DC.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 88b9ae1ec2d1930b8453f6d7f74f654228bdf353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b9ae1ec2d1930b8453f6d7f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 14 13:38:31 2013 +0800 gdi32: ExcludeClipRect should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 6 +++++- dlls/gdi32/tests/metafile.c | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 8a06ad4..3af7ef4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -157,14 +157,18 @@ INT EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection) INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); EMREXCLUDECLIPRECT emr; + BOOL ret; + emr.emr.iType = EMR_EXCLUDECLIPRECT; emr.emr.nSize = sizeof(emr); emr.rclClip.left = left; emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - return EMFDRV_WriteRecord( dev, &emr.emr ); + ret = EMFDRV_WriteRecord( dev, &emr.emr ); + return ret ? next->funcs->pExcludeClipRect( next, left, top, right, bottom ) : ERROR; } INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 86fa373..53ec7ac 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2530,7 +2530,6 @@ static void test_emf_clipping(void) SetRect(&rc_sclip, 0, 0, 100, 50); ret = ExcludeClipRect(hdc, 0, 50, 100, 100); -todo_wine ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); if (ret == COMPLEXREGION) { @@ -2543,10 +2542,9 @@ todo_wine SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); -todo_wine ok(EqualRect(&rc_res, &rc_sclip), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", - rc.left, rc.top, rc.right, rc.bottom, + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); hemf = CloseEnhMetaFile(hdc);

1 0

Jactry Zeng : msvcr90: Sync _wstat32i64 and _stat32i64 implementation.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 79b236c2d17b12c39b0c6814446f5313c23cc493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b236c2d17b12c39b0c68144… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Feb 14 21:13:08 2013 +0800 msvcr90: Sync _wstat32i64 and _stat32i64 implementation. --- dlls/msvcr90/msvcr90.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index dd91d5e..1f0a56a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -973,7 +973,7 @@ @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l @ varargs _sscanf_s_l(str str ptr) msvcrt._sscanf_s_l @ cdecl _stat32(str ptr) msvcr100._stat32 -@ stub _stat32i64 +@ cdecl _stat32i64(str ptr) msvcr100._stat32i64 @ cdecl _stat64(str ptr) msvcrt._stat64 @ cdecl _stat64i32(str ptr) msvcr100._stat64i32 @ cdecl _statusfp() msvcrt._statusfp @@ -1243,7 +1243,7 @@ @ cdecl _wsplitpath(wstr ptr ptr ptr ptr) msvcrt._wsplitpath @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) msvcrt._wsplitpath_s @ cdecl _wstat32(wstr ptr) msvcr100._wstat32 -@ stub _wstat32i64 +@ cdecl _wstat32i64(wstr ptr) msvcr100._wstat32i64 @ cdecl _wstat64(wstr ptr) msvcrt._wstat64 @ cdecl _wstat64i32(wstr ptr) msvcr100._wstat64i32 @ cdecl _wstrdate(ptr) msvcrt._wstrdate

1 0

Huw Davies : riched20: Simplify selection painting by drawing a selected run twice with appropriate clipping .
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: ab6bb56988c000c44c2bcf38aa77eb7baa23ca55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6bb56988c000c44c2bcf38a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:23 2013 +0000 riched20: Simplify selection painting by drawing a selected run twice with appropriate clipping. --- dlls/riched20/paint.c | 118 +++++++++++++++++++++++++------------------------ 1 files changed, 60 insertions(+), 58 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index af93869..e4bd9e6 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -305,89 +305,91 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in return; } + +static void draw_text( ME_Context *c, ME_Run *run, int x, int y, const WCHAR *text, BOOL selected, RECT *sel_rect ) +{ + COLORREF text_color = get_text_color( c, run->style, selected ); + COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; + COLORREF old_text, old_back; + HPEN pen; + + old_text = SetTextColor( c->hDC, text_color ); + if (selected) old_back = SetBkColor( c->hDC, back_color ); + + ExtTextOutW( c->hDC, x, y, selected ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); + + if (selected) SetBkColor( c->hDC, old_back ); + SetTextColor( c->hDC, old_text ); + + get_underline_pen( run->style, text_color, &pen ); + if (pen) + { + HPEN old_pen = SelectObject( c->hDC, pen ); + MoveToEx( c->hDC, x, y + 1, NULL ); + LineTo( c->hDC, x + run->nWidth, y + 1 ); + SelectObject( c->hDC, old_pen ); + DeleteObject( pen ); + } + + return; +} + + static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; HGDIOBJ hOldFont; - COLORREF rgbOld; int yOffset = 0; - COLORREF rgb; - HPEN hPen = NULL, hOldPen = NULL; - BOOL bHighlightedText = (nSelFrom < run->len && nSelTo >= 0 - && nSelFrom < nSelTo && !c->editor->bHideSelection); + BOOL selected = (nSelFrom < run->len && nSelTo >= 0 + && nSelFrom < nSelTo && !c->editor->bHideSelection); + BOOL old_style_selected = FALSE; RECT sel_rect; + HRGN clip = NULL, sel_rgn = NULL; yOffset = calc_y_offset( c, run->style ); - rgb = get_text_color( c, run->style, FALSE ); - - if (bHighlightedText) + if (selected) { nSelFrom = max( 0, nSelFrom ); nSelTo = min( run->len, nSelTo ); get_selection_rect( c, run, nSelFrom, nSelTo, cy, &sel_rect ); OffsetRect( &sel_rect, x, ymin ); - } - - hOldFont = ME_SelectStyleFont(c, run->style); - get_underline_pen( run->style, rgb, &hPen ); - if (hPen) hOldPen = SelectObject( hDC, hPen ); - - rgbOld = SetTextColor(hDC, rgb); - if (bHighlightedText && !c->editor->bEmulateVersion10) - { - COLORREF rgbBackOld; - /* FIXME: should use textmetrics info for Descent info */ - if (hPen) - MoveToEx(hDC, x, y - yOffset + 1, NULL); - if (sel_rect.left > x) + if (c->editor->bEmulateVersion10) { - ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nSelFrom, NULL); - if (hPen) - LineTo(hDC, sel_rect.left, y - yOffset + 1); + old_style_selected = TRUE; + selected = FALSE; } - SetTextColor( hDC, get_text_color( c, run->style, TRUE ) ); - rgbBackOld = SetBkColor(hDC, ITextHost_TxGetSysColor(c->editor->texthost, - COLOR_HIGHLIGHT)); - ExtTextOutW(hDC, sel_rect.left, y-yOffset, ETO_OPAQUE, &sel_rect, - szText+nSelFrom, nSelTo-nSelFrom, NULL); - if (hPen) - LineTo(hDC, sel_rect.right, y - yOffset + 1); - SetBkColor(hDC, rgbBackOld); - if (sel_rect.right < x + run->nWidth) + else { - SetTextColor(hDC, rgb); - ExtTextOutW(hDC, sel_rect.right, y-yOffset, 0, NULL, szText+nSelTo, - run->len - nSelTo, NULL); - if (hPen) - LineTo(hDC, x + run->nWidth, y - yOffset + 1); + sel_rgn = CreateRectRgnIndirect( &sel_rect ); + clip = CreateRectRgn( 0, 0, 0, 0 ); + if (GetClipRgn( hDC, clip ) != 1) + { + DeleteObject( clip ); + clip = NULL; + } } } - else - { - ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, run->len, NULL); - /* FIXME: should use textmetrics info for Descent info */ - if (hPen) - { - MoveToEx(hDC, x, y - yOffset + 1, NULL); - LineTo(hDC, x + run->nWidth, y - yOffset + 1); - } - - if (bHighlightedText) /* v1.0 inverts the selection */ - { - PatBlt(hDC, sel_rect.left, ymin, sel_rect.right - sel_rect.left, cy, DSTINVERT); - } - } + hOldFont = ME_SelectStyleFont( c, run->style ); - if (hPen) + if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); + draw_text( c, run, x, y - yOffset, szText, FALSE, NULL ); + if (sel_rgn) { - SelectObject(hDC, hOldPen); - DeleteObject(hPen); + ExtSelectClipRgn( hDC, clip, RGN_COPY ); + ExtSelectClipRgn( hDC, sel_rgn, RGN_AND ); + draw_text( c, run, x, y - yOffset, szText, TRUE, &sel_rect ); + ExtSelectClipRgn( hDC, clip, RGN_COPY ); + if (clip) DeleteObject( clip ); + DeleteObject( sel_rgn ); } - SetTextColor(hDC, rgbOld); + + if (old_style_selected) + PatBlt( hDC, sel_rect.left, ymin, sel_rect.right - sel_rect.left, cy, DSTINVERT ); + ME_UnselectStyleFont(c, run->style, hOldFont); }

1 0

Huw Davies : riched20: Move the white space painting operations to a common function.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 4cbe94f42ad6b4fd14133cbdc7a4eeb24c7b2f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cbe94f42ad6b4fd14133cbdc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:18 2013 +0000 riched20: Move the white space painting operations to a common function. --- dlls/riched20/paint.c | 127 ++++++++++++++++++++++++++++--------------------- 1 files changed, 72 insertions(+), 55 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 65c6e9e..b822f6c 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -228,55 +228,74 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) return; } -static void ME_HighlightSpace(ME_Context *c, int x, int y, LPCWSTR szText, - int nChars, ME_Style *s, int width, - int nSelFrom, int nSelTo, int ymin, int cy) +/********************************************************************* + * draw_space + * + * Draw the end-of-paragraph or tab space. + * + * If actually_draw is TRUE then ensure any underline is drawn. + */ +static void draw_space( ME_Context *c, ME_Run *run, int x, int y, + BOOL selected, BOOL actually_draw, int ymin, int cy ) { - HDC hDC = c->hDC; - HGDIOBJ hOldFont = NULL; - SIZE sz; - int selWidth; - /* Only highlight if there is a selection in the run and when - * EM_HIDESELECTION is not being used to hide the selection. */ - if (nSelFrom >= nChars || nSelTo < 0 || nSelFrom >= nSelTo - || c->editor->bHideSelection) - return; - hOldFont = ME_SelectStyleFont(c, s); - if (width <= 0) - { - GetTextExtentPoint32W(hDC, szText, nChars, &sz); - width = sz.cx; - } - if (nSelFrom < 0) nSelFrom = 0; - if (nSelTo > nChars) nSelTo = nChars; - GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); - x += sz.cx; - if (nSelTo != nChars) - { - GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); - selWidth = sz.cx; - } else { - selWidth = width - sz.cx; - } - ME_UnselectStyleFont(c, s, hOldFont); - - if (c->editor->bEmulateVersion10) - PatBlt(hDC, x, ymin, selWidth, cy, DSTINVERT); - else - { + HDC hdc = c->hDC; + BOOL old_style_selected = FALSE; RECT rect; - HBRUSH hBrush; - rect.left = x; - rect.top = ymin; - rect.right = x + selWidth; - rect.bottom = ymin + cy; - hBrush = CreateSolidBrush(ITextHost_TxGetSysColor(c->editor->texthost, - COLOR_HIGHLIGHT)); - FillRect(hDC, &rect, hBrush); - DeleteObject(hBrush); - } + COLORREF back_color = 0; + + SetRect( &rect, x, ymin, x + run->nWidth, ymin + cy ); + + if (c->editor->bHideSelection) selected = FALSE; + if (c->editor->bEmulateVersion10) + { + old_style_selected = selected; + selected = FALSE; + } + + if (selected) + back_color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ); + + if (actually_draw) + { + COLORREF text_color = get_text_color( c, run->style, selected ); + COLORREF old_text, old_back; + HFONT old_font = NULL; + HPEN pen = NULL; + int y_offset = calc_y_offset( c, run->style ); + static const WCHAR space[1] = {' '}; + + old_font = ME_SelectStyleFont( c, run->style ); + old_text = SetTextColor( hdc, text_color ); + if (selected) old_back = SetBkColor( hdc, back_color ); + + ExtTextOutW( hdc, x, y - y_offset, selected ? ETO_OPAQUE : 0, &rect, space, 1, &run->nWidth ); + + if (selected) SetBkColor( hdc, old_back ); + SetTextColor( hdc, old_text ); + ME_UnselectStyleFont( c, run->style, old_font ); + + get_underline_pen( run->style, text_color, &pen ); + if (pen) + { + HPEN old_pen = SelectObject( hdc, pen ); + MoveToEx( hdc, x, y - y_offset + 1, NULL ); + LineTo( hdc, x + run->nWidth, y - y_offset + 1 ); + SelectObject( hdc, old_pen ); + DeleteObject( pen ); + } + } + else if (selected) + { + HBRUSH brush = CreateSolidBrush( back_color ); + FillRect( hdc, &rect, brush ); + DeleteObject( brush ); + } + + if (old_style_selected) + PatBlt( hdc, x, ymin, run->nWidth, cy, DSTINVERT ); } + static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, int nChars, int nSelFrom, int nSelTo, int ymin, int cy) { @@ -406,7 +425,6 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa ME_DisplayItem *start; int runofs = run->nCharOfs+para->nCharOfs; int nSelFrom, nSelTo; - const WCHAR wszSpace[] = {' ', 0}; if (run->nFlags & MERF_HIDDEN) return; @@ -419,21 +437,20 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa { if (runofs >= nSelFrom && runofs < nSelTo) { - ME_HighlightSpace(c, x, y, wszSpace, 1, run->style, 0, 0, 1, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); + draw_space( c, run, x, y, TRUE, FALSE, + c->pt.y + para->pt.y + start->member.row.pt.y, + start->member.row.nHeight ); } return; } if (run->nFlags & (MERF_TAB | MERF_ENDCELL)) { - /* wszSpace is used instead of the tab character because otherwise - * an unwanted symbol can be inserted instead. */ - ME_DrawTextWithStyle(c, run, x, y, wszSpace, 1, - nSelFrom-runofs, nSelTo-runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); + BOOL selected = runofs >= nSelFrom && runofs < nSelTo; + + draw_space( c, run, x, y, selected, TRUE, + c->pt.y + para->pt.y + start->member.row.pt.y, + start->member.row.nHeight ); return; }

1 0

Huw Davies : riched20: Pass the run to the text drawing routine.
by Alexandre Julliard Feb. 14, 2013

Feb. 14, 2013

Module: wine Branch: master Commit: 82c8e567fb45eec60afe994a62776f41bdeb6d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c8e567fb45eec60afe994a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:14 2013 +0000 riched20: Pass the run to the text drawing routine. --- dlls/riched20/paint.c | 53 ++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1f8c7c4..d29d185 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -215,9 +215,8 @@ static void ME_HighlightSpace(ME_Context *c, int x, int y, LPCWSTR szText, } } -static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, - int nChars, ME_Style *s, int width, - int nSelFrom, int nSelTo, int ymin, int cy) +static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, + int nChars, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; HGDIOBJ hOldFont; @@ -233,26 +232,26 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, * by the font extends to the end of the tab. Tabs are always stored as * a single character run, so we can handle this case separately, since * otherwise lpDx would need to specify the lengths of each character. */ - if (width && nChars == 1) - lpDx = &width; /* Make sure underline for tab extends across tab space */ + if (run->nWidth && nChars == 1) + lpDx = &run->nWidth; /* Make sure underline for tab extends across tab space */ - hOldFont = ME_SelectStyleFont(c, s); - if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) { - yTwipsOffset = s->fmt.yOffset; + hOldFont = ME_SelectStyleFont(c, run->style); + if ((run->style->fmt.dwMask & run->style->fmt.dwEffects) & CFM_OFFSET) { + yTwipsOffset = run->style->fmt.yOffset; } - if ((s->fmt.dwMask & s->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) { - if (s->fmt.dwEffects & CFE_SUPERSCRIPT) yTwipsOffset = s->fmt.yHeight/3; - if (s->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -s->fmt.yHeight/12; + if ((run->style->fmt.dwMask & run->style->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) { + if (run->style->fmt.dwEffects & CFE_SUPERSCRIPT) yTwipsOffset = run->style->fmt.yHeight/3; + if (run->style->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -run->style->fmt.yHeight/12; } if (yTwipsOffset) yOffset = ME_twips2pointsY(c, yTwipsOffset); - if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) + if ((run->style->fmt.dwMask & CFM_LINK) && (run->style->fmt.dwEffects & CFE_LINK)) rgb = RGB(0,0,255); - else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) + else if ((run->style->fmt.dwMask & CFM_COLOR) && (run->style->fmt.dwEffects & CFE_AUTOCOLOR)) rgb = ITextHost_TxGetSysColor(c->editor->texthost, COLOR_WINDOWTEXT); else - rgb = s->fmt.crTextColor; + rgb = run->style->fmt.crTextColor; if (bHighlightedText) { @@ -269,7 +268,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, if (nSelTo >= nChars) { nSelTo = nChars; - xSelEnd = x + width; + xSelEnd = x + run->nWidth; } else { @@ -279,9 +278,9 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, } /* Choose the pen type for underlining the text. */ - if (s->fmt.dwMask & CFM_UNDERLINETYPE) + if (run->style->fmt.dwMask & CFM_UNDERLINETYPE) { - switch (s->fmt.bUnderlineType) + switch (run->style->fmt.bUnderlineType) { case CFU_UNDERLINE: case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ @@ -292,7 +291,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, hPen = CreatePen(PS_DOT, 1, rgb); break; default: - FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType); + FIXME("Unknown underline type (%u)\n", run->style->fmt.bUnderlineType); /* fall through */ case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ case CFU_UNDERLINENONE: @@ -332,13 +331,13 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, if (hPen) LineTo(hDC, xSelEnd, y - yOffset + 1); SetBkColor(hDC, rgbBackOld); - if (xSelEnd < x + width) + if (xSelEnd < x + run->nWidth) { SetTextColor(hDC, rgb); ExtTextOutW(hDC, xSelEnd, y-yOffset, 0, NULL, szText+nSelTo, nChars-nSelTo, NULL); if (hPen) - LineTo(hDC, x + width, y - yOffset + 1); + LineTo(hDC, x + run->nWidth, y - yOffset + 1); } } else @@ -349,7 +348,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, if (hPen) { MoveToEx(hDC, x, y - yOffset + 1, NULL); - LineTo(hDC, x + width, y - yOffset + 1); + LineTo(hDC, x + run->nWidth, y - yOffset + 1); } if (bHighlightedText) /* v1.0 inverts the selection */ @@ -364,7 +363,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, DeleteObject(hPen); } SetTextColor(hDC, rgbOld); - ME_UnselectStyleFont(c, s, hOldFont); + ME_UnselectStyleFont(c, run->style, hOldFont); } static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { @@ -407,7 +406,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa { /* wszSpace is used instead of the tab character because otherwise * an unwanted symbol can be inserted instead. */ - ME_DrawTextWithStyle(c, x, y, wszSpace, 1, run->style, run->nWidth, + ME_DrawTextWithStyle(c, run, x, y, wszSpace, 1, nSelFrom-runofs, nSelTo-runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight); @@ -421,16 +420,16 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa if (c->editor->cPasswordMask) { ME_String *szMasked = ME_MakeStringR(c->editor->cPasswordMask, run->len); - ME_DrawTextWithStyle(c, x, y, - szMasked->szData, szMasked->nLen, run->style, run->nWidth, + ME_DrawTextWithStyle(c, run, x, y, + szMasked->szData, szMasked->nLen, nSelFrom-runofs,nSelTo-runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight); ME_DestroyString(szMasked); } else - ME_DrawTextWithStyle(c, x, y, - get_text( run, 0 ), run->len, run->style, run->nWidth, + ME_DrawTextWithStyle(c, run, x, y, + get_text( run, 0 ), run->len, nSelFrom-runofs,nSelTo-runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight);

1 0