wine-commits September 2018

wine-commits@winehq.org

2 participants
670 discussions

Zebediah Figura : rpcrt4/tests: Add tests for delegated proxy methods.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: b82382f5fee8b9ca619c500f090797035f223b09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b82382f5fee8b9ca619c500f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 13 11:01:12 2018 -0500 rpcrt4/tests: Add tests for delegated proxy methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/Makefile.in | 5 +- dlls/rpcrt4/tests/cstub.c | 245 ++++++++++++++++++++++++++++++++++++++++-- dlls/rpcrt4/tests/cstub.idl | 37 +++++++ 3 files changed, 280 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index 5b80bc3..d8353b6 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -1,6 +1,7 @@ TESTDLL = rpcrt4.dll IMPORTS = oleaut32 ole32 rpcrt4 secur32 advapi32 EXTRAIDLFLAGS = --prefix-server=s_ +EXTRADEFS = -DPROXY_DELEGATION C_SRCS = \ cstub.c \ @@ -10,4 +11,6 @@ C_SRCS = \ rpc_async.c \ server.c -IDL_SRCS = server.idl +IDL_SRCS = \ + cstub.idl \ + server.idl diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 7bed308..22d4569 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -19,11 +19,10 @@ */ #include <stdarg.h> +#include <stdio.h> -#define PROXY_DELEGATION #define COBJMACROS -#include "wine/test.h" #include <windef.h> #include <winbase.h> #include <winnt.h> @@ -35,10 +34,22 @@ #include "rpcdce.h" #include "rpcproxy.h" +#include "wine/heap.h" +#include "wine/test.h" + +#include "cstub.h" + static CStdPSFactoryBuffer PSFactoryBuffer; -CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer) -CSTDSTUBBUFFER2RELEASE(&PSFactoryBuffer) +static ULONG WINAPI test_CStdStubBuffer_Release(IRpcStubBuffer *This) +{ + return NdrCStdStubBuffer_Release(This, (IPSFactoryBuffer *)&PSFactoryBuffer); +} + +static ULONG WINAPI test_CStdStubBuffer2_Release(IRpcStubBuffer *This) +{ + return NdrCStdStubBuffer2_Release(This, (IPSFactoryBuffer *)&PSFactoryBuffer); +} static GUID IID_if1 = {0x12345678, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; static GUID IID_if2 = {0x12345679, 1234, 5678, {12,34,56,78,90,0xab,0xcd,0xef}}; @@ -186,7 +197,18 @@ static CInterfaceStubVtbl if1_stub_vtbl = 5, &if1_table[-3] }, - { CStdStubBuffer_METHODS } + { + CStdStubBuffer_QueryInterface, + CStdStubBuffer_AddRef, + test_CStdStubBuffer_Release, + CStdStubBuffer_Connect, + CStdStubBuffer_Disconnect, + CStdStubBuffer_Invoke, + CStdStubBuffer_IsIIDSupported, + CStdStubBuffer_CountRefs, + CStdStubBuffer_DebugServerQueryInterface, + CStdStubBuffer_DebugServerRelease + } }; static CINTERFACE_PROXY_VTABLE(13) if2_proxy_vtbl = @@ -257,7 +279,7 @@ static CInterfaceStubVtbl if2_stub_vtbl = 13, &if2_table[-3] }, - { CStdStubBuffer_DELEGATING_METHODS } + { 0, 0, test_CStdStubBuffer2_Release, 0, 0, 0, 0, 0, 0, 0 } }; static CINTERFACE_PROXY_VTABLE(5) if3_proxy_vtbl = @@ -1194,9 +1216,219 @@ static void test_NdrDllRegisterProxy( void ) } } +static HANDLE create_process(const char *arg) +{ + PROCESS_INFORMATION pi; + STARTUPINFOA si = {0}; + char cmdline[200]; + char **argv; + BOOL ret; + + si.cb = sizeof(si); + winetest_get_mainargs(&argv); + sprintf(cmdline, "\"%s\" %s %s", argv[0], argv[1], arg); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed: %u\n", GetLastError()); + CloseHandle(pi.hThread); + return pi.hProcess; +} + +DEFINE_GUID(CLSID_test1,0xdeadf00d,0x0001,0x44c7,0x85,0x0f,0x2a,0x0f,0x46,0x5c,0x0c,0x6c); + +static HRESULT WINAPI test1_QueryInterface(ITest1 *iface, REFIID iid, void **out) +{ + if (winetest_debug > 1) trace("%s\n", wine_dbgstr_guid(iid)); + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_ITest1)) + { + *out = iface; + return S_OK; + } + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test1_AddRef(ITest1 *iface) +{ + return 2; +} + +static ULONG WINAPI test1_Release(ITest1 *iface) +{ + return 1; +} + +static HRESULT WINAPI test1_GetClassID(ITest1 *iface, CLSID *clsid) +{ + *clsid = CLSID_test1; + return S_OK; +} + +static int WINAPI test1_square(ITest1 *iface, int x) +{ + return x * x; +} + +static const ITest1Vtbl test1_vtbl = +{ + test1_QueryInterface, + test1_AddRef, + test1_Release, + test1_GetClassID, + test1_square, +}; + +static HRESULT WINAPI test_cf_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IClassFactory)) + { + *out = iface; + return S_OK; + } + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_cf_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI test_cf_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI test_cf_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **out) +{ + ITest1 *obj = heap_alloc(sizeof(*obj)); + + obj->lpVtbl = &test1_vtbl; + + return ITest1_QueryInterface(obj, iid, out); +} + +static HRESULT WINAPI test_cf_LockServer(IClassFactory *iface, BOOL lock) +{ + return S_OK; +} + +static const IClassFactoryVtbl test_cf_vtbl = +{ + test_cf_QueryInterface, + test_cf_AddRef, + test_cf_Release, + test_cf_CreateInstance, + test_cf_LockServer, +}; + +static IClassFactory test_cf = { &test_cf_vtbl }; + +extern CStdPSFactoryBuffer gPFactory; +extern const ProxyFileInfo * aProxyFileList; + +static void local_server_proc(void) +{ + DWORD obj_cookie, ps_cookie, index; + HANDLE stop_event, ready_event; + IPSFactoryBuffer *ps; + HRESULT hr; + + stop_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "wine_cstub_test_server_stop"); + ready_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "wine_cstub_test_server_ready"); + + CoInitialize(NULL); + + hr = CoRegisterClassObject(&CLSID_test1, (IUnknown *)&test_cf, + CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE, &obj_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + hr = NdrDllGetClassObject(&CLSID_test_ps, &IID_IPSFactoryBuffer, (void **)&ps, + &aProxyFileList, &CLSID_test_ps, &gPFactory); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRegisterClassObject(&CLSID_test_ps, (IUnknown *)ps, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &ps_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRegisterPSClsid(&IID_ITest1, &CLSID_test_ps); + ok(hr == S_OK, "got %#x\n", hr); + + SetEvent(ready_event); + + hr = CoWaitForMultipleHandles(0, 1000, 1, &stop_event, &index); + ok(hr == S_OK, "got %#x\n", hr); + ok(!index, "got %u\n", index); + + hr = CoRevokeClassObject(ps_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRevokeClassObject(obj_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + CoUninitialize(); + ExitProcess(0); +} + +static void test_delegated_methods(void) +{ + HANDLE process, stop_event, ready_event; + IPSFactoryBuffer *ps; + ITest1 *test_obj; + DWORD ps_cookie; + CLSID clsid; + HRESULT hr; + int ret; + + stop_event = CreateEventA(NULL, TRUE, FALSE, "wine_cstub_test_server_stop"); + ready_event = CreateEventA(NULL, TRUE, FALSE, "wine_cstub_test_server_ready"); + + process = create_process("server"); + ok(!WaitForSingleObject(ready_event, 1000), "wait failed\n"); + + hr = NdrDllGetClassObject(&CLSID_test_ps, &IID_IPSFactoryBuffer, (void **)&ps, + &aProxyFileList, &CLSID_test_ps, &gPFactory); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRegisterClassObject(&CLSID_test_ps, (IUnknown *)ps, + CLSCTX_INPROC_SERVER, REGCLS_MULTIPLEUSE, &ps_cookie); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoRegisterPSClsid(&IID_ITest1, &CLSID_test_ps); + ok(hr == S_OK, "got %#x\n", hr); + + hr = CoCreateInstance(&CLSID_test1, NULL, CLSCTX_LOCAL_SERVER, &IID_ITest1, (void **)&test_obj); + ok(hr == S_OK, "got %#x\n", hr); + + ret = ITest1_square(test_obj, 3); + ok(ret == 9, "got %d\n", ret); + + hr = ITest1_GetClassID(test_obj, &clsid); +todo_wine { + ok(hr == S_OK, "got %#x\n", hr); + ok(IsEqualGUID(&clsid, &CLSID_test1), "got %s\n", wine_dbgstr_guid(&clsid)); +} + + ITest1_Release(test_obj); + + SetEvent(stop_event); + ok(!WaitForSingleObject(process, 1000), "wait failed\n"); + + hr = CoRevokeClassObject(ps_cookie); + ok(hr == S_OK, "got %#x\n", hr); +} + START_TEST( cstub ) { IPSFactoryBuffer *ppsf; + int argc; + char **argv; + + argc = winetest_get_mainargs( &argv ); + if (argc > 2 && !strcmp(argv[2], "server")) + { + local_server_proc(); + return; + } OleInitialize(NULL); @@ -1209,6 +1441,7 @@ START_TEST( cstub ) test_Release(ppsf); test_delegating_Invoke(ppsf); test_NdrDllRegisterProxy(); + test_delegated_methods(); OleUninitialize(); } diff --git a/dlls/rpcrt4/tests/cstub.idl b/dlls/rpcrt4/tests/cstub.idl new file mode 100644 index 0000000..461bd87 --- /dev/null +++ b/dlls/rpcrt4/tests/cstub.idl @@ -0,0 +1,37 @@ +/* + * IDL to test COM object proxy/stub functions + * + * Copyright 2018 Zebediah Figura + * + * 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 + */ + +#pragma makedep proxy + +import "oleidl.idl"; + +[ + uuid(deadbeef-0001-44c7-850f-2a0f465c0c6c), + object +] +interface ITest1 : IPersist +{ + int square(int x); +} + +[ + uuid(deadbeef-ffff-44c7-850f-2a0f465c0c6c) +] +coclass test_ps { interface IPSFactoryBuffer; }

