August 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : widl: Generate a registration script along with the typelib when creating a resource file .
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 4ff0faa67cbc150b1031af927f919c0e438968df URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff0faa67cbc150b1031af927… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 15:15:55 2011 +0200 widl: Generate a registration script along with the typelib when creating a resource file. --- dlls/stdole32.tlb/std_ole_v1.idl | 1 + tools/widl/register.c | 114 ++++++++++++++++++++++++++++++-------- tools/widl/widl.h | 1 + tools/widl/write_msft.c | 1 + tools/wine.inf.in | 15 ----- 5 files changed, 94 insertions(+), 38 deletions(-) diff --git a/dlls/stdole32.tlb/std_ole_v1.idl b/dlls/stdole32.tlb/std_ole_v1.idl index bf9cb7e..45fb3d5 100644 --- a/dlls/stdole32.tlb/std_ole_v1.idl +++ b/dlls/stdole32.tlb/std_ole_v1.idl @@ -20,6 +20,7 @@ [ uuid(00020430-0000-0000-C000-000000000046), + restricted, version(1.0), helpstring("OLE Automation") ] diff --git a/tools/widl/register.c b/tools/widl/register.c index ec573be..c75a6ac 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -77,40 +77,72 @@ static const type_t *find_ps_factory( const statement_list_t *stmts ) return NULL; } -static int write_interface( const type_t *iface, const type_t *ps_factory ) +static void write_interface( const type_t *iface, const type_t *ps_factory ) { const UUID *uuid = get_attrp( iface->attrs, ATTR_UUID ); const UUID *ps_uuid = get_attrp( ps_factory->attrs, ATTR_UUID ); - if (!uuid) return 0; - if (!is_object( iface )) return 0; + if (!uuid) return; + if (!is_object( iface )) return; if (!type_iface_get_inherit(iface)) /* special case for IUnknown */ { - put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), iface->name ); - return 0; + put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), iface->name ); + return; } - if (is_local( iface->attrs )) return 0; - put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), iface->name ); + if (is_local( iface->attrs )) return; + put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), iface->name ); put_str( indent, "{\n" ); indent++; put_str( indent, "NumMethods = s %u\n", count_methods( iface )); put_str( indent, "ProxyStubClsid32 = s '%s'\n", format_uuid( ps_uuid )); indent--; put_str( indent, "}\n" ); - return 1; } -static int write_interfaces( const statement_list_t *stmts, const type_t *ps_factory ) +static void write_interfaces( const statement_list_t *stmts, const type_t *ps_factory ) { const statement_t *stmt; - int count = 0; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) { if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) - count += write_interface( stmt->u.type, ps_factory ); + write_interface( stmt->u.type, ps_factory ); + } +} + +static void write_typelib_interface( const type_t *iface, const typelib_t *typelib ) +{ + const UUID *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const UUID *uuid = get_attrp( iface->attrs, ATTR_UUID ); + unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); + + if (!uuid) return; + if (!is_object( iface )) return; + if (!is_attr( iface->attrs, ATTR_OLEAUTOMATION ) && !is_attr( iface->attrs, ATTR_DISPINTERFACE )) + return; + put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), iface->name ); + put_str( indent, "{\n" ); + indent++; + put_str( indent, "ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'\n" ); + put_str( indent, "ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'\n" ); + if (version) + put_str( indent, "TypeLib = s '%s' { val Version = s '%u.%u' }\n", + format_uuid( typelib_uuid ), MAJORVERSION(version), MINORVERSION(version) ); + else + put_str( indent, "TypeLib = s '%s'", format_uuid( typelib_uuid )); + indent--; + put_str( indent, "}\n" ); +} + +static void write_typelib_interfaces( const typelib_t *typelib ) +{ + const statement_t *stmt; + + if (typelib->stmts) LIST_FOR_EACH_ENTRY( stmt, typelib->stmts, const statement_t, entry ) + { + if (stmt->type == STMT_TYPE && type_get_type( stmt->u.type ) == TYPE_INTERFACE) + write_typelib_interface( stmt->u.type, typelib ); } - return count; } static int write_coclass( const type_t *class, const typelib_t *typelib ) @@ -123,10 +155,10 @@ static int write_coclass( const type_t *class, const typelib_t *typelib ) unsigned int version = get_attrv( class->attrs, ATTR_VERSION ); if (!uuid) return 0; - if (typelib && !threading) return 0; + if (typelib && !threading && !progid) return 0; if (!descr) descr = class->name; - put_str( indent, "ForceRemove '%s' = s '%s'\n", format_uuid( uuid ), descr ); + put_str( indent, "'%s' = s '%s'\n", format_uuid( uuid ), descr ); put_str( indent++, "{\n" ); if (threading) put_str( indent, "InprocServer32 = s '%%MODULE%%' { val ThreadingModel = s '%s' }\n", threading ); @@ -154,11 +186,6 @@ static void write_coclasses( const statement_list_t *stmts, const typelib_t *typ const type_t *type = stmt->u.type; if (type_get_type(type) == TYPE_COCLASS) write_coclass( type, typelib ); } - else if (stmt->type == STMT_LIBRARY) - { - const typelib_t *lib = stmt->u.lib; - write_coclasses( lib->stmts, lib ); - } } } @@ -201,10 +228,6 @@ static void write_progids( const statement_list_t *stmts ) const type_t *type = stmt->u.type; if (type_get_type(type) == TYPE_COCLASS) write_progid( type ); } - else if (stmt->type == STMT_LIBRARY) - { - write_progids( stmt->u.lib->stmts ); - } } } @@ -249,3 +272,48 @@ void write_regscript( const statement_list_t *stmts ) error( "Failed to write to %s\n", regscript_name ); } } + +void output_typelib_regscript( const typelib_t *typelib ) +{ + const UUID *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const char *descr = get_attrp( typelib->attrs, ATTR_HELPSTRING ); + const expr_t *lcid_expr = get_attrp( typelib->attrs, ATTR_LIBLCID ); + unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); + unsigned int flags = 0; + + if (is_attr( typelib->attrs, ATTR_RESTRICTED )) flags |= 1; /* LIBFLAG_FRESTRICTED */ + if (is_attr( typelib->attrs, ATTR_CONTROL )) flags |= 2; /* LIBFLAG_FCONTROL */ + if (is_attr( typelib->attrs, ATTR_HIDDEN )) flags |= 4; /* LIBFLAG_FHIDDEN */ + + put_str( indent, "HKCR\n" ); + put_str( indent++, "{\n" ); + + put_str( indent, "NoRemove Typelib\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove '%s'\n", format_uuid( typelib_uuid )); + put_str( indent++, "{\n" ); + put_str( indent, "'%u.%u' = s '%s'\n", + MAJORVERSION(version), MINORVERSION(version), descr ? descr : typelib->name ); + put_str( indent++, "{\n" ); + put_str( indent, "'%x' { %s = s '%%MODULE%%' }\n", + lcid_expr ? lcid_expr->cval : 0, typelib_kind == SYS_WIN64 ? "win64" : "win32" ); + put_str( indent, "FLAGS = s '%u'\n", flags ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + + put_str( indent, "NoRemove Interface\n" ); + put_str( indent++, "{\n" ); + write_typelib_interfaces( typelib ); + put_str( --indent, "}\n" ); + + put_str( indent, "NoRemove CLSID\n" ); + put_str( indent++, "{\n" ); + write_coclasses( typelib->stmts, typelib ); + put_str( --indent, "}\n" ); + + write_progids( typelib->stmts ); + put_str( --indent, "}\n" ); + + add_output_to_resources( "WINE_REGISTRY", typelib_name ); +} diff --git a/tools/widl/widl.h b/tools/widl/widl.h index 20be1f3..6551fa0 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -86,6 +86,7 @@ extern void write_proxies(const statement_list_t *stmts); extern void write_client(const statement_list_t *stmts); extern void write_server(const statement_list_t *stmts); extern void write_regscript(const statement_list_t *stmts); +extern void output_typelib_regscript( const typelib_t *typelib ); extern void write_local_stubs(const statement_list_t *stmts); extern void write_dlldata(const statement_list_t *stmts); diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 66da286..416f81d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2546,6 +2546,7 @@ static void save_all_changes(msft_typelib_t *typelib) if (strendswith( typelib_name, ".res" )) /* create a binary resource file */ { add_output_to_resources( "TYPELIB", "#1" ); + output_typelib_regscript( typelib->typelib ); flush_output_resources( typelib_name ); } else flush_output_buffer( typelib_name ); diff --git a/tools/wine.inf.in b/tools/wine.inf.in index cfefbe4..af68d8f 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -231,9 +231,6 @@ HKCR,https\shell\open\ddeexec,"NoActivateHandler",2,"" HKCR,https\shell\open\ddeexec\Application,,2,"IExplore" HKCR,https\shell\open\ddeexec\Topic,,2,"WWW_OpenURL" HKCR,mailto\shell\open\command,,2,"%11%\winebrowser %1" -; FIXME: the following should be done by the dll registration -HKCR,TypeLib\{00020430-0000-0000-C000-000000000046}\1.0\0\win16,,,"stdole.tlb" -HKCR,TypeLib\{00020430-0000-0000-C000-000000000046}\1.0\FLAGS,,,"1" HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"Codepage",0x10003,932 HKCR,MIME\Database\Charset\_iso-2022-jp$ESC,"InternetEncoding",0x10003,50221 @@ -2496,19 +2493,9 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 11,,devenum.dll,1 -11,,gameux.dll,1 -11,,hhctrl.ocx,1 -11,,ieframe.dll,1 -11,,jscript.dll,1 11,,mshtml.dll,1 -11,,msi.dll,1 11,,msiexec.exe,1 11,,msisip.dll,1 -11,,msxml.dll,1 -11,,msxml2.dll,1 -11,,msxml3.dll,1 -11,,msxml4.dll,1 -11,,msxml6.dll,1 11,,qcap.dll,1 11,,qmgr.dll,1 11,,quartz.dll,1 @@ -2517,9 +2504,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1 -11,,winhttp.dll,1 11,,wintrust.dll,1 -11,,wuapi.dll,1 11,,iexplore.exe,1 ; 32bit-only fake dlls

