June 2018 - Wine-commits - list.winehq.org

Louis Lenders : ntdll: Update version resource.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 7817056d91b5462c31f9fbdead335ffbf4ad0c34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7817056d91b5462c31f9fbde… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 19 20:38:44 2018 +0100 ntdll: Update version resource. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 670622b8fbb293466cfbd4c4ab3f802ed3586d75) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/version.rc b/dlls/ntdll/version.rc index c16ea4e..fd51d3c 100644 --- a/dlls/ntdll/version.rc +++ b/dlls/ntdll/version.rc @@ -18,9 +18,9 @@ #define WINE_FILEDESCRIPTION_STR "Wine ntdll" #define WINE_FILENAME_STR "ntdll.dll" -#define WINE_FILEVERSION 5,1,2600,2180 -#define WINE_FILEVERSION_STR "5.1.2600.2180" -#define WINE_PRODUCTVERSION 5,1,2600,2180 -#define WINE_PRODUCTVERSION_STR "5.1.2600.2180" +#define WINE_FILEVERSION 6,1,7601,24059 +#define WINE_FILEVERSION_STR "6.1.7601.24059" +#define WINE_PRODUCTVERSION 6,1,7601,24059 +#define WINE_PRODUCTVERSION_STR "6.1.7601.24059" #include "wine/wine_common_ver.rc"

1 0

Matteo Bruni : d3d8: Forbid setting a viewport larger than the render target.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 7ecb72caa62976b9589a09eda7f514c56e0e0368 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ecb72caa62976b9589a09ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 22 21:43:09 2018 +0100 d3d8: Forbid setting a viewport larger than the render target. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aa5fa7080631d9135dff10fdf96e21487e21e4f8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/device.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 506961a..caa3da5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1473,10 +1473,30 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3DVIEWPORT8 *viewport) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_sub_resource_desc rt_desc; + struct wined3d_rendertarget_view *rtv; + struct d3d8_surface *surface; struct wined3d_viewport vp; TRACE("iface %p, viewport %p.\n", iface, viewport); + wined3d_mutex_lock(); + if (!(rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0))) + { + wined3d_mutex_unlock(); + return D3DERR_NOTFOUND; + } + surface = wined3d_rendertarget_view_get_sub_resource_parent(rtv); + wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &rt_desc); + + if (viewport->X > rt_desc.width || viewport->Width > rt_desc.width - viewport->X + || viewport->Y > rt_desc.height || viewport->Height > rt_desc.height - viewport->Y) + { + WARN("Invalid viewport, returning D3DERR_INVALIDCALL.\n"); + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + vp.x = viewport->X; vp.y = viewport->Y; vp.width = viewport->Width; @@ -1484,7 +1504,6 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D vp.min_z = viewport->MinZ; vp.max_z = viewport->MaxZ; - wined3d_mutex_lock(); wined3d_device_set_viewport(device->wined3d_device, &vp); wined3d_mutex_unlock();

1 0

Michael Müller : mpr: Return correct error code for non network paths and REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: c838fc2aa1bb2bb0b6425d615da1ecc446ee7b6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c838fc2aa1bb2bb0b6425d61… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 13 20:32:33 2018 -0500 mpr: Return correct error code for non network paths and REMOTE_NAME_INFO_LEVEL in WNetGetUniversalName. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 31e5b4e5ee385e3d955545fbfa8ec79b77819b2a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mpr/tests/mpr.c | 9 +++------ dlls/mpr/wnet.c | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 330e66b..041afbf 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -101,25 +101,23 @@ static void test_WNetGetRemoteName(void) info_size = sizeof(buffer); ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &info_size); - todo_wine{ if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_NO_ERROR, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ok(info_size == sizeof(buffer), "Got wrong size: %u\n", info_size); fail_size = 0; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, &fail_size); - todo_wine{ if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_VALUE || ret == WN_MORE_DATA, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_NO_NET_OR_BAD_PATH, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, buffer, NULL); todo_wine ok(ret == WN_BAD_POINTER, "WNetGetUniversalNameA failed: %08x\n", ret); @@ -127,13 +125,12 @@ static void test_WNetGetRemoteName(void) ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, NULL, &info_size); - todo_wine { if(drive_type == DRIVE_REMOTE) + todo_wine ok(ret == WN_BAD_POINTER || ret == WN_BAD_VALUE, "WNetGetUniversalNameA failed: %08x\n", ret); else ok(ret == WN_NOT_CONNECTED || ret == WN_BAD_VALUE, "(%s) WNetGetUniversalNameA gave wrong error: %u\n", driveA, ret); - } fail_size = sizeof(driveA) / sizeof(char) - 1; ret = WNetGetUniversalNameA(driveA, REMOTE_NAME_INFO_LEVEL, diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 7b24693..78759ec 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -2348,7 +2348,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, break; } case REMOTE_NAME_INFO_LEVEL: - err = WN_NO_NETWORK; + err = WN_NOT_CONNECTED; break; default:

