December 2017 - Wine-commits

Nikolay Sivov : comctl32/tests: Some cleanup for SysLink tests.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 8138ac9a3c67c548aef0983d7b85cc15d988063e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8138ac9a3c67c548aef0983d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 1 08:30:16 2017 +0300 comctl32/tests: Some cleanup for SysLink tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/syslink.c | 75 ++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 48 deletions(-) diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 94569d6..382c89d 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -180,39 +180,44 @@ static HWND create_syslink(DWORD style, HWND parent) return hWndSysLink; } +static void test_create_syslink(void) +{ + HWND hWndSysLink; + LONG oldstyle; + + /* Create an invisible SysLink control */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent); + ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError()); + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE); + + /* Make the SysLink control visible */ + flush_sequences(sequences, NUM_MSG_SEQUENCE); + oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE); + SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); + RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); + flush_events(); + ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE); + + DestroyWindow(hWndSysLink); +} START_TEST(syslink) { ULONG_PTR ctx_cookie; - HANDLE hCtx; HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - INITCOMMONCONTROLSEX iccex; - BOOL rc; - HWND hWndSysLink; - LONG oldstyle; POINT orig_pos; + HANDLE hCtx; if (!load_v6_module(&ctx_cookie, &hCtx)) return; /* LoadLibrary is needed. This file has no reference to functions in comctl32 */ hComctl32 = LoadLibraryA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_LINK_CLASS; - rc = pInitCommonControlsEx(&iccex); - ok(rc, "InitCommonControlsEx failed (le %u)\n", GetLastError()); - if (!rc) - { - skip("Could not register ICC_LINK_CLASS\n"); - return; - } + ok(hComctl32 != NULL, "Failed to load comctl32.dll.\n"); /* Move the cursor off the parent window */ GetCursorPos(&orig_pos); @@ -223,36 +228,10 @@ START_TEST(syslink) /* Create parent window */ hWndParent = create_parent_window(); ok(hWndParent != NULL, "Failed to create parent Window!\n"); - if (!hWndParent) - { - skip("Parent window not present\n"); - return; - } - flush_events(); - - /* Create an invisible SysLink control */ - flush_sequences(sequences, NUM_MSG_SEQUENCE); - hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent); - ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError()); - if (!hWndSysLink) - { - skip("SysLink control not present?\n"); - return; - } flush_events(); - ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE); - /* Make the SysLink control visible */ - flush_sequences(sequences, NUM_MSG_SEQUENCE); - oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE); - SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); - RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); - flush_events(); - ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE); + test_create_syslink(); - DestroyWindow(hWndSysLink); DestroyWindow(hWndParent); unload_v6_module(ctx_cookie, hCtx); SetCursorPos(orig_pos.x, orig_pos.y);

1 0

