December 2006 - Wine-commits

Rob Shearman : ole32: Move the user marshal tests to usrmarshal.c.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 3bb4760f8801508982c6577889d99c67cf96ce69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb4760f8801508982c657788… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Dec 17 23:45:55 2006 +0000 ole32: Move the user marshal tests to usrmarshal.c. --- dlls/ole32/tests/Makefile.in | 3 +- dlls/ole32/tests/marshal.c | 189 ---------------------------------- dlls/ole32/tests/usrmarshal.c | 226 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 228 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bb4760f8801508982c65…

1 0

Paul Vriens : usp10/tests: Make tests run on win9x and NT4 again.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 012861100c24c4cb9770a2bcfa5377c5107330a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=012861100c24c4cb9770a2bcf… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Dec 17 19:18:41 2006 +0100 usp10/tests: Make tests run on win9x and NT4 again. --- dlls/usp10/tests/usp10.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index c6ffd8a..dd26492 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1237,11 +1237,22 @@ static void test_digit_substitution(void LGRPID_GEORGIAN, LGRPID_ARMENIAN }; + HMODULE hKernel32; + static BOOL (WINAPI * pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC,LGRPID,DWORD,LONG_PTR); + + hKernel32 = GetModuleHandleA("kernel32.dll"); + pEnumLanguageGroupLocalesA = (void*)GetProcAddress(hKernel32, "EnumLanguageGroupLocalesA"); + + if (!pEnumLanguageGroupLocalesA) + { + trace("EnumLanguageGroupLocalesA not available on this platform\n"); + return; + } for (i = 0; i < sizeof(groups)/sizeof(groups[0]); i++) { - ret = EnumLanguageGroupLocales(enum_proc, groups[i], 0, 0); - ok(ret, "EnumLanguageGroupLocales failed unexpectedly: 0x%08x\n", GetLastError()); + ret = pEnumLanguageGroupLocalesA(enum_proc, groups[i], 0, 0); + ok(ret, "EnumLanguageGroupLocalesA failed unexpectedly: 0x%08x\n", GetLastError()); } }

1 0

