January 2009 - Wine-commits

Alistair Leslie-Hughes : mshtml: Add missing interfaces.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: a1b4ee8866c6ed7ed0a62f604ac8426a2e9631da URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b4ee8866c6ed7ed0a62f604… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 28 16:59:34 2009 +1100 mshtml: Add missing interfaces. --- dlls/mshtml/htmlcomment.c | 4 +- dlls/mshtml/htmltextnode.c | 4 +- include/mshtml.idl | 453 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 457 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1b4ee8866c6ed7ed0a62…

1 0

Aric Stewart : msctf: Add stub ITfThreadMgr interface.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 43db8477af7b0960bb3383d856640154e04192ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=43db8477af7b0960bb3383d85… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 27 14:15:30 2009 -0600 msctf: Add stub ITfThreadMgr interface. --- dlls/msctf/Makefile.in | 3 +- dlls/msctf/msctf.c | 5 + dlls/msctf/msctf_internal.h | 26 +++++ dlls/msctf/threadmgr.c | 214 +++++++++++++++++++++++++++++++++++++++++++ include/msctf.idl | 51 ++++++++++ 5 files changed, 298 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index f8c22ad..6872551 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -7,7 +7,8 @@ IMPORTS = uuid ole32 user32 advapi32 kernel32 ntdll C_SRCS = \ msctf.c \ - regsvr.c + regsvr.c \ + threadmgr.c @MAKE_DLL_RULES@ diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 564eb73..76ed99d 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -31,7 +31,11 @@ #include "winreg.h" #include "shlwapi.h" #include "shlguid.h" +#include "comcat.h" #include "initguid.h" +#include "msctf.h" + +#include "msctf_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(msctf); @@ -45,6 +49,7 @@ static const struct { REFCLSID clsid; LPFNCONSTRUCTOR ctor; } ClassesTable[] = { + {&CLSID_TF_ThreadMgr, ThreadMgr_Constructor}, {NULL, NULL} }; diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h new file mode 100644 index 0000000..b8fd3ba --- /dev/null +++ b/dlls/msctf/msctf_internal.h @@ -0,0 +1,26 @@ +/* + * Internal header for msctf.dll + * + * Copyright 2008 Aric Stewart, 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 + */ + +#ifndef __WINE_MSCTF_I_H +#define __WINE_MSCTF_I_H + +extern HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); + +#endif /* __WINE_MSCTF_I_H */ diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c new file mode 100644 index 0000000..1867570 --- /dev/null +++ b/dlls/msctf/threadmgr.c @@ -0,0 +1,214 @@ +/* + * ITfThreadMgr implementation + * + * Copyright 2008 Aric Stewart, 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "wine/unicode.h" + +#include "msctf.h" +#include "msctf_internal.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +typedef struct tagACLMulti { + const ITfThreadMgrVtbl *ThreadMgrVtbl; + LONG refCount; +} ThreadMgr; + +static void ThreadMgr_Destructor(ThreadMgr *This) +{ + TRACE("destroying %p\n", This); + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = (ThreadMgr *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfThreadMgr)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ThreadMgr_AddRef(ITfThreadMgr *iface) +{ + ThreadMgr *This = (ThreadMgr *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI ThreadMgr_Release(ITfThreadMgr *iface) +{ + ThreadMgr *This = (ThreadMgr *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + ThreadMgr_Destructor(This); + return ret; +} + +/***************************************************** + * ITfThreadMgr functions + *****************************************************/ + +static HRESULT WINAPI ThreadMgr_fnActivate( ITfThreadMgr* iface, TfClientId *ptid) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_fnDeactivate( ITfThreadMgr* iface) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_CreateDocumentMgr( ITfThreadMgr* iface, ITfDocumentMgr +**ppdim) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDocumentMgrs +**ppEnum) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_GetFocus( ITfThreadMgr* iface, ITfDocumentMgr +**ppdimFocus) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_SetFocus( ITfThreadMgr* iface, ITfDocumentMgr *pdimFocus) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_AssociateFocus( ITfThreadMgr* iface, HWND hwnd, +ITfDocumentMgr *pdimNew, ITfDocumentMgr **ppdimPrev) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_IsThreadFocus( ITfThreadMgr* iface, BOOL *pfThreadFocus) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_GetFunctionProvider( ITfThreadMgr* iface, REFCLSID clsid, +ITfFunctionProvider **ppFuncProv) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_EnumFunctionProviders( ITfThreadMgr* iface, +IEnumTfFunctionProviders **ppEnum) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI ThreadMgr_GetGlobalCompartment( ITfThreadMgr* iface, +ITfCompartmentMgr **ppCompMgr) +{ + ThreadMgr *This = (ThreadMgr *)iface; + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfThreadMgrVtbl ThreadMgr_ThreadMgrVtbl = +{ + ThreadMgr_QueryInterface, + ThreadMgr_AddRef, + ThreadMgr_Release, + + ThreadMgr_fnActivate, + ThreadMgr_fnDeactivate, + ThreadMgr_CreateDocumentMgr, + ThreadMgr_EnumDocumentMgrs, + ThreadMgr_GetFocus, + ThreadMgr_SetFocus, + ThreadMgr_AssociateFocus, + ThreadMgr_IsThreadFocus, + ThreadMgr_GetFunctionProvider, + ThreadMgr_EnumFunctionProviders, + ThreadMgr_GetGlobalCompartment +}; + +HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + ThreadMgr *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(ThreadMgr)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->ThreadMgrVtbl= &ThreadMgr_ThreadMgrVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + return S_OK; +} diff --git a/include/msctf.idl b/include/msctf.idl index 52683d3..2ef8b07 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -24,3 +24,54 @@ import "comcat.idl"; #endif cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") + +typedef [uuid(de403c21-89fd-4f85-8b87-64584d063fbc)] DWORD TfClientId; + +interface ITfDocumentMgr; +interface IEnumTfDocumentMgrs; +interface ITfFunctionProvider; +interface IEnumTfFunctionProviders; +interface ITfCompartmentMgr; + +[ + object, + uuid(aa80e801-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface ITfThreadMgr: IUnknown +{ + HRESULT Activate( + [out] TfClientId *ptid); + + HRESULT Deactivate(); + + HRESULT CreateDocumentMgr( + [out] ITfDocumentMgr **ppdim); + + HRESULT EnumDocumentMgrs( + [out] IEnumTfDocumentMgrs **ppEnum); + + HRESULT GetFocus( + [out] ITfDocumentMgr **ppdimFocus); + + HRESULT SetFocus( + [in] ITfDocumentMgr *pdimFocus); + + HRESULT AssociateFocus( + [in] HWND hwnd, + [in, unique] ITfDocumentMgr *pdimNew, + [out] ITfDocumentMgr **ppdimPrev); + + HRESULT IsThreadFocus( + [out] BOOL *pfThreadFocus); + + HRESULT GetFunctionProvider( + [in] REFCLSID clsid, + [out] ITfFunctionProvider **ppFuncProv); + + HRESULT EnumFunctionProviders( + [out] IEnumTfFunctionProviders **ppEnum); + + HRESULT GetGlobalCompartment( + [out] ITfCompartmentMgr **ppCompMgr); +};

