December 2010 - Wine-commits

Andrew Bogott : shdocvw: Skip some tests if a modern IE is not present.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 1a5607b41518add5872c2a0e4f144dc85315f0e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a5607b41518add5872c2a0e4… Author: Andrew Bogott <andrew(a)CodeWeavers.com> Date: Wed Nov 10 23:52:01 2010 -0600 shdocvw: Skip some tests if a modern IE is not present. --- dlls/shdocvw/tests/intshcut.c | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/tests/intshcut.c b/dlls/shdocvw/tests/intshcut.c index cf0b225..af34614 100644 --- a/dlls/shdocvw/tests/intshcut.c +++ b/dlls/shdocvw/tests/intshcut.c @@ -32,6 +32,7 @@ #include "shobjidl.h" #include "shlguid.h" #include "ole2.h" +#include "mshtml.h" #include "initguid.h" #include "isguids.h" #include "intshcut.h" @@ -158,6 +159,20 @@ static void check_string_transform(IUniformResourceLocatorA *urlA, LPCSTR input, } } +static BOOL check_ie(void) +{ + IHTMLDocument5 *doc; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IHTMLDocument5, (void**)&doc); + if(FAILED(hres)) + return FALSE; + + IHTMLDocument5_Release(doc); + return TRUE; +} + static void test_NullURLs(void) { HRESULT hr; @@ -210,10 +225,13 @@ static void test_SetURLFlags(void) static void test_InternetShortcut(void) { - test_Aggregability(); - test_QueryInterface(); - test_NullURLs(); - test_SetURLFlags(); + if (check_ie()) + { + test_Aggregability(); + test_QueryInterface(); + test_NullURLs(); + test_SetURLFlags(); + } } START_TEST(intshcut)

1 0

