March 2007 - Wine-Commits - list.winehq.org

Rob Shearman : oleaut32: Clear the input pvar structure in VARIANT_UserUnmarshal to free the data instead of just initializing .
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: bb08a58965d7c044380aa356b624e3dd778a78f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb08a58965d7c044380aa356b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 19 14:58:11 2007 +0000 oleaut32: Clear the input pvar structure in VARIANT_UserUnmarshal to free the data instead of just initializing. --- dlls/oleaut32/tests/usrmarshal.c | 1 - dlls/oleaut32/usrmarshal.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 1a9d25c..a168d8f 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1188,7 +1188,6 @@ static void test_marshal_VARIANT(void) V_VT(V_VARIANTREF(&v)), V_VT(V_VARIANTREF(&v3))); ok(V_R8(V_VARIANTREF(&v)) == V_R8(V_VARIANTREF(&v3)), "r8s differ\n"); VARIANT_UserFree(&umcb.Flags, &v3); - todo_wine ok(heap_unknown->refs == 1, "%d refcounts of IUnknown leaked\n", heap_unknown->refs - 1); IUnknown_Release((IUnknown *)heap_unknown); } diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 71d7d6b..eea46c6 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -554,7 +554,7 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar); ALIGN_POINTER(Buffer, 7); - VariantInit(pvar); + VariantClear(pvar); header = (variant_wire_t *)Buffer;

1 0

Rob Shearman : oleaut32: Make the VARIANT_UserUnmarshal tests work on XP.
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: 3ad77d29ca4e50f272ec96a7efea3328f9dd40b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ad77d29ca4e50f272ec96a7e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 19 14:57:22 2007 +0000 oleaut32: Make the VARIANT_UserUnmarshal tests work on XP. --- dlls/oleaut32/tests/usrmarshal.c | 301 ++++++++++++++++++++++---------------- 1 files changed, 173 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ad77d29ca4e50f272ec9…

1 0