1 0

Alexandre Julliard : setupapi: Run registration scripts of fake dlls as they are copied.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 5ec4e8f192a3642d9b982f24392e303ef1e63957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec4e8f192a3642d9b982f243… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 2 13:47:43 2011 +0200 setupapi: Run registration scripts of fake dlls as they are copied. --- dlls/setupapi/fakedll.c | 74 +++++++++++++++++++++++++++++++++++++++++++++- tools/wine.inf.in | 63 +++++++++------------------------------- 2 files changed, 86 insertions(+), 51 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 27d4b8a..0c39935 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -33,6 +33,8 @@ # include <unistd.h> #endif +#define COBJMACROS +#define ATL_INITGUID #define NONAMELESSSTRUCT #define NONAMELESSUNION #include "ntstatus.h" @@ -45,6 +47,8 @@ #include "wine/unicode.h" #include "wine/library.h" #include "wine/debug.h" +#include "ole2.h" +#include "atliface.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -59,6 +63,7 @@ static SIZE_T file_buffer_size; static unsigned int handled_count; static unsigned int handled_total; static char **handled_dlls; +static IRegistrar *registrar; struct dll_info { @@ -465,6 +470,67 @@ static HANDLE create_dest_file( const WCHAR *name ) return h; } +static BOOL CALLBACK register_resource( HMODULE module, LPCWSTR type, LPWSTR name, LONG_PTR arg ) +{ + HRESULT *hr = (HRESULT *)arg; + WCHAR *buffer; + HRSRC rsrc = FindResourceW( module, name, type ); + char *str = LoadResource( module, rsrc ); + DWORD lenW, lenA = SizeofResource( module, rsrc ); + + if (!str) return FALSE; + lenW = MultiByteToWideChar( CP_UTF8, 0, str, lenA, NULL, 0 ) + 1; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) return FALSE; + MultiByteToWideChar( CP_UTF8, 0, str, lenA, buffer, lenW ); + buffer[lenW - 1] = 0; + *hr = IRegistrar_StringRegister( registrar, buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); + return TRUE; +} + +static void register_fake_dll( const WCHAR *name, const void *data, size_t size ) +{ + static const WCHAR atlW[] = {'a','t','l','.','d','l','l',0}; + static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; + static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; + const IMAGE_RESOURCE_DIRECTORY *resdir; + LDR_RESOURCE_INFO info; + HRESULT hr = S_OK; + HMODULE module = (HMODULE)((ULONG_PTR)data | 1); + + info.Type = (ULONG_PTR)regtypeW; + if (LdrFindResourceDirectory_U( module, &info, 1, &resdir )) return; + + if (!registrar) + { + /* create the object by hand since we can't guarantee that atl and ole32 are registered */ + IClassFactory *cf; + HRESULT (WINAPI *pDllGetClassObject)( REFCLSID clsid, REFIID iid, LPVOID *ppv ); + HMODULE atl = LoadLibraryW( atlW ); + + if ((pDllGetClassObject = (void *)GetProcAddress( atl, "DllGetClassObject" ))) + { + hr = pDllGetClassObject( &CLSID_Registrar, &IID_IClassFactory, (void **)&cf ); + if (SUCCEEDED( hr )) + { + hr = IClassFactory_CreateInstance( cf, NULL, &IID_IRegistrar, (void **)&registrar ); + IClassFactory_Release( cf ); + } + } + if (!registrar) + { + ERR( "failed to create IRegistrar: %x\n", hr ); + return; + } + } + + TRACE( "registering %s\n", debugstr_w(name) ); + IRegistrar_ClearReplacements( registrar ); + IRegistrar_AddReplacement( registrar, moduleW, name ); + EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&hr ); + if (FAILED(hr)) ERR( "failed to register %s: %x\n", debugstr_w(name), hr ); +} + /* copy a fake dll file to the dest directory */ static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) { @@ -494,7 +560,8 @@ static void install_fake_dll( WCHAR *dest, char *file, const char *ext ) ret = (WriteFile( h, data, size, &written, NULL ) && written == size); if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(dest), GetLastError() ); CloseHandle( h ); - if (!ret) DeleteFileW( dest ); + if (ret) register_fake_dll( dest, data, size ); + else DeleteFileW( dest ); } } *destname = 0; /* restore it for next file */ @@ -608,7 +675,8 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) DWORD written; ret = (WriteFile( h, buffer, size, &written, NULL ) && written == size); - if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() ); + if (ret) register_fake_dll( name, buffer, size ); + else ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() ); } else { @@ -632,4 +700,6 @@ void cleanup_fake_dlls(void) HeapFree( GetProcessHeap(), 0, handled_dlls ); handled_dlls = NULL; handled_count = handled_total = 0; + if (registrar) IRegistrar_Release( registrar ); + registrar = NULL; } diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 47c5824..cfefbe4 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2489,85 +2489,36 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" [RegisterDllsSection] ;;some dlls have to be registered first -11,,atl.dll,1 -11,,ole32.dll,1 11,,oleaut32.dll,1 11,,shell32.dll,1 -11,,actxprxy.dll,1 -11,,amstream.dll,1 -11,,avifil32.dll,1 -11,,browseui.dll,1 11,,comctl32.dll,2 -11,,comdlg32.dll,1 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 -11,,d3dxof.dll,1 -11,,ddraw.dll,1 -11,,ddrawex.dll,1 11,,devenum.dll,1 -11,,dinput.dll,1 -11,,dinput8.dll,1 -11,,dispex.dll,1 -11,,dmband.dll,1 -11,,dmcompos.dll,1 -11,,dmime.dll,1 -11,,dmloader.dll,1 -11,,dmscript.dll,1 -11,,dmstyle.dll,1 -11,,dmsynth.dll,1 -11,,dmusic.dll,1 -11,,dplayx.dll,1 -11,,dpnet.dll,1 -11,,dsound.dll,1 -11,,dswave.dll,1 -11,,dxdiagn.dll,1 -11,,explorerframe.dll,1 11,,gameux.dll,1 11,,hhctrl.ocx,1 -11,,hlink.dll,1 -11,,hnetcfg.dll,1 11,,ieframe.dll,1 -11,,inetcomm.dll,1 -11,,infosoft.dll,1 -11,,inseng.dll,1 -11,,itss.dll,1 11,,jscript.dll,1 -11,,mlang.dll,1 -11,,mmdevapi.dll,1 -11,,msctf.dll,1 -11,,msdaps.dll,1 11,,mshtml.dll,1 11,,msi.dll,1 11,,msiexec.exe,1 -11,,msimtf.dll,1 11,,msisip.dll,1 -11,,mstask.dll,1 11,,msxml.dll,1 11,,msxml2.dll,1 11,,msxml3.dll,1 11,,msxml4.dll,1 11,,msxml6.dll,1 -11,,objsel.dll,1 -11,,oledb32.dll,1 11,,qcap.dll,1 -11,,qedit.dll,1 11,,qmgr.dll,1 -11,,qmgrprxy.dll,1 11,,quartz.dll,1 -11,,rsaenh.dll,1 -11,,shdocvw.dll,1 -11,,sti.dll,1 11,,urlmon.dll,1 -11,,vbscript.dll,1 -11,,wbemprox.dll,1 11,,wiaservc.dll,1 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1 11,,winhttp.dll,1 11,,wintrust.dll,1 -11,,wmiutils.dll,1 11,,wuapi.dll,1 11,,iexplore.exe,1 @@ -2595,6 +2546,13 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe,- 11,,winetest.exe,- 12,,mountmgr.sys,- +; registration order matters for these +11,,msxml.dll +11,,msxml2.dll +11,,msxml3.dll +11,,msxml4.dll +11,,msxml6.dll +11,,shdocvw.dll 11,,* [FakeDlls] @@ -2614,6 +2572,13 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,mountmgr.sys +; registration order matters for these +11,,msxml.dll +11,,msxml2.dll +11,,msxml3.dll +11,,msxml4.dll +11,,msxml6.dll +11,,shdocvw.dll 10,Microsoft.NET\Framework\v1.1.4322,aspnet_regiis.exe 10,Microsoft.NET\Framework\v1.1.4322,ngen.exe 10,Microsoft.NET\Framework\v1.1.4322,fusion.dll

