wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Austin English : wine.inf: Create Microsoft Shared/TextConv directory.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 09cc2b93217b00ce4b53d79ff12409c3e4c8c9bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=09cc2b93217b00ce4b53d79ff… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Apr 25 01:18:31 2016 -0500 wine.inf: Create Microsoft Shared/TextConv directory. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d22b29b..589a1ff 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2584,6 +2584,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16422,Internet Explorer,iexplore.exe 16422,Windows Media Player,wmplayer.exe 16422,Windows NT\Accessories,wordpad.exe +16427,Microsoft Shared\TextConv, 16427,System\OLE DB,oledb32.dll 16427,System\OLE DB,msdaps.dll 11,,*

1 0

Aaryaman Vasishta : d3drm: Use ref and appdata from d3drm_object in d3drm_texture.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: e5e499d399e405f533c1a322e3f9dc47a2864682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e499d399e405f533c1a322e… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 24 21:38:20 2016 +0530 d3drm: Use ref and appdata from d3drm_object in d3drm_texture. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/d3drm_private.h | 2 -- dlls/d3drm/texture.c | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 3dae0bb..2eb8e4d 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -40,8 +40,6 @@ struct d3drm_texture IDirect3DRMTexture IDirect3DRMTexture_iface; IDirect3DRMTexture2 IDirect3DRMTexture2_iface; IDirect3DRMTexture3 IDirect3DRMTexture3_iface; - LONG ref; - DWORD app_data; }; void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 60374d3..886bb0b 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -707,7 +707,7 @@ static HRESULT WINAPI d3drm_texture3_QueryInterface(IDirect3DRMTexture3 *iface, static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - ULONG refcount = InterlockedIncrement(&texture->ref); + ULONG refcount = InterlockedIncrement(&texture->obj.ref); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -717,7 +717,7 @@ static ULONG WINAPI d3drm_texture3_AddRef(IDirect3DRMTexture3 *iface) static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture3(iface); - ULONG refcount = InterlockedDecrement(&texture->ref); + ULONG refcount = InterlockedDecrement(&texture->obj.ref); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -764,7 +764,7 @@ static HRESULT WINAPI d3drm_texture3_SetAppData(IDirect3DRMTexture3 *iface, DWOR TRACE("iface %p, data %#x.\n", iface, data); - texture->app_data = data; + texture->obj.appdata = data; return D3DRM_OK; } @@ -775,7 +775,7 @@ static DWORD WINAPI d3drm_texture3_GetAppData(IDirect3DRMTexture3 *iface) TRACE("iface %p.\n", iface); - return texture->app_data; + return texture->obj.appdata; } static HRESULT WINAPI d3drm_texture3_SetName(IDirect3DRMTexture3 *iface, const char *name) @@ -1056,7 +1056,6 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture) object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl; object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; - object->ref = 1; d3drm_object_init(&object->obj);

1 0

