September 2019 - Wine-devel

[PATCH] wined3d: Allow loading buffers mapped through system memory.
by Paul Gofman 23 Sep '19

23 Sep '19

Fixes rendering dirt on the wind shield and GL_INVALID_OPERATION errors in "Need For Speed Shift 2". The test succeeds on Windows with retail Direct3D 9, but fails with debug Direct3D 9 if selected in DirectX SDK control panel: error code is returned from _DrawIndexedPrimitive() and the triangle is not rendered. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/tests/visual.c | 138 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/buffer.c | 8 ++- 2 files changed, 144 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f23fb566e6..a3c02199ee 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26545,6 +26545,143 @@ done: DestroyWindow(window); } +static void test_draw_mapped_buffer(void) +{ + IDirect3DVertexBuffer9 *vb; + IDirect3DIndexBuffer9 *ib; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + unsigned int i; + D3DCOLOR color; + ULONG refcount; + HWND window; + HRESULT hr; + void *data; + + static const short indices[] = {0, 1, 2}; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad[] = + { + {{-1.0f, -1.0f, 0.1f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.1f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.1f}, 0xffff0000}, + }; + static const struct + { + D3DPOOL pool; + DWORD usage; + BOOL todo; + } + tests[] = + { + {D3DPOOL_DEFAULT, D3DUSAGE_DYNAMIC, TRUE}, + {D3DPOOL_MANAGED, 0}, + {D3DPOOL_SYSTEMMEM, 0}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateIndexBuffer(device, sizeof(indices), 0, + D3DFMT_INDEX16, D3DPOOL_DEFAULT, &ib, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DIndexBuffer9_Lock(ib, 0, sizeof(indices), &data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, indices, sizeof(indices)); + + hr = IDirect3DDevice9_SetIndices(device, ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizeof(quad), tests[i].usage, + D3DFVF_XYZ | D3DFVF_DIFFUSE, tests[i].pool, &vb, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), &data, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad[0])); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, ARRAY_SIZE(quad), 0, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + /* One more time now when buffer object in wined3d is already created. */ + hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad), &data, D3DLOCK_DISCARD); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, ARRAY_SIZE(quad), 0, 1); + ok(hr == D3D_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + color = getPixelColor(device, 160, 120); + + todo_wine_if(tests[i].todo) + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + + color = getPixelColor(device, 480, 360); + ok(color_match(color, 0x000000ff, 1), "Got unexpected color 0x%08x, test %u.\n", color, i); + + hr = IDirect3DVertexBuffer9_Unlock(vb); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + IDirect3DVertexBuffer9_Release(vb); + } + + hr = IDirect3DIndexBuffer9_Unlock(ib); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + IDirect3DIndexBuffer9_Release(ib); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -26690,4 +26827,5 @@ START_TEST(visual) test_nrm_instruction(); test_desktop_window(); test_mismatched_sample_types(); + test_draw_mapped_buffer(); } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 74c40f9f71..e79bd8f187 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -849,11 +849,15 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * TRACE("buffer %p.\n", buffer); - if (buffer->resource.map_count) + if (buffer->resource.map_count && buffer->map_ptr) { - WARN("Buffer is mapped, skipping preload.\n"); + FIXME("Buffer is mapped through buffer object, not loading.\n"); return; } + else if (buffer->resource.map_count) + { + WARN("Loading mapped buffer.\n"); + } buffer_mark_used(buffer); -- 2.21.0

4 6

[PATCH 2/2] bcrypt: Implement BCryptSignHash.
by Hans Leidekker 23 Sep '19