1 0

Austin English : authz: Add stub dll.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 78cffc6e912b3dae712b6c5604ad970a5fd3518d URL: http://source.winehq.org/git/wine.git/?a=commit;h=78cffc6e912b3dae712b6c560… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 27 23:01:17 2009 -0600 authz: Add stub dll. --- configure | 9 +++++++++ configure.ac | 1 + dlls/authz/Makefile.in | 13 +++++++++++++ dlls/authz/authz.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/authz/authz.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 109 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 873aa21..162775d 100755 --- a/configure +++ b/configure @@ -24134,6 +24134,14 @@ dlls/atl/Makefile: dlls/atl/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/atl/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/authz/Makefile" +test "x$enable_authz" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + authz" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/authz/Makefile: dlls/authz/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/authz/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/avicap32/Makefile" test "x$enable_avicap32" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ avicap32" @@ -28293,6 +28301,7 @@ do "dlls/amstream/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/amstream/Makefile" ;; "dlls/appwiz.cpl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/appwiz.cpl/Makefile" ;; "dlls/atl/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/atl/Makefile" ;; + "dlls/authz/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/authz/Makefile" ;; "dlls/avicap32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avicap32/Makefile" ;; "dlls/avifil32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/avifil32/Makefile" ;; "dlls/browseui/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/browseui/Makefile" ;; diff --git a/configure.ac b/configure.ac index acacf4c..06e3678 100644 --- a/configure.ac +++ b/configure.ac @@ -1809,6 +1809,7 @@ WINE_CONFIG_MAKEFILE([dlls/advpack/tests/Makefile],[dlls/Maketest.rules],[dlls], WINE_CONFIG_MAKEFILE([dlls/amstream/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/appwiz.cpl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/atl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/authz/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avicap32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/avifil32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/browseui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/authz/Makefile.in b/dlls/authz/Makefile.in new file mode 100644 index 0000000..0592efc --- /dev/null +++ b/dlls/authz/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = authz.dll +IMPORTS = kernel32 + +C_SRCS = \ + authz.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c new file mode 100644 index 0000000..6e98aac --- /dev/null +++ b/dlls/authz/authz.c @@ -0,0 +1,44 @@ +/* + * AUTHZ Implementation + * + * Copyright 2009 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(authz); + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + default: + break; + } + + return TRUE; +} diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec new file mode 100644 index 0000000..bc3010e --- /dev/null +++ b/dlls/authz/authz.spec @@ -0,0 +1,42 @@ +@ stub AuthzAccessCheck +@ stub AuthzAddSidsToContext +@ stub AuthzCachedAccessCheck +@ stub AuthzEnumerateSecurityEventSources +@ stub AuthzEvaluateSacl +@ stub AuthzFreeAuditEvent +@ stub AuthzFreeContext +@ stub AuthzFreeHandle +@ stub AuthzFreeResourceManager +@ stub AuthzGetInformationFromContext +@ stub AuthzInitializeContextFromAuthzContext +@ stub AuthzInitializeContextFromSid +@ stub AuthzInitializeContextFromToken +@ stub AuthzInitializeObjectAccessAuditEvent +@ stub AuthzInitializeObjectAccessAuditEvent2 +@ stub AuthzInitializeResourceManager +@ stub AuthzInstallSecurityEventSource +@ stub AuthzOpenObjectAudit +@ stub AuthzRegisterSecurityEventSource +@ stub AuthzReportSecurityEvent +@ stub AuthzReportSecurityEventFromParams +@ stub AuthzUninstallSecurityEventSource +@ stub AuthzUnregisterSecurityEventSource +@ stub AuthziAllocateAuditParams +@ stub AuthziCheckContextMembership +@ stub AuthziFreeAuditEventType +@ stub AuthziFreeAuditParams +@ stub AuthziFreeAuditQueue +@ stub AuthziGenerateAdminAlertAuditW +@ stub AuthziInitializeAuditEvent +@ stub AuthziInitializeAuditEventType +@ stub AuthziInitializeAuditParams +@ stub AuthziInitializeAuditParamsFromArray +@ stub AuthziInitializeAuditParamsWithRM +@ stub AuthziInitializeAuditQueue +@ stub AuthziInitializeContextFromSid +@ stub AuthziLogAuditEvent +@ stub AuthziModifyAuditEvent2 +@ stub AuthziModifyAuditEvent +@ stub AuthziModifyAuditEventType +@ stub AuthziModifyAuditQueue +@ stub AuthziSourceAudit

