November 2010 - Wine-commits

Hans Leidekker : msi: Revert 3cd55cc916ad8d74710f435845d8f970161f77fe.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 5871ad6d00224b025a755ecdb486f77a3d6b6a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5871ad6d00224b025a755ecdb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 3 15:06:19 2010 +0100 msi: Revert 3cd55cc916ad8d74710f435845d8f970161f77fe. It breaks the Office 2003 installer. --- dlls/msi/action.c | 4 ---- dlls/msi/tests/package.c | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f56fcf7..2b41b25 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -212,10 +212,6 @@ void msi_feature_set_state( MSIPACKAGE *package, MSIFEATURE *feature, INSTALLSTA feature->ActionRequest = state; feature->Action = state; } - if (feature->Attributes & msidbFeatureAttributesUIDisallowAbsent) - { - feature->Action = INSTALLSTATE_UNKNOWN; - } } void msi_component_set_state( MSIPACKAGE *package, MSICOMPONENT *comp, INSTALLSTATE state ) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d19a10a..7e236e4 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -5581,7 +5581,7 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "eleven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + todo_wine ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -6534,7 +6534,7 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "eleven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + todo_wine ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -7483,7 +7483,7 @@ static void test_states(void) r = MsiGetFeatureState(hpkg, "eleven", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_SOURCE, "Expected INSTALLSTATE_SOURCE, got %d\n", state); - ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); + todo_wine ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -9711,7 +9711,7 @@ static void test_featureparents(void) r = MsiGetFeatureState(hpkg, "lyra", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); + ok( action == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee; @@ -9839,7 +9839,7 @@ static void test_featureparents(void) r = MsiGetFeatureState(hpkg, "lyra", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); ok( state == INSTALLSTATE_ABSENT, "Expected lyra INSTALLSTATE_ABSENT, got %d\n", state); - todo_wine ok( action == INSTALLSTATE_ABSENT, "Expected lyra INSTALLSTATE_ABSENT, got %d\n", action); + ok( action == INSTALLSTATE_ABSENT, "Expected lyra INSTALLSTATE_ABSENT, got %d\n", action); state = 0xdeadbee; action = 0xdeadbee;

1 0

Hans Leidekker : include: Add winsxs.idl.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 58352b9443df584bd1100b337030b18066890674 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58352b9443df584bd1100b337… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 3 15:07:18 2010 +0100 include: Add winsxs.idl. --- .gitignore | 1 + include/Makefile.in | 1 + include/winsxs.idl | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index fdfe55b..d1090c1 100644 --- a/.gitignore +++ b/.gitignore @@ -240,6 +240,7 @@ include/wine/itss.h include/wine/svcctl.h include/wine/wined3d.h include/wine/winedxgi.h +include/winsxs.h include/wtypes.h include/wuapi.h include/xmldom.h diff --git a/include/Makefile.in b/include/Makefile.in index d112efa..733e4cc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -96,6 +96,7 @@ PUBLIC_IDL_H_SRCS = \ wincodec.idl \ wine/itss.idl \ wine/svcctl.idl \ + winsxs.idl \ wtypes.idl \ wuapi.idl \ xmldom.idl \ diff --git a/include/winsxs.idl b/include/winsxs.idl new file mode 100644 index 0000000..c2c38f2 --- /dev/null +++ b/include/winsxs.idl @@ -0,0 +1,101 @@ +/* + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * 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 + */ + +import "objidl.idl"; + +interface IAssemblyCache; +interface IAssemblyCacheItem; + +typedef struct _FUSION_INSTALL_REFERENCE_ +{ + DWORD cbSize; + DWORD dwFlags; + GUID guidScheme; + LPCWSTR szIdentifier; + LPCWSTR szNonCannonicalData; +} FUSION_INSTALL_REFERENCE, *LPFUSION_INSTALL_REFERENCE; + +typedef struct _ASSEMBLY_INFO +{ + ULONG cbAssemblyInfo; + DWORD dwAssemblyFlags; + ULARGE_INTEGER uliAssemblySizeInKB; + LPWSTR pszCurrentAssemblyPathBuf; + ULONG cchBuf; +} ASSEMBLY_INFO; + +typedef const struct _FUSION_INSTALL_REFERENCE_ *LPCFUSION_INSTALL_REFERENCE; + +[ + object, + uuid(e707dcde-d1cd-11d2-bab9-00c04f8eceae), + pointer_default(unique), + local +] +interface IAssemblyCache : IUnknown +{ + HRESULT UninstallAssembly( + [in] DWORD flags, + [in] LPCWSTR name, + [in] LPCFUSION_INSTALL_REFERENCE ref, + [out, optional] ULONG *disp); + + HRESULT QueryAssemblyInfo( + [in] DWORD flags, + [in] LPCWSTR name, + [in, out] ASSEMBLY_INFO *info); + + HRESULT CreateAssemblyCacheItem( + [in] DWORD flags, + [in] PVOID reserved, + [out] IAssemblyCacheItem **item, + [in, optional] LPCWSTR name); + + HRESULT Reserved( + [out] IUnknown **reserved); + + HRESULT InstallAssembly( + [in] DWORD flags, + [in] LPCWSTR path, + [in] LPCFUSION_INSTALL_REFERENCE ref); +} + +[ + object, + uuid(9e3aaeb4-d1cd-11d2-bab9-00c04f8eceae), + pointer_default(unique), + local +] +interface IAssemblyCacheItem : IUnknown +{ + HRESULT CreateStream( + [in] DWORD flags, + [in] LPCWSTR name, + [in] DWORD format, + [in] DWORD format_flags, + [out] IStream **stream, + [in, optional] ULARGE_INTEGER *max_size); + + HRESULT Commit( + [in] DWORD flags, + [out, optional] ULONG *disp); + + HRESULT AbortItem(); +} + +cpp_quote("HRESULT WINAPI CreateAssemblyCache(IAssemblyCache**,DWORD);")

1 0

Hans Leidekker : sxs: Correct the spec entry for CreateAssemblyCache.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: da831f4bbe2136e530cfc110e7651761d51213f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da831f4bbe2136e530cfc110e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 3 15:08:26 2010 +0100 sxs: Correct the spec entry for CreateAssemblyCache. --- dlls/sxs/sxs.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sxs/sxs.spec b/dlls/sxs/sxs.spec index cd32a2e..e199bb1 100644 --- a/dlls/sxs/sxs.spec +++ b/dlls/sxs/sxs.spec @@ -1,2 +1,2 @@ -@ stdcall CreateAssemblyCache(long long) +@ stdcall CreateAssemblyCache(ptr long) @ stub CreateAssemblyNameObject

1 0

Hans Leidekker : sxs: Add a stub implementation of IAssemblyCache.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: d4f64121e83671ac10ed6ead04f1c19eb5586cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f64121e83671ac10ed6ead0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 3 15:09:08 2010 +0100 sxs: Add a stub implementation of IAssemblyCache. --- dlls/sxs/Makefile.in | 1 + dlls/sxs/cache.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sxs/sxs.c | 6 -- 3 files changed, 167 insertions(+), 6 deletions(-) diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in index f7ca361..f218293 100644 --- a/dlls/sxs/Makefile.in +++ b/dlls/sxs/Makefile.in @@ -1,6 +1,7 @@ MODULE = sxs.dll C_SRCS = \ + cache.c \ sxs.c @MAKE_DLL_RULES@ diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c new file mode 100644 index 0000000..b6cf47e --- /dev/null +++ b/dlls/sxs/cache.c @@ -0,0 +1,166 @@ +/* + * IAssemblyCache implementation + * + * Copyright 2010 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS +#define INITGUID + +#include "windef.h" +#include "winbase.h" +#include "ole2.h" +#include "winsxs.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(sxs); + +struct cache +{ + const IAssemblyCacheVtbl *vtbl; + LONG refs; +}; + +static HRESULT WINAPI cache_QueryInterface( + IAssemblyCache *iface, + REFIID riid, + void **obj ) +{ + struct cache *cache = (struct cache *)iface; + + TRACE("%p, %s, %p\n", cache, debugstr_guid(riid), obj); + + *obj = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IAssemblyCache)) + { + IUnknown_AddRef( iface ); + *obj = cache; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI cache_AddRef( IAssemblyCache *iface ) +{ + struct cache *cache = (struct cache *)iface; + return InterlockedIncrement( &cache->refs ); +} + +static ULONG WINAPI cache_Release( IAssemblyCache *iface ) +{ + struct cache *cache = (struct cache *)iface; + ULONG refs = InterlockedDecrement( &cache->refs ); + + if (!refs) + { + TRACE("destroying %p\n", cache); + HeapFree( GetProcessHeap(), 0, cache ); + } + return refs; +} + +static HRESULT WINAPI cache_UninstallAssembly( + IAssemblyCache *iface, + DWORD flags, + LPCWSTR name, + LPCFUSION_INSTALL_REFERENCE ref, + ULONG *disp ) +{ + FIXME("%p, 0x%08x, %s, %p, %p\n", iface, flags, debugstr_w(name), ref, disp); + return E_NOTIMPL; +} + +static HRESULT WINAPI cache_QueryAssemblyInfo( + IAssemblyCache *iface, + DWORD flags, + LPCWSTR name, + ASSEMBLY_INFO *info ) +{ + FIXME("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(name), info); + return E_NOTIMPL; +} + +static HRESULT WINAPI cache_CreateAssemblyCacheItem( + IAssemblyCache *iface, + DWORD flags, + PVOID reserved, + IAssemblyCacheItem **item, + LPCWSTR name ) +{ + FIXME("%p, 0x%08x, %p, %p, %s\n", iface, flags, reserved, item, debugstr_w(name)); + return E_NOTIMPL; +} + +static HRESULT WINAPI cache_Reserved( + IAssemblyCache *iface, + IUnknown **reserved) +{ + FIXME("%p\n", reserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI cache_InstallAssembly( + IAssemblyCache *iface, + DWORD flags, + LPCWSTR path, + LPCFUSION_INSTALL_REFERENCE ref ) +{ + FIXME("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(path), ref); + return E_NOTIMPL; +} + +static const IAssemblyCacheVtbl cache_vtbl = +{ + cache_QueryInterface, + cache_AddRef, + cache_Release, + cache_UninstallAssembly, + cache_QueryAssemblyInfo, + cache_CreateAssemblyCacheItem, + cache_Reserved, + cache_InstallAssembly +}; + +/****************************************************************** + * CreateAssemblyCache (SXS.@) + */ +HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) +{ + struct cache *cache; + + TRACE("%p, %u\n", obj, reserved); + + if (!obj) + return E_INVALIDARG; + + *obj = NULL; + + cache = HeapAlloc( GetProcessHeap(), 0, sizeof(struct cache) ); + if (!cache) + return E_OUTOFMEMORY; + + cache->vtbl = &cache_vtbl; + cache->refs = 1; + + *obj = (IAssemblyCache *)cache; + return S_OK; +} diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 76c2f85..f4fdd6c 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -42,9 +42,3 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } return TRUE; } - -HRESULT WINAPI CreateAssemblyCache(DWORD unimplemented, DWORD dwReserved) -{ - FIXME("%u %u stub\n", unimplemented, dwReserved); - return E_NOTIMPL; -}

