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

Mikolaj Zalewski : user32: Static controls should have a clipping region set while sending the WM_CTLCOLORSTATIC .
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 613cfc2870a2f351919b22957788174511409fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=613cfc2870a2f351919b22957… Author: Mikolaj Zalewski <mikolajz(a)google.com> Date: Wed Aug 29 10:36:41 2007 -0700 user32: Static controls should have a clipping region set while sending the WM_CTLCOLORSTATIC. --- dlls/user32/static.c | 38 ++++++++++++ dlls/user32/tests/Makefile.in | 1 + dlls/user32/tests/static.c | 130 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 8afaca1..bb6abfb 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -111,6 +111,33 @@ const struct builtin_class_descr STATIC_builtin_class = 0 /* brush */ }; +static void setup_clipping(HWND hwnd, HDC hdc, HRGN *orig) +{ + RECT rc; + HRGN hrgn; + + /* Native control has always a clipping region set (this may be because + * builtin controls uses CS_PARENTDC) and an application depends on it + */ + hrgn = CreateRectRgn(0, 0, 1, 1); + if (GetClipRgn(hdc, hrgn) != 1) + { + DeleteObject(hrgn); + *orig = NULL; + } else + *orig = hrgn; + + GetClientRect(hwnd, &rc); + DPtoLP(hdc, (POINT *)&rc, 2); + IntersectClipRect(hdc, rc.left, rc.top, rc.right, rc.bottom); +} + +static void restore_clipping(HDC hdc, HRGN hrgn) +{ + SelectClipRgn(hdc, hrgn); + if (hrgn != NULL) + DeleteObject(hrgn); +} /*********************************************************************** * STATIC_SetIcon @@ -315,8 +342,12 @@ static VOID STATIC_TryPaintFcn(HWND hwnd, LONG full_style) if (!IsRectEmpty(&rc) && IsWindowVisible(hwnd) && staticPaintFunc[style]) { HDC hdc; + HRGN hOrigClipping; + hdc = GetDC( hwnd ); + setup_clipping(hwnd, hdc, &hOrigClipping); (staticPaintFunc[style])( hwnd, hdc, full_style ); + restore_clipping(hdc, hOrigClipping); ReleaseDC( hwnd, hdc ); } } @@ -413,7 +444,12 @@ static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, PAINTSTRUCT ps; HDC hdc = wParam ? (HDC)wParam : BeginPaint(hwnd, &ps); if (staticPaintFunc[style]) + { + HRGN hOrigClipping; + setup_clipping(hwnd, hdc, &hOrigClipping); (staticPaintFunc[style])( hwnd, hdc, full_style ); + restore_clipping(hdc, hOrigClipping); + } if (!wParam) EndPaint(hwnd, &ps); } break; @@ -721,6 +757,7 @@ static void STATIC_PaintRectfn( HWND hwnd, HDC hdc, DWORD style ) GetClientRect( hwnd, &rc); + /* FIXME: send WM_CTLCOLORSTATIC */ switch (style & SS_TYPEMASK) { case SS_BLACKRECT: @@ -865,6 +902,7 @@ static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ) { RECT rc; + /* FIXME: sometimes (not always) sends WM_CTLCOLORSTATIC */ GetClientRect( hwnd, &rc ); switch (style & SS_TYPEMASK) { diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in index 505d62d..40fec5b 100644 --- a/dlls/user32/tests/Makefile.in +++ b/dlls/user32/tests/Makefile.in @@ -21,6 +21,7 @@ CTESTS = \ monitor.c \ msg.c \ resource.c \ + static.c \ sysparams.c \ text.c \ win.c \ diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c new file mode 100644 index 0000000..7810db4 --- /dev/null +++ b/dlls/user32/tests/static.c @@ -0,0 +1,130 @@ +/* Unit test suite for static controls. + * + * Copyright 2007 Google (Mikolaj Zalewski) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> + +#define STRICT +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +#include "wine/test.h" + +#define TODO_COUNT 1 + +#define CTRL_ID 1995 + +static HWND hMainWnd; + +#define expect_eq(expr, value, type, fmt) { type val = expr; ok(val == (value), #expr " expected " #fmt " got " #fmt "\n", (value), val); } +#define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \ + r.bottom == _bottom && r.right == _right, "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", \ + r.left, r.top, r.right, r.bottom, _left, _top, _right, _bottom); + +int g_nReceivedColorStatic = 0; + +static HWND build_static(DWORD style) +{ + return CreateWindow("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0); +} + +static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_CTLCOLORSTATIC: + { + HDC hdc = (HDC)wparam; + HRGN hrgn = CreateRectRgn(0, 0, 1, 1); + ok(GetClipRgn(hdc, hrgn) == 1, "Static controls during a WM_CTLCOLORSTATIC must have a clipping region\n"); + DeleteObject(hrgn); + g_nReceivedColorStatic++; + } + break; + } + + return DefWindowProc(hwnd, msg, wparam, lparam); +} + +void test_updates(int style, int flags) +{ + RECT r1 = {20, 20, 30, 30}; + HWND hStatic = build_static(style); + int exp; + + trace("Testing style 0x%x\n", style); + g_nReceivedColorStatic = 0; + /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */ + InvalidateRect(hMainWnd, NULL, FALSE); + UpdateWindow(hMainWnd); + InvalidateRect(hMainWnd, &r1, FALSE); + UpdateWindow(hMainWnd); + InvalidateRect(hStatic, &r1, FALSE); + UpdateWindow(hStatic); + InvalidateRect(hStatic, NULL, FALSE); + UpdateWindow(hStatic); + + + if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) + exp = 4; + else + exp = 1; /* SS_ETCHED* seems to send WM_CTLCOLORSTATIC only sometimes */ + + if (flags & TODO_COUNT) + todo_wine { expect_eq(g_nReceivedColorStatic, exp, int, "%d"); } + else + expect_eq(g_nReceivedColorStatic, exp, int, "%d"); + DestroyWindow(hStatic); +} + +START_TEST(static) +{ + static char szClassName[] = "testclass"; + WNDCLASSEX wndclass; + + wndclass.cbSize = sizeof(wndclass); + wndclass.style = CS_HREDRAW | CS_VREDRAW; + wndclass.lpfnWndProc = WndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = 0; + wndclass.hInstance = GetModuleHandle(NULL); + wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION); + wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); + wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH); + wndclass.lpszClassName = szClassName; + wndclass.lpszMenuName = NULL; + RegisterClassEx(&wndclass); + + hMainWnd = CreateWindow(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandle(NULL), NULL); + ShowWindow(hMainWnd, SW_SHOW); + UpdateWindow(hMainWnd); + + test_updates(0, 0); + test_updates(SS_SIMPLE, 0); + test_updates(SS_ICON, 0); + test_updates(SS_BITMAP, 0); + test_updates(SS_BLACKRECT, TODO_COUNT); + test_updates(SS_WHITERECT, TODO_COUNT); + test_updates(SS_ETCHEDHORZ, TODO_COUNT); + test_updates(SS_ETCHEDVERT, TODO_COUNT); + + DestroyWindow(hMainWnd); +}