1 0

Aric Stewart : msctf: Add regsvr functions.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 2e5a5620201d773ca9d4bf35c3d762167316ab03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e5a5620201d773ca9d4bf35c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 27 14:15:17 2009 -0600 msctf: Add regsvr functions. --- dlls/msctf/Makefile.in | 3 +- dlls/msctf/msctf.spec | 4 +- dlls/msctf/regsvr.c | 482 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 486 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2e5a5620201d773ca9d4b…

1 0

Aric Stewart : msctf: Add definition of CLSID_TF_ThreadMgr.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: b8416b9ccb9b9071b149d97090ce41a09a563837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8416b9ccb9b9071b149d9709… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 27 14:15:23 2009 -0600 msctf: Add definition of CLSID_TF_ThreadMgr. --- .gitignore | 1 + dlls/msctf/regsvr.c | 8 ++++++++ dlls/uuid/uuid.c | 1 + include/Makefile.in | 1 + include/msctf.idl | 26 ++++++++++++++++++++++++++ 5 files changed, 37 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 65a0470..d9c831e 100644 --- a/.gitignore +++ b/.gitignore @@ -165,6 +165,7 @@ include/mimeole.h include/mlang.h include/mmstream.h include/mscoree.h +include/msctf.h include/mshtmhst.h include/mshtml.h include/msinkaut.h diff --git a/dlls/msctf/regsvr.c b/dlls/msctf/regsvr.c index f1d3b48..c461cd8 100644 --- a/dlls/msctf/regsvr.c +++ b/dlls/msctf/regsvr.c @@ -30,6 +30,7 @@ #include "ole2.h" #include "shlguid.h" +#include "msctf.h" #include "wine/debug.h" @@ -440,6 +441,13 @@ error_close_progid_key: * coclass list */ static struct regsvr_coclass const coclass_list[] = { + { + &CLSID_TF_ThreadMgr, + "TF_ThreadMgr", + NULL, + "msctf.dll", + "Apartment" + }, { NULL } /* list terminator */ }; diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 94f345e..1196080 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -109,3 +109,4 @@ DEFINE_GUID(CLSID_StdEvent, 0x0000032b,0x0000,0x0000,0xc0,0x00,0x0 DEFINE_GUID(CLSID_ManualResetEvent, 0x0000032c,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_SynchronizeContainer, 0x0000032d,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); +DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); diff --git a/include/Makefile.in b/include/Makefile.in index d6109ab..5056c3f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -43,6 +43,7 @@ PUBLIC_IDL_H_SRCS = \ mlang.idl \ mmstream.idl \ mscoree.idl \ + msctf.idl \ mshtmhst.idl \ mshtml.idl \ msinkaut.idl \ diff --git a/include/msctf.idl b/include/msctf.idl new file mode 100644 index 0000000..52683d3 --- /dev/null +++ b/include/msctf.idl @@ -0,0 +1,26 @@ +/* + * Copyright 2008 Aric Stewart, 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 + */ + +#ifndef DO_NO_IMPORTS +import "oaidl.idl"; +import "comcat.idl"; +/* import "textstor.idl"; */ +/* import "ctfutb.idl"; */ +#endif + +cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;")

