wine-commits January 2020

wine-commits@winehq.org

1 participants
535 discussions

Nikolay Sivov : advapi32/tests: Remove some workarounds for older versions.
by Alexandre Julliard 09 Jan '20

09 Jan '20

Module: wine Branch: master Commit: 10646ddb914343cbbf6c03401c07bc0b43a9099e URL: https://source.winehq.org/git/wine.git/?a=commit;h=10646ddb914343cbbf6c0340… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 9 09:24:27 2020 +0300 advapi32/tests: Remove some workarounds for older versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 360 ++++++++++++++++------------------------- dlls/advapi32/tests/service.c | 13 +- 2 files changed, 147 insertions(+), 226 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10646ddb914343cbbf6c…

1 0

Nikolay Sivov : d3d8/tests: Use GetCursorInfo() directly.
by Alexandre Julliard 09 Jan '20

09 Jan '20

Module: wine Branch: master Commit: fc4aa8046db7590afa56ad7c9b686c8b2066e2af URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc4aa8046db7590afa56ad7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 9 09:22:48 2020 +0300 d3d8/tests: Use GetCursorInfo() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index f598ad4f45..80bf62e361 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -55,8 +55,6 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); static HRESULT (WINAPI *ValidatePixelShader)(const DWORD *, const D3DCAPS8 *, BOOL, char **); -static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); - static const DWORD simple_vs[] = {0xFFFE0101, /* vs_1_1 */ 0x00000009, 0xC0010000, 0x90E40000, 0xA0E40000, /* dp4 oPos.x, v0, c0 */ 0x00000009, 0xC0020000, 0x90E40000, 0xA0E40001, /* dp4 oPos.y, v0, c1 */ @@ -930,7 +928,6 @@ cleanup: static void test_cursor(void) { - HMODULE user32_handle = GetModuleHandleA("user32.dll"); IDirect3DSurface8 *cursor = NULL; IDirect3DDevice8 *device; CURSORINFO info; @@ -941,13 +938,6 @@ static void test_cursor(void) HRESULT hr; BOOL ret; - pGetCursorInfo = (void *)GetProcAddress(user32_handle, "GetCursorInfo"); - if (!pGetCursorInfo) - { - win_skip("GetCursorInfo is not available\n"); - return; - } - window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -957,7 +947,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); + ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); cur = info.hCursor; d3d = Direct3DCreate8(D3D_SDK_VERSION); @@ -990,7 +980,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); + ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ @@ -1004,7 +994,7 @@ static void test_cursor(void) memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); - ok(pGetCursorInfo(&info), "GetCursorInfo failed\n"); + ok(GetCursorInfo(&info), "GetCursorInfo failed\n"); ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor);

1 0

Nikolay Sivov : user32/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard 09 Jan '20

09 Jan '20

Module: wine Branch: master Commit: cb9f5e7d0e9242e2f3fc66751ee4ed9f47e2bc0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9f5e7d0e9242e2f3fc6675… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 9 09:22:25 2020 +0300 user32/tests: Remove some workarounds for older Windows versions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 88 +++++++++++++++------------------------------ dlls/user32/tests/win.c | 96 +++++++++++++++++-------------------------------- 2 files changed, 60 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb9f5e7d0e9242e2f3fc…

1 0

Nikolay Sivov : shell32/tests: Use SHParseDisplayName() directly.
by Alexandre Julliard 09 Jan '20

09 Jan '20