1 0

Hans Leidekker : winhttp: Execute asynchronous requests in a separate thread.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: e5b8c497efe243a11e447c382a45a51f8b278e1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b8c497efe243a11e447c382… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:23:20 2011 +0200 winhttp: Execute asynchronous requests in a separate thread. --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/request.c | 539 ++++++++++++++++++++++++++-------------------- 2 files changed, 302 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5b8c497efe243a11e447…

1 0

Hans Leidekker : winhttp: Protect access to the request object with a critical section.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 916e3c1cc4c65064f9352eb9b0915d40e24f5781 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916e3c1cc4c65064f9352eb9b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:22:58 2011 +0200 winhttp: Protect access to the request object with a critical section. --- dlls/winhttp/request.c | 282 ++++++++++++++++++++++++++++++++++-------------- 1 files changed, 201 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=916e3c1cc4c65064f9352…

1 0

Nikolay Sivov : advapi32: Basic test for CreateRestrictedToken.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 3dc6226519655696f5dc94e8c28aa5ecb4fb5f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dc6226519655696f5dc94e8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 11:09:18 2011 +0400 advapi32: Basic test for CreateRestrictedToken. --- dlls/advapi32/tests/security.c | 95 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 931f912..a21989c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -115,6 +115,8 @@ static DWORD (WINAPI *pGetSecurityInfo)(HANDLE, SE_OBJECT_TYPE, SECURITY_INFORMA PSID*, PSID*, PACL*, PACL*, PSECURITY_DESCRIPTOR*); static NTSTATUS (WINAPI *pNtAccessCheck)(PSECURITY_DESCRIPTOR, HANDLE, ACCESS_MASK, PGENERIC_MAPPING, PPRIVILEGE_SET, PULONG, PULONG, NTSTATUS*); +static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTRIBUTES, DWORD, + PLUID_AND_ATTRIBUTES, DWORD, PSID_AND_ATTRIBUTES, PHANDLE); static HMODULE hmod; static int myARGC; @@ -157,6 +159,7 @@ static void init(void) pSetEntriesInAclA = (void *)GetProcAddress(hmod, "SetEntriesInAclA"); pSetSecurityDescriptorControl = (void *)GetProcAddress(hmod, "SetSecurityDescriptorControl"); pGetSecurityInfo = (void *)GetProcAddress(hmod, "GetSecurityInfo"); + pCreateRestrictedToken = (void *)GetProcAddress(hmod, "CreateRestrictedToken"); myARGC = winetest_get_mainargs( &myARGV ); } @@ -3868,6 +3871,97 @@ static void test_GetUserNameW(void) ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Last error was %u\n", GetLastError()); } +static void test_CreateRestrictedToken(void) +{ + HANDLE process_token, token, r_token; + PTOKEN_GROUPS token_groups, groups2; + SID_AND_ATTRIBUTES sattr; + BOOL is_member; + DWORD size; + BOOL ret; + DWORD i, j; + + if (!pCreateRestrictedToken) + { + win_skip("CreateRestrictedToken is not available\n"); + return; + } + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE|TOKEN_QUERY, &process_token); + ok(ret, "got error %d\n", GetLastError()); + + ret = DuplicateTokenEx(process_token, TOKEN_DUPLICATE|TOKEN_ADJUST_GROUPS|TOKEN_QUERY, + NULL, SecurityImpersonation, TokenImpersonation, &token); + ok(ret, "got error %d\n", GetLastError()); + + /* groups */ + ret = GetTokenInformation(token, TokenGroups, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "got %d with error %d\n", ret, GetLastError()); + token_groups = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetTokenInformation(token, TokenGroups, token_groups, size, &size); + ok(ret, "got error %d\n", GetLastError()); + + for (i = 0; i < token_groups->GroupCount; i++) + { + if (token_groups->Groups[i].Attributes & SE_GROUP_ENABLED) + break; + } + + if (i == token_groups->GroupCount) + { + HeapFree(GetProcessHeap(), 0, token_groups); + CloseHandle(token); + skip("User not a member of any group\n"); + return; + } + + is_member = FALSE; + ret = pCheckTokenMembership(token, token_groups->Groups[i].Sid, &is_member); + ok(ret, "got error %d\n", GetLastError()); + ok(is_member, "not a member\n"); + + /* disable a SID in new token */ + sattr.Sid = token_groups->Groups[i].Sid; + sattr.Attributes = 0; + ret = pCreateRestrictedToken(token, 0, 1, &sattr, 0, NULL, 0, NULL, &r_token); + todo_wine ok(ret, "got error %d\n", GetLastError()); + + if (ret) + { + /* check if a SID is enabled */ + is_member = TRUE; + ret = pCheckTokenMembership(r_token, token_groups->Groups[i].Sid, &is_member); + ok(ret, "got error %d\n", GetLastError()); + ok(!is_member, "not a member\n"); + + ret = GetTokenInformation(r_token, TokenGroups, NULL, 0, &size); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %d with error %d\n", + ret, GetLastError()); + groups2 = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetTokenInformation(r_token, TokenGroups, groups2, size, &size); + ok(ret, "got error %d\n", GetLastError()); + + for (j = 0; j < groups2->GroupCount; j++) + { + if (EqualSid(groups2->Groups[j].Sid, token_groups->Groups[i].Sid)) + break; + } + + ok(groups2->Groups[j].Attributes & SE_GROUP_USE_FOR_DENY_ONLY, + "got wrong attributes\n"); + ok((groups2->Groups[j].Attributes & SE_GROUP_ENABLED) == 0, + "got wrong attributes\n"); + + HeapFree(GetProcessHeap(), 0, groups2); + } + + HeapFree(GetProcessHeap(), 0, token_groups); + CloseHandle(r_token); + CloseHandle(token); + CloseHandle(process_token); +} + START_TEST(security) { init(); @@ -3903,4 +3997,5 @@ START_TEST(security) test_EqualSid(); test_GetUserNameA(); test_GetUserNameW(); + test_CreateRestrictedToken(); }

