February 2019 - Wine-Commits

Hans Leidekker : bcrypt: Add support for importing and exporting ECC private keys.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 158ce169e4aa60054956dd7dab20ff218d49f8fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=158ce169e4aa60054956dd7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 10:21:17 2019 +0100 bcrypt: Add support for importing and exporting ECC private keys. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_internal.h | 2 + dlls/bcrypt/bcrypt_main.c | 55 +++++++++++++++++++ dlls/bcrypt/gnutls.c | 121 +++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/macos.c | 12 +++++ dlls/bcrypt/tests/bcrypt.c | 52 ++++++++++++++++-- 5 files changed, 237 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=158ce169e4aa60054956…

1 0

Vijay Kiran Kamuju : setupapi: Add stub for CM_Get_Sibling.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 01b8a795952b460189fc1fc91eff8e733c4e053d URL: https://source.winehq.org/git/wine.git/?a=commit;h=01b8a795952b460189fc1fc9… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Tue Feb 12 21:34:12 2019 +0100 setupapi: Add stub for CM_Get_Sibling. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-0.spec | 2 +- .../api-ms-win-devices-config-l1-1-1.spec | 2 +- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 1 + 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec index fcd3aaa..6fe5ee3 100644 --- a/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec +++ b/dlls/api-ms-win-devices-config-l1-1-0/api-ms-win-devices-config-l1-1-0.spec @@ -21,7 +21,7 @@ @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW @ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stub CM_Get_Sibling +@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW @ stub CM_Open_Class_KeyW @ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index ab2a8a9..33dad4e 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -21,7 +21,7 @@ @ stub CM_Get_Device_Interface_PropertyW @ stub CM_Get_Device_Interface_Property_KeysW @ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent -@ stub CM_Get_Sibling +@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW @ stub CM_MapCrToWin32Err @ stub CM_Open_Class_KeyW diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 2438083d..20ede7b 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -113,7 +113,7 @@ @ stub CM_Get_Res_Des_Data_Ex @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex -@ stub CM_Get_Sibling +@ stdcall CM_Get_Sibling(ptr long long) setupapi.CM_Get_Sibling @ stdcall CM_Get_Sibling_Ex(ptr long long ptr) setupapi.CM_Get_Sibling_Ex @ stdcall CM_Get_Version() setupapi.CM_Get_Version @ stub CM_Get_Version_Ex diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 844bb21..cea6dac 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -123,7 +123,7 @@ @ stub CM_Get_Res_Des_Data_Ex @ stub CM_Get_Res_Des_Data_Size @ stub CM_Get_Res_Des_Data_Size_Ex -@ stub CM_Get_Sibling +@ stdcall CM_Get_Sibling(ptr long long) @ stdcall CM_Get_Sibling_Ex(ptr long long ptr) @ stdcall CM_Get_Version() @ stub CM_Get_Version_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 61ce005..4994ca4 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -501,6 +501,16 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULON } /*********************************************************************** + * CM_Get_Sibling (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Sibling( + PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags) +{ + FIXME("%p 0x%08x 0x%08x: stub\n", pdnDevInst, DevInst, ulFlags); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Get_Sibling_Ex (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_Sibling_Ex( diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index b8def60..da09115 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -205,6 +205,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex(PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine); CMAPI WORD WINAPI CM_Get_Version(void); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST,DEVINSTID_A,ULONG);

1 0

