wine-commits August 2009

wine-commits@winehq.org

4 participants
1042 discussions

Stefan Leichter : shdocvw: Add stub for SHRestricted2W.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: a4c1c66c874ed6705dc53d8c4a41a54e764bf1bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c1c66c874ed6705dc53d8c4… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Fri Aug 7 11:48:09 2009 +0200 shdocvw: Add stub for SHRestricted2W. --- dlls/shdocvw/shdocvw.spec | 2 +- dlls/shdocvw/shdocvw_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/shdocvw.spec b/dlls/shdocvw/shdocvw.spec index 2bfcc8f..aa5ef51 100644 --- a/dlls/shdocvw/shdocvw.spec +++ b/dlls/shdocvw/shdocvw.spec @@ -41,7 +41,7 @@ 152 stub -noname CShellUIHelper_CreateInstance2 153 stub -noname IsURLChild 158 stub -noname SHRestricted2A -159 stub -noname SHRestricted2W +159 stdcall -noname SHRestricted2W(long wstr long) 160 stub -noname SHIsRestricted2W 161 stub @ # CSearchAssistantOC::OnDraw 162 stub -noname CDDEAuto_Navigate diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 110b713..9090b7d 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -406,3 +406,12 @@ HRESULT WINAPI IEParseDisplayNameWithBCW(DWORD codepage, LPCWSTR lpszDisplayName FIXME("stub: 0x%x %s %p %p\n",codepage,debugstr_w(lpszDisplayName),pbc,ppidl); return E_FAIL; } + +/****************************************************************** + * SHRestricted2W (SHDOCVW.159) + */ +DWORD WINAPI SHRestricted2W(DWORD res, LPCWSTR url, DWORD reserved) +{ + FIXME("(%d %s %d) stub\n", res, debugstr_w(url), reserved); + return 0; +}

1 0

Andrew Nguyen : user32/tests: Test the behavior of DialogBoxParamA with dialog procedure window destruction .
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 797ec7a58eef5de5cffff981f60132827c44af2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=797ec7a58eef5de5cffff981f… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Aug 7 04:05:50 2009 -0500 user32/tests: Test the behavior of DialogBoxParamA with dialog procedure window destruction. --- dlls/user32/tests/dialog.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 060625c..35a1c94 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -901,6 +901,35 @@ static void test_GetDlgItemText(void) "string retrieved using GetDlgItemText should have been NULL terminated\n"); } +static INT_PTR CALLBACK DestroyDlgWinProc (HWND hDlg, UINT uiMsg, + WPARAM wParam, LPARAM lParam) +{ + if (uiMsg == WM_INITDIALOG) + { + DestroyWindow(hDlg); + return TRUE; + } + return FALSE; +} + +static INT_PTR CALLBACK DestroyOnCloseDlgWinProc (HWND hDlg, UINT uiMsg, + WPARAM wParam, LPARAM lParam) +{ + switch (uiMsg) + { + case WM_INITDIALOG: + PostMessage(hDlg, WM_CLOSE, 0, 0); + return TRUE; + case WM_CLOSE: + DestroyWindow(hDlg); + return TRUE; + case WM_DESTROY: + PostQuitMessage(0); + return TRUE; + } + return FALSE; +} + static void test_DialogBoxParamA(void) { int ret; @@ -912,6 +941,19 @@ static void test_DialogBoxParamA(void) ok(ERROR_INVALID_WINDOW_HANDLE == GetLastError() || broken(GetLastError() == 0xdeadbeef), "got %d, expected ERROR_INVALID_WINDOW_HANDLE\n",GetLastError()); + + /* Test a dialog which destroys itself on WM_INITDIALOG. */ + SetLastError(0xdeadbeef); + ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG", 0, DestroyDlgWinProc, 0); + ok(-1 == ret, "DialogBoxParamA returned %d, expected -1\n", ret); + ok(ERROR_INVALID_WINDOW_HANDLE == GetLastError() || + broken(GetLastError() == 0xdeadbeef), + "got %d, expected ERROR_INVALID_WINDOW_HANDLE\n",GetLastError()); + + /* Test a dialog which destroys itself on WM_CLOSE. */ + ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG", 0, DestroyOnCloseDlgWinProc, 0); + todo_wine ok(0 == ret, "DialogBoxParamA returned %d, expected 0\n", ret); + SetLastError(0xdeadbeef); ret = DialogBoxParamA(GetModuleHandle(NULL), "RESOURCE_INVALID" , 0, 0, 0); ok(-1 == ret, "DialogBoxParamA returned %d, expected -1\n", ret);

