wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Jacek Caban : d3d11.idl: Added CD3D11_DEPTH_STENCIL_DESC declaration.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: c1e780a96d37c34e39db8a0847698ee018a1d6fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1e780a96d37c34e39db8a084… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 19:21:05 2017 +0200 d3d11.idl: Added CD3D11_DEPTH_STENCIL_DESC declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 5c47d83..be5b3c0 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1232,6 +1232,57 @@ typedef struct D3D11_DEPTH_STENCIL_DESC D3D11_DEPTH_STENCILOP_DESC BackFace; } D3D11_DEPTH_STENCIL_DESC; +cpp_quote("#if !defined( D3D11_NO_HELPERS ) && defined( __cplusplus )") +cpp_quote("struct CD3D11_DEPTH_STENCIL_DESC : public D3D11_DEPTH_STENCIL_DESC {") +cpp_quote(" CD3D11_DEPTH_STENCIL_DESC() {}") +cpp_quote(" explicit CD3D11_DEPTH_STENCIL_DESC(const D3D11_DEPTH_STENCIL_DESC &other) : D3D11_DEPTH_STENCIL_DESC(other) {}") +cpp_quote(" explicit CD3D11_DEPTH_STENCIL_DESC(CD3D11_DEFAULT) {") +cpp_quote(" const D3D11_DEPTH_STENCILOP_DESC default_op =") +cpp_quote(" {D3D11_STENCIL_OP_KEEP, D3D11_STENCIL_OP_KEEP, D3D11_STENCIL_OP_KEEP, D3D11_COMPARISON_ALWAYS};") +cpp_quote(" DepthEnable = TRUE;") +cpp_quote(" DepthWriteMask = D3D11_DEPTH_WRITE_MASK_ALL;") +cpp_quote(" DepthFunc = D3D11_COMPARISON_LESS;") +cpp_quote(" StencilEnable = FALSE;") +cpp_quote(" StencilReadMask = D3D11_DEFAULT_STENCIL_READ_MASK;") +cpp_quote(" StencilWriteMask = D3D11_DEFAULT_STENCIL_WRITE_MASK;") +cpp_quote(" FrontFace = default_op;") +cpp_quote(" BackFace = default_op;") +cpp_quote(" }") +cpp_quote(" explicit CD3D11_DEPTH_STENCIL_DESC(") +cpp_quote(" BOOL depth_enable,") +cpp_quote(" D3D11_DEPTH_WRITE_MASK depth_write_mask,") +cpp_quote(" D3D11_COMPARISON_FUNC depth_func,") +cpp_quote(" BOOL stencil_enable,") +cpp_quote(" UINT8 stencil_read_mask,") +cpp_quote(" UINT8 stencil_write_mask,") +cpp_quote(" D3D11_STENCIL_OP front_stencil_fail_op,") +cpp_quote(" D3D11_STENCIL_OP front_stencil_depth_fail_op,") +cpp_quote(" D3D11_STENCIL_OP front_stencil_pass_op,") +cpp_quote(" D3D11_COMPARISON_FUNC front_stencil_func,") +cpp_quote(" D3D11_STENCIL_OP back_stencil_fail_op,") +cpp_quote(" D3D11_STENCIL_OP back_stencil_depth_fail_op,") +cpp_quote(" D3D11_STENCIL_OP back_stencil_pass_op,") +cpp_quote(" D3D11_COMPARISON_FUNC back_stencil_func) {") +cpp_quote(" DepthEnable = depth_enable;") +cpp_quote(" DepthWriteMask = depth_write_mask;") +cpp_quote(" DepthFunc = depth_func;") +cpp_quote(" StencilEnable = stencil_enable;") +cpp_quote(" StencilReadMask = stencil_read_mask;") +cpp_quote(" StencilWriteMask = stencil_write_mask;") +cpp_quote(" FrontFace.StencilFailOp = front_stencil_fail_op;") +cpp_quote(" FrontFace.StencilDepthFailOp = front_stencil_depth_fail_op;") +cpp_quote(" FrontFace.StencilPassOp = front_stencil_pass_op;") +cpp_quote(" FrontFace.StencilFunc = front_stencil_func;") +cpp_quote(" BackFace.StencilFailOp = back_stencil_fail_op;") +cpp_quote(" BackFace.StencilDepthFailOp = back_stencil_depth_fail_op;") +cpp_quote(" BackFace.StencilPassOp = back_stencil_pass_op;") +cpp_quote(" BackFace.StencilFunc = back_stencil_func;") +cpp_quote(" }") +cpp_quote(" ~CD3D11_DEPTH_STENCIL_DESC() {}") +cpp_quote(" operator const D3D11_DEPTH_STENCIL_DESC&() const { return *this; }") +cpp_quote("};") +cpp_quote("#endif") + typedef struct D3D11_RENDER_TARGET_VIEW_DESC { DXGI_FORMAT Format;

1 0

André Hentschel : vcomp/tests: Test more arguments with a callback.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 3d69e4ec498c6ab77c0129bb3fa3f73aea0aeca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d69e4ec498c6ab77c0129bb3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 5 22:11:43 2017 +0200 vcomp/tests: Test more arguments with a callback. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/tests/vcomp.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 165d710..154744b 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -539,13 +539,21 @@ static void CDECL fork_ptr_cb(LONG *a, LONG *b, LONG *c, LONG *d, LONG *e) InterlockedIncrement(e); } -static void CDECL fork_uintptr_cb(UINT_PTR a, UINT_PTR b, UINT_PTR c, UINT_PTR d, UINT_PTR e) +static void CDECL fork_uintptr_cb(UINT_PTR a, UINT_PTR b, UINT_PTR c, UINT_PTR d, + UINT_PTR e, UINT_PTR f, UINT_PTR g, UINT_PTR h, + UINT_PTR i, UINT_PTR j, UINT_PTR k) { ok(a == 1, "expected a == 1, got %p\n", (void *)a); ok(b == MAXUINT_PTR - 2, "expected b == MAXUINT_PTR - 2, got %p\n", (void *)b); ok(c == 3, "expected c == 3, got %p\n", (void *)c); ok(d == MAXUINT_PTR - 4, "expected d == MAXUINT_PTR - 4, got %p\n", (void *)d); ok(e == 5, "expected e == 5, got %p\n", (void *)e); + ok(f == 6, "expected f == 6, got %p\n", (void *)f); + ok(g == 7, "expected g == 7, got %p\n", (void *)g); + ok(h == 8, "expected h == 8, got %p\n", (void *)h); + ok(i == 9, "expected i == 9, got %p\n", (void *)i); + ok(j == 10, "expected j == 10, got %p\n", (void *)j); + ok(k == 11, "expected k == 11, got %p\n", (void *)k); } #ifdef __i386__ @@ -581,8 +589,10 @@ static void test_vcomp_fork(void) ok(d == 7, "expected d == 7, got %d\n", d); ok(e == 8, "expected e == 8, got %d\n", e); - p_vcomp_fork(TRUE, 5, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), - (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5); + p_vcomp_fork(TRUE, 11, fork_uintptr_cb, (UINT_PTR)1, (UINT_PTR)(MAXUINT_PTR - 2), + (UINT_PTR)3, (UINT_PTR)(MAXUINT_PTR - 4), (UINT_PTR)5, + (UINT_PTR)6, (UINT_PTR)7, (UINT_PTR)8, (UINT_PTR)9, + (UINT_PTR)10, (UINT_PTR)11); #ifdef __i386__ {

