March 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : server: Return the status from an async I/ O APC call to the server.
by Alexandre Julliard 21 Mar '07

21 Mar '07

Module: wine Branch: master Commit: 50975c81f0d595f6b8a683b861a9c4dd5c819c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50975c81f0d595f6b8a683b86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 20 19:27:10 2007 +0100 server: Return the status from an async I/O APC call to the server. --- dlls/ntdll/sync.c | 2 ++ include/wine/server_protocol.h | 7 ++++++- server/protocol.def | 5 +++++ server/trace.c | 4 ++++ 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 1f7fad8..72d73bb 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -682,6 +682,8 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) case APC_ASYNC_IO: NtCurrentTeb()->num_async_io--; call->async_io.func( call->async_io.user, call->async_io.sb, call->async_io.status ); + result->type = call->type; + result->async_io.status = ((IO_STATUS_BLOCK *)call->async_io.sb)->u.Status; break; case APC_VIRTUAL_ALLOC: result->type = call->type; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 93087cf..6c17242 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -338,6 +338,11 @@ typedef union { enum apc_type type; unsigned int status; + } async_io; + struct + { + enum apc_type type; + unsigned int status; void *addr; unsigned long size; } virtual_alloc; @@ -4694,6 +4699,6 @@ union generic_reply struct allocate_locally_unique_id_reply allocate_locally_unique_id_reply; }; -#define SERVER_PROTOCOL_VERSION 281 +#define SERVER_PROTOCOL_VERSION 282 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index d335d0a..57e306f 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -352,6 +352,11 @@ typedef union enum apc_type type; struct { + enum apc_type type; /* APC_ASYNC_IO */ + unsigned int status; /* new status of async operation */ + } async_io; + struct + { enum apc_type type; /* APC_VIRTUAL_ALLOC */ unsigned int status; /* status returned by call */ void *addr; /* resulting address */ diff --git a/server/trace.c b/server/trace.c index b5aab1a..659ec28 100644 --- a/server/trace.c +++ b/server/trace.c @@ -179,6 +179,10 @@ static void dump_apc_result( const apc_result_t *result ) { case APC_NONE: break; + case APC_ASYNC_IO: + fprintf( stderr, "APC_ASYNC_IO,status=%s", + get_status_name( result->async_io.status ) ); + break; case APC_VIRTUAL_ALLOC: fprintf( stderr, "APC_VIRTUAL_ALLOC,status=%s,addr=%p,size=%lu", get_status_name( result->virtual_alloc.status ),

1 0