1 0

Alexandre Julliard : winex11: Set initial wm hints on the desktop window too.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: a2a511836218ff4c97a08745d13e4e141b2af9a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a511836218ff4c97a08745d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 30 12:19:55 2007 +0200 winex11: Set initial wm hints on the desktop window too. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 2b56913..e55fcfd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -992,6 +992,7 @@ static void get_desktop_xwin( Display *display, struct x11drv_win_data *data ) { data->managed = TRUE; SetPropA( data->hwnd, managed_prop, (HANDLE)1 ); + set_initial_wm_hints( display, data ); } } }

1 0

Andrew Talbot : shdocvw: Constify some variables.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 72c3d16d83c44382023b32289b14709c98d04498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72c3d16d83c44382023b32289… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Aug 29 22:20:28 2007 +0100 shdocvw: Constify some variables. --- dlls/shdocvw/navigate.c | 8 ++++---- dlls/shdocvw/shdocvw.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 4c1ccdb..fb71682 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -317,8 +317,8 @@ static IBindStatusCallback *create_callback(DocHost *This, PBYTE post_data, return BINDSC(ret); } -static void on_before_navigate2(DocHost *This, LPWSTR url, PBYTE post_data, ULONG post_data_len, - LPWSTR headers, VARIANT_BOOL *cancel) +static void on_before_navigate2(DocHost *This, LPCWSTR url, const BYTE *post_data, + ULONG post_data_len, LPWSTR headers, VARIANT_BOOL *cancel) { VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers; DISPPARAMS dispparams; @@ -514,8 +514,8 @@ static HRESULT bind_url_to_object(DocHost *This, LPCWSTR url, PBYTE post_data, U return hres; } -HRESULT navigate_url(DocHost *This, BSTR url, VARIANT *Flags, VARIANT *TargetFrameName, - VARIANT *PostData, VARIANT *Headers) +HRESULT navigate_url(DocHost *This, BSTR url, const VARIANT *Flags, + const VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { PBYTE post_data = NULL; ULONG post_data_len = 0; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 5704156..d421025 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -194,7 +194,7 @@ HRESULT WebBrowserV2_Create(IUnknown*,REFIID,void**); void create_doc_view_hwnd(DocHost*); void deactivate_document(DocHost*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); -HRESULT navigate_url(DocHost*,BSTR,VARIANT*,VARIANT*,VARIANT*,VARIANT*); +HRESULT navigate_url(DocHost*,BSTR,const VARIANT*,const VARIANT*,VARIANT*,VARIANT*); HRESULT InternetExplorer_Create(IUnknown*,REFIID,void**); void InternetExplorer_WebBrowser_Init(InternetExplorer*);

1 0

Kai Blin : secur32: Implement LsaLogonUser stub.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 6efe40b3a65dae3c3014e5b6eed79b57f0bae615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6efe40b3a65dae3c3014e5b6e… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Aug 29 22:19:03 2007 +0200 secur32: Implement LsaLogonUser stub. --- dlls/secur32/lsa.c | 15 +++++++++++++++ dlls/secur32/secur32.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index df51013..738253a 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -76,6 +76,21 @@ NTSTATUS WINAPI LsaGetLogonSessionData(PLUID LogonId, return STATUS_SUCCESS; } +NTSTATUS WINAPI LsaLogonUser(HANDLE LsaHandle, PLSA_STRING OriginName, + SECURITY_LOGON_TYPE LogonType, ULONG AuthenticationPackage, + PVOID AuthenticationInformation, ULONG AuthenticationInformationLength, + PTOKEN_GROUPS LocalGroups, PTOKEN_SOURCE SourceContext, + PVOID* ProfileBuffer, PULONG ProfileBufferLength, PLUID LogonId, + PHANDLE Token, PQUOTA_LIMITS Quotas, PNTSTATUS SubStatus) +{ + FIXME("%p %p %d %d %p %d %p %p %p %p %p %p %p %p stub\n", LsaHandle, + OriginName, LogonType, AuthenticationPackage, + AuthenticationInformation, AuthenticationInformationLength, + LocalGroups, SourceContext, ProfileBuffer, ProfileBufferLength, + LogonId, Token, Quotas, SubStatus); + return STATUS_SUCCESS; +} + NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, PLSA_STRING PackageName, PULONG AuthenticationPackage) { diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index a71fee6..d237dec 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -38,7 +38,7 @@ @ stdcall LsaEnumerateLogonSessions(ptr ptr) @ stdcall LsaFreeReturnBuffer(ptr) @ stdcall LsaGetLogonSessionData(ptr ptr) -@ stub LsaLogonUser +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) @ stub LsaRegisterLogonProcess @ stub LsaRegisterPolicyChangeNotification

1 0

Kai Blin : secur32: Implement LsaFreeReturnBuffer stub.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 8942443a42aaeaeb8946823f3f154f73f1d906a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8942443a42aaeaeb8946823f3… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Aug 29 22:18:44 2007 +0200 secur32: Implement LsaFreeReturnBuffer stub. --- dlls/secur32/lsa.c | 6 ++++++ dlls/secur32/secur32.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 8f76206..db0d61e 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -63,6 +63,12 @@ NTSTATUS WINAPI LsaEnumerateLogonSessions(PULONG LogonSessionCount, return STATUS_SUCCESS; } +NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID Buffer) +{ + FIXME("%p stub\n", Buffer); + return STATUS_SUCCESS; +} + NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, PLSA_STRING PackageName, PULONG AuthenticationPackage) { diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 16ce8de..9e3be02 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -36,7 +36,7 @@ @ stdcall LsaConnectUntrusted(long) @ stdcall LsaDeregisterLogonProcess(long) @ stdcall LsaEnumerateLogonSessions(ptr ptr) -@ stub LsaFreeReturnBuffer +@ stdcall LsaFreeReturnBuffer(ptr) @ stub LsaGetLogonSessionData @ stub LsaLogonUser @ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr)

