wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Andrey Turkin : kernel32: Send debug strings to system-wide monitor.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 02ce96f425642e7863f15350dad2139ab5c040c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02ce96f425642e7863f15350d… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 5 21:42:36 2009 +0400 kernel32: Send debug strings to system-wide monitor. --- dlls/kernel32/debugger.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 79 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index f0dae2d..50a7428 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -240,6 +240,10 @@ BOOL WINAPI DebugActiveProcessStop( DWORD pid ) */ void WINAPI OutputDebugStringA( LPCSTR str ) { + static HANDLE DBWinMutex = NULL; + static BOOL mutex_inited = FALSE; + + /* send string to attached debugger */ SERVER_START_REQ( output_debug_string ) { req->string = wine_server_client_ptr( str ); @@ -247,7 +251,82 @@ void WINAPI OutputDebugStringA( LPCSTR str ) wine_server_call( req ); } SERVER_END_REQ; + WARN("%s\n", str); + + /* send string to a system-wide monitor */ + /* FIXME should only send to monitor if no debuggers are attached */ + + if (!mutex_inited) + { + /* first call to OutputDebugString, initialize mutex handle */ + static const WCHAR mutexname[] = {'D','B','W','i','n','M','u','t','e','x',0}; + HANDLE mutex = CreateMutexExW( NULL, mutexname, 0, SYNCHRONIZE ); + if (mutex) + { + if (InterlockedCompareExchangePointer( &DBWinMutex, mutex, 0 ) != 0) + { + /* someone beat us here... */ + CloseHandle( mutex ); + } + } + mutex_inited = TRUE; + } + + if (DBWinMutex) + { + static const WCHAR shmname[] = {'D','B','W','I','N','_','B','U','F','F','E','R',0}; + static const WCHAR eventbuffername[] = {'D','B','W','I','N','_','B','U','F','F','E','R','_','R','E','A','D','Y',0}; + static const WCHAR eventdataname[] = {'D','B','W','I','N','_','D','A','T','A','_','R','E','A','D','Y',0}; + HANDLE mapping; + + mapping = OpenFileMappingW( FILE_MAP_WRITE, FALSE, shmname ); + if (mapping) + { + LPVOID buffer; + HANDLE eventbuffer, eventdata; + + buffer = MapViewOfFile( mapping, FILE_MAP_WRITE, 0, 0, 0 ); + eventbuffer = OpenEventW( SYNCHRONIZE, FALSE, eventbuffername ); + eventdata = OpenEventW( EVENT_MODIFY_STATE, FALSE, eventdataname ); + + if (buffer && eventbuffer && eventdata) + { + /* monitor is present, synchronize with other OutputDebugString invokations */ + WaitForSingleObject( DBWinMutex, INFINITE ); + + /* acquire control over the buffer */ + if (WaitForSingleObject( eventbuffer, 10000 ) == WAIT_OBJECT_0) + { + int str_len; + struct _mon_buffer_t { + DWORD pid; + char buffer[1]; + } *mon_buffer = (struct _mon_buffer_t*) buffer; + + str_len = strlen( str ); + if (str_len > (4096 - sizeof(DWORD) - 1)) + str_len = 4096 - sizeof(DWORD) - 1; + + mon_buffer->pid = GetCurrentProcessId(); + memcpy( mon_buffer->buffer, str, str_len ); + mon_buffer->buffer[str_len] = 0; + + /* signal data ready */ + SetEvent( eventdata ); + } + ReleaseMutex( DBWinMutex ); + } + + if (buffer) + UnmapViewOfFile( buffer ); + if (eventbuffer) + CloseHandle( eventbuffer ); + if (eventdata) + CloseHandle( eventdata ); + CloseHandle( mapping ); + } + } }

1 0

