February 2013 - Wine-commits

Alexandre Julliard : twain_32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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 : cryptnet: Remove an unnecessary DllMain entry point.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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 : dpnhpast: Remove an unnecessary DllMain entry point.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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 : iphlpapi: Remove an unnecessary DllMain entry point.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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

Alexandre Julliard : ktmw32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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 14 Feb '13

14 Feb '13

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

Alexandre Julliard : usp10: Remove an unnecessary DllMain entry point.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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 : wtsapi32: Remove an unnecessary DllMain entry point.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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

Henri Verbeet : configure: Include Xlib.h before Xrandr.h.
by Alexandre Julliard 14 Feb '13

14 Feb '13

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

Dmitry Timoshkov : gdi32: IntersectClipRect should update actual clipping region for a EMF DC.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 47b89a8fac21d6998541de8fe1fa45ed0028f2bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b89a8fac21d6998541de8fe… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 14 13:38:06 2013 +0800 gdi32: IntersectClipRect should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 6 +++++- dlls/gdi32/tests/metafile.c | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index f4c4a43..8a06ad4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -169,14 +169,18 @@ INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT botto INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pIntersectClipRect ); EMRINTERSECTCLIPRECT emr; + BOOL ret; + emr.emr.iType = EMR_INTERSECTCLIPRECT; 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->pIntersectClipRect( next, left, top, right, bottom ) : ERROR; } INT EMFDRV_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index e969c47..86fa373 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2511,7 +2511,6 @@ static void test_emf_clipping(void) rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); ret = IntersectClipRect(hdc, 0, 0, 100, 100); -todo_wine ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); if (ret == COMPLEXREGION) { @@ -2524,7 +2523,6 @@ 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), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom,

1 0