1 0

Detlef Riekenberg : wer: Add a stub for WerReportSubmit.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 6f5421631c5b835a4123b32aed07bf55602fc341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5421631c5b835a4123b32ae… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 2 21:24:08 2010 +0100 wer: Add a stub for WerReportSubmit. --- dlls/wer/main.c | 28 ++++++++++++++++++++++++++++ dlls/wer/wer.spec | 2 +- 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index d78da3e..585ac91 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -291,3 +291,31 @@ HRESULT WINAPI WerReportSetParameter(HREPORT hreport, DWORD id, PCWSTR name, PCW return E_NOTIMPL; } + +/*********************************************************************** + * WerReportSubmit (wer.@) + * + * Ask the user for permission and send the error report + * then kill or restart the application, when requested + * + * PARAMS + * hreport [i] error reporting handle to send + * consent [i] current transmit permission + * flags [i] flag to select dialog, transmission snd restart options + * presult [o] ptr, where the transmission result should be saved + * + * RETURNS + * Success: S_OK + * Failure: A HRESULT error code + * + */ +HRESULT WINAPI WerReportSubmit(HREPORT hreport, WER_CONSENT consent, DWORD flags, PWER_SUBMIT_RESULT presult) +{ + FIXME("(%p, %d, 0x%x, %p) :stub\n", hreport, consent, flags, presult); + + if(!presult) + return E_INVALIDARG; + + *presult = WerDisabled; + return E_NOTIMPL; +} diff --git a/dlls/wer/wer.spec b/dlls/wer/wer.spec index 5e6fb52..4303c20 100644 --- a/dlls/wer/wer.spec +++ b/dlls/wer/wer.spec @@ -69,7 +69,7 @@ @ stdcall WerReportCreate(wstr long ptr ptr) @ stdcall WerReportSetParameter(ptr long wstr wstr) @ stub WerReportSetUIOption -@ stub WerReportSubmit +@ stdcall WerReportSubmit(ptr long long ptr) @ stub WerpGetReportConsent @ stub WerpIsDisabled @ stub WerpOpenUserQueue