1 0

Henri Verbeet : wined3d: Go to the fallbacks if D3D is not initialized in surface_blt().
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 98650e841e90bcc1f694fc1ad58ff45ff1dbeedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=98650e841e90bcc1f694fc1ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 1 21:35:45 2011 +0200 wined3d: Go to the fallbacks if D3D is not initialized in surface_blt(). Even though this is the "OpenGL" surface implementation, this can still happen in e.g. ddraw if no swapchain is created yet. That's something we should fix, but not today. --- dlls/wined3d/surface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6167bde..c13beb0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1304,6 +1304,12 @@ static HRESULT surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_ goto fallback; } + if (!device->d3d_initialized) + { + WARN("D3D not initialized, using fallback.\n"); + goto fallback; + } + dst_ds_flags = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); if (src_surface) src_ds_flags = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: ff6501e8a57df2fe259e46deaefd98880d1f26e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff6501e8a57df2fe259e46dea… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Aug 1 21:59:31 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/po/lt.po b/po/lt.po index b4bdf07..63a44a7 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-07-28 19:21+0300\n" +"PO-Revision-Date: 2011-08-01 21:57+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -8673,32 +8673,27 @@ msgstr "%s %S %S Atverti ištekliai: %lu\n" #: net.rc:45 msgid "OK" -msgstr "" +msgstr "Gerai" #: net.rc:46 -#, fuzzy msgid "Paused" -msgstr "&Pristabdyta" +msgstr "Pristabdyta" #: net.rc:47 -#, fuzzy msgid "Disconnected" -msgstr "Kanalas prijungtas\n" +msgstr "Atjungta" #: net.rc:48 -#, fuzzy msgid "A network error occurred" -msgstr "Įvyko spausdintuvo klaida." +msgstr "Įvyko tinklo klaida" #: net.rc:49 -#, fuzzy msgid "Connection is being made" -msgstr "Sujungimas aktyvus\n" +msgstr "Jungiamasi" #: net.rc:50 -#, fuzzy msgid "Reconnecting" -msgstr "Jungiamasi prie %s" +msgstr "Jungiamasi iš naujo" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 01fb0fdfe0c08fb3a709b71cff60b854b27b4d90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01fb0fdfe0c08fb3a709b71cf… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Aug 2 11:36:50 2011 +0900 po: Updated Korean translation. --- po/ko.po | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/po/ko.po b/po/ko.po index 276ab96..d00d929 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8622,32 +8622,27 @@ msgstr "%s %S %S 열린 리소스: %lu\n" #: net.rc:45 msgid "OK" -msgstr "" +msgstr "확인" #: net.rc:46 -#, fuzzy msgid "Paused" -msgstr "정지(&P)" +msgstr "정지됨" #: net.rc:47 -#, fuzzy msgid "Disconnected" -msgstr "파이프 연결됨\n" +msgstr "연결이 끊어짐" #: net.rc:48 -#, fuzzy msgid "A network error occurred" -msgstr "프린터 오류 발생." +msgstr "네트워크 오류가 발생함" #: net.rc:49 -#, fuzzy msgid "Connection is being made" -msgstr "연결이 활성화됨\n" +msgstr "연결이 활성화됨" #: net.rc:50 -#, fuzzy msgid "Reconnecting" -msgstr " %s 연결중" +msgstr "다시 연결중" #: notepad.rc:27 msgid "&New\tCtrl+N"