Andrew Talbot : msvcrt: Replace inline static with static inline.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 7b10348088947ab772140d37aeb915333a6e2d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b10348088947ab772140d37a… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 19 19:48:07 2007 +0000 msvcrt: Replace inline static with static inline. --- dlls/msvcrt/cppexcept.c | 10 +++++----- dlls/msvcrt/except.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 81f4779..3b25438 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -49,7 +49,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame 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 ) +static inline void *call_ebp_func( void *func, void *ebp ) { void *ret; int dummy; @@ -65,7 +65,7 @@ inline static void *call_ebp_func( void *func, void *ebp ) } /* call a copy constructor */ -inline static void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) +static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase ) { TRACE( "calling copy ctor %p object %p src %p\n", func, this, src ); if (has_vbase) @@ -78,13 +78,13 @@ inline static void call_copy_ctor( void *func, void *this, void *src, int has_vb } /* call the destructor of the exception object */ -inline static void call_dtor( void *func, void *object ) +static inline void call_dtor( void *func, void *object ) { __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); } /* continue execution to the specified address after exception is caught */ -inline static void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) +static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) { __asm__ __volatile__("movl -4(%0),%%esp; leal 12(%0),%%ebp; jmp *%1" : : "r" (frame), "a" (addr) ); @@ -276,7 +276,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG /* 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, +static inline void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame *frame, const cxx_function_descr *descr, int nested_trylevel, cxx_exception_type *info ) { diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 3ed3245..5784e4f 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -66,13 +66,13 @@ typedef struct _MSVCRT_EXCEPTION_FRAME #define TRYLEVEL_END (-1) /* End of trylevel list */ #if defined(__GNUC__) && defined(__i386__) -inline static void call_finally_block( void *code_block, void *base_ptr ) +static inline void call_finally_block( void *code_block, void *base_ptr ) { __asm__ __volatile__ ("movl %1,%%ebp; call *%%eax" : : "a" (code_block), "g" (base_ptr)); } -inline static DWORD call_filter( void *func, void *arg, void *ebp ) +static inline DWORD call_filter( void *func, void *arg, void *ebp ) { DWORD ret; __asm__ __volatile__ ("pushl %%ebp; pushl %3; movl %2,%%ebp; call *%%eax; popl %%ebp; popl %%ebp"

1 0

Chris Robinson : quartz: Don't delete critical sections before the filter' s pins are done using them.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 6bd3b156aca74ab50e98a097c723e583c458ef43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd3b156aca74ab50e98a097c… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 19 13:26:09 2007 -0700 quartz: Don't delete critical sections before the filter's pins are done using them. --- dlls/quartz/dsoundrender.c | 5 +++-- dlls/quartz/parser.c | 5 +++-- dlls/quartz/transform.c | 6 +++--- dlls/quartz/videorenderer.c | 6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index b5fa40b..5e84e21 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -400,8 +400,6 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) { IPin *pConnectedTo; - This->csFilter.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csFilter); if (This->pClock) IReferenceClock_Release(This->pClock); @@ -425,6 +423,9 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) This->lpVtbl = NULL; This->IBasicAudio_vtbl = NULL; + This->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csFilter); + TRACE("Destroying Audio Renderer\n"); CoTaskMemFree(This); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index fb8c085..15e01e8 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -187,8 +187,6 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) { ULONG i; - This->csFilter.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csFilter); if (This->pClock) IReferenceClock_Release(This->pClock); @@ -208,6 +206,9 @@ static ULONG WINAPI Parser_Release(IBaseFilter * iface) CoTaskMemFree(This->ppPins); This->lpVtbl = NULL; + + This->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csFilter); TRACE("Destroying parser\n"); CoTaskMemFree(This); diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 04366ef..8343afb 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -276,9 +276,6 @@ static ULONG WINAPI TransformFilter_Release(IBaseFilter * iface) { ULONG i; - This->csFilter.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csFilter); - if (This->pClock) IReferenceClock_Release(This->pClock); @@ -301,6 +298,9 @@ static ULONG WINAPI TransformFilter_Release(IBaseFilter * iface) This->pFuncsTable->pfnCleanup(This); + This->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csFilter); + TRACE("Destroying transform filter\n"); CoTaskMemFree(This); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ccfa61a..a7df440 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -524,9 +524,6 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) { IPin *pConnectedTo; - This->csFilter.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&This->csFilter); - DestroyWindow(This->hWnd); PostThreadMessageA(This->ThreadID, WM_QUIT, 0, 0); WaitForSingleObject(This->hThread, INFINITE); @@ -547,6 +544,9 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) CoTaskMemFree(This->ppPins); This->lpVtbl = NULL; + This->csFilter.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&This->csFilter); + TRACE("Destroying Video Renderer\n"); CoTaskMemFree(This);

1 0

Michael Stefaniuc : quartz: Fix typo that produced an empty if-statement.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 0674ff43b2a0c74fb1d58118703e5658cc8051b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0674ff43b2a0c74fb1d581187… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 20 10:55:24 2007 +0100 quartz: Fix typo that produced an empty if-statement. --- dlls/quartz/filtergraph.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 682f535..5e1061e 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1127,7 +1127,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, IPin_Release(ppinreader); IBaseFilter_Release(preader); - if (psplitter); + if (psplitter) IBaseFilter_Release(psplitter); return hr;

1 0

