July 2012 - Wine-Commits - list.winehq.org

Austin English : inseng: Add a stub for DllInstall.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: f8077a5697088147c21bb72ec3bf249ea983d42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8077a5697088147c21bb72ec… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jul 5 08:46:22 2012 -0500 inseng: Add a stub for DllInstall. --- dlls/inseng/inseng.spec | 2 +- dlls/inseng/inseng_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/inseng/inseng.spec b/dlls/inseng/inseng.spec index b3a2ce2..82c0b4d 100644 --- a/dlls/inseng/inseng.spec +++ b/dlls/inseng/inseng.spec @@ -3,7 +3,7 @@ @ stdcall CheckTrustEx(ptr ptr ptr ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) -@ stub DllInstall +@ stdcall DllInstall(long wstr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() @ stub DownloadFile diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c index 94e1910..42681c2 100644 --- a/dlls/inseng/inseng_main.c +++ b/dlls/inseng/inseng_main.c @@ -92,3 +92,12 @@ BOOL WINAPI CheckTrustEx( LPVOID a, LPVOID b, LPVOID c, LPVOID d, LPVOID e ) FIXME("%p %p %p %p %p\n", a, b, c, d, e ); return TRUE; } + +/*********************************************************************** + * DllInstall (INSENG.@) + */ +HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline) +{ + FIXME("(%s, %s): stub\n", bInstall ? "TRUE" : "FALSE", debugstr_w(cmdline)); + return S_OK; +}

1 0

