July 2014 - Wine-commits - list.winehq.org

Piotr Caban : usp10: Limit trace length in dump_types.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 6d7ce98fec4bbdff86bd901e91e5636bd6680bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7ce98fec4bbdff86bd901e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 12 11:56:56 2014 +0200 usp10: Limit trace length in dump_types. --- dlls/usp10/bidi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 63ffa6a..2926454 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -146,10 +146,15 @@ static const char debug_type[][4] = static inline void dump_types(const char* header, WORD *types, int start, int end) { - int i; + int i, len = 0; TRACE("%s:",header); - for (i = start; i< end; i++) + for (i = start; i < end && len < 200; i++) + { TRACE(" %s",debug_type[types[i]]); + len += strlen(debug_type[types[i]])+1; + } + if (i != end) + TRACE("..."); TRACE("\n"); }

1 0

Piotr Caban : usp10: Limit trace length in iso_dump_types.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 43871921204d4b598f55b6be1bfab076572ae69c URL: http://source.winehq.org/git/wine.git/?a=commit;h=43871921204d4b598f55b6be1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 12 11:57:12 2014 +0200 usp10: Limit trace length in iso_dump_types. --- dlls/usp10/bidi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 2926454..5b227d8 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -513,11 +513,16 @@ static inline int iso_previousChar(IsolatedRun *iso_run, int index) static inline void iso_dump_types(const char* header, IsolatedRun *iso_run) { - int i; + int i, len = 0; TRACE("%s:",header); TRACE("[ "); - for (i = 0; i < iso_run->length; i++) + for (i = 0; i < iso_run->length && len < 200; i++) + { TRACE(" %s",debug_type[*iso_run->item[i].pcls]); + len += strlen(debug_type[*iso_run->item[i].pcls])+1; + } + if (i != iso_run->length) + TRACE("..."); TRACE(" ]\n"); }

1 0

Bruno Jesus : rsaenh/tests: Make the tests pass in Windows <= NT4.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 50ded4b2f8eb84001a318487dcffd9bec175fc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ded4b2f8eb84001a318487d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:11:14 2014 -0300 rsaenh/tests: Make the tests pass in Windows <= NT4. --- dlls/rsaenh/tests/rsaenh.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index abc90e1..c90bc79 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -450,6 +450,11 @@ static void test_hashes(void) ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); + if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ + { + ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + } ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -477,6 +482,11 @@ static void test_hashes(void) ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); + if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ + { + ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + } ok(result, "%08x\n", GetLastError()); len = 16; @@ -526,6 +536,11 @@ static void test_hashes(void) ok(result, "%08x\n", GetLastError()); result = CryptHashData(hHash, pbData, 5, CRYPT_USERDATA); + if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ + { + ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); + result = CryptHashData(hHash, pbData, 5, 0); + } ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) {

1 0

Bruno Jesus : rsaenh/tests: Add DES/3DES-112 const buffer test.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: c579945b98e86ad7dc7dbd4ae17a867d229cd6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c579945b98e86ad7dc7dbd4ae… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:11:30 2014 -0300 rsaenh/tests: Add DES/3DES-112 const buffer test. --- dlls/rsaenh/tests/rsaenh.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c90bc79..4fabaad 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -802,6 +802,9 @@ static void test_3des112(void) BOOL result; DWORD dwLen; unsigned char pbData[16], enc_data[16], bad_data[16]; + static const BYTE des112[16] = { + 0x8e, 0x0c, 0x3c, 0xa3, 0x05, 0x88, 0x5f, 0x7a, + 0x32, 0xa1, 0x06, 0x52, 0x64, 0xd2, 0x44, 0x1c }; int i; result = derive_key(CALG_3DES_112, &hKey, 0); @@ -817,6 +820,8 @@ static void test_3des112(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); + ok(!memcmp(pbData, des112, sizeof(des112)), "3DES_112 encryption failed!\n"); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); @@ -886,9 +891,12 @@ static void test_des(void) BOOL result; DWORD dwLen, dwMode; unsigned char pbData[16], enc_data[16], bad_data[16]; + static const BYTE des[16] = { + 0x58, 0x86, 0x42, 0x46, 0x65, 0x4b, 0x92, 0x62, + 0xcf, 0x0f, 0x65, 0x37, 0x43, 0x7a, 0x82, 0xb9 }; int i; - result = derive_key(CALG_DES, &hKey, 56); + result = derive_key(CALG_DES, &hKey, 0); if (!result) { /* rsaenh compiled without OpenSSL */ ok(GetLastError()==NTE_BAD_ALGID, "%08x\n", GetLastError()); @@ -909,6 +917,8 @@ static void test_des(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); + ok(!memcmp(pbData, des, sizeof(des)), "DES encryption failed!\n"); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError());