1 0

Kai Blin : secur32: Implement LsaGetLogonSessionData stub.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 0c6e2c20bda4a18baa58bc1ca3550a2fc4358b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6e2c20bda4a18baa58bc1ca… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Aug 29 22:18:54 2007 +0200 secur32: Implement LsaGetLogonSessionData stub. --- dlls/secur32/lsa.c | 7 +++++++ dlls/secur32/secur32.spec | 2 +- include/ntsecapi.h | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index db0d61e..df51013 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -69,6 +69,13 @@ NTSTATUS WINAPI LsaFreeReturnBuffer(PVOID Buffer) return STATUS_SUCCESS; } +NTSTATUS WINAPI LsaGetLogonSessionData(PLUID LogonId, + PSECURITY_LOGON_SESSION_DATA* ppLogonSessionData) +{ + FIXME("%p %p stub\n", LogonId, ppLogonSessionData); + return STATUS_SUCCESS; +} + NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, PLSA_STRING PackageName, PULONG AuthenticationPackage) { diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 9e3be02..a71fee6 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -37,7 +37,7 @@ @ stdcall LsaDeregisterLogonProcess(long) @ stdcall LsaEnumerateLogonSessions(ptr ptr) @ stdcall LsaFreeReturnBuffer(ptr) -@ stub LsaGetLogonSessionData +@ stdcall LsaGetLogonSessionData(ptr ptr) @ stub LsaLogonUser @ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) @ stub LsaRegisterLogonProcess diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 8ef6167..cedd20c 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -235,6 +235,21 @@ typedef struct _POLICY_MODIFICATION_INFO LARGE_INTEGER DatabaseCreationTime; } POLICY_MODIFICATION_INFO, *PPOLICY_MODIFICATION_INFO; +typedef struct _SECURITY_LOGON_SESSION_DATA { + ULONG Size; + LUID LogonId; + LSA_UNICODE_STRING UserName; + LSA_UNICODE_STRING LogonDomain; + LSA_UNICODE_STRING AuthenticationPackage; + ULONG LogonType; + ULONG Session; + PSID Sid; + LARGE_INTEGER LogonTime; + LSA_UNICODE_STRING LogonServer; + LSA_UNICODE_STRING DnsDomainName; + LSA_UNICODE_STRING Upn; +} SECURITY_LOGON_SESSION_DATA, *PSECURITY_LOGON_SESSION_DATA; + typedef struct { SID_NAME_USE Use;

1 0

Kai Blin : secur32: Implement LsaEnumerateLogonSessions stub.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: d1339bc0fadd1b33408fbfcc7d05be1b4f5ab4ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1339bc0fadd1b33408fbfcc7… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Aug 29 22:18:36 2007 +0200 secur32: Implement LsaEnumerateLogonSessions stub. --- dlls/secur32/lsa.c | 10 ++++++++++ dlls/secur32/secur32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 9529be8..8f76206 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -53,6 +53,16 @@ NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE LsaHandle) return STATUS_SUCCESS; } +NTSTATUS WINAPI LsaEnumerateLogonSessions(PULONG LogonSessionCount, + PLUID* LogonSessionList) +{ + FIXME("%p %p stub\n", LogonSessionCount, LogonSessionList); + *LogonSessionCount = 0; + *LogonSessionList = NULL; + + return STATUS_SUCCESS; +} + NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, PLSA_STRING PackageName, PULONG AuthenticationPackage) { diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index d6dc936..16ce8de 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -35,7 +35,7 @@ @ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) @ stdcall LsaConnectUntrusted(long) @ stdcall LsaDeregisterLogonProcess(long) -@ stub LsaEnumerateLogonSessions +@ stdcall LsaEnumerateLogonSessions(ptr ptr) @ stub LsaFreeReturnBuffer @ stub LsaGetLogonSessionData @ stub LsaLogonUser

