wine-commits November 2011

wine-commits@winehq.org

2 participants
852 discussions

Henri Verbeet : d3d10: Add the ID3D10StateBlock interface.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 2112f48eeee15b734a7ff20e69b7b99a25dcc7b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2112f48eeee15b734a7ff20e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 14 21:11:39 2011 +0100 d3d10: Add the ID3D10StateBlock interface. --- include/d3d10effect.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/include/d3d10effect.h b/include/d3d10effect.h index 772d424..8c5cc63 100644 --- a/include/d3d10effect.h +++ b/include/d3d10effect.h @@ -778,12 +778,31 @@ DECLARE_INTERFACE(ID3D10EffectPass) }; #undef INTERFACE +DEFINE_GUID(IID_ID3D10StateBlock, 0x0803425a, 0x57f5, 0x4dd6, 0x94, 0x65, 0xa8, 0x75, 0x70, 0x83, 0x4a, 0x08); + +#define INTERFACE ID3D10StateBlock +DECLARE_INTERFACE_(ID3D10StateBlock, IUnknown) +{ + /* IUnknown methods */ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **object) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /* ID3D10StateBlock methods */ + STDMETHOD(Capture)(THIS) PURE; + STDMETHOD(Apply)(THIS) PURE; + STDMETHOD(ReleaseAllDeviceObjects)(THIS) PURE; + STDMETHOD(GetDevice)(THIS_ ID3D10Device **device) PURE; +}; +#undef INTERFACE + #ifdef __cplusplus extern "C" { #endif HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3D10Effect **effect); +HRESULT WINAPI D3D10CreateStateBlock(ID3D10Device *device, + D3D10_STATE_BLOCK_MASK *mask, ID3D10StateBlock **stateblock); #ifdef __cplusplus }

1 0