Aaryaman Vasishta : d3drm: Use sizeof instead of strlen in d3drm_texture3_GetClassName.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 93c2196189fb1a358aae91a8f712378075ce8b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c2196189fb1a358aae91a8f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 24 21:38:19 2016 +0530 d3drm: Use sizeof instead of strlen in d3drm_texture3_GetClassName. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index f81fc03..60374d3 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -796,7 +796,7 @@ static HRESULT WINAPI d3drm_texture3_GetClassName(IDirect3DRMTexture3 *iface, DW { TRACE("iface %p, size %p, name %p.\n", iface, size, name); - if (!size || *size < strlen("Texture") || !name) + if (!size || *size < sizeof("Texture") || !name) return E_INVALIDARG; strcpy(name, "Texture");

1 0

Francois Gouget : ddraw: Remove DDENUMSURFACES_{MATCH, SEARCH}TYPE as they are unused.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 2738f7690d4209ebf98a8415bdb0202436379b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2738f7690d4209ebf98a8415b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 24 12:41:27 2016 +0200 ddraw: Remove DDENUMSURFACES_{MATCH,SEARCH}TYPE as they are unused. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 60875d2..eb1652c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2963,9 +2963,6 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, return hr; } -#define DDENUMSURFACES_SEARCHTYPE (DDENUMSURFACES_CANBECREATED|DDENUMSURFACES_DOESEXIST) -#define DDENUMSURFACES_MATCHTYPE (DDENUMSURFACES_ALL|DDENUMSURFACES_MATCH|DDENUMSURFACES_NOMATCH) - static BOOL Main_DirectDraw_DDPIXELFORMAT_Match(const DDPIXELFORMAT *requested, const DDPIXELFORMAT *provided) @@ -3072,9 +3069,6 @@ static BOOL ddraw_match_surface_desc(const DDSURFACEDESC2 *requested, const DDSU return TRUE; } -#undef DDENUMSURFACES_SEARCHTYPE -#undef DDENUMSURFACES_MATCHTYPE - struct surfacescallback2_context { LPDDENUMSURFACESCALLBACK2 func;

1 0

Sebastian Lackner : server: Do not hold reference on parent process.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: bae3dcc2957683a4e2ca04a75ef10f91688300e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae3dcc2957683a4e2ca04a75… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 21 12:34:07 2016 +0200 server: Do not hold reference on parent process. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 2 +- server/console.c | 3 +-- server/process.c | 7 +++---- server/process.h | 2 +- server/snapshot.c | 2 +- server/thread.c | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 2708072..2631aa3 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1157,7 +1157,7 @@ static void test_Toolhelp(void) Sleep(100); } /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ - todo_wine ok(i < 20 || broken(i == 20), "process object not released\n"); + ok(i < 20 || broken(i == 20), "process object not released\n"); snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); diff --git a/server/console.c b/server/console.c index 0d98b78..efb20da 100644 --- a/server/console.c +++ b/server/console.c @@ -1424,13 +1424,12 @@ DECL_HANDLER(alloc_console) case 0: /* renderer is current, console to be attached to parent process */ renderer = current; - if (!(process = current->process->parent)) + if (!(process = get_process_from_id( current->process->parent_id ))) { if (fd != -1) close( fd ); set_error( STATUS_ACCESS_DENIED ); return; } - grab_object( process ); attach = 1; break; case 0xffffffff: diff --git a/server/process.c b/server/process.c index d2eab45..52bd462 100644 --- a/server/process.c +++ b/server/process.c @@ -506,7 +506,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit close( fd ); goto error; } - process->parent = NULL; + process->parent_id = 0; process->debugger = NULL; process->handles = NULL; process->msg_fd = NULL; @@ -558,7 +558,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit else { struct process *parent = parent_thread->process; - process->parent = (struct process *)grab_object( parent ); + process->parent_id = parent->id; process->handles = inherit_all ? copy_handle_table( process, parent ) : alloc_handle_table( process, 0 ); /* Note: for security reasons, starting a new process does not attempt @@ -625,7 +625,6 @@ static void process_destroy( struct object *obj ) release_object( process->job ); } if (process->console) release_object( process->console ); - if (process->parent) release_object( process->parent ); if (process->msg_fd) release_object( process->msg_fd ); list_remove( &process->entry ); if (process->idle_event) release_object( process->idle_event ); @@ -1354,7 +1353,7 @@ DECL_HANDLER(get_process_info) if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ))) { reply->pid = get_process_id( process ); - reply->ppid = process->parent ? get_process_id( process->parent ) : 0; + reply->ppid = process->parent_id; reply->exit_code = process->exit_code; reply->priority = process->priority; reply->affinity = process->affinity; diff --git a/server/process.h b/server/process.h index fa7f60d..34b6ea6 100644 --- a/server/process.h +++ b/server/process.h @@ -56,7 +56,7 @@ struct process { struct object obj; /* object header */ struct list entry; /* entry in system-wide process list */ - struct process *parent; /* parent process */ + process_id_t parent_id; /* parent process id (at the time of creation) */ struct list thread_list; /* thread list */ struct thread *debugger; /* thread debugging this process */ struct handle_table *handles; /* handle entries */ diff --git a/server/snapshot.c b/server/snapshot.c index 3566b89..e35588a 100644 --- a/server/snapshot.c +++ b/server/snapshot.c @@ -115,7 +115,7 @@ static int snapshot_next_process( struct snapshot *snapshot, struct next_process ptr = &snapshot->processes[snapshot->process_pos++]; reply->count = ptr->count; reply->pid = get_process_id( ptr->process ); - reply->ppid = ptr->process->parent ? get_process_id( ptr->process->parent ) : 0; + reply->ppid = ptr->process->parent_id; reply->threads = ptr->threads; reply->priority = ptr->priority; reply->handles = ptr->handles; diff --git a/server/thread.c b/server/thread.c index ca02a8a..5f8405b 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1304,7 +1304,7 @@ DECL_HANDLER(init_thread) process->peb = req->entry; process->cpu = req->cpu; reply->info_size = init_process( current ); - if (!process->parent) + if (!process->parent_id) process->affinity = current->affinity = get_thread_affinity( current ); else set_thread_affinity( current, current->affinity );

1 0

Sebastian Lackner : server: Increase size of PID table and do not reuse recently freed ptids.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 1025ed38c07102aa0bc4fb4e66b37ba35e5e9bd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1025ed38c07102aa0bc4fb4e6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 21 12:34:00 2016 +0200 server: Increase size of PID table and do not reuse recently freed ptids. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/process.c b/server/process.c index 11d2987..d2eab45 100644 --- a/server/process.c +++ b/server/process.c @@ -338,6 +338,7 @@ static unsigned int used_ptid_entries; /* number of entries in use */ static unsigned int alloc_ptid_entries; /* number of allocated entries */ static unsigned int next_free_ptid; /* next free entry */ static unsigned int last_free_ptid; /* last free entry */ +static unsigned int num_free_ptids; /* number of free ptids */ static void kill_all_processes(void); @@ -354,16 +355,17 @@ unsigned int alloc_ptid( void *ptr ) id = used_ptid_entries + PTID_OFFSET; entry = &ptid_entries[used_ptid_entries++]; } - else if (next_free_ptid) + else if (next_free_ptid && num_free_ptids >= 256) { id = next_free_ptid; entry = &ptid_entries[id - PTID_OFFSET]; if (!(next_free_ptid = entry->next)) last_free_ptid = 0; + num_free_ptids--; } else /* need to grow the array */ { unsigned int count = alloc_ptid_entries + (alloc_ptid_entries / 2); - if (!count) count = 64; + if (!count) count = 512; if (!(entry = realloc( ptid_entries, count * sizeof(*entry) ))) { set_error( STATUS_NO_MEMORY ); @@ -390,8 +392,8 @@ void free_ptid( unsigned int id ) /* append to end of free list so that we don't reuse it too early */ if (last_free_ptid) ptid_entries[last_free_ptid - PTID_OFFSET].next = id; else next_free_ptid = id; - last_free_ptid = id; + num_free_ptids++; } /* retrieve the pointer corresponding to a process or thread id */

1 0

Aric Stewart : winex11.drv: Improve setting IME result text with no composition.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: e4d94e48138ff4963e1b896d392e6fa6b9b87054 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d94e48138ff4963e1b896d3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 22 13:59:03 2016 -0500 winex11.drv: Improve setting IME result text with no composition. This greatly improves behaviors around deadkeys in Microsoft Word. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/ime.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 22698cf..ee622c1 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1046,24 +1046,38 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) LPINPUTCONTEXT lpIMC; HIMCC newCompStr; LPIMEPRIVATE myPrivate; + BOOL inComp; imc = RealIMC(FROM_X11); lpIMC = ImmLockIMC(imc); if (lpIMC == NULL) return; + newCompStr = updateCompStr(lpIMC->hCompStr, NULL, 0); + ImmDestroyIMCC(lpIMC->hCompStr); + lpIMC->hCompStr = newCompStr; + newCompStr = updateResultStr(lpIMC->hCompStr, lpResult, dwResultLen); ImmDestroyIMCC(lpIMC->hCompStr); lpIMC->hCompStr = newCompStr; myPrivate = ImmLockIMCC(lpIMC->hPrivate); - if (!myPrivate->bInComposition) - GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); - GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_RESULTSTR); - if (!myPrivate->bInComposition) - GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); + inComp = myPrivate->bInComposition; ImmUnlockIMCC(lpIMC->hPrivate); + if (!inComp) + { + ImmSetOpenStatus(imc, TRUE); + GenerateIMEMessage(imc, WM_IME_STARTCOMPOSITION, 0, 0); + } + + GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR); + GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE); + GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); + + if (!inComp) + ImmSetOpenStatus(imc, FALSE); + ImmUnlockIMC(imc); }