1 0

Zebediah Figura : ntdll: Implement _alldvrm() and _aulldvrm().
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 0cedcf481e165e555ec177469c41af56fabf2974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cedcf481e165e555ec17746… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 3 10:10:27 2018 -0500 ntdll: Implement _alldvrm() and _aulldvrm(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f80b1f45ff31c8a4f079bdda85c44a64b6d667fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/large_int.c | 74 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 4 +- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- 3 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/large_int.c b/dlls/ntdll/large_int.c index a0d465c..5716416 100644 --- a/dlls/ntdll/large_int.c +++ b/dlls/ntdll/large_int.c @@ -627,6 +627,43 @@ LONGLONG WINAPI _allshr( LONGLONG a, LONG b ) } /****************************************************************************** + * _alldvrm (NTDLL.@) + * + * Divide two 64 bit integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _alldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_allrem") "\n\t" + "movl %edx,%ebx\n\t" + "pushl %eax\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_alldiv") "\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + +/****************************************************************************** * _aullrem (NTDLL.@) * * Calculate the remainder after dividing two 64 bit unsigned integers. @@ -660,4 +697,41 @@ ULONGLONG WINAPI _aullshr( ULONGLONG a, LONG b ) return a >> b; } +/****************************************************************************** + * _aulldvrm (NTDLL.@) + * + * Divide two 64 bit unsigned integers. + * + * PARAMS + * a [I] Initial number. + * b [I] Number to divide a by. + * + * RETURNS + * Returns the quotient of a and b in edx:eax. + * Returns the remainder of a and b in ebx:ecx. + */ +__ASM_STDCALL_FUNC( _aulldvrm, 16, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_aullrem") "\n\t" + "movl %edx,%ebx\n\t" + "pushl %eax\n\t" + "pushl 20(%ebp)\n\t" + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "pushl 8(%ebp)\n\t" + "call " __ASM_NAME("_aulldiv") "\n\t" + "popl %ecx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret $16" ) + #endif /* __i386__ */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a6d6dc8..a9a9e3f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1336,7 +1336,7 @@ @ cdecl -private __iscsymf(long) NTDLL___iscsymf @ cdecl -private __toascii(long) NTDLL___toascii @ stdcall -arch=i386 -ret64 _alldiv(int64 int64) -# @ stub _alldvrm +@ stdcall -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -arch=i386 -norelay _alloca_probe() @ stdcall -arch=i386 -ret64 _allrem(int64 int64) @@ -1344,7 +1344,7 @@ @ stdcall -arch=i386 -ret64 _allshr(int64 long) @ cdecl -private -ret64 _atoi64(str) @ stdcall -arch=i386 -ret64 _aulldiv(int64 int64) -# @ stub _aulldvrm +@ stdcall -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk() diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 0e4af90..9031f09 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1403,14 +1403,14 @@ @ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -private _abnormal_termination() msvcrt._abnormal_termination @ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) -@ stub _alldvrm +@ stdcall -private -arch=i386 -norelay _alldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) @ stdcall -private -arch=i386 -norelay _alloca_probe() @ stdcall -private -arch=i386 -ret64 _allrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _allshl(int64 long) @ stdcall -private -arch=i386 -ret64 _allshr(int64 long) @ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64) -@ stub _aulldvrm +@ stdcall -private -arch=i386 -norelay _aulldvrm(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) @ stdcall -private -arch=i386 -ret64 _aullshr(int64 long) @ stdcall -private -arch=i386 -norelay _chkstk()

1 0

Alexandre Julliard : wininet/tests: Update the winehq.org certificate data.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 130cb57bf9e498983d3e7cfe472792894ae64d97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=130cb57bf9e498983d3e7cfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 6 15:27:49 2018 -0600 wininet/tests: Update the winehq.org certificate data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 105b3dc8169db038b30abb653add0689dff2b89e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/http.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index af78704..72121d8 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5526,11 +5526,22 @@ typedef struct { } cert_struct_test_t; static const cert_struct_test_t test_winehq_org_cert = { + "US\r\n" + "55114\r\n" + "MN\r\n" + "Saint Paul\r\n" + "Ste 120\r\n" + "700 Raymond Ave\r\n" + "CodeWeavers\r\n" + "IT\r\n" + "Secure Link SSL Wildcard\r\n" "*.winehq.org", "US\r\n" - "GeoTrust Inc.\r\n" - "RapidSSL SHA256 CA" + "VA\r\n" + "Herndon\r\n" + "Network Solutions L.L.C.\r\n" + "Network Solutions OV Server CA 2" }; static const cert_struct_test_t test_winehq_com_cert = {

1 0

Johann Frei : dinput: Implement X/Y axis granularity and add test.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 18f498f4b5e42483c08506d703312a846e461816 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18f498f4b5e42483c08506d7… Author: Johann Frei <johann_frei(a)yahoo.de> Date: Tue Mar 6 20:03:41 2018 +0100 dinput: Implement X/Y axis granularity and add test. Signed-off-by: Johann Frei <johann_frei(a)yahoo.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4bc1e172ecba43dd8a5eb341cdd8e705a314b44d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/mouse.c | 17 +++++++++++++++-- dlls/dinput/tests/mouse.c | 23 ++++++++++++++++++++++- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index eaec6b1..6d3eff5 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -616,8 +616,21 @@ static HRESULT WINAPI SysMouseWImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REF case (DWORD_PTR) DIPROP_GRANULARITY: { LPDIPROPDWORD pr = (LPDIPROPDWORD) pdiph; - /* We'll just assume that the app asks about the Z axis */ - pr->dwData = WHEEL_DELTA; + if ( + ((pdiph->dwHow == DIPH_BYOFFSET) && + ((pdiph->dwObj == DIMOFS_X) || + (pdiph->dwObj == DIMOFS_Y))) + || + ((pdiph->dwHow == DIPH_BYID) && + ((pdiph->dwObj == (DIDFT_MAKEINSTANCE(WINE_MOUSE_X_AXIS_INSTANCE) | DIDFT_RELAXIS)) || + (pdiph->dwObj == (DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS)))) + ){ + /* Set granularity of X/Y Axis to 1. See MSDN on DIPROP_GRANULARITY */ + pr->dwData = 1; + } else { + /* We'll just assume that the app asks about the Z axis */ + pr->dwData = WHEEL_DELTA; + } break; } diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index dac7d8d..c2d0226 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -161,7 +161,7 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); - /* Check for buffer owerflow */ + /* Check for buffer overflow */ for (i = 0; i < 6; i++) mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0); @@ -172,6 +172,27 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0); ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt); + /* Check for granularity property using BYOFFSET */ + memset(&di_op, 0, sizeof(di_op)); + di_op.diph.dwHow = DIPH_BYOFFSET; + di_op.diph.dwObj = DIMOFS_Y; + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + hr = IDirectInputDevice_GetProperty(pMouse, DIPROP_GRANULARITY, &di_op.diph); + /* Granularity of Y axis should be 1! */ + ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); + + /* Check for granularity property using BYID */ + memset(&di_op, 0, sizeof(di_op)); + di_op.diph.dwHow = DIPH_BYID; + /* WINE_MOUSE_Y_AXIS_INSTANCE := 1 */ + di_op.diph.dwObj = (DIDFT_MAKEINSTANCE(1) | DIDFT_RELAXIS); + di_op.diph.dwSize = sizeof(DIPROPDWORD); + di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER); + hr = IDirectInputDevice_GetProperty(pMouse, DIPROP_GRANULARITY, &di_op.diph); + /* Granularity of Y axis should be 1! */ + ok(hr == S_OK && di_op.dwData == 1, "GetProperty(): %08x, dwData: %i but should be 1.\n", hr, di_op.dwData); + if (pMouse) IUnknown_Release(pMouse); DestroyWindow( hwnd2 );