1 0

Hans Leidekker : msi: Don't crash if there is no feature parent.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: aef0aa30fd8ef50cf3915bc94a26fbfb572c1407 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef0aa30fd8ef50cf3915bc94… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 3 15:04:07 2010 +0100 msi: Don't crash if there is no feature parent. --- dlls/msi/dialog.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1221531..a68d953 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2258,7 +2258,11 @@ msi_seltree_add_child_features( MSIPACKAGE *package, HWND hwnd, LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) { - if ( strcmpW( parent, feature->Feature_Parent ) ) + if ( parent && feature->Feature_Parent && strcmpW( parent, feature->Feature_Parent )) + continue; + else if ( parent && !feature->Feature_Parent ) + continue; + else if ( !parent && feature->Feature_Parent ) continue; if ( !feature->Title )

1 0

Hans Leidekker : msi: Components don't require a key path.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 566e67a491306e31e21773252255e9d04b9d7737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566e67a491306e31e21773252… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 3 15:04:49 2010 +0100 msi: Components don't require a key path. --- dlls/msi/action.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3ebf286..8a25c1a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3358,10 +3358,11 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) } comp->Action = INSTALLSTATE_LOCAL; - file = get_loaded_file( package, comp->KeyPath ); - if (!file) + if (!comp->KeyPath || !(file = get_loaded_file( package, comp->KeyPath ))) + { + TRACE("component has no key path\n"); return ERROR_SUCCESS; - + } ui_actiondata( package, szRegisterTypeLibraries, row ); module = LoadLibraryExW( file->TargetPath, NULL, LOAD_LIBRARY_AS_DATAFILE );

