Update of /cvsroot/pywin32/pywin32/com/win32comext/shell/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12369/com/win32comext/shell/src
Modified Files:
Tag: py3k
shell.cpp
Log Message:
merge minor consolidations from the trunk
Index: shell.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/com/win32comext/shell/src/shell.cpp,v
retrieving revision 1.68.2.4
retrieving revision 1.68.2.5
diff -C2 -d -r1.68.2.4 -r1.68.2.5
*** shell.cpp 24 Nov 2008 06:14:33 -0000 1.68.2.4
--- shell.cpp 4 Dec 2008 00:07:22 -0000 1.68.2.5
***************
*** 2482,2486 ****
// @pymethod bool|shell|IsUserAnAdmin|Tests whether the current user is a member of the Administrator's group.
! // @rdesc The result is true or false.
static PyObject *PyIsUserAnAdmin(PyObject *self, PyObject *args)
{
--- 2482,2486 ----
// @pymethod bool|shell|IsUserAnAdmin|Tests whether the current user is a member of the Administrator's group.
! // @rdesc The result is true or false, or a com_error with E_NOTIMPL is raised.
static PyObject *PyIsUserAnAdmin(PyObject *self, PyObject *args)
{
***************
*** 3285,3295 ****
PYCOM_INTERFACE_CLIENT_ONLY(NameSpaceTreeControl),
PYCOM_INTERFACE_FULL(ExplorerCommand),
! PYCOM_INTERFACE_FULL(CopyHookA),
! PYCOM_INTERFACE_FULL(CopyHookW),
! // For b/w compat, Add IID_ICopyHook as IID_CopyHookA
! { &IID_ICopyHookA, "ICopyHook", "IID_ICopyHook", NULL, NULL },
! PYCOM_INTERFACE_IID_ONLY(ShellCopyHookA),
! PYCOM_INTERFACE_IID_ONLY(ShellCopyHookW),
! PYCOM_INTERFACE_IID_ONLY(ShellCopyHook),
PYCOM_INTERFACE_FULL(ShellItem),
PYCOM_INTERFACE_FULL(ShellItemArray),
--- 3285,3295 ----
PYCOM_INTERFACE_CLIENT_ONLY(NameSpaceTreeControl),
PYCOM_INTERFACE_FULL(ExplorerCommand),
! PYCOM_INTERFACE_FULL(CopyHookA),
! PYCOM_INTERFACE_FULL(CopyHookW),
! // For b/w compat, Add IID_ICopyHook as IID_CopyHookA
! { &IID_ICopyHookA, "ICopyHook", "IID_ICopyHook", NULL, NULL },
! PYCOM_INTERFACE_IID_ONLY(ShellCopyHookA),
! PYCOM_INTERFACE_IID_ONLY(ShellCopyHookW),
! PYCOM_INTERFACE_IID_ONLY(ShellCopyHook),
PYCOM_INTERFACE_FULL(ShellItem),
PYCOM_INTERFACE_FULL(ShellItemArray),
|
