wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Sergey Guralnik : user32: Init standard scrollbars during WM_NCCREATE.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 1cd5e69478afe031566fc265c7c1ecec318e936c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd5e69478afe031566fc265c… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Wed Jan 23 08:28:36 2013 +0200 user32: Init standard scrollbars during WM_NCCREATE. --- dlls/user32/defwnd.c | 14 ++++++++++++++ dlls/user32/tests/scroll.c | 13 +++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index af566bf..7a55844 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -837,6 +837,13 @@ LRESULT WINAPI DefWindowProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam if (!IS_INTRESOURCE(cs->lpszName)) DEFWND_SetTextA( hwnd, cs->lpszName ); result = 1; + + if(cs->style & (WS_HSCROLL | WS_VSCROLL)) + { + SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0}; + SetScrollInfo( hwnd, SB_HORZ, &si, FALSE ); + SetScrollInfo( hwnd, SB_VERT, &si, FALSE ); + } } break; @@ -984,6 +991,13 @@ LRESULT WINAPI DefWindowProcW( if (!IS_INTRESOURCE(cs->lpszName)) DEFWND_SetTextW( hwnd, cs->lpszName ); result = 1; + + if(cs->style & (WS_HSCROLL | WS_VSCROLL)) + { + SCROLLINFO si = {sizeof si, SIF_ALL, 0, 100, 0, 0, 0}; + SetScrollInfo( hwnd, SB_HORZ, &si, FALSE ); + SetScrollInfo( hwnd, SB_VERT, &si, FALSE ); + } } break; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 49f42bb..0f0ede2 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -241,7 +241,6 @@ static void scrollbar_test_default( DWORD style) ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else -todo_wine ok(( min == 0 && max == 100) || broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); @@ -253,7 +252,6 @@ todo_wine ok( min == 0 && max == 0, "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); else -todo_wine ok(( min == 0 && max == 100) || broken( min == 0 && max == 0), /* Win 9x/ME */ "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); @@ -263,7 +261,6 @@ todo_wine if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else -todo_wine ok( ret || broken( !ret), /* Win 9x/ME */ "GetScrollInfo failed unexpectedly. Style is %08x\n", style); @@ -273,7 +270,6 @@ todo_wine if( !( style & ( WS_VSCROLL | WS_HSCROLL))) ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); else -todo_wine ok( ret || broken( !ret), /* Win 9x/ME */ "GetScrollInfo failed unexpectedly. Style is %08x\n", style); @@ -423,15 +419,12 @@ static LRESULT CALLBACK scroll_init_proc(HWND hwnd, UINT msg, /* WM_NCCREATE was passed to DefWindowProc */ if(cs->style & (WS_VSCROLL | WS_HSCROLL)) { - todo_wine - ok(h_ret && v_ret, "GetScrollInfo() should return NON-zero " + ok(h_ret && v_ret, "GetScrollInfo() should return NON-zero " "but got h_ret=%d v_ret=%d\n", h_ret, v_ret); - todo_wine - ok(vert.nMin == 0 && vert.nMax == 100, + ok(vert.nMin == 0 && vert.nMax == 100, "unexpected init values(SB_VERT): min=%d max=%d\n", vert.nMin, vert.nMax); - todo_wine - ok(horz.nMin == 0 && horz.nMax == 100, + ok(horz.nMin == 0 && horz.nMax == 100, "unexpected init values(SB_HORZ): min=%d max=%d\n", horz.nMin, horz.nMax); }

1 0

Austin English : include: Flesh out d3d11.idl.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 899392b316e2ffe4bde37a0578f138c97fa65bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=899392b316e2ffe4bde37a057… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 22 18:59:18 2013 -0800 include: Flesh out d3d11.idl. --- include/d3d11.idl | 1630 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1623 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=899392b316e2ffe4bde37…

1 0

Alexandre Julliard : advapi32/tests: Fix another test failure.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 8148b99e3e32ee65c0206db2648f0dcf25a8970f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8148b99e3e32ee65c0206db26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 17:00:06 2013 +0100 advapi32/tests: Fix another test failure. --- dlls/advapi32/tests/service.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 5248e82..3d16126 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1856,9 +1856,10 @@ static void test_sequence(void) bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, NULL, 0, &n1); error = GetLastError(); ok(!bret, "Expected QueryServiceObjectSecurity to fail: result %d\n", bret); - ok(error == ERROR_INSUFFICIENT_BUFFER || broken(error == ERROR_INVALID_ADDRESS), + ok(error == ERROR_INSUFFICIENT_BUFFER || + broken(error == ERROR_INVALID_ADDRESS) || broken(error == ERROR_INVALID_PARAMETER), "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", error); - if (error == ERROR_INVALID_ADDRESS) n1 = 1024; + if (error != ERROR_INSUFFICIENT_BUFFER) n1 = 1024; pSD = LocalAlloc(0, n1); bret = pQueryServiceObjectSecurity(svc_handle, DACL_SECURITY_INFORMATION, pSD, n1, &n2); ok(bret, "Expected QueryServiceObjectSecurity to succeed: result %d\n", bret);

1 0

Erich Hoover : advapi32: Fix intermittent 64-bit test failure.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: cb45236032404c69597f3a87d6ea586fbbd74a80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb45236032404c69597f3a87d… Author: Erich Hoover <ehoover(a)mines.edu> Date: Fri Jan 18 11:00:58 2013 -0700 advapi32: Fix intermittent 64-bit test failure. --- dlls/advapi32/tests/security.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 0e0730f..e4adab1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3119,7 +3119,6 @@ static void test_GetNamedSecurityInfoA(void) bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); - HeapFree(GetProcessHeap(), 0, user); ok(bret, "Failed to add Current User to ACL.\n"); bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n"); @@ -3134,6 +3133,7 @@ static void test_GetNamedSecurityInfoA(void) if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("SetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); return; } @@ -3144,6 +3144,7 @@ static void test_GetNamedSecurityInfoA(void) if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) { win_skip("GetNamedSecurityInfoA is not implemented\n"); + HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); return; } @@ -3175,6 +3176,7 @@ static void test_GetNamedSecurityInfoA(void) "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } LocalFree(pSD); + HeapFree(GetProcessHeap(), 0, user); CloseHandle(hTemp); }