Rob Shearman : oleaut32: Add some tests for user marshaling a VT_UNKNOWN variant.
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: 35772a70d3f414c19f1ea92f9f145b7c35f5009a URL: http://source.winehq.org/git/wine.git/?a=commit;h=35772a70d3f414c19f1ea92f9… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 19 14:54:57 2007 +0000 oleaut32: Add some tests for user marshaling a VT_UNKNOWN variant. --- dlls/oleaut32/tests/usrmarshal.c | 90 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 90 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 9bc282d..447b30e 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" @@ -404,6 +406,45 @@ static void test_marshal_BSTR(void) SysFreeString(b); } +typedef struct +{ + const IUnknownVtbl *lpVtbl; + ULONG refs; +} HeapUnknown; + +static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + if (IsEqualIID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *ppv = (LPVOID)iface; + return S_OK; + } + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI HeapUnknown_AddRef(IUnknown *iface) +{ + HeapUnknown *This = (HeapUnknown *)iface; + return InterlockedIncrement((LONG*)&This->refs); +} + +static ULONG WINAPI HeapUnknown_Release(IUnknown *iface) +{ + HeapUnknown *This = (HeapUnknown *)iface; + ULONG refs = InterlockedDecrement((LONG*)&This->refs); + if (!refs) HeapFree(GetProcessHeap(), 0, This); + return refs; +} + +static const IUnknownVtbl HeapUnknown_Vtbl = +{ + HeapUnknown_QueryInterface, + HeapUnknown_AddRef, + HeapUnknown_Release +}; + static void check_variant_header(DWORD *wirev, VARIANT *v, unsigned long size) { WORD *wp; @@ -445,6 +486,7 @@ static void test_marshal_VARIANT(void) SAFEARRAYBOUND sab; LPSAFEARRAY lpsa; DECIMAL dec, dec2; + HeapUnknown *heap_unknown; umcb.Flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); umcb.pReserve = NULL; @@ -1058,6 +1100,54 @@ static void test_marshal_VARIANT(void) VARIANT_UserFree(&umcb.Flags, &v3); } HeapFree(GetProcessHeap(), 0, buffer); + + /*** UNKNOWN ***/ + heap_unknown = HeapAlloc(GetProcessHeap(), 0, sizeof(*heap_unknown)); + heap_unknown->lpVtbl = &HeapUnknown_Vtbl; + heap_unknown->refs = 1; + VariantInit(&v); + VariantInit(&v2); + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = (IUnknown *)heap_unknown; + + size = VARIANT_UserSize(&umcb.Flags, 0, &v); + ok(size > 32, "size %ld\n", size); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + memset(buffer, 0xcc, size); + next = VARIANT_UserMarshal(&umcb.Flags, buffer, &v); + wirev = (DWORD*)buffer; + check_variant_header(wirev, &v, next - buffer); + wirev += 5; + + todo_wine + ok(*wirev == (DWORD_PTR)V_UNKNOWN(&v), "wv[5] %08x\n", *wirev); + wirev++; + todo_wine + ok(*wirev == next - buffer - 0x20, "wv[6] %08x\n", *wirev); + wirev++; + todo_wine + ok(*wirev == next - buffer - 0x20, "wv[7] %08x\n", *wirev); + wirev++; + todo_wine + ok(*wirev == 0x574f454d, "wv[8] %08x\n", *wirev); + if (VARIANT_UNMARSHAL_WORKS) + { + VARIANT v3; + VariantInit(&v3); + V_VT(&v3) = VT_UNKNOWN; + V_UNKNOWN(&v3) = (IUnknown *)heap_unknown; + IUnknown_AddRef(V_UNKNOWN(&v3)); + next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v3); + ok(V_VT(&v) == V_VT(&v3), "got vt %d expect %d\n", V_VT(&v), V_VT(&v3)); + ok(V_VT(V_VARIANTREF(&v)) == V_VT(V_VARIANTREF(&v3)), "vts differ %x %x\n", + V_VT(V_VARIANTREF(&v)), V_VT(V_VARIANTREF(&v3))); + ok(V_R8(V_VARIANTREF(&v)) == V_R8(V_VARIANTREF(&v3)), "r8s differ\n"); + VARIANT_UserFree(&umcb.Flags, &v3); + todo_wine + ok(heap_unknown->refs == 1, "%d refcounts of IUnknown leaked\n", heap_unknown->refs - 1); + IUnknown_Release((IUnknown *)heap_unknown); + } + HeapFree(GetProcessHeap(), 0, buffer); }

1 0

Rob Shearman : include: Fix the byte-order in the definition of the USER_MARSHAL_CB_SIGNATURE macro .
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: 6d4f63e73f6604a268be794d584f7f206300be74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4f63e73f6604a268be794d5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 19 14:56:39 2007 +0000 include: Fix the byte-order in the definition of the USER_MARSHAL_CB_SIGNATURE macro. --- include/rpcndr.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index 2c28020..8feab23 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -274,8 +274,8 @@ typedef struct _USER_MARSHAL_ROUTINE_QUADRUPLE /* 'USRC' */ #define USER_MARSHAL_CB_SIGNATURE \ - ( (DWORD)'U' | ( (DWORD)'S' << 8 ) | \ - ( (DWORD)'R' << 16 ) | ( (DWORD)'C' << 24 ) ) + ( ( (DWORD)'U' << 24 ) | ( (DWORD)'S' << 16 ) | \ + ( (DWORD)'R' << 8 ) | ( (DWORD)'C' ) ) typedef enum {

1 0