1 0

Henri Verbeet : wined3d: Fix a condition in record_lights().
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 35826e9761b8b9c90e6f64b24d8e0d33261f57ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=35826e9761b8b9c90e6f64b24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 7 08:51:22 2009 +0200 wined3d: Fix a condition in record_lights(). --- dlls/wined3d/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index a8e53f0..abdb333 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -357,7 +357,7 @@ static inline void record_lights(IWineD3DStateBlockImpl *This, IWineD3DStateBloc LIST_FOR_EACH(e, &This->lightMap[i]) { BOOL updated = FALSE; PLIGHTINFOEL *src = LIST_ENTRY(e, PLIGHTINFOEL, entry), *realLight; - if(!src->changed || !src->enabledChanged) continue; + if (!src->changed && !src->enabledChanged) continue; /* Look up the light in the destination */ LIST_FOR_EACH(f, &targetStateBlock->lightMap[i]) {

1 0

Henri Verbeet : wined3d: Check the return value of wglDeleteContext() in context_destroy_gl_resources().
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 41729ca91919d2992ab3b3c6fa25da993b2ff9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41729ca91919d2992ab3b3c6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 7 08:51:21 2009 +0200 wined3d: Check the return value of wglDeleteContext() in context_destroy_gl_resources(). --- dlls/wined3d/context.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cd791c8..aa1518e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -705,7 +705,11 @@ static void context_destroy_gl_resources(struct wined3d_context *context) ReleaseDC(context->win_handle, context->hdc); } - pwglDeleteContext(context->glCtx); + if (!pwglDeleteContext(context->glCtx)) + { + DWORD err = GetLastError(); + ERR("wglDeleteContext(%p) failed, last error %#x.\n", context->glCtx, err); + } } DWORD context_get_tls_idx(void)

1 0

Henri Verbeet : wined3d: Merge the context-> current_rt check for rendertarget readback with the code above.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 7ed116da2e2bafef09b45cbeb80859edbd13d73c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed116da2e2bafef09b45cbeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 7 08:51:20 2009 +0200 wined3d: Merge the context->current_rt check for rendertarget readback with the code above. Also update the comments. --- dlls/wined3d/context.c | 81 +++++++++++++++++++---------------------------- 1 files changed, 33 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0eb6cfd..cd791c8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1862,59 +1862,44 @@ retry: Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), StateTable); } } - } - /* When switching away from an offscreen render target, and we're not using FBOs, - * we have to read the drawable into the texture. This is done via PreLoad(and - * SFLAG_INDRAWABLE set on the surface). There are some things that need care though. - * PreLoad needs a GL context, and FindContext is called before the context is activated. - * It also has to be called with the old rendertarget active, otherwise a wrong drawable - * is read. This leads to these possible situations: - * - * 0) lastActiveRenderTarget == target && oldTid == newTid: - * Nothing to do, we don't even reach this code in this case... - * - * 1) lastActiveRenderTarget != target && oldTid == newTid: - * The currently active context is OK for readback. Call PreLoad, and it - * performs the read - * - * 2) lastActiveRenderTarget == target && oldTid != newTid: - * Nothing to do - the drawable is unchanged - * - * 3) lastActiveRenderTarget != target && oldTid != newTid: - * This is tricky. We have to get a context with the old drawable from somewhere - * before we can switch to the new context. In this case, PreLoad calls - * ActivateContext(lastActiveRenderTarget) from the new(current) thread. This - * is case (2) then. The old drawable is activated for the new thread, and the - * readback can be done. The recursed ActivateContext does *not* call PreLoad again. - * After that, the outer ActivateContext(which calls PreLoad) can activate the new - * target for the new thread - */ - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && old_render_offscreen - && context->current_rt && context->current_rt != target) - { - BOOL oldInDraw = This->isInDraw; + /* When switching away from an offscreen render target, and we're not + * using FBOs, we have to read the drawable into the texture. This is + * done via PreLoad (and SFLAG_INDRAWABLE set on the surface). There + * are some things that need care though. PreLoad needs a GL context, + * and FindContext is called before the context is activated. It also + * has to be called with the old rendertarget active, otherwise a + * wrong drawable is read. */ + if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && old_render_offscreen && context->current_rt != target) + { + BOOL oldInDraw = This->isInDraw; - /* PreLoad requires a context to load the texture, thus it will call ActivateContext. - * Set the isInDraw to true to signal PreLoad that it has a context. Will be tricky - * when using offscreen rendering with multithreading - */ - This->isInDraw = TRUE; + /* surface_internal_preload() requires a context to load the + * texture, so it will call ActivateContext. Set isInDraw to true + * to signal surface_internal_preload() that it has a context. */ - /* Do that before switching the context: - * Read the back buffer of the old drawable into the destination texture - */ - if (((IWineD3DSurfaceImpl *)context->current_rt)->texture_name_srgb) - { - surface_internal_preload(context->current_rt, SRGB_BOTH); - } else { - surface_internal_preload(context->current_rt, SRGB_RGB); - } + /* FIXME: This is just broken. There's no guarantee whatsoever + * that the currently active context, if any, is appropriate for + * reading back the render target. We should probably call + * context_set_current(context) here and then rely on + * ActivateContext() doing the right thing. */ + This->isInDraw = TRUE; + + /* Read the back buffer of the old drawable into the destination texture. */ + if (((IWineD3DSurfaceImpl *)context->current_rt)->texture_name_srgb) + { + surface_internal_preload(context->current_rt, SRGB_BOTH); + } + else + { + surface_internal_preload(context->current_rt, SRGB_RGB); + } - /* Assume that the drawable will be modified by some other things now */ - IWineD3DSurface_ModifyLocation(context->current_rt, SFLAG_INDRAWABLE, FALSE); + IWineD3DSurface_ModifyLocation(context->current_rt, SFLAG_INDRAWABLE, FALSE); - This->isInDraw = oldInDraw; + This->isInDraw = oldInDraw; + } } context->draw_buffer_dirty = TRUE;

