wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Henri Verbeet : ddraw: Implement ddraw7_Initialize().
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: ec04f80cf606f07a630bfc515f004be9cc4679ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec04f80cf606f07a630bfc515… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 18 21:05:28 2011 +0200 ddraw: Implement ddraw7_Initialize(). --- dlls/ddraw/ddraw.c | 19 +++++++++++++++---- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/main.c | 17 +++++++++++++++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 4708b8e..65afa90 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1537,11 +1537,22 @@ static HRESULT WINAPI ddraw2_GetAvailableVidMem(IDirectDraw2 *iface, * DDERR_ALREADYINITIALIZED on repeated calls * *****************************************************************************/ -static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *Guid) +static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *guid) { - FIXME("iface %p, guid %s stub!\n", iface, debugstr_guid(Guid)); + IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); - return DDERR_ALREADYINITIALIZED; + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); + + if (This->initialized) + return DDERR_ALREADYINITIALIZED; + + /* FIXME: To properly take the GUID into account we should call + * ddraw_init() here instead of in DDRAW_Create(). */ + if (guid) + FIXME("Ignoring guid %s.\n", debugstr_guid(guid)); + + This->initialized = TRUE; + return DD_OK; } static HRESULT WINAPI ddraw4_Initialize(IDirectDraw4 *iface, GUID *guid) @@ -1575,7 +1586,7 @@ static HRESULT WINAPI d3d1_Initialize(IDirect3D *iface, REFIID riid) { TRACE("iface %p, riid %s.\n", iface, debugstr_guid(riid)); - return D3D_OK; + return DDERR_ALREADYINITIALIZED; } /***************************************************************************** diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 601797e..bc48ad1 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -81,6 +81,7 @@ struct IDirectDrawImpl /* See comment in IDirectDraw::AddRef */ LONG ref7, ref4, ref2, ref3, ref1, numIfaces; + BOOL initialized; /* WineD3D linkage */ struct wined3d *wineD3D; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index e475914..2ab9eac 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -275,6 +275,14 @@ DirectDrawCreate(GUID *GUID, EnterCriticalSection(&ddraw_cs); hr = DDRAW_Create(GUID, (void **) DD, UnkOuter, &IID_IDirectDraw); LeaveCriticalSection(&ddraw_cs); + + if (SUCCEEDED(hr)) + { + hr = IDirectDraw_Initialize(*DD, GUID); + if (FAILED(hr)) + IDirectDraw_Release(*DD); + } + return hr; } @@ -304,6 +312,15 @@ DirectDrawCreateEx(GUID *GUID, EnterCriticalSection(&ddraw_cs); hr = DDRAW_Create(GUID, DD, UnkOuter, iid); LeaveCriticalSection(&ddraw_cs); + + if (SUCCEEDED(hr)) + { + IDirectDraw7 *ddraw7 = *(IDirectDraw7 **)DD; + hr = IDirectDraw7_Initialize(ddraw7, GUID); + if (FAILED(hr)) + IDirectDraw7_Release(ddraw7); + } + return hr; }

1 0

Henri Verbeet : ddraw: Get rid of IDirectDraw3.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: feb96511a92f0d4e9c9e05fbb1bfbc6eeb3f7d72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb96511a92f0d4e9c9e05fbb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 18 21:05:27 2011 +0200 ddraw: Get rid of IDirectDraw3. --- dlls/ddraw/ddraw.c | 389 -------------------------------------------- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/main.c | 2 - 3 files changed, 0 insertions(+), 392 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=feb96511a92f0d4e9c9e0…

1 0

