wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Frédéric Delanoy : cmd: Backup echo mode before running external batch file.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 4c3c2b121e09efa83eafcd33289f4ccae7b191b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3c2b121e09efa83eafcd332… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 9 01:48:04 2011 +0200 cmd: Backup echo mode before running external batch file. --- programs/cmd/wcmdmain.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 117565b..108d411 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1228,7 +1228,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, CMD_LIST **cmdList) { WCHAR *cmd, *p, *redir; - int status, i; + int status, i, prev_echo_mode; DWORD count, creationDisposition; HANDLE h; WCHAR *whichcmd; @@ -1581,7 +1581,9 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCMD_exit (cmdList); break; default: + prev_echo_mode = echo_mode; WCMD_run_program (whichcmd, 0); + echo_mode = prev_echo_mode; } HeapFree( GetProcessHeap(), 0, cmd ); HeapFree( GetProcessHeap(), 0, new_redir ); @@ -1594,6 +1596,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, } } } + /************************************************************************* * WCMD_LoadMessage * Load a string from the resource file, handling any error

1 0

Francois Gouget : kernel32: Add parentheses to clarify the precedence between '&' and '||'.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: f8c315e052571a97cef9dfefbe3a997320d67a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c315e052571a97cef9dfefb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 01:45:30 2011 +0200 kernel32: Add parentheses to clarify the precedence between '&' and '||'. --- dlls/kernel32/volume.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4a2a7b5..a937f6b 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -612,7 +612,7 @@ static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, HANDLE ha * Me$$ysoft chose to reverse the serial number in NT4/W2K. * It's true and nobody will ever be able to change it. */ - if (GetVersion() & 0x80000000 || type == FS_UDF) + if ((GetVersion() & 0x80000000) || type == FS_UDF) return (sum[3] << 24) | (sum[2] << 16) | (sum[1] << 8) | sum[0]; else return (sum[0] << 24) | (sum[1] << 16) | (sum[2] << 8) | sum[3];

1 0

Alistair Leslie-Hughes : include: Add xmlparser interfaces.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: fd1ef626f08c00866d8296c6cfeb8bec6e216058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd1ef626f08c00866d8296c6c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jul 15 15:57:29 2011 +1000 include: Add xmlparser interfaces. --- .gitignore | 1 + include/Makefile.in | 3 +- include/xmlparser.idl | 352 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 355 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd1ef626f08c00866d829…

1 0

Frédéric Delanoy : cmd: Use correct type instead of void* for prev_context field of BATCH_CONTEXT struct .
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 003e8d2797878cbe3fc4f5945c440b74c63a625f URL: http://source.winehq.org/git/wine.git/?a=commit;h=003e8d2797878cbe3fc4f5945… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 7 11:00:53 2011 +0200 cmd: Use correct type instead of void* for prev_context field of BATCH_CONTEXT struct. --- programs/cmd/wcmd.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 3cf9d4b..c8a7e6d 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -120,12 +120,12 @@ void WCMD_execute (const WCHAR *orig_command, const WCHAR *redirects, /* Data structure to hold context when executing batch files */ -typedef struct { +typedef struct _BATCH_CONTEXT { WCHAR *command; /* The command which invoked the batch file */ HANDLE h; /* Handle to the open batch file */ WCHAR *batchfileW; /* Name of same */ int shift_count[10]; /* Offset in terms of shifts for %0 - %9 */ - void *prev_context; /* Pointer to the previous context block */ + struct _BATCH_CONTEXT *prev_context; /* Pointer to the previous context block */ BOOL skip_rest; /* Skip the rest of the batch program and exit */ CMD_LIST *toExecute; /* Commands left to be executed */ } BATCH_CONTEXT;

1 0