Michael Stefaniuc : oleaut32/tests: Floating point numeric constants are by default doubles.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 3af4ebf27a8f1e5b493038eb06f2f0c6718b4669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3af4ebf27a8f1e5b493038eb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 12 23:43:34 2019 +0100 oleaut32/tests: Floating point numeric constants are by default doubles. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index f235a75..62b4852 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2715,8 +2715,7 @@ static void test_VarSub(void) ok(hres == S_OK && V_VT(&result) == VT_CY, "VarSub: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4702.0), - "VarSub: CY value %f, expected %f\n", r, (double)4720); + ok(hres == S_OK && EQ_DOUBLE(r, 4702.0), "VarSub: CY value %f, expected %f\n", r, 4720.0); hres = pVarSub(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, @@ -5533,12 +5532,12 @@ static void test_VarMul(void) hres = pVarMul(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarMul: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 42399.0), "VarMul: CY value %f, expected %f\n", r, (double)42399); + ok(hres == S_OK && EQ_DOUBLE(r, 42399.0), "VarMul: CY value %f, expected %f\n", r, 42399.0); hres = pVarMul(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarMul: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, (double)46.2); + ok(hres == S_OK && EQ_DOUBLE(r, 46.2), "VarMul: DECIMAL value %f, expected %f\n", r, 46.2); SysFreeString(lbstr); SysFreeString(rbstr); @@ -5704,7 +5703,7 @@ static void test_VarAdd(void) hres = pVarAdd(&left, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_BSTR, "VarAdd: expected coerced type VT_BSTR, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromStr(V_BSTR(&result), 0, 0, &r); - ok(hres == S_OK && EQ_DOUBLE(r, 1212.0), "VarAdd: BSTR value %f, expected %f\n", r, (double)1212); + ok(hres == S_OK && EQ_DOUBLE(r, 1212.0), "VarAdd: BSTR value %f, expected %f\n", r, 1212.0); VariantClear(&result); /* Manuly test some VT_CY and VT_DECIMAL variants */ @@ -5724,12 +5723,12 @@ static void test_VarAdd(void) hres = pVarAdd(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_CY, "VarAdd: expected coerced type VT_CY, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromCy(V_CY(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 4720.0), "VarAdd: CY value %f, expected %f\n", r, (double)4720); + ok(hres == S_OK && EQ_DOUBLE(r, 4720.0), "VarAdd: CY value %f, expected %f\n", r, 4720.0); hres = pVarAdd(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarAdd: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, (double)-15.2); + ok(hres == S_OK && EQ_DOUBLE(r, -15.2), "VarAdd: DECIMAL value %f, expected %f\n", r, -15.2); VariantClear(&result); SysFreeString(lbstr); @@ -7994,40 +7993,37 @@ static void test_VarDiv(void) ok(hres == S_OK && V_VT(&result) == VT_R8, "VARDIV: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 1.0), - "VARDIV: CY value %f, expected %f\n", V_R8(&result), (double)1.0); + "VARDIV: CY value %f, expected %f\n", V_R8(&result), 1.0); hres = pVarDiv(&cy, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VARDIV: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 5000.0), - "VARDIV: CY value %f, expected %f\n", V_R8(&result), (double)5000.0); + "VARDIV: CY value %f, expected %f\n", V_R8(&result), 5000.0); hres = pVarDiv(&left, &cy, &result); ok(hres == S_OK && V_VT(&result) == VT_R8, "VARDIV: expected coerced type VT_R8, got %s!\n", vtstr(V_VT(&result))); ok(hres == S_OK && EQ_DOUBLE(V_R8(&result), 0.01), - "VARDIV: CY value %f, expected %f\n", V_R8(&result), (double)0.01); + "VARDIV: CY value %f, expected %f\n", V_R8(&result), 0.01); hres = pVarDiv(&left, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VARDIV: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 50.0), - "VARDIV: DECIMAL value %f, expected %f\n", r, (double)50.0); + ok(hres == S_OK && EQ_DOUBLE(r, 50.0), "VARDIV: DECIMAL value %f, expected %f\n", r, 50.0); hres = pVarDiv(&dec, &dec, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VARDIV: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 1.0), - "VARDIV: DECIMAL value %f, expected %f\n", r, (double)1.0); + ok(hres == S_OK && EQ_DOUBLE(r, 1.0), "VARDIV: DECIMAL value %f, expected %f\n", r, 1.0); hres = pVarDiv(&dec, &right, &result); ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VARDIV: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, 1.0), - "VARDIV: DECIMAL value %f, expected %f\n", r, (double)1.0); + ok(hres == S_OK && EQ_DOUBLE(r, 1.0), "VARDIV: DECIMAL value %f, expected %f\n", r, 1.0); /* Check for division by zero and overflow */ V_VT(&left) = VT_R8;

1 0