Dmitry Timoshkov : winedump: Fix a couple of typos.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: c4e7e07a4598a4ffa4882607181a3895265c303d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e7e07a4598a4ffa48826071… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 18 13:45:50 2006 +0800 winedump: Fix a couple of typos. --- tools/winedump/pe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 9c25af1..df07aa9 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -608,7 +608,7 @@ static void dump_dir_imported_functions( printf(" offset %08lx %s\n", Offset(importDesc), (const char*)RVA(importDesc->Name, sizeof(DWORD))); printf(" Hint/Name Table: %08X\n", (DWORD)importDesc->u.OriginalFirstThunk); - printf(" TimeDataStamp: %08X (%s)\n", + printf(" TimeDateStamp: %08X (%s)\n", importDesc->TimeDateStamp, get_time_str(importDesc->TimeDateStamp)); printf(" ForwarderChain: %08X\n", importDesc->ForwarderChain); printf(" First thunk RVA: %08X\n", (DWORD)importDesc->FirstThunk); @@ -673,7 +673,7 @@ static void dump_dir_delay_imported_func printf(" grAttrs %08x offset %08lx %s\n", importDesc->grAttrs, Offset(importDesc), use_rva ? (const char *)RVA(importDesc->szName, sizeof(DWORD)) : (char *)importDesc->szName); printf(" Hint/Name Table: %08x\n", importDesc->pINT); - printf(" TimeDataStamp: %08X (%s)\n", + printf(" TimeDateStamp: %08X (%s)\n", importDesc->dwTimeStamp, get_time_str(importDesc->dwTimeStamp)); printf(" Ordn Name\n");

1 0

Dmitry Timoshkov : winedump: Remove a redundant ';'.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 1d63675322e10ad8225723187d1af68a4e75b592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d63675322e10ad8225723187… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Dec 18 13:46:27 2006 +0800 winedump: Remove a redundant ';'. --- tools/winedump/pe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index df07aa9..e05274f 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -412,7 +412,7 @@ void dump_section(const IMAGE_SECTION_HE switch (sectHead->Characteristics & IMAGE_SCN_ALIGN_MASK) { -#define X2(b,s) case b: printf(" " s); break; +#define X2(b,s) case b: printf(" " s); break X2(IMAGE_SCN_ALIGN_1BYTES, "ALIGN_1BYTES"); X2(IMAGE_SCN_ALIGN_2BYTES, "ALIGN_2BYTES"); X2(IMAGE_SCN_ALIGN_4BYTES, "ALIGN_4BYTES");

1 0

Andrew Talbot : server: Cast-qual warnings fix.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 53dae9b7f580b7faf471bc577ceae42aecac2817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53dae9b7f580b7faf471bc577… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 16 17:43:17 2006 +0000 server: Cast-qual warnings fix. --- server/token.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/token.c b/server/token.c index 44e1a90..b84c91b 100644 --- a/server/token.c +++ b/server/token.c @@ -515,7 +515,7 @@ static ACL *create_default_dacl( const S memcpy( sid, &local_system_sid, sizeof(local_system_sid) ); /* GENERIC_ALL for specified user */ - aaa = (ACCESS_ALLOWED_ACE *)((const char *)aaa + aaa->Header.AceSize); + aaa = (ACCESS_ALLOWED_ACE *)((char *)aaa + aaa->Header.AceSize); aaa->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; aaa->Header.AceFlags = 0; aaa->Header.AceSize = (sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD)) +

1 0

Paul Vriens : user32/tests: Make sure the tests run on NT4 again.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 75414bb4ad38be10c990555153d4efa9cb7cc133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75414bb4ad38be10c99055515… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Sun Dec 17 13:10:03 2006 +0100 user32/tests: Make sure the tests run on NT4 again. --- dlls/user32/tests/monitor.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index de91f44..a4ea8ec 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -27,6 +27,8 @@ static HMODULE hdll; static BOOL (WINAPI *pEnumDisplayDevicesA)(LPCSTR,DWORD,LPDISPLAY_DEVICEA,DWORD); static BOOL (WINAPI *pEnumDisplayMonitors)(HDC,LPRECT,MONITORENUMPROC,LPARAM); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); +static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); +static HMONITOR (WINAPI *pMonitorFromWindow)(HWND,DWORD); static void init_function_pointers(void) { @@ -37,6 +39,8 @@ static void init_function_pointers(void) pEnumDisplayDevicesA = (void*)GetProcAddress(hdll, "EnumDisplayDevicesA"); pEnumDisplayMonitors = (void*)GetProcAddress(hdll, "EnumDisplayMonitors"); pGetMonitorInfoA = (void*)GetProcAddress(hdll, "GetMonitorInfoA"); + pMonitorFromPoint = (void*)GetProcAddress(hdll, "MonitorFromPoint"); + pMonitorFromWindow = (void*)GetProcAddress(hdll, "MonitorFromWindow"); } } @@ -179,14 +183,14 @@ static void test_monitors(void) POINT pt; pt.x = pt.y = 0; - primary = MonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY ); + primary = pMonitorFromPoint( pt, MONITOR_DEFAULTTOPRIMARY ); ok( primary != 0, "couldn't get primary monitor\n" ); - monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTONULL ); + monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTONULL ); ok( !monitor, "got %p, should not get a monitor for an invalid window\n", monitor ); - monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); + monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTOPRIMARY ); ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTOPRIMARY\n", monitor, primary ); - monitor = MonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST ); + monitor = pMonitorFromWindow( 0, MONITOR_DEFAULTTONEAREST ); ok( monitor == primary, "got %p, should get primary %p for MONITOR_DEFAULTTONEAREST\n", monitor, primary ); } @@ -197,5 +201,6 @@ START_TEST(monitor) test_enumdisplaydevices(); if (winetest_interactive) test_ChangeDisplaySettingsEx(); - test_monitors(); + if (pMonitorFromPoint && pMonitorFromWindow) + test_monitors(); }

1 0