1 0

Nikolay Sivov : advapi32: Fix CheckTokenMemberShip for primary tokens.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 5290766ae0826e506b944b42944a5468bb79fa5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5290766ae0826e506b944b429… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 2 02:12:51 2011 +0400 advapi32: Fix CheckTokenMemberShip for primary tokens. --- dlls/advapi32/security.c | 13 +++++++++++++ dlls/advapi32/tests/security.c | 6 ++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index c3454a8..e4953d0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -607,6 +607,19 @@ CheckTokenMembership( HANDLE token, PSID sid_to_check, } token = thread_token; } + else + { + TOKEN_TYPE type; + + ret = GetTokenInformation(token, TokenType, &type, sizeof(TOKEN_TYPE), &size); + if (!ret) goto exit; + + if (type == TokenPrimary) + { + SetLastError(ERROR_NO_IMPERSONATION_TOKEN); + return FALSE; + } + } ret = GetTokenInformation(token, TokenGroups, NULL, 0, &size); if (!ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 6a9a1d2..931f912 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3637,21 +3637,23 @@ static void test_CheckTokenMembership(void) return; } + is_member = FALSE; ret = pCheckTokenMembership(token, token_groups->Groups[i].Sid, &is_member); ok(ret, "CheckTokenMembership failed with error %d\n", GetLastError()); ok(is_member, "CheckTokenMembership should have detected sid as member\n"); + is_member = FALSE; ret = pCheckTokenMembership(NULL, token_groups->Groups[i].Sid, &is_member); ok(ret, "CheckTokenMembership failed with error %d\n", GetLastError()); ok(is_member, "CheckTokenMembership should have detected sid as member\n"); + is_member = TRUE; + SetLastError(0xdeadbeef); ret = pCheckTokenMembership(process_token, token_groups->Groups[i].Sid, &is_member); -todo_wine { ok(!ret && GetLastError() == ERROR_NO_IMPERSONATION_TOKEN, "CheckTokenMembership with process token %s with error %d\n", ret ? "succeeded" : "failed", GetLastError()); ok(!is_member, "CheckTokenMembership should have cleared is_member\n"); -} HeapFree(GetProcessHeap(), 0, token_groups); CloseHandle(token);