André Hentschel : wininet: Improve stub message for InternetSetFilePointer.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 4896f94aaf22053fc76fcf3f3e39ac2080c74de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4896f94aaf22053fc76fcf3f3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 19:20:38 2011 +0100 wininet: Improve stub message for InternetSetFilePointer. --- dlls/wininet/internet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 43be36d..391a525 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2108,7 +2108,7 @@ INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW( DWORD WINAPI InternetSetFilePointer(HINTERNET hFile, LONG lDistanceToMove, PVOID pReserved, DWORD dwMoveContext, DWORD_PTR dwContext) { - FIXME("stub\n"); + FIXME("(%p %d %p %d %lx): stub\n", hFile, lDistanceToMove, pReserved, dwMoveContext, dwContext); return FALSE; }

1 0

André Hentschel : kernel32/tests: Fix two typos.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 62d719419c875f3dd5c9ee7f5becdf4c18b1b3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d719419c875f3dd5c9ee7f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 19:20:34 2011 +0100 kernel32/tests: Fix two typos. --- dlls/kernel32/tests/actctx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index b7f3010..3af6e63 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -591,7 +591,7 @@ static HANDLE test_create(const char *file, const char *manifest) ok(handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError()); ok(actctx.cbSize == sizeof(actctx), "actctx.cbSize=%d\n", actctx.cbSize); - ok(actctx.dwFlags == 0, "actctx.=%d\n", actctx.dwFlags); + ok(actctx.dwFlags == 0, "actctx.dwFlags=%d\n", actctx.dwFlags); ok(actctx.lpSource == path, "actctx.lpSource=%p\n", actctx.lpSource); ok(actctx.wProcessorArchitecture == 0, "actctx.wProcessorArchitecture=%d\n", actctx.wProcessorArchitecture); @@ -599,7 +599,7 @@ static HANDLE test_create(const char *file, const char *manifest) ok(actctx.lpAssemblyDirectory == NULL, "actctx.lpAssemblyDirectory=%p\n", actctx.lpAssemblyDirectory); ok(actctx.lpResourceName == NULL, "actctx.lpResourceName=%p\n", actctx.lpResourceName); - ok(actctx.lpApplicationName == NULL, "actctx.lpApplocationName=%p\n", + ok(actctx.lpApplicationName == NULL, "actctx.lpApplicationName=%p\n", actctx.lpApplicationName); ok(actctx.hModule == NULL, "actctx.hModule=%p\n", actctx.hModule);

1 0

André Hentschel : msvcrt: Implement _wfreopen_s.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 947d1bf588319383ed43920fafcf62e41cb7659e URL: http://source.winehq.org/git/wine.git/?a=commit;h=947d1bf588319383ed43920fa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 18:33:47 2011 +0100 msvcrt: Implement _wfreopen_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 87cae04..0925c1f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1350,7 +1350,7 @@ @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen -@ stub _wfreopen_s +@ cdecl _wfreopen_s(ptr wstr wstr ptr) msvcrt._wfreopen_s @ cdecl _wfsopen(wstr wstr long) msvcrt._wfsopen @ cdecl _wfullpath(ptr wstr long) msvcrt._wfullpath @ cdecl _wgetcwd(wstr long) msvcrt._wgetcwd diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 06751ef..4cde658 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1203,7 +1203,7 @@ @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen -@ stub _wfreopen_s +@ cdecl _wfreopen_s(ptr wstr wstr ptr) msvcrt._wfreopen_s @ cdecl _wfsopen(wstr wstr long) msvcrt._wfsopen @ cdecl _wfullpath(ptr wstr long) msvcrt._wfullpath @ cdecl _wgetcwd(wstr long) msvcrt._wgetcwd diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 688bdc6..9d0d9e6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1197,7 +1197,7 @@ @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen -@ stub _wfreopen_s +@ cdecl _wfreopen_s(ptr wstr wstr ptr) msvcrt._wfreopen_s @ cdecl _wfsopen(wstr wstr long) msvcrt._wfsopen @ cdecl _wfullpath(ptr wstr long) msvcrt._wfullpath @ cdecl _wgetcwd(wstr long) msvcrt._wgetcwd diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index f3200eb..07fed45 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3277,6 +3277,25 @@ MSVCRT_FILE* CDECL MSVCRT__wfreopen(const MSVCRT_wchar_t *path, const MSVCRT_wch } /********************************************************************* + * _wfreopen_s (MSVCRT.@) + */ +int CDECL MSVCRT__wfreopen_s(MSVCRT_FILE** pFile, + const MSVCRT_wchar_t *path, const MSVCRT_wchar_t *mode, MSVCRT_FILE* file) +{ + if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(path != NULL) || + !MSVCRT_CHECK_PMT(mode != NULL) || !MSVCRT_CHECK_PMT(file != NULL)) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *pFile = MSVCRT__wfreopen(path, mode, file); + + if(!*pFile) + return *MSVCRT__errno(); + return 0; +} + +/********************************************************************* * freopen (MSVCRT.@) * */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f2b5e33..fac2104 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1133,7 +1133,7 @@ @ cdecl _wfopen(wstr wstr) MSVCRT__wfopen @ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s @ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen -# stub _wfreopen_s(ptr wstr wstr ptr) +@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s @ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen @ cdecl _wfullpath(ptr wstr long) # stub _wfullpath_dbg(ptr wstr long long str long)

1 0

André Hentschel : msvcrt: Implement freopen_s.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: ba5b0c34a83bbf939f5ad70239c4c0c1d5a5e0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5b0c34a83bbf939f5ad7023… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 18:33:00 2011 +0100 msvcrt: Implement freopen_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 76618ea..87cae04 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1469,7 +1469,7 @@ @ stub fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen -@ stub freopen_s +@ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s @ cdecl frexp(double ptr) msvcrt.frexp @ varargs fscanf(ptr str) msvcrt.fscanf @ varargs fscanf_s(ptr str) msvcrt.fscanf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index f3c0a94..06751ef 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1325,7 +1325,7 @@ @ stub fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen -@ stub freopen_s +@ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s @ cdecl frexp(double ptr) msvcrt.frexp @ varargs fscanf(ptr str) msvcrt.fscanf @ varargs fscanf_s(ptr str) msvcrt.fscanf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e40d2e9..688bdc6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1326,7 +1326,7 @@ @ stub fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen -@ stub freopen_s +@ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s @ cdecl frexp(double ptr) msvcrt.frexp @ varargs fscanf(ptr str) msvcrt.fscanf @ varargs fscanf_s(ptr str) msvcrt.fscanf_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b6af98f..f3200eb 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3300,6 +3300,25 @@ MSVCRT_FILE* CDECL MSVCRT_freopen(const char *path, const char *mode, MSVCRT_FIL } /********************************************************************* + * freopen_s (MSVCRT.@) + */ +int CDECL MSVCRT_freopen_s(MSVCRT_FILE** pFile, + const char *path, const char *mode, MSVCRT_FILE* file) +{ + if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(path != NULL) || + !MSVCRT_CHECK_PMT(mode != NULL) || !MSVCRT_CHECK_PMT(file != NULL)) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *pFile = MSVCRT_freopen(path, mode, file); + + if(!*pFile) + return *MSVCRT__errno(); + return 0; +} + +/********************************************************************* * fsetpos (MSVCRT.@) */ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c8c710d..f2b5e33 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1269,7 +1269,7 @@ @ cdecl fread(ptr long long ptr) MSVCRT_fread @ cdecl free(ptr) MSVCRT_free @ cdecl freopen(str str ptr) MSVCRT_freopen -# stub freopen_s(ptr str str ptr) +@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp @ cdecl -arch=x86_64 frexpf(float ptr) MSVCRT_frexpf @ varargs fscanf(ptr str) MSVCRT_fscanf

1 0

André Hentschel : ole32: Implement writing VT_CLSID properties.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 09202ee949f3797ca756ad39a20fc859373e7d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09202ee949f3797ca756ad39a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 18:02:15 2011 +0100 ole32: Implement writing VT_CLSID properties. --- dlls/ole32/stg_prop.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 5eb0371..53c2a99 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1746,6 +1746,15 @@ static HRESULT PropertyStorage_WritePropertyToStream(PropertyStorage_impl *This, bytesWritten = count + sizeof cf_hdr; break; } + case VT_CLSID: + { + CLSID temp; + + StorageUtl_WriteGUID((BYTE *)&temp, 0, var->u.puuid); + hr = IStream_Write(This->stm, &temp, sizeof(temp), &count); + bytesWritten = count; + break; + } default: FIXME("unsupported type: %d\n", var->vt); return STG_E_INVALIDPARAMETER;

1 0

Maarten Lankhorst : ntdll: Use VALGRIND_RESIZEINPLACE_BLOCK when available.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: d9889cfd632b0ac27026fdd92b5cae879bce62fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9889cfd632b0ac27026fdd92… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Nov 11 22:12:25 2011 +0100 ntdll: Use VALGRIND_RESIZEINPLACE_BLOCK when available. --- dlls/ntdll/heap.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 022045f..6ca509a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -263,6 +263,13 @@ static inline void notify_free( void const *ptr ) #endif } +static inline void notify_realloc( void const *ptr, SIZE_T size_old, SIZE_T size_new ) +{ +#ifdef VALGRIND_RESIZEINPLACE_BLOCK + VALGRIND_RESIZEINPLACE_BLOCK( ptr, size_old, size_new, 0 ); +#endif +} + static void subheap_notify_free_all(SUBHEAP const *subheap) { #ifdef VALGRIND_FREELIKE_BLOCK @@ -753,6 +760,11 @@ static void *realloc_large_block( HEAP *heap, DWORD flags, void *ptr, SIZE_T siz SIZE_T unused = arena->block_size - sizeof(*arena) - size; /* FIXME: we could remap zero-pages instead */ +#ifdef VALGRIND_RESIZEINPLACE_BLOCK + if (RUNNING_ON_VALGRIND) + notify_realloc( arena + 1, arena->data_size, size ); + else +#endif if (size > arena->data_size) initialize_block( (char *)ptr + arena->data_size, size - arena->data_size, unused, flags ); else @@ -1844,11 +1856,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size list_remove( &pFree->entry ); pArena->size += (pFree->size & ARENA_SIZE_MASK) + sizeof(*pFree); if (!HEAP_Commit( subheap, pArena, rounded_size )) goto oom; - notify_free( pArena + 1 ); + notify_realloc( pArena + 1, oldActualSize, size ); HEAP_ShrinkBlock( subheap, pArena, rounded_size ); - notify_alloc( pArena + 1, size, FALSE ); - /* FIXME: this is wrong as we may lose old VBits settings */ - mark_block_initialized( pArena + 1, oldActualSize ); } else /* Do it the hard way */ { @@ -1883,12 +1892,8 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size } else { - /* Shrink the block */ - notify_free( pArena + 1 ); HEAP_ShrinkBlock( subheap, pArena, rounded_size ); - notify_alloc( pArena + 1, size, FALSE ); - /* FIXME: this is wrong as we may lose old VBits settings */ - mark_block_initialized( pArena + 1, size ); + notify_realloc( pArena + 1, oldActualSize, size ); } pArena->unused_bytes = (pArena->size & ARENA_SIZE_MASK) - size;

1 0

Frédéric Delanoy : cmd: Avoid duplication of commonly used strings.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 5fc25686a41084beb3974ef50139ea82124144b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fc25686a41084beb3974ef50… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 12 13:58:01 2011 +0100 cmd: Avoid duplication of commonly used strings. --- programs/cmd/batch.c | 1 - programs/cmd/builtins.c | 12 ++++++------ programs/cmd/directory.c | 17 +++++------------ programs/cmd/wcmd.h | 7 +++++++ programs/cmd/wcmdmain.c | 10 ++++------ 5 files changed, 22 insertions(+), 25 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 7edb8df..10af36b 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -317,7 +317,6 @@ void WCMD_HandleTildaModifiers(WCHAR **start, const WCHAR *forVariable, static const WCHAR validmodifiers[NUMMODIFIERS] = { '~', 'f', 'd', 'p', 'n', 'x', 's', 'a', 't', 'z', '$' }; - static const WCHAR space[] = {' ', '\0'}; WIN32_FILE_ATTRIBUTE_DATA fileInfo; WCHAR outputparam[MAX_PATH]; diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 770a78a..59fbc8e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -58,17 +58,17 @@ extern DWORD errorlevel; static BOOL verify_mode = FALSE; -static const WCHAR dotW[] = {'.','\0'}; -static const WCHAR dotdotW[] = {'.','.','\0'}; -static const WCHAR slashW[] = {'\\','\0'}; -static const WCHAR starW[] = {'*','\0'}; -static const WCHAR equalW[] = {'=','\0'}; +const WCHAR dotW[] = {'.','\0'}; +const WCHAR dotdotW[] = {'.','.','\0'}; +const WCHAR nullW[] = {'\0'}; +const WCHAR starW[] = {'*','\0'}; +const WCHAR slashW[] = {'\\','\0'}; +const WCHAR equalW[] = {'=','\0'}; static const WCHAR fslashW[] = {'/','\0'}; static const WCHAR onW[] = {'O','N','\0'}; static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; -static const WCHAR nullW[] = {'\0'}; /************************************************************************** * WCMD_ask_confirm diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 3634ded..03cb952 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -59,13 +59,6 @@ static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; static BOOL paged_mode, recurse, wide, bare, lower, shortname, usernames, separator; static ULONG showattrs, attrsbits; -static const WCHAR dotW[] = {'.','\0'}; -static const WCHAR dotdotW[] = {'.','.','\0'}; -static const WCHAR starW[] = {'*','\0'}; -static const WCHAR slashW[] = {'\\','\0'}; -static const WCHAR emptyW[] = {'\0'}; -static const WCHAR spaceW[] = {' ','\0'}; - /***************************************************************************** * WCMD_strrev * @@ -432,14 +425,14 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le /* Note: WCMD_output uses wvsprintf which does not allow %* so manually pad with spaces to appropriate width */ - strcpyW(temp, emptyW); + strcpyW(temp, nullW); while (padding > 0) { - strcatW(&temp[toWrite], spaceW); + strcatW(&temp[toWrite], space); toWrite++; if (toWrite > 99) { WCMD_output(temp); toWrite = 0; - strcpyW(temp, emptyW); + strcpyW(temp, nullW); } padding--; } @@ -457,7 +450,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le } else { if (!((strcmpW((fd+i)->cFileName, dotW) == 0) || (strcmpW((fd+i)->cFileName, dotdotW) == 0))) { - WCMD_output (fmt5, recurse?inputparms->dirName:emptyW, (fd+i)->cFileName); + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); } else { addNewLine = FALSE; } @@ -475,7 +468,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (usernames) WCMD_output (fmt3, username); WCMD_output(fmt4,(fd+i)->cFileName); } else { - WCMD_output (fmt5, recurse?inputparms->dirName:emptyW, (fd+i)->cFileName); + WCMD_output (fmt5, recurse?inputparms->dirName:nullW, (fd+i)->cFileName); } } } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 205d31c..88b28c1 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -220,6 +220,13 @@ extern const WCHAR externals[NUM_EXTERNALS][10]; /* Some standard messages */ extern const WCHAR newline[]; +extern const WCHAR space[]; +extern const WCHAR nullW[]; +extern const WCHAR dotW[]; +extern const WCHAR dotdotW[]; +extern const WCHAR starW[]; +extern const WCHAR slashW[]; +extern const WCHAR equalW[]; extern WCHAR anykey[]; extern WCHAR version_string[]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index b529672..e306d52 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -90,7 +90,7 @@ int defaultColor = 7; BOOL echo_mode = TRUE; static int opt_c, opt_k, opt_s; const WCHAR newline[] = {'\r','\n','\0'}; -static const WCHAR equalsW[] = {'=','\0'}; +const WCHAR space[] = {' ','\0'}; static const WCHAR closeBW[] = {')','\0'}; WCHAR anykey[100]; WCHAR version_string[100]; @@ -747,7 +747,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, /* search and replace manipulation */ } else { - WCHAR *equalspos = strstrW(colonpos, equalsW); + WCHAR *equalspos = strstrW(colonpos, equalW); WCHAR *replacewith = equalspos+1; WCHAR *found = NULL; WCHAR *searchIn; @@ -1084,7 +1084,6 @@ void WCMD_run_program (WCHAR *command, int called) { WCHAR thisDir[MAX_PATH] = {'\0'}; WCHAR *pos = NULL; BOOL found = FALSE; - static const WCHAR slashW[] = {'\\','\0'}; /* Work on the first directory on the search path */ pos = strchrW(pathposn, ';'); @@ -1332,7 +1331,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, /* According to MSDN CreateProcess docs, special env vars record the current directory on each drive, in the form =C: so see if one specified, and if so go back to it */ - strcpyW(envvar, equalsW); + strcpyW(envvar, equalW); strcatW(envvar, cmd); if (GetEnvironmentVariableW(envvar, dir, MAX_PATH) == 0) { static const WCHAR fmt[] = {'%','s','\\','\0'}; @@ -1835,7 +1834,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); /* Show prompt before batch line IF echo is on and in batch program */ if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { - static const WCHAR spc[]={' ','\0'}; static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); @@ -1850,7 +1848,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, extraSpace, min_len, echoCol, len) != CSTR_EQUAL) { - WCMD_output_asis(spc); + WCMD_output_asis(space); } WCMD_output_asis(newline); }