1 0

Austin English : wininet: Add ParseX509EncodedCertificateForListBoxEntry stub.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: b2cdad1b589fec00c60d305d9ca29f120c5704f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2cdad1b589fec00c60d305d… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Mar 28 03:20:02 2018 +0000 wininet: Add ParseX509EncodedCertificateForListBoxEntry stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c8861df6d11343d4742afed32b7a9fc5a50e2ccc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/dialogs.c | 9 +++++++++ dlls/wininet/wininet.spec | 2 +- include/winineti.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index 938daa8..b13b566 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -574,6 +574,15 @@ BOOL WINAPI InternetShowSecurityInfoByURLW(LPCWSTR url, HWND window) } /*********************************************************************** + * ParseX509EncodedCertificateForListBoxEntry (@) + */ +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE cert, DWORD len, LPSTR szlistbox, LPDWORD listbox) +{ + FIXME("stub: %p %d %s %p\n", cert, len, debugstr_a(szlistbox), listbox); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** * ShowX509EncodedCertificate (@) */ DWORD WINAPI ShowX509EncodedCertificate(HWND parent, LPBYTE cert, DWORD len) diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index e4337a2..7ef28d6 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -216,7 +216,7 @@ @ stdcall IsUrlCacheEntryExpiredA(str long ptr) @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) @ stdcall LoadUrlCacheContent() -@ stub ParseX509EncodedCertificateForListBoxEntry +@ stdcall ParseX509EncodedCertificateForListBoxEntry(ptr long str ptr) @ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) @ stdcall PrivacySetZonePreferenceW(long long long wstr) @ stdcall ReadUrlCacheEntryStream(ptr long ptr ptr long) diff --git a/include/winineti.h b/include/winineti.h index 5b6f15f..5e38424 100644 --- a/include/winineti.h +++ b/include/winineti.h @@ -120,6 +120,7 @@ BOOL WINAPI InternetQueryFortezzaStatus(DWORD*,DWORD_PTR); BOOL WINAPI IsUrlCacheEntryExpiredA(LPCSTR,DWORD,FILETIME*); BOOL WINAPI IsUrlCacheEntryExpiredW(LPCWSTR,DWORD,FILETIME*); #define IsUrlCacheEntryExpired WINELIB_NAME_AW(IsUrlCacheEntryExpired) +DWORD WINAPI ParseX509EncodedCertificateForListBoxEntry(LPBYTE,DWORD,LPSTR,LPDWORD); BOOL WINAPI SetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA,DWORD); BOOL WINAPI SetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW,DWORD); #define SetUrlCacheConfigInfo WINELIB_NAME_AW(SetUrlCacheConfigInfo)