1 0

Ricky Zhou : winemac: Allow Command to be mapped to Ctrl.
by Alexandre Julliard 17 Sep '18

17 Sep '18

Module: wine Branch: master Commit: f621baa00f649a41d64908980661b1bdaf65ad9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f621baa00f649a41d6490898… Author: Ricky Zhou <ricky(a)rzhou.org> Date: Wed Sep 12 02:35:30 2018 -0700 winemac: Allow Command to be mapped to Ctrl. Adds the following registry options, which configure the Mac driver to map Command to Ctrl: HKEY_CURRENT_USER\Software\Wine\Mac Driver\LeftCommandIsCtrl HKEY_CURRENT_USER\Software\Wine\Mac Driver\RightCommandIsCtrl Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35351 Signed-off-by: Ricky Zhou <ricky(a)rzhou.org> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 37 +++++++++++++++++++++---------------- dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winemac.drv/macdrv_main.c | 12 ++++++++++++ 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 4143d14..e405cda 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -140,22 +140,27 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) *modifiers &= ~NX_ALTERNATEMASK; } -static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modifiers) +static inline NSUInteger adjusted_modifiers_for_settings(NSUInteger modifiers) { fix_device_modifiers_by_generic(&modifiers); - if (left_option_is_alt && (modifiers & NX_DEVICELALTKEYMASK)) - { - modifiers |= NX_DEVICELCMDKEYMASK; - modifiers &= ~NX_DEVICELALTKEYMASK; - } - if (right_option_is_alt && (modifiers & NX_DEVICERALTKEYMASK)) - { - modifiers |= NX_DEVICERCMDKEYMASK; - modifiers &= ~NX_DEVICERALTKEYMASK; - } - fix_generic_modifiers_by_device(&modifiers); - - return modifiers; + NSUInteger new_modifiers = modifiers & ~(NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK | + NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK); + + // The MACDRV keyboard driver translates Command keys to Alt. If the + // Option key (NX_DEVICE[LR]ALTKEYMASK) should behave like Alt in + // Windows, rewrite it to Command (NX_DEVICE[LR]CMDKEYMASK). + if (modifiers & NX_DEVICELALTKEYMASK) + new_modifiers |= left_option_is_alt ? NX_DEVICELCMDKEYMASK : NX_DEVICELALTKEYMASK; + if (modifiers & NX_DEVICERALTKEYMASK) + new_modifiers |= right_option_is_alt ? NX_DEVICERCMDKEYMASK : NX_DEVICERALTKEYMASK; + + if (modifiers & NX_DEVICELCMDKEYMASK) + new_modifiers |= left_command_is_ctrl ? NX_DEVICELCTLKEYMASK : NX_DEVICELCMDKEYMASK; + if (modifiers & NX_DEVICERCMDKEYMASK) + new_modifiers |= right_command_is_ctrl ? NX_DEVICERCTLKEYMASK : NX_DEVICERCMDKEYMASK; + + fix_generic_modifiers_by_device(&new_modifiers); + return new_modifiers; } @@ -2059,7 +2064,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi [self flagsChanged:theEvent]; [self postKey:[theEvent keyCode] pressed:[theEvent type] == NSKeyDown - modifiers:adjusted_modifiers_for_option_behavior([theEvent modifierFlags]) + modifiers:adjusted_modifiers_for_settings([theEvent modifierFlags]) event:theEvent]; } @@ -2679,7 +2684,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi { NX_DEVICERCMDKEYMASK, kVK_RightCommand }, }; - NSUInteger modifierFlags = adjusted_modifiers_for_option_behavior([theEvent modifierFlags]); + NSUInteger modifierFlags = adjusted_modifiers_for_settings([theEvent modifierFlags]); NSUInteger changed; int i, last_changed; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 6bad790..011b1ff 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -159,6 +159,8 @@ extern int topmost_float_inactive DECLSPEC_HIDDEN; extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN; extern int left_option_is_alt DECLSPEC_HIDDEN; extern int right_option_is_alt DECLSPEC_HIDDEN; +extern int left_command_is_ctrl DECLSPEC_HIDDEN; +extern int right_command_is_ctrl DECLSPEC_HIDDEN; extern int allow_immovable_windows DECLSPEC_HIDDEN; extern int cursor_clipping_locks_windows DECLSPEC_HIDDEN; extern int use_precise_scrolling DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 7abeea9..544d448 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -52,6 +52,8 @@ BOOL allow_vsync = TRUE; BOOL allow_set_gamma = TRUE; int left_option_is_alt = 0; int right_option_is_alt = 0; +int left_command_is_ctrl = 0; +int right_command_is_ctrl = 0; BOOL allow_software_rendering = FALSE; BOOL disable_window_decorations = FALSE; int allow_immovable_windows = TRUE; @@ -172,6 +174,16 @@ static void setup_options(void) if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer))) right_option_is_alt = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "LeftCommandIsCtrl", buffer, sizeof(buffer))) + left_command_is_ctrl = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "RightCommandIsCtrl", buffer, sizeof(buffer))) + right_command_is_ctrl = IS_OPTION_TRUE(buffer[0]); + + if (left_command_is_ctrl && right_command_is_ctrl && !left_option_is_alt && !right_option_is_alt) + WARN("Both Command keys have been mapped to Control. There is no way to " + "send an Alt key to Windows applications. Consider enabling " + "LeftOptionIsAlt or RightOptionIsAlt.\n"); + if (!get_config_key(hkey, appkey, "AllowSoftwareRendering", buffer, sizeof(buffer))) allow_software_rendering = IS_OPTION_TRUE(buffer[0]);

1 0

Alexandre Julliard : Wine release 3.16
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: website Branch: master Commit: 0ad107e8fc844e7eadb8abf8eab40f85a51a1434 URL: https://source.winehq.org/git/website.git/?a=commit;h=0ad107e8fc844e7eadb8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 21:21:22 2018 +0200 Wine release 3.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018091401.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018091401.xml b/news/en/2018091401.xml new file mode 100644 index 0000000..064b365 --- /dev/null +++ b/news/en/2018091401.xml @@ -0,0 +1,16 @@ +<news> +<date>September 14, 2018</date> +<title>Wine 3.16 Released</title> +<body> + The Wine development release 3.16 is now available. + <a href="{$root}/announce/3.16">What's new</a> in this release: +<ul> + <li>Initial implementation of OPC Services.</li> + <li>Support for rendering buttons from an ImageList.</li> + <li>Better support for CSS properties in MSHTML.</li> + <li>Namespace fixes in XML Writer.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.16.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.16 : Alexandre Julliard : Release 3.16
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: wine Branch: refs/tags/wine-3.16 Tag: 2346a04549835658b5827283f87f4022d496b600 URL: https://source.winehq.org/git/wine.git/?a=tag;h=2346a04549835658b5827283f87… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 21:19:10 2018 +0200 Release 3.16

1 0

Alexandre Julliard : Release 3.16.
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: wine Branch: master Commit: 64d9f309b7f74d4154e685c5d1d78c1b8335c0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=64d9f309b7f74d4154e685c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 21:19:10 2018 +0200 Release 3.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 775 +++++++++++++++++++++++++------------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 327 insertions(+), 470 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=64d9f309b7f74d4154e6…

1 0

Francois Gouget : cmd: A spelling fix in a comment.
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: wine Branch: master Commit: 99fdd9e61c4a68660bdc67b292783476da68d082 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99fdd9e61c4a68660bdc67b2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 14 16:47:32 2018 +0200 cmd: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e6a9ce3..25b9881 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1628,7 +1628,7 @@ static void WCMD_part_execute(CMD_LIST **cmdList, const WCHAR *firstcmd, } if (curPosition == *cmdList) *cmdList = (*cmdList)->nextcommand; - /* If we were in an IF statement and we didnt find an else and yet we get back to + /* If we were in an IF statement and we didn't find an else and yet we get back to the same bracket depth as the IF, then the IF statement is over. This is required to handle nested ifs properly */ } else if (isIF && (*cmdList)->bracketDepth == myDepth) {

1 0

Francois Gouget : ole32/tests: Fix spelling of a variable name.
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: wine Branch: master Commit: 8330192951adc06f024b136ef016414c6cf345ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=8330192951adc06f024b136e… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 14 16:47:39 2018 +0200 ole32/tests: Fix spelling of a variable name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 9b82e49..18cfb19 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4620,7 +4620,7 @@ static void test_OleCreateStaticFromData(void) IOleObject *ole_obj = NULL; IStorage *storage; ILockBytes *ilb; - IPersist *presist; + IPersist *persist; CLSID clsid; STATSTG statstg; int enumerated_streams, matched_streams; @@ -4699,9 +4699,9 @@ static void test_OleCreateStaticFromData(void) hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, dib_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); - hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); - hr = IPersist_GetClassID(presist, &clsid); + hr = IPersist_GetClassID(persist, &clsid); ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_Picture_Dib), "Got wrong clsid: %s, expected: %s.\n", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_Dib)); @@ -4717,7 +4717,7 @@ static void test_OleCreateStaticFromData(void) ok(enumerated_streams == stg_def_dib.stream_count, "created %d != def streams %d\n", enumerated_streams, stg_def_dib.stream_count); ReleaseStgMedium(&stgmed); - IPersist_Release(presist); + IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj); @@ -4733,9 +4733,9 @@ static void test_OleCreateStaticFromData(void) hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, emf_fmt, NULL, storage, (void **)&ole_obj); ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); - hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&persist); ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); - hr = IPersist_GetClassID(presist, &clsid); + hr = IPersist_GetClassID(persist, &clsid); ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); ok(IsEqualCLSID(&clsid, &CLSID_Picture_EnhMetafile), "Got wrong clsid: %s, expected: %s.\n", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_EnhMetafile)); @@ -4751,7 +4751,7 @@ static void test_OleCreateStaticFromData(void) ok(enumerated_streams == stg_def_emf.stream_count, "created %d != def streams %d\n", enumerated_streams, stg_def_emf.stream_count); ReleaseStgMedium(&stgmed); - IPersist_Release(presist); + IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj);