1 0

Bruno Jesus : rsaenh/tests: Add a pre XP DES compatibility test.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 3b7c61dc2a888e0b3bb39e90ae1b91f466ca62f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7c61dc2a888e0b3bb39e90a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:11:51 2014 -0300 rsaenh/tests: Add a pre XP DES compatibility test. --- dlls/rsaenh/tests/rsaenh.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 4fabaad..467551e 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -894,6 +894,9 @@ static void test_des(void) static const BYTE des[16] = { 0x58, 0x86, 0x42, 0x46, 0x65, 0x4b, 0x92, 0x62, 0xcf, 0x0f, 0x65, 0x37, 0x43, 0x7a, 0x82, 0xb9 }; + static const BYTE des_old_behavior[16] = { + 0xb0, 0xfd, 0x11, 0x69, 0x76, 0xb1, 0xa1, 0x03, + 0xf7, 0xbc, 0x23, 0xaa, 0xd4, 0xc1, 0xc9, 0x55 }; int i; result = derive_key(CALG_DES, &hKey, 0); @@ -981,6 +984,25 @@ static void test_des(void) result = CryptDestroyKey(hKey); ok(result, "%08x\n", GetLastError()); + + /* Windows >= XP changed the way DES keys are derived, this test ensures we don't break that */ + derive_key(CALG_DES, &hKey, 56); + + dwMode = CRYPT_MODE_ECB; + result = CryptSetKeyParam(hKey, KP_MODE, (BYTE*)&dwMode, 0); + ok(result, "%08x\n", GetLastError()); + + for (i=0; i<sizeof(pbData); i++) pbData[i] = (unsigned char)i; + + dwLen = 13; + result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); + ok(result, "%08x\n", GetLastError()); + + ok(!memcmp(pbData, des, sizeof(des)) || broken(!memcmp(pbData, des_old_behavior, sizeof(des))) /* <= 2000 */, + "DES encryption failed!\n"); + + result = CryptDestroyKey(hKey); + ok(result, "%08x\n", GetLastError()); } static void test_3des(void)

1 0

Bruno Jesus : dinput/tests: Release the instance after tests (valgrind).
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 1242417d131ae9fafd66ee79e96352a1e0215fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1242417d131ae9fafd66ee79e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:40:04 2014 -0300 dinput/tests: Release the instance after tests (valgrind). --- dlls/dinput/tests/dinput.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index cc28985..0490642 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -603,6 +603,7 @@ static void test_DirectInputJoyConfig8(void) "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr); } + IDirectInput_Release(pDI); } START_TEST(dinput)

1 0

Bruno Jesus : psapi/tests: Free buffer on error (valgrind).
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 78eac8156e93d65cc15c7e7241ec90639bea3d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78eac8156e93d65cc15c7e724… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 15:24:36 2014 -0300 psapi/tests: Free buffer on error (valgrind). --- dlls/psapi/tests/psapi_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index ee7e8bd..62d4f5c 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -228,7 +228,11 @@ static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DW todo_wine ok(!status, "NtQueryVirtualMemory error %x\n", status); /* FIXME: remove once Wine is fixed */ - if (status) return FALSE; + if (status) + { + HeapFree(GetProcessHeap(), 0, buf); + return FALSE; + } section_name = (MEMORY_SECTION_NAME *)buf; ok(ret_len == section_name->SectionFileName.MaximumLength + sizeof(*section_name), "got %lu, %u\n",

1 0

Bruno Jesus : wineconsole: Free registry key name (valgrind).
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 421d3cd9e802ec63fe5928b4f331ff85064f83d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=421d3cd9e802ec63fe5928b4f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 16:02:13 2014 -0300 wineconsole: Free registry key name (valgrind). --- programs/wineconsole/wineconsole.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 7698521..3c2faf5 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -519,6 +519,7 @@ static void WINECON_Delete(struct inner_data* data) if (data->hConIn) CloseHandle(data->hConIn); if (data->hConOut) CloseHandle(data->hConOut); if (data->hSynchro) CloseHandle(data->hSynchro); + HeapFree(GetProcessHeap(), 0, data->curcfg.registry); HeapFree(GetProcessHeap(), 0, data->cells); HeapFree(GetProcessHeap(), 0, data); }

