wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Zhiyi Zhang : dxgi: Implement dxgi_factory_GetWindowAssociation().
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 6c3c5b23c76dc8df8ea662e2de38c90ddc1607dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c3c5b23c76dc8df8ea662e2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 19 14:59:01 2019 +0430 dxgi: Implement dxgi_factory_GetWindowAssociation(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 10 ++++++++-- dlls/dxgi/tests/dxgi.c | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 52c145b..6912fc1 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -181,9 +181,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFac static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) { - FIXME("iface %p, window %p stub!\n", iface, window); + TRACE("iface %p, window %p.\n", iface, window); - return E_NOTIMPL; + if (!window) + return DXGI_ERROR_INVALID_CALL; + + /* The tests show that this always returns NULL for some unknown reason. */ + *window = NULL; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d123e40..c5e5006 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5064,7 +5064,7 @@ static void test_window_association(void) refcount = IDXGIAdapter_Release(adapter); hr = IDXGIFactory_GetWindowAssociation(factory, NULL); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); for (i = 0; i <= DXGI_MWA_VALID; ++i) { @@ -5080,11 +5080,11 @@ static void test_window_association(void) hwnd = (HWND)0xdeadbeef; hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); /* Apparently GetWindowAssociation() always returns NULL, even when * MakeWindowAssociation() and GetWindowAssociation() are both * successfully called. */ - todo_wine ok(!hwnd, "Expect null associated window.\n"); + ok(!hwnd, "Expect null associated window.\n"); } hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1);

1 0