Hans Leidekker : bcrypt: Implement BCryptDeriveKeyPBKDF2.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: f0a18f6f19ffc0455b67d94f10d423f96715122f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0a18f6f19ffc0455b67d94f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 13 10:21:18 2019 +0100 bcrypt: Implement BCryptDeriveKeyPBKDF2. Based on a patch by Jack Grigg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42704 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt.spec | 1 + dlls/bcrypt/bcrypt_main.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 91 +++++++++++++++++++++++++++++++++++++++++++--- dlls/ncrypt/ncrypt.spec | 2 +- include/bcrypt.h | 1 + 5 files changed, 180 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0a18f6f19ffc0455b67…

1 0

Nikolay Sivov : uiautomationcore: Add UiaHostProviderFromHwnd() stub.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 35b01d6205f4a95e0237500a08e5f5ba3638fc09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35b01d6205f4a95e0237500a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 12 16:26:51 2019 +0300 uiautomationcore: Add UiaHostProviderFromHwnd() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/uiautomationcore/Makefile.in | 1 + dlls/uiautomationcore/tests/Makefile.in | 5 ++ dlls/uiautomationcore/tests/uiautomation.c | 92 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_main.c | 6 ++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 8 files changed, 108 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ec211a5..7f89b1e 100755 --- a/configure +++ b/configure @@ -19985,6 +19985,7 @@ wine_fn_config_makefile dlls/tzres enable_tzres wine_fn_config_makefile dlls/ucrtbase enable_ucrtbase wine_fn_config_makefile dlls/ucrtbase/tests enable_tests wine_fn_config_makefile dlls/uiautomationcore enable_uiautomationcore +wine_fn_config_makefile dlls/uiautomationcore/tests enable_tests wine_fn_config_makefile dlls/uiribbon enable_uiribbon wine_fn_config_makefile dlls/unicows enable_unicows wine_fn_config_makefile dlls/updspapi enable_updspapi diff --git a/configure.ac b/configure.ac index 1b425d2..36add65 100644 --- a/configure.ac +++ b/configure.ac @@ -3724,6 +3724,7 @@ WINE_CONFIG_MAKEFILE(dlls/tzres) WINE_CONFIG_MAKEFILE(dlls/ucrtbase) WINE_CONFIG_MAKEFILE(dlls/ucrtbase/tests) WINE_CONFIG_MAKEFILE(dlls/uiautomationcore) +WINE_CONFIG_MAKEFILE(dlls/uiautomationcore/tests) WINE_CONFIG_MAKEFILE(dlls/uiribbon) WINE_CONFIG_MAKEFILE(dlls/unicows) WINE_CONFIG_MAKEFILE(dlls/updspapi) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 78d6254..5221450 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,4 +1,5 @@ MODULE = uiautomationcore.dll +IMPORTLIB = uiautomationcore C_SRCS = \ uia_main.c diff --git a/dlls/uiautomationcore/tests/Makefile.in b/dlls/uiautomationcore/tests/Makefile.in new file mode 100644 index 0000000..c39b062 --- /dev/null +++ b/dlls/uiautomationcore/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = uiautomationcore.dll +IMPORTS = uiautomationcore user32 + +C_SRCS = \ + uiautomation.c diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c new file mode 100644 index 0000000..cbcba1a --- /dev/null +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -0,0 +1,92 @@ +/* + * UI Automation tests + * + * Copyright 2019 Nikolay Sivov for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" +#include "uiautomation.h" + +#include "wine/test.h" + +static LRESULT WINAPI test_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static void test_UiaHostProviderFromHwnd(void) +{ + IRawElementProviderSimple *p, *p2; + WNDCLASSA cls; + HRESULT hr; + HWND hwnd; + + cls.style = 0; + cls.lpfnWndProc = test_wnd_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(NULL); + cls.hIcon = 0; + cls.hCursor = NULL; + cls.hbrBackground = NULL; + cls.lpszMenuName = NULL; + cls.lpszClassName = "HostProviderFromHwnd class"; + + RegisterClassA(&cls); + + hwnd = CreateWindowExA(0, "HostProviderFromHwnd class", "Test window 1", + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE, + 0, 0, 100, 100, GetDesktopWindow(), NULL, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create a test window.\n"); + + p = (void *)0xdeadbeef; + hr = UiaHostProviderFromHwnd(NULL, &p); +todo_wine { + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + ok(p == NULL, "Unexpected instance.\n"); +} + p = NULL; + hr = UiaHostProviderFromHwnd(hwnd, &p); +todo_wine + ok(hr == S_OK, "Failed to get host provider, hr %#x.\n", hr); + +if (hr == S_OK) +{ + p2 = NULL; + hr = UiaHostProviderFromHwnd(hwnd, &p2); + ok(hr == S_OK, "Failed to get host provider, hr %#x.\n", hr); + ok(p != p2, "Unexpected instance.\n"); + IRawElementProviderSimple_Release(p2); + + hr = IRawElementProviderSimple_get_HostRawElementProvider(p, &p2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(p2 == NULL, "Unexpected instance.\n"); + + IRawElementProviderSimple_Release(p); +} + + DestroyWindow(hwnd); + UnregisterClassA("HostProviderFromHwnd class", NULL); +} + +START_TEST(uiautomation) +{ + test_UiaHostProviderFromHwnd(); +} diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 0730846..f0d8247 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -93,3 +93,9 @@ HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVEN FIXME("(%p, %d): stub\n", provider, id); return S_OK; } + +HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **provider) +{ + FIXME("(%p, %p): stub\n", hwnd, provider); + return E_NOTIMPL; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 28eefc9..53ef893 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -72,7 +72,7 @@ @ stub UiaHTextRangeFromVariant @ stub UiaHUiaNodeFromVariant @ stub UiaHasServerSideProvider -@ stub UiaHostProviderFromHwnd +@ stdcall UiaHostProviderFromHwnd(long ptr) #@ stub UiaIAccessibleFromProvider @ stdcall UiaLookupId(long ptr) @ stub UiaNavigate diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 1898fe9..0acdc29 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -59,6 +59,7 @@ BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); +HRESULT WINAPI UiaHostProviderFromHwnd(HWND hwnd, IRawElementProviderSimple **elprov); #ifdef __cplusplus }

1 0

Dmitry Timoshkov : wineps.drv: PostScript header should be written by StartDoc instead of StartPage.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: c4a54852952a59c3129beac78c08cad56643fe22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4a54852952a59c3129beac7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 13 11:40:30 2019 +0000 wineps.drv: PostScript header should be written by StartDoc instead of StartPage. Otherwise a being created file has wrong signature if an application directly injects PostScript code. This patch fixes printing from Adobe PageMaker. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 1 - dlls/wineps.drv/escape.c | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 82cf200..2d9ef1d 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1433,7 +1433,6 @@ static void print_something(HDC hdc) while (*p == '\r' || *p == '\n') p++; } -todo_wine ok(p && !memcmp(p, psadobe, sizeof(psadobe)), "wrong signature: %.14s\n", p ? p : buf); DeleteFileA(file_name); diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 44d790b..b3eff68 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -397,15 +397,14 @@ INT PSDRV_StartPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(!physDev->job.OutOfPage) { FIXME("Already started a page?\n"); return 1; } - if(physDev->job.PageNo++ == 0) { - if(!PSDRV_WriteHeader( dev, physDev->job.doc_name )) - return 0; - } + physDev->job.PageNo++; if(!PSDRV_WriteNewPage( dev )) return 0; @@ -421,6 +420,8 @@ INT PSDRV_EndPage( PHYSDEV dev ) { PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); + TRACE("%p\n", dev->hdc); + if(physDev->job.OutOfPage) { FIXME("Already ended a page?\n"); return 1; @@ -483,6 +484,13 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) ClosePrinter(physDev->job.hprinter); return 0; } + + if (!PSDRV_WriteHeader( dev, doc->lpszDocName )) { + WARN("Failed to write header\n"); + ClosePrinter(physDev->job.hprinter); + return 0; + } + physDev->job.banding = FALSE; physDev->job.OutOfPage = TRUE; physDev->job.PageNo = 0; @@ -501,6 +509,8 @@ INT PSDRV_EndDoc( PHYSDEV dev ) PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); INT ret = 1; + TRACE("%p\n", dev->hdc); + if(!physDev->job.id) { FIXME("hJob == 0. Now what?\n"); return 0;

1 0

Alexandre Julliard : ntdll: Also create the initial process parameters with RtlCreateProcessParametersEx ().
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 50f0ed75efc16d4fd3f0e786242829808407fce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50f0ed75efc16d4fd3f0e786… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 13 12:48:36 2019 +0100 ntdll: Also create the initial process parameters with RtlCreateProcessParametersEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 35 +++++++++++++++++++++++++++++------ dlls/ntdll/thread.c | 23 +---------------------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index bf57ab9..d2b40bd 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -22,6 +22,9 @@ #include <assert.h> #include <stdarg.h> +#ifdef HAVE_UNISTD_H +# include <unistd.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -34,6 +37,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(environ); +static WCHAR empty[] = {0}; +static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; +static const UNICODE_STRING null_str = { 0, 0, NULL }; + /****************************************************************************** * NtQuerySystemEnvironmentValue [NTDLL.@] */ @@ -454,10 +461,6 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu const UNICODE_STRING *RuntimeInfo, ULONG flags ) { - static WCHAR empty[] = {0}; - static const UNICODE_STRING empty_str = { 0, sizeof(empty), empty }; - static const UNICODE_STRING null_str = { 0, 0, NULL }; - UNICODE_STRING curdir; const RTL_USER_PROCESS_PARAMETERS *cur_params; SIZE_T size, env_size = 0; @@ -479,7 +482,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu curdir.MaximumLength = MAX_PATH * sizeof(WCHAR); if (!CommandLine) CommandLine = ImagePathName; - if (!Environment) Environment = cur_params->Environment; + if (!Environment && cur_params) Environment = cur_params->Environment; if (!WindowTitle) WindowTitle = &empty_str; if (!Desktop) Desktop = &empty_str; if (!ShellInfo) ShellInfo = &empty_str; @@ -509,7 +512,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu params->AllocationSize = size; params->Size = size; params->Flags = PROCESS_PARAMS_FLAG_NORMALIZED; - params->ConsoleFlags = cur_params->ConsoleFlags; + if (cur_params) params->ConsoleFlags = cur_params->ConsoleFlags; /* all other fields are zero */ ptr = params + 1; @@ -584,6 +587,26 @@ void init_user_process_params( SIZE_T data_size ) RTL_USER_PROCESS_PARAMETERS *params = NULL; UNICODE_STRING curdir, dllpath, imagepath, cmdline, title, desktop, shellinfo, runtime; + if (!data_size) + { + if (RtlCreateProcessParametersEx( &params, &null_str, &null_str, &empty_str, &null_str, NULL, + &null_str, &null_str, &null_str, &null_str, + PROCESS_PARAMS_FLAG_NORMALIZED )) + return; + + NtCurrentTeb()->Peb->ProcessParameters = params; + if (isatty(0) || isatty(1) || isatty(2)) + params->ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ + if (!isatty(0)) + wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params->hStdInput ); + if (!isatty(1)) + wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdOutput ); + if (!isatty(2)) + wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params->hStdError ); + params->wShowWindow = 1; /* SW_SHOWNORMAL */ + return; + } + if (!(info = RtlAllocateHeap( GetProcessHeap(), 0, data_size ))) return; SERVER_START_REQ( get_startup_info ) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 8dc903a..9f4a08f 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -67,8 +67,6 @@ struct startup_info static PEB *peb; static PEB_LDR_DATA ldr; -static RTL_USER_PROCESS_PARAMETERS params; /* default parameters if no parent */ -static WCHAR current_dir[MAX_PATH]; static RTL_BITMAP tls_bitmap; static RTL_BITMAP tls_expansion_bitmap; static RTL_BITMAP fls_bitmap; @@ -192,7 +190,6 @@ void thread_init(void) peb = addr; peb->FastPebLock = &peb_lock; - peb->ProcessParameters = &params; peb->TlsBitmap = &tls_bitmap; peb->TlsExpansionBitmap = &tls_expansion_bitmap; peb->FlsBitmap = &fls_bitmap; @@ -201,9 +198,6 @@ void thread_init(void) peb->OSMinorVersion = 1; peb->OSBuildNumber = 0xA28; peb->OSPlatformId = VER_PLATFORM_WIN32_NT; - params.CurrentDirectory.DosPath.Buffer = current_dir; - params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); - params.wShowWindow = 1; /* SW_SHOWNORMAL */ ldr.Length = sizeof(ldr); ldr.Initialized = TRUE; RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); @@ -257,22 +251,7 @@ void thread_init(void) exit(1); } - /* allocate user parameters */ - if (info_size) - { - init_user_process_params( info_size ); - } - else - { - if (isatty(0) || isatty(1) || isatty(2)) - params.ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ - if (!isatty(0)) - wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params.hStdInput ); - if (!isatty(1)) - wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdOutput ); - if (!isatty(2)) - wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdError ); - } + init_user_process_params( info_size ); /* initialize time values in user_shared_data */ NtQuerySystemTime( &now );