Maarten Lankhorst : quartz: Refuse WAVE_FORMAT_PCM/EXTENSIBLE in acmwrapper .
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 5a8ce4c7935cb6c26ba75e106749fcfd6403cf26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a8ce4c7935cb6c26ba75e106… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Dec 1 23:17:31 2010 +0100 quartz: Refuse WAVE_FORMAT_PCM/EXTENSIBLE in acmwrapper. --- dlls/quartz/acmwrapper.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index dfd0529..3659326 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -259,7 +259,11 @@ static HRESULT WINAPI ACMWrapper_SetMediaType(TransformFilter *tf, PIN_DIRECTION (IsEqualIID(&pmt->formattype, &FORMAT_WaveFormatEx))) { HACMSTREAM drv; + WAVEFORMATEX *wfx = (WAVEFORMATEX*)pmt->pbFormat; AM_MEDIA_TYPE* outpmt = &This->tf.pmt; + + if (!wfx || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + return VFW_E_TYPE_NOT_ACCEPTED; FreeMediaType(outpmt); This->pWfIn = (LPWAVEFORMATEX)pmt->pbFormat;

1 0

Hans Leidekker : msi: Reuse temporary executables.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 06505c9a344a70a6510f3eb758187d634590f383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06505c9a344a70a6510f3eb75… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 2 11:32:26 2010 +0100 msi: Reuse temporary executables. Fixes a custom action in the Office 2010 installer and makes installers that pack multiple custom actions in an executable faster. --- dlls/msi/custom.c | 118 +++++++++++++++++++++++++++++++--------------------- dlls/msi/msipriv.h | 9 ++++ dlls/msi/package.c | 15 +++++++ 3 files changed, 94 insertions(+), 48 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 8c080c9..391bf9a 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -355,60 +355,90 @@ end: return rc; } - -static UINT store_binary_to_temp(MSIPACKAGE *package, LPCWSTR source, - LPWSTR tmp_file) +static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL dll ) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','B','i' ,'n','a','r','y','`',' ','W','H','E','R','E',' ', '`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; - MSIRECORD *row = 0; + MSIRECORD *row; + MSIBINARY *binary; HANDLE file; CHAR buffer[1024]; - WCHAR fmt[MAX_PATH]; - DWORD sz = MAX_PATH; + WCHAR fmt[MAX_PATH], tmpfile[MAX_PATH]; + DWORD sz = MAX_PATH, write; UINT r; if (msi_get_property(package->db, cszTempFolder, fmt, &sz) != ERROR_SUCCESS) GetTempPathW(MAX_PATH, fmt); - if (GetTempFileNameW(fmt, szMsi, 0, tmp_file) == 0) + if (!GetTempFileNameW( fmt, szMsi, 0, tmpfile )) { - TRACE("Unable to create file\n"); - return ERROR_FUNCTION_FAILED; + TRACE("unable to create temp file %s (%u)\n", debugstr_w(tmpfile), GetLastError()); + return NULL; } - track_tempfile(package, tmp_file); row = MSI_QueryGetRecord(package->db, query, source); if (!row) - return ERROR_FUNCTION_FAILED; + return NULL; - /* write out the file */ - file = CreateFileW(tmp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, - FILE_ATTRIBUTE_NORMAL, NULL); + if (!(binary = msi_alloc_zero( sizeof(MSIBINARY) ))) + { + msiobj_release( &row->hdr ); + return NULL; + } + file = CreateFileW( tmpfile, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); if (file == INVALID_HANDLE_VALUE) - r = ERROR_FUNCTION_FAILED; - else { - do + msiobj_release( &row->hdr ); + return NULL; + } + do + { + sz = sizeof(buffer); + r = MSI_RecordReadStream( row, 2, buffer, &sz ); + if (r != ERROR_SUCCESS) { - DWORD write; - sz = sizeof buffer; - r = MSI_RecordReadStream(row, 2, buffer, &sz); - if (r != ERROR_SUCCESS) - { - ERR("Failed to get stream\n"); - break; - } - WriteFile(file, buffer, sz, &write, NULL); - } while (sz == sizeof buffer); - CloseHandle(file); + ERR("Failed to get stream\n"); + break; + } + WriteFile( file, buffer, sz, &write, NULL ); + } while (sz == sizeof buffer); + + CloseHandle( file ); + msiobj_release( &row->hdr ); + if (r != ERROR_SUCCESS) + { + DeleteFileW( tmpfile ); + msi_free( binary ); + return NULL; } - msiobj_release(&row->hdr); + /* keep a reference to prevent the dll from being unloaded */ + if (dll && !(binary->module = LoadLibraryW( tmpfile ))) + { + ERR("failed to load dll %s (%u)\n", debugstr_w( binary->tmpfile ), GetLastError() ); + DeleteFileW( tmpfile ); + msi_free( binary ); + return NULL; + } + binary->source = strdupW( source ); + binary->tmpfile = strdupW( tmpfile ); + list_add_tail( &package->binaries, &binary->entry ); + return binary; +} - return r; +static MSIBINARY *get_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL dll ) +{ + MSIBINARY *binary; + + LIST_FOR_EACH_ENTRY( binary, &package->binaries, MSIBINARY, entry ) + { + if (!strcmpW( binary->source, source )) + return binary; + } + + return create_temp_binary( package, source, dll ); } static void file_running_action(MSIPACKAGE* package, HANDLE Handle, @@ -875,20 +905,15 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { msi_custom_action_info *info; - WCHAR tmp_file[MAX_PATH]; + MSIBINARY *binary; UINT r; - r = store_binary_to_temp(package, source, tmp_file); - if (r != ERROR_SUCCESS) - return r; - - TRACE("Calling function %s from %s\n",debugstr_w(target), - debugstr_w(tmp_file)); + if (!(binary = get_temp_binary( package, source, TRUE ))) + return ERROR_FUNCTION_FAILED; - if (!strchrW(tmp_file,'.')) - strcatW(tmp_file, szDot); + TRACE("Calling function %s from %s\n", debugstr_w(target), debugstr_w(binary->tmpfile)); - info = do_msidbCustomActionTypeDll( package, type, tmp_file, target, action ); + info = do_msidbCustomActionTypeDll( package, type, binary->tmpfile, target, action ); r = wait_thread_handle( info ); release_custom_action_data( info ); @@ -898,7 +923,6 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action) { - WCHAR tmp_file[MAX_PATH]; STARTUPINFOW si; PROCESS_INFORMATION info; BOOL rc; @@ -906,29 +930,27 @@ static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, WCHAR *deformated = NULL; WCHAR *cmd; static const WCHAR spc[] = {' ',0}; + MSIBINARY *binary; UINT r; memset(&si,0,sizeof(STARTUPINFOW)); - r = store_binary_to_temp(package, source, tmp_file); - if (r != ERROR_SUCCESS) - return r; + if (!(binary = get_temp_binary( package, source, FALSE ))) + return ERROR_FUNCTION_FAILED; deformat_string(package,target,&deformated); - len = strlenW(tmp_file)+2; - + len = strlenW( binary->tmpfile ) + 2; if (deformated) len += strlenW(deformated); cmd = msi_alloc(sizeof(WCHAR)*len); - strcpyW(cmd,tmp_file); + strcpyW( cmd, binary->tmpfile ); if (deformated) { strcatW(cmd,spc); strcatW(cmd,deformated); - msi_free(deformated); } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index feb82a0..fb24d30 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -163,6 +163,14 @@ typedef struct tagMSIPATCHINFO MSIPATCHSTATE state; } MSIPATCHINFO; +typedef struct tagMSIBINARY +{ + struct list entry; + WCHAR *source; + WCHAR *tmpfile; + HMODULE module; +} MSIBINARY; + typedef struct _column_info { LPCWSTR table; @@ -330,6 +338,7 @@ typedef struct tagMSIPACKAGE struct list files; struct list tempfiles; struct list folders; + struct list binaries; LPWSTR ActionFormat; LPWSTR LastAction; HANDLE log_file; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 596db2b..a81d0bd 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -284,6 +284,20 @@ static void free_package_structures( MSIPACKAGE *package ) msi_free( patch ); } + LIST_FOR_EACH_SAFE( item, cursor, &package->binaries ) + { + MSIBINARY *binary = LIST_ENTRY( item, MSIBINARY, entry ); + + list_remove( &binary->entry ); + if (binary->module) + FreeLibrary( binary->module ); + if (!DeleteFileW( binary->tmpfile )) + ERR("failed to delete %s (%u)\n", debugstr_w(binary->tmpfile), GetLastError()); + msi_free( binary->source ); + msi_free( binary->tmpfile ); + msi_free( binary ); + } + msi_free( package->BaseURL ); msi_free( package->PackagePath ); msi_free( package->ProductCode ); @@ -1059,6 +1073,7 @@ static MSIPACKAGE *msi_alloc_package( void ) list_init( &package->sourcelist_info ); list_init( &package->sourcelist_media ); list_init( &package->patches ); + list_init( &package->binaries ); } return package;