Gerald Pfeifer : mshtml: Add failure detection to set_downloading_proc.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 3eafe92ba31aa4369e652777762b0bd122fa39bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eafe92ba31aa4369e6527777… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Sep 8 01:08:56 2011 +0200 mshtml: Add failure detection to set_downloading_proc. --- dlls/mshtml/persist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index b73476b..2e2643f 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -179,7 +179,7 @@ static void set_downloading_proc(task_t *_task) IDropTarget *drop_target = NULL; hres = IDocHostUIHandler_GetDropTarget(doc->hostui, NULL /* FIXME */, &drop_target); - if(drop_target) { + if(SUCCEEDED(hres)) { FIXME("Use IDropTarget\n"); IDropTarget_Release(drop_target); }

1 0

Bernhard Loos : winealsa.drv: If there are no devices, there is also no default device.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 366f54110a54b2a14c851ef35a4e2de64a388da2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366f54110a54b2a14c851ef35… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Sep 9 15:49:16 2011 +0200 winealsa.drv: If there are no devices, there is also no default device. --- dlls/winealsa.drv/mmdevdrv.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 0c47876..1d1ce6f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -390,6 +390,13 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, if(FAILED(hr)) return hr; + if(*num == 0) + { + *ids = NULL; + *keys = NULL; + return S_OK; + } + *ids = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(WCHAR *)); *keys = HeapAlloc(GetProcessHeap(), 0, (*num + 1) * sizeof(char *)); if(!*ids || !*keys){

1 0

Louis Lenders : dpnet: Return success in IDirectPlay8PeerImpl_Initialize.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 56212ce215129d466474b503d834edfd41899c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56212ce215129d466474b503d… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 9 09:04:04 2011 +0200 dpnet: Return success in IDirectPlay8PeerImpl_Initialize. --- dlls/dpnet/peer.c | 4 ++-- dlls/dpnet/tests/peer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index 751b93b..f4d238a 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -85,9 +85,9 @@ static ULONG WINAPI IDirectPlay8PeerImpl_Release(IDirectPlay8Peer *iface) static HRESULT WINAPI IDirectPlay8PeerImpl_Initialize(IDirectPlay8Peer *iface, void * const pvUserContext, const PFNDPNMESSAGEHANDLER pfn, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pvUserContext, pfn, dwFlags); - return DPNERR_GENERIC; + return DPN_OK; } static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer *iface, diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index afbea42..1d6dfc9 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -52,7 +52,7 @@ static void test_init_dp(void) ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); hr = IDirectPlay8Peer_Initialize(peer, NULL, DirectPlayMessageHandler, 0); - todo_wine ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); + ok(hr == S_OK, "IDirectPlay8Peer_Initialize failed with %x\n", hr); } static void test_enum_service_providers(void)

1 0

Alexandre Julliard : wininet/tests: Avoid crash on test failure.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 905d6844e37de49f0d8547350bfa70a848777318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905d6844e37de49f0d8547350… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 15:57:59 2011 +0200 wininet/tests: Avoid crash on test failure. --- dlls/wininet/tests/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 3e2ed23..ed42395 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -133,7 +133,7 @@ static void test_GetUrlCacheEntryInfoExA(void) ret = GetUrlCacheEntryInfoEx(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, NULL, NULL, NULL, 0); ok(ret, "GetUrlCacheEntryInfoEx failed with error %d\n", GetLastError()); - check_cache_entry_infoA("GetUrlCacheEntryInfoEx", lpCacheEntryInfo); + if (ret) check_cache_entry_infoA("GetUrlCacheEntryInfoEx", lpCacheEntryInfo); cbCacheEntryInfo = 100000; SetLastError(0xdeadbeef); @@ -428,7 +428,7 @@ static void test_urlcacheA(void) ret = RetrieveUrlCacheEntryFile(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo, 0); ok(ret, "RetrieveUrlCacheEntryFile failed with error %d\n", GetLastError()); - check_cache_entry_infoA("RetrieveUrlCacheEntryFile", lpCacheEntryInfo); + if (ret) check_cache_entry_infoA("RetrieveUrlCacheEntryFile", lpCacheEntryInfo); HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo);

1 0

Alexandre Julliard : secur32/tests: Avoid crash on test failure.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 0359f9d430ea95df3f349d2f6be67d59f8cdd1e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0359f9d430ea95df3f349d2f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 9 15:53:49 2011 +0200 secur32/tests: Avoid crash on test failure. --- dlls/secur32/tests/schannel.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 1b6fdf8..a729394 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -746,12 +746,15 @@ static void test_communication(void) buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = pDecryptMessage(&context, &buffers[0], 0, NULL); ok(status == SEC_E_OK, "DecryptMessage failed: %08x\n", status); - ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); - ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); - ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); + if (status == SEC_E_OK) + { + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n"); + ok(buffers[0].pBuffers[1].BufferType == SECBUFFER_DATA, "Expected second buffer to be SECBUFFER_DATA\n"); + ok(buffers[0].pBuffers[2].BufferType == SECBUFFER_STREAM_TRAILER, "Expected third buffer to be SECBUFFER_STREAM_TRAILER\n"); - data = buffers[0].pBuffers[1].pvBuffer; - data[buffers[0].pBuffers[1].cbBuffer] = 0; + data = buffers[0].pBuffers[1].pvBuffer; + data[buffers[0].pBuffers[1].cbBuffer] = 0; + } pDeleteSecurityContext(&context); pFreeCredentialsHandle(&cred_handle);

1 0

Louis Lenders : wine.inf: Add registry key HKLM, %CurrentVersionNT%, " ProductName".
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: e3edf08e8ca6862868fadc7598f56f51ab462e05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3edf08e8ca6862868fadc759… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Aug 15 21:11:36 2011 +0200 wine.inf: Add registry key HKLM,%CurrentVersionNT%,"ProductName". --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 1113400..e317a0d 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -3049,6 +3049,7 @@ HKLM,%CurrentVersionNT%,"CurrentVersion",2,"5.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 3" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows XP" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x300 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"

1 0

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 September 2011