Module: wine Branch: master Commit: 8a13cc643768343edd550737c80e3e0567356d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a13cc643768343edd550737… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 9 09:21:47 2020 +0300 shell32/tests: Use SHParseDisplayName() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/ebrowser.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 65a9571980..7aefd14b37 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -35,7 +35,6 @@ static HWND hwnd; static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); -static HRESULT (WINAPI *pSHParseDisplayName)(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*); static void init_function_pointers(void) { @@ -43,7 +42,6 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("shell32.dll"); pSHCreateShellItem = (void*)GetProcAddress(hmod, "SHCreateShellItem"); - pSHParseDisplayName = (void*)GetProcAddress(hmod, "SHParseDisplayName"); } /********************************************************************* @@ -1295,7 +1293,6 @@ static void test_navigation(void) static const WCHAR testfolderW[] = {'w','i','n','e','t','e','s','t','f','o','l','d','e','r','\0'}; - ok(pSHParseDisplayName != NULL, "pSHParseDisplayName unexpectedly missing.\n"); ok(pSHCreateShellItem != NULL, "pSHCreateShellItem unexpectedly missing.\n"); GetCurrentDirectoryW(MAX_PATH, current_path); @@ -1311,8 +1308,10 @@ static void test_navigation(void) CreateDirectoryW(child_path, NULL); - pSHParseDisplayName(current_path, NULL, &pidl_current, 0, NULL); - pSHParseDisplayName(child_path, NULL, &pidl_child, 0, NULL); + hr = SHParseDisplayName(current_path, NULL, &pidl_current, 0, NULL); + ok(hr == S_OK, "Failed to parse a path, hr %#x.\n", hr); + hr = SHParseDisplayName(child_path, NULL, &pidl_child, 0, NULL); + ok(hr == S_OK, "Failed to parse a path, hr %#x.\n", hr); ebrowser_instantiate(&peb); ebrowser_initialize(peb);

1 0

Jacek Caban : wmp/tests: Don't use round to avoid dependency on mingwex.
by Alexandre Julliard 09 Jan '20

09 Jan '20

Module: wine Branch: master Commit: 44bc06ba95254ea574b56693a01d731977814279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44bc06ba95254ea574b56693… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 23:22:18 2020 +0100 wmp/tests: Don't use round to avoid dependency on mingwex. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/tests/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c index 9857a7e7ae..65038364ed 100644 --- a/dlls/wmp/tests/media.c +++ b/dlls/wmp/tests/media.c @@ -419,7 +419,7 @@ static BOOL test_wmp(void) ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres); hres = IWMPMedia_get_duration(media, &duration); ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres); - ok(round(duration) == 3, "unexpected value: %f\n", duration); + ok(floor(duration + 0.5) == 3, "unexpected value: %f\n", duration); IWMPMedia_Release(media); network = NULL;

1 0

André Hentschel : gdi32: Fix some spec file entries.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: 21003538619cb22bf35d7cf68ee0ef13ff658424 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21003538619cb22bf35d7cf6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 21:22:27 2020 +0100 gdi32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdi32.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 4e08e3494c..8faa2978f4 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -48,7 +48,7 @@ @ stdcall CreateDCA(str str str ptr) @ stdcall CreateDCW(wstr wstr wstr ptr) @ stdcall CreateDIBPatternBrush(long long) -@ stdcall CreateDIBPatternBrushPt(long long) +@ stdcall CreateDIBPatternBrushPt(ptr long) @ stdcall CreateDIBSection(long ptr long ptr long long) @ stdcall CreateDIBitmap(long ptr long ptr ptr long) @ stdcall CreateDiscardableBitmap(long long long) @@ -251,14 +251,14 @@ @ stdcall GetCharABCWidthsFloatW(long long long ptr) @ stdcall GetCharABCWidthsI(long long long ptr ptr) @ stdcall GetCharABCWidthsW(long long long ptr) -@ stdcall GetCharWidth32A(long long long long) -@ stdcall GetCharWidth32W(long long long long) -@ stdcall GetCharWidthA(long long long long) GetCharWidth32A +@ stdcall GetCharWidth32A(long long long ptr) +@ stdcall GetCharWidth32W(long long long ptr) +@ stdcall GetCharWidthA(long long long ptr) GetCharWidth32A @ stdcall GetCharWidthFloatA(long long long ptr) @ stdcall GetCharWidthFloatW(long long long ptr) @ stdcall GetCharWidthI(ptr long long ptr ptr) @ stdcall GetCharWidthInfo(ptr ptr) -@ stdcall GetCharWidthW(long long long long) GetCharWidth32W +@ stdcall GetCharWidthW(long long long ptr) GetCharWidth32W @ stub GetCharWidthWOW @ stdcall GetCharacterPlacementA(long str long long ptr long) @ stdcall GetCharacterPlacementW(long wstr long long ptr long)

1 0

André Hentschel : user32: Fix some spec file entries.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: ec5c4221ad43ce9e1a5bbce774fa53e45e3b2834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec5c4221ad43ce9e1a5bbce7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 21:22:23 2020 +0100 user32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user32.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 0ecceb3adf..1aedc32de2 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -220,8 +220,8 @@ @ stdcall EnumDesktopsW(ptr ptr long) @ stub EnumDisplayDeviceModesA @ stub EnumDisplayDeviceModesW -@ stdcall EnumDisplayDevicesA(ptr long ptr long) -@ stdcall EnumDisplayDevicesW(ptr long ptr long) +@ stdcall EnumDisplayDevicesA(str long ptr long) +@ stdcall EnumDisplayDevicesW(wstr long ptr long) @ stdcall EnumDisplayMonitors(long ptr ptr long) @ stdcall EnumDisplaySettingsA(str long ptr) @ stdcall EnumDisplaySettingsExA(str long ptr long) @@ -444,7 +444,7 @@ @ stdcall InsertMenuItemA(long long long ptr) @ stdcall InsertMenuItemW(long long long ptr) @ stdcall InsertMenuW(long long long long ptr) -@ stdcall InternalGetWindowText(long long long) +@ stdcall InternalGetWindowText(long ptr long) @ stdcall IntersectRect(ptr ptr ptr) @ stdcall InvalidateRect(long ptr long) @ stdcall InvalidateRgn(long long long)

1 0

André Hentschel : ole32: Fix some spec file entries.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: 1a29624d4c5e5ed5871a0d51f826559b8d373dae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a29624d4c5e5ed5871a0d51… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 21:22:14 2020 +0100 ole32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/combase.spec | 2 +- dlls/ole32/ole32.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f67527adf6..64394f461d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -283,7 +283,7 @@ @ stub UpdateDCOMSettings @ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) ole32.WdtpInterfacePointer_UserMarshal @ stub WdtpInterfacePointer_UserMarshal64 -@ stdcall WdtpInterfacePointer_UserSize(ptr long ptr long ptr) ole32.WdtpInterfacePointer_UserSize +@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) ole32.WdtpInterfacePointer_UserSize @ stub WdtpInterfacePointer_UserSize64 @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) ole32.WdtpInterfacePointer_UserUnmarshal @ stub WdtpInterfacePointer_UserUnmarshal64 diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 5e0e7030b2..eaf0e6b7f4 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -171,7 +171,7 @@ @ stdcall HWND_UserUnmarshal(ptr ptr ptr) @ stdcall IIDFromString(wstr ptr) @ stub I_RemoteMain -@ stdcall IsAccelerator(long long ptr long) +@ stdcall IsAccelerator(long long ptr ptr) @ stdcall IsEqualGUID(ptr ptr) @ stub IsValidIid @ stdcall IsValidInterface(ptr) @@ -222,9 +222,9 @@ @ stdcall OleQueryCreateFromData(ptr) @ stdcall OleQueryLinkFromData(ptr) @ stdcall OleRegEnumFormatEtc(ptr long ptr) -@ stdcall OleRegEnumVerbs(long ptr) +@ stdcall OleRegEnumVerbs(ptr ptr) @ stdcall OleRegGetMiscStatus(ptr long ptr) -@ stdcall OleRegGetUserType(long long ptr) +@ stdcall OleRegGetUserType(ptr long ptr) @ stdcall OleRun(ptr) @ stdcall OleSave(ptr ptr long) @ stdcall OleSaveToStream(ptr ptr) @@ -275,7 +275,7 @@ @ stdcall StgOpenPropStg(ptr ptr long long ptr) @ stdcall StgOpenStorage(wstr ptr long ptr long ptr) @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) -@ stdcall StgOpenStorageOnILockBytes(ptr ptr long long long ptr) +@ stdcall StgOpenStorageOnILockBytes(ptr ptr long ptr long ptr) @ stdcall StgSetTimes(wstr ptr ptr ptr ) @ stdcall StringFromCLSID(ptr ptr) @ stdcall StringFromGUID2(ptr ptr long) @@ -287,7 +287,7 @@ @ stub UtGetDvtd32Info @ stdcall WdtpInterfacePointer_UserFree(ptr) @ stdcall WdtpInterfacePointer_UserMarshal(ptr long ptr ptr ptr) -@ stdcall WdtpInterfacePointer_UserSize(ptr long ptr long ptr) +@ stdcall WdtpInterfacePointer_UserSize(ptr long long ptr ptr) @ stdcall WdtpInterfacePointer_UserUnmarshal(ptr ptr ptr ptr) @ stdcall WriteClassStg(ptr ptr) @ stdcall WriteClassStm(ptr ptr)

1 0

André Hentschel : gdiplus: Fix some spec file entries.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: 76fea3a99069ea237acbd9b66fd269e032ae54af URL: https://source.winehq.org/git/wine.git/?a=commit;h=76fea3a99069ea237acbd9b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 21:22:03 2020 +0100 gdiplus: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index ee28b0ea4a..11866633b3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -100,7 +100,7 @@ 100 stdcall GdipCreateMatrix3I(ptr ptr ptr) 101 stdcall GdipCreateMatrix(ptr) 102 stdcall GdipCreateMetafileFromEmf(ptr long ptr) -103 stdcall GdipCreateMetafileFromFile(ptr ptr) +103 stdcall GdipCreateMetafileFromFile(wstr ptr) 104 stdcall GdipCreateMetafileFromStream(ptr ptr) 105 stdcall GdipCreateMetafileFromWmf(ptr long ptr ptr) 106 stdcall GdipCreateMetafileFromWmfFile(wstr ptr ptr) @@ -506,7 +506,7 @@ 506 stdcall GdipSetImageAttributesGamma(ptr long long float) 507 stdcall GdipSetImageAttributesNoOp(ptr long long) 508 stdcall GdipSetImageAttributesOutputChannel(ptr long long long) -509 stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long ptr) +509 stdcall GdipSetImageAttributesOutputChannelColorProfile(ptr long long wstr) 510 stdcall GdipSetImageAttributesRemapTable(ptr long long long ptr) 511 stdcall GdipSetImageAttributesThreshold(ptr long long float) 512 stdcall GdipSetImageAttributesToIdentity(ptr long) @@ -624,7 +624,7 @@ 624 stdcall GdipImageSetAbort(ptr ptr) 625 stdcall GdipGraphicsSetAbort(ptr ptr) 626 stub GdipDrawImageFX -627 stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) -628 stdcall GdipConvertToEmfPlusToFile(ptr ptr ptr ptr long ptr ptr) +627 stdcall GdipConvertToEmfPlus(ptr ptr ptr long wstr ptr) +628 stdcall GdipConvertToEmfPlusToFile(ptr ptr ptr wstr long wstr ptr) 629 stub GdipConvertToEmfPlusToStream 630 stub GdipPlayTSClientRecord

1 0

André Hentschel : dbghelp: Fix MiniDumpWriteDump spec file entry.
by Alexandre Julliard 08 Jan '20

08 Jan '20

Module: wine Branch: master Commit: 7a567d1bb00ea2cdac0e972220b1985800ab445e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a567d1bb00ea2cdac0e9722… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 21:21:51 2020 +0100 dbghelp: Fix MiniDumpWriteDump spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 4c06f87d12..6ffa82da92 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -27,7 +27,7 @@ @ stdcall MakeSureDirectoryPathExists(str) @ stdcall MapDebugInformation(long str str long) @ stdcall MiniDumpReadDumpStream(ptr long ptr ptr ptr) -@ stdcall MiniDumpWriteDump(ptr long ptr long long long long) +@ stdcall MiniDumpWriteDump(ptr long ptr long ptr ptr ptr) @ stdcall SearchTreeForFile(str str ptr) @ stdcall SearchTreeForFileW(wstr wstr ptr) @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr)

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
54
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 January 2020