1 0

Yussur-Mustafa Oraji : httpapi: Add stub for HttpCloseServerSession.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 776e74549da066ff9d35219117d4612808de4cfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=776e74549da066ff9d352191… Author: Yussur-Mustafa Oraji <yussur.oraji(a)hotmail.de> Date: Mon Feb 11 10:07:31 2019 +0000 httpapi: Add stub for HttpCloseServerSession. Signed-off-by: Yussur-Mustafa Oraji <yussur.oraji(a)hotmail.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/httpapi.spec | 1 + dlls/httpapi/httpapi_main.c | 9 +++++++++ dlls/httpapi/tests/httpapi.c | 7 +++++++ include/http.h | 1 + 4 files changed, 18 insertions(+) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index cdab28d..1d8fcd8 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -7,6 +7,7 @@ @ stub HttpCreateFilter @ stdcall HttpCreateHttpHandle(ptr long) @ stdcall HttpCreateServerSession(long ptr long) +@ stdcall HttpCloseServerSession(int64) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 1b35cd6..3ab0399 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -192,3 +192,12 @@ ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSI FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved ); return ERROR_ACCESS_DENIED; } + +/*********************************************************************** + * HttpCloseServerSession (HTTPAPI.@) + */ +ULONG WINAPI HttpCloseServerSession( HTTP_SERVER_SESSION_ID id ) +{ + FIXME( "(%s): stub!\n", wine_dbgstr_longlong(id)); + return ERROR_INVALID_PARAMETER; +} diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 47df226..e143755 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -92,30 +92,37 @@ static void test_HttpCreateServerSession(void) version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, NULL, 0); +todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 1; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 3; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 2; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(session); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); version.HttpApiMajorVersion = 1; version.HttpApiMinorVersion = 0; ret = pHttpCreateServerSession(version, &session, 0); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(session); +todo_wine ok(!ret, "Unexpected return value %u.\n", ret); ret = pHttpCloseServerSession(0xdead); diff --git a/include/http.h b/include/http.h index b8ce811..8f284a8 100644 --- a/include/http.h +++ b/include/http.h @@ -60,6 +60,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID); ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); +ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED); ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);