1 0

Michael Stefaniuc : itss: Use assignment instead of memcpy to copy a struct .
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 0538e9995d91cf98ea3f8b71187b6b57cb328e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0538e9995d91cf98ea3f8b711… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:30:53 2013 +0100 itss: Use assignment instead of memcpy to copy a struct. --- dlls/itss/chm_lib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index ada9be1..c9bbcdf 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -835,7 +835,7 @@ struct chmFile *chm_dup(struct chmFile *oldHandle) struct chmFile *newHandle=NULL; newHandle = HeapAlloc(GetProcessHeap(), 0, sizeof(struct chmFile)); - memcpy(newHandle, oldHandle, sizeof(struct chmFile)); + *newHandle = *oldHandle; /* duplicate fd handle */ DuplicateHandle(GetCurrentProcess(), oldHandle->fd,

1 0

Michael Stefaniuc : crypt32: Use assignment instead of memcpy to copy a struct.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: ab270d433f3e2d43045449ae2fb4fb6ca4b17113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab270d433f3e2d43045449ae2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:18:24 2013 +0100 crypt32: Use assignment instead of memcpy to copy a struct. --- dlls/crypt32/decode.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a4934a7..e5f8baf 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -692,8 +692,7 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, CryptMemAlloc( cItems * sizeof(struct AsnArrayItemSize)); if (itemSizes) - memcpy(itemSizes, &itemSize, - sizeof(itemSize)); + *itemSizes = itemSize; } if (itemSizes) {

1 0

Michael Stefaniuc : mscms: Use assignment instead of memcpy to copy structs .
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 184f167b190d99b47ff263c8818aee9c5f748e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=184f167b190d99b47ff263c88… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:18:09 2013 +0100 mscms: Use assignment instead of memcpy to copy structs. --- dlls/mscms/handle.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/handle.c b/dlls/mscms/handle.c index 1fec810..2f9eaec 100644 --- a/dlls/mscms/handle.c +++ b/dlls/mscms/handle.c @@ -140,7 +140,7 @@ HPROFILE create_profile( struct profile *profile ) if ((handle = alloc_profile_handle())) { DWORD_PTR index = (DWORD_PTR)handle - 1; - memcpy( &profiletable[index], profile, sizeof(struct profile) ); + profiletable[index] = *profile; } LeaveCriticalSection( &MSCMS_handle_cs ); return handle; @@ -221,7 +221,7 @@ HTRANSFORM create_transform( struct transform *transform ) if ((handle = alloc_transform_handle())) { DWORD_PTR index = (DWORD_PTR)handle - 1; - memcpy( &transformtable[index], transform, sizeof(struct transform) ); + transformtable[index] = *transform; } LeaveCriticalSection( &MSCMS_handle_cs ); return handle;

1 0

Michael Stefaniuc : msvcrt/tests: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: a8b63acc0388584e7788ae1ead14cacbdc85d3e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b63acc0388584e7788ae1ea… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:11:44 2013 +0100 msvcrt/tests: Use assignment instead of memcpy to copy structs. --- dlls/msvcrt/tests/cpp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index 88f8225..fc223c5 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -967,7 +967,7 @@ static void test_rtti(void) call_func1(pexception_dtor, &e); call_func1(pbad_typeid_dtor, &b); - memcpy(&simple_class_sig0_rtti, &simple_class_rtti, sizeof(struct rtti_data)); + simple_class_sig0_rtti = simple_class_rtti; simple_class_sig0_rtti.object_locator.signature = 0; simple_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); simple_class_sig0_rtti.base_array.bases[0] = RTTI_REF_SIG0(simple_class_sig0_rtti, base_descriptor[0], base); @@ -975,7 +975,7 @@ static void test_rtti(void) simple_class_sig0_rtti.object_locator.type_descriptor = RTTI_REF_SIG0(simple_class_sig0_rtti, type_info[0], base); simple_class_sig0_rtti.object_locator.type_hierarchy = RTTI_REF_SIG0(simple_class_sig0_rtti, object_hierarchy, base); - memcpy(&child_class_sig0_rtti, &child_class_rtti, sizeof(struct rtti_data)); + child_class_sig0_rtti = child_class_rtti; child_class_sig0_rtti.object_locator.signature = 0; child_class_sig0_rtti.base_descriptor[0].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[1], base); child_class_sig0_rtti.base_descriptor[1].type_descriptor = RTTI_REF_SIG0(child_class_sig0_rtti, type_info[0], base);