1 0

Józef Kucia : wined3d: Set WINED3DFMT_FLAG_COMPRESSED based on format block info.
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: wine Branch: master Commit: ea8a88047c8a502d2dfdfbd6d618ce611b7514d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea8a88047c8a502d2dfdfbd6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 14 14:00:57 2018 +0200 wined3d: Set WINED3DFMT_FLAG_COMPRESSED based on format block info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 103 +++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea8a88047c8a502d2dfd…

1 0

Józef Kucia : wined3d: Use >= for shader model checks in feature_level_from_caps().
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: wine Branch: master Commit: 2b56410081ebb820bed9d360ebf413aeaf84f8ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b56410081ebb820bed9d360… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 14 14:00:56 2018 +0200 wined3d: Use >= for shader model checks in feature_level_from_caps(). Spotted by Matteo Bruni. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index af17df8..6f39a3e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1265,15 +1265,15 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g && gl_info->supported[ARB_TEXTURE_COMPRESSION_BPTC]) return WINED3D_FEATURE_LEVEL_11; - if (shader_model == 4) + if (shader_model >= 4) return WINED3D_FEATURE_LEVEL_10; } - if (shader_model == 3) + if (shader_model >= 3) return WINED3D_FEATURE_LEVEL_9_SM3; - if (shader_model == 2) + if (shader_model >= 2) return WINED3D_FEATURE_LEVEL_9_SM2; - if (shader_model == 1) + if (shader_model >= 1) return WINED3D_FEATURE_LEVEL_8; if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3)

1 0

Nikolay Sivov : d2d1: Update to ID2D1DrawingStateBlock1.
by Alexandre Julliard 14 Sep '18

14 Sep '18

Module: wine Branch: master Commit: 8b3a7c2581a81cb9c599c3fda66d2d781e265cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b3a7c2581a81cb9c599c3fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 14 08:50:30 2018 +0300 d2d1: Update to ID2D1DrawingStateBlock1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 8 +++--- dlls/d2d1/factory.c | 26 ++++++++++++++--- dlls/d2d1/state_block.c | 75 +++++++++++++++++++++++++++++++----------------- dlls/d2d1/tests/d2d1.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b3a7c2581a81cb9c599…

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
67
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 September 2018