1 0

Ricardo Filipe : pdh: Add stub for EdhEnumObjectItemsA/W.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: cb8297623a8277d3acd039596ac420a83669a753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8297623a8277d3acd039596… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Tue Jan 27 16:39:32 2009 +0000 pdh: Add stub for EdhEnumObjectItemsA/W. --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 28 ++++++++++++++++++++++++++++ include/pdh.h | 3 +++ include/pdhmsg.h | 1 + 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index ad46f40..0e1ea84 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -28,10 +28,10 @@ @ stub PdhEnumMachinesHA @ stub PdhEnumMachinesHW @ stub PdhEnumMachinesW -@ stub PdhEnumObjectItemsA +@ stdcall PdhEnumObjectItemsA(str str str ptr ptr ptr ptr long long) @ stub PdhEnumObjectItemsHA @ stub PdhEnumObjectItemsHW -@ stub PdhEnumObjectItemsW +@ stdcall PdhEnumObjectItemsW(wstr wstr wstr ptr ptr ptr ptr long long) @ stub PdhEnumObjectsA @ stub PdhEnumObjectsHA @ stub PdhEnumObjectsHW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 423f033..4a32cf5 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1059,3 +1059,31 @@ PDH_STATUS WINAPI PdhValidatePathExW( PDH_HLOG source, LPCWSTR path ) } return PdhValidatePathW( path ); } + +/*********************************************************************** + * PdhEnumObjectItemsA (PDH.@) + */ +PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR szDataSource, LPCSTR szMachineName, LPCSTR szObjectName, + LPSTR mszCounterList, LPDWORD pcchCounterListLength, LPSTR mszInstanceList, + LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) +{ + FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szMachineName), + debugstr_a(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, + pcchInstanceListLength, dwDetailLevel, dwFlags); + + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhEnumObjectItemsW (PDH.@) + */ +PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineName, LPCWSTR szObjectName, + LPWSTR mszCounterList, LPDWORD pcchCounterListLength, LPWSTR mszInstanceList, + LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) +{ + FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szMachineName), + debugstr_w(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, + pcchInstanceListLength, dwDetailLevel, dwFlags); + + return PDH_NOT_IMPLEMENTED; +} diff --git a/include/pdh.h b/include/pdh.h index 7018247..082f5cc 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -175,6 +175,9 @@ PDH_STATUS WINAPI PdhCloseQuery(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryData(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryDataEx(PDH_HQUERY, DWORD, HANDLE); PDH_STATUS WINAPI PdhCollectQueryDataWithTime(PDH_HQUERY,LONGLONG *); +PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR, LPCSTR, LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD, DWORD, DWORD); +PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR, LPCWSTR, LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD, DWORD, DWORD); +#define PdhEnumObjectItems WINELIB_NAME_AW(PdhEnumObjectItems) PDH_STATUS WINAPI PdhGetCounterInfoA(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTER_INFO_A); PDH_STATUS WINAPI PdhGetCounterInfoW(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTER_INFO_W); #define PdhGetCounterInfo WINELIB_NAME_AW(PdhGetCounterInfo) diff --git a/include/pdhmsg.h b/include/pdhmsg.h index bee466e..f5bcbb3 100644 --- a/include/pdhmsg.h +++ b/include/pdhmsg.h @@ -33,6 +33,7 @@ #define PDH_CSTATUS_BAD_COUNTERNAME 0xc0000bc0 #define PDH_INSUFFICIENT_BUFFER 0xc0000bc2 #define PDH_INVALID_DATA 0xc0000bc6 +#define PDH_NOT_IMPLEMENTED 0xc0000bd3 #define PDH_STRING_NOT_FOUND 0xc0000bd4 #endif /* _PDH_MSG_H_ */

