January 2013 - Wine-Commits

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

Jan. 24, 2013

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 : mscms: Use assignment instead of memcpy to copy structs .
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

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 : crypt32: Use assignment instead of memcpy to copy a struct.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

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 : msvcrt/tests: Use assignment instead of memcpy to copy structs.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

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

Andrew Eikum : ieframe/tests: Don' t convert to long path name until the file exists.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: b233d2054e64e216a5b3868f301bfc934b019b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b233d2054e64e216a5b3868f3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 24 10:35:00 2013 -0600 ieframe/tests: Don't convert to long path name until the file exists. --- dlls/ieframe/tests/webbrowser.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index c1e8b49..1915876 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3529,8 +3529,6 @@ static void test_FileProtocol(void) GetTempPathA(MAX_PATH, file_path); strcat(file_path, test_file); - GetLongPathNameA(file_path, file_path, sizeof(file_path)); - strcat(file_url, file_path); webbrowser = create_webbrowser(); if(!webbrowser) @@ -3546,6 +3544,9 @@ static void test_FileProtocol(void) } CloseHandle(file); + GetLongPathNameA(file_path, file_path, sizeof(file_path)); + strcat(file_url, file_path); + test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, TRUE); test_DoVerb(webbrowser);

1 0

Austin English : include: Flesh out d3d11.idl.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

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

Jacek Caban : ieframe/tests: Fixed a race in tests.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: b28a4507a993a92bf9a751a1394e9b8c5afd1c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b28a4507a993a92bf9a751a13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 24 13:28:09 2013 +0100 ieframe/tests: Fixed a race in tests. --- dlls/ieframe/tests/webbrowser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 760618f..c1e8b49 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2792,7 +2792,6 @@ static void test_download(DWORD flags) CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); if(is_first_load) todo_wine CHECK_CALLED(GetDropTarget); - todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); if(!(flags & DWL_REFRESH)) CHECK_CALLED(Invoke_DOCUMENTCOMPLETE); @@ -2805,6 +2804,7 @@ static void test_download(DWORD flags) DispatchMessage(&msg); } + todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); if(flags & DWL_HTTP) CLEAR_CALLED(Exec_SETTITLE); /* FIXME: make it more strict */ CHECK_CALLED(UpdateUI);

1 0

Sergey Guralnik : user32: Init standard scrollbars during WM_NCCREATE.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

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

Alexandre Julliard : wbemprox: Don' t rely on GetTicksCount to determine boot time.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: 22b3a8251ffb54203a05486b42cd70fd0caf5c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22b3a8251ffb54203a05486b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 15:24:31 2013 +0100 wbemprox: Don't rely on GetTicksCount to determine boot time. --- dlls/wbemprox/builtin.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 09da3f6..2e2e24b 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -945,21 +945,15 @@ static WCHAR *get_lastbootuptime(void) static const WCHAR fmtW[] = {'%','0','4','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u','%','0','2','u', '.','%','0','6','u','+','0','0','0',0}; - SYSTEMTIME st; - FILETIME ft; - ULARGE_INTEGER ticks; + SYSTEM_TIMEOFDAY_INFORMATION ti; + TIME_FIELDS tf; WCHAR *ret; if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; - GetSystemTime( &st ); - SystemTimeToFileTime( &st, &ft ); - ticks.u.LowPart = ft.dwLowDateTime; - ticks.u.HighPart = ft.dwHighDateTime; - ticks.QuadPart -= GetTickCount64() * 10000; - ft.dwLowDateTime = ticks.u.LowPart; - ft.dwHighDateTime = ticks.u.HighPart; - FileTimeToSystemTime( &ft, &st ); - sprintfW( ret, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000 ); + + NtQuerySystemInformation( SystemTimeOfDayInformation, &ti, sizeof(ti), NULL ); + RtlTimeToTimeFields( &ti.liKeBootTime, &tf ); + sprintfW( ret, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); return ret; } static const WCHAR *get_osarchitecture(void)

1 0

Alexandre Julliard : ole32: Fix wrap-around bug in tick count comparison.
by Alexandre Julliard Jan. 24, 2013

Jan. 24, 2013

Module: wine Branch: master Commit: e089295f75cf9db2557418d644c72bc9ba55e70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e089295f75cf9db2557418d64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 24 15:15:25 2013 +0100 ole32: Fix wrap-around bug in tick count comparison. --- dlls/ole32/compobj.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 630e016..dc2a02b 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -813,14 +813,17 @@ static void apartment_freeunusedlibraries(struct apartment *apt, DWORD delay) real_delay = 0; } - if (!real_delay || (entry->unload_time && (entry->unload_time < GetTickCount()))) + if (!real_delay || (entry->unload_time && ((int)(GetTickCount() - entry->unload_time) > 0))) { list_remove(&entry->entry); COMPOBJ_DllList_ReleaseRef(entry->dll, TRUE); HeapFree(GetProcessHeap(), 0, entry); } else + { entry->unload_time = GetTickCount() + real_delay; + if (!entry->unload_time) entry->unload_time = 1; + } } else if (entry->unload_time) entry->unload_time = 0;

1 0