1 0

Hans Leidekker : ntdll: Don't call NtClose directly in delete_view.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 71beac32192d661849d5fff6e5265d2f32faf61d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71beac32192d661849d5fff6e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 2 11:33:03 2010 +0100 ntdll: Don't call NtClose directly in delete_view. --- dlls/ntdll/ntdll_misc.h | 2 ++ dlls/ntdll/om.c | 28 +++++++++++++++++----------- dlls/ntdll/virtual.c | 2 +- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 212edf5..1a9c40e 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -39,6 +39,8 @@ struct drive_info ino_t ino; }; +extern NTSTATUS close_handle( HANDLE ); + /* exceptions */ extern void wait_suspend( CONTEXT *context ); extern NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *context ); diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index 85ac0bf..c103ddd 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -348,6 +348,22 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, return ret; } +/* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ +NTSTATUS close_handle( HANDLE handle ) +{ + NTSTATUS ret; + int fd = server_remove_fd_from_cache( handle ); + + SERVER_START_REQ( close_handle ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + if (fd != -1) close( fd ); + return ret; +} + /************************************************************************** * NtClose [NTDLL.@] * @@ -362,17 +378,7 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, */ NTSTATUS WINAPI NtClose( HANDLE Handle ) { - NTSTATUS ret; - int fd = server_remove_fd_from_cache( Handle ); - - SERVER_START_REQ( close_handle ) - { - req->handle = wine_server_obj_handle( Handle ); - ret = wine_server_call( req ); - } - SERVER_END_REQ; - if (fd != -1) close( fd ); - return ret; + return close_handle( Handle ); } /* diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 548c0fd..d7a04c3 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -444,7 +444,7 @@ static void delete_view( struct file_view *view ) /* [in] View */ { if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); list_remove( &view->entry ); - if (view->mapping) NtClose( view->mapping ); + if (view->mapping) close_handle( view->mapping ); RtlFreeHeap( virtual_heap, 0, view ); }

1 0