1 0

Nikolay Sivov : dwrite: Use more appropriate allocation helpers.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: 8d2e59edaa7f6cefcaba4e2439fa410e6c0a979d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d2e59edaa7f6cefcaba4e24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 13 10:47:10 2019 +0300 dwrite: Use more appropriate allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 20 ++++++++++---------- dlls/dwrite/bidi.c | 2 +- dlls/dwrite/font.c | 22 +++++++++++----------- dlls/dwrite/layout.c | 32 ++++++++++++++++---------------- dlls/dwrite/main.c | 7 ++++--- 5 files changed, 42 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d2e59edaa7f6cefcaba…

1 0

Michael Stefaniuc : oleaut32/tests: Fix printing of an expected value.
by Alexandre Julliard Feb. 13, 2019

Feb. 13, 2019

Module: wine Branch: master Commit: d5068822664bb2ef7db8fed97b8f1a84b756a976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5068822664bb2ef7db8fed9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Feb 12 23:43:31 2019 +0100 oleaut32/tests: Fix printing of an expected value. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c00968e..f235a75 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2722,8 +2722,7 @@ static void test_VarSub(void) ok(hres == S_OK && V_VT(&result) == VT_DECIMAL, "VarSub: expected coerced type VT_DECIMAL, got %s!\n", vtstr(V_VT(&result))); hres = VarR8FromDec(&V_DECIMAL(&result), &r); - ok(hres == S_OK && EQ_DOUBLE(r, -6.8), - "VarSub: DECIMAL value %f, expected %f\n", r, (double)-15.2); + ok(hres == S_OK && EQ_DOUBLE(r, -6.8), "VarSub: DECIMAL value %f, expected %f\n", r, -6.8); SysFreeString(lbstr); SysFreeString(rbstr);

1 0