Detlef Riekenberg : localspl/tests: Fix copy+paste bug.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: b1202e7e69c7f09cced4525b75da28fbdc19080f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1202e7e69c7f09cced4525b7… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Mar 20 05:22:50 2007 +0100 localspl/tests: Fix copy+paste bug. --- dlls/localspl/tests/localmon.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/localspl/tests/localmon.c b/dlls/localspl/tests/localmon.c index bcc8177..a8ace23 100644 --- a/dlls/localspl/tests/localmon.c +++ b/dlls/localspl/tests/localmon.c @@ -1017,7 +1017,7 @@ START_TEST(localmon) if ((pXcvOpenPort) && (pXcvDataPort) && (pXcvClosePort)) { SetLastError(0xdeadbeef); - res = pXcvOpenPort(emptyW, 0, &hXcv); + res = pXcvOpenPort(emptyW, SERVER_ACCESS_ADMINISTER, &hXcv); ok(res, "hXcv: %d with %u and %p (expected '!= 0')\n", res, GetLastError(), hXcv); SetLastError(0xdeadbeef);

1 0

Andrew Talbot : ddraw: Replace inline static with static inline.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 4eb936db331ed25d9bd5c9301ad05af6d90a5885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb936db331ed25d9bd5c9301… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 19 19:45:14 2007 +0000 ddraw: Replace inline static with static inline. --- dlls/ddraw/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index c754036..4e3d3a6 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -795,7 +795,7 @@ DestroyCallback(IDirectDrawSurface7 *surf, * Reads a config key from the registry. Taken from WineD3D * ***********************************************************************/ -inline static DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, char* buffer, DWORD size) +static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, char* buffer, DWORD size) { if (0 != appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0; if (0 != defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0;

1 0

Andrew Talbot : dsound: Replace inline static with static inline.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 6eba82d41892b6571e0caecd1a644cff4b727968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eba82d41892b6571e0caecd1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Mar 19 19:46:38 2007 +0000 dsound: Replace inline static with static inline. --- dlls/dsound/dsound_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 0a2803d..94d2122 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -115,7 +115,7 @@ int ds_default_bits_per_sample = 8; * Get a config key from either the app-specific or the default config */ -inline static DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, +static inline DWORD get_config_key( HKEY defkey, HKEY appkey, const char *name, char *buffer, DWORD size ) { if (appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0;

1 0

Rob Shearman : ole32: Add a test for StgStreamImpl_SetSize with a non-zero HighPart for the size .
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 36d5515d911486349e77683f1fda1e22b6248dc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d5515d911486349e77683f1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 19 14:53:00 2007 +0000 ole32: Add a test for StgStreamImpl_SetSize with a non-zero HighPart for the size. --- dlls/ole32/tests/storage32.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 710aa45..d96a7ed 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -308,6 +308,9 @@ static void test_storage_stream(void) ok(r==S_OK, "failed to seek stream\n"); r = IStream_SetSize(stm,p); ok(r==S_OK, "failed to set pos\n"); + p.u.HighPart = 1; + r = IStream_SetSize(stm,p); + ok(r==STG_E_INVALIDFUNCTION, "setting to invalid pos should fail with STG_E_INVALIDFUNCTION instead of error 0x%08x\n", r); pos.QuadPart = 10; r = IStream_Seek(stm, pos, STREAM_SEEK_SET, &p ); ok(r==S_OK, "failed to seek stream\n");

1 0

Kai Blin : netapi32: Add test for adding/deleting users.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: ce6a7595c3910f528332547b077049ad8205e69f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6a7595c3910f528332547b0… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Mar 19 16:48:39 2007 +0100 netapi32: Add test for adding/deleting users. --- dlls/netapi32/tests/access.c | 56 +++++++++++++++++++++++++++++++++++++++++- include/lmaccess.h | 5 +++ 2 files changed, 60 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 92d5d3b..7dd5855 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -20,7 +20,6 @@ #include <stdarg.h> -#include <wine/test.h> #include <windef.h> #include <winbase.h> #include <winerror.h> @@ -28,6 +27,8 @@ #include <lmerr.h> #include <lmapibuf.h> +#include "wine/test.h" + WCHAR user_name[UNLEN + 1]; WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; @@ -36,6 +37,9 @@ static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a',' static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; static const WCHAR sNonexistentUser[] = {'N','o','n','e','x','i','s','t','e','n','t',' ', 'U','s','e','r',0}; +static const WCHAR sTestUserName[] = {'t', 'e', 's', 't', 'u', 's', 'e', 'r', 0}; +static const WCHAR sTestUserOldPass[] = {'o', 'l', 'd', 'p', 'a', 's', 's', 0}; +static const WCHAR sTestUserNewPass[] = {'n', 'e', 'w', 'p', 'a', 's', 's', 0}; static const WCHAR sBadNetPath[] = {'\\','\\','B','a',' ',' ','p','a','t','h',0}; static const WCHAR sInvalidName[] = {'\\',0}; static const WCHAR sInvalidName2[] = {'\\','\\',0}; @@ -46,6 +50,9 @@ static NET_API_STATUS (WINAPI *pNetApiBufferSize)(LPVOID,LPDWORD)=NULL; static NET_API_STATUS (WINAPI *pNetQueryDisplayInformation)(LPWSTR,DWORD,DWORD,DWORD,DWORD,LPDWORD,PVOID*)=NULL; static NET_API_STATUS (WINAPI *pNetUserGetInfo)(LPCWSTR,LPCWSTR,DWORD,LPBYTE*)=NULL; static NET_API_STATUS (WINAPI *pNetUserModalsGet)(LPCWSTR,DWORD,LPBYTE*)=NULL; +static NET_API_STATUS (WINAPI *pNetUserAdd)(LPCWSTR,DWORD,LPBYTE,LPDWORD)=NULL; +static NET_API_STATUS (WINAPI *pNetUserChangePassword)(LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR)=NULL; +static NET_API_STATUS (WINAPI *pNetUserDel)(LPCWSTR,LPCWSTR)=NULL; static int init_access_tests(void) { @@ -192,6 +199,49 @@ static void run_usermodalsget_tests(void) pNetApiBufferFree(umi2); } +static void run_userhandling_tests(void) +{ + NET_API_STATUS ret; + USER_INFO_1 usri; + + if(!pNetUserAdd || !pNetUserChangePassword || !pNetUserDel) + { + skip("Functions for modifying the user database missing. Skipping test.\n"); + return; + } + + usri.usri1_name = (LPWSTR) sTestUserName; + usri.usri1_password = (LPWSTR) sTestUserOldPass; + usri.usri1_priv = USER_PRIV_USER; + usri.usri1_home_dir = NULL; + usri.usri1_comment = NULL; + usri.usri1_flags = UF_SCRIPT; + usri.usri1_script_path = NULL; + + ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); + if(ret == ERROR_ACCESS_DENIED) + { + skip("Insufficient permissions to add users. Skipping test.\n"); + return; + } + if(ret == NERR_UserExists) + { + skip("User already exists, skipping test to not mess up the system\n"); + return; + } + + ok(ret == NERR_Success, "Adding user failed with error 0x%08x\n", ret); + if(ret != NERR_Success) + return; + + ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, + sTestUserNewPass); + todo_wine ok(ret == NERR_Success, "Changing the password failed.\n"); + + ret = pNetUserDel(NULL, sTestUserName); + todo_wine ok(ret == NERR_Success, "Deleting the user failed.\n"); +} + START_TEST(access) { HMODULE hnetapi32=LoadLibraryA("netapi32.dll"); @@ -200,6 +250,9 @@ START_TEST(access) pNetQueryDisplayInformation=(void*)GetProcAddress(hnetapi32,"NetQueryDisplayInformation"); pNetUserGetInfo=(void*)GetProcAddress(hnetapi32,"NetUserGetInfo"); pNetUserModalsGet=(void*)GetProcAddress(hnetapi32,"NetUserModalsGet"); + pNetUserAdd=(void*)GetProcAddress(hnetapi32, "NetUserAdd"); + pNetUserChangePassword=(void*)GetProcAddress(hnetapi32, "NetUserChangePassword"); + pNetUserDel=(void*)GetProcAddress(hnetapi32, "NetUserDel"); if (!pNetApiBufferSize) trace("It appears there is no netapi32 functionality on this platform\n"); @@ -208,5 +261,6 @@ START_TEST(access) run_usergetinfo_tests(); run_querydisplayinformation1_tests(); run_usermodalsget_tests(); + run_userhandling_tests(); } } diff --git a/include/lmaccess.h b/include/lmaccess.h index 41e1826..1c7c37c 100644 --- a/include/lmaccess.h +++ b/include/lmaccess.h @@ -440,6 +440,11 @@ typedef struct _LOCALGROUP_USERS_INFO_0 { LPWSTR lgrui0_name; } LOCALGROUP_USERS_INFO_0, *PLOCALGROUP_USERS_INFO_0, *LPLOCALGROUP_USERS_INFO_0; +#define USER_PRIV_GUEST 0 +#define USER_PRIV_USER 1 +#define USER_PRIV_ADMIN 2 +#define USER_PRIV_MASK 3 + #define LOCALGROUP_NAME_PARMNUM 1 #define LOCALGROUP_COMMENT_PARMNUM 2

1 0

Dmitry Timoshkov : user32: Avoid compiler specific code in the DefWindowProc test.
by Alexandre Julliard 20 Mar '07

20 Mar '07

Module: wine Branch: master Commit: 6e5b36d4dc7ca8209ae3da316c37d8c2980189a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e5b36d4dc7ca8209ae3da316… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 19 23:56:49 2007 +0800 user32: Avoid compiler specific code in the DefWindowProc test. --- dlls/user32/tests/class.c | 46 ++++++++++++++++++++++++-------------------- 1 files changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 782f0ba..bd1cde6 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -558,10 +558,14 @@ static void test_instances(void) static void test_defwndproc() { - char classA[] = "deftest"; - WCHAR classW[] = {'d','e','f','t','e','s','t',0}; + static const char classA[] = "deftest"; + static const WCHAR classW[] = {'d','e','f','t','e','s','t',0}; + WNDPROC pDefWindowProcA, pDefWindowProcW; int i; + pDefWindowProcA = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcA"); + pDefWindowProcW = (void *)GetProcAddress(GetModuleHandle("user32.dll"), "DefWindowProcW"); + for (i = 0; i < 4; i++) { WNDCLASSEXA cls; /* the memory layout of WNDCLASSEXA and WNDCLASSEXW is the same */ @@ -572,9 +576,9 @@ static void test_defwndproc() cls.hInstance = GetModuleHandle(NULL); cls.hbrBackground = GetStockObject (WHITE_BRUSH); if (i & 1) - cls.lpfnWndProc = DefWindowProcA; + cls.lpfnWndProc = pDefWindowProcA; else - cls.lpfnWndProc = DefWindowProcW; + cls.lpfnWndProc = pDefWindowProcW; if (i & 2) { @@ -583,7 +587,7 @@ static void test_defwndproc() } else { - cls.lpszClassName = (LPSTR)classW; + cls.lpszClassName = (LPCSTR)classW; atom = RegisterClassExW((WNDCLASSEXW *)&cls); } ok(atom != 0, "Couldn't register class, i=%d, %d\n", i, GetLastError()); @@ -592,32 +596,32 @@ static void test_defwndproc() ok(hwnd != NULL, "Couldn't create window i=%d\n", i); if ((i & 1) && (i & 2)) { - ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)DefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), DefWindowProcA); - ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (LONG_PTR)DefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), DefWindowProcA); + ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); + ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); } else todo_wine { - ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)DefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), DefWindowProcA); - ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (LONG_PTR)DefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", - (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), DefWindowProcA); + ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), pDefWindowProcA); + ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), pDefWindowProcA); } if (!(i & 1) && !(i & 2)) { - ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)DefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), DefWindowProcW); - ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (LONG_PTR)DefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), DefWindowProcW); + ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); + ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); } else todo_wine { - ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)DefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), DefWindowProcW); - ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (LONG_PTR)DefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", - (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), DefWindowProcW); + ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), pDefWindowProcW); + ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (ULONG_PTR)pDefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), pDefWindowProcW); } DestroyWindow(hwnd);

1 0