Andrew Talbot : winhelp: Cast-qual warnings fix.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: bc718eec9e247fe293d32ab2d9edc28808629ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc718eec9e247fe293d32ab2d… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 16 14:52:36 2006 +0000 winhelp: Cast-qual warnings fix. --- programs/winhelp/hlpfile.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/winhelp/hlpfile.c b/programs/winhelp/hlpfile.c index e95dfdf..59f55d1 100644 --- a/programs/winhelp/hlpfile.c +++ b/programs/winhelp/hlpfile.c @@ -452,10 +452,12 @@ static BOOL HLPFILE_AddPage(HLPFILE *hlp while (ptr < page->lpszTitle + titlesize) { unsigned len = strlen(ptr); + char* macro_str; + WINE_TRACE("macro: %s\n", ptr); macro = HeapAlloc(GetProcessHeap(), 0, sizeof(HLPFILE_MACRO) + len + 1); - macro->lpszMacro = (char*)(macro + 1); - memcpy((char*)macro->lpszMacro, ptr, len + 1); + macro->lpszMacro = macro_str = (char*)(macro + 1); + memcpy(macro_str, ptr, len + 1); /* FIXME: shall we really link macro in reverse order ?? * may produce strange results when played at page opening */ @@ -822,6 +824,7 @@ static HLPFILE_LINK* HLPFILE_Alloc BOOL clrChange, unsigned wnd) { HLPFILE_LINK* link; + char* link_str; /* FIXME: should build a string table for the attributes.link.lpszPath * they are reallocated for each link @@ -830,8 +833,8 @@ static HLPFILE_LINK* HLPFILE_Alloc if (!link) return NULL; link->cookie = cookie; - link->lpszString = (char*)link + sizeof(HLPFILE_LINK); - strcpy((char*)link->lpszString, str); + link->lpszString = link_str = (char*)link + sizeof(HLPFILE_LINK); + strcpy(link_str, str); link->lHash = hash; link->bClrChange = clrChange ? 1 : 0; link->window = wnd;

1 0

Alexandre Julliard : msvcrt: Define __CxxLongjmpUnwind for i386 only.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 0689e9ea0589ff9df4db8affba589c79629d5010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0689e9ea0589ff9df4db8affb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 16 17:37:20 2006 +0100 msvcrt: Define __CxxLongjmpUnwind for i386 only. --- dlls/msvcrt/cppexcept.c | 29 +++++++++++++++-------------- dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index e556353..ec1f364 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -424,6 +424,21 @@ __ASM_GLOBAL_FUNC( __CxxFrameHandler, "add $28,%esp\n\t" "ret" ); + +/********************************************************************* + * __CxxLongjmpUnwind (MSVCRT.@) + * + * Callback meant to be used as UnwindFunc for setjmp/longjmp. + */ +void __stdcall __CxxLongjmpUnwind( const struct MSVCRT___JUMP_BUFFER *buf ) +{ + cxx_exception_frame *frame = (cxx_exception_frame *)buf->Registration; + const cxx_function_descr *descr = (const cxx_function_descr *)buf->UnwindData[0]; + + TRACE( "unwinding frame %p descr %p trylevel %ld\n", frame, descr, buf->TryLevel ); + cxx_local_unwind( frame, descr, buf->TryLevel ); +} + #endif /* __i386__ */ /********************************************************************* @@ -469,17 +484,3 @@ unsigned int CDECL __CxxQueryExceptionSi { return sizeof(cxx_exception_type); } - -/********************************************************************* - * __CxxLongjmpUnwind (MSVCRT.@) - * - * Callback meant to be used as UnwindFunc for setjmp/longjmp. - */ -void __stdcall __CxxLongjmpUnwind( const struct MSVCRT___JUMP_BUFFER *buf ) -{ - cxx_exception_frame *frame = (cxx_exception_frame *)buf->Registration; - const cxx_function_descr *descr = (const cxx_function_descr *)buf->UnwindData[0]; - - TRACE( "unwinding frame %p descr %p trylevel %ld\n", frame, descr, buf->TryLevel ); - cxx_local_unwind( frame, descr, buf->TryLevel ); -} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f236c24..59e21f6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -76,7 +76,7 @@ @ cdecl _Strftime(str long str ptr ptr) @ cdecl _XcptFilter(long ptr) @ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) -@ stdcall __CxxLongjmpUnwind(ptr) +@ stdcall -i386 __CxxLongjmpUnwind(ptr) @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid

1 0

Andrew Talbot : server: Cast-qual warnings fix.
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 76c556ad68e8ba2902f403afbc41f1449ae2dc08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c556ad68e8ba2902f403afb… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Dec 16 17:41:30 2006 +0000 server: Cast-qual warnings fix. --- server/object.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/object.c b/server/object.c index 6efe239..63465f2 100644 --- a/server/object.c +++ b/server/object.c @@ -290,14 +290,15 @@ void release_object( void *ptr ) struct object *find_object( const struct namespace *namespace, const struct unicode_str *name, unsigned int attributes ) { - const struct list *list, *p; + const struct list *list; + struct list *p; if (!name || !name->len) return NULL; list = &namespace->names[ get_name_hash( namespace, name->str, name->len ) ]; LIST_FOR_EACH( p, list ) { - const struct object_name *ptr = LIST_ENTRY( p, const struct object_name, entry ); + const struct object_name *ptr = LIST_ENTRY( p, struct object_name, entry ); if (ptr->len != name->len) continue; if (attributes & OBJ_CASE_INSENSITIVE) {

1 0

Ulrich Czekalla : ddraw: IDirectDraw3 should use its own ref count variable .
by Alexandre Julliard 18 Dec '06

18 Dec '06

Module: wine Branch: master Commit: 325f666fc57eda037935ecada14191bbec6002a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=325f666fc57eda037935ecada… Author: Ulrich Czekalla <ulrich.czekalla(a)utoronto.ca> Date: Fri Dec 15 11:15:28 2006 -0500 ddraw: IDirectDraw3 should use its own ref count variable. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/ddraw_thunks.c | 8 ++++---- dlls/ddraw/main.c | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 26c1bc8..d31d280 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -96,7 +96,7 @@ struct IDirectDrawImpl ICOM_VFIELD_MULTI(IDirect3D); /* See comment in IDirectDraw::AddRef */ - LONG ref7, ref4, ref2, ref1, numIfaces; + LONG ref7, ref4, ref2, ref3, ref1, numIfaces; /* WineD3D linkage */ IWineD3D *wineD3D; diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index 99518f0..ce61f18 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -110,9 +110,9 @@ static ULONG WINAPI IDirectDraw3Impl_AddRef(LPDIRECTDRAW3 iface) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw3, iface); - ULONG ref = InterlockedIncrement(&This->ref4); + ULONG ref = InterlockedIncrement(&This->ref3); - TRACE("(%p) : incrementing IDirectDraw4 refcount from %u.\n", This, ref -1); + TRACE("(%p) : incrementing IDirectDraw3 refcount from %u.\n", This, ref -1); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -170,9 +170,9 @@ static ULONG WINAPI IDirectDraw3Impl_Release(LPDIRECTDRAW3 iface) { ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw3, iface); - ULONG ref = InterlockedDecrement(&This->ref4); + ULONG ref = InterlockedDecrement(&This->ref3); - TRACE_(ddraw)("(%p)->() decrementing IDirectDraw4 refcount from %u.\n", This, ref +1); + TRACE_(ddraw)("(%p)->() decrementing IDirectDraw3 refcount from %u.\n", This, ref +1); if(ref == 0) { diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index a520381..26aac5d 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -882,11 +882,12 @@ DllMain(HINSTANCE hInstDLL, int i; IDirectDrawImpl *ddraw = LIST_ENTRY(entry, IDirectDrawImpl, ddraw_list_entry); - WARN("DDraw %p has a refcount of %d\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref2 + ddraw->ref1); + WARN("DDraw %p has a refcount of %d\n", ddraw, ddraw->ref7 + ddraw->ref4 + ddraw->ref3 + ddraw->ref2 + ddraw->ref1); /* Add references to each interface to avoid freeing them unexpectadely */ IDirectDraw_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw)); IDirectDraw2_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw2)); + IDirectDraw3_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw3)); IDirectDraw4_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw4)); IDirectDraw7_AddRef(ICOM_INTERFACE(ddraw, IDirectDraw7)); @@ -925,6 +926,7 @@ DllMain(HINSTANCE hInstDLL, */ while(IDirectDraw_Release(ICOM_INTERFACE(ddraw, IDirectDraw))); while(IDirectDraw2_Release(ICOM_INTERFACE(ddraw, IDirectDraw2))); + while(IDirectDraw3_Release(ICOM_INTERFACE(ddraw, IDirectDraw3))); while(IDirectDraw4_Release(ICOM_INTERFACE(ddraw, IDirectDraw4))); while(IDirectDraw7_Release(ICOM_INTERFACE(ddraw, IDirectDraw7))); }

1 0