Nikolay Sivov : comctl32/syslink: Fix return value for LM_GETIDEALSIZE.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 57dec7677816446763d280f55a9b1a5cebef6436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57dec7677816446763d280f55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 1 08:30:17 2017 +0300 comctl32/syslink: Fix return value for LM_GETIDEALSIZE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/syslink.c | 12 ++++++------ dlls/comctl32/tests/syslink.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 339c728..67a1a60 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -1472,7 +1472,7 @@ static BOOL SYSLINK_NoNextLink (const SYSLINK_INFO *infoPtr, BOOL Prev) * SYSLINK_GetIdealSize * Calculates the ideal size of a link control at a given maximum width. */ -static VOID SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, LPSIZE lpSize) +static LONG SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, SIZE *lpSize) { RECT rc; HDC hdc; @@ -1493,6 +1493,8 @@ static VOID SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, L lpSize->cx = rc.right; lpSize->cy = rc.bottom; } + + return rc.bottom; } /*********************************************************************** @@ -1664,11 +1666,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, case LM_GETIDEALHEIGHT: if (lParam) - { - /* LM_GETIDEALSIZE */ - SYSLINK_GetIdealSize(infoPtr, (int)wParam, (LPSIZE)lParam); - } - return SYSLINK_GetIdealHeight(infoPtr); + return SYSLINK_GetIdealSize(infoPtr, (int)wParam, (SIZE *)lParam); + else + return SYSLINK_GetIdealHeight(infoPtr); case WM_SETFOCUS: return SYSLINK_SetFocus(infoPtr); diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 382c89d..a6b90b6 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -205,6 +205,43 @@ static void test_create_syslink(void) DestroyWindow(hWndSysLink); } +static void test_LM_GETIDEALHEIGHT(void) +{ + HWND hwnd; + LONG ret; + + hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent); + ok(hwnd != NULL, "Failed to create SysLink window.\n"); + + ret = SendMessageA(hwnd, LM_GETIDEALHEIGHT, 0, 0); + ok(ret > 0, "Unexpected ideal height, %d.\n", ret); + + DestroyWindow(hwnd); +} + +static void test_LM_GETIDEALSIZE(void) +{ + HWND hwnd; + LONG ret; + SIZE sz; + + hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent); + ok(hwnd != NULL, "Failed to create SysLink window.\n"); + + memset(&sz, 0, sizeof(sz)); + ret = SendMessageA(hwnd, LM_GETIDEALSIZE, 0, (LPARAM)&sz); + ok(ret > 0, "Unexpected return value, %d.\n", ret); + if (sz.cy == 0) + win_skip("LM_GETIDEALSIZE is not supported.\n"); + else + { + ok(sz.cx > 5, "Unexpected ideal width, %d.\n", sz.cx); + ok(sz.cy == ret, "Unexpected ideal height, %d.\n", sz.cy); + } + + DestroyWindow(hwnd); +} + START_TEST(syslink) { ULONG_PTR ctx_cookie; @@ -231,6 +268,8 @@ START_TEST(syslink) flush_events(); test_create_syslink(); + test_LM_GETIDEALHEIGHT(); + test_LM_GETIDEALSIZE(); DestroyWindow(hWndParent); unload_v6_module(ctx_cookie, hCtx);

1 0

Stefan Leichter : wdscore: Add stub DLL.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: ff061b9edfc28a4f15b018b8a843a307ccedecc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff061b9edfc28a4f15b018b8a… Author: Stefan Leichter <sle85276(a)gmx.de> Date: Thu Nov 30 21:54:11 2017 +0100 wdscore: Add stub DLL. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/wdscore/Makefile.in | 4 ++ dlls/wdscore/wdscore.spec | 161 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore_main.c | 43 ++++++++++++ 5 files changed, 211 insertions(+) diff --git a/configure b/configure index afe9492..e12fc0b 100755 --- a/configure +++ b/configure @@ -1500,6 +1500,7 @@ enable_virtdisk enable_vssapi enable_wbemdisp enable_wbemprox +enable_wdscore enable_webservices enable_wer enable_wevtapi @@ -18978,6 +18979,7 @@ wine_fn_config_dll wbemdisp enable_wbemdisp clean wine_fn_config_test dlls/wbemdisp/tests wbemdisp_test wine_fn_config_dll wbemprox enable_wbemprox clean wine_fn_config_test dlls/wbemprox/tests wbemprox_test +wine_fn_config_dll wdscore enable_wdscore wine_fn_config_dll webservices enable_webservices implib wine_fn_config_test dlls/webservices/tests webservices_test wine_fn_config_dll wer enable_wer implib diff --git a/configure.ac b/configure.ac index 6bae4e3..4eafce1 100644 --- a/configure.ac +++ b/configure.ac @@ -3593,6 +3593,7 @@ WINE_CONFIG_DLL(wbemdisp,,[clean]) WINE_CONFIG_TEST(dlls/wbemdisp/tests) WINE_CONFIG_DLL(wbemprox,,[clean]) WINE_CONFIG_TEST(dlls/wbemprox/tests) +WINE_CONFIG_DLL(wdscore) WINE_CONFIG_DLL(webservices,,[implib]) WINE_CONFIG_TEST(dlls/webservices/tests) WINE_CONFIG_DLL(wer,,[implib]) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in new file mode 100644 index 0000000..5bcdb2c --- /dev/null +++ b/dlls/wdscore/Makefile.in @@ -0,0 +1,4 @@ +MODULE = wdscore.dll + +C_SRCS = \ + wdscore_main.c diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec new file mode 100644 index 0000000..ab4aeb7 --- /dev/null +++ b/dlls/wdscore/wdscore.spec @@ -0,0 +1,161 @@ +@ stub ??0?$CDynamicArray(a)EPAE@@QAE(a)I@Z +@ stub ??0?$CDynamicArray(a)EPAUSkey@@@@QAE(a)I@Z +@ stub ??0?$CDynamicArray(a)EPAUSValue@@@@QAE(a)I@Z +@ stub ??0?$CDynamicArray(a)GPAG@QAE(a)I@Z +@ stub ??0?$CDynamicArray(a)PAUSEnumBinContext@@PAPAU1@@@QAE(a)I@Z +@ stub ??0?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QAE(a)I@Z +@ stub ??0?$CDynamicArray(a)_KPA_K@@QAE(a)I@Z +@ stub ??1?$CDynamicArray(a)EPAE@@QAE(a)XZ +@ stub ??1?$CDynamicArray(a)EPAUSKey@@@@QAE(a)XZ +@ stub ??1?$CDynamicArray(a)EPAUSValue@@@@QAE(a)XZ +@ stub ??1?$CDynamicArray(a)GPAG@@QAE(a)XZ +@ stub ??1?$CDynamicArray(a)PAUSEnumBinContext@@PAPAU1@@@QAE(a)XZ +@ stub ??1?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QAE(a)XZ +@ stub ??4?$CDynamicArray(a)_KPA_K@@QAE(a)XZ +@ stub ??4?$CDynamicArray(a)EPAE@@QAEAAV(a)ABV@@Z +@ stub ??4?$CDynamicArray(a)EPAUSKey@@@@@QAEAAV0(a)ABV0@@Z +@ stub ??4?$CDynamicArray(a)EPAUSValue@@@@@QAEAAV0(a)ABV0@@Z +@ stub ??4?$CDynamicArray(a)GPAG@@QAEAAV(a)ABV@@Z +@ stub ??4?$CDynamicArray(a)PAUSEnumBinContext@@PAPAU1@@@QAEAAV(a)ABV@@Z +@ stub ??4?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QAEAAV(a)ABV@@Z +@ stub ??4?$CDynamicArray(a)_KPA_K@@QAEAAV(a)ABV@@Z +@ stub ??A?$CDynamicArray(a)PAUSEnumBinContext@@PAPAU1@@@QAEAAPAUSEnumBinContext@@I(a)Z +@ stub ??A?$CDynamicArray(a)_KPA_K@QAEAA_KI(a)Z +@ stub ??B?$CDynamicArray(a)EPAUSKey@@@@@QBEPAUSKey@@XZ +@ stub ??B?$CDynamicArray(a)EPAUSValue@@@@@QBEPAUSValue@@XZ +@ stub ??B?$CDynamicArray(a)GPAG@@QBEPAGXZ +@ stub ??C?$CDynamicArray(a)EPAUSKey@@@@@QBEPAUSKey@@XZ +@ stub ??C?$CDynamicArray(a)EPAUSValue@@@@@QBEPAUSValue@@XZ +@ stub ??_F?$CDynamicArray(a)EPAE@@QAEXXZ +@ stub ??_F?$CDynamicArray(a)EPAUSKey@@@@@QAEXXZ +@ stub ??_F?$CDynamicArray(a)EPAUSValue@@@@@QAEXXZ +@ stub ??_F?$CDynamicArray(a)GPAG@@QAEXXZ +@ stub ??_F?$CDynamicArray(a)PAUSEnumBinContext@@PAPAU1@@@QAEXXZ +@ stub ??_F?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QAEXXZ +@ stub ??_F?$CDynamicArray(a)_KPA_K@@QAEXXZ +@ stub ?Add@?$CDynamicArray(a)PAUSEnumBinContext@@PAPAU1@@@QAEHAAPAUSEnumBinContext@@@Z +@ stub ?Add@?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QAEHAAUSKeeperEntry(a)CBlackboardFactory@@@Z +@ stub ?Add@?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QAEHAAUSKeeperEntry(a)CBlackboardFactory@@AAI(a)Z +@ stub ?Add@?$CDynamicArray(a)_KPA_K@@QAEHAA_K(a)Z +@ stub ?ElementAt@?$CDynamicArray(a)GPAG@@QAEAAGI(a)Z +@ stub ?ElementAt@?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QAEHAAUSKeeperEntry(a)CBlackboardFactory@@I(a)Z +@ stub ?GetBuffer@?$CDynamicArray(a)EPAE@@QAEPAEI(a)Z +@ stub ?GetBuffer@?$CDynamicArray(a)EPAUSValue@@@@QAEPAUSValue@@I(a)Z +@ stub ?GetBuffer@?$CDynamicArray(a)GPAG@@QAEPAGI(a)Z +@ stub ?GetSize@?$CDynamicArray(a)EPAE@@QBEIXZ +@ stub ?GetSize@?$CDynamicArray@@GPAG@@QBEIXZ +@ stub ?GetSize@?$CDynamicArray@@PAUSEnumBinContext@@PAPAU1@@@QBEIXZ +@ stub ?GetSize@?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QBEIXZ +@ stub ?GetSize@?$CDynamicArray(a)_KPA_K@@QBEIXZ +@ stub ?Init@?$CDynamicArray(a)EPAE@@QBEIXZ +@ stub ?Init@?$CDynamicArray(a)EPAUSKey@@@@IAEXI(a)Z +@ stub ?Init@?$CDynamicArray(a)EPAUSValue@@@@IAEXI(a)Z +@ stub ?Init@?$CDynamicArray(a)GPAG@@IAEXI(a)Z +@ stub ?Init@?$CDynamicArray(a)PAUSEnumBinContext@@PAPAU1(a)IAEXI@Z +@ stub ?Init@?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@IAEXI(a)Z +@ stub ?Init@?$CDynamicArray(a)_KPA_K@@IAEXI(a)Z +@ stub ?RemoveAll@?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QAEXXZ +@ stub ?RemoveAll@?$CDynamicArray(a)_KPA_K@@QAEXXZ +@ stub ?RemoveItemFromTail@?$CDynamicArray(a)PAUSEnumBinContext@@PAPAU1@@@QAEXXZ +@ stub ?SetSize@?$CDynamicArray(a)EPAE@@QAEHK(a)Z +@ stub ?SetSize@?$CDynamicArray(a)EPAUSKey@@@@QAEHK(a)Z +@ stub ?SetSize@?$CDynamicArray(a)EPAUSValue@@@@QAEHK(a)Z +@ stub ?SetSize@?$CDynamicArray(a)GPAG@@QAEHK(a)Z +@ stub ?SetSize@?$CDynamicArray(a)PAUSEnumBinContext@@PAPAU1@@@QAEHK(a)Z +@ stub ?SetSize@?$CDynamicArray(a)USKeepEntry@CBlackboardFactory@@PAU12@@@QAEHK(a)Z +@ stub ?SetSize@?$CDynamicArray(a)_KPA_K@@AEHK(a)Z +@ stub WdsGetPointer +#@ extern g_Kernel32 +#@ extern g_bEnableDiagnosticMode +@ stub ConstructPartialMsgIfA +@ stub ConstructPartialMsgIfW +@ stub ConstructPartialMsgVA +@ stub ConstructPartialMsgVW +@ stub CurrentIP +@ stub EndMajorTask +@ stub EndMinorTask +@ stub GetMajorTask +@ stub GetMajorTaskA +@ stub GetMinorTask +@ stub GetMinorTaskA +@ stub StartMajorTask +@ stub StartMinorTask +@ stub WdsAbortBlackboardItemEnum +@ stub WdsAddModule +@ stub WdsAddUsmtLogStack +@ stub WdsAllocCollection +@ stub WdsCollectionAddValue +@ stub WdsCollectionGetValue +@ stub WdsCopyBlackboardItems +@ stub WdsCopyBlackboardItemsEx +@ stub WdsCreateBlackboard +@ stub WdsDeleteBlackboardValue +@ stub WdsDeleteEvent +@ stub WdsDestroyBlackboard +@ stub WdsDuplicateData +@ stub WdsEnableDiagnosticMode +@ stub WdsEnableExit +@ stub WdsEnableExitEx +@ stub WdsEnumFirstBlackboardItem +@ stub WdsEnumFirstCollectionValue +@ stub WdsEnumNextBlackboardItem +@ stub WdsEnumNextCollectionValue +@ stub WdsExecuteWorkQueue +@ stub WdsExecuteWorkQueue2 +@ stub WdsExecuteWorkQueueEx +@ stub WdsExitImmediately +@ stub WdsExitImmediatelyEx +@ stub WdsFreeCollection +@ stub WdsFreeData +@ stub WdsGenericSetupLogInit +@ stub WdsGetAssertFlags +@ stub WdsGetBlackboardBinaryData +@ stub WdsGetBlackboardStringA +@ stub WdsGetBlackboardStringW +@ stub WdsGetBlackboardUintPtr +@ stub WdsGetBlackboardValue +@ stub WdsGetCurrentExecutionGroup +@ stub WdsGetSetupLog +@ stub WdsTempDir +@ stub WdsInitialize +@ stub WdsInitializeCallbackArray +@ stub WdsInitializeDataBinary +@ stub WdsInitializeDataStringA +@ stub WdsInitializeDataStringW +@ stub WdsInitializeDataUInt32 +@ stub WdsInitializeDataUInt64 +@ stub WdsIsDiagnosticModeEnabled +@ stub WdsInterateOfflineQueue +@ stub WdsInterateQueue +@ stub WdsLockBlackboardValue +@ stub WdsLockExecutionGroup +@ stub WdsLogCreate +@ stub WdsLogDestroy +@ stub WdsLogRegStockProviders +@ stub WdsLogRegisterProvider +@ stub WdsLogStructuredException +@ stub WdsLogUnRegStockProviders +@ stub WdsLogUnRegisterProvider +@ stub WdsPackCollection +@ stub WdsPublish +@ stub WdsPublishEx +@ stub WdsPublishImmediateAsynch +@ stub WdsPublishImmediateEx +@ stub WdsPublishOffline +@ stub WdsSeqAlloc +@ stub WdsSeqFree +@ stub WdsSetAssertFlags +@ stub WdsSetBlackboardValue +@ stub WdsSetNextExecutionGroup +@ stub WdsSetUILanguage +@ stub WdsSetupLogDestroy +@ stub WdsSetupLogInit +@ stub WdsSetLogMessageA +@ stub WdsSetLogMessageW +@ stub WdsSubscribeEx +@ stub WdsTerminate +@ stub WdsUnlockExecutionGroup +@ stub WdsUnpackCollection +@ stub WdsUnsubscribe +@ stub WdsUnsubscribeEx +@ stub WdsValidBlackboard diff --git a/dlls/wdscore/wdscore_main.c b/dlls/wdscore/wdscore_main.c new file mode 100644 index 0000000..f9a3154 --- /dev/null +++ b/dlls/wdscore/wdscore_main.c @@ -0,0 +1,43 @@ +/* + * Copyright 2017 Stefan Leichter + * + * 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 <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +}

1 0

Alexandre Julliard : configure: Replace AC_HEADER_MAJOR macro to handle glibc 2.25 sys/types.h breakage.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 4100c9210dba2ba280b08e474f67d139a4a6a571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4100c9210dba2ba280b08e474… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 1 12:43:19 2017 +0100 configure: Replace AC_HEADER_MAJOR macro to handle glibc 2.25 sys/types.h breakage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 16 ++++++++++++++++ configure | 36 ++---------------------------------- configure.ac | 2 +- 3 files changed, 19 insertions(+), 35 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 9364188..2c11de0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -35,6 +35,22 @@ AS_VAR_IF([ac_cv_prog_$1],[], AC_CHECK_PROG([$1],[$2],[$2],[$3],[$4])])], [AS_VAR_COPY([$1],[ac_cv_prog_$1])])]) +dnl WINE_HEADER_MAJOR() +dnl +dnl Same as AC_HEADER_MAJOR but fixed to handle the glibc 2.25 sys/types.h breakage +dnl +AC_DEFUN([WINE_HEADER_MAJOR], +[AC_CHECK_HEADER(sys/mkdev.h, + [AC_DEFINE(MAJOR_IN_MKDEV, 1, + [Define to 1 if `major', `minor', and `makedev' are + declared in <mkdev.h>.])]) +if test $ac_cv_header_sys_mkdev_h = no; then + AC_CHECK_HEADER(sys/sysmacros.h, + [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, + [Define to 1 if `major', `minor', and `makedev' + are declared in <sysmacros.h>.])]) +fi]) + dnl **** Initialize the programs used by other checks **** dnl dnl Usage: WINE_PATH_SONAME_TOOLS diff --git a/configure b/configure index e12fc0b..1da4efa 100755 --- a/configure +++ b/configure @@ -7051,35 +7051,6 @@ fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 -$as_echo_n "checking whether sys/types.h defines makedev... " >&6; } -if ${ac_cv_header_sys_types_h_makedev+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> -int -main () -{ -return makedev(0, 0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_header_sys_types_h_makedev=yes -else - ac_cv_header_sys_types_h_makedev=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_types_h_makedev" >&5 -$as_echo "$ac_cv_header_sys_types_h_makedev" >&6; } - -if test $ac_cv_header_sys_types_h_makedev = no; then ac_fn_c_check_header_mongrel "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default" if test "x$ac_cv_header_sys_mkdev_h" = xyes; then : @@ -7088,9 +7059,8 @@ $as_echo "#define MAJOR_IN_MKDEV 1" >>confdefs.h fi - - if test $ac_cv_header_sys_mkdev_h = no; then - ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" +if test $ac_cv_header_sys_mkdev_h = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default" if test "x$ac_cv_header_sys_sysmacros_h" = xyes; then : $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h @@ -7098,9 +7068,7 @@ $as_echo "#define MAJOR_IN_SYSMACROS 1" >>confdefs.h fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; } if ${ac_cv_header_stat_broken+:} false; then : diff --git a/configure.ac b/configure.ac index 4eafce1..6cba83b 100644 --- a/configure.ac +++ b/configure.ac @@ -525,7 +525,7 @@ AC_CHECK_HEADERS(\ valgrind/valgrind.h \ zlib.h ) -AC_HEADER_MAJOR() +WINE_HEADER_MAJOR() AC_HEADER_STAT() dnl **** Checks for headers that depend on other ones ****

1 0

Stefan Dösinger : wined3d: Show the device window when changing fullscreen resolutions.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 04d4584deadbd4dd7627be46f7447a6d4b087f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04d4584deadbd4dd7627be46f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 15 23:21:16 2017 +0100 wined3d: Show the device window when changing fullscreen resolutions. World of Warplanes calls SetWindowLong(window, GWL_STYLE, WS_POPUP) before calling reset, effectively hiding the window. It does not call SetWindowPos(SWP_FRAMECHANGED), so the effect isn't visible and the game displays fine after the reset. However, after the next mouse click WINPOS_WindowFromPoint skips the window because it doesn't have WS_VISIBLE and returns the desktop window. This in turn triggers a focus loss and d3d9 minimizes the game. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 118 +++++++++++++++++++++++++++++++++++++++++++-- dlls/d3d9/tests/device.c | 121 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/swapchain.c | 1 + 3 files changed, 232 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04d4584deadbd4dd7627b…

1 0

Stefan Dösinger : d3d8/tests: Test mode change messages.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 90c7e55190377f3e2643daae60f6cf6066606a8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c7e55190377f3e2643daae6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 15 23:21:17 2017 +0100 d3d8/tests: Test mode change messages. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9cebd17..94b3e2e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2435,6 +2435,7 @@ struct message enum message_window window; BOOL check_wparam; WPARAM expect_wparam; + WINDOWPOS *store_wp; }; static const struct message *expect_messages; @@ -2483,6 +2484,9 @@ static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM "Got unexpected wparam %lx for message %x, expected %lx.\n", wparam, message, expect_messages->expect_wparam); + if (expect_messages->store_wp) + *expect_messages->store_wp = *(WINDOWPOS *)lparam; + ++expect_messages; } } @@ -2549,8 +2553,9 @@ static void test_wndproc(void) D3DDISPLAYMODE d3ddm; DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; DEVMODEW devmode; - LONG change_ret; + LONG change_ret, device_style; BOOL ret; + WINDOWPOS windowpos; static const struct message create_messages[] = { @@ -2649,6 +2654,31 @@ static void test_wndproc(void) {WM_SIZE, FOCUS_WINDOW, TRUE, SIZE_MAXIMIZED}, {0, 0, FALSE, 0}, }; + struct message mode_change_messages[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + /* TODO 2: Windows sends a second WM_WINDOWPOSCHANGING(SWP_NOMOVE | SWP_NOSIZE + * | SWP_NOACTIVATE) in this situation, suggesting a difference in their ShowWindow + * implementation. This SetWindowPos call could in theory affect the Z order. Wine's + * ShowWindow does not send such a message because the window is already visible. */ + {0, 0, FALSE, 0}, + }; + struct message mode_change_messages_hidden[] = + { + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + {WM_SIZE, DEVICE_WINDOW, FALSE, 0}, + {WM_SHOWWINDOW, DEVICE_WINDOW, FALSE, 0}, + {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0, &windowpos}, + {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, + /* TODO: WM_DISPLAYCHANGE is sent to the focus window too, but the order is + * differs between Wine and Windows. */ + {0, 0, FALSE, 0}, + }; d3d8 = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d8, "Failed to create a D3D object.\n"); @@ -3010,13 +3040,63 @@ static void test_wndproc(void) ref = IDirect3DDevice8_Release(device); ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + filter_messages = NULL; + + ShowWindow(device_window, SW_RESTORE); + SetForegroundWindow(focus_window); + flush_events(); + filter_messages = focus_window; device_desc.device_window = device_window; if (!(device = create_device(d3d8, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } + filter_messages = NULL; + flush_events(); + + device_desc.width = user32_width; + device_desc.height = user32_height; + + expect_messages = mode_change_messages; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", + expect_messages->message, expect_messages->window, i); + + /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ + device_style = GetWindowLongA(device_window, GWL_STYLE); + SetWindowLongA(device_window, GWL_STYLE, device_style & ~WS_VISIBLE); + + flush_events(); + device_desc.width = d3d_width; + device_desc.height = d3d_height; + memset(&windowpos, 0, sizeof(windowpos)); + + expect_messages = mode_change_messages_hidden; + filter_messages = focus_window; + hr = reset_device(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); + filter_messages = NULL; + + flush_events(); + ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", + expect_messages->message, expect_messages->window); + + ok(windowpos.hwnd == device_window && !windowpos.hwndInsertAfter + && !windowpos.x && !windowpos.y && !windowpos.cx && !windowpos.cy + && windowpos.flags == (SWP_SHOWWINDOW | SWP_NOMOVE | SWP_NOSIZE), + "Got unexpected WINDOWPOS hwnd=%p, insertAfter=%p, x=%d, y=%d, cx=%d, cy=%d, flags=%x\n", + windowpos.hwnd, windowpos.hwndInsertAfter, windowpos.x, windowpos.y, windowpos.cx, + windowpos.cy, windowpos.flags); + + device_style = GetWindowLongA(device_window, GWL_STYLE); + ok(device_style & WS_VISIBLE, "Expected the device window to be visible.\n"); proc = SetWindowLongPtrA(focus_window, GWLP_WNDPROC, (LONG_PTR)DefWindowProcA); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx.\n", (LONG_PTR)test_proc);

1 0

Austin English : wrc: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

1 0

Austin English : winemaker: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 6a269557eef8fda27dc0611f91446530c4da73e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a269557eef8fda27dc0611f9… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:05 2017 -0600 winemaker: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 6 +++--- tools/winemaker/winemaker.fr.UTF-8.man.in | 6 +++--- tools/winemaker/winemaker.man.in | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/winemaker/winemaker.de.UTF-8.man.in b/tools/winemaker/winemaker.de.UTF-8.man.in index 388a516..8b2f144 100644 --- a/tools/winemaker/winemaker.de.UTF-8.man.in +++ b/tools/winemaker/winemaker.de.UTF-8.man.in @@ -240,7 +240,7 @@ die Anwendung enthält: Sie muss entweder im aktuellen Verzeichnis oder im \fBwinemaker\fR unterstützt noch keine Messagedateien und deren Compiler. .PP Fehler können im -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine Bugtracker .UE gemeldet werden. @@ -253,12 +253,12 @@ André Hentschel .SH VERFÜGBARKEIT .B winemaker ist Teil der Wine-Distribution, verfügbar im WineHQ, dem -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Hauptquartier der Wine-Entwicklung .UE . .SH SIEHE AUCH .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine-Dokumentation und Support .UE . diff --git a/tools/winemaker/winemaker.fr.UTF-8.man.in b/tools/winemaker/winemaker.fr.UTF-8.man.in index 75ed9fd..b0b1da1 100644 --- a/tools/winemaker/winemaker.fr.UTF-8.man.in +++ b/tools/winemaker/winemaker.fr.UTF-8.man.in @@ -266,7 +266,7 @@ ne prend pas encore en charge les fichiers de messages, ni le compilateur de messages. .PP Les bugs peuvent être signalés (en anglais) sur le -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B système de suivi des problèmes de Wine .UE . .SH AUTEURS @@ -277,12 +277,12 @@ Dimitrie O. Paun André Hentschel .SH DISPONIBILITÉ \fBwinemaker\fR fait partie de la distribution de Wine, qui est disponible sur WineHQ, le -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B quartier général du développement de Wine .UE . .SH VOIR AUSSI .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Documentation et support de Wine .UE . diff --git a/tools/winemaker/winemaker.man.in b/tools/winemaker/winemaker.man.in index 9d03e65..5572cdd 100644 --- a/tools/winemaker/winemaker.man.in +++ b/tools/winemaker/winemaker.man.in @@ -225,7 +225,7 @@ executable: it must either be in the current directory or in the \fBwinemaker\fR does not support message files and the message compiler yet. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AUTHORS @@ -238,12 +238,12 @@ André Hentschel .B winemaker is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH SEE ALSO .BR wine (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : wmc: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: 3a8f1c86ea1d848bfdf5390fd335bcc2650e193a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8f1c86ea1d848bfdf5390fd… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:06 2017 -0600 wmc: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/po.c | 2 +- tools/wmc/wmc.man.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index b604ac7..6db02c8 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -418,7 +418,7 @@ static po_file_t create_po_file(void) po_message_set_msgid( msg, "" ); po_message_set_msgstr( msg, "Project-Id-Version: Wine\n" - "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" + "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" "PO-Revision-Date: N/A\n" "Last-Translator: Automatically generated\n" diff --git a/tools/wmc/wmc.man.in b/tools/wmc/wmc.man.in index 39356d6..242604c 100644 --- a/tools/wmc/wmc.man.in +++ b/tools/wmc/wmc.man.in @@ -104,20 +104,20 @@ implemented because it is a, well, non-informative format change. It is recognized on the commandline for some form of compatibility. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B wmc is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" .BR wine (1), .BR wrc (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0

Austin English : winebuild: Move WineHQ URLs to https.
by Alexandre Julliard 01 Dec '17

01 Dec '17

Module: wine Branch: master Commit: b54cf0571419af463ae3bcdd5e59edf0702bd8cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b54cf0571419af463ae3bcdd5… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Nov 30 12:57:02 2017 -0600 winebuild: Move WineHQ URLs to https. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/winebuild.man.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/winebuild.man.in b/tools/winebuild/winebuild.man.in index d99fb57..564f312 100644 --- a/tools/winebuild/winebuild.man.in +++ b/tools/winebuild/winebuild.man.in @@ -487,14 +487,14 @@ It is not yet possible to use a PE-format dll in an import specification; only Wine dlls can be imported. .PP Bugs can be reported on the -.UR http://bugs.winehq.org +.UR https://bugs.winehq.org .B Wine bug tracker .UE . .SH AVAILABILITY .B winebuild is part of the Wine distribution, which is available through WineHQ, the -.UR http://www.winehq.org/ +.UR https://www.winehq.org/ .B Wine development headquarters .UE . .SH "SEE ALSO" @@ -502,6 +502,6 @@ the .BR winegcc (1), .BR wrc (1), .br -.UR http://www.winehq.org/help +.UR https://www.winehq.org/help .B Wine documentation and support .UE .

1 0