1 0

Henri Verbeet : wined3d: Explicitly pass the context to drawStridedSlow().
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 0479fb13b51c2113cc2ca782258aad9fc1f51604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0479fb13b51c2113cc2ca7822… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 7 08:51:19 2009 +0200 wined3d: Explicitly pass the context to drawStridedSlow(). --- dlls/wined3d/drawprim.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 09cb960..9a5aef7 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -70,10 +70,10 @@ static void drawStridedFast(IWineD3DDevice *iface, GLenum primitive_type, */ /* GL locking is done by the caller */ -static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_stream_info *si, UINT NumVertexes, - GLenum glPrimType, const void *idxData, UINT idxSize, UINT minIndex, UINT startIdx) +static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context *context, + const struct wined3d_stream_info *si, UINT NumVertexes, GLenum glPrimType, + const void *idxData, UINT idxSize, UINT minIndex, UINT startIdx) { - struct wined3d_context *context = context_get_current(); unsigned int textureNo = 0; const WORD *pIdxBufS = NULL; const DWORD *pIdxBufL = NULL; @@ -656,7 +656,8 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT numberOfVertice } drawStridedSlowVs(iface, stream_info, index_count, glPrimType, idxData, idxSize, minIndex, StartIdx); } else { - drawStridedSlow(iface, stream_info, index_count, glPrimType, idxData, idxSize, minIndex, StartIdx); + drawStridedSlow(iface, context, stream_info, index_count, + glPrimType, idxData, idxSize, minIndex, StartIdx); } } else if(This->instancedDraw) { /* Instancing emulation with mixing immediate mode and arrays */

1 0

Henri Verbeet : wined3d: Explicitly pass the context to the shader_select() handler.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 3bf0ad45289a59ec388507a39b50ce3865ec9639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bf0ad45289a59ec388507a39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 7 08:51:18 2009 +0200 wined3d: Explicitly pass the context to the shader_select() handler. --- dlls/wined3d/arb_program_shader.c | 13 +++-- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/baseshader.c | 2 +- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 89 ++++++++++++++++++++---------------- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 62 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3bf0ad45289a59ec38850…

1 0

Hans Leidekker : include: Add prototypes for EncodePointer and DecodePointer.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 26fbee2db7b5f02a60c81c9b327066d08e545c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26fbee2db7b5f02a60c81c9b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 7 08:37:19 2009 +0200 include: Add prototypes for EncodePointer and DecodePointer. --- include/winbase.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 613114c..9e52bde 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1424,6 +1424,7 @@ WINBASEAPI BOOL WINAPI DebugActiveProcessStop(DWORD); WINBASEAPI void WINAPI DebugBreak(void); WINBASEAPI BOOL WINAPI DebugBreakProcess(HANDLE); WINBASEAPI BOOL WINAPI DebugSetProcessKillOnExit(BOOL); +WINBASEAPI PVOID WINAPI DecodePointer(PVOID); WINADVAPI BOOL WINAPI DecryptFileA(LPCSTR,DWORD); WINADVAPI BOOL WINAPI DecryptFileW(LPCWSTR,DWORD); #define DecryptFile WINELIB_NAME_AW(DecryptFile) @@ -1456,6 +1457,7 @@ WINBASEAPI BOOL WINAPI DuplicateHandle(HANDLE,HANDLE,HANDLE,HANDLE*,DWORD WINADVAPI BOOL WINAPI DuplicateToken(HANDLE,SECURITY_IMPERSONATION_LEVEL,PHANDLE); WINADVAPI BOOL WINAPI DuplicateTokenEx(HANDLE,DWORD,LPSECURITY_ATTRIBUTES,SECURITY_IMPERSONATION_LEVEL,TOKEN_TYPE,PHANDLE); WINBASEAPI BOOL WINAPI EscapeCommFunction(HANDLE,UINT); +WINBASEAPI PVOID WINAPI EncodePointer(PVOID); WINADVAPI BOOL WINAPI EncryptFileA(LPCSTR); WINADVAPI BOOL WINAPI EncryptFileW(LPCWSTR); #define EncryptFile WINELIB_NAME_AW(EncryptFile)

1 0

Hans Leidekker : advapi32: Add tests for LsaLookupNames2.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: 9cec6e64ec2606a7cc2c6e734b5e8d94dad302bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cec6e64ec2606a7cc2c6e734… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 7 08:36:51 2009 +0200 advapi32: Add tests for LsaLookupNames2. --- dlls/advapi32/tests/lsa.c | 138 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 137 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index e69e4e1..991b06b 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -41,7 +41,8 @@ static NTSTATUS (WINAPI *pLsaEnumerateAccountRights)(LSA_HANDLE,PSID,PLSA_UNICOD static NTSTATUS (WINAPI *pLsaFreeMemory)(PVOID); static NTSTATUS (WINAPI *pLsaOpenPolicy)(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE); static NTSTATUS (WINAPI *pLsaQueryInformationPolicy)(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); -static BOOL (WINAPI *pConvertSidToStringSidA)(PSID pSid, LPSTR *str); +static BOOL (WINAPI *pConvertSidToStringSidA)(PSID,LPSTR*); +static NTSTATUS (WINAPI *pLsaLookupNames2)(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); static BOOL init(void) { @@ -53,6 +54,7 @@ static BOOL init(void) pLsaOpenPolicy = (void*)GetProcAddress(hadvapi32, "LsaOpenPolicy"); pLsaQueryInformationPolicy = (void*)GetProcAddress(hadvapi32, "LsaQueryInformationPolicy"); pConvertSidToStringSidA = (void*)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); + pLsaLookupNames2 = (void*)GetProcAddress(hadvapi32, "LsaLookupNames2"); if (pLsaClose && pLsaEnumerateAccountRights && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA) return TRUE; @@ -216,6 +218,139 @@ static void test_lsa(void) } } +static void get_sid_info(PSID psid, LPSTR *user, LPSTR *dom) +{ + static char account[257], domain[257]; + DWORD user_size, dom_size; + SID_NAME_USE use; + BOOL ret; + + *user = account; + *dom = domain; + + user_size = dom_size = 257; + account[0] = domain[0] = 0; + ret = LookupAccountSidA(NULL, psid, account, &user_size, domain, &dom_size, &use); + ok(ret, "LookupAccountSidA failed %u\n", GetLastError()); +} + +static void test_LsaLookupNames2(void) +{ + static const WCHAR n1[] = {'L','O','C','A','L',' ','S','E','R','V','I','C','E'}; + static const WCHAR n2[] = {'N','T',' ','A','U','T','H','O','R','I','T','Y','\\','L','o','c','a','l','S','e','r','v','i','c','e'}; + + NTSTATUS status; + LSA_HANDLE handle; + LSA_OBJECT_ATTRIBUTES attrs; + PLSA_REFERENCED_DOMAIN_LIST domains; + PLSA_TRANSLATED_SID2 sids; + LSA_UNICODE_STRING name[3]; + LPSTR account, sid_dom; + + if (!pLsaLookupNames2) + { + win_skip("LsaLookupNames2 not avaliable\n"); + return; + } + + if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) + { + skip("Non-english locale (skipping LsaLookupNames2 tests)\n"); + return; + } + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + + status = pLsaOpenPolicy(NULL, &attrs, POLICY_ALL_ACCESS, &handle); + ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "LsaOpenPolicy(POLICY_ALL_ACCESS) returned 0x%08x\n", status); + + /* try a more restricted access mask if necessary */ + if (status == STATUS_ACCESS_DENIED) + { + trace("LsaOpenPolicy(POLICY_ALL_ACCESS) failed, trying POLICY_VIEW_LOCAL_INFORMATION\n"); + status = pLsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &handle); + ok(status == STATUS_SUCCESS, "LsaOpenPolicy(POLICY_VIEW_LOCAL_INFORMATION) returned 0x%08x\n", status); + } + if (status != STATUS_SUCCESS) + { + skip("Cannot acquire policy handle\n"); + return; + } + + name[0].Buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(n1)); + name[0].Length = name[0].MaximumLength = sizeof(n1); + memcpy(name[0].Buffer, n1, sizeof(n1)); + + name[1].Buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(n1)); + name[1].Length = name[1].MaximumLength = sizeof(n1) - sizeof(WCHAR); + memcpy(name[1].Buffer, n1, sizeof(n1) - sizeof(WCHAR)); + + name[2].Buffer = HeapAlloc(GetProcessHeap(), 0, sizeof(n2)); + name[2].Length = name[2].MaximumLength = sizeof(n2); + memcpy(name[2].Buffer, n2, sizeof(n2)); + + /* account name only */ + sids = NULL; + domains = NULL; + status = pLsaLookupNames2(handle, 0, 1, &name[0], &domains, &sids); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %x)\n", status); + ok(sids[0].Use == SidTypeWellKnownGroup, "expected SidTypeWellKnownGroup, got %u\n", sids[0].Use); + ok(sids[0].Flags == 0, "expected 0, got 0x%08x\n", sids[0].Flags); + todo_wine ok(domains->Entries == 1, "expected 1, got %u\n", domains->Entries); + get_sid_info(sids[0].Sid, &account, &sid_dom); + ok(!strcmp(account, "LOCAL SERVICE"), "expected \"LOCAL SERVICE\", got \"%s\"\n", account); + ok(!strcmp(sid_dom, "NT AUTHORITY"), "expected \"NT AUTHORITY\", got \"%s\"\n", sid_dom); + pLsaFreeMemory(sids); + pLsaFreeMemory(domains); + + /* unknown account name */ + sids = NULL; + domains = NULL; + status = pLsaLookupNames2(handle, 0, 1, &name[1], &domains, &sids); + ok(status == STATUS_NONE_MAPPED, "expected STATUS_NONE_MAPPED, got %x)\n", status); + ok(sids[0].Use == SidTypeUnknown, "expected SidTypeUnknown, got %u\n", sids[0].Use); + ok(sids[0].Flags == 0, "expected 0, got 0x%08x\n", sids[0].Flags); + ok(domains->Entries == 0, "expected 0, got %u\n", domains->Entries); + pLsaFreeMemory(sids); + pLsaFreeMemory(domains); + + /* account + domain */ + sids = NULL; + domains = NULL; + status = pLsaLookupNames2(handle, 0, 1, &name[2], &domains, &sids); + ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %x)\n", status); + ok(sids[0].Use == SidTypeWellKnownGroup, "expected SidTypeWellKnownGroup, got %u\n", sids[0].Use); + ok(sids[0].Flags == 0, "expected 0, got 0x%08x\n", sids[0].Flags); + todo_wine ok(domains->Entries == 1, "expected 1, got %u\n", domains->Entries); + get_sid_info(sids[0].Sid, &account, &sid_dom); + ok(!strcmp(account, "LOCAL SERVICE"), "expected \"LOCAL SERVICE\", got \"%s\"\n", account); + ok(!strcmp(sid_dom, "NT AUTHORITY"), "expected \"NT AUTHORITY\", got \"%s\"\n", sid_dom); + pLsaFreeMemory(sids); + pLsaFreeMemory(domains); + + /* all three */ + sids = NULL; + domains = NULL; + status = pLsaLookupNames2(handle, 0, 3, name, &domains, &sids); + ok(status == STATUS_SOME_NOT_MAPPED, "expected STATUS_SOME_NOT_MAPPED, got %x)\n", status); + ok(sids[0].Use == SidTypeWellKnownGroup, "expected SidTypeWellKnownGroup, got %u\n", sids[0].Use); + ok(sids[1].Use == SidTypeUnknown, "expected SidTypeUnknown, got %u\n", sids[0].Use); + ok(sids[2].Use == SidTypeWellKnownGroup, "expected SidTypeWellKnownGroup, got %u\n", sids[0].Use); + todo_wine ok(sids[0].DomainIndex == 0, "expected 0, got %u\n", sids[0].DomainIndex); + todo_wine ok(domains->Entries == 1, "expected 1, got %u\n", domains->Entries); + pLsaFreeMemory(sids); + pLsaFreeMemory(domains); + + HeapFree(GetProcessHeap(), 0, name[0].Buffer); + HeapFree(GetProcessHeap(), 0, name[1].Buffer); + HeapFree(GetProcessHeap(), 0, name[2].Buffer); + + status = pLsaClose(handle); + ok(status == STATUS_SUCCESS, "LsaClose() failed, returned 0x%08x\n", status); +} + START_TEST(lsa) { if (!init()) { @@ -224,4 +359,5 @@ START_TEST(lsa) } test_lsa(); + test_LsaLookupNames2(); }