1 0

Frédéric Delanoy : cmd: Trim whitespace in echo on/off.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: e8d8df3c542548c329d3deca62d0352b531222d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8d8df3c542548c329d3deca6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Nov 11 19:27:43 2011 +0100 cmd: Trim whitespace in echo on/off. --- programs/cmd/builtins.c | 54 +++++++++++++++++++++++------ programs/cmd/tests/test_builtins.cmd | 2 + programs/cmd/tests/test_builtins.cmd.exp | 2 + 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5272bfc..770a78a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -854,6 +854,35 @@ BOOL WCMD_delete (WCHAR *command) { return foundAny; } +/* + * WCMD_strtrim + * + * Returns a trimmed version of s with all leading and trailing whitespace removed + * Pre: s non NULL + * + */ +static WCHAR *WCMD_strtrim(const WCHAR *s) +{ + DWORD len = strlenW(s); + const WCHAR *start = s; + WCHAR* result; + + if (!(result = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)))) + return NULL; + + while (isspaceW(*start)) start++; + if (*start) { + const WCHAR *end = s + len - 1; + while (end > start && isspaceW(*end)) end--; + memcpy(result, start, (end - start + 2) * sizeof(WCHAR)); + result[end - start + 1] = '\0'; + } else { + result[0] = '\0'; + } + + return result; +} + /**************************************************************************** * WCMD_echo * @@ -861,33 +890,36 @@ BOOL WCMD_delete (WCHAR *command) { * in DOS (try typing "ECHO ON AGAIN" for an example). */ -void WCMD_echo (const WCHAR *command) { - +void WCMD_echo (const WCHAR *command) +{ int count; const WCHAR *origcommand = command; + WCHAR *trimmed; if ( command[0]==' ' || command[0]=='\t' || command[0]=='.' || command[0]==':' || command[0]==';') command++; - count = strlenW(command); + trimmed = WCMD_strtrim(command); + if (!trimmed) return; + + count = strlenW(trimmed); if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':' && origcommand[0]!=';') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); return; } - if (lstrcmpiW(command, onW) == 0) { + + if (lstrcmpiW(trimmed, onW) == 0) echo_mode = TRUE; - return; - } - if (lstrcmpiW(command, offW) == 0) { + else if (lstrcmpiW(trimmed, offW) == 0) echo_mode = FALSE; - return; + else { + WCMD_output_asis (command); + WCMD_output (newline); } - WCMD_output_asis (command); - WCMD_output (newline); - + HeapFree(GetProcessHeap(), 0, trimmed); } /************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 13c9393..bcaccb2 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -26,8 +26,10 @@ echo@tab@word@tab@@space@ echo @tab@word echo @tab@word echo@tab@@tab@word +echo @tab@ on @space@ @echo off +echo off@tab@@space@ echo ------------ Testing 'echo' [OFF] -------------- echo word echo 'singlequotedword' diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7a0eec3..e35b710 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -74,6 +74,8 @@ word @pwd@>echo@tab@@tab@word@space@ @tab@word + +@pwd@>echo @tab@ on @space@@space@ ------------ Testing 'echo' [OFF] -------------- word 'singlequotedword'

1 0

Alexandre Julliard : server: Cope with stdio file descriptors being closed on startup.
by Alexandre Julliard 15 Nov '11

15 Nov '11

Module: wine Branch: master Commit: 3acc2068a00e3de505373c75656e3816a6c05710 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acc2068a00e3de505373c756… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 15 11:39:42 2011 +0100 server: Cope with stdio file descriptors being closed on startup. --- server/request.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/request.c b/server/request.c index cea23ef..05c7464 100644 --- a/server/request.c +++ b/server/request.c @@ -758,6 +758,10 @@ void open_master_socket(void) assert( sizeof(union generic_request) == sizeof(struct request_max_size) ); assert( sizeof(union generic_reply) == sizeof(struct request_max_size) ); + /* make sure the stdio fds are open */ + fd = open( "/dev/null", O_RDWR ); + while (fd >= 0 && fd <= 2) fd = dup( fd ); + if (!server_dir) fatal_error( "directory %s cannot be accessed\n", config_dir ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s", config_dir ); if ((config_dir_fd = open( ".", O_RDONLY )) == -1) fatal_perror( "open %s", config_dir ); @@ -777,12 +781,8 @@ void open_master_socket(void) acquire_lock(); /* close stdin and stdout */ - if ((fd = open( "/dev/null", O_RDWR )) != -1) - { - dup2( fd, 0 ); - dup2( fd, 1 ); - close( fd ); - } + dup2( fd, 0 ); + dup2( fd, 1 ); /* signal parent */ dummy = 0; @@ -813,6 +813,7 @@ void open_master_socket(void) /* init the process tracing mechanism */ init_tracing_mechanism(); + close( fd ); } /* master socket timer expiration handler */

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2011