Andrey Turkin : kernel32: Always use ANSI version of OutputDebugString.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 3eaecf04761812caa7478af4bf812d2cd812b09c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eaecf04761812caa7478af4b… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 5 21:42:22 2009 +0400 kernel32: Always use ANSI version of OutputDebugString. --- dlls/kernel32/debugger.c | 17 ++++++++--------- include/wine/server_protocol.h | 5 +---- server/debugger.c | 1 - server/protocol.def | 4 +--- server/request.h | 3 +-- server/trace.c | 4 +--- 6 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/debugger.c b/dlls/kernel32/debugger.c index bb0b5fa..f0dae2d 100644 --- a/dlls/kernel32/debugger.c +++ b/dlls/kernel32/debugger.c @@ -118,7 +118,7 @@ BOOL WINAPI WaitForDebugEvent( break; case OUTPUT_DEBUG_STRING_EVENT: event->u.DebugString.lpDebugStringData = wine_server_get_ptr( data.output_string.string ); - event->u.DebugString.fUnicode = data.output_string.unicode; + event->u.DebugString.fUnicode = FALSE; event->u.DebugString.nDebugStringLength = data.output_string.length; break; case RIP_EVENT: @@ -243,7 +243,6 @@ void WINAPI OutputDebugStringA( LPCSTR str ) SERVER_START_REQ( output_debug_string ) { req->string = wine_server_client_ptr( str ); - req->unicode = 0; req->length = strlen(str) + 1; wine_server_call( req ); } @@ -267,15 +266,15 @@ void WINAPI OutputDebugStringA( LPCSTR str ) */ void WINAPI OutputDebugStringW( LPCWSTR str ) { - SERVER_START_REQ( output_debug_string ) + UNICODE_STRING strW; + STRING strA; + + RtlInitUnicodeString( &strW, str ); + if (!RtlUnicodeStringToAnsiString( &strA, &strW, TRUE )) { - req->string = wine_server_client_ptr( str ); - req->unicode = 1; - req->length = (lstrlenW(str) + 1) * sizeof(WCHAR); - wine_server_call( req ); + OutputDebugStringA( strA.Buffer ); + RtlFreeAnsiString( &strA ); } - SERVER_END_REQ; - WARN("%s\n", debugstr_w(str)); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 0b18b50..7683e8a 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -115,7 +115,6 @@ typedef union struct { int code; - int unicode; client_ptr_t string; data_size_t length; } output_string; @@ -2048,8 +2047,6 @@ struct output_debug_string_request struct request_header __header; data_size_t length; client_ptr_t string; - int unicode; - char __pad_28[4]; }; struct output_debug_string_reply { @@ -5347,6 +5344,6 @@ union generic_reply struct set_window_layered_info_reply set_window_layered_info_reply; }; -#define SERVER_PROTOCOL_VERSION 390 +#define SERVER_PROTOCOL_VERSION 391 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/debugger.c b/server/debugger.c index faade98..795a24a 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -699,7 +699,6 @@ DECL_HANDLER(output_debug_string) debug_event_t data; data.output_string.string = req->string; - data.output_string.unicode = req->unicode; data.output_string.length = req->length; generate_debug_event( current, OUTPUT_DEBUG_STRING_EVENT, &data ); } diff --git a/server/protocol.def b/server/protocol.def index 9748931..d7b31f4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -131,9 +131,8 @@ typedef union struct { int code; /* OUTPUT_DEBUG_STRING_EVENT */ - int unicode; /* is it Unicode? */ - client_ptr_t string; /* string to display (in debugged process address space) */ data_size_t length; /* string length */ + client_ptr_t string; /* string to display (in debugged process address space) */ } output_string; struct { @@ -1580,7 +1579,6 @@ enum char_info_mode @REQ(output_debug_string) data_size_t length; /* string length */ client_ptr_t string; /* string to display (in debugged process address space) */ - int unicode; /* is it Unicode? */ @END diff --git a/server/request.h b/server/request.h index c726130..02c7984 100644 --- a/server/request.h +++ b/server/request.h @@ -1102,8 +1102,7 @@ C_ASSERT( FIELD_OFFSET(struct get_exception_status_request, handle) == 12 ); C_ASSERT( sizeof(struct get_exception_status_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, length) == 12 ); C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, string) == 16 ); -C_ASSERT( FIELD_OFFSET(struct output_debug_string_request, unicode) == 24 ); -C_ASSERT( sizeof(struct output_debug_string_request) == 32 ); +C_ASSERT( sizeof(struct output_debug_string_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, tid) == 16 ); C_ASSERT( FIELD_OFFSET(struct continue_debug_event_request, status) == 20 ); diff --git a/server/trace.c b/server/trace.c index 511c460..10c731c 100644 --- a/server/trace.c +++ b/server/trace.c @@ -656,8 +656,7 @@ static void dump_varargs_debug_event( const char *prefix, data_size_t size ) case OUTPUT_DEBUG_STRING_EVENT: fprintf( stderr, "%s{output_string", prefix ); dump_uint64( ",string=", &event.output_string.string ); - fprintf( stderr, ",unicode=%d,len=%u}", - event.output_string.unicode, event.output_string.length ); + fprintf( stderr, ",len=%u}", event.output_string.length ); break; case RIP_EVENT: fprintf( stderr, "%s{rip,err=%d,type=%d}", prefix, @@ -1994,7 +1993,6 @@ static void dump_output_debug_string_request( const struct output_debug_string_r { fprintf( stderr, " length=%u", req->length ); dump_uint64( ", string=", &req->string ); - fprintf( stderr, ", unicode=%d", req->unicode ); } static void dump_continue_debug_event_request( const struct continue_debug_event_request *req )

1 0

Henri Verbeet : wined3d: Remove some unused code.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 2be38232ea46b9042a6ef5a904c5d91a64d0aff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be38232ea46b9042a6ef5a90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:57 2009 +0200 wined3d: Remove some unused code. --- dlls/wined3d/directx.c | 10 ---------- dlls/wined3d/wined3d_private.h | 40 ---------------------------------------- 2 files changed, 0 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d494ec..18ac560 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4454,16 +4454,6 @@ static HRESULT WINAPI IWineD3DImpl_GetParent(IWineD3D *iface, IUnknown **pParent return WINED3D_OK; } -ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pVolume) { - IUnknown* volumeParent; - TRACE("(%p) call back\n", pVolume); - - /* Now, release the parent, which will take care of cleaning up the volume for us */ - IWineD3DVolume_GetParent(pVolume, &volumeParent); - IUnknown_Release(volumeParent); - return IUnknown_Release(volumeParent); -} - static void WINE_GLAPI invalid_func(const void *data) { ERR("Invalid vertex attribute function called\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 03b5b51..87e752e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -240,10 +240,6 @@ static inline float float_24_to_32(DWORD in) #define VBO_NONE 0 #define VBO_HW 1 -#define NP2_NONE 0 -#define NP2_REPACK 1 -#define NP2_NATIVE 2 - #define ORM_BACKBUFFER 0 #define ORM_PBUFFER 1 #define ORM_FBO 2 @@ -325,13 +321,6 @@ enum wined3d_immconst_type WINED3D_IMMCONST_FLOAT4, }; -typedef enum _WINED3DVS_RASTOUT_OFFSETS -{ - WINED3DSRO_POSITION = 0, - WINED3DSRO_FOG = 1, - WINED3DSRO_POINT_SIZE = 2, -} WINED3DVS_RASTOUT_OFFSETS; - #define WINED3DSP_NOSWIZZLE (0 | (1 << 2) | (2 << 4) | (3 << 6)) typedef enum _WINED3DSHADER_PARAM_SRCMOD_TYPE @@ -766,7 +755,6 @@ extern int num_lock DECLSPEC_HIDDEN; #define GL_SUPPORT(ExtName) (GLINFO_LOCATION.supported[ExtName] != 0) #define GL_LIMITS(ExtName) (GLINFO_LOCATION.max_##ExtName) #define GL_EXTCALL(FuncName) (GLINFO_LOCATION.FuncName) -#define GL_VEND(_VendName) (GLINFO_LOCATION.gl_vendor == VENDOR_##_VendName ? TRUE : FALSE) #define D3DCOLOR_B_R(dw) (((dw) >> 16) & 0xFF) #define D3DCOLOR_B_G(dw) (((dw) >> 8) & 0xFF) @@ -788,8 +776,6 @@ extern int num_lock DECLSPEC_HIDDEN; /* DirectX Device Limits */ /* --------------------- */ #define MAX_MIP_LEVELS 32 /* Maximum number of mipmap levels. */ -#define MAX_STREAMS 16 /* Maximum possible streams - used for fixed size arrays - See MaxStreams in MSDN under GetDeviceCaps */ #define HIGHEST_TRANSFORMSTATE WINED3DTS_WORLDMATRIX(255) /* Highest value in WINED3DTRANSFORMSTATETYPE */ /* Checking of API calls */ @@ -826,29 +812,12 @@ do { memcpy(gl_mat, (mat), 16 * sizeof(float)); \ } while (0) -/* Macro to dump out the current state of the light chain */ -#define DUMP_LIGHT_CHAIN() \ -do { \ - PLIGHTINFOEL *el = This->stateBlock->lights;\ - while (el) { \ - TRACE("Light %p (glIndex %ld, d3dIndex %ld, enabled %d)\n", el, el->glIndex, el->OriginalIndex, el->lightEnabled);\ - el = el->next; \ - } \ -} while(0) - /* Trace vector and strided data information */ -#define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w) #define TRACE_STRIDED(si, name) do { if (si->use_map & (1 << name)) \ TRACE( #name "=(data:%p, stride:%d, format:%#x, vbo %d, stream %u)\n", \ si->elements[name].data, si->elements[name].stride, si->elements[name].format_desc->format, \ si->elements[name].buffer_object, si->elements[name].stream_idx); } while(0) -/* Defines used for optimizations */ - -/* Only reapply what is necessary */ -#define REAPPLY_ALPHAOP 0x0001 -#define REAPPLY_ALL 0xFFFF - /* Advance declaration of structures to satisfy compiler */ typedef struct IWineD3DStateBlockImpl IWineD3DStateBlockImpl; typedef struct IWineD3DSurfaceImpl IWineD3DSurfaceImpl; @@ -1231,9 +1200,6 @@ HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain * #define WINE_D3D8_CAPABLE(gl_info) WINE_D3D7_CAPABLE(gl_info) && (gl_info->supported[ARB_MULTISAMPLE] && gl_info->supported[ARB_TEXTURE_BORDER_CLAMP]) #define WINE_D3D9_CAPABLE(gl_info) WINE_D3D8_CAPABLE(gl_info) && (gl_info->supported[ARB_FRAGMENT_PROGRAM] && gl_info->supported[ARB_VERTEX_SHADER]) -/* Default callbacks for implicit object destruction */ -extern ULONG WINAPI D3DCB_DefaultDestroyVolume(IWineD3DVolume *pSurface) DECLSPEC_HIDDEN; - /***************************************************************************** * Internal representation of a light */ @@ -2066,7 +2032,6 @@ BOOL palette9_changed(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN; /***************************************************************************** * IWineD3DVertexDeclaration implementation structure */ -#define MAX_ATTRIBS 16 struct wined3d_vertex_declaration_element { @@ -2268,12 +2233,7 @@ typedef struct IWineD3DQueryImpl LONG ref; /* Note: Ref counting not required */ IUnknown *parent; - /*TODO: replace with iface usage */ -#if 0 - IWineD3DDevice *wineD3DDevice; -#else IWineD3DDeviceImpl *wineD3DDevice; -#endif /* IWineD3DQuery fields */ enum query_state state;

1 0

Henri Verbeet : wined3d: Move the SM1 opcode enum to shader_sm1.c.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 92d22ce535a560ea203ed779b34458b77d5ca201 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d22ce535a560ea203ed779b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:56 2009 +0200 wined3d: Move the SM1 opcode enum to shader_sm1.c. --- dlls/wined3d/shader_sm1.c | 379 +++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 91 ---------- 2 files changed, 235 insertions(+), 235 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92d22ce535a560ea203ed…

1 0

Henri Verbeet : wined3d: Keep a reference to the vertex declaration initially captured by CreateStateBlock () as well.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 5c229715610532373525c1736090ff344d51e44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c229715610532373525c1736… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:55 2009 +0200 wined3d: Keep a reference to the vertex declaration initially captured by CreateStateBlock() as well. --- dlls/wined3d/stateblock.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 01783c5..8bbde2f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1653,6 +1653,7 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (stateblock->textures[i]) IWineD3DBaseTexture_AddRef(stateblock->textures[i]); } + if (stateblock->vertexDecl) IWineD3DVertexDeclaration_AddRef(stateblock->vertexDecl); if (stateblock->pIndexData) IWineD3DBuffer_AddRef(stateblock->pIndexData); if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader);

1 0

Henri Verbeet : wined3d: Keep references to the textures initially captured by CreateStateBlock() as well.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: b5de2fcb1c331a22a5166bee00700516eb415a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5de2fcb1c331a22a5166bee0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:54 2009 +0200 wined3d: Keep references to the textures initially captured by CreateStateBlock() as well. --- dlls/wined3d/stateblock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ef33a2a..01783c5 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1648,6 +1648,11 @@ HRESULT stateblock_init(IWineD3DStateBlockImpl *stateblock, IWineD3DDeviceImpl * if (stateblock->streamSource[i]) IWineD3DBuffer_AddRef(stateblock->streamSource[i]); } + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (stateblock->textures[i]) IWineD3DBaseTexture_AddRef(stateblock->textures[i]); + } + if (stateblock->pIndexData) IWineD3DBuffer_AddRef(stateblock->pIndexData); if (stateblock->vertexShader) IWineD3DVertexShader_AddRef(stateblock->vertexShader); if (stateblock->pixelShader) IWineD3DPixelShader_AddRef(stateblock->pixelShader);

