November 2007 - Wine-commits

Alexandre Julliard : ntdll: Send the exit code to the server on failed initialization.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: c70a17dbd94dd71567db94ef00e4daf4d1088b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70a17dbd94dd71567db94ef0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 19 14:26:05 2007 +0100 ntdll: Send the exit code to the server on failed initialization. --- dlls/ntdll/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index c6c6806..4d6b854 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2330,7 +2330,7 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, error: ERR( "Main exe initialization for %s failed, status %x\n", debugstr_w(peb->ProcessParameters->ImagePathName.Buffer), status ); - exit(1); + NtTerminateProcess( GetCurrentProcess(), status ); }

1 0

Alexandre Julliard : ntdll: Unblock signals in process init only after the dlls have been imported.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 0f5fc117a2320bb7e21b9ae4d07d717bed413171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f5fc117a2320bb7e21b9ae4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 19 14:27:07 2007 +0100 ntdll: Unblock signals in process init only after the dlls have been imported. --- dlls/ntdll/loader.c | 6 ++++++ dlls/ntdll/server.c | 1 - 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 4d6b854..ca1ebdd 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -36,6 +36,7 @@ #include "wine/exception.h" #include "wine/library.h" +#include "wine/pthread.h" #include "wine/unicode.h" #include "wine/debug.h" #include "wine/server.h" @@ -52,6 +53,8 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); #define RT_MANIFEST ((ULONG_PTR)24) #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID ((ULONG_PTR)2) +extern struct wine_pthread_functions pthread_functions; + typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); static int process_detaching = 0; /* set on process detach to avoid deadlocks with thread detach */ @@ -2314,6 +2317,9 @@ void WINAPI LdrInitializeThunk( ULONG unknown1, ULONG unknown2, ULONG unknown3, if ((status = fixup_imports( wm, load_path )) != STATUS_SUCCESS) goto error; if ((status = alloc_process_tls()) != STATUS_SUCCESS) goto error; if ((status = alloc_thread_tls()) != STATUS_SUCCESS) goto error; + + pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); + if ((status = process_attach( wm, (LPVOID)1 )) != STATUS_SUCCESS) { if (last_failed_modref) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index 33f81dc..1eebef1 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1072,7 +1072,6 @@ NTSTATUS server_init_process_done(void) } SERVER_END_REQ; - pthread_functions.sigprocmask( SIG_UNBLOCK, &server_block_set, NULL ); return status; }

1 0

Michael Stefaniuc : ntdll: Remove duplicate includes.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 0ecf2edca08a03dd29d8a1b72b0f1e8d26d89431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecf2edca08a03dd29d8a1b72… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 01:42:30 2007 +0100 ntdll: Remove duplicate includes. --- dlls/ntdll/heap.c | 1 - dlls/ntdll/serial.c | 3 --- dlls/ntdll/signal_powerpc.c | 1 - 3 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e6ba48c..fa0c1c4 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -35,7 +35,6 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" -#include "winternl.h" #include "winnt.h" #include "winternl.h" #include "wine/list.h" diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index be398a5..1b05b6e 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -39,9 +39,6 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#ifdef HAVE_TERMIOS_H -#include <termios.h> -#endif #include <fcntl.h> #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 9b73510..9f1b52a 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -103,7 +103,6 @@ typedef struct ucontext SIGCONTEXT; # include <sys/ucontext.h> # include <sys/types.h> -# include <signal.h> typedef siginfo_t siginfo; typedef struct ucontext SIGCONTEXT;

1 0

Michael Stefaniuc : kernel32: Remove duplicate includes.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: e973a193b7b188b81b0f9f47ecdedea069a82840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e973a193b7b188b81b0f9f47e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 01:42:43 2007 +0100 kernel32: Remove duplicate includes. --- dlls/kernel32/kernel_main.c | 1 - dlls/kernel32/tests/toolhelp.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 846f787..504e6f0 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -35,7 +35,6 @@ #include "wine/winbase16.h" #include "wine/library.h" -#include "wincon.h" #include "toolhelp.h" #include "kernel_private.h" #include "kernel16_private.h" diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index ca9c06c..3ae7540 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -21,13 +21,11 @@ #include <stdarg.h> #include <stdlib.h> #include <stdio.h> -#include <windef.h> -#include <winbase.h> -#include "tlhelp32.h" -#include "wine/test.h" #include "windef.h" #include "winbase.h" +#include "tlhelp32.h" +#include "wine/test.h" #include "winuser.h" static char selfname[MAX_PATH];

1 0