1 0

Adam Martinson : msxml3: Implement XSLPattern collection methods.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: e16914963e168e36e0b6a02f93e2f229df8226e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16914963e168e36e0b6a02f9… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Tue Nov 2 16:12:21 2010 -0500 msxml3: Implement XSLPattern collection methods. --- dlls/msxml3/queryresult.c | 1 - dlls/msxml3/tests/domdoc.c | 223 ++++++++++++++++++-------------------------- dlls/msxml3/xslpattern.y | 109 +++++++++++++++++++--- 3 files changed, 186 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e16914963e168e36e0b6a…

1 0

Detlef Riekenberg : wer: Implement WerReportCreate and WerReportCloseHandle .
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: ab47cca2fb7779e5f24c9738990f296fd46e5839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab47cca2fb7779e5f24c97389… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 1 23:08:45 2010 +0100 wer: Implement WerReportCreate and WerReportCloseHandle. --- dlls/wer/main.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/wer/tests/main.c | 3 -- 2 files changed, 81 insertions(+), 7 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 289d01e..539eac4 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -23,10 +23,44 @@ #include "windef.h" #include "winbase.h" #include "werapi.h" +#include "wine/list.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wer); +typedef struct { + struct list entry; + WER_REPORT_INFORMATION info; + WER_REPORT_TYPE reporttype; + WCHAR eventtype[1]; +} report_t; + + +static CRITICAL_SECTION report_table_cs; +static CRITICAL_SECTION_DEBUG report_table_cs_debug = +{ + 0, 0, &report_table_cs, + { &report_table_cs_debug.ProcessLocksList, &report_table_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": report_table_cs") } +}; +static CRITICAL_SECTION report_table_cs = { &report_table_cs_debug, -1, 0, 0, 0, 0 }; + +static struct list report_table = LIST_INIT(report_table); + +/*********************************************************************** + * Memory alloccation helper + */ + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline BOOL heap_free(void *mem) +{ + return HeapFree(GetProcessHeap(), 0, mem); +} + HRESULT WINAPI WerAddExcludedApplication(PCWSTR exeName, BOOL allUsers) { FIXME("(%s, %d) stub\n",debugstr_w(exeName), allUsers); @@ -86,9 +120,29 @@ HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR exeName, BOOL allUsers) */ HRESULT WINAPI WerReportCloseHandle(HREPORT hreport) { - FIXME("(%p) :stub\n", hreport); + report_t * report = (report_t *) hreport; + report_t * cursor; + BOOL found = FALSE; + + TRACE("(%p)\n", hreport); + EnterCriticalSection(&report_table_cs); + if (report) { + LIST_FOR_EACH_ENTRY(cursor, &report_table, report_t, entry) + { + if (cursor == report) { + found = TRUE; + list_remove(&report->entry); + break; + } + } + } + LeaveCriticalSection(&report_table_cs); + if (!found) + return E_INVALIDARG; - return E_NOTIMPL; + heap_free(report); + + return S_OK; } /*********************************************************************** @@ -113,8 +167,10 @@ HRESULT WINAPI WerReportCloseHandle(HREPORT hreport) */ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWER_REPORT_INFORMATION reportinfo, HREPORT *phandle) { + report_t *report; + DWORD len; - FIXME("(%s, %d, %p, %p) :stub\n", debugstr_w(eventtype), reporttype, reportinfo, phandle); + TRACE("(%s, %d, %p, %p)\n", debugstr_w(eventtype), reporttype, reportinfo, phandle); if (reportinfo) { TRACE(".wzFriendlyEventName: %s\n", debugstr_w(reportinfo->wzFriendlyEventName)); TRACE(".wzApplicationName: %s\n", debugstr_w(reportinfo->wzApplicationName)); @@ -125,7 +181,28 @@ HRESULT WINAPI WerReportCreate(PCWSTR eventtype, WER_REPORT_TYPE reporttype, PWE return E_INVALIDARG; } - return E_NOTIMPL; + len = lstrlenW(eventtype) + 1; + + report = heap_alloc_zero(len * sizeof(WCHAR) + sizeof(report_t)); + if (!report) + return __HRESULT_FROM_WIN32(ERROR_OUTOFMEMORY); + + lstrcpyW(report->eventtype, eventtype); + report->reporttype = reporttype; + + if (reportinfo) { + report->info = *reportinfo; + } else { + FIXME("build report information from scratch for %p\n", report); + } + + EnterCriticalSection(&report_table_cs); + list_add_head(&report_table, &report->entry); + LeaveCriticalSection(&report_table_cs); + + *phandle = report; + TRACE("=> %p\n", report); + return S_OK; } /*********************************************************************** diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index a431789..f63b7bd 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -111,7 +111,6 @@ static void test_WerReportCloseHandle(void) report = (void *) 0xdeadbeef; hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); - todo_wine ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) { @@ -143,8 +142,6 @@ static void test_WerReportCreate(void) report = (void *) 0xdeadbeef; /* test a simple valid case */ hr = WerReportCreate(appcrash, WerReportCritical, NULL, &report); - - todo_wine ok(hr == S_OK, "got 0x%x and %p (expected S_OK)\n", hr, report); if (!report) {