1 0

Francois Gouget : include: Remove duplicate Web Services declarations.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 881fd6a565e0b94e1482c522174f457c6d0af2ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=881fd6a565e0b94e1482c5221… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 24 04:08:44 2016 +0200 include: Remove duplicate Web Services declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/webservices.h b/include/webservices.h index 6217105..6e30f50 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -49,10 +49,7 @@ typedef struct _WS_ENDPOINT_ADDRESS WS_ENDPOINT_ADDRESS; typedef struct _WS_ENDPOINT_IDENTITY WS_ENDPOINT_IDENTITY; typedef struct _WS_ENUM_DESCRIPTION WS_ENUM_DESCRIPTION; typedef struct _WS_ENUM_VALUE WS_ENUM_VALUE; -typedef struct _WS_OPERATION_DESCRIPTION WS_OPERATION_DESCRIPTION; typedef struct _WS_HTTP_POLICY_DESCRIPTION WS_HTTP_POLICY_DESCRIPTION; -typedef struct _WS_MESSAGE_PROPERTY WS_MESSAGE_PROPERTY; -typedef struct _WS_MESSAGE_PROPERTIES WS_MESSAGE_PROPERTIES; typedef struct _WS_MESSAGE WS_MESSAGE; typedef struct _WS_MESSAGE_DESCRIPTION WS_MESSAGE_DESCRIPTION; typedef struct _WS_OPERATION_DESCRIPTION WS_OPERATION_DESCRIPTION;

