December 2006 - Wine-commits

Alexandre Julliard : msvcrt: Make pointers to read-only exception descriptors const.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 8592c4b876c95d86e3b8a608cfd6daea9ef514b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8592c4b876c95d86e3b8a608c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 13:41:31 2006 +0100 msvcrt: Make pointers to read-only exception descriptors const. --- dlls/msvcrt/cppexcept.c | 28 +++++++++++++++------------- dlls/msvcrt/cppexcept.h | 32 ++++++++++++++++---------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 52b17a4..c4679c3 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -45,8 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, - cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, - int nested_trylevel ); + const cxx_function_descr *descr, + EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ); /* call a function with a given ebp */ inline static void *call_ebp_func( void *func, void *ebp ) @@ -112,7 +112,7 @@ static void dump_exception_type( const c } } -static void dump_function_descr( const cxx_function_descr *descr, const cxx_exception_type *info ) +static void dump_function_descr( const cxx_function_descr *descr ) { UINT i; int j; @@ -133,7 +133,7 @@ static void dump_function_descr( const c descr->tryblock[i].catchblock_count ); for (j = 0; j < descr->tryblock[i].catchblock_count; j++) { - catchblock_info *ptr = &descr->tryblock[i].catchblock[j]; + const catchblock_info *ptr = &descr->tryblock[i].catchblock[j]; TRACE( " %d: flags %x offset %d handler %p type %p %s\n", j, ptr->flags, ptr->offset, ptr->handler, ptr->type_info, dbgstr_type_info( ptr->type_info ) ); @@ -142,7 +142,8 @@ static void dump_function_descr( const c } /* check if the exception type is caught by a given catch block, and return the type that matched */ -static const cxx_type_info *find_caught_type( cxx_exception_type *exc_type, catchblock_info *catchblock ) +static const cxx_type_info *find_caught_type( cxx_exception_type *exc_type, + const catchblock_info *catchblock ) { UINT i; @@ -168,7 +169,7 @@ static const cxx_type_info *find_caught_ /* copy the exception object where the catch block wants it */ static void copy_exception( void *object, cxx_exception_frame *frame, - catchblock_info *catchblock, const cxx_type_info *type ) + const catchblock_info *catchblock, const cxx_type_info *type ) { void **dest_ptr; @@ -197,7 +198,7 @@ static void copy_exception( void *object } /* unwind the local function up to a given trylevel */ -static void cxx_local_unwind( cxx_exception_frame* frame, cxx_function_descr *descr, int last_level) +static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_descr *descr, int last_level) { void (*handler)(); int trylevel = frame->trylevel; @@ -227,7 +228,7 @@ struct catch_func_nested_frame EXCEPTION_REGISTRATION_RECORD frame; /* standard exception frame */ EXCEPTION_RECORD *prev_rec; /* previous record to restore in thread data */ cxx_exception_frame *cxx_frame; /* frame of parent exception */ - cxx_function_descr *descr; /* descriptor of parent exception */ + const cxx_function_descr *descr; /* descriptor of parent exception */ int trylevel; /* current try level */ EXCEPTION_RECORD *rec; /* rec associated with frame */ }; @@ -276,7 +277,7 @@ static DWORD catch_function_nested_handl /* find and call the appropriate catch block for an exception */ /* returns the address to continue execution to after the catch block was called */ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame, - cxx_function_descr *descr, int nested_trylevel, + const cxx_function_descr *descr, int nested_trylevel, cxx_exception_type *info ) { UINT i; @@ -289,7 +290,7 @@ inline static void call_catch_block( PEX for (i = 0; i < descr->tryblock_count; i++) { - tryblock_info *tryblock = &descr->tryblock[i]; + const tryblock_info *tryblock = &descr->tryblock[i]; if (trylevel < tryblock->start_level) continue; if (trylevel > tryblock->end_level) continue; @@ -297,7 +298,7 @@ inline static void call_catch_block( PEX /* got a try block */ for (j = 0; j < tryblock->catchblock_count; j++) { - catchblock_info *catchblock = &tryblock->catchblock[j]; + const catchblock_info *catchblock = &tryblock->catchblock[j]; if(info) { const cxx_type_info *type = find_caught_type( info, catchblock ); @@ -357,7 +358,8 @@ inline static void call_catch_block( PEX */ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch, - cxx_function_descr *descr, EXCEPTION_REGISTRATION_RECORD* nested_frame, + const cxx_function_descr *descr, + EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ) { cxx_exception_type *exc_type; @@ -390,7 +392,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTIO TRACE("handling C++ exception rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec, frame, frame->trylevel, descr, nested_frame ); dump_exception_type( exc_type ); - dump_function_descr( descr, exc_type ); + dump_function_descr( descr ); } } else diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 8482cc7..d4c8068 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -53,10 +53,10 @@ typedef struct __cxx_exception_frame /* info about a single catch {} block */ typedef struct __catchblock_info { - UINT flags; /* flags (see below) */ - type_info *type_info; /* C++ type caught by this block */ - int offset; /* stack offset to copy exception object to */ - void (*handler)(); /* catch block handler code */ + UINT flags; /* flags (see below) */ + const type_info *type_info; /* C++ type caught by this block */ + int offset; /* stack offset to copy exception object to */ + void (*handler)(); /* catch block handler code */ } catchblock_info; #define TYPE_FLAG_CONST 1 #define TYPE_FLAG_VOLATILE 2 @@ -65,11 +65,11 @@ typedef struct __catchblock_info /* info about a single try {} block */ typedef struct __tryblock_info { - int start_level; /* start trylevel of that block */ - int end_level; /* end trylevel of that block */ - int catch_level; /* initial trylevel of the catch block */ - int catchblock_count; /* count of catch blocks in array */ - catchblock_info *catchblock; /* array of catch blocks */ + int start_level; /* start trylevel of that block */ + int end_level; /* end trylevel of that block */ + int catch_level; /* initial trylevel of the catch block */ + int catchblock_count; /* count of catch blocks in array */ + const catchblock_info *catchblock; /* array of catch blocks */ } tryblock_info; /* info about the unwind handler for a given trylevel */ @@ -82,12 +82,12 @@ typedef struct __unwind_info /* descriptor of all try blocks of a given function */ typedef struct __cxx_function_descr { - UINT magic; /* must be CXX_FRAME_MAGIC */ - UINT unwind_count; /* number of unwind handlers */ - unwind_info *unwind_table; /* array of unwind handlers */ - UINT tryblock_count; /* number of try blocks */ - tryblock_info *tryblock; /* array of try blocks */ - UINT unknown[3]; + UINT magic; /* must be CXX_FRAME_MAGIC */ + UINT unwind_count; /* number of unwind handlers */ + const unwind_info *unwind_table; /* array of unwind handlers */ + UINT tryblock_count; /* number of try blocks */ + const tryblock_info *tryblock; /* array of try blocks */ + UINT unknown[3]; } cxx_function_descr; typedef void (*cxx_copy_ctor)(void); @@ -121,7 +121,7 @@ typedef struct __cxx_type_info_table typedef DWORD (*cxx_exc_custom_handler)( PEXCEPTION_RECORD, cxx_exception_frame*, PCONTEXT, EXCEPTION_REGISTRATION_RECORD**, - cxx_function_descr*, int nested_trylevel, + const cxx_function_descr*, int nested_trylevel, EXCEPTION_REGISTRATION_RECORD *nested_frame, DWORD unknown3 ); /* type information for an exception object */

1 0

Alexandre Julliard : msvcrt: Implemented __CxxLongjmpUnwind.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 7d98599d7daaa3497a5de6445011ed4a9470c1a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d98599d7daaa3497a5de6445… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 15 13:41:48 2006 +0100 msvcrt: Implemented __CxxLongjmpUnwind. --- dlls/msvcrt/cppexcept.c | 14 ++++++++++++++ dlls/msvcrt/except.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index c4679c3..e556353 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -469,3 +469,17 @@ 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/except.c b/dlls/msvcrt/except.c index 80d6c71..a218387 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -259,7 +259,7 @@ int CDECL _abnormal_termination(void) #ifdef __i386__ #define MSVCRT_JMP_MAGIC 0x56433230 /* ID value for new jump structure */ -typedef void (*MSVCRT_unwind_function)(const void*); +typedef void (__stdcall *MSVCRT_unwind_function)(const struct MSVCRT___JUMP_BUFFER *); /* define an entrypoint for setjmp/setjmp3 that stores the registers in the jmp buf */ /* and then jumps to the C backend function */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0b27bed..f236c24 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) -@ stub __CxxLongjmpUnwind #(ptr) stdcall +@ stdcall __CxxLongjmpUnwind(ptr) @ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid

1 0

Dmitry Timoshkov : ddraw: Fix warnings.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 8836dea139e13f89a5b53ef464a564559e03e93d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8836dea139e13f89a5b53ef46… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 15 15:02:33 2006 +0800 ddraw: Fix warnings. --- dlls/ddraw/ddraw_thunks.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_thunks.c b/dlls/ddraw/ddraw_thunks.c index ef8af6b..99518f0 100644 --- a/dlls/ddraw/ddraw_thunks.c +++ b/dlls/ddraw/ddraw_thunks.c @@ -112,7 +112,7 @@ IDirectDraw3Impl_AddRef(LPDIRECTDRAW3 if ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw3, iface); ULONG ref = InterlockedIncrement(&This->ref4); - TRACE("(%p) : incrementing IDirectDraw4 refcount from %lu.\n", This, ref -1); + TRACE("(%p) : incrementing IDirectDraw4 refcount from %u.\n", This, ref -1); if(ref == 1) InterlockedIncrement(&This->numIfaces); @@ -172,7 +172,7 @@ IDirectDraw3Impl_Release(LPDIRECTDRAW3 i ICOM_THIS_FROM(IDirectDrawImpl, IDirectDraw3, iface); ULONG ref = InterlockedDecrement(&This->ref4); - TRACE_(ddraw)("(%p)->() decrementing IDirectDraw4 refcount from %lu.\n", This, ref +1); + TRACE_(ddraw)("(%p)->() decrementing IDirectDraw4 refcount from %u.\n", This, ref +1); if(ref == 0) {

1 0

Dmitry Timoshkov : ddrawex: Avoid not necessary casts.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 95f263240b1ef8de07b8cdb76a4d37255ebdcc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95f263240b1ef8de07b8cdb76… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 15 15:03:32 2006 +0800 ddrawex: Avoid not necessary casts. --- dlls/ddrawex/ddrawex_private.h | 4 ++-- dlls/ddrawex/main.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h index 2153921..117ddba 100644 --- a/dlls/ddrawex/ddrawex_private.h +++ b/dlls/ddrawex/ddrawex_private.h @@ -48,7 +48,7 @@ DECLARE_INTERFACE_(IDirectDrawFactory, I ******************************************************************************/ typedef struct { - IClassFactory *lpVtbl; + const IClassFactoryVtbl *lpVtbl; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, REFIID iid, LPVOID *ppObj); } IClassFactoryImpl; @@ -59,7 +59,7 @@ typedef struct ******************************************************************************/ typedef struct { - IDirectDrawFactory *lpVtbl; + const IDirectDrawFactoryVtbl *lpVtbl; LONG ref; } IDirectDrawFactoryImpl; diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c index e3cd664..40ec7cb 100644 --- a/dlls/ddrawex/main.c +++ b/dlls/ddrawex/main.c @@ -272,9 +272,9 @@ CreateDirectDrawFactory(IUnknown* UnkOut return E_OUTOFMEMORY; } - This->lpVtbl = (IDirectDrawFactory*) &IDirectDrawFactory_Vtbl; + This->lpVtbl = &IDirectDrawFactory_Vtbl; - hr = IDirectDrawFactory_QueryInterface(This->lpVtbl, iid, obj); + hr = IDirectDrawFactory_QueryInterface((IDirectDrawFactory *)This, iid, obj); if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, This); @@ -315,7 +315,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSI factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->lpVtbl = (IClassFactory*) &IClassFactory_Vtbl; + factory->lpVtbl = &IClassFactory_Vtbl; factory->ref = 1; factory->pfnCreateInstance = CreateDirectDrawFactory;

1 0

Dmitry Timoshkov : user32: Add support for the VK_APPS (Menu) key.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 6c73f7395ba610c3ce7549f9ebdccaf24829b8ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c73f7395ba610c3ce7549f9e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 15 15:03:43 2006 +0800 user32: Add support for the VK_APPS (Menu) key. --- dlls/user32/message.c | 6 ++++++ dlls/user32/tests/msg.c | 18 ++++++++++++++++++ dlls/winex11.drv/keyboard.c | 2 +- 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 94d29d8..89f7495 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1660,6 +1660,12 @@ static BOOL process_keyboard_message( MS SendMessageW(msg->hwnd, WM_APPCOMMAND, (WPARAM)msg->hwnd, MAKELPARAM(0, (FAPPCOMMAND_KEY | (msg->wParam - VK_BROWSER_BACK + 1)))); } } + else if (msg->message == WM_KEYUP) + { + /* Handle VK_APPS key by posting a WM_CONTEXTMENU message */ + if (msg->wParam == VK_APPS && !MENU_IsMenuActive()) + PostMessageW(msg->hwnd, WM_CONTEXTMENU, (WPARAM)msg->hwnd, (LPARAM)-1); + } } if (HOOK_CallHooks( WH_KEYBOARD, remove ? HC_ACTION : HC_NOREMOVE, diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5b74cc4..98a1229 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5288,6 +5288,17 @@ static const struct message WmF1Seq[] = { WM_KEYUP, sent|wparam|lparam, VK_F1, 0xc0000001 }, { 0 } }; +static const struct message WmVkAppsSeq[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_APPS, 1 }, /* XP */ + { WM_KEYDOWN, wparam|lparam, VK_APPS, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_APPS, 0x00000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_APPS, 0xc0000001 }, /* XP */ + { WM_KEYUP, wparam|lparam, VK_APPS, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_APPS, 0xc0000001 }, + { WM_CONTEXTMENU, lparam, /*hwnd*/0, (LPARAM)-1 }, + { WM_CONTEXTMENU, sent|lparam, /*hwnd*/0, (LPARAM)-1 }, + { 0 } +}; static void pump_msg_loop(HWND hwnd, HACCEL hAccel) { @@ -5495,11 +5506,18 @@ static void test_accelerators(void) pump_msg_loop(hwnd, 0); ok_sequence(WmAltMouseButton, "Alt+MouseButton press/release", FALSE); + trace("testing VK_F1 press/release\n"); keybd_event(VK_F1, 0, 0, 0); keybd_event(VK_F1, 0, KEYEVENTF_KEYUP, 0); pump_msg_loop(hwnd, 0); ok_sequence(WmF1Seq, "F1 press/release", TRUE); + trace("testing VK_APPS press/release\n"); + keybd_event(VK_APPS, 0, 0, 0); + keybd_event(VK_APPS, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmVkAppsSeq, "VK_APPS press/release", FALSE); + DestroyWindow(hwnd); } diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 19d3684..c5947cf 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1001,7 +1001,7 @@ static const WORD nonchar_key_vkey[256] VK_DOWN, VK_PRIOR, VK_NEXT, VK_END, 0, 0, 0, 0, 0, 0, 0, 0, /* FF58 */ /* misc keys */ - VK_SELECT, VK_SNAPSHOT, VK_EXECUTE, VK_INSERT, 0, 0, 0, 0, /* FF60 */ + VK_SELECT, VK_SNAPSHOT, VK_EXECUTE, VK_INSERT, 0,0,0, VK_APPS, /* FF60 */ 0, VK_CANCEL, VK_HELP, VK_CANCEL, 0, 0, 0, 0, /* FF68 */ 0, 0, 0, 0, 0, 0, 0, 0, /* FF70 */ /* keypad keys */

1 0

Dmitry Timoshkov : user32: Center the context menu if it was activated via VK_APPS like Windows does.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: b37b72b0068a11045667e6700e146549ee191b65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b37b72b0068a11045667e6700… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Dec 15 15:04:01 2006 +0800 user32: Center the context menu if it was activated via VK_APPS like Windows does. --- dlls/user32/edit.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index f93c9aa..44c6f95 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4102,6 +4102,16 @@ static void EDIT_WM_ContextMenu(EDITSTAT /* select all */ EnableMenuItem(popup, 7, MF_BYPOSITION | (start || (end != strlenW(es->text)) ? MF_ENABLED : MF_GRAYED)); + if (x == -1 && y == -1) /* passed via VK_APPS press/release */ + { + RECT rc; + /* Windows places the menu at the edit's center in this case */ + GetClientRect(es->hwndSelf, &rc); + MapWindowPoints(es->hwndSelf, 0, (POINT *)&rc, 2); + x = rc.left + (rc.right - rc.left) / 2; + y = rc.top + (rc.bottom - rc.top) / 2; + } + TrackPopupMenu(popup, TPM_LEFTALIGN | TPM_RIGHTBUTTON, x, y, 0, es->hwndSelf, NULL); DestroyMenu(menu); }

1 0

Hans Leidekker : setupapi: Add a stub implementation for SetupPromptReboot.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 7f31cc47561a9e903cdccd9b7de3a3faf645e154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f31cc47561a9e903cdccd9b7… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Dec 15 10:02:00 2006 +0100 setupapi: Add a stub implementation for SetupPromptReboot. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 9 +++++++++ include/setupapi.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 2c6672d..ed91774 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -454,7 +454,7 @@ @ stdcall SetupOpenMasterInf() @ stub SetupPromptForDiskA @ stub SetupPromptForDiskW -@ stub SetupPromptReboot +@ stdcall SetupPromptReboot(ptr ptr long) @ stub SetupQueryDrivesInDiskSpaceListA @ stub SetupQueryDrivesInDiskSpaceListW @ stub SetupQueryFileLogA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index faf6a1f..1ab79da 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -200,3 +200,12 @@ BOOL WINAPI SetupOpenLog(BOOL Reserved) FIXME("(%d) stub\n", Reserved); return TRUE; } + +/*********************************************************************** + * SetupPromptReboot(SETUPAPI.@) + */ +INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) +{ + FIXME("%p, %p, %d\n", file_queue, owner, scan_only); + return 0; +} diff --git a/include/setupapi.h b/include/setupapi.h index d27cb9f..7fd1099 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -851,6 +851,7 @@ HINF WINAPI SetupOpenInfFileA( PCSTR HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR pszclass, DWORD style, UINT *error ); #define SetupOpenInfFile WINELIB_NAME_AW(SetupOpenInfFile) HINF WINAPI SetupOpenMasterInf( VOID ); +INT WINAPI SetupPromptReboot( HSPFILEQ, HWND, BOOL); BOOL WINAPI SetupQueryInfFileInformationA(PSP_INF_INFORMATION, UINT, PSTR, DWORD, PDWORD); BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION, UINT, PWSTR, DWORD, PDWORD); #define SetupQueryInfFileInformation WINELIB_NAME_AW(SetupQueryInFileInformation)

1 0

Andrew Talbot : secur32/tests: Cast-qual warnings fix.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 2ec6c1bf965ffc40db3d1bd2ff922d67310e37fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ec6c1bf965ffc40db3d1bd2f… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Thu Dec 14 22:22:20 2006 +0000 secur32/tests: Cast-qual warnings fix. --- dlls/secur32/tests/ntlm.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index f616491..b90d065 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -558,7 +558,10 @@ static void testInitializeSecurityContex PSecPkgInfo pkg_info = NULL; SspiData client; SEC_WINNT_AUTH_IDENTITY id; - static char sec_pkg_name[] = "NTLM"; + static char sec_pkg_name[] = "NTLM", + test_user[] = "testuser", + workgroup[] = "WORKGROUP", + test_pass[] = "testpass"; ULONG req_attr, ctxt_attr; TimeStamp ttl; PBYTE packet; @@ -570,11 +573,11 @@ static void testInitializeSecurityContex } pFreeContextBuffer(pkg_info); - id.User = (unsigned char*) "testuser"; + id.User = (unsigned char*) test_user; id.UserLength = strlen((char *) id.User); - id.Domain = (unsigned char *) "WORKGROUP"; + id.Domain = (unsigned char *) workgroup; id.DomainLength = strlen((char *) id.Domain); - id.Password = (unsigned char*) "testpass"; + id.Password = (unsigned char*) test_pass; id.PasswordLength = strlen((char *) id.Password); id.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; @@ -775,12 +778,16 @@ static void testAuth(ULONG data_rep, BOO if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)== SEC_E_OK) { + static char test_user[] = "testuser", + workgroup[] = "WORKGROUP", + test_pass[] = "testpass"; + pFreeContextBuffer(pkg_info); - id.User = (unsigned char*) "testuser"; + id.User = (unsigned char*) test_user; id.UserLength = strlen((char *) id.User); - id.Domain = (unsigned char *) "WORKGROUP"; + id.Domain = (unsigned char *) workgroup; id.DomainLength = strlen((char *) id.Domain); - id.Password = (unsigned char*) "testpass"; + id.Password = (unsigned char*) test_pass; id.PasswordLength = strlen((char *) id.Password); id.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI; @@ -912,12 +919,16 @@ static void testSignSeal() */ if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)== SEC_E_OK) { + static char test_user[] = "testuser", + workgroup[] = "WORKGROUP", + test_pass[] = "testpass"; + pFreeContextBuffer(pkg_info); - id.User = (unsigned char*) "testuser"; + id.User = (unsigned char*) test_user; id.UserLength = strlen((char *) id.User); - id.Domain = (unsigned char *) "WORKGROUP"; + id.Domain = (unsigned char *) workgroup; id.DomainLength = strlen((char *) id.Domain); - id.Password = (unsigned char*) "testpass"; + id.Password = (unsigned char*) test_pass; id.PasswordLength = strlen((char *) id.Password); id.Flags = SEC_WINNT_AUTH_IDENTITY_ANSI;

1 0

Stefan Dösinger : ddraw: Add a TRACE to GetPixelFormat .
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 2fe8a41cb833157ac2a811567129cd329f9c4b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe8a41cb833157ac2a811567… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 14 20:49:26 2006 +0100 ddraw: Add a TRACE to GetPixelFormat. --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 03ea974..b005579 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1291,8 +1291,8 @@ IDirectDrawSurfaceImpl_GetColorKey(IDire /* There is a DDERR_NOCOLORKEY error, but how do we know if a color key * isn't there? That's like saying that an int isn't there. (Which MS * has done in other docs.) */ - ICOM_THIS_FROM(IDirectDrawSurfaceImpl, IDirectDrawSurface7, iface); + TRACE("(%p)->(%08x,%p)\n", This, Flags, CKey); if(!CKey) return DDERR_INVALIDPARAMS;

1 0

Stefan Dösinger : wined3d: D3DRS_ZVISIBLE is not supposed to return an error.
by Alexandre Julliard 15 Dec '06

15 Dec '06

Module: wine Branch: master Commit: 46028b08323dd348f8939faaeb343a416504622b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46028b08323dd348f8939faae… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Dec 14 20:48:09 2006 +0100 wined3d: D3DRS_ZVISIBLE is not supposed to return an error. --- dlls/d3d8/tests/device.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/d3d.c | 12 ++++++++++++ dlls/wined3d/device.c | 8 +------- 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3ec0dbd..1ad56b7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -648,6 +648,44 @@ cleanup: if(pDevice) IDirect3D8_Release(pDevice); } +static void test_states(void) +{ + HRESULT hr; + HWND hwnd = NULL; + IDirect3D8 *pD3d = NULL; + IDirect3DDevice8 *pDevice = NULL; + D3DPRESENT_PARAMETERS d3dpp; + D3DDISPLAYMODE d3ddm; + + pD3d = pDirect3DCreate8( D3D_SDK_VERSION ); + ok(pD3d != NULL, "Failed to create IDirect3D8 object\n"); + hwnd = CreateWindow( "static", "d3d8_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!pD3d || !hwnd) goto cleanup; + + IDirect3D8_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); + ZeroMemory( &d3dpp, sizeof(d3dpp) ); + d3dpp.Windowed = TRUE; + d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD; + d3dpp.BackBufferWidth = 640; + d3dpp.BackBufferHeight = 480; + d3dpp.BackBufferFormat = d3ddm.Format; + + hr = IDirect3D8_CreateDevice( pD3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &d3dpp, &pDevice ); + ok(SUCCEEDED(hr), "Failed to create IDirect3D8Device (%s)\n", DXGetErrorString8(hr)); + if (FAILED(hr)) goto cleanup; + + hr = IDirect3DDevice8_SetRenderState(pDevice, D3DRS_ZVISIBLE, TRUE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState(D3DRS_ZVISIBLE, TRUE) returned %s\n", DXGetErrorString8(hr)); + hr = IDirect3DDevice8_SetRenderState(pDevice, D3DRS_ZVISIBLE, FALSE); + ok(hr == D3D_OK, "IDirect3DDevice8_SetRenderState(D3DRS_ZVISIBLE, FALSE) returned %s\n", DXGetErrorString8(hr)); + +cleanup: + if(pD3d) IDirect3D8_Release(pD3d); + if(pDevice) IDirect3D8_Release(pDevice); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -659,5 +697,6 @@ START_TEST(device) test_refcount(); test_mipmap_levels(); test_cursor(); + test_states(); } } diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 3f800c5..661efb3 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -475,6 +475,17 @@ out: IDirect3DVertexBuffer7_Release(lpVBufDest2); } +static void StateTest( void ) +{ + HRESULT rc; + + /* The msdn says its undocumented, does it return an error too? */ + rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_ZVISIBLE, TRUE); + ok(rc == D3D_OK, "IDirect3DDevice7_SetRenderState(D3DRENDERSTATE_ZVISIBLE, TRUE) returned %08x\n", rc); + rc = IDirect3DDevice7_SetRenderState(lpD3DDevice, D3DRENDERSTATE_ZVISIBLE, FALSE); + ok(rc == D3D_OK, "IDirect3DDevice7_SetRenderState(D3DRENDERSTATE_ZVISIBLE, FALSE) returned %08x\n", rc); +} + START_TEST(d3d) { init_function_pointers(); @@ -489,5 +500,6 @@ START_TEST(d3d) } LightTest(); ProcessVerticesTest(); + StateTest(); ReleaseDirect3D(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 58d379f..939af52 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3442,16 +3442,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl case WINED3DRS_SRCBLENDALPHA : case WINED3DRS_DESTBLENDALPHA : case WINED3DRS_BLENDOPALPHA : + case WINED3DRS_ZVISIBLE : StateTable[STATE_RENDER(State)].apply(STATE_RENDER(State), This->stateBlock); break; - /** not supported */ - case WINED3DRS_ZVISIBLE : - { - LEAVE_GL(); - return WINED3DERR_INVALIDCALL; - } - default: FIXME("(%p)->(%s,%d) unknown state\n", This, debug_d3drenderstate(State), Value); }

1 0