Francois Gouget : ntdll: Don' t trace potentially uninitialized structures if we are not going to use them .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: bee334003b85ba3c2d4cd57160ca08cc4a533023 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee334003b85ba3c2d4cd5716… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 20:09:12 2011 +0200 ntdll: Don't trace potentially uninitialized structures if we are not going to use them. --- dlls/ntdll/om.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c index c103ddd..18da18d 100644 --- a/dlls/ntdll/om.c +++ b/dlls/ntdll/om.c @@ -404,10 +404,10 @@ NTSTATUS WINAPI NtOpenDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK Desir POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS ret; - TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); if (!DirectoryHandle) return STATUS_ACCESS_VIOLATION; if (!ObjectAttributes) return STATUS_INVALID_PARAMETER; + TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); /* Have to test it here because server won't know difference between * ObjectName == NULL and ObjectName == "" */ if (!ObjectAttributes->ObjectName) @@ -452,9 +452,9 @@ NTSTATUS WINAPI NtCreateDirectoryObject(PHANDLE DirectoryHandle, ACCESS_MASK Des POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS ret; - TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); if (!DirectoryHandle) return STATUS_ACCESS_VIOLATION; + TRACE("(%p,0x%08x,%s)\n", DirectoryHandle, DesiredAccess, debugstr_ObjectAttributes(ObjectAttributes)); SERVER_START_REQ(create_directory) {

1 0

Francois Gouget : inetcomm: Fix printing NULL strings.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 54ae7787debda283f9853fe14683eec80f2428d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54ae7787debda283f9853fe14… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:50:27 2011 +0200 inetcomm: Fix printing NULL strings. --- dlls/inetcomm/mimeole.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index f297c29..8a1e3d4 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2134,7 +2134,8 @@ static HRESULT WINAPI MimeMessage_IsContentType( { HRESULT hr; IMimeBody *mime_body; - TRACE("(%p)->(%p, %s, %s)\n", iface, hBody, pszPriType, pszSubType); + TRACE("(%p)->(%p, %s, %s)\n", iface, hBody, debugstr_a(pszPriType), + debugstr_a(pszSubType)); hr = IMimeMessage_BindToObject(iface, hBody, &IID_IMimeBody, (void**)&mime_body); if(FAILED(hr)) return hr;

1 0

Francois Gouget : d3dxof: Fix printing NULL strings.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: cb6a8125a9b2acbc4085714a1f7c6bade2621125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6a8125a9b2acbc4085714a1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:50:11 2011 +0200 d3dxof: Fix printing NULL strings. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b8f0f00..8678396 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -575,7 +575,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetData(IDirectXFileData* iface, LPCS { IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); - TRACE("(%p/%p)->(%s,%p,%p)\n", This, iface, szMember, pcbSize, ppvData); + TRACE("(%p/%p)->(%s,%p,%p)\n", This, iface, debugstr_a(szMember), pcbSize, ppvData); if (!pcbSize || !ppvData) return DXFILEERR_BADVALUE;

1 0

Francois Gouget : msi: Fix printing NULL strings.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: ff98afc450a1a881ab951a29662c8f1313dcc425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff98afc450a1a881ab951a296… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:49:55 2011 +0200 msi: Fix printing NULL strings. --- dlls/msi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index d281098..de9c0ce 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -489,7 +489,7 @@ UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder, awstring str; UINT r; - TRACE("%s %p %p\n", szFolder, debugstr_a(szPathBuf), pcchPathBuf); + TRACE("%s %p %p\n", debugstr_a(szFolder), debugstr_a(szPathBuf), pcchPathBuf); str.unicode = FALSE; str.str.a = szPathBuf;

1 0

Francois Gouget : dinput: Fix printing NULL strings.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: ca8c1103af3ef4520893c69b9cb5e24bb853bfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8c1103af3ef4520893c69b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:44:01 2011 +0200 dinput: Fix printing NULL strings. --- dlls/dinput/dinput_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 028d901..373b990 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -883,7 +883,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( int i, j; - FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, ptszUserName, lpdiActionFormat, + FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_a(ptszUserName), lpdiActionFormat, lpCallback, pvRef, dwFlags); #define X(x) if (dwFlags & x) FIXME("\tdwFlags |= "#x"\n"); X(DIEDBSFL_ATTACHEDONLY)

1 0

Francois Gouget : quartz/tests: Skip some tests if not allowed to register filters.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: e5e2304427c2ea7dab662fdb39a109cac1060969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e2304427c2ea7dab662fdb3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:42:15 2011 +0200 quartz/tests: Skip some tests if not allowed to register filters. --- dlls/quartz/tests/filtergraph.c | 59 +++++++------ dlls/quartz/tests/filtermapper.c | 177 ++++++++++++++++++++----------------- 2 files changed, 128 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5e2304427c2ea7dab662…

1 0

Francois Gouget : ntdll/tests: Skip some tests if not allowed to modify image file execution options.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 344ef82b68411ac3115e5e1dcc2596fecfd9a5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=344ef82b68411ac3115e5e1dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:41:27 2011 +0200 ntdll/tests: Skip some tests if not allowed to modify image file execution options. --- dlls/ntdll/tests/reg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 8f44a1d..5ca14eb 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1198,6 +1198,11 @@ static void test_redirection(void) pRtlInitUnicodeString( &str, classes64W ); status = pNtCreateKey( &key64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + if (status == STATUS_ACCESS_DENIED) + { + skip("Not authorized to modify the Classes key\n"); + return; + } ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); pRtlInitUnicodeString( &str, classes32W );

1 0

Francois Gouget : kernel32/tests: Skip some tests if not allowed to modify the image file execution options.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 752bb66b654e69a87c56b52a352104eea265f790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=752bb66b654e69a87c56b52a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:40:52 2011 +0200 kernel32/tests: Skip some tests if not allowed to modify the image file execution options. --- dlls/kernel32/tests/heap.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 26bc58f..634e14d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -724,6 +724,11 @@ static void test_debug_heap( const char *argv0, DWORD flags ) if (!strcmp( keyname + strlen(keyname) - 3, ".so" )) keyname[strlen(keyname) - 3] = 0; err = RegCreateKeyA( HKEY_LOCAL_MACHINE, keyname, &hkey ); + if (err == ERROR_ACCESS_DENIED) + { + skip("Not authorized to change the image file execution options\n"); + return; + } ok( !err, "failed to create '%s' error %u\n", keyname, err ); if (err) return;

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