Travis Athougies : d3dx9_36: Improved constant table parsing.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: ca7405a9a1a07ac6554c7c8721cf62a1247f33d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7405a9a1a07ac6554c7c872… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Nov 30 16:28:22 2010 -0800 d3dx9_36: Improved constant table parsing. --- dlls/d3dx9_36/shader.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index e2efe53..4d1ac86 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -994,10 +994,11 @@ static HRESULT parse_ctab_constant_type(const D3DXSHADER_TYPEINFO *type, ctab_co constant->desc.Type = type->Type; constant->desc.Rows = type->Rows; constant->desc.Columns = type->Columns; + constant->desc.Elements = type->Elements; constant->desc.StructMembers = type->StructMembers; - TRACE("class = %d, type = %d, rows = %d, columns = %d, struct_members = %d\n", - constant->desc.Class, constant->desc.Type, + TRACE("class = %d, type = %d, rows = %d, columns = %d, elements = %d, struct_members = %d\n", + constant->desc.Class, constant->desc.Type, constant->desc.Elements, constant->desc.Rows, constant->desc.Columns, constant->desc.StructMembers); if ((constant->desc.Class == D3DXPC_STRUCT) && constant->desc.StructMembers) @@ -1095,11 +1096,24 @@ HRESULT WINAPI D3DXGetShaderConstantTableEx(CONST DWORD* byte_code, object->constants[i].desc.Name = object->ctab + constant_info[i].Name; object->constants[i].desc.RegisterSet = constant_info[i].RegisterSet; object->constants[i].desc.RegisterIndex = constant_info[i].RegisterIndex; - object->constants[i].desc.RegisterCount = 0; + object->constants[i].desc.RegisterCount = constant_info[i].RegisterCount; + object->constants[i].desc.DefaultValue = object->ctab + constant_info[i].DefaultValue; + hr = parse_ctab_constant_type((LPD3DXSHADER_TYPEINFO)(object->ctab + constant_info[i].TypeInfo), &object->constants[i]); if (hr != D3D_OK) goto error; + + if (constant_info[i].RegisterSet != D3DXRS_FLOAT4) + FIXME("Don't know how to calculate Bytes for non D3DXRS_FLOAT4 constants\n"); + + /* D3DXRS_FLOAT4 has a base size of 4 (not taking into account dimensions and element count) */ + object->constants[i].desc.Bytes = 4; + + /* Take into account dimensions and elements */ + object->constants[i].desc.Bytes *= object->constants[i].desc.Elements; + object->constants[i].desc.Bytes *= object->constants[i].desc.Rows * + object->constants[i].desc.Columns; } *constant_table = (LPD3DXCONSTANTTABLE)object;

1 0

Travis Athougies : d3dx9_36/tests: Extended ID3DXConstantTable tests.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: d2055e6ea9df427713e263411930f31956cc636e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2055e6ea9df427713e263411… Author: Travis Athougies <iammisc(a)gmail.com> Date: Tue Nov 30 16:28:48 2010 -0800 d3dx9_36/tests: Extended ID3DXConstantTable tests. --- dlls/d3dx9_36/tests/shader.c | 160 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 160 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2055e6ea9df427713e26…

1 0

Hans Leidekker : msi: Clear last error on success in MsiQueryFeatureState and MsiQueryProductState .
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: ad6b7cd46a539b6d5b24943a9462c8d7b08723c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6b7cd46a539b6d5b24943a9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 2 12:24:16 2010 +0100 msi: Clear last error on success in MsiQueryFeatureState and MsiQueryProductState. --- dlls/msi/msi.c | 7 ++ dlls/msi/tests/msi.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 207 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad6b7cd46a539b6d5b249…

1 0

Alexandre Julliard : widl: Add progid, threading and vi_progid attributes for coclasses.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 3991b05746adfaf547331c261c4ed7e3291e6479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3991b05746adfaf547331c261… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:05:57 2010 +0100 widl: Add progid, threading and vi_progid attributes for coclasses. This is a Wine extension, modelled after the corresponding attributes supported by Visual C++. --- tools/widl/parser.l | 8 ++++++++ tools/widl/parser.y | 23 +++++++++++++++++++---- tools/widl/widltypes.h | 12 ++++++++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 2938fb6..3a535e8 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -289,11 +289,13 @@ static const struct keyword attr_keywords[] = {"aggregatable", tAGGREGATABLE}, {"allocate", tALLOCATE}, {"annotation", tANNOTATION}, + {"apartment", tAPARTMENT}, {"appobject", tAPPOBJECT}, {"async", tASYNC}, {"async_uuid", tASYNCUUID}, {"auto_handle", tAUTOHANDLE}, {"bindable", tBINDABLE}, + {"both", tBOTH}, {"broadcast", tBROADCAST}, {"byte_count", tBYTECOUNT}, {"call_as", tCALLAS}, @@ -320,6 +322,7 @@ static const struct keyword attr_keywords[] = {"explicit_handle", tEXPLICITHANDLE}, {"fault_status", tFAULTSTATUS}, {"force_allocate", tFORCEALLOCATE}, + {"free", tFREE}, {"handle", tHANDLE}, {"helpcontext", tHELPCONTEXT}, {"helpfile", tHELPFILE}, @@ -342,6 +345,7 @@ static const struct keyword attr_keywords[] = {"local", tLOCAL}, {"maybe", tMAYBE}, {"message", tMESSAGE}, + {"neutral", tNEUTRAL}, {"nocode", tNOCODE}, {"nonbrowsable", tNONBROWSABLE}, {"noncreatable", tNONCREATABLE}, @@ -356,6 +360,7 @@ static const struct keyword attr_keywords[] = {"out", tOUT}, {"partial_ignore", tPARTIALIGNORE}, {"pointer_default", tPOINTERDEFAULT}, + {"progid", tPROGID}, {"propget", tPROPGET}, {"propput", tPROPPUT}, {"propputref", tPROPPUTREF}, @@ -369,12 +374,14 @@ static const struct keyword attr_keywords[] = {"requestedit", tREQUESTEDIT}, {"restricted", tRESTRICTED}, {"retval", tRETVAL}, + {"single", tSINGLE}, {"size_is", tSIZEIS}, {"source", tSOURCE}, {"strict_context_handle", tSTRICTCONTEXTHANDLE}, {"string", tSTRING}, {"switch_is", tSWITCHIS}, {"switch_type", tSWITCHTYPE}, + {"threading", tTHREADING}, {"transmit_as", tTRANSMITAS}, {"uidefault", tUIDEFAULT}, {"unique", tUNIQUE}, @@ -384,6 +391,7 @@ static const struct keyword attr_keywords[] = {"v1_enum", tV1ENUM}, {"vararg", tVARARG}, {"version", tVERSION}, + {"vi_progid", tVIPROGID}, {"wire_marshal", tWIREMARSHAL}, }; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1bf9a1e..c924a66 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -239,7 +239,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %token tOUT %token tPARTIALIGNORE tPASCAL %token tPOINTERDEFAULT -%token tPROPERTIES +%token tPROGID tPROPERTIES %token tPROPGET tPROPPUT tPROPPUTREF %token tPROXY tPTR %token tPUBLIC @@ -260,7 +260,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %token tSTRICTCONTEXTHANDLE %token tSTRING tSTRUCT %token tSWITCH tSWITCHIS tSWITCHTYPE -%token tTRANSMITAS +%token tTHREADING tTRANSMITAS %token tTRUE %token tTYPEDEF %token tUIDEFAULT tUNION @@ -269,9 +269,10 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %token tUSESGETLASTERROR tUSERMARSHAL tUUID %token tV1ENUM %token tVARARG -%token tVERSION +%token tVERSION tVIPROGID %token tVOID %token tWCHAR tWIREMARSHAL +%token tAPARTMENT tNEUTRAL tSINGLE tFREE tBOTH %type <attr> attribute type_qualifier function_specifier %type <attr_list> m_attributes attributes attrib_list m_type_qual_list @@ -299,7 +300,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <declarator> m_abstract_declarator abstract_declarator abstract_declarator_no_direct abstract_direct_declarator %type <declarator_list> declarator_list struct_declarator_list %type <type> coclass coclasshdr coclassdef -%type <num> pointer_type version +%type <num> pointer_type threading_type version %type <str> libraryhdr callconv cppquote importlib import t_ident %type <uuid> uuid_string %type <import> import_start @@ -538,6 +539,7 @@ attribute: { $$ = NULL; } | tOUT { $$ = make_attr(ATTR_OUT); } | tPARTIALIGNORE { $$ = make_attr(ATTR_PARTIALIGNORE); } | tPOINTERDEFAULT '(' pointer_type ')' { $$ = make_attrv(ATTR_POINTERDEFAULT, $3); } + | tPROGID '(' aSTRING ')' { $$ = make_attrp(ATTR_PROGID, $3); } | tPROPGET { $$ = make_attr(ATTR_PROPGET); } | tPROPPUT { $$ = make_attr(ATTR_PROPPUT); } | tPROPPUTREF { $$ = make_attr(ATTR_PROPPUTREF); } @@ -559,6 +561,7 @@ attribute: { $$ = NULL; } | tSWITCHIS '(' expr ')' { $$ = make_attrp(ATTR_SWITCHIS, $3); } | tSWITCHTYPE '(' type ')' { $$ = make_attrp(ATTR_SWITCHTYPE, $3); } | tTRANSMITAS '(' type ')' { $$ = make_attrp(ATTR_TRANSMITAS, $3); } + | tTHREADING '(' threading_type ')' { $$ = make_attrv(ATTR_THREADING, $3); } | tUIDEFAULT { $$ = make_attr(ATTR_UIDEFAULT); } | tUSESGETLASTERROR { $$ = make_attr(ATTR_USESGETLASTERROR); } | tUSERMARSHAL '(' type ')' { $$ = make_attrp(ATTR_USERMARSHAL, $3); } @@ -566,6 +569,7 @@ attribute: { $$ = NULL; } | tV1ENUM { $$ = make_attr(ATTR_V1ENUM); } | tVARARG { $$ = make_attr(ATTR_VARARG); } | tVERSION '(' version ')' { $$ = make_attrv(ATTR_VERSION, $3); } + | tVIPROGID '(' aSTRING ')' { $$ = make_attrp(ATTR_VIPROGID, $3); } | tWIREMARSHAL '(' type ')' { $$ = make_attrp(ATTR_WIREMARSHAL, $3); } | pointer_type { $$ = make_attrv(ATTR_POINTERTYPE, $1); } ; @@ -1069,6 +1073,14 @@ init_declarator: | declarator '=' expr_const { $$ = $1; $1->var->eval = $3; } ; +threading_type: + tAPARTMENT { $$ = THREADING_APARTMENT; } + | tNEUTRAL { $$ = THREADING_NEUTRAL; } + | tSINGLE { $$ = THREADING_SINGLE; } + | tFREE { $$ = THREADING_FREE; } + | tBOTH { $$ = THREADING_BOTH; } + ; + pointer_type: tREF { $$ = RPC_FC_RP; } | tUNIQUE { $$ = RPC_FC_UP; } @@ -2070,6 +2082,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_PARTIALIGNORE */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, "partial_ignore" }, /* ATTR_POINTERDEFAULT */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, /* ATTR_POINTERTYPE */ { 1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, "ref, unique or ptr" }, + /* ATTR_PROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "progid" }, /* ATTR_PROPGET */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propget" }, /* ATTR_PROPPUT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propput" }, /* ATTR_PROPPUTREF */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "propputref" }, @@ -2087,6 +2100,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_STRING */ { 1, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, "string" }, /* ATTR_SWITCHIS */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, "switch_is" }, /* ATTR_SWITCHTYPE */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, "switch_type" }, + /* ATTR_THREADING */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "threading" }, /* ATTR_TRANSMITAS */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "transmit_as" }, /* ATTR_UIDEFAULT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "uidefault" }, /* ATTR_USESGETLASTERROR */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "usesgetlasterror" }, @@ -2095,6 +2109,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, "v1_enum" }, /* ATTR_VARARG */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "vararg" }, /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "version" }, + /* ATTR_VIPROGID */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "vi_progid" }, /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "wire_marshal" }, }; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 40962ed..295ad70 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -135,6 +135,7 @@ enum attr_type ATTR_PARTIALIGNORE, ATTR_POINTERDEFAULT, ATTR_POINTERTYPE, + ATTR_PROGID, ATTR_PROPGET, ATTR_PROPPUT, ATTR_PROPPUTREF, @@ -152,6 +153,7 @@ enum attr_type ATTR_STRING, ATTR_SWITCHIS, ATTR_SWITCHTYPE, + ATTR_THREADING, ATTR_TRANSMITAS, ATTR_UIDEFAULT, ATTR_USERMARSHAL, @@ -160,6 +162,7 @@ enum attr_type ATTR_V1ENUM, ATTR_VARARG, ATTR_VERSION, + ATTR_VIPROGID, ATTR_WIREMARSHAL }; @@ -240,6 +243,15 @@ enum statement_type STMT_CPPQUOTE }; +enum threading_type +{ + THREADING_APARTMENT = 1, + THREADING_NEUTRAL, + THREADING_SINGLE, + THREADING_FREE, + THREADING_BOTH +}; + enum type_basic_type { TYPE_BASIC_INT8 = 1,

1 0

Alexandre Julliard : widl: Generate keys for coclasses in the registration resources.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 335282f5648b6bba215f969870e11a6b466b3738 URL: http://source.winehq.org/git/wine.git/?a=commit;h=335282f5648b6bba215f96987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:49:01 2010 +0100 widl: Generate keys for coclasses in the registration resources. --- tools/widl/register.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 106 insertions(+), 3 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index 61870ea..20554b1 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -47,6 +47,20 @@ static const char *format_uuid( const UUID *uuid ) return buffer; } +static const char *get_coclass_threading( const type_t *class ) +{ + static const char * const models[] = + { + NULL, + "Apartment", /* THREADING_APARTMENT */ + "Neutral", /* THREADING_NEUTRAL */ + "Single", /* THREADING_SINGLE */ + "Free", /* THREADING_FREE */ + "Both", /* THREADING_BOTH */ + }; + return models[get_attrv( class->attrs, ATTR_THREADING )]; +} + static int write_interface( const type_t *iface ) { const UUID *uuid = get_attrp( iface->attrs, ATTR_UUID ); @@ -79,6 +93,93 @@ static int write_interfaces( const statement_list_t *stmts ) return count; } +static int write_coclass( const type_t *class ) +{ + const UUID *uuid = get_attrp( class->attrs, ATTR_UUID ); + const char *descr = get_attrp( class->attrs, ATTR_HELPSTRING ); + const char *progid = get_attrp( class->attrs, ATTR_PROGID ); + const char *vi_progid = get_attrp( class->attrs, ATTR_VIPROGID ); + const char *threading = get_coclass_threading( class ); + + if (!uuid) return 0; + if (!descr) descr = class->name; + + put_str( indent, "ForceRemove '%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 ); + if (progid || vi_progid) put_str( indent, "CLSID = s '%s'\n", descr ); + if (progid) put_str( indent, "ProgId = s '%s'\n", progid ); + if (vi_progid) put_str( indent, "VersionIndependentProgId = s '%s'\n", vi_progid ); + put_str( --indent, "}\n" ); + return 1; +} + +static void write_coclasses( const statement_list_t *stmts, const UUID *typelib_uuid ) +{ + const statement_t *stmt; + + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type == STMT_TYPE) + { + const type_t *type = stmt->u.type; + if (type_get_type(type) == TYPE_COCLASS) write_coclass( type ); + } + else if (stmt->type == STMT_LIBRARY) + { + const UUID *uuid = get_attrp( stmt->u.lib->attrs, ATTR_UUID ); + write_coclasses( stmt->u.lib->stmts, uuid ); + } + } +} + +static int write_progid( const type_t *class ) +{ + const UUID *uuid = get_attrp( class->attrs, ATTR_UUID ); + const char *descr = get_attrp( class->attrs, ATTR_HELPSTRING ); + const char *progid = get_attrp( class->attrs, ATTR_PROGID ); + const char *vi_progid = get_attrp( class->attrs, ATTR_VIPROGID ); + + if (!uuid) return 0; + if (!descr) descr = vi_progid ? vi_progid : progid; + + if (progid) + { + put_str( indent, "ForceRemove '%s' = s '%s'\n", progid, descr ); + put_str( indent++, "{\n" ); + put_str( indent, "CLSID = s '%s'\n", format_uuid( uuid ) ); + put_str( --indent, "}\n" ); + } + if (vi_progid) + { + put_str( indent, "ForceRemove '%s' = s '%s'\n", vi_progid, descr ); + put_str( indent++, "{\n" ); + put_str( indent, "CLSID = s '%s'\n", format_uuid( uuid ) ); + if (progid) put_str( indent, "CurVer = s '%s'\n", progid ); + put_str( --indent, "}\n" ); + } + return 1; +} + +static void write_progids( const statement_list_t *stmts ) +{ + const statement_t *stmt; + + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type == STMT_TYPE) + { + 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 ); + } + } +} + /* put a string into the resource file */ static inline void put_string( const char *str ) { @@ -107,17 +208,19 @@ void write_regscript( const statement_list_t *stmts ) count = write_interfaces( stmts ); put_str( --indent, "}\n" ); + put_str( indent, "NoRemove CLSID\n" ); + put_str( indent++, "{\n" ); if (count) { - put_str( indent, "NoRemove CLSID\n" ); - put_str( indent++, "{\n" ); put_str( indent, "ForceRemove '%%CLSID_PSFactoryBuffer%%' = s 'PSFactoryBuffer'\n" ); put_str( indent++, "{\n" ); put_str( indent, "InprocServer32 = s '%%MODULE%%' { val ThreadingModel = s 'Both' }\n" ); put_str( --indent, "}\n" ); - put_str( --indent, "}\n" ); } + write_coclasses( stmts, NULL ); + put_str( --indent, "}\n" ); + write_progids( stmts ); put_str( --indent, "}\n" ); if (strendswith( regscript_name, ".res" )) /* create a binary resource file */

1 0

Alexandre Julliard : oleaut32: Use widl to generate the coclasses registrations.
by Alexandre Julliard 02 Dec '10

02 Dec '10

Module: wine Branch: master Commit: 6b7c7467239f2800dc50a6fcf52e400f010656aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b7c7467239f2800dc50a6fcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 30 12:49:15 2010 +0100 oleaut32: Use widl to generate the coclasses registrations. --- dlls/oleaut32/oleaut32.rgs | 21 --------------------- dlls/oleaut32/oleaut32_ocidl.idl | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/oleaut32.rgs b/dlls/oleaut32/oleaut32.rgs index be78c51..36dcafd 100644 --- a/dlls/oleaut32/oleaut32.rgs +++ b/dlls/oleaut32/oleaut32.rgs @@ -41,24 +41,6 @@ HKCR InprocServer = s 'ole2disp.dll' InprocServer32 = s '%MODULE%' } - ForceRemove '{0BE35203-8F91-11CE-9DE3-00AA004BB851}' = s 'CLSID_StdFont' - { - CLSID = s 'Standard Font' - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Both' } - ProgId = s 'StdFont' - } - ForceRemove '{46763EE0-CAB2-11CE-8C20-00AA0051E5D4}' = s 'Obsolete Font' - { - CLSID = s 'Obsolete Font' - InprocServer32 = s '%MODULE%' - ProgId = s 'OldFont' - } - ForceRemove '{0BE35204-8F91-11CE-9DE3-00AA004BB851}' = s 'CLSID_StdPict' - { - CLSID = s 'Standard Picture' - InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' } - ProgId = s 'StdPicture' - } } NoRemove Interface { @@ -104,7 +86,4 @@ HKCR ProxyStubClsid32 = s '{00020420-0000-0000-C000-000000000046}' } } - ForceRemove StdFont { CLSID = s '{0BE35203-8F91-11CE-9DE3-00AA004BB851}' } - ForceRemove OldFont { CLSID = s '{46763EE0-CAB2-11CE-8C20-00AA0051E5D4}' } - ForceRemove StdPicture { CLSID = s '{0BE35204-8F91-11CE-9DE3-00AA004BB851}' } } diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl index dcd3ea4..9f6b7cf 100644 --- a/dlls/oleaut32/oleaut32_ocidl.idl +++ b/dlls/oleaut32/oleaut32_ocidl.idl @@ -17,3 +17,27 @@ */ #include "ocidl.idl" + +[ + helpstring("Standard Font"), + progid("StdFont"), + threading(both), + uuid(0be35203-8f91-11ce-9de3-00aa004bb851) +] +coclass StdFont { interface IFont; } + +[ + helpstring("Obsolete Font"), + progid("OldFont"), + threading(both), + uuid(46763ee0-cab2-11ce-8c20-00aa0051e5d4) +] +coclass OldFont { interface IFont; } + +[ + helpstring("Standard Picture"), + progid("StdPicture"), + threading(apartment), + uuid(0be35204-8f91-11ce-9de3-00aa004bb851) +] +coclass StdPicture { interface IPicture; }

1 0