October 2018 - Wine-Commits

Henri Verbeet : wined3d: Move the "buffer_type_hint" field from struct wined3d_buffer to struct wined3d_buffer_gl.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 12b5c9148588464d621131e80a2b751e7dbce55b URL: https://source.winehq.org/git/wine.git/?a=commit;h=12b5c9148588464d621131e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 26 17:01:08 2018 +0330 wined3d: Move the "buffer_type_hint" field from struct wined3d_buffer to struct wined3d_buffer_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 203 +++++++++++++++++++++-------------------- dlls/wined3d/view.c | 14 +-- dlls/wined3d/wined3d_private.h | 3 +- 3 files changed, 115 insertions(+), 105 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=12b5c9148588464d6211…

1 0

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL buffer information.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 15962381e2d52a3e56a0ab352c6e208d80f7cde3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15962381e2d52a3e56a0ab35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 26 17:01:07 2018 +0330 wined3d: Introduce a separate structure for OpenGL buffer information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 10 ++++++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5b3419d..4b66193 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -782,7 +782,7 @@ static void wined3d_buffer_destroy_object(void *object) } heap_free(buffer->maps); - heap_free(buffer); + heap_free(wined3d_buffer_gl(buffer)); } ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) @@ -1444,7 +1444,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) { - struct wined3d_buffer *object; + struct wined3d_buffer_gl *object; HRESULT hr; TRACE("device %p, desc byte_width %u, usage %s, bind_flags %s, access %s, data %p, parent %p, " @@ -1456,7 +1456,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = wined3d_buffer_init(object, device, desc, data, parent, parent_ops))) + if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); heap_free(object); @@ -1465,7 +1465,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct TRACE("Created buffer %p.\n", object); - *buffer = object; + *buffer = &object->b; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3abe5e6..0402603 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3796,6 +3796,16 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; +struct wined3d_buffer_gl +{ + struct wined3d_buffer b; +}; + +static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer) +{ + return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); +} + struct wined3d_rendertarget_view { LONG refcount;

1 0

Henri Verbeet : wined3d: Get rid of the "device" parameter to context_bind_dummy_textures().
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 32e46a98054720e694f47d142db84cbe2f1a0460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32e46a98054720e694f47d14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 26 17:01:05 2018 +0330 wined3d: Get rid of the "device" parameter to context_bind_dummy_textures(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bdd291b..3d1a483 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1743,7 +1743,7 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC } /* Context activation is done by the caller. */ -void context_bind_dummy_textures(const struct wined3d_device *device, const struct wined3d_context *context) +void context_bind_dummy_textures(const struct wined3d_context *context) { const struct wined3d_dummy_textures *textures = &context->device->dummy_textures; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -2287,7 +2287,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, * are not created yet. In that case, they will be created (and bound) by * create_dummy_textures right after this context is initialized. */ if (device->dummy_textures.tex_2d) - context_bind_dummy_textures(device, context); + context_bind_dummy_textures(context); /* Initialise all rectangles to avoid resetting unused ones later. */ gl_info->gl_ops.gl.p_glScissor(0, 0, 0, 0); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b50d667..17ef5d9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -738,7 +738,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("create dummy textures"); - context_bind_dummy_textures(device, context); + context_bind_dummy_textures(context); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 33d248f..88dce65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2156,8 +2156,7 @@ void context_apply_ffp_blit_state(struct wined3d_context *context, void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; -void context_bind_dummy_textures(const struct wined3d_device *device, - const struct wined3d_context *context) DECLSPEC_HIDDEN; +void context_bind_dummy_textures(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint name) DECLSPEC_HIDDEN; void context_check_fbo_status(const struct wined3d_context *context, GLenum target) DECLSPEC_HIDDEN; void context_copy_bo_address(struct wined3d_context *context,

1 0

Alexandre Julliard : ntdll: Partially implement RtlRandomEx().
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 72662305b3e6807ea6d01f320581eae29d5d8a37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=72662305b3e6807ea6d01f32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 13:07:15 2018 +0200 ntdll: Partially implement RtlRandomEx(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 818ae00..87b5d70 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -839,7 +839,7 @@ @ stdcall -norelay RtlRaiseException(ptr) @ stdcall RtlRaiseStatus(long) @ stdcall RtlRandom(ptr) -@ stub RtlRandomEx +@ stdcall RtlRandomEx(ptr) @ stdcall RtlReAllocateHeap(long long ptr long) @ stub RtlReadMemoryStream @ stub RtlReadOutOfProcessMemoryStream diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index d3a4e7d..e80aa5e 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -753,6 +753,15 @@ ULONG WINAPI RtlRandom (PULONG seed) /************************************************************************* + * RtlRandomEx [NTDLL.@] + */ +ULONG WINAPI RtlRandomEx( ULONG *seed ) +{ + WARN( "semi-stub: should use a different algorithm\n" ); + return RtlRandom( seed ); +} + +/************************************************************************* * RtlAreAllAccessesGranted [NTDLL.@] * * Check if all desired accesses are granted diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 422d575..c10fa2f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1144,7 +1144,7 @@ @ stdcall RtlQueryTimeZoneInformation(ptr) @ stdcall -norelay RtlRaiseException(ptr) @ stdcall RtlRandom(ptr) -@ stub RtlRandomEx +@ stdcall RtlRandomEx(ptr) @ stub RtlRealPredecessor @ stub RtlRealSuccessor @ stub RtlRemoveUnicodePrefix

1 0

Alistair Leslie-Hughes : wine.inf: Install oledb32, msdaps to the right location for WOW64.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 61cdd8e352b40c183a4db72302c5125c2d167e71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61cdd8e352b40c183a4db723… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 26 05:21:36 2018 +0000 wine.inf: Install oledb32,msdaps to the right location for WOW64. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b6aeb1c..5a3f8c4 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2577,6 +2577,8 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe 16422,Windows NT\Accessories,wordpad.exe +16427,System\OLE DB,oledb32.dll +16427,System\OLE DB,msdaps.dll 11,,* [FakeDlls]

1 0

Alexandre Julliard : Release 3.19.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: d279bc24934fd1b68324017ae1b9e70975640a0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d279bc24934fd1b68324017a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 21:22:11 2018 +0200 Release 3.19. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 622 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 354 insertions(+), 290 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d279bc24934fd1b68324…

1 0

Tag wine-3.19 : Alexandre Julliard : Release 3.19
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: refs/tags/wine-3.19 Tag: dc91d55e9005d0755b89d9bacdf0adec44266cc7 URL: https://source.winehq.org/git/wine.git/?a=tag;h=dc91d55e9005d0755b89d9bacdf… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 26 21:22:11 2018 +0200 Release 3.19

1 0

Dmitry Timoshkov : crypt32: CertComparePublicKeyInfo should not try to decode a non-RSA public key.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 8f488a71b9a0718b4c36823089df0309194e4e76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f488a71b9a0718b4c368230… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 26 13:17:26 2018 +0300 crypt32: CertComparePublicKeyInfo should not try to decode a non-RSA public key. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 7 +++++++ dlls/crypt32/tests/cert.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 9157814..d09d049 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -28,6 +28,7 @@ #include "winternl.h" #define CRYPT_OID_INFO_HAS_EXTRA_FIELDS #include "wincrypt.h" +#include "snmp.h" #include "bcrypt.h" #include "winnls.h" #include "rpc.h" @@ -1242,6 +1243,12 @@ BOOL WINAPI CertComparePublicKeyInfo(DWORD dwCertEncodingType, TRACE("(%08x, %p, %p)\n", dwCertEncodingType, pPublicKey1, pPublicKey2); + /* RSA public key data should start with ASN_SEQUENCE, + * otherwise it's not a RSA_CSP_PUBLICKEYBLOB. + */ + if (!pPublicKey1->PublicKey.cbData || pPublicKey1->PublicKey.pbData[0] != ASN_SEQUENCE) + dwCertEncodingType = 0; + switch (GET_CERT_ENCODING_TYPE(dwCertEncodingType)) { case 0: /* Seems to mean "raw binary bits" */ diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index cc7bd4c..f653741 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3210,7 +3210,6 @@ static void testComparePublicKeyInfo(void) ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); /* Different OIDs appear to compare */ @@ -3219,14 +3218,12 @@ todo_wine ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); info2.Algorithm.pszObjId = oid_x957_dsa; ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); info1.PublicKey.cbData = sizeof(bits1); @@ -3238,7 +3235,6 @@ todo_wine ret = CertComparePublicKeyInfo(0, &info1, &info2); ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info2); -todo_wine ok(ret, "CertComparePublicKeyInfo failed: %08x\n", GetLastError()); info2.Algorithm.pszObjId = oid_rsa_rsa; @@ -3297,11 +3293,9 @@ todo_wine ret = CertComparePublicKeyInfo(0, &info1, &info1); ok(ret, "CertComparePublicKeyInfo: as raw binary: keys should be equal\n"); ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); -todo_wine ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); info1.PublicKey.cbData--; /* kill one byte, make ASN.1 encoded data invalid */ ret = CertComparePublicKeyInfo(X509_ASN_ENCODING, &info1, &info1); -todo_wine ok(ret, "CertComparePublicKeyInfo: as ASN.1 encoded: keys should be equal\n"); /* ASN.1 encoded non-comparing case */