1 0

Detlef Riekenberg : wer: Implement Wer*ExcludedApplication.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: f47d2118b148418db65f55a9421ceb4079081270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47d2118b148418db65f55a94… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Nov 2 21:08:54 2010 +0100 wer: Implement Wer*ExcludedApplication. --- dlls/wer/Makefile.in | 1 + dlls/wer/main.c | 86 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/wer/Makefile.in b/dlls/wer/Makefile.in index e90dcc0..6916c19 100644 --- a/dlls/wer/Makefile.in +++ b/dlls/wer/Makefile.in @@ -1,5 +1,6 @@ MODULE = wer.dll IMPORTLIB = wer +IMPORTS = advapi32 C_SRCS = \ main.c diff --git a/dlls/wer/main.c b/dlls/wer/main.c index 539eac4..d78da3e 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -1,5 +1,6 @@ /* * Copyright 2010 Louis Lenders + * Copyright 2010 Detlef Riekenberg * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,8 +23,10 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "werapi.h" #include "wine/list.h" +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wer); @@ -47,6 +50,11 @@ static CRITICAL_SECTION report_table_cs = { &report_table_cs_debug, -1, 0, 0, 0, static struct list report_table = LIST_INIT(report_table); +static WCHAR regpath_exclude[] = {'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', + 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; + /*********************************************************************** * Memory alloccation helper */ @@ -61,12 +69,6 @@ static inline BOOL heap_free(void *mem) return HeapFree(GetProcessHeap(), 0, mem); } -HRESULT WINAPI WerAddExcludedApplication(PCWSTR exeName, BOOL allUsers) -{ - FIXME("(%s, %d) stub\n",debugstr_w(exeName), allUsers); - return E_NOTIMPL; -} - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -86,6 +88,47 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } /*********************************************************************** + * WerAddExcludedApplication (wer.@) + * + * Add an application to the user specific or the system wide exclusion list + * + * PARAMS + * exeName [i] The application name + * allUsers [i] for all users (TRUE) or for the current user (FALSE) + * + * RETURNS + * Success: S_OK + * Faulure: A HRESULT error code + * + */ +HRESULT WINAPI WerAddExcludedApplication(PCWSTR exeName, BOOL allUsers) +{ + HKEY hkey; + DWORD value = 1; + LPWSTR bs; + + TRACE("(%s, %d)\n",debugstr_w(exeName), allUsers); + if (!exeName || !exeName[0]) + return E_INVALIDARG; + + bs = strrchrW(exeName, '\\'); + if (bs) { + bs++; /* skip the backslash */ + if (!bs[0]) { + return E_INVALIDARG; + } + } else + bs = (LPWSTR) exeName; + + if (!RegCreateKeyW(allUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, regpath_exclude, &hkey)) { + RegSetValueExW(hkey, bs, 0, REG_DWORD, (LPBYTE)&value, sizeof(DWORD)); + RegCloseKey(hkey); + return S_OK; + } + return E_ACCESSDENIED; +} + +/*********************************************************************** * WerRemoveExcludedApplication (wer.@) * * remove an application from the exclusion list @@ -94,15 +137,36 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) * exeName [i] The application name * allUsers [i] for all users (TRUE) or for the current user (FALSE) * - * RESULTS - * SUCCESS S_OK - * FAILURE A HRESULT error code + * RETURNS + * Success: S_OK + * Faulure: A HRESULT error code * */ HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR exeName, BOOL allUsers) { - FIXME("(%s, %d) :stub\n",debugstr_w(exeName), allUsers); - return E_NOTIMPL; + HKEY hkey; + LPWSTR bs; + LONG lres; + + TRACE("(%s, %d)\n",debugstr_w(exeName), allUsers); + if (!exeName || !exeName[0]) + return E_INVALIDARG; + + bs = strrchrW(exeName, '\\'); + if (bs) { + bs++; /* skip the backslash */ + if (!bs[0]) { + return E_INVALIDARG; + } + } else + bs = (LPWSTR) exeName; + + if (!RegCreateKeyW(allUsers ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER, regpath_exclude, &hkey)) { + lres = RegDeleteValueW(hkey, bs); + RegCloseKey(hkey); + return lres ? __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND) : S_OK; + } + return E_ACCESSDENIED; } /***********************************************************************

1 0