Michael Stefaniuc : setupapi: Remove duplicate includes.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 0977f858dabef33e7121de92f7d94a5931d6818a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0977f858dabef33e7121de92f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 01:42:51 2007 +0100 setupapi: Remove duplicate includes. --- dlls/setupapi/setupcab.c | 1 - dlls/setupapi/setupx_main.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index ca069bd..a3427d3 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -27,7 +27,6 @@ #include <string.h> #include <stdlib.h> -#include "wine/debug.h" #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/setupapi/setupx_main.c b/dlls/setupapi/setupx_main.c index fcf89c0..9b12ff7 100644 --- a/dlls/setupapi/setupx_main.c +++ b/dlls/setupapi/setupx_main.c @@ -69,7 +69,6 @@ #include "setupapi.h" #include "setupx16.h" #include "setupapi_private.h" -#include "winerror.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi);

1 0

Michael Stefaniuc : dlls: Remove duplicate includes.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 3e8970602c0cba1085f81294cfeab1ee2df0e08e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8970602c0cba1085f81294c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 01:43:03 2007 +0100 dlls: Remove duplicate includes. --- dlls/atl/atl_ax.c | 1 - dlls/dinput/joystick_linux.c | 1 - dlls/dnsapi/ns_name.c | 1 - dlls/quartz/avidec.c | 1 - dlls/shell32/shfldr_unixfs.c | 1 - dlls/user32/winpos.c | 1 - dlls/uuid/uuid.c | 1 - dlls/winmm/mci.c | 1 - 8 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/atl/atl_ax.c b/dlls/atl/atl_ax.c index 8201d09..64b338b 100644 --- a/dlls/atl/atl_ax.c +++ b/dlls/atl/atl_ax.c @@ -25,7 +25,6 @@ #include "windef.h" #include "winbase.h" -#include "winuser.h" #include "winerror.h" #include "winuser.h" #include "wine/debug.h" diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 000837d..bb967b9 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -32,7 +32,6 @@ #include <stdio.h> #include <string.h> #include <time.h> -#include <errno.h> #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff --git a/dlls/dnsapi/ns_name.c b/dlls/dnsapi/ns_name.c index de5fbdb..c33c7d6 100644 --- a/dlls/dnsapi/ns_name.c +++ b/dlls/dnsapi/ns_name.c @@ -32,7 +32,6 @@ # include <resolv.h> #endif #include <string.h> -#include <ctype.h> /* Data. */ diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 9e033c1..16dfe69 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -24,7 +24,6 @@ #include "pin.h" #include "uuids.h" -#include "vfwmsgs.h" #include "amvideo.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c index c18da27..6016dc7 100644 --- a/dlls/shell32/shfldr_unixfs.c +++ b/dlls/shell32/shfldr_unixfs.c @@ -140,7 +140,6 @@ # include <pwd.h> #endif #include <grp.h> -#include <limits.h> #define COBJMACROS #define NONAMELESSUNION diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 21c1089..94a95d2 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -26,7 +26,6 @@ #include <string.h> #include "ntstatus.h" #define WIN32_NO_STATUS -#include "winerror.h" #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 7fd7c2c..28cdec4 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -28,7 +28,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -#include "windef.h" #include "winbase.h" #include "wingdi.h" #include "winuser.h" diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 44748d2..52d5402 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -53,7 +53,6 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "winreg.h" #include "mmsystem.h" #include "winuser.h" #include "winnls.h"

1 0