1 0

Zebediah Figura : msi: Add a basic internal UI implementation.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 48237e249b76f5ad883ec073e352f850994e06cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=48237e249b76f5ad883ec073e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 5 23:31:52 2017 -0500 msi: Add a basic internal UI implementation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.c | 11 +++- dlls/msi/msi_main.c | 2 +- dlls/msi/package.c | 139 ++++++++++++++++++++++++++++++++---------------- dlls/msi/tests/format.c | 20 +++++-- dlls/msi/tests/msi.c | 18 +++++++ 5 files changed, 136 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48237e249b76f5ad883ec…

1 0

Zebediah Figura : msi/tests: Work around test failures on Windows.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: c83b8e0a16b496144e99266d745db22c67d69ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c83b8e0a16b496144e99266d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 5 23:31:51 2017 -0500 msi/tests: Work around test failures on Windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 58e932f..291bcb2 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9335,6 +9335,18 @@ static const struct externalui_message closehandle_sequence[] = { {0} }; +static INT CALLBACK externalui_message_string_callback(void *context, UINT message, LPCSTR string) +{ + struct externalui_message msg; + + msg.message = message; + msg.field_count = 0; + strcpy(msg.field[0], string); + add_message(&msg); + + return 1; +} + static INT CALLBACK externalui_message_callback(void *context, UINT message, MSIHANDLE hrecord) { struct externalui_message msg; @@ -9343,12 +9355,19 @@ static INT CALLBACK externalui_message_callback(void *context, UINT message, MSI int i; msg.message = message; + if (message == INSTALLMESSAGE_TERMINATE) + { + /* trying to access the record seems to hang on some versions of Windows */ + msg.field_count = -1; + add_message(&msg); + return 1; + } msg.field_count = MsiRecordGetFieldCount(hrecord); for (i = 0; i <= msg.field_count; i++) { length = 100; MsiRecordGetStringA(hrecord, i, buffer, &length); - memcpy(msg.field[i], buffer, length+1); + memcpy(msg.field[i], buffer, min(100, length+1)); } add_message(&msg); @@ -9361,11 +9380,12 @@ static void test_externalui_message(void) /* test that events trigger the correct sequence of messages */ INSTALLUI_HANDLER_RECORD prev; - const struct externalui_message *sequence = NULL; MSIHANDLE hdb, hpkg; UINT r; - r = pMsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS, &sequence, &prev); + /* processing SHOWDIALOG with a record handler causes a crash on XP */ + MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, NULL); + r = pMsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, NULL, &prev); flush_sequence(); @@ -9401,7 +9421,7 @@ static void test_externalui_message(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok_sequence(doaction_costinitialize_sequence, "MsiDoAction(\"CostInitialize\")", TRUE); - /* Test a standard action */ + /* Test a custom action */ r = MsiDoActionA(hpkg, "custom"); ok(r == ERROR_FUNCTION_NOT_CALLED, "Expected ERROR_FUNCTION_NOT_CALLED, got %d\n", r); ok_sequence(doaction_custom_sequence, "MsiDoAction(\"custom\")", FALSE);

1 0

Alex Henrie : ole32: Avoid null pointer dereferences in CoGetTreatAsClass.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 5a3b87a0fd3d643106dbc3cbd6ebef69b61401e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a3b87a0fd3d643106dbc3cbd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jul 5 23:01:22 2017 -0600 ole32: Avoid null pointer dereferences in CoGetTreatAsClass. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 4 ++++ dlls/ole32/tests/compobj.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1ce9cec..6024448 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3825,6 +3825,10 @@ HRESULT WINAPI CoGetTreatAsClass(REFCLSID clsidOld, LPCLSID clsidNew) LONG len = sizeof(szClsidNew); TRACE("(%s,%p)\n", debugstr_guid(clsidOld), clsidNew); + + if (!clsidOld || !clsidNew) + return E_INVALIDARG; + *clsidNew = *clsidOld; /* copy over old value */ res = COM_OpenKeyForCLSID(clsidOld, wszTreatAs, KEY_READ, &hkey); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index e585a46..feb1d72 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2176,10 +2176,18 @@ static void test_TreatAsClass(void) win_skip("CoGetTreatAsClass not present\n"); return; } + hr = pCoGetTreatAsClass(&deadbeef,&out); ok (hr == S_FALSE, "expected S_FALSE got %x\n",hr); ok (IsEqualGUID(&out,&deadbeef), "expected to get same clsid back\n"); + hr = pCoGetTreatAsClass(NULL, &out); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); + ok(IsEqualGUID(&out, &deadbeef), "expected no change to the clsid\n"); + + hr = pCoGetTreatAsClass(&deadbeef, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG got %08x\n", hr); + lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID", 0, KEY_READ, &clsidkey); ok(!lr, "Couldn't open CLSID key, error %d\n", lr);