1 0

Henri Verbeet : wined3d: Move the "buffer_object_usage" field from struct wined3d_buffer to struct wined3d_buffer_gl.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: fc9c8e4758a44f7a76a5193ecbe39fe8e35580e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc9c8e4758a44f7a76a5193e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 26 17:01:09 2018 +0330 wined3d: Move the "buffer_object_usage" field from struct wined3d_buffer to struct wined3d_buffer_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1481e9b..17bcb70 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -257,7 +257,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - buffer_gl->b.buffer_object_usage = gl_usage; + buffer_gl->buffer_object_usage = gl_usage; buffer_invalidate_bo_range(&buffer_gl->b, 0, 0); return TRUE; @@ -827,7 +827,7 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, if (flags & WINED3D_MAP_DISCARD) { GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, - NULL, buffer_gl->b.buffer_object_usage)); + NULL, buffer_gl->buffer_object_usage)); checkGLcall("glBufferData"); return; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 226fdd0..2b52218 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3759,7 +3759,6 @@ struct wined3d_buffer struct wined3d_buffer_desc desc; GLuint buffer_object; - GLenum buffer_object_usage; unsigned int bind_flags; DWORD flags; DWORD locations; @@ -3799,6 +3798,7 @@ struct wined3d_buffer_gl { struct wined3d_buffer b; + GLenum buffer_object_usage; GLenum buffer_type_hint; };

1 0

Dmitry Timoshkov : crypt32: Trace entry contents in CryptInstallOIDFunctionAddress.
by Alexandre Julliard Oct. 26, 2018

Oct. 26, 2018

Module: wine Branch: master Commit: 81b0a38c47ee0d20b9b077f3e7d2860ce85d93f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81b0a38c47ee0d20b9b077f3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 26 13:17:14 2018 +0300 crypt32: Trace entry contents in CryptInstallOIDFunctionAddress. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/oid.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 1eb8282..d6c411c 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -250,6 +250,8 @@ BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, { struct OIDFunction *func; + TRACE("OID %s, func %p\n", debugstr_a(rgFuncEntry[i].pszOID), rgFuncEntry[i].pvFuncAddr); + if (!IS_INTOID(rgFuncEntry[i].pszOID)) func = CryptMemAlloc(sizeof(struct OIDFunction) + strlen(rgFuncEntry[i].pszOID) + 1);

1 0