23 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt.spec | 2 +- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 25 +++++++ dlls/bcrypt/gnutls.c | 51 +++++++++++++ dlls/bcrypt/macos.c | 7 ++ dlls/bcrypt/tests/bcrypt.c | 131 +++++++++++++++++++++++++++++++++- 6 files changed, 213 insertions(+), 4 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 1ea3760ba2..95bec876b9 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -48,7 +48,7 @@ @ stub BCryptSetAuditingInterface @ stub BCryptSetContextFunctionProperty @ stdcall BCryptSetProperty(ptr wstr ptr long long) -@ stub BCryptSignHash +@ stdcall BCryptSignHash(ptr ptr ptr long ptr long ptr long) @ stub BCryptUnregisterConfigChangeNotify @ stdcall BCryptUnregisterProvider(wstr) @ stdcall BCryptVerifySignature(ptr ptr ptr long ptr long long) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index ee16762593..bc1bdc2e53 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -229,6 +229,7 @@ NTSTATUS key_symmetric_decrypt( struct key *, const UCHAR *, ULONG, UCHAR *, ULO NTSTATUS key_symmetric_get_tag( struct key *, UCHAR *, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_asymmetric_init( struct key *, struct algorithm *, ULONG, const UCHAR *, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_asymmetric_generate( struct key * ) DECLSPEC_HIDDEN; +NTSTATUS key_asymmetric_sign( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG *, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_asymmetric_verify( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, DWORD ) DECLSPEC_HIDDEN; NTSTATUS key_destroy( struct key * ) DECLSPEC_HIDDEN; BOOL key_is_symmetric( struct key * ) DECLSPEC_HIDDEN; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 369e445db0..647b46cb29 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -1213,6 +1213,13 @@ NTSTATUS key_asymmetric_generate( struct key *key ) return STATUS_NOT_IMPLEMENTED; } +NTSTATUS key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, UCHAR *signature, ULONG signature_len, DWORD flags ) { @@ -1417,6 +1424,24 @@ NTSTATUS WINAPI BCryptImportKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HAN return key_import_pair( alg, type, ret_key, input, input_len ); } +NTSTATUS WINAPI BCryptSignHash( BCRYPT_KEY_HANDLE handle, void *padding, UCHAR *input, ULONG input_len, + UCHAR *output, ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + struct key *key = handle; + + TRACE( "%p, %p, %p, %u, %p, %u, %p, %08x\n", handle, padding, input, input_len, output, output_len, + ret_len, flags ); + + if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (key_is_symmetric( key )) + { + FIXME( "signing with symmetric keys not yet supported\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + return key_asymmetric_sign( key, padding, input, input_len, output, output_len, ret_len, flags ); +} + NTSTATUS WINAPI BCryptVerifySignature( BCRYPT_KEY_HANDLE handle, void *padding, UCHAR *hash, ULONG hash_len, UCHAR *signature, ULONG signature_len, ULONG flags ) { diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 8b2cc8b316..5b59b617aa 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -99,6 +99,7 @@ MAKE_FUNCPTR(gnutls_global_set_log_level); MAKE_FUNCPTR(gnutls_perror); MAKE_FUNCPTR(gnutls_privkey_deinit); MAKE_FUNCPTR(gnutls_privkey_init); +MAKE_FUNCPTR(gnutls_privkey_sign_hash); MAKE_FUNCPTR(gnutls_pubkey_deinit); MAKE_FUNCPTR(gnutls_pubkey_init); #undef MAKE_FUNCPTR @@ -195,6 +196,7 @@ BOOL gnutls_initialize(void) LOAD_FUNCPTR(gnutls_perror) LOAD_FUNCPTR(gnutls_privkey_deinit); LOAD_FUNCPTR(gnutls_privkey_init); + LOAD_FUNCPTR(gnutls_privkey_sign_hash); LOAD_FUNCPTR(gnutls_pubkey_deinit); LOAD_FUNCPTR(gnutls_pubkey_init); #undef LOAD_FUNCPTR @@ -1067,6 +1069,55 @@ NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULO return (ret < 0) ? STATUS_INVALID_SIGNATURE : STATUS_SUCCESS; } +NTSTATUS key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len, ULONG flags ) +{ + BCRYPT_PKCS1_PADDING_INFO *pad = padding; + gnutls_datum_t hash, signature; + int ret; + + if (key->alg_id != ALG_ID_RSA) + { + FIXME( "algorithm %u not supported\n", key->alg_id ); + return STATUS_NOT_IMPLEMENTED; + } + if (flags != BCRYPT_PAD_PKCS1) + { + FIXME( "flags %08x not implemented\n", flags ); + return STATUS_NOT_IMPLEMENTED; + } + if (!pad || !pad->pszAlgId || lstrcmpiW(pad->pszAlgId, BCRYPT_SHA1_ALGORITHM)) + { + FIXME( "%s padding not implemented\n", debugstr_w(pad ? pad->pszAlgId : NULL) ); + return STATUS_NOT_IMPLEMENTED; + } + + if (!input) + { + *ret_len = key->u.a.bitlen / 8; + return STATUS_SUCCESS; + } + if (!key->u.a.handle) return STATUS_INVALID_PARAMETER; + + hash.data = input; + hash.size = input_len; + + signature.data = NULL; + signature.size = 0; + + if ((ret = pgnutls_privkey_sign_hash( key->u.a.handle, GNUTLS_DIG_SHA1, 0, &hash, &signature ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (output_len >= signature.size) memcpy( output, signature.data, signature.size ); + *ret_len = signature.size; + + free( signature.data ); + return STATUS_SUCCESS; +} + NTSTATUS key_destroy( struct key *key ) { if (key_is_symmetric( key )) diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index 0dd1066130..0f7b14ff95 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -199,6 +199,13 @@ NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, ULONG bitl return STATUS_NOT_IMPLEMENTED; } +NTSTATUS key_asymmetric_sign( struct key *key, void *padding, UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len, ULONG *ret_len ) +{ + FIXME( "not implemented on Mac\n" ); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS key_asymmetric_verify( struct key *key, void *padding, UCHAR *hash, ULONG hash_len, UCHAR *signature, ULONG signature_len, DWORD flags ) { diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index b8678a520d..8975800f43 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -59,6 +59,7 @@ static NTSTATUS (WINAPI *pBCryptImportKeyPair)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HAN UCHAR *, ULONG, ULONG); static NTSTATUS (WINAPI *pBCryptOpenAlgorithmProvider)(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); static NTSTATUS (WINAPI *pBCryptSetProperty)(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptSignHash)(BCRYPT_KEY_HANDLE, void *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptVerifySignature)(BCRYPT_KEY_HANDLE, VOID *, UCHAR *, ULONG, UCHAR *, ULONG, ULONG); static void test_BCryptGenRandom(void) @@ -1783,10 +1784,16 @@ static UCHAR rsaSignature[] = static void test_RSA(void) { + static UCHAR hash[] = + {0x7e,0xe3,0x74,0xe7,0xc5,0x0b,0x6b,0x70,0xdb,0xab,0x32,0x6d,0x1d,0x51,0xd6,0x74,0x79,0x8e,0x5b,0x4b}; BCRYPT_PKCS1_PADDING_INFO pad; - BCRYPT_ALG_HANDLE alg = NULL; - BCRYPT_KEY_HANDLE key = NULL; + BCRYPT_ALG_HANDLE alg; + BCRYPT_KEY_HANDLE key; + BCRYPT_RSAKEY_BLOB *rsablob; + UCHAR sig[64]; + ULONG len, size; NTSTATUS ret; + BYTE *buf; ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) @@ -1823,8 +1830,48 @@ static void test_RSA(void) ret = pBCryptDestroyKey(key); ok(!ret, "pBCryptDestroyKey failed: %08x\n", ret); + /* sign/verify with export/import round-trip */ + ret = pBCryptGenerateKeyPair(alg, &key, 512, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + memset(sig, 0, sizeof(sig)); + ret = pBCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %08x\n", ret); + + size = 0; + ret = pBCryptExportKey(key, NULL, BCRYPT_RSAPUBLIC_BLOB, NULL, 0, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size, "size not set\n"); + + buf = HeapAlloc(GetProcessHeap(), 0, size); + ret = pBCryptExportKey(key, NULL, BCRYPT_RSAPUBLIC_BLOB, buf, size, &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + rsablob = (BCRYPT_RSAKEY_BLOB *)buf; + ok(rsablob->Magic == BCRYPT_RSAPUBLIC_MAGIC, "got %08x\n", rsablob->Magic); + ok(rsablob->BitLength == 512, "got %u\n", rsablob->BitLength); + ok(rsablob->cbPublicExp == 3, "got %u\n", rsablob->cbPublicExp); + ok(rsablob->cbModulus == 64, "got %u\n", rsablob->cbModulus); + ok(!rsablob->cbPrime1, "got %u\n", rsablob->cbPrime1); + ok(!rsablob->cbPrime2, "got %u\n", rsablob->cbPrime2); + ok(size == sizeof(*rsablob) + rsablob->cbPublicExp + rsablob->cbModulus, "got %u\n", size); + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, buf, size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + HeapFree(GetProcessHeap(), 0, buf); + + ret = pBCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %08x\n", ret); + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + ret = pBCryptCloseAlgorithmProvider(alg, 0); - ok(!ret, "pBCryptCloseAlgorithmProvider failed: %08x\n", ret); + ok(!ret, "got %08x\n", ret); } static void test_RSA_SIGN(void) @@ -1977,6 +2024,82 @@ static void test_BCryptEnumContextFunctions(void) if (status == STATUS_SUCCESS) pBCryptFreeBuffer( buffer ); } +static BYTE rsapublic[] = +{ + 0x52, 0x53, 0x41, 0x31, 0x00, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0xd5, 0xfe, 0xf6, 0x7a, 0x9a, 0xa1, 0x2d, 0xcf, 0x98, + 0x60, 0xca, 0x38, 0x60, 0x0b, 0x74, 0x4c, 0x7e, 0xa1, 0x42, 0x64, 0xad, 0x05, 0xa5, 0x29, 0x25, 0xcb, 0xd5, + 0x9c, 0xaf, 0x6f, 0x63, 0x85, 0x6d, 0x5b, 0x59, 0xe5, 0x17, 0x8f, 0xf9, 0x18, 0x90, 0xa7, 0x63, 0xae, 0xe0, + 0x3a, 0x62, 0xf7, 0x98, 0x57, 0xe9, 0x91, 0xda, 0xfb, 0xd9, 0x36, 0x45, 0xe4, 0x9e, 0x75, 0xf6, 0x73, 0xc4, + 0x99, 0x23, 0x21, 0x1b, 0x3d, 0xe1, 0xe0, 0xa6, 0xa0, 0x4a, 0x50, 0x2a, 0xcb, 0x2a, 0x50, 0xf0, 0x8b, 0x70, + 0x9c, 0xe4, 0x1a, 0x14, 0x3b, 0xbe, 0x35, 0xa5, 0x5a, 0x91, 0xa3, 0xa1, 0x82, 0xea, 0x84, 0x4d, 0xe8, 0x62, + 0x3b, 0x11, 0xec, 0x61, 0x09, 0x6c, 0xfe, 0xb2, 0xcc, 0x4b, 0xa8, 0xff, 0xaf, 0x73, 0x72, 0x05, 0x4e, 0x7e, + 0xe5, 0x73, 0xdf, 0x24, 0xcf, 0x7f, 0x5d, 0xaf, 0x8a, 0xf0, 0xd8, 0xcb, 0x08, 0x1e, 0xf2, 0x36, 0x70, 0x8d, + 0x1b, 0x9e, 0xc8, 0x98, 0x60, 0x54, 0xeb, 0x45, 0x34, 0x21, 0x43, 0x4d, 0x42, 0x0a, 0x3a, 0x2d, 0x0f, 0x0e, + 0xd6, 0x0d, 0xe4, 0x2e, 0x8c, 0x31, 0x87, 0xa8, 0x09, 0x89, 0x61, 0x16, 0xca, 0x5b, 0xbe, 0x76, 0x69, 0xbb, + 0xfd, 0x91, 0x63, 0xd2, 0x66, 0x57, 0x08, 0xef, 0xe2, 0x40, 0x67, 0xd7, 0x7f, 0x50, 0x15, 0x42, 0x33, 0x97, + 0x54, 0x73, 0x47, 0xe7, 0x9c, 0x14, 0xa8, 0xb0, 0x3d, 0xc9, 0x23, 0xb0, 0x27, 0x3b, 0xe7, 0xdd, 0x5f, 0xd1, + 0x4f, 0x31, 0x10, 0x7d, 0xdd, 0x69, 0x8e, 0xde, 0xa3, 0xe8, 0x92, 0x00, 0xfa, 0xa5, 0xa4, 0x40, 0x51, 0x23, + 0x82, 0x84, 0xc7, 0xce, 0x19, 0x61, 0x26, 0xf1, 0xae, 0xf3, 0x90, 0x93, 0x98, 0x56, 0x23, 0x9a, 0xd1, 0xbd, + 0xf2, 0xdf, 0xfd, 0x13, 0x9c, 0x30, 0x07, 0xf9, 0x5a, 0x2e, 0x00, 0xc6, 0x1f +}; + +static void test_BCryptSignHash(void) +{ + static UCHAR hash[] = + {0x7e,0xe3,0x74,0xe7,0xc5,0x0b,0x6b,0x70,0xdb,0xab,0x32,0x6d,0x1d,0x51,0xd6,0x74,0x79,0x8e,0x5b,0x4b}; + BCRYPT_PKCS1_PADDING_INFO pad; + BCRYPT_ALG_HANDLE alg; + BCRYPT_KEY_HANDLE key; + UCHAR sig[256]; + NTSTATUS ret; + ULONG len; + + ret = pBCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); + if (ret) + { + win_skip("failed to open RSA provider: %08x\n", ret); + return; + } + + /* public key */ + ret = pBCryptImportKeyPair(alg, NULL, BCRYPT_RSAPUBLIC_BLOB, &key, rsapublic, sizeof(rsapublic), 0); + ok(!ret, "got %08x\n", ret); + + len = 0; + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; + ret = pBCryptSignHash(key, &pad, NULL, 0, NULL, 0, &len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %08x\n", ret); + ok(len == 256, "got %u\n", len); + + len = 0; + ret = pBCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); + ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_INTERNAL_ERROR) /* < win7 */, "got %08x\n", ret); + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptGenerateKeyPair(alg, &key, 512, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptFinalizeKeyPair(key, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + len = 0; + memset(sig, 0, sizeof(sig)); + ret = pBCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %08x\n", ret); + ok(len == 64, "got %u\n", len); + + ret = pBCryptVerifySignature(key, &pad, hash, sizeof(hash), sig, len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptDestroyKey(key); + ok(!ret, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(alg, 0); + ok(!ret, "got %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -2013,6 +2136,7 @@ START_TEST(bcrypt) pBCryptImportKeyPair = (void *)GetProcAddress(module, "BCryptImportKeyPair"); pBCryptOpenAlgorithmProvider = (void *)GetProcAddress(module, "BCryptOpenAlgorithmProvider"); pBCryptSetProperty = (void *)GetProcAddress(module, "BCryptSetProperty"); + pBCryptSignHash = (void *)GetProcAddress(module, "BCryptSignHash"); pBCryptVerifySignature = (void *)GetProcAddress(module, "BCryptVerifySignature"); test_BCryptGenRandom(); @@ -2031,6 +2155,7 @@ START_TEST(bcrypt) test_RSA_SIGN(); test_ECDH(); test_BCryptEnumContextFunctions(); + test_BCryptSignHash(); FreeLibrary(module); } -- 2.20.1

1 0

[PATCH 1/2] bcrypt: Add support for generating RSA keys.
by Hans Leidekker 23 Sep '19

23 Sep '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 4 +- dlls/bcrypt/bcrypt_main.c | 24 ++++++-- dlls/bcrypt/gnutls.c | 101 ++++++++++++++++++++++++++++++++-- dlls/bcrypt/macos.c | 3 +- 4 files changed, 118 insertions(+), 14 deletions(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 943c33d2b2..ee16762593 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -158,6 +158,7 @@ struct key_symmetric struct key_asymmetric { gnutls_privkey_t handle; + ULONG bitlen; /* ignored for ECC keys */ UCHAR *pubkey; ULONG pubkey_len; }; @@ -185,6 +186,7 @@ struct key_symmetric struct key_asymmetric { + ULONG bitlen; UCHAR *pubkey; ULONG pubkey_len; }; @@ -225,7 +227,7 @@ NTSTATUS key_symmetric_set_auth_data( struct key *, UCHAR *, ULONG ) DECLSPEC_HI NTSTATUS key_symmetric_encrypt( struct key *, const UCHAR *, ULONG, UCHAR *, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_symmetric_decrypt( struct key *, const UCHAR *, ULONG, UCHAR *, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_symmetric_get_tag( struct key *, UCHAR *, ULONG ) DECLSPEC_HIDDEN; -NTSTATUS key_asymmetric_init( struct key *, struct algorithm *, const UCHAR *, ULONG ) DECLSPEC_HIDDEN; +NTSTATUS key_asymmetric_init( struct key *, struct algorithm *, ULONG, const UCHAR *, ULONG ) DECLSPEC_HIDDEN; NTSTATUS key_asymmetric_generate( struct key * ) DECLSPEC_HIDDEN; NTSTATUS key_asymmetric_verify( struct key *, void *, UCHAR *, ULONG, UCHAR *, ULONG, DWORD ) DECLSPEC_HIDDEN; NTSTATUS key_destroy( struct key * ) DECLSPEC_HIDDEN; diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 79660c1cf1..369e445db0 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -854,6 +854,14 @@ static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, U memcpy( output + sizeof(len), key->u.s.secret, key->u.s.secret_len ); return STATUS_SUCCESS; } + else if (!strcmpW( type, BCRYPT_RSAPUBLIC_BLOB )) + { + *size = key->u.a.pubkey_len; + if (output_len < key->u.a.pubkey_len) return STATUS_SUCCESS; + + memcpy( output, key->u.a.pubkey, key->u.a.pubkey_len ); + return STATUS_SUCCESS; + } else if (!strcmpW( type, BCRYPT_ECCPUBLIC_BLOB )) { *size = key->u.a.pubkey_len; @@ -1059,7 +1067,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP if (!strcmpW( type, BCRYPT_ECCPUBLIC_BLOB )) { BCRYPT_ECCKEY_BLOB *ecc_blob = (BCRYPT_ECCKEY_BLOB *)input; - DWORD key_size, magic; + DWORD key_size, magic, size; if (input_len < sizeof(*ecc_blob)) return STATUS_INVALID_PARAMETER; @@ -1091,7 +1099,9 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - if ((status = key_asymmetric_init( key, alg, (BYTE *)ecc_blob, sizeof(*ecc_blob) + ecc_blob->cbKey * 2 ))) + + size = sizeof(*ecc_blob) + ecc_blob->cbKey * 2; + if ((status = key_asymmetric_init( key, alg, key_size * 8, (BYTE *)ecc_blob, size ))) { heap_free( key ); return status; @@ -1125,7 +1135,8 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - if ((status = key_asymmetric_init( key, alg, NULL, 0 ))) + + if ((status = key_asymmetric_init( key, alg, key_size * 8, NULL, 0 ))) { heap_free( key ); return status; @@ -1151,7 +1162,7 @@ static NTSTATUS key_import_pair( struct algorithm *alg, const WCHAR *type, BCRYP key->hdr.magic = MAGIC_KEY; size = sizeof(*rsa_blob) + rsa_blob->cbPublicExp + rsa_blob->cbModulus; - if ((status = key_asymmetric_init( key, alg, (BYTE *)rsa_blob, size ))) + if ((status = key_asymmetric_init( key, alg, rsa_blob->BitLength, (BYTE *)rsa_blob, size ))) { heap_free( key ); return status; @@ -1189,7 +1200,8 @@ static NTSTATUS key_duplicate( struct key *key_orig, struct key *key_copy ) return STATUS_NOT_IMPLEMENTED; } -NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHAR *pubkey, ULONG pubkey_len ) +NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, ULONG bitlen, const UCHAR *pubkey, + ULONG pubkey_len ) { ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; @@ -1302,7 +1314,7 @@ NTSTATUS WINAPI BCryptGenerateKeyPair( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_H if (!(key = heap_alloc_zero( sizeof(*key) ))) return STATUS_NO_MEMORY; key->hdr.magic = MAGIC_KEY; - if ((status = key_asymmetric_init( key, alg, NULL, 0 ))) + if ((status = key_asymmetric_init( key, alg, key_len, NULL, 0 ))) { heap_free( key ); return status; diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 583a0e47e6..8b2cc8b316 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -81,6 +81,9 @@ static int (*pgnutls_pubkey_import_rsa_raw)(gnutls_pubkey_t key, const gnutls_da /* Not present in gnutls version < 3.3.0 */ static int (*pgnutls_privkey_export_ecc_raw)(gnutls_privkey_t, gnutls_ecc_curve_t *, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *); +static int (*pgnutls_privkey_export_rsa_raw)(gnutls_privkey_t, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *, + gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *, gnutls_datum_t *, + gnutls_datum_t *); static int (*pgnutls_privkey_generate)(gnutls_privkey_t, gnutls_pk_algorithm_t, unsigned int, unsigned int); static void *libgnutls_handle; @@ -116,6 +119,13 @@ static int compat_gnutls_pubkey_import_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_c return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_privkey_export_rsa_raw(gnutls_privkey_t key, gnutls_datum_t *m, gnutls_datum_t *e, + gnutls_datum_t *d, gnutls_datum_t *p, gnutls_datum_t *q, + gnutls_datum_t *u, gnutls_datum_t *e1, gnutls_datum_t *e2) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static int compat_gnutls_privkey_export_ecc_raw(gnutls_privkey_t key, gnutls_ecc_curve_t *curve, gnutls_datum_t *x, gnutls_datum_t *y, gnutls_datum_t *k) { @@ -210,6 +220,11 @@ BOOL gnutls_initialize(void) WARN("gnutls_pubkey_import_ecc_raw not found\n"); pgnutls_pubkey_import_ecc_raw = compat_gnutls_pubkey_import_ecc_raw; } + if (!(pgnutls_privkey_export_rsa_raw = wine_dlsym( libgnutls_handle, "gnutls_privkey_export_rsa_raw", NULL, 0 ))) + { + WARN("gnutls_privkey_export_rsa_raw not found\n"); + pgnutls_privkey_export_rsa_raw = compat_gnutls_privkey_export_rsa_raw; + } if (!(pgnutls_privkey_export_ecc_raw = wine_dlsym( libgnutls_handle, "gnutls_privkey_export_ecc_raw", NULL, 0 ))) { WARN("gnutls_privkey_export_ecc_raw not found\n"); @@ -535,6 +550,58 @@ NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) return STATUS_SUCCESS; } +static NTSTATUS export_gnutls_pubkey_rsa( gnutls_privkey_t gnutls_key, ULONG bitlen, UCHAR **pubkey, ULONG *pubkey_len ) +{ + BCRYPT_RSAKEY_BLOB *rsa_blob; + gnutls_datum_t m, e; + UCHAR *dst, *src; + int ret; + + if ((ret = pgnutls_privkey_export_rsa_raw( gnutls_key, &m, &e, NULL, NULL, NULL, NULL, NULL, NULL ))) + { + pgnutls_perror( ret ); + return STATUS_INTERNAL_ERROR; + } + + if (!(rsa_blob = heap_alloc( sizeof(*rsa_blob) + e.size + m.size ))) + { + pgnutls_perror( ret ); + free( e.data ); free( m.data ); + return STATUS_NO_MEMORY; + } + + dst = (UCHAR *)(rsa_blob + 1); + if (e.size == bitlen / 8 + 1 && !e.data[0]) + { + src = e.data + 1; + e.size--; + } + else src = e.data; + memcpy( dst, src, e.size ); + + dst += e.size; + if (m.size == bitlen / 8 + 1 && !m.data[0]) + { + src = m.data + 1; + m.size--; + } + else src = m.data; + memcpy( dst, src, m.size ); + + rsa_blob->Magic = BCRYPT_RSAPUBLIC_MAGIC; + rsa_blob->BitLength = bitlen; + rsa_blob->cbPublicExp = e.size; + rsa_blob->cbModulus = m.size; + rsa_blob->cbPrime1 = 0; + rsa_blob->cbPrime2 = 0; + + *pubkey = (UCHAR *)rsa_blob; + *pubkey_len = sizeof(*rsa_blob) + e.size + m.size; + + free( e.data ); free( m.data ); + return STATUS_SUCCESS; +} + static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, UCHAR **pubkey, ULONG *pubkey_len ) { BCRYPT_ECCKEY_BLOB *ecc_blob; @@ -593,8 +660,8 @@ static NTSTATUS export_gnutls_pubkey_ecc( gnutls_privkey_t gnutls_key, UCHAR **p NTSTATUS key_asymmetric_generate( struct key *key ) { gnutls_pk_algorithm_t pk_alg; - gnutls_ecc_curve_t curve; gnutls_privkey_t handle; + unsigned int bitlen; NTSTATUS status; int ret; @@ -602,9 +669,14 @@ NTSTATUS key_asymmetric_generate( struct key *key ) switch (key->alg_id) { + case ALG_ID_RSA: + pk_alg = GNUTLS_PK_RSA; + bitlen = key->u.a.bitlen; + break; + case ALG_ID_ECDH_P256: pk_alg = GNUTLS_PK_ECC; /* compatible with ECDSA and ECDH */ - curve = GNUTLS_ECC_CURVE_SECP256R1; + bitlen = GNUTLS_CURVE_TO_BITS( GNUTLS_ECC_CURVE_SECP256R1 ); break; default: @@ -618,14 +690,29 @@ NTSTATUS key_asymmetric_generate( struct key *key ) return STATUS_INTERNAL_ERROR; } - if ((ret = pgnutls_privkey_generate( handle, pk_alg, GNUTLS_CURVE_TO_BITS(curve), 0 ))) + if ((ret = pgnutls_privkey_generate( handle, pk_alg, bitlen, 0 ))) { pgnutls_perror( ret ); pgnutls_privkey_deinit( handle ); return STATUS_INTERNAL_ERROR; } - if ((status = export_gnutls_pubkey_ecc( handle, &key->u.a.pubkey, &key->u.a.pubkey_len ))) + switch (pk_alg) + { + case GNUTLS_PK_RSA: + status = export_gnutls_pubkey_rsa( handle, key->u.a.bitlen, &key->u.a.pubkey, &key->u.a.pubkey_len ); + break; + + case GNUTLS_PK_ECC: + status = export_gnutls_pubkey_ecc( handle, &key->u.a.pubkey, &key->u.a.pubkey_len ); + break; + + default: + ERR( "unhandled algorithm %u\n", pk_alg ); + return STATUS_INTERNAL_ERROR; + } + + if (status) { pgnutls_privkey_deinit( handle ); return status; @@ -741,7 +828,8 @@ NTSTATUS key_import_ecc( struct key *key, UCHAR *buf, ULONG len ) return STATUS_SUCCESS; } -NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHAR *pubkey, ULONG pubkey_len ) +NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, ULONG bitlen, const UCHAR *pubkey, + ULONG pubkey_len ) { if (!libgnutls_handle) return STATUS_INTERNAL_ERROR; @@ -764,7 +852,8 @@ NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHA memcpy( key->u.a.pubkey, pubkey, pubkey_len ); key->u.a.pubkey_len = pubkey_len; } - key->alg_id = alg->id; + key->alg_id = alg->id; + key->u.a.bitlen = bitlen; return STATUS_SUCCESS; } diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c index df79f3e80d..0dd1066130 100644 --- a/dlls/bcrypt/macos.c +++ b/dlls/bcrypt/macos.c @@ -192,7 +192,8 @@ NTSTATUS key_symmetric_get_tag( struct key *key, UCHAR *tag, ULONG len ) return STATUS_NOT_IMPLEMENTED; } -NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, const UCHAR *pubkey, ULONG pubkey_len ) +NTSTATUS key_asymmetric_init( struct key *key, struct algorithm *alg, ULONG bitlen, const UCHAR *pubkey, + ULONG pubkey_len ) { FIXME( "not implemented on Mac\n" ); return STATUS_NOT_IMPLEMENTED; -- 2.20.1

1 0

Fwd: [PATCH] kernel32: Make GetFinalPathNameByHandle warn on mounted folder.
by Jeff Smith 23 Sep '19

23 Sep '19

On Mon, Sep 23, 2019 at 1:01 AM Zhiyi Zhang <zzhang(a)codeweavers.com> wrote: > > Hi Jeff, > > It would be better if you could add some tests for this. > For example, add a test that shows the failures on wine > and then next patch fix it and remove todo_wines. I normally do add tests, but in this case I wasn't certain how to set up a test that relies on a particular system and wine configuration. Specifically, this needs to be run on a path, on a mounted drive without a mapped drive letter, on a mounted drive with a mapped drive letter. For instance: Z: is mapped to / and /home is a mount (but is not mapped to a drive letter) and the test would operate on /home/jeff. > And is this for winehq bug 47787? Yes, though I wouldn't say it really addresses the issue, just makes it a bit clearer why it fails when it does. I explained a bit further in bz (where I link to the patch). > Thanks, > Zhiyi > > On 9/23/19 1:10 PM, Jeff Smith wrote: > > GetFinalPathNameByHandle attempts to translate a volume mount point to > > an NT volume name using QueryDosDevice, but this can only succeed if the > > mount point is a drive letter. When GetVolumeNameForVolumeMountPoint > > encounters a similiar situation, it emits a fixme message. > > > > When attempting to translate a volume mount point to an NT volume name > > with GetFinalPathNameByHandle, for a mount point that is not a drive > > letter, emit a fixme message. > > > > Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> > > --- > > dlls/kernel32/file.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c > > index 2b6a13fc0d..2d52b0a165 100644 > > --- a/dlls/kernel32/file.c > > +++ b/dlls/kernel32/file.c > > @@ -1442,6 +1442,14 @@ DWORD WINAPI GetFinalPathNameByHandleW(HANDLE file, LPWSTR path, DWORD charcount > > { > > WCHAR nt_prefix[MAX_PATH]; > > > > + /* if length of drive_part is > 3 then it must be a mounted folder */ > > + if (drive_part_len > 3) > > + { > > + FIXME("Mounted Folders are not yet supported\n"); > > + SetLastError( ERROR_NOT_A_REPARSE_POINT ); > > + return 0; > > + } > > + > > /* QueryDosDeviceW sets error code on failure */ > > drive_part[drive_part_len - 1] = 0; > > if (!QueryDosDeviceW( drive_part, nt_prefix, MAX_PATH )) >

1 0

[PATCH v2] vbscript: Handle NULL code text in ParseScriptText and ParseProcedureText.
by Gabriel Ivăncescu 23 Sep '19

23 Sep '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/tests/run.c | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 0527297..d78e096 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1822,6 +1822,8 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; + if (!src) src = L""; + hres = parse_script(&ctx.parser, src, delimiter, flags); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 8e51e3c..ebcc883 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1917,6 +1917,10 @@ static void test_parse_context(void) hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + /* NULL code text succeeds but does nothing */ + hres = IActiveScriptParse_ParseScriptText(parser, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + /* unknown identifier context is not a valid argument */ str = a2bstr("Call reportSuccess()\n"); hres = IActiveScriptParse_ParseScriptText(parser, str, yW, NULL, NULL, 0, 0, 0, NULL, NULL); @@ -2003,6 +2007,7 @@ static void test_procedures(void) DISPPARAMS dp = {NULL}; IActiveScript *script; IDispatchEx *proc; + IDispatch *disp; EXCEPINFO ei = {0}; VARIANT v; HRESULT hres; @@ -2012,6 +2017,10 @@ static void test_procedures(void) hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, emptyW, NULL, NULL, NULL, 0, 0, 0, &disp); + ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); + IDispatch_Release(disp); + proc = parse_procedure(parse_proc, "dim x\nif true then x=false", 0); V_VT(&v) = VT_EMPTY; -- 2.21.0

2 1

[PATCH] msscript.ocx: Avoid buffer overflow when getting the type info.
by Gabriel Ivăncescu 23 Sep '19

23 Sep '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 6e4c8d1..8fdcf20 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -139,6 +139,8 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) { HRESULT hres; + if (tid >= ARRAY_SIZE(typeinfos)) + return DISP_E_BADINDEX; if (!typelib) hres = load_typelib(); if (!typelib) -- 2.21.0

2 4

[PATCH v2] user32: Send a WM_ACTIVATE message after restoring a minimized window.
by Zhiyi Zhang 23 Sep '19

23 Sep '19

The WmShowRestoreMinimizedOverlappedSeq message sequence in tests clearly show that there is a WM_ACTIVATE message at the end of ShowWindow() calls after restoring a minimized window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47507 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 169418. Add more tests to show that WM_ACTIVATE is not from SetFocus. dlls/user32/tests/msg.c | 268 +++++++++++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 9 +- 2 files changed, 275 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2766e7f5fb..70858644be 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -892,6 +892,157 @@ static const struct message WmShowVisMaxPopupSeq[] = { { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { 0 } }; +/* ShowWindow(hwnd, SW_RESTORE) to a minimized window */ +static const struct message WmShowRestoreMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { HCBT_ACTIVATE, hook }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam, WA_ACTIVE }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent|defwinproc }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and focused */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to a minimized window */ +static const struct message WmShowNoActivateMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + /* Following optional messages are on XP/2003 */ + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + { HCBT_ACTIVATE, hook|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_NCACTIVATE, sent|optional }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ACTIVATE, sent|wparam|optional, WA_ACTIVE }, + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|defwinproc|optional }, + { WM_KILLFOCUS, sent|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message on XP even if the window is already active and focused */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_RESTORE) to an active minimized window */ +static const struct message WmShowRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE message even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_SHOWNOACTIVATE) to an active minimized window */ +static const struct message WmShowNoActivateActiveMinimizedOverlappedSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + /* Following optional messages are present on XP */ + { HCBT_SETFOCUS, hook|optional }, + { WM_SETFOCUS, sent|optional }, + /* Note this WM_ACTIVATE message even if the window is already active and with flag SW_SHOWNOACTIVATE */ + { WM_ACTIVATE, sent|wparam|lparam|optional, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; +/* ShowWindow(hwnd, SW_RESTORE) to a minimized child window. Here are messages received by the parent */ +static const struct message WmShowRestoreMinimizedChildSeq[] = +{ + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_NCCALCSIZE, sent }, + { WM_CHILDACTIVATE, sent }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { HCBT_SETFOCUS, hook }, + { WM_KILLFOCUS, sent|optional }, + { WM_SETFOCUS, sent }, + { WM_PAINT, sent }, + { WM_PAINT, sent }, + { WM_NCPAINT, sent|beginpaint }, + { WM_ERASEBKGND, sent|beginpaint }, + { 0 } +}; /* CreateWindow (for a child popup window, not initially visible) */ static const struct message WmCreateChildPopupSeq[] = { { HCBT_CREATEWND, hook }, @@ -4636,7 +4787,7 @@ static void test_scroll_messages(HWND hwnd) static void test_showwindow(void) { - HWND hwnd, hchild; + HWND hwnd, hwnd2, hchild; RECT rc; hwnd = CreateWindowExA(0, "TestWindowClass", "Test overlapped", WS_OVERLAPPEDWINDOW, @@ -4773,6 +4924,80 @@ static void test_showwindow(void) ok_sequence(WmShowVisMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE); DestroyWindow(hwnd); flush_sequence(); + + /* Test 5: + * 1. Restoring a minimized window. + */ + hwnd = CreateWindowA("TestWindowClass", "window1", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + hwnd2 = CreateWindowA("static", "window2", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd2 != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd2); + ok(GetActiveWindow() == hwnd2, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE): minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd2); + ok(GetActiveWindow() == hwnd2, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE): minimized overlapped", TRUE); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + flush_sequence(); + + /* Test 6: + * 1. Restoring a minimized but active window. + */ + hwnd = CreateWindowA("TestWindowClass", "parent", WS_VISIBLE | WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_RESTORE): active minimized overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hwnd, SW_SHOWNOACTIVATE); + flush_events(); + ok_sequence(WmShowNoActivateActiveMinimizedOverlappedSeq, + "ShowWindow(hwnd, SW_SHOWNOACTIVATE): active minimized overlapped", TRUE); + + hchild = CreateWindowA("TestWindowClass", "child", WS_VISIBLE | WS_CHILD, 0, 0, 100, 100, hwnd, 0, 0, 0); + ok(hchild != NULL, "Failed to create child window\n"); + ShowWindow(hchild, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); + flush_sequence(); + ShowWindow(hchild, SW_RESTORE); + flush_events(); + ok_sequence(WmShowRestoreMinimizedChildSeq, "ShowWindow(hwnd, SW_RESTORE): minimized child", FALSE); + DestroyWindow(hchild); + + DestroyWindow(hwnd); + flush_sequence(); } static void test_sys_menu(void) @@ -15415,6 +15640,39 @@ static const struct message WmRestoreMinimizedOverlappedSeq[] = { 0 } }; +/* DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0) to an active minimized window */ +static const struct message WmRestoreActiveMinimizedOverlappedSeq[] = +{ + { HCBT_SYSCOMMAND, hook|wparam|lparam, SC_RESTORE, 0 }, + { HCBT_MINMAX, hook }, + { WM_QUERYOPEN, sent }, + { WM_NCACTIVATE, sent }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_NCCALCSIZE, sent|optional }, + { WM_MOVE, sent|optional }, + { WM_SIZE, sent|optional }, + { WM_GETTEXT, sent|optional }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_GETMINMAXINFO, sent|defwinproc }, + { WM_NCCALCSIZE, sent }, + { WM_NCPAINT, sent }, + { WM_GETTEXT, sent|defwinproc|optional }, + { WM_ERASEBKGND, sent }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, + { WM_MOVE, sent|defwinproc }, + { WM_SIZE, sent|defwinproc }, + { WM_NCCALCSIZE, sent|optional }, + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { HCBT_SETFOCUS, hook }, + { WM_SETFOCUS, sent }, + /* Note this WM_ACTIVATE messages even if the window is already active */ + { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, + { WM_PAINT, sent }, + { 0 } +}; + struct rbuttonup_thread_data { HWND hwnd; @@ -15476,7 +15734,15 @@ static void test_defwinproc(void) DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); flush_events(); ok_sequence(WmRestoreMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):overlapped", TRUE); + + ShowWindow(hwnd, SW_MINIMIZE); + SetActiveWindow(hwnd); + ok(GetActiveWindow() == hwnd, "Unexpected active window\n"); + flush_events(); flush_sequence(); + DefWindowProcA(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); + flush_events(); + ok_sequence(WmRestoreActiveMinimizedOverlappedSeq, "DefWindowProcA(SC_RESTORE):active minimized overlapped", TRUE); GetCursorPos(&pos); GetWindowRect(hwnd, &rect); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index bbbab60fbe..ebfdf9b6f0 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1182,7 +1182,14 @@ static BOOL show_window( HWND hwnd, INT cmd ) else WIN_ReleasePtr( wndPtr ); /* if previous state was minimized Windows sets focus to the window */ - if (style & WS_MINIMIZE) SetFocus( hwnd ); + if (style & WS_MINIMIZE) + { + SetFocus( hwnd ); + /* Send a WM_ACTIVATE message for a top level window, even if the window is already active */ + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!(style & WS_CHILD) && !(swp & SWP_NOACTIVATE)) + SendMessageW( hwnd, WM_ACTIVATE, WA_ACTIVE, 0 ); + } done: SetThreadDpiAwarenessContext( context ); -- 2.20.1

2 1

[PATCH] vbscript: Handle NULL code text in ParseScriptText and ParseProcedureText.
by Gabriel Ivăncescu 23 Sep '19

23 Sep '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/compile.c | 3 +++ dlls/vbscript/tests/run.c | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 0527297..44919be 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1815,6 +1815,7 @@ static void release_compiler(compile_ctx_t *ctx) HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *delimiter, DWORD flags, vbscode_t **ret) { + static const WCHAR emptyW[] = { 0 }; function_t *new_func; function_decl_t *func_decl; class_decl_t *class_decl; @@ -1822,6 +1823,8 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli vbscode_t *code; HRESULT hres; + if (!src) src = emptyW; + hres = parse_script(&ctx.parser, src, delimiter, flags); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 8e51e3c..ebcc883 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1917,6 +1917,10 @@ static void test_parse_context(void) hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + /* NULL code text succeeds but does nothing */ + hres = IActiveScriptParse_ParseScriptText(parser, NULL, NULL, NULL, NULL, 0, 0, 0, NULL, NULL); + ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); + /* unknown identifier context is not a valid argument */ str = a2bstr("Call reportSuccess()\n"); hres = IActiveScriptParse_ParseScriptText(parser, str, yW, NULL, NULL, 0, 0, 0, NULL, NULL); @@ -2003,6 +2007,7 @@ static void test_procedures(void) DISPPARAMS dp = {NULL}; IActiveScript *script; IDispatchEx *proc; + IDispatch *disp; EXCEPINFO ei = {0}; VARIANT v; HRESULT hres; @@ -2012,6 +2017,10 @@ static void test_procedures(void) hres = IActiveScript_QueryInterface(script, &IID_IActiveScriptParseProcedure2, (void**)&parse_proc); ok(hres == S_OK, "Could not get IActiveScriptParseProcedure2 iface: %08x\n", hres); + hres = IActiveScriptParseProcedure2_ParseProcedureText(parse_proc, NULL, NULL, emptyW, NULL, NULL, NULL, 0, 0, 0, &disp); + ok(hres == S_OK, "ParseProcedureText failed: %08x\n", hres); + IDispatch_Release(disp); + proc = parse_procedure(parse_proc, "dim x\nif true then x=false", 0); V_VT(&v) = VT_EMPTY; -- 2.21.0

2 2

[PATCH v4 3/3] msscript: Partially implement IScriptControl::AddCode().
by Jactry Zeng 23 Sep '19

23 Sep '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 47 +++++++----- dlls/msscript.ocx/tests/msscript.c | 114 ++++++++++++++++++++++++++++- 2 files changed, 139 insertions(+), 22 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 812c0ebcae..c615e63ed4 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -977,40 +977,47 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } +static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) +{ + EXCEPINFO excepinfo; + HRESULT hr; + + if (!control->host || control->state != Initialized) + return E_FAIL; + + if (control->host->script_state != SCRIPTSTATE_STARTED) + { + hr = set_script_state(control->host, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + } + + hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, + NULL, NULL, 0, 1, flag, res, &excepinfo); + /* FIXME: more error handling */ + return hr; +} + static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(code)); - return E_NOTIMPL; + + TRACE("(%p)->(%s).\n", This, debugstr_w(code)); + + return parse_script_text(This, code, SCRIPTTEXT_ISVISIBLE, NULL); } static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); - EXCEPINFO excepinfo; - HRESULT hr; - FIXME("(%p)->(%s %p)\n", This, debugstr_w(expression), res); + TRACE("(%p)->(%s, %p).\n", This, debugstr_w(expression), res); if (!res) return E_POINTER; V_VT(res) = VT_EMPTY; - if (!This->host || This->state != Initialized) - return E_FAIL; - - if (This->host->script_state != SCRIPTSTATE_STARTED) - { - hr = set_script_state(This->host, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; - } - - hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, - 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); - /* FIXME: more error handling */ - - return hr; + return parse_script_text(This, expression, SCRIPTTEXT_ISEXPRESSION, res); } static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR statement) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 80a1760b08..d3f0955ca7 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -144,6 +144,8 @@ static HRESULT WINAPI ActiveScriptParse_AddScriptlet(IActiveScriptParse *iface, return E_NOTIMPL; } +static DWORD parse_flags = 0; + static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *iface, LPCOLESTR pstrCode, LPCOLESTR pstrItemName, IUnknown *punkContext, LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, @@ -155,9 +157,13 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac ok(!pstrDelimiter, "got wrong pointer: %p.\n", pstrDelimiter); ok(!dwSourceContextCookie, "got wrong value: %s.\n", wine_dbgstr_longlong(dwSourceContextCookie)); ok(ulStartingLine == 1, "got wrong value: %d.\n", ulStartingLine); - ok(dwFlags == SCRIPTTEXT_ISEXPRESSION, "got wrong flags: %x.\n", dwFlags); - ok(!!pvarResult, "got wrong pointer: %p.\n", pvarResult); ok(!!pexcepinfo, "got wrong pointer: %p.\n", pexcepinfo); + ok(dwFlags == parse_flags, "got wrong flags: %x.\n", dwFlags); + if (parse_flags == SCRIPTTEXT_ISEXPRESSION) + ok(!!pvarResult, "got wrong pointer: %p.\n", pvarResult); + else + ok(!pvarResult, "got wrong pointer: %p.\n", pvarResult); + CHECK_EXPECT(ParseScriptText); return S_OK; } @@ -1516,6 +1522,7 @@ static void test_IScriptControl_Eval(void) SET_EXPECT(SetScriptState_STARTED); SET_EXPECT(ParseScriptText); + parse_flags = SCRIPTTEXT_ISEXPRESSION; script_str = a2bstr("var1 = 1 + 1"); V_VT(&var) = VT_NULL; V_I4(&var) = 0xdeadbeef; @@ -1566,6 +1573,108 @@ static void test_IScriptControl_Eval(void) } } +static void test_IScriptControl_AddCode(void) +{ + BSTR code_str, language; + IScriptControl *sc; + VARIANT var; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + + hr = IScriptControl_AddCode(sc, NULL); + ok(hr == E_FAIL, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + + language = a2bstr("jscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 0); + + code_str = a2bstr("invalid syntax"); + hr = IScriptControl_AddCode(sc, code_str); + todo_wine ok(hr == 0x800a03ec, "IScriptControl_AddCode returned: 0x%08x.\n", hr); + SysFreeString(code_str); + todo_wine CHECK_ERROR(sc, 1004); + + IScriptControl_Release(sc); + + /* custom script engine */ + if (have_custom_engine) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language = a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + parse_flags = SCRIPTTEXT_ISVISIBLE; + code_str = a2bstr("1 + 1"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + code_str = a2bstr("0x100"); + hr = IScriptControl_AddCode(sc, code_str); + ok(hr == S_OK, "IScriptControl_AddCode failed: 0x%08x.\n", hr); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + /* Call Eval() after AddCode() for checking if it will call SetScriptState() again. */ + SET_EXPECT(ParseScriptText); + parse_flags = SCRIPTTEXT_ISEXPRESSION; + code_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, code_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(code_str); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } +} + START_TEST(msscript) { IUnknown *unk; @@ -1600,6 +1709,7 @@ START_TEST(msscript) test_UseSafeSubset(); test_State(); test_IScriptControl_Eval(); + test_IScriptControl_AddCode(); init_registry(FALSE); -- 2.23.0

2 1

[PATCH v4 2/3] msscript: Cache state of IActiveScript in ScriptHost struct.
by Jactry Zeng 23 Sep '19

23 Sep '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 23 ++++++-- dlls/msscript.ocx/tests/msscript.c | 95 +++++++++++++++++++++++++++++- 2 files changed, 111 insertions(+), 7 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 6e4c8d166a..812c0ebcae 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -71,6 +71,7 @@ typedef struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + SCRIPTSTATE script_state; CLSID clsid; struct list named_items; @@ -568,6 +569,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) WARN("InitNew failed, %#x\n", hr); goto failed; } + host->script_state = SCRIPTSTATE_INITIALIZED; *ret = host; return S_OK; @@ -952,6 +954,16 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, return hr; } +static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) +{ + HRESULT hr; + + hr = IActiveScript_SetScriptState(host->script, state); + if (SUCCEEDED(hr)) + host->script_state = state; + return hr; +} + static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface); @@ -962,7 +974,7 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return E_FAIL; clear_named_items(This->host); - return IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_INITIALIZED); + return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) @@ -987,9 +999,12 @@ static HRESULT WINAPI ScriptControl_Eval(IScriptControl *iface, BSTR expression, if (!This->host || This->state != Initialized) return E_FAIL; - hr = IActiveScript_SetScriptState(This->host->script, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return hr; + if (This->host->script_state != SCRIPTSTATE_STARTED) + { + hr = set_script_state(This->host, SCRIPTSTATE_STARTED); + if (FAILED(hr)) + return hr; + } hr = IActiveScriptParse_ParseScriptText(This->host->parse, expression, NULL, NULL, NULL, 0, 1, SCRIPTTEXT_ISEXPRESSION, res, &excepinfo); diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 7a1a0f31f8..80a1760b08 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -95,6 +95,8 @@ DEFINE_EXPECT(Close); DEFINE_EXPECT(SetScriptSite); DEFINE_EXPECT(QI_IActiveScriptParse); DEFINE_EXPECT(SetScriptState_INITIALIZED); +DEFINE_EXPECT(SetScriptState_STARTED); +DEFINE_EXPECT(ParseScriptText); DEFINE_EXPECT(AddNamedItem); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) @@ -147,8 +149,17 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac LPCOLESTR pstrDelimiter, CTXARG_T dwSourceContextCookie, ULONG ulStartingLine, DWORD dwFlags, VARIANT *pvarResult, EXCEPINFO *pexcepinfo) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + ok(!!pstrCode, "got wrong pointer: %p.\n", pstrCode); + ok(!pstrItemName, "got wrong pointer: %p.\n", pstrItemName); + ok(!punkContext, "got wrong pointer: %p.\n", punkContext); + ok(!pstrDelimiter, "got wrong pointer: %p.\n", pstrDelimiter); + ok(!dwSourceContextCookie, "got wrong value: %s.\n", wine_dbgstr_longlong(dwSourceContextCookie)); + ok(ulStartingLine == 1, "got wrong value: %d.\n", ulStartingLine); + ok(dwFlags == SCRIPTTEXT_ISEXPRESSION, "got wrong flags: %x.\n", dwFlags); + ok(!!pvarResult, "got wrong pointer: %p.\n", pvarResult); + ok(!!pexcepinfo, "got wrong pointer: %p.\n", pexcepinfo); + CHECK_EXPECT(ParseScriptText); + return S_OK; } static const IActiveScriptParseVtbl ActiveScriptParseVtbl = { @@ -304,6 +315,10 @@ static HRESULT WINAPI ActiveScript_SetScriptState(IActiveScript *iface, SCRIPTST CHECK_EXPECT(SetScriptState_INITIALIZED); return S_OK; } + else if (ss == SCRIPTSTATE_STARTED) { + CHECK_EXPECT(SetScriptState_STARTED); + return S_OK; + } else ok(0, "unexpected call, state %u\n", ss); @@ -1371,7 +1386,7 @@ static void _check_error(IScriptControl *sc, LONG exp_num, int line) { error_num = 0xdeadbeef; hr = IScriptError_get_Number(script_err, &error_num); - ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.", hr); + ok_(__FILE__,line)(hr == S_OK, "IScriptError_get_Number failed: 0x%08x.\n", hr); ok_(__FILE__,line)(error_num == exp_num, "got wrong error number: %d, expected %d.\n", error_num, exp_num); IScriptError_Release(script_err); @@ -1475,6 +1490,80 @@ static void test_IScriptControl_Eval(void) SysFreeString(script_str); IScriptControl_Release(sc); + + if (have_custom_engine) + { + hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IScriptControl, (void **)&sc); + ok(hr == S_OK, "Failed to create IScriptControl interface: 0x%08x.\n", hr); + + SET_EXPECT(CreateInstance); + SET_EXPECT(SetInterfaceSafetyOptions); + SET_EXPECT(SetScriptSite); + SET_EXPECT(QI_IActiveScriptParse); + SET_EXPECT(InitNew); + + language= a2bstr("testscript"); + hr = IScriptControl_put_Language(sc, language); + ok(hr == S_OK, "IScriptControl_put_Language failed: 0x%08x.\n", hr); + SysFreeString(language); + + CHECK_CALLED(CreateInstance); + CHECK_CALLED(SetInterfaceSafetyOptions); + CHECK_CALLED(SetScriptSite); + CHECK_CALLED(QI_IActiveScriptParse); + CHECK_CALLED(InitNew); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var1 = 1 + 1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(ParseScriptText); + + SET_EXPECT(SetScriptState_INITIALIZED); + hr = IScriptControl_Reset(sc); + ok(hr == S_OK, "IScriptControl_Reset failed: 0x%08x.\n", hr); + CHECK_CALLED(SetScriptState_INITIALIZED); + + SET_EXPECT(SetScriptState_STARTED); + SET_EXPECT(ParseScriptText); + script_str = a2bstr("var2 = 10 + var1"); + V_VT(&var) = VT_NULL; + V_I4(&var) = 0xdeadbeef; + hr = IScriptControl_Eval(sc, script_str, &var); + ok(hr == S_OK, "IScriptControl_Eval failed: 0x%08x.\n", hr); + ok((V_VT(&var) == VT_EMPTY) && (V_I4(&var) == 0xdeadbeef), "V_VT(var) = %d, V_I4(var) = %d.\n", + V_VT(&var), V_I4(&var)); + SysFreeString(script_str); + CHECK_CALLED(SetScriptState_STARTED); + CHECK_CALLED(ParseScriptText); + + IActiveScriptSite_Release(site); + + SET_EXPECT(Close); + + IScriptControl_Release(sc); + + CHECK_CALLED(Close); + } } START_TEST(msscript) -- 2.23.0

2 1