1 0

Austin English : setupapi: Add a stub for SetupDiSetClassInstallParamsW.
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 3013b6c6da9f02fa7afc3b49a036d063d4c4837a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3013b6c6da9f02fa7afc3b49a… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Jul 13 16:45:25 2014 -0700 setupapi: Add a stub for SetupDiSetClassInstallParamsW. --- dlls/setupapi/devinst.c | 14 ++++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ef56d2b..966af75 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3648,6 +3648,20 @@ BOOL WINAPI SetupDiSetClassInstallParamsA( } /*********************************************************************** + * SetupDiSetClassInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetClassInstallParamsW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_CLASSINSTALL_HEADER ClassInstallParams, + DWORD ClassInstallParamsSize) +{ + FIXME("%p %p %x %u\n",DeviceInfoSet, DeviceInfoData, + ClassInstallParams->InstallFunction, ClassInstallParamsSize); + return FALSE; +} + +/*********************************************************************** * SetupDiCallClassInstaller (SETUPAPI.@) */ BOOL WINAPI SetupDiCallClassInstaller( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index a8ce41a..48ab1e4 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -384,7 +384,7 @@ @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) -@ stub SetupDiSetClassInstallParamsW +@ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long) @ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr) @ stub SetupDiSetDeviceInstallParamsW @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr ptr)

1 0

Henri Verbeet : wined3d: Always mark vertex buffers as used in context_apply_draw_state().
by Alexandre Julliard 14 Jul '14

14 Jul '14

Module: wine Branch: master Commit: 68339456a8f7543ae46ac504c2ce7f4f0221a789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68339456a8f7543ae46ac504c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:21 2014 +0200 wined3d: Always mark vertex buffers as used in context_apply_draw_state(). The issue this solves is that buffer_internal_preload() is only called when STATE_VDECL or STATE_STREAMSRC is invalidated, but that doesn't happen for regular buffer maps. We'd like to be able to just call buffer_internal_preload() here, but buffer_internal_preload() has dependencies on context_stream_info_from_declaration() and vice versa. --- dlls/wined3d/buffer.c | 7 ++++++- dlls/wined3d/context.c | 11 +++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fbbe398..901382c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -721,6 +721,11 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined checkGLcall("glUnmapBufferARB"); } +void buffer_mark_used(struct wined3d_buffer *buffer) +{ + buffer->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); +} + /* Context activation is done by the caller. */ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) @@ -741,7 +746,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte return; } - buffer->flags &= ~(WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); + buffer_mark_used(buffer); if (!buffer->buffer_object) { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 32cc191..e8423f4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2958,6 +2958,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de const struct StateEntry *state_table = context->state_table; const struct wined3d_fb_state *fb = state->fb; unsigned int i; + WORD map; if (!context_validate_rt_config(context->gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) @@ -2974,7 +2975,17 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de context_update_tex_unit_map(context, state); context_preload_textures(context, state); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) + { context_update_stream_info(context, state); + } + else + { + for (i = 0, map = context->stream_info.use_map; map; map >>= 1, ++i) + { + if (map & 1) + buffer_mark_used(state->streams[context->stream_info.elements[i].stream_idx].buffer); + } + } if (state->index_buffer) { if (context->stream_info.all_vbo) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8f411cd..0c11528 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2590,6 +2590,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN; +void buffer_mark_used(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0