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

Alexandre Julliard : strmdll: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 36f087b39536c647fe1c598cd1b022264550f7bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=36f087b39536c647fe1c598c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:49:49 2019 +0200 strmdll: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmdll/Makefile.in | 2 ++ dlls/strmdll/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/strmdll/Makefile.in b/dlls/strmdll/Makefile.in index 429cd12..2eded8b 100644 --- a/dlls/strmdll/Makefile.in +++ b/dlls/strmdll/Makefile.in @@ -1,4 +1,6 @@ MODULE = strmdll.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/strmdll/main.c b/dlls/strmdll/main.c index 25bb5e2..1278fc2 100644 --- a/dlls/strmdll/main.c +++ b/dlls/strmdll/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 : storage: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

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

Alexandre Julliard : sti: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

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 : snmpapi: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

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

Zebediah Figura : d3d10core/tests: Test creating and rendering to a swapchain on the desktop window.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 3ff08662c99ac7ef99cd0cb47ebdccf287363831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ff08662c99ac7ef99cd0cb4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 20 18:56:25 2019 -0500 d3d10core/tests: Test creating and rendering to a swapchain on the desktop window. 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 | 76 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index ecf1f38..81442e9 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -17981,6 +17981,81 @@ static void test_render_a8(void) release_test_context(&test_context); } +static void test_desktop_window(void) +{ + ID3D10RenderTargetView *backbuffer_rtv; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + ID3D10Texture2D *backbuffer; + IDXGISwapChain *swapchain; + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D10Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get DXGI device, hr %#x.\n", hr); + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = GetDesktopWindow(); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + 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. */, + "Failed to create swapchain, hr %#x.\n", hr); + IDXGIFactory_Release(factory); + if (FAILED(hr)) + { + ID3D10Device_Release(device); + return; + } + + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)backbuffer, NULL, &backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, backbuffer_rtv, red); + check_texture_color(backbuffer, 0xff0000ff, 1); + + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID3D10RenderTargetView_Release(backbuffer_rtv); + ID3D10Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -18098,6 +18173,7 @@ START_TEST(d3d10core) queue_test(test_depth_clip); queue_test(test_staging_buffers); queue_test(test_render_a8); + queue_test(test_desktop_window); run_queued_tests();

1 0

Alexandre Julliard : version: Move implementation into kernelbase.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: ae89bc8a9b016a3e5e554cf94a37b2ec8c8bb206 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae89bc8a9b016a3e5e554cf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 14:57:58 2019 +0200 version: Move implementation into kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 3 +- dlls/kernelbase/kernelbase.spec | 24 +- dlls/kernelbase/version.c | 1340 ++++++++++++++++++++++++++++++++++++++ dlls/version/Makefile.in | 1 + dlls/version/version.c | 1347 --------------------------------------- dlls/version/version.spec | 24 +- 6 files changed, 1367 insertions(+), 1372 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae89bc8a9b016a3e5e55…

1 0

Alexandre Julliard : sxs: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

Module: wine Branch: master Commit: 9ce1a6e3fffac70b77b11715efb351efeb0dd6d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ce1a6e3fffac70b77b11715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 21 08:50:39 2019 +0200 sxs: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/Makefile.in | 2 + dlls/sxs/cache.c | 113 ++++++++++++++++++++++++------------------------- dlls/sxs/name.c | 31 +++++++------- dlls/sxs/sxs_private.h | 4 +- 4 files changed, 74 insertions(+), 76 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9ce1a6e3fffac70b77b1…

1 0

Alexandre Julliard : srclient: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

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 : spoolss: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

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 : sound.drv: Build with msvcrt.
by Alexandre Julliard June 21, 2019

June 21, 2019

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