1 0

Henri Verbeet : d3d9: Make the individual stateblock tests responsible for checking data.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 7d0d8c0245f66f09bbb6b7affa8f0b8948e4851d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d0d8c0245f66f09bbb6b7aff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 09:05:53 2009 +0200 d3d9: Make the individual stateblock tests responsible for checking data. --- dlls/d3d9/tests/stateblock.c | 735 ++++++++++++++++++++++++------------------ 1 files changed, 427 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7d0d8c0245f66f09bbb6b…

1 0

Ge van Geldorp : schannel/tests: Fix crash on Win7.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 875d3b9799dc15cab2c075f22e4a4778f09980fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=875d3b9799dc15cab2c075f22… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 schannel/tests: Fix crash on Win7. --- dlls/schannel/lsamode.c | 14 +++++++++++++- dlls/schannel/tests/main.c | 35 ++++++++++++++++++++++++++++++++--- include/ntsecpkg.h | 29 +++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index 23d8599..f43150e 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -109,6 +109,12 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ + NULL, /* ChangeAccountPassword */ + NULL, /* QueryMetaData */ + NULL, /* ExchangeMetaData */ + NULL, /* GetCredUIContext */ + NULL, /* UpdateCredentials */ + NULL, /* ValidateTargetInfo */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -139,6 +145,12 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ + NULL, /* ChangeAccountPassword */ + NULL, /* QueryMetaData */ + NULL, /* ExchangeMetaData */ + NULL, /* GetCredUIContext */ + NULL, /* UpdateCredentials */ + NULL, /* ValidateTargetInfo */ } }; @@ -150,7 +162,7 @@ NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_3; + *PackageVersion = SECPKG_INTERFACE_VERSION_6; *pcTables = 2; *ppTables = secPkgFunctionTable; diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index d05275f..b576848 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -37,7 +37,13 @@ SetContextAttributes) #define SECPKG_FUNCTION_TABLE_SIZE_2 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ SetCredentialsAttributes) -#define SECPKG_FUNCTION_TABLE_SIZE_3 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_3 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + ChangeAccountPassword) +#define SECPKG_FUNCTION_TABLE_SIZE_4 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + QueryMetaData) +#define SECPKG_FUNCTION_TABLE_SIZE_5 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + ValidateTargetInfo) +#define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE*, PULONG); @@ -121,6 +127,7 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, ULONG Version) { size_t size; + PSECPKG_FUNCTION_TABLE pNextTable; if (Version == SECPKG_INTERFACE_VERSION) size = SECPKG_FUNCTION_TABLE_SIZE_1; @@ -128,12 +135,32 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, size = SECPKG_FUNCTION_TABLE_SIZE_2; else if (Version == SECPKG_INTERFACE_VERSION_3) size = SECPKG_FUNCTION_TABLE_SIZE_3; + else if (Version == SECPKG_INTERFACE_VERSION_4) + size = SECPKG_FUNCTION_TABLE_SIZE_4; + else if (Version == SECPKG_INTERFACE_VERSION_5) + size = SECPKG_FUNCTION_TABLE_SIZE_5; + else if (Version == SECPKG_INTERFACE_VERSION_6) + size = SECPKG_FUNCTION_TABLE_SIZE_6; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL; } - return (PSECPKG_FUNCTION_TABLE)((PBYTE)pTable + size); + pNextTable = (PSECPKG_FUNCTION_TABLE)((PBYTE)pTable + size); + /* Win7 function tables appear to be SECPKG_INTERFACE_VERSION_6 format, + but unfortunately SpLsaModeInitialize returns SECPKG_INTERFACE_VERSION_3. + We detect that by comparing the "Initialize" pointer from the old table + to the "FreeCredentialsHandle" pointer of the new table. These functions + have different numbers of arguments, so they can't possibly point to the + same implementation */ + if (broken((void *) pTable->Initialize == (void *) pNextTable->FreeCredentialsHandle && + pNextTable->FreeCredentialsHandle != NULL)) + { + win_skip("Invalid function pointers for next package\n"); + return NULL; + } + + return pNextTable; } static void testGetInfo(void) @@ -181,7 +208,9 @@ static void testGetInfo(void) PackageInfo.fCapabilities); ok(PackageInfo.wVersion == 1, "wVersion: %d\n", PackageInfo.wVersion); ok(PackageInfo.wRPCID == 14, "wRPCID: %d\n", PackageInfo.wRPCID); - ok(PackageInfo.cbMaxToken == 0x4000, "cbMaxToken: 0x%x\n", + ok(PackageInfo.cbMaxToken == 0x4000 || + PackageInfo.cbMaxToken == 0x6000, /* Win7 */ + "cbMaxToken: 0x%x\n", PackageInfo.cbMaxToken); } } diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index e887360..b83d364 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -34,6 +34,9 @@ extern "C" { #define SECPKG_INTERFACE_VERSION 0x10000 #define SECPKG_INTERFACE_VERSION_2 0x20000 #define SECPKG_INTERFACE_VERSION_3 0x40000 +#define SECPKG_INTERFACE_VERSION_4 0x80000 +#define SECPKG_INTERFACE_VERSION_5 0x100000 +#define SECPKG_INTERFACE_VERSION_6 0x200000 /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { @@ -144,6 +147,11 @@ typedef struct _SECPKG_EXTENDED_INFORMATION { } Info; } SECPKG_EXTENDED_INFORMATION, *PSECPKG_EXTENDED_INFORMATION; +typedef struct _SECPKG_TARGETINFO { + PSID DomainSid; + PCWSTR ComputerName; +} SECPKG_TARGETINFO, *PSECPKG_TARGETINFO; + /* callbacks implemented by SSP/AP dlls and called by the LSA */ typedef VOID (NTAPI *PLSA_CALLBACK_FUNCTION)(ULONG_PTR, ULONG_PTR, PSecBuffer, PSecBuffer); @@ -345,6 +353,18 @@ typedef NTSTATUS (NTAPI SpSetContextAttributesFn)(LSA_SEC_HANDLE, ULONG, PVOID, ULONG); typedef NTSTATUS (NTAPI SpSetCredentialsAttributesFn)(LSA_SEC_HANDLE, ULONG, PVOID, ULONG); +typedef NTSTATUS (NTAPI SpChangeAccountPasswordFn)(PUNICODE_STRING, + PUNICODE_STRING, PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PSecBufferDesc); +typedef NTSTATUS (NTAPI SpQueryMetaDataFn)(LSA_SEC_HANDLE, PUNICODE_STRING, + ULONG, PULONG, PUCHAR *, PLSA_SEC_HANDLE); +typedef NTSTATUS (NTAPI SpExchangeMetaDataFn)(LSA_SEC_HANDLE, PUNICODE_STRING, + ULONG, ULONG, PUCHAR, PLSA_SEC_HANDLE); +typedef NTSTATUS (NTAPI SpGetCredUIContextFn)(LSA_SEC_HANDLE, GUID *, PULONG, + PUCHAR *); +typedef NTSTATUS (NTAPI SpUpdateCredentialsFn)(LSA_SEC_HANDLE, GUID *, ULONG, + PUCHAR); +typedef NTSTATUS (NTAPI SpValidateTargetInfoFn)(PLSA_CLIENT_REQUEST, PVOID, + PVOID, ULONG, PSECPKG_TARGETINFO); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -406,6 +426,15 @@ typedef struct SECPKG_FUNCTION_TABLE { /* Packages with version SECPKG_INTERFACE_VERSION_2 end here */ SpSetCredentialsAttributesFn *SetCredentialsAttributes; /* Packages with version SECPKG_INTERFACE_VERSION_3 end here */ + SpChangeAccountPasswordFn *ChangeAccountPassword; + /* Packages with version SECPKG_INTERFACE_VERSION_4 end here */ + SpQueryMetaDataFn *QueryMetaData; + SpExchangeMetaDataFn *ExchangeMetaData; + SpGetCredUIContextFn *GetCredUIContext; + SpUpdateCredentialsFn *UpdateCredentials; + /* Packages with version SECPKG_INTERFACE_VERSION_5 end here */ + SpValidateTargetInfoFn *ValidateTargetInfo; + /* Packages with version SECPKG_INTERFACE_VERSION_6 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE;

