June 2019 - Wine-commits - list.winehq.org

Zebediah Figura : wined3d: Use a backup device context for swapchains created on the desktop window.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 0922237c8308f583b9dd27bed386223be87c7057 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0922237c8308f583b9dd27be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 18:56:28 2019 -0500 wined3d: Use a backup device context for swapchains created on the desktop window. This patch was written by "naur". Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18490 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/d3d8/tests/visual.c | 7 +------ dlls/d3d9/tests/visual.c | 7 +------ dlls/wined3d/context.c | 8 +++++++- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 81442e9..a395467 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18028,7 +18028,7 @@ static void test_desktop_window(void) swapchain_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - todo_wine ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, + ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, "Failed to create swapchain, hr %#x.\n", hr); IDXGIFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index b8a90ec..1d7a7c7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29338,7 +29338,7 @@ static void test_desktop_window(void) swapchain_desc.Flags = 0; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - todo_wine ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, + ok(hr == S_OK || broken(hr == DXGI_ERROR_INVALID_CALL) /* Not available on all Windows versions. */, "Failed to create swapchain, hr %#x.\n", hr); IDXGIFactory_Release(factory); if (FAILED(hr)) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a35b180..fc7c3cc 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11024,12 +11024,7 @@ static void test_desktop_window(void) DestroyWindow(window); device = create_device(d3d, GetDesktopWindow(), GetDesktopWindow(), TRUE); - todo_wine ok(!!device, "Failed to create a D3D device.\n"); - if (!device) - { - IDirect3D8_Release(d3d); - return; - } + ok(!!device, "Failed to create a D3D device.\n"); hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index bed74f1..5ba07a3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -25813,12 +25813,7 @@ static void test_desktop_window(void) DestroyWindow(window); device = create_device(d3d, GetDesktopWindow(), GetDesktopWindow(), TRUE); - todo_wine ok(!!device, "Failed to create a D3D device.\n"); - if (!device) - { - IDirect3D9_Release(d3d); - return; - } + ok(!!device, "Failed to create a D3D device.\n"); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5b293b4..619b5ff 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1961,10 +1961,16 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->tid = GetCurrentThreadId(); context_gl->window = context->swapchain->win_handle; - if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) + if (context_gl->window == GetDesktopWindow()) { + TRACE("Swapchain is created on the desktop window, trying backup device context.\n"); + context_gl->dc = NULL; + } + else if (!(context_gl->dc = GetDCEx(context_gl->window, 0, DCX_USESTYLE | DCX_CACHE))) WARN("Failed to retrieve device context, trying swapchain backup.\n"); + if (!context_gl->dc) + { if (!(context_gl->dc = swapchain_get_backup_dc(context->swapchain))) { ERR("Failed to retrieve a device context.\n");

1 0

Alexandre Julliard : Release 4.11.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 07afb240a87d097c83ca5263c61145a170894a22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07afb240a87d097c83ca5263… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 23:42:46 2019 +0200 Release 4.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 1013 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 5 files changed, 460 insertions(+), 576 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07afb240a87d097c83ca…

1 0

Tag wine-4.11 : Alexandre Julliard : Release 4.11
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: refs/tags/wine-4.11 Tag: 0f062598c79fde0131924ac2d08d813d660e6e20 URL: https://source.winehq.org/git/wine.git/?a=tag;h=0f062598c79fde0131924ac2d08… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 23:42:46 2019 +0200 Release 4.11

1 0

Alexandre Julliard : snmpapi: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 48a4635390fc5e0e2ddc2df59c7ce6ce5426a0fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=48a4635390fc5e0e2ddc2df5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:25 2019 +0200 snmpapi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/snmpapi/Makefile.in | 2 ++ dlls/snmpapi/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/snmpapi/Makefile.in b/dlls/snmpapi/Makefile.in index cf4498c..90c3901 100644 --- a/dlls/snmpapi/Makefile.in +++ b/dlls/snmpapi/Makefile.in @@ -1,5 +1,7 @@ MODULE = snmpapi.dll IMPORTLIB = snmpapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/snmpapi/main.c b/dlls/snmpapi/main.c index 2101ec8..3c90ca2 100644 --- a/dlls/snmpapi/main.c +++ b/dlls/snmpapi/main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdio.h> #include <stdarg.h>

1 0

Alexandre Julliard : sound.drv: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: af11345710e3ec33c9e1ab296328b92ec06d4f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af11345710e3ec33c9e1ab29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:32 2019 +0200 sound.drv: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sound.drv16/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/sound.drv16/Makefile.in b/dlls/sound.drv16/Makefile.in index 8e9b04b..1a31640 100644 --- a/dlls/sound.drv16/Makefile.in +++ b/dlls/sound.drv16/Makefile.in @@ -1,4 +1,4 @@ MODULE = sound.drv16 -EXTRADLLFLAGS = -m16 -Wb,--main-module,winmm.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,winmm.dll C_SRCS = sound.c

1 0

Alexandre Julliard : spoolss: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: be0e5491d472325ca2023f0497b3abc8624592c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0e5491d472325ca2023f04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:39 2019 +0200 spoolss: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/spoolss/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in index b6bc40e..a177944 100644 --- a/dlls/spoolss/Makefile.in +++ b/dlls/spoolss/Makefile.in @@ -2,6 +2,8 @@ MODULE = spoolss.dll IMPORTLIB = spoolss IMPORTS = winspool +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ router.c \ spoolss_main.c

1 0

Alexandre Julliard : srclient: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 6128623e7ac3f8b5165d4aeb4b3cdf9738e4d267 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6128623e7ac3f8b5165d4aeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:46 2019 +0200 srclient: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/srclient/Makefile.in | 2 ++ dlls/srclient/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/srclient/Makefile.in b/dlls/srclient/Makefile.in index 5c11e75..48aab4d 100644 --- a/dlls/srclient/Makefile.in +++ b/dlls/srclient/Makefile.in @@ -1,4 +1,6 @@ MODULE = srclient.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/srclient/main.c b/dlls/srclient/main.c index 6c2e7b4..98832a9 100644 --- a/dlls/srclient/main.c +++ b/dlls/srclient/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : sspicli: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: bb12daf2b09c668b79eabee803746c7609379791 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb12daf2b09c668b79eabee8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:48:56 2019 +0200 sspicli: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sspicli/Makefile.in | 2 ++ dlls/sspicli/main.c | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/sspicli/Makefile.in b/dlls/sspicli/Makefile.in index ceef844..7e0493f 100644 --- a/dlls/sspicli/Makefile.in +++ b/dlls/sspicli/Makefile.in @@ -1,4 +1,6 @@ MODULE = sspicli.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/sspicli/main.c b/dlls/sspicli/main.c index dfcc1cc..186a6ac 100644 --- a/dlls/sspicli/main.c +++ b/dlls/sspicli/main.c @@ -25,7 +25,6 @@ #include "wincred.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(sspicli); @@ -45,9 +44,9 @@ SECURITY_STATUS SEC_ENTRY SspiEncodeStringsAsAuthIdentity( if (!username && !domainname && !creds) return SEC_E_INVALID_TOKEN; - if (username) len_username = strlenW( username ); - if (domainname) len_domainname = strlenW( domainname ); - if (creds) len_password = strlenW( creds ); + if (username) len_username = lstrlenW( username ); + if (domainname) len_domainname = lstrlenW( domainname ); + if (creds) len_password = lstrlenW( creds ); size = sizeof(*id); if (username) size += (len_username + 1) * sizeof(WCHAR); @@ -101,8 +100,8 @@ static inline WCHAR *strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - if ((dst = HeapAlloc( GetProcessHeap(), 0, (strlenW( src ) + 1) * sizeof(WCHAR) ))) - strcpyW( dst, src ); + if ((dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) + lstrcpyW( dst, src ); return dst; }

1 0

Alexandre Julliard : sti: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 007997c4d4bf85ee6d020620fdece35432f075fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=007997c4d4bf85ee6d020620… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:49:15 2019 +0200 sti: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sti/Makefile.in | 2 ++ dlls/sti/sti.c | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in index be3ac51..884fdbd 100644 --- a/dlls/sti/Makefile.in +++ b/dlls/sti/Makefile.in @@ -2,6 +2,8 @@ MODULE = sti.dll IMPORTLIB = sti IMPORTS = uuid ole32 oleaut32 rpcrt4 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ sti.c \ sti_main.c diff --git a/dlls/sti/sti.c b/dlls/sti/sti.c index 41c94f5..962371f 100644 --- a/dlls/sti/sti.c +++ b/dlls/sti/sti.c @@ -29,7 +29,6 @@ #include "sti.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(sti); @@ -149,11 +148,11 @@ static HRESULT WINAPI stillimagew_RegisterLaunchApplication(IStillImageW *iface, ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, registeredAppsLaunchPath, &registeredAppsKey); if (ret == ERROR_SUCCESS) { - WCHAR *value = HeapAlloc(GetProcessHeap(), 0, - (lstrlenW(pwszCommandLine) + 1 + lstrlenW(commandLineSuffix) + 1) * sizeof(WCHAR)); + size_t len = lstrlenW(pwszCommandLine) + 1 + lstrlenW(commandLineSuffix) + 1; + WCHAR *value = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); if (value) { - sprintfW(value, format, pwszCommandLine, commandLineSuffix); + swprintf(value, len, format, pwszCommandLine, commandLineSuffix); ret = RegSetValueExW(registeredAppsKey, pwszAppName, 0, REG_SZ, (BYTE*)value, (lstrlenW(value)+1)*sizeof(WCHAR)); if (ret != ERROR_SUCCESS)

1 0

Alexandre Julliard : storage: Build with msvcrt.
by Alexandre Julliard 21 Jun '19

21 Jun '19

Module: wine Branch: master Commit: 67bf5c7131487a1b686004e9bc8b70f78af7e160 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67bf5c7131487a1b686004e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:49:30 2019 +0200 storage: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/Makefile.in | 2 +- dlls/storage.dll16/storage.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/storage.dll16/Makefile.in b/dlls/storage.dll16/Makefile.in index f390aca..b7a2045 100644 --- a/dlls/storage.dll16/Makefile.in +++ b/dlls/storage.dll16/Makefile.in @@ -1,5 +1,5 @@ MODULE = storage.dll16 IMPORTS = uuid ole32 -EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll +EXTRADLLFLAGS = -m16 -mno-cygwin -Wb,--main-module,ole32.dll C_SRCS = storage.c diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 23e88b4..1bcc720 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -21,16 +21,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <assert.h> #include <time.h> #include <stdarg.h> #include <string.h> #include <sys/types.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif #define NONAMELESSUNION @@ -40,7 +35,6 @@ #include "winerror.h" #include "wine/winbase16.h" #include "wownt32.h" -#include "wine/unicode.h" #include "objbase.h" #include "wine/debug.h" @@ -687,7 +681,7 @@ STORAGE_look_for_named_pps(stream_access16*str,int n,LPOLESTR name) { if (1!=STORAGE_get_pps_entry(str,n,&stde)) return -1; - if (!lstrcmpW(name,stde.pps_rawname)) + if (!wcscmp(name,stde.pps_rawname)) return n; if (stde.pps_prev != -1) { ret=STORAGE_look_for_named_pps(str,stde.pps_prev,name); @@ -778,7 +772,7 @@ STORAGE_init_storage(stream_access16 *str) { stde = (struct storage_pps_entry*)block; MultiByteToWideChar(CP_ACP, 0, "RootEntry", -1, stde->pps_rawname, ARRAY_SIZE(stde->pps_rawname)); - stde->pps_sizeofname = (strlenW(stde->pps_rawname)+1) * sizeof(WCHAR); + stde->pps_sizeofname = (lstrlenW(stde->pps_rawname)+1) * sizeof(WCHAR); stde->pps_type = 5; stde->pps_dir = -1; stde->pps_next = -1; @@ -1752,7 +1746,7 @@ HRESULT CDECL IStorage16_fnCreateStorage(IStorage16 *iface, LPCOLESTR16 pwcsName assert(nPPSEntries == 1); MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, lpstg->stde.pps_rawname, ARRAY_SIZE(lpstg->stde.pps_rawname)); - lpstg->stde.pps_sizeofname = (strlenW(lpstg->stde.pps_rawname)+1)*sizeof(WCHAR); + lpstg->stde.pps_sizeofname = (lstrlenW(lpstg->stde.pps_rawname)+1)*sizeof(WCHAR); lpstg->stde.pps_next = -1; lpstg->stde.pps_prev = -1; lpstg->stde.pps_dir = -1; @@ -1815,7 +1809,7 @@ HRESULT CDECL IStorage16_fnCreateStream(IStorage16 *iface, LPCOLESTR16 pwcsName, assert(nPPSEntries == 1); MultiByteToWideChar(CP_ACP, 0, pwcsName, -1, lpstr->stde.pps_rawname, ARRAY_SIZE(lpstr->stde.pps_rawname)); - lpstr->stde.pps_sizeofname = (strlenW(lpstr->stde.pps_rawname)+1) * sizeof(WCHAR); + lpstr->stde.pps_sizeofname = (lstrlenW(lpstr->stde.pps_rawname)+1) * sizeof(WCHAR); lpstr->stde.pps_next = -1; lpstr->stde.pps_prev = -1; lpstr->stde.pps_dir = -1;

1 0