1 0

Hans Leidekker : advapi32: Add a basic implementation of LsaLookupNames2.
by Alexandre Julliard 07 Aug '09

07 Aug '09

Module: wine Branch: master Commit: bf021af0eedc30cc8c6cc77b090563218f4ee989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf021af0eedc30cc8c6cc77b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 7 08:36:20 2009 +0200 advapi32: Add a basic implementation of LsaLookupNames2. --- dlls/advapi32/lsa.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 77 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index ffc7cfd..66727ba 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -299,19 +299,88 @@ NTSTATUS WINAPI LsaLookupNames( return STATUS_NONE_MAPPED; } +static BOOL lookup_name( LSA_UNICODE_STRING *name, SID *sid, DWORD *sid_size, WCHAR *domain, + DWORD *domain_size, SID_NAME_USE *use, BOOL *handled ) +{ + BOOL ret; + + ret = lookup_local_wellknown_name( name, sid, sid_size, domain, domain_size, use, handled ); + if (!*handled) + ret = lookup_local_user_name( name, sid, sid_size, domain, domain_size, use, handled ); + + return ret; +} + /****************************************************************************** * LsaLookupNames2 [ADVAPI32.@] * */ -NTSTATUS WINAPI LsaLookupNames2( - LSA_HANDLE policy, - ULONG flags, - ULONG count, - PLSA_UNICODE_STRING names, - PLSA_REFERENCED_DOMAIN_LIST *domains, - PLSA_TRANSLATED_SID2 *sids) +NTSTATUS WINAPI LsaLookupNames2( LSA_HANDLE policy, ULONG flags, ULONG count, + PLSA_UNICODE_STRING names, PLSA_REFERENCED_DOMAIN_LIST *domains, + PLSA_TRANSLATED_SID2 *sids ) { - FIXME("(%p,0x%08x,0x%08x,%p,%p,%p) stub\n", policy, flags, count, names, domains, sids); + ULONG i, sid_size_total = 0, domain_size_total = 0, size, num_domains; + ULONG sid_size, domain_size, mapped; + BOOL ret, handled = FALSE; + SID_NAME_USE use; + SID *sid; + + TRACE("(%p,0x%08x,0x%08x,%p,%p,%p)\n", policy, flags, count, names, domains, sids); + + mapped = num_domains = 0; + for (i = 0; i < count; i++) + { + handled = FALSE; + sid_size = domain_size = 0; + ret = lookup_name( &names[i], NULL, &sid_size, NULL, &domain_size, &use, &handled ); + if (handled) + { + sid_size_total += sid_size; + if (domain_size) + { + FIXME("domain not handled\n"); + domain_size_total += domain_size; + num_domains++; + } + mapped++; + } + } + TRACE("mapped %u out of %u\n", mapped, count); + + size = sizeof(LSA_TRANSLATED_SID2) * count + sid_size_total; + if (!(*sids = HeapAlloc( GetProcessHeap(), 0, size) )) return STATUS_NO_MEMORY; + + sid = (SID *)*sids + sizeof(LSA_TRANSLATED_SID2) * mapped; + + if (!(*domains = HeapAlloc( GetProcessHeap(), 0, sizeof(LSA_REFERENCED_DOMAIN_LIST) ))) + { + HeapFree( GetProcessHeap(), 0, *sids ); + return STATUS_NO_MEMORY; + } + (*domains)->Entries = 0; + (*domains)->Domains = NULL; + + for (i = 0; i < count; i++) + { + (*sids)[i].Use = SidTypeUnknown; + (*sids)[i].DomainIndex = -1; + (*sids)[i].Flags = 0; + + handled = FALSE; + sid_size = sid_size_total; + ret = lookup_name( &names[i], sid, &sid_size, NULL, &domain_size, &use, &handled ); + if (handled) + { + (*sids)[i].Sid = sid; + (*sids)[i].Use = use; + + sid += sid_size; + sid_size_total -= sid_size; + } + } + + if (mapped == count) return STATUS_SUCCESS; + if (mapped > 0 && mapped < count) return STATUS_SOME_NOT_MAPPED; return STATUS_NONE_MAPPED; }

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