Rob Shearman : ole32: Implement TYMED_FILE for STGMEDIUM marshaling and unmarshaling.
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: 251bab8ac9909c2dcf4447918dfcd58349f95ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=251bab8ac9909c2dcf4447918… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 19 14:55:59 2007 +0000 ole32: Implement TYMED_FILE for STGMEDIUM marshaling and unmarshaling. --- dlls/ole32/usrmarshal.c | 69 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 785d268..550b201 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -35,6 +35,8 @@ #include "ole2.h" #include "oleauto.h" #include "rpcproxy.h" + +#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -1471,7 +1473,13 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM size = HGLOBAL_UserSize(pFlags, size, &pStgMedium->u.hGlobal); break; case TYMED_FILE: - FIXME("TYMED_FILE\n"); + TRACE("TYMED_FILE\n"); + if (pStgMedium->u.lpszFileName) + { + TRACE("file name is %s\n", debugstr_w(pStgMedium->u.lpszFileName)); + size += 3 * sizeof(DWORD) + + (strlenW(pStgMedium->u.lpszFileName) + 1) * sizeof(WCHAR); + } break; case TYMED_ISTREAM: FIXME("TYMED_ISTREAM\n"); @@ -1545,7 +1553,24 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p pBuffer = HGLOBAL_UserMarshal(pFlags, pBuffer, &pStgMedium->u.hGlobal); break; case TYMED_FILE: - FIXME("TYMED_FILE\n"); + TRACE("TYMED_FILE\n"); + if (pStgMedium->u.lpszFileName) + { + DWORD len; + len = strlenW(pStgMedium->u.lpszFileName); + /* conformance */ + *(DWORD *)pBuffer = len + 1; + pBuffer += sizeof(DWORD); + /* offset */ + *(DWORD *)pBuffer = 0; + pBuffer += sizeof(DWORD); + /* variance */ + *(DWORD *)pBuffer = len + 1; + pBuffer += sizeof(DWORD); + + TRACE("file name is %s\n", debugstr_w(pStgMedium->u.lpszFileName)); + memcpy(pBuffer, pStgMedium->u.lpszFileName, (len + 1) * sizeof(WCHAR)); + } break; case TYMED_ISTREAM: FIXME("TYMED_ISTREAM\n"); @@ -1595,7 +1620,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p */ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, STGMEDIUM *pStgMedium) { - DWORD content; + DWORD content = 0; DWORD releaseunk; ALIGN_POINTER(pBuffer, 3); @@ -1622,7 +1647,43 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char pBuffer = HGLOBAL_UserUnmarshal(pFlags, pBuffer, &pStgMedium->u.hGlobal); break; case TYMED_FILE: - FIXME("TYMED_FILE\n"); + TRACE("TYMED_FILE\n"); + if (content) + { + DWORD conformance; + DWORD variance; + conformance = *(DWORD *)pBuffer; + pBuffer += sizeof(DWORD); + if (*(DWORD *)pBuffer != 0) + { + ERR("invalid offset %d\n", *(DWORD *)pBuffer); + RpcRaiseException(RPC_S_INVALID_BOUND); + return NULL; + } + pBuffer += sizeof(DWORD); + variance = *(DWORD *)pBuffer; + pBuffer += sizeof(DWORD); + if (conformance != variance) + { + ERR("conformance (%d) and variance (%d) should be equal\n", + conformance, variance); + RpcRaiseException(RPC_S_INVALID_BOUND); + return NULL; + } + if (conformance > 0x7fffffff) + { + ERR("conformance 0x%x too large\n", conformance); + RpcRaiseException(RPC_S_INVALID_BOUND); + return NULL; + } + pStgMedium->u.lpszFileName = CoTaskMemAlloc(conformance * sizeof(WCHAR)); + if (!pStgMedium->u.lpszFileName) RpcRaiseException(ERROR_OUTOFMEMORY); + TRACE("unmarshalled file name is %s\n", debugstr_wn((const WCHAR *)pBuffer, variance)); + memcpy(pStgMedium->u.lpszFileName, pBuffer, variance * sizeof(WCHAR)); + pBuffer += variance * sizeof(WCHAR); + } + else + pStgMedium->u.lpszFileName = NULL; break; case TYMED_ISTREAM: FIXME("TYMED_ISTREAM\n");

