February 2008 - Wine-commits

Rob Shearman : mshtml: Add a dummy member to nsMargin as empty structs aren 't valid in C89.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 94fe669387ed325bb54704790b24c1106733d941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94fe669387ed325bb54704790… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 16:22:03 2008 +0000 mshtml: Add a dummy member to nsMargin as empty structs aren't valid in C89. --- dlls/mshtml/nsiface.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 0f7e066..f27960a 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -1404,7 +1404,7 @@ interface nsIWebNavigation : nsISupports ] interface nsIPrintSettings : nsISupports { - typedef struct {} nsMargin; + typedef struct { char dummy; } nsMargin; nsresult SetPrintOptions(PRInt32 aType, PRBool aTurnOnOff); nsresult GetPrintOptions(PRInt32 aType, PRBool *_retval);

1 0

Rob Shearman : avifil32: Pass the number of characters to LoadStringW, not the number of bytes.
by Alexandre Julliard 15 Feb '08

15 Feb '08

Module: wine Branch: master Commit: 89a2eab3f439e5ddf98d27fac5931ce799ab8b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89a2eab3f439e5ddf98d27fac… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Feb 13 16:21:53 2008 +0000 avifil32: Pass the number of characters to LoadStringW, not the number of bytes. --- dlls/avifil32/avifile.c | 8 ++++---- dlls/avifil32/wavfile.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index 5becaf4..b0ef1cb 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -1656,7 +1656,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) This->fInfo.dwWidth = MainAVIHdr.dwWidth; This->fInfo.dwHeight = MainAVIHdr.dwHeight; LoadStringW(AVIFILE_hModule, IDS_AVIFILETYPE, This->fInfo.szFileType, - sizeof(This->fInfo.szFileType)); + sizeof(This->fInfo.szFileType)/sizeof(This->fInfo.szFileType[0])); /* go back to into header list */ if (mmioAscend(This->hmmio, &ck, 0) != S_OK) @@ -1767,9 +1767,9 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) /* generate description for stream like "filename.avi Type #n" */ if (streamHdr.fccType == streamtypeVIDEO) - LoadStringW(AVIFILE_hModule, IDS_VIDEO, szType, sizeof(szType)); + LoadStringW(AVIFILE_hModule, IDS_VIDEO, szType, sizeof(szType)/sizeof(szType[0])); else if (streamHdr.fccType == streamtypeAUDIO) - LoadStringW(AVIFILE_hModule, IDS_AUDIO, szType, sizeof(szType)); + LoadStringW(AVIFILE_hModule, IDS_AUDIO, szType, sizeof(szType)/sizeof(szType[0])); else wsprintfW(szType, streamTypeFmt, (char*)&streamHdr.fccType); @@ -1782,7 +1782,7 @@ static HRESULT AVIFILE_LoadFile(IAVIFileImpl *This) memset(pStream->sInfo.szName, 0, sizeof(pStream->sInfo.szName)); - LoadStringW(AVIFILE_hModule, IDS_AVISTREAMFORMAT, streamNameFmt, sizeof(streamNameFmt)); + LoadStringW(AVIFILE_hModule, IDS_AVISTREAMFORMAT, streamNameFmt, sizeof(streamNameFmt)/sizeof(streamNameFmt[0])); /* FIXME: avoid overflow -- better use wsnprintfW, which doesn't exists ! */ wsprintfW(pStream->sInfo.szName, streamNameFmt, diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 7791a66..b9779e3 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -607,9 +607,9 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile *iface, memset(& This->sInfo, 0, sizeof(This->sInfo)); LoadStringW(AVIFILE_hModule, IDS_WAVEFILETYPE, This->fInfo.szFileType, - sizeof(This->fInfo.szFileType)); + sizeof(This->fInfo.szFileType)/sizeof(This->fInfo.szFileType[0])); if (LoadStringW(AVIFILE_hModule, IDS_WAVESTREAMFORMAT, - wszStreamFmt, sizeof(wszStreamFmt)) > 0) { + wszStreamFmt, sizeof(wszStreamFmt)/sizeof(wszStreamFmt[0])) > 0) { wsprintfW(This->sInfo.szName, wszStreamFmt, AVIFILE_BasenameW(This->szFileName)); }

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

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

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

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 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: 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 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

Andrew Talbot : comdlg32: Assign to structs instead of using memcpy.
by Alexandre Julliard 13 Feb '08

13 Feb '08

Module: wine Branch: master Commit: 8fb1f0d089b975c13cfa134541a3524206684790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb1f0d089b975c13cfa13454… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Feb 13 11:09:02 2008 +0000 comdlg32: Assign to structs instead of using memcpy. --- dlls/comdlg32/printdlg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 95f4dac..8e78f3c 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3232,7 +3232,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg == WM_INITDIALOG) { /*Init dialog*/ pda = (PageSetupDataA*)lParam; pda->hDlg = hDlg; /* saving handle to main window to PageSetupDataA structure */ - memcpy(&pda->curdlg, pda->dlga, sizeof(pda->curdlg)); + pda->curdlg = *pda->dlga; hDrawWnd = GetDlgItem(hDlg, rct1); TRACE("set property to %p\n", pda); @@ -3358,7 +3358,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (uMsg==WM_INITDIALOG) { res = TRUE; pda = (PageSetupDataW*)lParam; - memcpy(&pda->curdlg, pda, sizeof(pda->curdlg)); + pda->curdlg = *pda->dlga; SetPropW(hDlg, __WINE_PAGESETUPDLGDATA, pda); if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) { res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga); @@ -3537,10 +3537,10 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) { COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - + pda = HeapAlloc(GetProcessHeap(),0,sizeof(*pda)); pda->dlga = setupdlg; - memcpy(&pda->pdlg,&pdlg,sizeof(pdlg)); + pda->pdlg = pdlg; bRet = (0<DialogBoxIndirectParamA( setupdlg->hInstance, @@ -3631,7 +3631,7 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) { } pdw = HeapAlloc(GetProcessHeap(),0,sizeof(*pdw)); pdw->dlga = setupdlg; - memcpy(&pdw->pdlg,&pdlg,sizeof(pdlg)); + pdw->pdlg = pdlg; bRet = (0<DialogBoxIndirectParamW( setupdlg->hInstance,

1 0