1 0

Michael Stefaniuc : dinput: Use assignment instead of memcpy to copy a struct.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: ab542a92d5e4f5eb60e18d4a62e7559bc454ec29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab542a92d5e4f5eb60e18d4a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:07:42 2013 +0100 dinput: Use assignment instead of memcpy to copy a struct. --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 466b6bf..0a044a5 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -314,7 +314,7 @@ static void find_joydevs(void) continue; } joydevs = new_joydevs; - memcpy(joydevs + have_joydevs, &joydev, sizeof(joydev)); + joydevs[have_joydevs] = joydev; have_joydevs++; close(fd);

1 0

Michael Stefaniuc : d3dx9_36/tests: Use assignment instead of memcpy to copy a struct.
by Alexandre Julliard 24 Jan '13

24 Jan '13

Module: wine Branch: master Commit: 18b2a38ba228109f8a18d5b51d358ab2d5d441b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18b2a38ba228109f8a18d5b51… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 24 15:06:44 2013 +0100 d3dx9_36/tests: Use assignment instead of memcpy to copy a struct. --- dlls/d3dx9_36/tests/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index bad9d43..bb1104b 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -324,7 +324,7 @@ static void test_dds_header_handling(void) dds.header.width = tests[i].width; dds.header.height = tests[i].height; dds.header.pitch_or_linear_size = tests[i].pitch; - memcpy(&dds.header.pixel_format, &tests[i].pixel_format, sizeof(struct dds_pixel_format)); + dds.header.pixel_format = tests[i].pixel_format; hr = D3DXGetImageInfoFromFileInMemory(&dds, file_size, &info); ok(hr == tests[i].expected_result, "%d: D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", i, hr, tests[i].expected_result);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
74
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 January 2013