1 0

Jarkko Korpi : kernel32: Silence repeated LocaleNameToLCID unsupported flags.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 2a8412e646071986402a25bff46efa0ee3916600 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a8412e646071986402a25bf… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Wed Jul 15 02:38:25 2015 +0300 kernel32: Silence repeated LocaleNameToLCID unsupported flags. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dc5b22963bac51f796e5f9618b18ae2ab9488325) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index e4c323e..7f6c287 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -1396,8 +1396,10 @@ LANGID WINAPI GetSystemDefaultUILanguage(void) LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) { struct locale_name locale_name; + static int once; - if (flags) FIXME( "unsupported flags %x\n", flags ); + if (flags && !once++) + FIXME( "unsupported flags %x\n", flags ); if (name == LOCALE_NAME_USER_DEFAULT) return GetUserDefaultLCID(); @@ -1427,7 +1429,8 @@ LCID WINAPI LocaleNameToLCID( LPCWSTR name, DWORD flags ) */ INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) { - if (flags) FIXME( "unsupported flags %x\n", flags ); + static int once; + if (flags && !once++) FIXME( "unsupported flags %x\n", flags ); return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); }

1 0

Michael Müller : ieframe: Return S_OK in IViewObject: :Draw stub.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 1ccaed20fa86e63e8dfabc166e55dd6e92548bd0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ccaed20fa86e63e8dfabc16… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 28 10:41:07 2018 -0500 ieframe: Return S_OK in IViewObject::Draw stub. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6545037efba8f3ee48f2a48747c1528f9afeb914) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 3e44991..546e251 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -60,7 +60,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %08lx)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue, dwContinue); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect,

1 0

Alistair Leslie-Hughes : pidgen: Add PIDGenSimpA stub.
by Alexandre Julliard 26 Jun '18

26 Jun '18

Module: wine Branch: stable Commit: 83718a7b4a0782402553b87352bee0fe38b043a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83718a7b4a0782402553b873… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Mar 17 10:19:17 2018 +0000 pidgen: Add PIDGenSimpA stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit df408ba3abd75c10af35d647728087cf447d29b0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index 3aa3e84..cf165ea 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -43,3 +43,10 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_a(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index ad5c369..8b7e778 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,6 +1,6 @@ @ stub PIDGenA @ stub PIDGenW -@ stub PIDGenSimpA +@ stdcall PIDGenSimpA(str long long long long long long long long) @ stub PIDGenSimpW @ stub SetupPIDGenA @ stub SetupPIDGenW

1 0