wine-commits February 2008

wine-commits@winehq.org

3 participants
999 discussions

Rob Shearman : mshtml: All interfaces in nsiface.idl are local.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 9b11494db7cdd45abaa5921c4bac2238915f8869 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b11494db7cdd45abaa5921c4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 16:21:42 2008 +0000 mshtml: All interfaces in nsiface.idl are local. Since there is no in or out, or other information necessary for remoting, all of the interfaces can only used locally, so declare them all as local. --- dlls/mshtml/nsiface.idl | 293 +++++++++++++++++++++++++++++++---------------- 1 files changed, 194 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b11494db7cdd45abaa59…

1 0

Rob Shearman : mshtml: Remove extra semi-colons after cpp_quote in nsiface. idl.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 4539f4f25bee33f9ef4dbbf499195ae679f56ee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4539f4f25bee33f9ef4dbbf49… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 16:21:25 2008 +0000 mshtml: Remove extra semi-colons after cpp_quote in nsiface.idl. --- dlls/mshtml/nsiface.idl | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 26258ee..334f5b0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -23,8 +23,8 @@ * useable in C code. */ -cpp_quote("#define GECKO_VERSION \"0.1.0\""); -cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION"); +cpp_quote("#define GECKO_VERSION \"0.1.0\"") +cpp_quote("#define GECKO_VERSION_STRING \"Wine Gecko \" GECKO_VERSION") import "wtypes.idl"; @@ -736,7 +736,7 @@ interface nsIDOMElementCSSInlineStyle : nsISupports nsresult GetStyle(nsIDOMCSSStyleDeclaration **aStyle); } -cpp_quote("#undef GetClassName"); +cpp_quote("#undef GetClassName") [ object, @@ -1263,7 +1263,7 @@ interface nsIWebBrowser : nsISupports nsresult GetContentDOMWindow(nsIDOMWindow **aContentDOMWindow); } -cpp_quote("#define SETUP_IS_CHROME_WRAPPER 7"); +cpp_quote("#define SETUP_IS_CHROME_WRAPPER 7") [ object, @@ -1311,7 +1311,7 @@ interface nsIBaseWindow : nsISupports nsresult SetTitle(const PRUnichar *aTitle); } -cpp_quote("#define LOAD_FLAGS_NONE 0"); +cpp_quote("#define LOAD_FLAGS_NONE 0") [ object, @@ -1710,13 +1710,13 @@ interface nsIDOMEvent : nsISupports nsresult InitEvent(const nsAString *eventTypeArg, PRBool canBubbleArg, PRBool cancelableArg); } -cpp_quote("#define CONTEXT_NONE 0x00"); -cpp_quote("#define CONTEXT_LINK 0x01"); -cpp_quote("#define CONTEXT_IMAGE 0x02"); -cpp_quote("#define CONTEXT_DOCUMENT 0x04"); -cpp_quote("#define CONTEXT_TEXT 0x08"); -cpp_quote("#define CONTEXT_INPUT 0x10"); -cpp_quote("#define CONTEXT_BACKGROUND_IMAGE 0x20"); +cpp_quote("#define CONTEXT_NONE 0x00") +cpp_quote("#define CONTEXT_LINK 0x01") +cpp_quote("#define CONTEXT_IMAGE 0x02") +cpp_quote("#define CONTEXT_DOCUMENT 0x04") +cpp_quote("#define CONTEXT_TEXT 0x08") +cpp_quote("#define CONTEXT_INPUT 0x10") +cpp_quote("#define CONTEXT_BACKGROUND_IMAGE 0x20") [ object,

1 0

Stefan Dösinger : wined3d: Switch the visual tests back to D3DDEVTYPE_HAL.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 9950cb4bf58a4d45cd96979acb9b3b56e48ae28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9950cb4bf58a4d45cd96979ac… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Feb 9 23:57:35 2008 +0100 wined3d: Switch the visual tests back to D3DDEVTYPE_HAL. --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 08df897..1509a08 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -119,7 +119,7 @@ static IDirect3DDevice9 *init_d3d9(void) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D16; - hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_REF, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); + hr = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D_CreateDevice returned: %s\n", DXGetErrorString9(hr)); return device_ptr;

1 0

Stefan Dösinger : wined3d: Add a test for the vFace register.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 81de2fa10a08ae4294dc1e118fb090c218de61e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81de2fa10a08ae4294dc1e118… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 11 12:04:57 2008 +0100 wined3d: Add a test for the vFace register. --- dlls/d3d9/tests/visual.c | 110 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 95 +++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 13 ++++- 3 files changed, 175 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81de2fa10a08ae4294dc1…

1 0