Jacek Caban : ieframe: Added more DoVerb tests.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 4bc259951b4bc0cb0a345e061482e3b538be53b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bc259951b4bc0cb0a345e061… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 9 17:46:10 2012 +0200 ieframe: Added more DoVerb tests. --- dlls/ieframe/tests/webbrowser.c | 95 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 12d2bba..6711c77 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -1753,8 +1753,7 @@ static HWND create_container_window(void) RegisterClassExW(&wndclass); return CreateWindowW(wszWebBrowserContainer, wszWebBrowserContainer, - WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, NULL, NULL, NULL, NULL); + WS_OVERLAPPEDWINDOW, 10, 10, 600, 600, NULL, NULL, NULL, NULL); } static void test_DoVerb(IUnknown *unk) @@ -1805,6 +1804,40 @@ static void test_DoVerb(IUnknown *unk) IOleObject_Release(oleobj); } +static void call_DoVerb(IUnknown *unk, LONG verb) +{ + IOleObject *oleobj; + RECT rect = {60,60,600,600}; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "QueryInterface(IID_OleObject) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + hres = IOleObject_DoVerb(oleobj, verb, NULL, &ClientSite, + -1, container_hwnd, &rect); + ok(hres == S_OK, "DoVerb failed: %08x\n", hres); + + IOleObject_Release(oleobj); +} + +static HWND get_hwnd(IUnknown *unk) +{ + IOleInPlaceObject *inplace; + HWND hwnd; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IOleInPlaceObject, (void**)&inplace); + ok(hres == S_OK, "QueryInterface(IID_OleInPlaceObject) failed: %08x\n", hres); + + hres = IOleInPlaceObject_GetWindow(inplace, &hwnd); + ok(hres == S_OK, "GetWindow failed: %08x\n", hres); + + IOleInPlaceObject_Release(inplace); + return hwnd; +} + static void test_GetMiscStatus(IOleObject *oleobj) { DWORD st, i; @@ -3423,6 +3456,62 @@ static void test_WebBrowser_slim_container(void) ok(ref == 0, "ref=%d, expected 0\n", ref); } +static void test_WebBrowser_DoVerb(void) +{ + IUnknown *unk = NULL; + HRESULT hres; + RECT rect; + HWND hwnd; + ULONG ref; + BOOL res; + + is_downloading = FALSE; + is_first_load = TRUE; + use_container_olecmd = FALSE; + + if (FAILED(create_WebBrowser(&unk))) + return; + hres = IUnknown_QueryInterface(unk, &IID_IWebBrowser2, (void**)&wb); + ok(hres == S_OK, "QueryInterface(IID_IWebBrowser) failed: %08x\n", hres); + if(FAILED(hres)) + return; + + test_ClientSite(unk, &ClientSite, FALSE); + + SET_EXPECT(CanInPlaceActivate); + SET_EXPECT(Site_GetWindow); + SET_EXPECT(OnInPlaceActivate); + SET_EXPECT(GetWindowContext); + SET_EXPECT(ShowObject); + SET_EXPECT(GetContainer); + SET_EXPECT(Frame_GetWindow); + call_DoVerb(unk, OLEIVERB_INPLACEACTIVATE); + CHECK_CALLED(CanInPlaceActivate); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(OnInPlaceActivate); + CHECK_CALLED(GetWindowContext); + CHECK_CALLED(ShowObject); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Frame_GetWindow); + + hwnd = get_hwnd(unk); + + memset(&rect, 0xa, sizeof(rect)); + res = GetWindowRect(hwnd, &rect); + ok(res, "GetWindowRect failed: %u\n", GetLastError()); + + SET_EXPECT(OnInPlaceDeactivate); + call_DoVerb(unk, OLEIVERB_HIDE); + CHECK_CALLED(OnInPlaceDeactivate); + + test_ClientSite(unk, NULL, FALSE); + + IWebBrowser2_Release(wb); + ref = IUnknown_Release(unk); + ok(ref == 0, "ref=%d, expected 0\n", ref); +} + + /* Check if Internet Explorer is configured to run in "Enhanced Security Configuration" (aka hardened mode) */ /* Note: this code is duplicated in dlls/mshtml/tests/mshtml_test.h and dlls/urlmon/tests/sec_mgr.c */ static BOOL is_ie_hardened(void) @@ -3461,6 +3550,8 @@ START_TEST(webbrowser) win_skip("Skipping http tests in hardened mode\n"); } + trace("Testing WebBrowser DoVerb\n"); + test_WebBrowser_DoVerb(); trace("Testing WebBrowser (with close)...\n"); test_WebBrowser(TRUE, TRUE); trace("Testing WebBrowser w/o container-based olecmd...\n");

1 0

Huw Davies : winspool: Don't assume that CUPS is available.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: c4457ec19142392bd06014489cb6bac7cc98b5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4457ec19142392bd06014489… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 9 13:28:32 2012 +0100 winspool: Don't assume that CUPS is available. --- dlls/winspool.drv/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index bb530de..8027a1a 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -801,6 +801,8 @@ static http_status_t cupsGetPPD3_wrapper( http_t *http, const char *name, if (pcupsGetPPD3) return pcupsGetPPD3( http, name, modtime, buffer, bufsize ); + if (!pcupsGetPPD) return HTTP_NOT_FOUND; + TRACE( "No cupsGetPPD3 implementation, so calling cupsGetPPD\n" ); *modtime = 0;

1 0

Nikolay Sivov : msxml3: Remove unneeded xmlInitParser call.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 9a28ac8f7b9923829f3ae67ff0309772fe042028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a28ac8f7b9923829f3ae67ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:53:20 2012 +0400 msxml3: Remove unneeded xmlInitParser call. --- dlls/msxml3/domdoc.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 5711daf..cbbebf2 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -488,7 +488,6 @@ static xmlDocPtr doparse(domdoc* This, char const* ptr, int len, xmlCharEncoding xmlSAX2EndElementNs, /* endElementNs */ sax_serror /* serror */ }; - xmlInitParser(); pctx = xmlCreateMemoryParserCtxt(ptr, len); if (!pctx)

1 0

Hans Leidekker : setupapi: SetupInstallServicesFromInfSection doesn' t fail if there are no AddService or DelService directives in the section.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: da922769c5536932185d7bfce604ee1b7885b75d URL: http://source.winehq.org/git/wine.git/?a=commit;h=da922769c5536932185d7bfce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:07:37 2012 +0200 setupapi: SetupInstallServicesFromInfSection doesn't fail if there are no AddService or DelService directives in the section. --- dlls/setupapi/install.c | 13 ++++++++----- dlls/setupapi/tests/install.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 874b4a9..1c8236a 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -1447,12 +1447,16 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR SC_HANDLE scm; INFCONTEXT context; INT section_flags; - BOOL ok, ret = FALSE; + BOOL ok, ret = TRUE; + if (!(ok = SetupFindFirstLineW( hinf, section, NULL, &context ))) + { + SetLastError( ERROR_SECTION_NOT_FOUND ); + return FALSE; + } if (!(scm = OpenSCManagerW( NULL, NULL, SC_MANAGER_ALL_ACCESS ))) return FALSE; - if (!(ok = SetupFindFirstLineW( hinf, section, AddService, &context ))) - SetLastError( ERROR_SECTION_NOT_FOUND ); + ok = SetupFindFirstLineW( hinf, section, AddService, &context ); while (ok) { if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) @@ -1465,8 +1469,7 @@ BOOL WINAPI SetupInstallServicesFromInfSectionW( HINF hinf, PCWSTR section, DWOR ok = SetupFindNextMatchLineW( &context, AddService, &context ); } - if (!(ok = SetupFindFirstLineW( hinf, section, DelService, &context ))) - SetLastError( ERROR_SECTION_NOT_FOUND ); + ok = SetupFindFirstLineW( hinf, section, DelService, &context ); while (ok) { if (!SetupGetStringFieldW( &context, 1, service_name, MAX_INF_STRING_LENGTH, NULL )) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index 1c204b5..a2fa00b 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -322,6 +322,20 @@ static void test_install_svc_from(void) CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); + strcpy(inf, "[Version]\nSignature=\"$Chicago$\"\n"); + strcat(inf, "[XSP.InstallPerVer]\n"); + strcat(inf, "AddReg=AspEventlogMsg.Reg,Perf.Reg,AspVersions.Reg,FreeADO.Reg,IndexServer.Reg\n"); + create_inf_file(inffile, inf); + sprintf(path, "%s\\%s", CURR_DIR, inffile); + infhandle = SetupOpenInfFileA(path, NULL, INF_STYLE_WIN4, NULL); + + SetLastError(0xdeadbeef); + ret = SetupInstallServicesFromInfSectionA(infhandle, "XSP.InstallPerVer", 0); + ok(ret, "Expected success\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %08x\n", GetLastError()); + SetupCloseInfFile(infhandle); + DeleteFile(inffile); + /* TODO: Test the Flags */ }

1 0

Hans Leidekker : msi: Don't hard-code the ServicePackLevel property.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 32fa9db88863485059d2d1aeb55137e81abf7cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fa9db88863485059d2d1aeb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 9 11:08:37 2012 +0200 msi: Don't hard-code the ServicePackLevel property. --- dlls/msi/package.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 4944065..1115942 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -666,12 +666,11 @@ done: static VOID set_installer_properties(MSIPACKAGE *package) { - WCHAR pth[MAX_PATH]; WCHAR *ptr; OSVERSIONINFOEXW OSVersion; MEMORYSTATUSEX msex; DWORD verval, len; - WCHAR verstr[10], bufstr[20]; + WCHAR pth[MAX_PATH], verstr[11], bufstr[22]; HDC dc; HKEY hkey; LPWSTR username, companyname; @@ -701,14 +700,13 @@ static VOID set_installer_properties(MSIPACKAGE *package) static const WCHAR szVersion9x[] = {'V','e','r','s','i','o','n','9','X',0}; static const WCHAR szVersionNT[] = {'V','e','r','s','i','o','n','N','T',0}; static const WCHAR szMsiNTProductType[] = {'M','s','i','N','T','P','r','o','d','u','c','t','T','y','p','e',0}; - static const WCHAR szFormat[] = {'%','l','i',0}; + static const WCHAR szFormat[] = {'%','u',0}; + static const WCHAR szFormat2[] = {'%','u','.','%','u',0}; static const WCHAR szWindowsBuild[] = {'W','i','n','d','o','w','s','B','u','i','l','d',0}; static const WCHAR szServicePackLevel[] = {'S','e','r','v','i','c','e','P','a','c','k','L','e','v','e','l',0}; - static const WCHAR szSix[] = {'6',0 }; static const WCHAR szVersionMsi[] = { 'V','e','r','s','i','o','n','M','s','i',0 }; static const WCHAR szVersionDatabase[] = { 'V','e','r','s','i','o','n','D','a','t','a','b','a','s','e',0 }; static const WCHAR szPhysicalMemory[] = { 'P','h','y','s','i','c','a','l','M','e','m','o','r','y',0 }; - static const WCHAR szFormat2[] = {'%','l','i','.','%','l','i',0}; static const WCHAR szScreenX[] = {'S','c','r','e','e','n','X',0}; static const WCHAR szScreenY[] = {'S','c','r','e','e','n','Y',0}; static const WCHAR szColorBits[] = {'C','o','l','o','r','B','i','t','s',0}; @@ -871,8 +869,8 @@ static VOID set_installer_properties(MSIPACKAGE *package) } sprintfW(verstr, szFormat, OSVersion.dwBuildNumber); msi_set_property(package->db, szWindowsBuild, verstr); - /* just fudge this */ - msi_set_property(package->db, szServicePackLevel, szSix); + sprintfW(verstr, szFormat, OSVersion.wServicePackMajor); + msi_set_property(package->db, szServicePackLevel, verstr); sprintfW( bufstr, szFormat2, MSI_MAJORVERSION, MSI_MINORVERSION); msi_set_property( package->db, szVersionMsi, bufstr );

1 0

Henri Verbeet : winex11: Get rid of xrandr.h.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 6c4465f4acadde4e29eff6eb81463c90e27e9c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c4465f4acadde4e29eff6eb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:39 2012 +0200 winex11: Get rid of xrandr.h. --- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 3 --- dlls/winex11.drv/xrandr.c | 15 ++++++++++----- dlls/winex11.drv/xrandr.h | 32 -------------------------------- 4 files changed, 11 insertions(+), 40 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98fe198..9ce0bbd 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -664,6 +664,7 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN; +void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 7118486..8012df3 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -47,7 +47,6 @@ #include "winreg.h" #include "x11drv.h" -#include "xrandr.h" #include "xcomposite.h" #include "wine/server.h" #include "wine/debug.h" @@ -576,10 +575,8 @@ static BOOL process_attach(void) /* initialize XVidMode */ X11DRV_XF86VM_Init(); -#ifdef SONAME_LIBXRANDR /* initialize XRandR */ X11DRV_XRandR_Init(); -#endif #ifdef SONAME_LIBXCOMPOSITE X11DRV_XComposite_Init(); #endif diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f8134fb..4d988ef 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -20,24 +20,22 @@ #include "config.h" #include "wine/port.h" +#include "wine/debug.h" #include <string.h> #include <stdio.h> +WINE_DEFAULT_DEBUG_CHANNEL(xrandr); + #ifdef SONAME_LIBXRANDR #include <X11/Xlib.h> #include <X11/extensions/Xrandr.h> #include "x11drv.h" -#include "xrandr.h" - #include "windef.h" #include "winbase.h" #include "wingdi.h" #include "wine/library.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(xrandr); static void *xrandr_handle; @@ -299,4 +297,11 @@ void X11DRV_XRandR_Init(void) TRACE("Enabling XRandR\n"); } +#else /* SONAME_LIBXRANDR */ + +void X11DRV_XRandR_Init(void) +{ + TRACE("XRandR support not compiled in.\n"); +} + #endif /* SONAME_LIBXRANDR */ diff --git a/dlls/winex11.drv/xrandr.h b/dlls/winex11.drv/xrandr.h deleted file mode 100644 index 7a12fbb..0000000 --- a/dlls/winex11.drv/xrandr.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Wine X11drv Xrandr interface - * - * Copyright 2003 Alexander James Pasadyn - * - * 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 - */ -#ifndef __WINE_XRANDR_H -#define __WINE_XRANDR_H - -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - -#ifdef SONAME_LIBXRANDR - -void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; - -#endif /* SONAME_LIBXRANDR */ -#endif /* __WINE_XRANDR_H */

1 0

Nikolay Sivov : msxml3: Fix xml declaration output when it' s specified in loaded document (in case of file).
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 41aa34758e18f89b6d912e15177eafba12d10d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41aa34758e18f89b6d912e151… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jul 8 22:51:52 2012 +0400 msxml3: Fix xml declaration output when it's specified in loaded document (in case of file). --- dlls/msxml3/domdoc.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 5ac03e1..5711daf 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2403,6 +2403,8 @@ static HRESULT WINAPI domdoc_save( case VT_BSTR: case VT_BSTR | VT_BYREF: { + int options = get_doc(This)->standalone == -1 ? XML_SAVE_NO_DECL : 0; + /* save with file path */ HANDLE handle = CreateFileW( (V_VT(&destination) & VT_BYREF)? *V_BSTRREF(&destination) : V_BSTR(&destination), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); @@ -2414,7 +2416,7 @@ static HRESULT WINAPI domdoc_save( /* disable top XML declaration */ ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, - handle, NULL, XML_SAVE_NO_DECL); + handle, NULL, options); if (!ctx) { CloseHandle(handle);

1 0

Henri Verbeet : secur32: Only read complete records in schan_InitializeSecurityContextW().
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: 2025e81585abf41bf8f9adb14c13b4dfba9ad691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2025e81585abf41bf8f9adb14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:35 2012 +0200 secur32: Only read complete records in schan_InitializeSecurityContextW(). --- dlls/secur32/schannel.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index af34e66..cc287dc 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -668,6 +668,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct schan_buffers *out_buffers; struct schan_credentials *cred; struct schan_transport transport; + SIZE_T expected_size = ~0UL; SECURITY_STATUS ret; TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, @@ -714,7 +715,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } else { - unsigned int expected_size; + SIZE_T record_size = 0; unsigned char *ptr; SecBuffer *buffer; int idx; @@ -727,17 +728,29 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( return SEC_E_INCOMPLETE_MESSAGE; buffer = &pInput->pBuffers[idx]; - if (buffer->cbBuffer < 5) - return SEC_E_INCOMPLETE_MESSAGE; - ptr = buffer->pvBuffer; - expected_size = 5 + ((ptr[3] << 8) | ptr[4]); - if (buffer->cbBuffer < expected_size) + expected_size = 0; + + while (buffer->cbBuffer > expected_size + 5) + { + record_size = 5 + ((ptr[3] << 8) | ptr[4]); + + if (buffer->cbBuffer < expected_size + record_size) + break; + + expected_size += record_size; + ptr += record_size; + } + + if (!expected_size) { - TRACE("Expected %u bytes, but buffer only contains %u bytes.\n", expected_size, buffer->cbBuffer); + TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + max(6, record_size), buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } + TRACE("Using expected_size %lu.\n", expected_size); + ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX); } @@ -745,6 +758,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( transport.ctx = ctx; init_schan_buffers(&transport.in, pInput, schan_init_sec_ctx_get_next_buffer); + transport.in.limit = expected_size; init_schan_buffers(&transport.out, pOutput, schan_init_sec_ctx_get_next_buffer); schan_imp_set_session_transport(ctx->session, &transport);

1 0

Henri Verbeet : winex11: Get rid of xvidmode.h.
by Alexandre Julliard July 9, 2012

July 9, 2012

Module: wine Branch: master Commit: eafc8d0b3440dc842dc50822aa6d4a49f8662d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafc8d0b3440dc842dc50822a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jul 8 16:06:38 2012 +0200 winex11: Get rid of xvidmode.h. --- dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 5 ----- dlls/winex11.drv/xvidmode.c | 13 +++++++++++-- dlls/winex11.drv/xvidmode.h | 37 ------------------------------------- 4 files changed, 14 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0bfbc6f..98fe198 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -662,6 +662,9 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, unsigned int nmodes, int reserve_depths) DECLSPEC_HIDDEN; +void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; +void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 528715b..7118486 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -47,7 +47,6 @@ #include "winreg.h" #include "x11drv.h" -#include "xvidmode.h" #include "xrandr.h" #include "xcomposite.h" #include "wine/server.h" @@ -575,10 +574,8 @@ static BOOL process_attach(void) xinerama_init( WidthOfScreen(screen), HeightOfScreen(screen) ); X11DRV_Settings_Init(); -#ifdef SONAME_LIBXXF86VM /* initialize XVidMode */ X11DRV_XF86VM_Init(); -#endif #ifdef SONAME_LIBXRANDR /* initialize XRandR */ X11DRV_XRandR_Init(); @@ -625,10 +622,8 @@ static void thread_detach(void) static void process_detach(void) { X11DRV_Clipboard_Cleanup(); -#ifdef SONAME_LIBXXF86VM /* cleanup XVidMode */ X11DRV_XF86VM_Cleanup(); -#endif X11DRV_XRender_Finalize(); /* cleanup GDI */ diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index f452da2..a308fff 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -34,8 +34,6 @@ #include <X11/extensions/xf86vmproto.h> #endif -#include "xvidmode.h" - #include "windef.h" #include "wingdi.h" #include "ddrawi.h" @@ -408,6 +406,17 @@ static BOOL X11DRV_XF86VM_SetGammaRamp(LPDDGAMMARAMP ramp) return ret; } +#else /* SONAME_LIBXXF86VM */ + +void X11DRV_XF86VM_Init(void) +{ + TRACE("XVidMode support not compiled in.\n"); +} + +void X11DRV_XF86VM_Cleanup(void) +{ +} + #endif /* SONAME_LIBXXF86VM */ /*********************************************************************** diff --git a/dlls/winex11.drv/xvidmode.h b/dlls/winex11.drv/xvidmode.h deleted file mode 100644 index ac6ea2e..0000000 --- a/dlls/winex11.drv/xvidmode.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * DirectDraw HAL XVidMode interface - * - * Copyright 2001 TransGaming Technologies, Inc. - * - * 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 - */ -#ifndef __WINE_XVIDMODE_H -#define __WINE_XVIDMODE_H - -#ifndef __WINE_CONFIG_H -# error You must include config.h to use this header -#endif - -#ifdef SONAME_LIBXXF86VM -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" - -void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; -void X11DRV_XF86VM_Cleanup(void) DECLSPEC_HIDDEN; - -#endif /* SONAME_LIBXXF86VM */ -#endif /* __WINE_XVIDMODE_H */

1 0