1 0

Rob Shearman : ole32: Add warnings for failures in the structured storage stream functions.
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: 05e99099af7a7cee30c6d0c4b409f4bb2cbe46d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05e99099af7a7cee30c6d0c4b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Mar 19 14:53:41 2007 +0000 ole32: Add warnings for failures in the structured storage stream functions. --- dlls/ole32/stg_stream.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index 6f2ec9a..e144b2c 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -486,7 +486,10 @@ static HRESULT WINAPI StgStreamImpl_Seek( */ if (!This->parentStorage) + { + WARN("storage reverted\n"); return STG_E_REVERTED; + } /* * The caller is allowed to pass in NULL as the new position return value. @@ -515,6 +518,7 @@ static HRESULT WINAPI StgStreamImpl_Seek( *plibNewPosition = This->streamSize; break; default: + WARN("invalid dwOrigin %d\n", dwOrigin); return STG_E_INVALIDFUNCTION; } @@ -549,19 +553,28 @@ static HRESULT WINAPI StgStreamImpl_SetSize( TRACE("(%p, %d)\n", iface, libNewSize.u.LowPart); if(!This->parentStorage) + { + WARN("storage reverted\n"); return STG_E_REVERTED; + } /* * As documented. */ if (libNewSize.u.HighPart != 0) + { + WARN("invalid value for libNewSize.u.HighPart %d\n", libNewSize.u.HighPart); return STG_E_INVALIDFUNCTION; + } /* * Do we have permission? */ if (!(This->grfMode & (STGM_WRITE | STGM_READWRITE))) + { + WARN("access denied\n"); return STG_E_ACCESSDENIED; + } if (This->streamSize.u.LowPart == libNewSize.u.LowPart) return S_OK; @@ -669,7 +682,10 @@ static HRESULT WINAPI StgStreamImpl_CopyTo( */ if (!This->parentStorage) + { + WARN("storage reverted\n"); return STG_E_REVERTED; + } if ( pstm == 0 ) return STG_E_INVALIDPOINTER; @@ -703,6 +719,7 @@ static HRESULT WINAPI StgStreamImpl_CopyTo( if (bytesRead != bytesWritten) { hr = STG_E_MEDIUMFULL; + WARN("medium full\n"); break; } @@ -744,7 +761,10 @@ static HRESULT WINAPI StgStreamImpl_Commit( StgStreamImpl* const This=(StgStreamImpl*)iface; if (!This->parentStorage) + { + WARN("storage reverted\n"); return STG_E_REVERTED; + } return S_OK; } @@ -772,7 +792,10 @@ static HRESULT WINAPI StgStreamImpl_LockRegion( StgStreamImpl* const This=(StgStreamImpl*)iface; if (!This->parentStorage) + { + WARN("storage reverted\n"); return STG_E_REVERTED; + } FIXME("not implemented!\n"); return E_NOTIMPL; @@ -787,7 +810,10 @@ static HRESULT WINAPI StgStreamImpl_UnlockRegion( StgStreamImpl* const This=(StgStreamImpl*)iface; if (!This->parentStorage) + { + WARN("storage reverted\n"); return STG_E_REVERTED; + } FIXME("not implemented!\n"); return E_NOTIMPL; @@ -818,7 +844,10 @@ static HRESULT WINAPI StgStreamImpl_Stat( */ if (!This->parentStorage) + { + WARN("storage reverted\n"); return STG_E_REVERTED; + } /* * Read the information from the property. @@ -838,6 +867,7 @@ static HRESULT WINAPI StgStreamImpl_Stat( return S_OK; } + WARN("failed to read properties\n"); return E_FAIL; }

1 0

Jacek Caban : spoolsv: Added spoolsv.exe.
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: d1ddc9c1f72e796fba3997c07dc04a1d822a6e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ddc9c1f72e796fba3997c07… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 19 14:13:34 2007 +0100 spoolsv: Added spoolsv.exe. --- .gitignore | 1 + Makefile.in | 2 + configure | 3 ++ configure.ac | 1 + programs/Makefile.in | 2 + programs/spoolsv/Makefile.in | 14 +++++++++++++ programs/spoolsv/main.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 67 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 4003e3e..5bc66af 100644 --- a/.gitignore +++ b/.gitignore @@ -759,6 +759,7 @@ programs/regsvr32/regsvr32 programs/regsvr32/regsvr32.res programs/rpcss/rpcss programs/rundll32/rundll32 +programs/spoolsv/spoolsv programs/start/rsrc.res programs/start/start programs/taskmgr/font.bmp diff --git a/Makefile.in b/Makefile.in index 265acf3..7b3f8e0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -449,6 +449,7 @@ ALL_MAKEFILES = \ programs/regsvr32/Makefile \ programs/rpcss/Makefile \ programs/rundll32/Makefile \ + programs/spoolsv/Makefile \ programs/start/Makefile \ programs/taskmgr/Makefile \ programs/uninstaller/Makefile \ @@ -786,6 +787,7 @@ programs/regedit/Makefile: programs/regedit/Makefile.in programs/Makeprog.rules programs/regsvr32/Makefile: programs/regsvr32/Makefile.in programs/Makeprog.rules programs/rpcss/Makefile: programs/rpcss/Makefile.in programs/Makeprog.rules programs/rundll32/Makefile: programs/rundll32/Makefile.in programs/Makeprog.rules +programs/spoolsv/Makefile: programs/spoolsv/Makefile.in programs/Makeprog.rules programs/start/Makefile: programs/start/Makefile.in programs/Makeprog.rules programs/taskmgr/Makefile: programs/taskmgr/Makefile.in programs/Makeprog.rules programs/uninstaller/Makefile: programs/uninstaller/Makefile.in programs/Makeprog.rules diff --git a/configure b/configure index 5b56377..09acfea 100755 --- a/configure +++ b/configure @@ -20823,6 +20823,8 @@ ac_config_files="$ac_config_files programs/rpcss/Makefile" ac_config_files="$ac_config_files programs/rundll32/Makefile" +ac_config_files="$ac_config_files programs/spoolsv/Makefile" + ac_config_files="$ac_config_files programs/start/Makefile" ac_config_files="$ac_config_files programs/taskmgr/Makefile" @@ -21744,6 +21746,7 @@ do "programs/regsvr32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/regsvr32/Makefile" ;; "programs/rpcss/Makefile") CONFIG_FILES="$CONFIG_FILES programs/rpcss/Makefile" ;; "programs/rundll32/Makefile") CONFIG_FILES="$CONFIG_FILES programs/rundll32/Makefile" ;; + "programs/spoolsv/Makefile") CONFIG_FILES="$CONFIG_FILES programs/spoolsv/Makefile" ;; "programs/start/Makefile") CONFIG_FILES="$CONFIG_FILES programs/start/Makefile" ;; "programs/taskmgr/Makefile") CONFIG_FILES="$CONFIG_FILES programs/taskmgr/Makefile" ;; "programs/uninstaller/Makefile") CONFIG_FILES="$CONFIG_FILES programs/uninstaller/Makefile" ;; diff --git a/configure.ac b/configure.ac index abd544c..d38e84e 100644 --- a/configure.ac +++ b/configure.ac @@ -1809,6 +1809,7 @@ AC_CONFIG_FILES([programs/regedit/Makefile]) AC_CONFIG_FILES([programs/regsvr32/Makefile]) AC_CONFIG_FILES([programs/rpcss/Makefile]) AC_CONFIG_FILES([programs/rundll32/Makefile]) +AC_CONFIG_FILES([programs/spoolsv/Makefile]) AC_CONFIG_FILES([programs/start/Makefile]) AC_CONFIG_FILES([programs/taskmgr/Makefile]) AC_CONFIG_FILES([programs/uninstaller/Makefile]) diff --git a/programs/Makefile.in b/programs/Makefile.in index 1dbf5d4..f164c0b 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -24,6 +24,7 @@ SUBDIRS = \ regsvr32 \ rpcss \ rundll32 \ + spoolsv \ start \ taskmgr \ uninstaller \ @@ -63,6 +64,7 @@ INSTALLSUBDIRS = \ regsvr32 \ rpcss \ rundll32 \ + spoolsv \ start \ taskmgr \ uninstaller \ diff --git a/programs/spoolsv/Makefile.in b/programs/spoolsv/Makefile.in new file mode 100644 index 0000000..4ebf189 --- /dev/null +++ b/programs/spoolsv/Makefile.in @@ -0,0 +1,14 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = spoolsv.exe +APPMODE = -mconsole +IMPORTS = advapi32 kernel32 + +C_SRCS = \ + main.c + +(a)MAKE_PROG_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/programs/spoolsv/main.c b/programs/spoolsv/main.c new file mode 100644 index 0000000..365aff0 --- /dev/null +++ b/programs/spoolsv/main.c @@ -0,0 +1,44 @@ +/* + * Copyright 2007 Jacek Caban 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 + */ + +#define WIN32_LEAN_AND_MEAN + +#include <windows.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(spoolsv); + +static void WINAPI serv_main(DWORD argc, LPWSTR *argv) +{ + WINE_FIXME("(%d %p)\n", argc, argv); +} + +int main(int argc, char **argv) +{ + static WCHAR wszSPOOLER[] = {'S','P','O','O','L','E','R',0}; + static const SERVICE_TABLE_ENTRYW servtbl[] = { + {wszSPOOLER, serv_main}, + {NULL, NULL} + }; + + WINE_TRACE("(%d %p)\n", argc, argv); + + StartServiceCtrlDispatcherW(servtbl); + return 0; +}

1 0

Jacek Caban : advapi: Improve SetEntriesInAclW stub.
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: 2cd033eee1a2f442d40a4c1663d500ac7e5ef9c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd033eee1a2f442d40a4c166… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 19 15:05:52 2007 +0100 advapi: Improve SetEntriesInAclW stub. --- dlls/advapi32/security.c | 3 ++- dlls/advapi32/tests/security.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index a0b4b3c..1dbc5e3 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2921,7 +2921,8 @@ DWORD WINAPI SetEntriesInAclW( ULONG count, PEXPLICIT_ACCESSW pEntries, PACL OldAcl, PACL* NewAcl ) { FIXME("%d %p %p %p\n",count,pEntries,OldAcl,NewAcl); - return ERROR_CALL_NOT_IMPLEMENTED; + *NewAcl = NULL; + return ERROR_SUCCESS; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 7f44203..dd986b1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1686,6 +1686,16 @@ static void test_impersonation_level(void) HeapFree(GetProcessHeap(), 0, PrivilegeSet); } +static void test_SetEntriesInAcl(void) +{ + ACL *acl = (ACL*)0xdeadbeef; + DWORD res; + + res = SetEntriesInAclW(0, NULL, NULL, &acl); + ok(res == ERROR_SUCCESS, "SetEntriesInAcl failed: %u\n", res); + ok(acl == NULL, "acl=%p, expected NULL\n", acl); +} + START_TEST(security) { init(); @@ -1706,4 +1716,5 @@ START_TEST(security) test_LookupAccountName(); test_process_security(); test_impersonation_level(); + test_SetEntriesInAcl(); }

1 0

Jacek Caban : wine.inf: Register Spooler service.
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: 546de27f1124b974bd777ec833964ae7731f736d URL: http://source.winehq.org/git/wine.git/?a=commit;h=546de27f1124b974bd777ec83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 19 14:14:32 2007 +0100 wine.inf: Register Spooler service. --- tools/wine.inf | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index d6f312b..ebefa21 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -45,6 +45,7 @@ AddReg=\ Nls,\ OLE,\ Printing,\ + Services, \ Tapi,\ Timezones @@ -68,6 +69,7 @@ AddReg=\ Nls,\ OLE,\ Printing,\ + Services, \ Tapi,\ Timezones,\ VersionInfo @@ -81,6 +83,7 @@ CurrentVersion="Software\Microsoft\Windows\CurrentVersion" CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion" FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" Control="System\CurrentControlSet\Control" +Services="System\CurrentControlSet\Services" [Classes] HKCR,.avi,"Content Type",2,"video/avi" @@ -2578,6 +2581,16 @@ HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"Dlt",,"Tasmania Dayli HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"Std",,"Tasmania Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tasmania Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +[Services] +HKLM,"%Services%\Spooler","Description",,"Loads files to memory for later printing." +HKLM,"%Services%\Spooler","DisplayName",,"Print Spooler" +HKLM,"%Services%\Spooler","ErrorControl",0x10001,1 +HKLM,"%Services%\Spooler","Group",,"SpoolerGroup" +HKLM,"%Services%\Spooler","ImagePath",,"spoolsv.exe" +HKLM,"%Services%\Spooler","ObjectName",,"LocalSystem" +HKLM,"%Services%\Spooler","Start",0x10001,2 +HKLM,"%Services%\Spooler","Type",0x10001,0x110 + [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.0" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 4"

1 0

Damjan Jovanovic : ws2_32: In some cases send should block until the entire buffer is sent.
by Alexandre Julliard March 20, 2007

March 20, 2007

Module: wine Branch: master Commit: 665e8a5e6494b936ad41bf7e557fabf1211d831d URL: http://source.winehq.org/git/wine.git/?a=commit;h=665e8a5e6494b936ad41bf7e5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Mar 19 15:42:40 2007 +0200 ws2_32: In some cases send should block until the entire buffer is sent. --- dlls/ws2_32/socket.c | 74 ++++++++++++++++++++++++------ dlls/ws2_32/tests/sock.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 16222ca..e14eba8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2873,27 +2873,71 @@ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, return SOCKET_ERROR; } - if (_is_blocking(s)) + *lpNumberOfBytesSent = 0; + if ( _is_blocking(s) ) { - /* FIXME: exceptfds? */ - int timeout = GET_SNDTIMEO(fd); - if( !do_block(fd, POLLOUT, timeout)) { - err = WSAETIMEDOUT; - goto err_free; /* msdn says a timeout in send is fatal */ + /* On a blocking non-overlapped stream socket, + * sending blocks until the entire buffer is sent. */ + struct iovec *piovec = iovec; + int finish_time = GET_SNDTIMEO(fd); + if (finish_time >= 0) + finish_time += GetTickCount(); + while ( dwBufferCount > 0 ) + { + int timeout; + if ( finish_time >= 0 ) + { + timeout = finish_time - GetTickCount(); + if ( timeout < 0 ) + timeout = 0; + } + else + timeout = finish_time; + /* FIXME: exceptfds? */ + if( !do_block(fd, POLLOUT, timeout)) { + err = WSAETIMEDOUT; + goto err_free; /* msdn says a timeout in send is fatal */ + } + + n = WS2_send( fd, piovec, dwBufferCount, to, tolen, dwFlags ); + if ( n == -1 ) + { + err = wsaErrno(); + goto err_free; + } + *lpNumberOfBytesSent += n; + + while ( n > 0 ) + { + if ( piovec->iov_len > n ) + { + piovec->iov_base = (char*)piovec->iov_base + n; + piovec->iov_len -= n; + n = 0; + } + else + { + n -= piovec->iov_len; + --dwBufferCount; + ++piovec; + } + } } } - - n = WS2_send( fd, iovec, dwBufferCount, to, tolen, dwFlags ); - if ( n == -1 ) + else { - err = wsaErrno(); - if ( err == WSAEWOULDBLOCK ) - _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); - goto err_free; + n = WS2_send( fd, iovec, dwBufferCount, to, tolen, dwFlags ); + if ( n == -1 ) + { + err = wsaErrno(); + if ( err == WSAEWOULDBLOCK ) + _enable_event(SOCKET2HANDLE(s), FD_WRITE, 0, 0); + goto err_free; + } + *lpNumberOfBytesSent = n; } - TRACE(" -> %i bytes\n", n); - *lpNumberOfBytesSent = n; + TRACE(" -> %i bytes\n", *lpNumberOfBytesSent); HeapFree( GetProcessHeap(), 0, iovec ); release_sock_fd( s, fd ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c5bf766..bd01bd3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1620,6 +1620,115 @@ static void test_inet_addr(void) ok(addr == INADDR_NONE, "inet_addr succeeded unexpectedly\n"); } +static DWORD WINAPI drain_socket_thread(LPVOID arg) +{ + char buffer[1024]; + SOCKET sock = *(SOCKET*)arg; + + while (recv(sock, buffer, sizeof(buffer), 0) > 0) + ; + return 0; +} + +static void test_send(void) +{ + SOCKET src = INVALID_SOCKET; + SOCKET server = INVALID_SOCKET; + SOCKET dst = INVALID_SOCKET; + HANDLE hThread = NULL; + struct sockaddr_in addr; + int len; + const int buflen = 1024*1024; + char *buffer = NULL; + int ret; + + src = socket(AF_INET, SOCK_STREAM, 0); + if (src == INVALID_SOCKET) + { + ok(0, "socket failed, error %d\n", WSAGetLastError()); + goto end; + } + + server = socket(AF_INET, SOCK_STREAM, 0); + if (server == INVALID_SOCKET) + { + ok(0, "socket failed, error %d\n", WSAGetLastError()); + goto end; + } + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = bind(server, (struct sockaddr*)&addr, sizeof(addr)); + if (ret != 0) + { + ok(0, "bind failed, error %d\n", WSAGetLastError()); + goto end; + } + + len = sizeof(addr); + ret = getsockname(server, (struct sockaddr*)&addr, &len); + if (ret != 0) + { + ok(0, "getsockname failed, error %d\n", WSAGetLastError()); + goto end; + } + + ret = listen(server, 1); + if (ret != 0) + { + ok(0, "listen failed, error %d\n", WSAGetLastError()); + goto end; + } + + ret = connect(src, (struct sockaddr*)&addr, sizeof(addr)); + if (ret != 0) + { + ok(0, "connect failed, error %d\n", WSAGetLastError()); + goto end; + } + + len = sizeof(addr); + dst = accept(server, (struct sockaddr*)&addr, &len); + if (dst == INVALID_SOCKET) + { + ok(0, "accept failed, error %d\n", WSAGetLastError()); + goto end; + } + + hThread = CreateThread(NULL, 0, drain_socket_thread, &dst, 0, NULL); + if (hThread == NULL) + { + ok(0, "CreateThread failed, error %d\n", GetLastError()); + goto end; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, buflen); + if (buffer == NULL) + { + ok(0, "HeapAlloc failed, error %d\n", GetLastError()); + goto end; + } + + ret = send(src, buffer, buflen, 0); + if (ret >= 0) + ok(ret == buflen, "send should have sent %d bytes, but it only sent %d\n", buflen, ret); + else + ok(0, "send failed, error %d\n", WSAGetLastError()); + +end: + if (src != INVALID_SOCKET) + closesocket(src); + if (server != INVALID_SOCKET) + closesocket(server); + if (dst != INVALID_SOCKET) + closesocket(dst); + if (hThread != NULL) + CloseHandle(hThread); + if (buffer != NULL) + HeapFree(GetProcessHeap(), 0, buffer); +} + /**************** Main program ***************/ START_TEST( sock ) @@ -1653,5 +1762,7 @@ START_TEST( sock ) test_getsockname(); test_inet_addr(); + test_send(); + Exit(); }

1 0