Michael Stefaniuc : quartz: Fix memory leaks on error paths. Found by Smatch.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 41044dcd8c2d011a9602e2c342eb9accc818054a URL: http://source.winehq.org/git/wine.git/?a=commit;h=41044dcd8c2d011a9602e2c34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 00:20:05 2007 +0100 quartz: Fix memory leaks on error paths. Found by Smatch. --- dlls/quartz/dsoundrender.c | 4 +++- dlls/quartz/filesource.c | 2 ++ dlls/quartz/parser.c | 8 ++++++-- dlls/quartz/pin.c | 12 +++++++++--- dlls/quartz/transform.c | 4 ++++ dlls/quartz/videorenderer.c | 4 +++- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a7ebd9f..947bb98 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -97,10 +97,12 @@ static HRESULT DSoundRender_InputPin_Construct(const PIN_INFO * pPinInfo, SAMPLE { pPinImpl->pin.lpVtbl = &DSoundRender_InputPin_Vtbl; pPinImpl->lpVtblMemInput = &MemInputPin_Vtbl; - + *ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 726776b..73c92b2 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -880,6 +880,8 @@ static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter *ppPin = (IPin *)(&pPinImpl->pin.pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; } diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 39ea58b..94eb614 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -128,10 +128,12 @@ static HRESULT Parser_OutputPin_Construct(const PIN_INFO * pPinInfo, ALLOCATOR_P if (SUCCEEDED(Parser_OutputPin_Init(pPinInfo, props, pUserData, pQueryAccept, pmt, fSamplesPerSec, pCritSec, pPinImpl))) { pPinImpl->pin.pin.lpVtbl = &Parser_OutputPin_Vtbl; - + *ppPin = (IPin *)pPinImpl; return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; } @@ -723,10 +725,12 @@ static HRESULT Parser_InputPin_Construct(const PIN_INFO * pPinInfo, SAMPLEPROC p if (SUCCEEDED(PullPin_Init(pPinInfo, pSampleProc, pUserData, pQueryAccept, pCritSec, pPinImpl))) { pPinImpl->pin.lpVtbl = &Parser_InputPin_Vtbl; - + *ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; } diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 9960dff..08ddcef 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -147,10 +147,12 @@ HRESULT InputPin_Construct(const PIN_INFO * pPinInfo, SAMPLEPROC pSampleProc, LP { pPinImpl->pin.lpVtbl = &InputPin_Vtbl; pPinImpl->lpVtblMemInput = &MemInputPin_Vtbl; - + *ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; } @@ -228,10 +230,12 @@ HRESULT OutputPin_Construct(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *pro if (SUCCEEDED(OutputPin_Init(pPinInfo, props, pUserData, pQueryAccept, pCritSec, pPinImpl))) { pPinImpl->pin.lpVtbl = &OutputPin_Vtbl; - + *ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; } @@ -1021,10 +1025,12 @@ HRESULT PullPin_Construct(const PIN_INFO * pPinInfo, SAMPLEPROC pSampleProc, LPV if (SUCCEEDED(PullPin_Init(pPinInfo, pSampleProc, pUserData, pQueryAccept, pCritSec, pPinImpl))) { pPinImpl->pin.lpVtbl = &PullPin_Vtbl; - + *ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; } diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index b63cacd..0570a90 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -107,6 +107,8 @@ static HRESULT TransformFilter_InputPin_Construct(const PIN_INFO * pPinInfo, SAM *ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; } @@ -136,6 +138,8 @@ static HRESULT TransformFilter_OutputPin_Construct(const PIN_INFO * pPinInfo, co *ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9e76fd1..67e601e 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -277,10 +277,12 @@ static HRESULT VideoRenderer_InputPin_Construct(const PIN_INFO * pPinInfo, SAMPL { pPinImpl->pin.lpVtbl = &VideoRenderer_InputPin_Vtbl; pPinImpl->lpVtblMemInput = &MemInputPin_Vtbl; - + *ppPin = (IPin *)(&pPinImpl->pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; }

1 0

Michael Stefaniuc : comdlg32: Remove duplicate includes.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 861c58d462f93892c445ab15fe83657eebc36ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861c58d462f93892c445ab15f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 01:42:20 2007 +0100 comdlg32: Remove duplicate includes. --- dlls/comdlg32/filedlg.c | 3 +-- dlls/comdlg32/tests/printdlg.c | 1 - 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index cd2ad51..67fefd1 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -61,12 +61,11 @@ #include "windef.h" #include "winbase.h" -#include "winreg.h" #include "winternl.h" #include "winnls.h" #include "wingdi.h" -#include "winuser.h" #include "winreg.h" +#include "winuser.h" #include "commdlg.h" #include "dlgs.h" #include "cdlg.h" diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 9842b17..783773f 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "winerror.h" #include "wingdi.h" -#include "wingdi.h" #include "winuser.h" #include "cderr.h"

1 0

Michael Stefaniuc : shell32: Fix a mem leak on an error path. Found by Smatch.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 04380452d0800065d40f079f5e5964b47740115d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04380452d0800065d40f079f5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 00:19:19 2007 +0100 shell32: Fix a mem leak on an error path. Found by Smatch. --- dlls/shell32/shfldr_mycomp.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index ec0132b..87530a5 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -684,6 +684,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, { /* Neither a shell namespace extension nor a drive letter. */ ERR("Wrong pidl type\n"); + CoTaskMemFree(pszPath); return E_INVALIDARG; } }

1 0

Michael Stefaniuc : qcap: Fix a mem leak on an error path. Found by Smatch.
by Alexandre Julliard 19 Nov '07

19 Nov '07

Module: wine Branch: master Commit: 0805f6bb83e5ad989e244d6c8b8e6891882f958e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0805f6bb83e5ad989e244d6c8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Nov 19 00:19:47 2007 +0100 qcap: Fix a mem leak on an error path. Found by Smatch. --- dlls/qcap/vfwcapture.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index b461054..5e46335 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -767,6 +767,8 @@ VfwPin_Construct( IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, *ppPin = (IPin *)(&pPinImpl->pin.pin.lpVtbl); return S_OK; } + + CoTaskMemFree(pPinImpl); return E_FAIL; }

1 0