Aric Stewart : version: Check for 16-bit file format before returning ERROR_RESOURCE_DATA_NOT_FOUND .
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: 1a328d91263079b1678838d89d999296f3da6636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a328d91263079b1678838d89… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 13 10:17:05 2008 -0600 version: Check for 16-bit file format before returning ERROR_RESOURCE_DATA_NOT_FOUND. --- dlls/version/info.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 2be1df7..395895b 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -253,9 +253,6 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCWSTR filename, DWORD datasize, LP { WARN("Could not load %s\n", debugstr_w(filename)); - if (GetLastError() == ERROR_BAD_EXE_FORMAT) - return 0xFFFFFFFF; - return 0; } hRsrc = FindResourceW(hModule, @@ -384,7 +381,10 @@ static DWORD VERSION_GetFileVersionInfo_16( LPCSTR filename, DWORD datasize, LPV if(hModule < 32) { WARN("Could not load %s\n", debugstr_a(filename)); - return 0; + if (hModule == ERROR_BAD_FORMAT) + return 0xFFFFFFFF; + else + return 0x0; } hRsrc = FindResource16(hModule, MAKEINTRESOURCEA(VS_VERSION_INFO),

1 0

Rob Shearman : ole32: Fix potential NULL dereference of qiresults in ClientIdentity_QueryMultipleInterfaces .
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: 461ce6e4a28d1afb28a88861fa2143d0ac8919d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461ce6e4a28d1afb28a88861f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 12:35:13 2008 +0000 ole32: Fix potential NULL dereference of qiresults in ClientIdentity_QueryMultipleInterfaces. This could happen if proxy_manager_get_remunknown returns S_FALSE, so fix the check of the return code to match that below. --- dlls/ole32/marshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 32dadb1..dd292be 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -279,7 +279,7 @@ static HRESULT WINAPI ClientIdentity_QueryMultipleInterfaces(IMultiQI *iface, UL /* get IRemUnknown proxy so we can communicate with the remote object */ hr = proxy_manager_get_remunknown(This, &remunk); - if (hr == S_OK) + if (SUCCEEDED(hr)) { hr = IRemUnknown_RemQueryInterface(remunk, ipid, NORMALEXTREFS, nonlocal_mqis, iids, &qiresults);

1 0

Rob Shearman : ole32: Fix a potentially confusing combination of conditional and bitwise or operators by adding extra brackets .
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: bfa6ddaeb772334696d040f116f09d5a146c0012 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfa6ddaeb772334696d040f11… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 12:35:08 2008 +0000 ole32: Fix a potentially confusing combination of conditional and bitwise or operators by adding extra brackets. --- dlls/ole32/compobj.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 55b9125..c800a2c 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3432,8 +3432,8 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, if (message_loop) { - DWORD wait_flags = (dwFlags & COWAIT_WAITALL) ? MWMO_WAITALL : 0 | - (dwFlags & COWAIT_ALERTABLE ) ? MWMO_ALERTABLE : 0; + DWORD wait_flags = ((dwFlags & COWAIT_WAITALL) ? MWMO_WAITALL : 0) | + ((dwFlags & COWAIT_ALERTABLE ) ? MWMO_ALERTABLE : 0); TRACE("waiting for rpc completion or window message\n");

1 0

Rob Shearman : ole32: Remove an assert that is useless and triggers warnings elsewhere in static analysis tools .
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: a10cf1644987b58aa4c9edc8322634ca5c25cfe4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10cf1644987b58aa4c9edc83… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 12:35:00 2008 +0000 ole32: Remove an assert that is useless and triggers warnings elsewhere in static analysis tools. --- dlls/ole32/compobj.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 73bd0f3..55b9125 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1780,11 +1780,6 @@ static HRESULT COM_GetRegisteredClassObject(const struct apartment *apt, REFCLSI HRESULT hr = S_FALSE; RegisteredClass *curClass; - /* - * Sanity check - */ - assert(ppUnk!=0); - EnterCriticalSection( &csRegisteredClassList ); LIST_FOR_EACH_ENTRY(curClass, &RegisteredClassList, RegisteredClass, entry)

1 0

Rob Shearman : ole32: Fix local-variable shadowing in apartment_hostobject_thread.
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: e0d25c6394c44349169cd687a7502d296f211084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d25c6394c44349169cd687a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 12:34:52 2008 +0000 ole32: Fix local-variable shadowing in apartment_hostobject_thread. --- dlls/ole32/compobj.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 2ccccdf..73bd0f3 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -591,9 +591,9 @@ static DWORD CALLBACK apartment_hostobject_thread(LPVOID p) { if (!msg.hwnd && (msg.message == DM_HOSTOBJECT)) { - struct host_object_params *params = (struct host_object_params *)msg.lParam; - params->hr = apartment_hostobject(apt, params); - SetEvent(params->event); + struct host_object_params *obj_params = (struct host_object_params *)msg.lParam; + obj_params->hr = apartment_hostobject(apt, obj_params); + SetEvent(obj_params->event); } else {

1 0

Rob Shearman : ole32: Fix reference count leak in BindMoniker.
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: 14f7a59270579d57244e7ce3527f157233f0bc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f7a59270579d57244e7ce35… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 12:34:44 2008 +0000 ole32: Fix reference count leak in BindMoniker. --- dlls/ole32/bindctx.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index e0f297e..5c348cb 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -611,6 +611,9 @@ HRESULT WINAPI BindMoniker(LPMONIKER pmk, DWORD grfOpt, REFIID riid, LPVOID * pp res = CreateBindCtx(grfOpt, &pbc); if (SUCCEEDED(res)) + { res = IMoniker_BindToObject(pmk, pbc, NULL, riid, ppvResult); + IBindCtx_Release(pbc); + } return res; }

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 February 2008