1 0

Nikolay Sivov : comctl32: Improve DrawShadowText().
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 2771fd9758b71b64a43773f22f09c5ec304cc751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2771fd9758b71b64a43773f22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 24 16:24:35 2016 +0300 comctl32: Improve DrawShadowText(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/commctrl.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c12a214..2a4cd42 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1592,12 +1592,33 @@ LRESULT WINAPI SetPathWordBreakProc(HWND hwnd, BOOL bSet) * * Draw text with shadow. */ -int WINAPI DrawShadowText(HDC hdc, LPCWSTR pszText, UINT cch, RECT *rect, DWORD dwFlags, - COLORREF crText, COLORREF crShadow, int ixOffset, int iyOffset) +int WINAPI DrawShadowText(HDC hdc, LPCWSTR text, UINT length, RECT *rect, DWORD flags, + COLORREF crText, COLORREF crShadow, int offset_x, int offset_y) { - FIXME("(%p, %s, %d, %p, %d, 0x%08x, 0x%08x, %d, %d): stub\n", hdc, debugstr_w(pszText), cch, rect, dwFlags, - crText, crShadow, ixOffset, iyOffset); - return DrawTextW(hdc, pszText, cch, rect, DT_LEFT); + int bkmode, ret; + COLORREF clr; + RECT r; + + FIXME("(%p, %s, %d, %p, 0x%08x, 0x%08x, 0x%08x, %d, %d): semi-stub\n", hdc, debugstr_w(text), + length, rect, flags, crText, crShadow, offset_x, offset_y); + + bkmode = SetBkMode(hdc, TRANSPARENT); + clr = SetTextColor(hdc, crShadow); + + /* FIXME: for shadow we need to render normally, blur it, and blend with current background. */ + r = *rect; + OffsetRect(&r, 1, 1); + DrawTextW(hdc, text, length, &r, flags); + + SetTextColor(hdc, crText); + + /* with text color on top of a shadow */ + ret = DrawTextW(hdc, text, length, rect, flags); + + SetTextColor(hdc, clr); + SetBkMode(hdc, bkmode); + + return ret; } /***********************************************************************

1 0

Francois Gouget : schannel: Add declarations for SECPKG version 7.
by Alexandre Julliard 25 Apr '16

25 Apr '16

Module: wine Branch: master Commit: 57271ca1869067f1556ca0c2bc3e45884bb013a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57271ca1869067f1556ca0c2b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 24 12:32:34 2016 +0200 schannel: Add declarations for SECPKG version 7. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schannel/lsamode.c | 4 +++- dlls/schannel/tests/main.c | 6 +++++- include/ntsecpkg.h | 12 +++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index f43150e..96ca240 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -115,6 +115,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -151,6 +152,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NULL, /* GetCredUIContext */ NULL, /* UpdateCredentials */ NULL, /* ValidateTargetInfo */ + NULL, /* PostLogonUser */ } }; @@ -162,7 +164,7 @@ NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_6; + *PackageVersion = SECPKG_INTERFACE_VERSION_7; *pcTables = 2; *ppTables = secPkgFunctionTable; diff --git a/dlls/schannel/tests/main.c b/dlls/schannel/tests/main.c index d8ade9a..4240dd7 100644 --- a/dlls/schannel/tests/main.c +++ b/dlls/schannel/tests/main.c @@ -43,7 +43,9 @@ QueryMetaData) #define SECPKG_FUNCTION_TABLE_SIZE_5 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ ValidateTargetInfo) -#define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_6 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + PostLogonUser) +#define SECPKG_FUNCTION_TABLE_SIZE_7 sizeof(SECPKG_FUNCTION_TABLE) #define LSA_BASE_CAPS ( \ SECPKG_FLAG_INTEGRITY | \ @@ -152,6 +154,8 @@ static PSECPKG_FUNCTION_TABLE getNextSecPkgTable(PSECPKG_FUNCTION_TABLE pTable, size = SECPKG_FUNCTION_TABLE_SIZE_5; else if (Version == SECPKG_INTERFACE_VERSION_6) size = SECPKG_FUNCTION_TABLE_SIZE_6; + else if (Version == SECPKG_INTERFACE_VERSION_7) + size = SECPKG_FUNCTION_TABLE_SIZE_7; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL; diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index b83d364..0df345d 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -37,6 +37,7 @@ extern "C" { #define SECPKG_INTERFACE_VERSION_4 0x80000 #define SECPKG_INTERFACE_VERSION_5 0x100000 #define SECPKG_INTERFACE_VERSION_6 0x200000 +#define SECPKG_INTERFACE_VERSION_7 0x400000 /* enum definitions for Secure Service Provider/Authentication Packages */ typedef enum _LSA_TOKEN_INFORMATION_TYPE { @@ -147,11 +148,17 @@ typedef struct _SECPKG_EXTENDED_INFORMATION { } Info; } SECPKG_EXTENDED_INFORMATION, *PSECPKG_EXTENDED_INFORMATION; -typedef struct _SECPKG_TARGETINFO { +typedef struct _SECPKG_TARGETINFO { PSID DomainSid; PCWSTR ComputerName; } SECPKG_TARGETINFO, *PSECPKG_TARGETINFO; +typedef struct _SECPKG_POST_LOGON_USER_INFO { + ULONG Flags; + LUID LogonId; + LUID LinkedLogonId; +} SECPKG_POST_LOGON_USER_INFO, *PSECPKG_POST_LOGON_USER_INFO; + /* callbacks implemented by SSP/AP dlls and called by the LSA */ typedef VOID (NTAPI *PLSA_CALLBACK_FUNCTION)(ULONG_PTR, ULONG_PTR, PSecBuffer, PSecBuffer); @@ -365,6 +372,7 @@ typedef NTSTATUS (NTAPI SpUpdateCredentialsFn)(LSA_SEC_HANDLE, GUID *, ULONG, PUCHAR); typedef NTSTATUS (NTAPI SpValidateTargetInfoFn)(PLSA_CLIENT_REQUEST, PVOID, PVOID, ULONG, PSECPKG_TARGETINFO); +typedef NTSTATUS (NTAPI LSA_AP_POST_LOGON_USER)(PSECPKG_POST_LOGON_USER_INFO); /* User-mode functions implemented by SSP/AP obtainable by a dispatch table */ typedef NTSTATUS (NTAPI SpInstanceInitFn)(ULONG, PSECPKG_DLL_FUNCTIONS, @@ -435,6 +443,8 @@ typedef struct SECPKG_FUNCTION_TABLE { /* Packages with version SECPKG_INTERFACE_VERSION_5 end here */ SpValidateTargetInfoFn *ValidateTargetInfo; /* Packages with version SECPKG_INTERFACE_VERSION_6 end here */ + LSA_AP_POST_LOGON_USER* PostLogonUser; + /* Packages with version SECPKG_INTERFACE_VERSION_7 end here */ } SECPKG_FUNCTION_TABLE, *PSECPKG_FUNCTION_TABLE;

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
75
Older →

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 April 2016