1 0

Ge van Geldorp : user32/tests: Fix sysparams test failure on Win7.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 2165c2640edb0d157220870e6951ef9773aefafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2165c2640edb0d157220870e6… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 user32/tests: Fix sysparams test failure on Win7. --- dlls/user32/tests/sysparams.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 7b2edaf..dd1e708 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -942,7 +942,8 @@ static void test_SPI_SETSCREENSAVEACTIVE( void ) /* 17 */ rc=SystemParametersInfoA( SPI_GETSCREENSAVEACTIVE, 0, &v, 0 ); ok(rc!=0,"%d: rc=%d err=%d\n",i,rc,GetLastError()); - eq( v, vals[i], "SPI_{GET,SET}SCREENSAVEACTIVE", "%d" ); + ok(v == vals[i] || broken(! v) /* Win 7 */, + "SPI_{GET,SET}SCREENSAVEACTIVE: got %d instead of %d\n", v, vals[i]); } rc=SystemParametersInfoA( SPI_SETSCREENSAVEACTIVE, old_b, 0, SPIF_UPDATEINIFILE );

1 0

Ge van Geldorp : secur32/tests: Add acceptable error code for Win7 ntlm test.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 43a28649c35d9b1631656bf891110c2334b07686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43a28649c35d9b1631656bf89… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Mon Sep 17 00:00:00 2001 +0200 secur32/tests: Add acceptable error code for Win7 ntlm test. --- dlls/secur32/tests/ntlm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 797b7ab..b7c5105 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -436,7 +436,8 @@ static SECURITY_STATUS runClient(SspiData *sspi_data, BOOL first, ULONG data_rep 0, data_rep, NULL, 0, sspi_data->ctxt, out_buf, &ctxt_attr, &ttl); - ok(ret == SEC_E_INTERNAL_ERROR, "expected SEC_E_INTERNAL_ERROR, got %s\n", getSecError(ret)); + ok(ret == SEC_E_INTERNAL_ERROR || ret == SEC_I_CONTINUE_NEEDED, + "expected SEC_E_INTERNAL_ERROR or SEC_I_CONTINUE_NEEDED, got %s\n", getSecError(ret)); out_buf->pBuffers[0].pvBuffer = old_buf;

1 0

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 October 2009