1 0

Kai Blin : secur32: Implement LsaLookupAuthenticationPackage stub.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: ae06588d9b9774b8e8716ae15e4146a047a86f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae06588d9b9774b8e8716ae15… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Aug 29 22:18:24 2007 +0200 secur32: Implement LsaLookupAuthenticationPackage stub. --- dlls/secur32/Makefile.in | 1 + dlls/secur32/lsa.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ dlls/secur32/secur32.c | 23 ---------------- dlls/secur32/secur32.spec | 2 +- 4 files changed, 64 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 45043d3..43efc1c 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ base64_codec.c \ dispatcher.c \ hmac_md5.c \ + lsa.c \ negotiate.c \ ntlm.c \ schannel.c \ diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c new file mode 100644 index 0000000..9529be8 --- /dev/null +++ b/dlls/secur32/lsa.c @@ -0,0 +1,62 @@ +/* Copyright (C) 2004 Juan Lang + * Copyright (C) 2007 Kai Blin + * + * Local Security Authority functions, as far as secur32 has them. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "ntsecapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsa); + +NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE LsaHandle, + ULONG AuthenticationPackage, PVOID ProtocolSubmitBuffer, + ULONG SubmitBufferLength, PVOID* ProtocolReturnBuffer, + PULONG ReturnBufferLength, PNTSTATUS ProtocolStatus) +{ + FIXME("%p %d %p %d %p %p %p stub\n", LsaHandle, AuthenticationPackage, + ProtocolSubmitBuffer, SubmitBufferLength, ProtocolReturnBuffer, + ReturnBufferLength, ProtocolStatus); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) +{ + FIXME("%p stub\n", LsaHandle); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE LsaHandle) +{ + FIXME("%p stub\n", LsaHandle); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE LsaHandle, + PLSA_STRING PackageName, PULONG AuthenticationPackage) +{ + FIXME("%p %p %p stub\n", LsaHandle, PackageName, AuthenticationPackage); + AuthenticationPackage = NULL; + return STATUS_SUCCESS; +} diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 2e12c66..1e040ea 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -1050,29 +1050,6 @@ BOOLEAN WINAPI GetUserNameExW( return FALSE; } -NTSTATUS WINAPI LsaCallAuthenticationPackage( - HANDLE LsaHandle, ULONG AuthenticationPackage, PVOID ProtocolSubmitBuffer, - ULONG SubmitBufferLength, PVOID* ProtocolReturnBuffer, PULONG ReturnBufferLength, - PNTSTATUS ProtocolStatus) -{ - FIXME("%p %d %p %d %p %p %p\n", LsaHandle, AuthenticationPackage, - ProtocolSubmitBuffer, SubmitBufferLength, ProtocolReturnBuffer, - ReturnBufferLength, ProtocolStatus); - return 0; -} - -NTSTATUS WINAPI LsaConnectUntrusted(PHANDLE LsaHandle) -{ - FIXME("%p\n", LsaHandle); - return 0; -} - -NTSTATUS WINAPI LsaDeregisterLogonProcess(HANDLE LsaHandle) -{ - FIXME("%p\n", LsaHandle); - return 0; -} - BOOLEAN WINAPI TranslateNameA( LPCSTR lpAccountName, EXTENDED_NAME_FORMAT AccountNameFormat, EXTENDED_NAME_FORMAT DesiredNameFormat, LPSTR lpTranslatedName, diff --git a/dlls/secur32/secur32.spec b/dlls/secur32/secur32.spec index 5e73003..d6dc936 100644 --- a/dlls/secur32/secur32.spec +++ b/dlls/secur32/secur32.spec @@ -39,7 +39,7 @@ @ stub LsaFreeReturnBuffer @ stub LsaGetLogonSessionData @ stub LsaLogonUser -@ stub LsaLookupAuthenticationPackage +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) @ stub LsaRegisterLogonProcess @ stub LsaRegisterPolicyChangeNotification @ stub LsaUnregisterPolicyChangeNotification

1 0

Kai Blin : secur32: Give a hint where to find ntlm_auth.
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: 78b047e4e40d3e27e6961f8ab639f5a9297c8768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b047e4e40d3e27e6961f8ab… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Aug 29 22:37:27 2007 +0200 secur32: Give a hint where to find ntlm_auth. --- dlls/secur32/ntlm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 21fbc59..7924156 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1868,6 +1868,9 @@ void SECUR32_initNTLMSP(void) MIN_NTLM_AUTH_MAJOR_VERSION, MIN_NTLM_AUTH_MINOR_VERSION, MIN_NTLM_AUTH_MICRO_VERSION); + ERR("Usually, you can find it in the winbind package of your " + "distribution.\n"); + } cleanup_helper(helper); }

1 0

Francois Gouget : gdiplus: Add some missing or related prototypes and types .
by Alexandre Julliard 30 Aug '07

30 Aug '07

Module: wine Branch: master Commit: b6b97b1efa2342b5fd7efca0f2b2d2246c50dbeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6b97b1efa2342b5fd7efca0f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 29 21:42:01 2007 +0200 gdiplus: Add some missing or related prototypes and types. Fix the GdipDrawRectangles() prototype. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/image.c | 2 - include/gdiplusflat.h | 67 ++++++++++++++++++++++++++++++++++++--------- include/gdiplusgpstubs.h | 2 +- include/gdiplusimaging.h | 25 ++++++++++++++++- include/gdiplustypes.h | 1 + 6 files changed, 80 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b6b97b1efa2342b5fd7ef…

1 0