Zhiyi Zhang : dxgi/tests: Add window association tests.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 434b6fe019ec1ccab76f40a32bde6f96b6ea274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=434b6fe019ec1ccab76f40a3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 19 14:59:00 2019 +0430 dxgi/tests: Add window association tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0..d123e40 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4985,6 +4985,185 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_window_association(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + LONG_PTR original_wndproc, wndproc; + IDXGIFactory *factory, *factory2; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + IDXGIDevice *device; + HWND hwnd, hwnd2; + BOOL fullscreen; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct + { + UINT flag; + BOOL expect_fullscreen; + BOOL broken_d3d10; + } + tests[] = + { + /* There are two reasons why VK_TAB and VK_ESC are not tested here: + * + * - Posting them to the window doesn't exit fullscreen like + * Alt+Enter does. Alt+Tab and Alt+Esc are handled somewhere else. + * E.g., not calling IDXGISwapChain::Present() will break Alt+Tab + * and Alt+Esc while Alt+Enter will still function. + * + * - Posting them hangs the posting thread. Another thread that keeps + * sending input is needed to avoid the hang. The hang is not + * because of flush_events(). */ + {0, TRUE}, + {0, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, + {0, TRUE}, + {0, FALSE} + }; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + 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 = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + original_wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + + hwnd2 = CreateWindowA("static", "dxgi_test2", 0, 0, 0, 400, 200, 0, 0, 0, 0); + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGIAdapter_Release(adapter); + + hr = IDXGIFactory_GetWindowAssociation(factory, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i <= DXGI_MWA_VALID; ++i) + { + hr = IDXGIFactory_MakeWindowAssociation(factory, NULL, i); + ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, i); + ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx for flags %#x.\n", + wndproc, original_wndproc, i); + + hwnd = (HWND)0xdeadbeef; + hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + /* Apparently GetWindowAssociation() always returns NULL, even when + * MakeWindowAssociation() and GetWindowAssociation() are both + * successfully called. */ + todo_wine ok(!hwnd, "Expect null associated window.\n"); + } + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Alt+Enter tests. */ + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx.\n", wndproc, original_wndproc); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Windows 7 testbot */, + "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not change fullscreen state.\n"); + } + else + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + /* First associate a window with the opposite flags. */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Associate the current test window. */ + hwnd = tests[i].flag ? swapchain_desc.OutputWindow : NULL; + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd, tests[i].flag); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Associating a new test window doesn't override the old window. */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Associations with a different factory don't affect the existing + * association. */ + hr = IDXGIFactory_MakeWindowAssociation(factory2, hwnd, ~tests[i].flag & DXGI_MWA_VALID); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Post synthesized Alt + VK_RETURN WM_SYSKEYDOWN. */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(tests[i].expect_fullscreen) + ok(fullscreen == tests[i].expect_fullscreen + || broken(tests[i].broken_d3d10 && fullscreen), + "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); + + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + ok(wndproc == original_wndproc, "Text %u: Got unexpected wndproc %#lx, expected %#lx.\n", + i, wndproc, original_wndproc); + } + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = IDXGIFactory_Release(factory2); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(hwnd2); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5084,6 +5263,7 @@ START_TEST(dxgi) test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); + test_window_association(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index);

1 0

Alexandre Julliard : kernelbase: Revert some incorrect differences with shlwapi.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 733cdaa6984f89bd42f04004f93392572beac381 URL: https://source.winehq.org/git/wine.git/?a=commit;h=733cdaa6984f89bd42f04004… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 19:43:11 2019 +0200 kernelbase: Revert some incorrect differences with shlwapi. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d903841..82708be 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1518,21 +1518,20 @@ LPSTR WINAPI PathCombineA(char *dst, const char *dir, const char *file) if (!dst) return NULL; - dst[0] = 0; - if (!dir && !file) - return NULL; + goto fail; if (dir && !MultiByteToWideChar(CP_ACP, 0, dir, -1, dirW, ARRAY_SIZE(dirW))) - return NULL; + goto fail; if (file && !MultiByteToWideChar(CP_ACP, 0, file, -1, fileW, ARRAY_SIZE(fileW))) - return NULL; + goto fail; if (PathCombineW(dstW, dir ? dirW : NULL, file ? fileW : NULL)) if (WideCharToMultiByte(CP_ACP, 0, dstW, -1, dst, MAX_PATH, 0, 0)) return dst; - +fail: + dst[0] = 0; return NULL; } @@ -1945,7 +1944,7 @@ void WINAPI PathRemoveExtensionA(char *path) return; path = PathFindExtensionA(path); - if (path && !*path) + if (path && *path) *path = '\0'; } @@ -1957,7 +1956,7 @@ void WINAPI PathRemoveExtensionW(WCHAR *path) return; path = PathFindExtensionW(path); - if (path && !*path) + if (path && *path) *path = '\0'; } @@ -3924,7 +3923,7 @@ static HRESULT url_guess_scheme(const WCHAR *url, WCHAR *out, DWORD *out_len) BOOL j; MultiByteToWideChar(CP_ACP, 0, - "Software\\Microsoft\\Windows\\CurrentVersion\\URL\\Prefixes", 1, reg_path, MAX_PATH); + "Software\\Microsoft\\Windows\\CurrentVersion\\URL\\Prefixes", -1, reg_path, MAX_PATH); RegOpenKeyExW(HKEY_LOCAL_MACHINE, reg_path, 0, 1, &newkey); index = 0; while (value_len = data_len = MAX_PATH,

1 0

Alexandre Julliard : ntdll: Use .so builtin if found instead of falling back to the installed PE file.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: a226e2b7a9651f2d19a953267d3d8ff98d3783e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a226e2b7a9651f2d19a95326… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 11:47:34 2019 +0200 ntdll: Use .so builtin if found instead of falling back to the installed PE file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3d747ed..43ca7c5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2304,6 +2304,7 @@ static NTSTATUS open_builtin_file( char *name, WINE_MODREF **pwm, void **module, { WARN( "%s found in WINEDLLPATH but not a builtin, ignoring\n", debugstr_a(name) ); NtUnmapViewOfSection( NtCurrentProcess(), *module ); + *module = NULL; status = STATUS_DLL_NOT_FOUND; } @@ -2318,6 +2319,8 @@ static NTSTATUS open_builtin_file( char *name, WINE_MODREF **pwm, void **module, { if ((*so_name = RtlAllocateHeap( GetProcessHeap(), 0, strlen(name) + 1 ))) strcpy( *so_name, name ); + NtUnmapViewOfSection( NtCurrentProcess(), *module ); + *module = NULL; status = STATUS_SUCCESS; } else status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; @@ -2505,7 +2508,7 @@ static NTSTATUS load_builtin_dll( LPCWSTR load_path, const UNICODE_STRING *nt_na if (status == STATUS_DLL_NOT_FOUND && *module_ptr) { /* builtin not found, load the module we got previously */ - TRACE( "loading %s from PE builtin %s\n", debugstr_w(name), debugstr_us(nt_name) ); + TRACE( "loading %s from PE file %s\n", debugstr_w(name), debugstr_us(nt_name) ); return load_native_dll( load_path, nt_name, module_ptr, &image_info, flags, pwm, &st ); } if (status) return status;

1 0

Alexandre Julliard : rtutils: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 966b57c2ed6729ac80a55e697aed84e43efad9ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=966b57c2ed6729ac80a55e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:41 2019 +0200 rtutils: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtutils/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index fb49dfc..d778852 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -1,6 +1,8 @@ MODULE = rtutils.dll IMPORTLIB = rtutils +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ tracing.c

1 0

Alexandre Julliard : rstrtmgr: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 11475ae174c373072127424a0906a1ea2e4d921c URL: https://source.winehq.org/git/wine.git/?a=commit;h=11475ae174c373072127424a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:35 2019 +0200 rstrtmgr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rstrtmgr/Makefile.in | 2 ++ dlls/rstrtmgr/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/rstrtmgr/Makefile.in b/dlls/rstrtmgr/Makefile.in index eb6e237..b2be9b4 100644 --- a/dlls/rstrtmgr/Makefile.in +++ b/dlls/rstrtmgr/Makefile.in @@ -1,4 +1,6 @@ MODULE = rstrtmgr.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index 433bd17..0aa8094 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/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 : rsaenh: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: 18fbc3a3cf880f35ab497c0e2026fe850536c6bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=18fbc3a3cf880f35ab497c0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:27 2019 +0200 rsaenh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 2 ++ dlls/rsaenh/implglue.c | 9 +++------ dlls/rsaenh/rsaenh.c | 6 +----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index 9997752..80680d6 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -2,6 +2,8 @@ MODULE = rsaenh.dll IMPORTLIB = rsaenh IMPORTS = bcrypt crypt32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ aes.c \ des.c \ diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 76c2b1f..9d90ad7 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -21,18 +21,15 @@ * 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 "wine/library.h" +#include <stdarg.h> +#include <stdio.h> #include "windef.h" +#include "winbase.h" #include "wincrypt.h" #include "implglue.h" -#include <stdio.h> - /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index c22b3dc..9119d4b 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -22,11 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/library.h" -#include "wine/debug.h" - #include <stdarg.h> #include <stdio.h> @@ -39,6 +34,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "aclapi.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt);

1 0

Alexandre Julliard : rpcrt4: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: eadb037ba115e1101645d8260bb5cb9e8e52a87f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eadb037ba115e1101645d826… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:06 2019 +0200 rpcrt4: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 2 ++ dlls/rpcrt4/cproxy.c | 3 --- dlls/rpcrt4/cpsf.c | 26 +++++++++++--------------- dlls/rpcrt4/cstub.c | 3 --- dlls/rpcrt4/ndr_marshall.c | 5 ++--- dlls/rpcrt4/ndr_stubless.c | 3 --- dlls/rpcrt4/rpc_assoc.c | 5 ++--- dlls/rpcrt4/rpc_binding.c | 21 ++++++++++----------- dlls/rpcrt4/rpc_server.c | 3 --- dlls/rpcrt4/rpc_transport.c | 29 ++++++++++++++--------------- dlls/rpcrt4/rpcrt4_main.c | 5 +---- 11 files changed, 42 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eadb037ba115e1101645…

1 0

Alexandre Julliard : riched32: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: d15d53b2e9bc8895dee9143c422f40d79a3bec41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d15d53b2e9bc8895dee9143c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:30:31 2019 +0200 riched32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched32/Makefile.in b/dlls/riched32/Makefile.in index 6ea0f4d..dde9b7c 100644 --- a/dlls/riched32/Makefile.in +++ b/dlls/riched32/Makefile.in @@ -1,6 +1,8 @@ MODULE = riched32.dll IMPORTS = riched20 user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ richedit.c

1 0

Alexandre Julliard : riched20: Build with msvcrt.
by Alexandre Julliard 19 Jun '19

19 Jun '19

Module: wine Branch: master Commit: a6d57b0addc9513f1a9384668825eadf60a51035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6d57b0addc9513f1a938466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:30:25 2019 +0200 riched20: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/Makefile.in | 2 +- dlls/riched20/editor.c | 14 +++++++------- dlls/riched20/editor.h | 3 +-- dlls/riched20/para.c | 2 +- dlls/riched20/richole.c | 6 +++--- dlls/riched20/run.c | 2 +- dlls/riched20/style.c | 2 +- dlls/riched20/txthost.c | 3 --- dlls/riched20/txtsrv.c | 3 --- dlls/riched20/writer.c | 19 ++++++++----------- 10 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 8f8aeee..76f78d3 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -1,7 +1,7 @@ MODULE = riched20.dll IMPORTLIB = riched20 IMPORTS = uuid usp10 ole32 oleaut32 imm32 user32 gdi32 -EXTRADLLFLAGS = -Wl,--image-base,0x7ac00000 +EXTRADLLFLAGS = -mno-cygwin -Wl,--image-base,0x7ac00000 C_SRCS = \ caret.c \ diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b826a2c..1b78eab 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1926,7 +1926,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurStart + nMatched ), text[nMatched], (flags & FR_MATCHCASE))) { - if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; nMatched++; @@ -1950,7 +1950,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH else wNextChar = ' '; - if (isalnumW(wNextChar)) + if (iswalnum(wNextChar)) break; } @@ -2010,7 +2010,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH while (pCurItem && ME_CharCompare( *get_text( &pCurItem->member.run, nCurEnd - nMatched - 1 ), text[nLen - nMatched - 1], (flags & FR_MATCHCASE) )) { - if ((flags & FR_WHOLEWORD) && isalnumW(wLastChar)) + if ((flags & FR_WHOLEWORD) && iswalnum(wLastChar)) break; nMatched++; @@ -2036,7 +2036,7 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH else wPrevChar = ' '; - if (isalnumW(wPrevChar)) + if (iswalnum(wPrevChar)) break; } @@ -5284,7 +5284,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) return result; } -static int wchar_comp( const void *key, const void *elem ) +static int __cdecl wchar_comp( const void *key, const void *elem ) { return *(const WCHAR *)key - *(const WCHAR *)elem; } @@ -5333,7 +5333,7 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, while (cursor.nOffset < run_len) { c = str[cursor.nOffset]; - if (!isspaceW( c ) && !isurlneutral( c )) + if (!iswspace( c ) && !isurlneutral( c )) { *candidate_min = cursor; candidateStarted = TRUE; @@ -5353,7 +5353,7 @@ static BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, while (cursor.nOffset < run_len) { c = str[cursor.nOffset]; - if (isspaceW( c )) + if (iswspace( c )) { if (quoted && c != '\r') { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 68264e7..f56d2a2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -19,7 +19,6 @@ */ #include "editstr.h" -#include "wine/unicode.h" struct _RTF_Info; @@ -105,7 +104,7 @@ static inline int ME_IsWSpace(WCHAR ch) static inline int ME_CharCompare(WCHAR a, WCHAR b, int caseSensitive) { - return caseSensitive ? (a == b) : (toupperW(a) == toupperW(b)); + return caseSensitive ? (a == b) : (towupper(a) == towupper(b)); } /* note: those two really return the first matching offset (starting from EOS)+1 diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 6eec6b5..5b6cf77 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -312,7 +312,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) { case PFN_ARABIC: default: - p += sprintfW( p, fmtW, num ); + p += swprintf( p, 20, fmtW, num ); break; case PFN_LCLETTER: diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c111920..5a102a7 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -372,7 +372,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te case FONT_WEIGHT: return left->l == right->l; case FONT_NAME: - return !strcmpW(left->str, right->str); + return !wcscmp(left->str, right->str); case FONT_POSITION: case FONT_SIZE: case FONT_SPACING: @@ -1688,7 +1688,7 @@ static HRESULT WINAPI ITextRange_fnSetText(ITextRange *me, BSTR str) } /* it's safer not to rely on stored BSTR length */ - len = strlenW(str); + len = lstrlenW(str); cursor = editor->pCursors[0]; ME_CursorFromCharOfs(editor, This->start, &editor->pCursors[0]); style = ME_GetInsertStyle(editor, 0); @@ -4537,7 +4537,7 @@ static HRESULT WINAPI ITextSelection_fnSetText(ITextSelection *me, BSTR str) return CO_E_RELEASED; editor = This->reOle->editor; - len = strlenW(str); + len = lstrlenW(str); ME_GetSelectionOfs(editor, &from, &to); ME_ReplaceSel(editor, FALSE, str, len); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 66c24f8..6772e2f 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -862,7 +862,7 @@ void ME_GetCharFormat(ME_TextEditor *editor, const ME_Cursor *from, { if (!(tmp.dwMask & CFM_FACE)) pFmt->dwMask &= ~CFM_FACE; - else if (lstrcmpW(pFmt->szFaceName, tmp.szFaceName) || + else if (wcscmp(pFmt->szFaceName, tmp.szFaceName) || pFmt->bPitchAndFamily != tmp.bPitchAndFamily) pFmt->dwMask &= ~CFM_FACE; } diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 3b9d771..1be1c15 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -352,7 +352,7 @@ static BOOL ME_IsFontEqual(const LOGFONTW *p1, const LOGFONTW *p2) { if (memcmp(p1, p2, sizeof(LOGFONTW)-sizeof(p1->lfFaceName))) return FALSE; - if (lstrcmpW(p1->lfFaceName, p2->lfFaceName)) + if (wcscmp(p1->lfFaceName, p2->lfFaceName)) return FALSE; return TRUE; } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index fc489f2..3f25625 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #define COBJMACROS #include "editor.h" diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 941b8a3..9ce1d47 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #define COBJMACROS #include "editor.h" diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 2bd97d8..94001ee 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" - #define NONAMELESSUNION #include "editor.h" @@ -123,17 +120,17 @@ ME_StreamOutMove(ME_OutStream *pStream, const char *buffer, int len) } -static BOOL +static BOOL WINAPIV ME_StreamOutPrint(ME_OutStream *pStream, const char *format, ...) { char string[STREAMOUT_BUFFER_SIZE]; /* This is going to be enough */ int len; - va_list valist; + __ms_va_list valist; - va_start(valist, format); + __ms_va_start(valist, format); len = vsnprintf(string, sizeof(string), format, valist); - va_end(valist); - + __ms_va_end(valist); + return ME_StreamOutMove(pStream, string, len); } @@ -245,7 +242,7 @@ static void add_font_to_fonttbl( ME_OutStream *stream, ME_Style *style ) { for (i = 0; i < stream->nFontTblLen; i++) if (table[i].bCharSet == charset - && (table[i].szFaceName == face || !lstrcmpW(table[i].szFaceName, face))) + && (table[i].szFaceName == face || !wcscmp(table[i].szFaceName, face))) break; if (i == stream->nFontTblLen && i < STREAMOUT_FONTTBL_SIZE) @@ -270,7 +267,7 @@ static BOOL find_font_in_fonttbl( ME_OutStream *stream, CHARFORMAT2W *fmt, unsig for (i = 0; i < stream->nFontTblLen; i++) { if (facename == stream->fonttbl[i].szFaceName - || !lstrcmpW(facename, stream->fonttbl[i].szFaceName)) + || !wcscmp(facename, stream->fonttbl[i].szFaceName)) if (!(fmt->dwMask & CFM_CHARSET) || fmt->bCharSet == stream->fonttbl[i].bCharSet) { @@ -841,7 +838,7 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) } } - if (strcmpW(old_fmt->szFaceName, fmt->szFaceName) || + if (wcscmp(old_fmt->szFaceName, fmt->szFaceName) || old_fmt->bCharSet != fmt->bCharSet) { if (find_font_in_fonttbl( pStream, fmt, &i ))

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2019