1 0

Aric Stewart : msctf: Add base dll framework.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: a74aeae6e4adb2e05de85ed78618cd9b6f8bbb50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74aeae6e4adb2e05de85ed78… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 27 14:15:08 2009 -0600 msctf: Add base dll framework. --- configure | 9 +++ configure.ac | 1 + dlls/msctf/Makefile.in | 13 ++++ dlls/msctf/msctf.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf.spec | 7 ++ 5 files changed, 219 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 5053163..873aa21 100755 --- a/configure +++ b/configure @@ -25526,6 +25526,14 @@ dlls/mscoree/Makefile: dlls/mscoree/Makefile.in dlls/Makedll.rules" ac_config_files="$ac_config_files dlls/mscoree/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/msctf/Makefile" +test "x$enable_msctf" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + msctf" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/msctf/Makefile: dlls/msctf/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/msctf/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/msdmo/Makefile" test "x$enable_msdmo" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ msdmo" @@ -28459,6 +28467,7 @@ do "dlls/mscms/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscms/Makefile" ;; "dlls/mscms/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscms/tests/Makefile" ;; "dlls/mscoree/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/mscoree/Makefile" ;; + "dlls/msctf/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msctf/Makefile" ;; "dlls/msdmo/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msdmo/Makefile" ;; "dlls/msftedit/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msftedit/Makefile" ;; "dlls/msg711.acm/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/msg711.acm/Makefile" ;; diff --git a/configure.ac b/configure.ac index 12cc8e2..acacf4c 100644 --- a/configure.ac +++ b/configure.ac @@ -1983,6 +1983,7 @@ WINE_CONFIG_MAKEFILE([dlls/mscat32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL WINE_CONFIG_MAKEFILE([dlls/mscms/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/mscms/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/mscoree/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/msctf/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msdmo/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msftedit/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/msg711.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in new file mode 100644 index 0000000..1505037 --- /dev/null +++ b/dlls/msctf/Makefile.in @@ -0,0 +1,13 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = msctf.dll +IMPORTS = uuid ole32 user32 advapi32 kernel32 ntdll + +C_SRCS = \ + msctf.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c new file mode 100644 index 0000000..564eb73 --- /dev/null +++ b/dlls/msctf/msctf.c @@ -0,0 +1,189 @@ +/* + * MSCTF Server DLL + * + * Copyright 2008 Aric Stewart, 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 "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" +#include "shlguid.h" +#include "initguid.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +LONG MSCTF_refCount = 0; + +HINSTANCE MSCTF_hinstance = 0; + +typedef HRESULT (*LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); + +static const struct { + REFCLSID clsid; + LPFNCONSTRUCTOR ctor; +} ClassesTable[] = { + {NULL, NULL} +}; + +typedef struct tagClassFactory +{ + const IClassFactoryVtbl *vtbl; + LONG ref; + LPFNCONSTRUCTOR ctor; +} ClassFactory; + +static void ClassFactory_Destructor(ClassFactory *This) +{ + TRACE("Destroying class factory %p\n", This); + HeapFree(GetProcessHeap(),0,This); + MSCTF_refCount--; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) +{ + *ppvOut = NULL; + if (IsEqualIID(riid, &IID_IClassFactory) || IsEqualIID(riid, &IID_IUnknown)) { + IClassFactory_AddRef(iface); + *ppvOut = iface; + return S_OK; + } + + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + ULONG ret = InterlockedDecrement(&This->ref); + + if (ret == 0) + ClassFactory_Destructor(This); + return ret; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID iid, LPVOID *ppvOut) +{ + ClassFactory *This = (ClassFactory *)iface; + HRESULT ret; + IUnknown *obj; + + TRACE("(%p, %p, %s, %p)\n", iface, punkOuter, debugstr_guid(iid), ppvOut); + ret = This->ctor(punkOuter, &obj); + if (FAILED(ret)) + return ret; + ret = IUnknown_QueryInterface(obj, iid, ppvOut); + IUnknown_Release(obj); + return ret; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + ClassFactory *This = (ClassFactory *)iface; + + TRACE("(%p)->(%x)\n", This, fLock); + + if(fLock) + InterlockedIncrement(&MSCTF_refCount); + else + InterlockedDecrement(&MSCTF_refCount); + + return S_OK; +} + +static const IClassFactoryVtbl ClassFactoryVtbl = { + /* IUnknown */ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + + /* IClassFactory*/ + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) +{ + ClassFactory *This = HeapAlloc(GetProcessHeap(),0,sizeof(ClassFactory)); + This->vtbl = &ClassFactoryVtbl; + This->ref = 1; + This->ctor = ctor; + *ppvOut = (LPVOID)This; + TRACE("Created class factory %p\n", This); + MSCTF_refCount++; + return S_OK; +} + +/************************************************************************* + * MSCTF DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) +{ + TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + MSCTF_hinstance = hinst; + break; + } + return TRUE; +} + +/************************************************************************* + * DllCanUnloadNow (MSCTF.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return MSCTF_refCount ? S_FALSE : S_OK; +} + +/*********************************************************************** + * DllGetClassObject (MSCTF.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *ppvOut) +{ + int i; + + *ppvOut = NULL; + if (!IsEqualIID(iid, &IID_IUnknown) && !IsEqualIID(iid, &IID_IClassFactory)) + return E_NOINTERFACE; + + for (i = 0; ClassesTable[i].clsid != NULL; i++) + if (IsEqualCLSID(ClassesTable[i].clsid, clsid)) { + return ClassFactory_Constructor(ClassesTable[i].ctor, ppvOut); + } + FIXME("CLSID %s not supported\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec new file mode 100644 index 0000000..4d73291 --- /dev/null +++ b/dlls/msctf/msctf.spec @@ -0,0 +1,7 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub SetInputScope +@ stub SetInputScopeXML +@ stub SetInputScopes

1 0

Hervé Chanal : shell32: A new icon for mydocs.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: c18d34048d0c51b8d4b4076cd9fddc9d6309d24f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c18d34048d0c51b8d4b4076cd… Author: Hervé Chanal <chanal_herve(a)yahoo.fr> Date: Tue Jan 27 16:46:05 2009 +0100 shell32: A new icon for mydocs. --- dlls/shell32/Makefile.in | 1 + dlls/shell32/mydocs.ico | Bin 318 -> 15086 bytes dlls/shell32/mydocs.svg | 946 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 947 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c18d34048d0c51b8d4b40…

1 0

Ricardo Filipe : ntdll: Add stub for RtlDecompressBuffer.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: 141dcff4412faa564a61f76ca8edef230a01917b URL: http://source.winehq.org/git/wine.git/?a=commit;h=141dcff4412faa564a61f76ca… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Tue Jan 27 16:02:04 2009 +0000 ntdll: Add stub for RtlDecompressBuffer. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/rtl.c | 13 +++++++++++++ include/winternl.h | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8e0058d..269df8f 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -503,7 +503,7 @@ @ stub RtlDebugPrintTimes @ stdcall RtlDecodePointer(ptr) # @ stub RtlDecodeSystemPointer -@ stub RtlDecompressBuffer +@ stdcall RtlDecompressBuffer(long ptr long ptr long ptr) @ stub RtlDecompressFragment @ stub RtlDefaultNpAcl @ stub RtlDelete diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 3f2f27e..f84c7c4 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -1095,3 +1095,16 @@ NTSTATUS WINAPI RtlCompressBuffer(USHORT CompressionFormatAndEngine, PUCHAR Unco return STATUS_NOT_IMPLEMENTED; } + +/****************************************************************************** + * RtlDecompressBuffer [NTDLL.@] + */ +NTSTATUS WINAPI RtlDecompressBuffer(USHORT CompressionFormat, PUCHAR UncompressedBuffer, + ULONG UncompressedBufferSize, PUCHAR CompressedBuffer, + ULONG CompressedBufferSize, PULONG FinalUncompressedSize) +{ + FIXME("0x%04x, %p, %u, %p, %u, %p :stub\n", CompressionFormat, UncompressedBuffer, UncompressedBufferSize, + CompressedBuffer, CompressedBufferSize, FinalUncompressedSize); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/include/winternl.h b/include/winternl.h index 5a014f4..1a11469 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2274,6 +2274,7 @@ NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); NTSYSAPI NTSTATUS WINAPI RtlCreateUserThread(HANDLE,const SECURITY_DESCRIPTOR*,BOOLEAN,PVOID,SIZE_T,SIZE_T,PRTL_THREAD_START_ROUTINE,void*,HANDLE*,CLIENT_ID*); NTSYSAPI void WINAPI RtlDeactivateActivationContext(DWORD,ULONG_PTR); +NTSYSAPI NTSTATUS WINAPI RtlDecompressBuffer(USHORT,PUCHAR,ULONG,PUCHAR,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI RtlDeleteAce(PACL,DWORD); NTSYSAPI NTSTATUS WINAPI RtlDeleteAtomFromAtomTable(RTL_ATOM_TABLE,RTL_ATOM); NTSYSAPI NTSTATUS WINAPI RtlDeleteCriticalSection(RTL_CRITICAL_SECTION *);

1 0

Paul Vriens : kernel32/tests: Don't crash when run as a normal user.
by Alexandre Julliard 28 Jan '09

28 Jan '09

Module: wine Branch: master Commit: cca75cc147cbca74003ab78dde41441c070417e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cca75cc147cbca74003ab78dd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jan 28 11:43:30 2009 +0100 kernel32/tests: Don't crash when run as a normal user. --- dlls/kernel32/tests/profile.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index e07ece3..59f9c2b 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -681,7 +681,14 @@ static void test_GetPrivateProfileString(const char *content, const char *descri ok(!lstrcmpA(buf, "default"), "Expected \"default\", got \"%s\"\n", buf); GetWindowsDirectoryA(windir, MAX_PATH); - GetTempFileNameA(windir, "pre", 0, path); + SetLastError(0xdeadbeef); + ret = GetTempFileNameA(windir, "pre", 0, path); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("Not allowed to create a file in the Windows directory\n"); + DeleteFileA(filename); + return; + } tempfile = strrchr(path, '\\') + 1; create_test_file(path, content, lstrlenA(content));

1 0