1 0

Hans Leidekker : winhttp: Implement IWinHttpRequest::SetAutoLogonPolicy.
by Alexandre Julliard Aug. 2, 2011

Aug. 2, 2011

Module: wine Branch: master Commit: 40bf74107faa7f307e7c014a27c026be2471c673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40bf74107faa7f307e7c014a2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 2 09:23:35 2011 +0200 winhttp: Implement IWinHttpRequest::SetAutoLogonPolicy. --- dlls/winhttp/request.c | 30 ++++++++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 15 +++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 633d8e8..2a70a87 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2174,6 +2174,7 @@ struct winhttp_request DWORD bytes_available; DWORD bytes_read; DWORD error; + DWORD logon_policy; LONG resolve_timeout; LONG connect_timeout; LONG send_timeout; @@ -2845,6 +2846,11 @@ static HRESULT request_send( struct winhttp_request *request ) { return HRESULT_FROM_WIN32( get_last_error() ); } + if (!WinHttpSetOption( request->hrequest, WINHTTP_OPTION_AUTOLOGON_POLICY, &request->logon_policy, + sizeof(request->logon_policy) )) + { + return HRESULT_FROM_WIN32( get_last_error() ); + } if (!WinHttpSetTimeouts( request->hrequest, request->resolve_timeout, request->connect_timeout, @@ -3241,8 +3247,28 @@ static HRESULT WINAPI winhttp_request_SetAutoLogonPolicy( IWinHttpRequest *iface, WinHttpRequestAutoLogonPolicy policy ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + HRESULT hr = S_OK; + + TRACE("%p, %u\n", request, policy ); + + EnterCriticalSection( &request->cs ); + switch (policy) + { + case AutoLogonPolicy_Always: + request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW; + break; + case AutoLogonPolicy_OnlyIfBypassProxy: + request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; + break; + case AutoLogonPolicy_Never: + request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_HIGH; + break; + default: hr = E_INVALIDARG; + break; + } + LeaveCriticalSection( &request->cs ); + return hr; } static const struct IWinHttpRequestVtbl winhttp_request_vtbl = diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b450df7..a662ef8 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2265,6 +2265,12 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetRequestHeader( req, date, today ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + hr = IWinHttpRequest_SetAutoLogonPolicy( req, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( method ); method = SysAllocString( method1W ); SysFreeString( url ); @@ -2335,6 +2341,9 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetRequestHeader( req, date, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2396,6 +2405,9 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetRequestHeader( req, date, today ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantInit( &timeout ); V_VT( &timeout ) = VT_I4; V_I4( &timeout ) = 10; @@ -2457,6 +2469,9 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetRequestHeader( req, date, today ); ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND ), "got %08x\n", hr ); + hr = IWinHttpRequest_SetAutoLogonPolicy( req, AutoLogonPolicy_OnlyIfBypassProxy ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr );

1 0