1 0

Jacek Caban : rsaenh: Implement duplicate_hash_impl for bcrypt-based hashes.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 4c917e95327dff18b3598c81b486f464b581f549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c917e95327dff18b3598c81b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 6 13:44:48 2017 +0200 rsaenh: Implement duplicate_hash_impl for bcrypt-based hashes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/implglue.c | 14 +++++++++++--- include/bcrypt.h | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 4ac2767..69c7f80 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -160,9 +160,17 @@ BOOL finalize_hash_impl(ALG_ID aiAlgid, HASH_CONTEXT *pHashContext, BYTE *pbHash BOOL duplicate_hash_impl(ALG_ID aiAlgid, const HASH_CONTEXT *pSrcHashContext, HASH_CONTEXT *pDestHashContext) { - *pDestHashContext = *pSrcHashContext; - - return TRUE; + switch (aiAlgid) + { + case CALG_MD2: + case CALG_MD4: + case CALG_MD5: + case CALG_SHA: + *pDestHashContext = *pSrcHashContext; + return TRUE; + default: + return !BCryptDuplicateHash(pSrcHashContext->bcrypt_hash, &pDestHashContext->bcrypt_hash, NULL, 0, 0); + } } BOOL new_key_impl(ALG_ID aiAlgid, KEY_CONTEXT *pKeyContext, DWORD dwKeyLen) diff --git a/include/bcrypt.h b/include/bcrypt.h index 05d0691..9e193da 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -113,5 +113,6 @@ NTSTATUS WINAPI BCryptHash(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, PUCHAR, ULONG, PUCH NTSTATUS WINAPI BCryptHashData(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG); NTSTATUS WINAPI BCryptOpenAlgorithmProvider(BCRYPT_ALG_HANDLE *, LPCWSTR, LPCWSTR, ULONG); NTSTATUS WINAPI BCryptSetProperty(BCRYPT_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG); +NTSTATUS WINAPI BCryptDuplicateHash(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG); #endif /* __WINE_BCRYPT_H */

1 0

Hugh McMaster : reg/tests: Add some more tests for importing hex data.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 25de5c925597808ed3d473f49622e1619fdbd5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=25de5c925597808ed3d473f49… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 08:17:56 2017 +0000 reg/tests: Add some more tests for importing hex data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 169 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25de5c925597808ed3d47…

1 0

Hugh McMaster : reg/tests: Add another test for "0x" prefixes in the hex data type.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 48a2105e03b774f882d3a3e2d40eab8ee2d97db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a2105e03b774f882d3a3e2d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 08:17:46 2017 +0000 reg/tests: Add another test for "0x" prefixes in the hex data type. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 7906f8d..20acd85 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1784,7 +1784,8 @@ static void test_import(void) "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n" "\"Wine47j\"=hex(0x2):56,61,6c,75,65,00\n" - "\"Wine47k\"=hex(x2)::56,61,6c,75,65,00\n\n", &r); + "\"Wine47k\"=hex(0X2):56,61,6c,75,65,00\n" + "\"Wine47l\"=hex(x2):56,61,6c,75,65,00\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); @@ -1797,6 +1798,7 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine47i"); todo_wine verify_reg_nonexist(hkey, "Wine47j"); todo_wine verify_reg_nonexist(hkey, "Wine47k"); + todo_wine verify_reg_nonexist(hkey, "Wine47l"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3122,7 +3124,8 @@ static void test_unicode_import(void) "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n" "\"Wine47j\"=hex(0x2):56,00,61,00,6c,00,75,00,65,00,00,00\n" - "\"Wine47k\"=hex(x2):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + "\"Wine47k\"=hex(0X2):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine47l\"=hex(x2):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); @@ -3135,6 +3138,7 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine47i"); todo_wine verify_reg_nonexist(hkey, "Wine47j"); todo_wine verify_reg_nonexist(hkey, "Wine47k"); + todo_wine verify_reg_nonexist(hkey, "Wine47l"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ data if the parsed hex data does not end in a null-terminating character.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 3908296237b0a325c694b7dc3a6893d4fd3bc355 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3908296237b0a325c694b7dc3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 11:18:58 2017 +0000 regedit: Null-terminate REG_EXPAND_SZ and REG_MULTI_SZ data if the parsed hex data does not end in a null-terminating character. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 19 ++++++++++++++----- programs/regedit/tests/regedit.c | 18 +++++++++--------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 9fe0cb8..9680bd2 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -848,13 +848,22 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; } - if (!parser->is_unicode && (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ)) + if (parser->data_type == REG_EXPAND_SZ || parser->data_type == REG_MULTI_SZ) { - void *tmp = parser->data; + BYTE *data = parser->data; - parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); - parser->data_size *= sizeof(WCHAR); - HeapFree(GetProcessHeap(), 0, tmp); + if (data[parser->data_size - 1] != 0x00) + { + data[parser->data_size] = 0x00; + parser->data_size++; + } + + if (!parser->is_unicode) + { + parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); + parser->data_size *= sizeof(WCHAR); + HeapFree(GetProcessHeap(), 0, data); + } } set_state(parser, SET_VALUE); diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 8a07fb7..7389781 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -388,7 +388,7 @@ static void test_basic_import(void) lr = RegQueryValueExA(hkey, "Wine11d", NULL, &type, (BYTE *)&buffer, &size); ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); - todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(size == 6 || broken(size == 5) /* Win2k */, "got wrong size %u, expected 6\n", size); ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); /* Wine11e */ size = sizeof(buffer); @@ -396,7 +396,7 @@ static void test_basic_import(void) lr = RegQueryValueExA(hkey, "Wine11e", NULL, &type, (BYTE *)&buffer, &size); ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); - todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(size == 6 || broken(size == 5) /* Win2k */, "got wrong size %u, expected 6\n", size); ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); exec_import_str("REGEDIT4\n\n" @@ -517,8 +517,8 @@ static void test_basic_import(void) verify_reg(hkey, "Wine18a", REG_MULTI_SZ, "Line\0", 6, 0); verify_reg(hkey, "Wine18b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); verify_reg(hkey, "Wine18c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - verify_reg(hkey, "Wine18d", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); - verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); + verify_reg(hkey, "Wine18d", REG_MULTI_SZ, "Line concat", 12, 0); + verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -549,8 +549,8 @@ static void test_basic_import(void) "\"Wine20d\"=hex(7):4c,69,6e,65,00,\n" "\"Wine20e\"=hex(7):4c,69,6e,65,00,00\n" "\"Wine20f\"=hex(7):4c,69,6e,65,00,00,\n\n"); - verify_reg(hkey, "Wine20a", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); - verify_reg(hkey, "Wine20b", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE); + verify_reg(hkey, "Wine20a", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine20b", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine20c", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine20d", REG_MULTI_SZ, "Line", 5, 0); verify_reg(hkey, "Wine20e", REG_MULTI_SZ, "Line\0", 6, 0); @@ -562,8 +562,8 @@ static void test_basic_import(void) "\"Wine21b\"=hex(2):25,50,41,54,48,25,\n" "\"Wine21c\"=hex(2):25,50,41,54,48,25,00\n" "\"Wine21d\"=hex(2):25,50,41,54,48,25,00,\n\n"); - verify_reg(hkey, "Wine21a", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); - verify_reg(hkey, "Wine21b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE); + verify_reg(hkey, "Wine21a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine21b", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0); @@ -1314,7 +1314,7 @@ static void test_comments(void) " 63,6f,6e,\\;comment\n" " 63,61,74,;comment\n" " 65,6e,61,74,69,6f,6e,00,00\n\n"); - verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); + verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : regedit: Hex data lines may be terminated by a semicolon.
by Alexandre Julliard 06 Jul '17

06 Jul '17

Module: wine Branch: master Commit: 7b95ddcb04ac83bdc5614a5049cbbb82b7f2e306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b95ddcb04ac83bdc5614a504… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jul 6 11:18:43 2017 +0000 regedit: Hex data lines may be terminated by a semicolon. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 ++ programs/regedit/tests/regedit.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index cddebf7..9fe0cb8 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -303,6 +303,8 @@ static BOOL convert_hex_csv_to_hex(struct parser *parser, WCHAR **str) *str = end + 1; return TRUE; } + else if (*end == ';') + return TRUE; return FALSE; } diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 1b3efc8..8a07fb7 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -364,7 +364,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine10b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); verify_reg(hkey, "Wine10c", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); verify_reg(hkey, "Wine10d", REG_NONE, "V\0a\0l\0u", 8, 0); - todo_wine verify_reg(hkey, "Wine10e", REG_NONE, "V\0a\0l\0u", 8, 0); + verify_reg(hkey, "Wine10e", REG_NONE, "V\0a\0l\0u", 8, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -394,10 +394,10 @@ static void test_basic_import(void) size = sizeof(buffer); memset(buffer, '-', size); lr = RegQueryValueExA(hkey, "Wine11e", NULL, &type, (BYTE *)&buffer, &size); - todo_wine ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); - todo_wine ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); + ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); + ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); - todo_wine ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); + ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -419,7 +419,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine12b", REG_BINARY, hex, sizeof(hex), 0); verify_reg(hkey, "Wine12c", REG_BINARY, hex, sizeof(hex), 0); verify_reg(hkey, "Wine12d", REG_BINARY, hex, 6, 0); - todo_wine verify_reg(hkey, "Wine12e", REG_BINARY, hex, 6, 0); + verify_reg(hkey, "Wine12e", REG_BINARY, hex, 6, 0); /* Test import with subkeys */ exec_import_str("REGEDIT4\n\n" @@ -518,7 +518,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine18b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); verify_reg(hkey, "Wine18c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); verify_reg(hkey, "Wine18d", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); - todo_wine verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, 0); + verify_reg(hkey, "Wine18e", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -538,7 +538,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine19b", 0x100, "%PATH%", 7, 0); verify_reg(hkey, "Wine19c", 0x100, "%PATH%", 7, 0); verify_reg(hkey, "Wine19d", 0x100, "%PATH", 5, 0); - todo_wine verify_reg(hkey, "Wine19e", 0x100, "%PATH", 5, 0); + verify_reg(hkey, "Wine19e", 0x100, "%PATH", 5, 0); /* Test null-termination of REG_EXPAND_SZ and REG_MULTI_SZ data*/ exec_import_str("REGEDIT4\n\n" @@ -1314,7 +1314,7 @@ static void test_comments(void) " 63,6f,6e,\\;comment\n" " 63,61,74,;comment\n" " 65,6e,61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, TODO_REG_SIZE); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2017