September 2008 - Wine-commits

Jeremy Newman : adding a page for the keynote from WineConf 2008
by Jeremy Newman 30 Sep '08

30 Sep '08

Module: website Branch: master Commit: 5f1ffda860e8e2f19183431ef0142d7b87d446b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=5f1ffda860e8e2f1918343… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Sep 30 15:29:26 2008 -0500 adding a page for the keynote from WineConf 2008 --- templates/en/wineconf/media.template | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/templates/en/wineconf/media.template b/templates/en/wineconf/media.template new file mode 100644 index 0000000..49f5cd8 --- /dev/null +++ b/templates/en/wineconf/media.template @@ -0,0 +1,34 @@ + + +<p><img src="{$root}/images/wineconf/wineconf_logo.jpg" width="295" height="108" alt="-LOGO-"></p> + +<h2>Media</h2> + +<script type="text/javascript" src="http://www.codeweavers.com/js/swfobject.js"></script> +<script type="text/javascript"> + var flashvars = {}; + flashvars.width = "720"; + flashvars.height = "480"; + flashvars.file = "http://media.codeweavers.com/pub/other/wineconf2008.flv"; + flashvars.backcolor = "0xEFEFEF"; + var params = {}; + params.menu = "false"; + params.allowfullscreen = "true"; + var attributes = {}; + attributes.id = "mediaplayer"; + attributes.name = "mediaplayer"; + swfobject.embedSWF("http://www.codeweavers.com/images/swf/mediaplayer.swf", "winehqvid", "720", "480", "8.0.0", null, flashvars, params, attributes); +</script> + +<p>The following is the keynote address from Alexandre Julliard given during WineConf 2008. To view the video you will need +to have <a href="http://www.macromedia.com/go/getflashplayer">Adobe Flash Player</a> installed.</p> + +<div style="margin-left: 25px;"> + <div id="winehqvid"> + <b class="error">Flash Player Not Found!</b><br /> + <a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see our videos. + </div> +</div> + +<p> </p> +

1 0

Andrew Talbot : dinput: Sign-compare warnings fix.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: c1d5dfe84bdaca664c44ef40c00272b34a172429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1d5dfe84bdaca664c44ef40c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Sep 29 21:28:22 2008 +0100 dinput: Sign-compare warnings fix. --- dlls/dinput/dinput_main.c | 22 ++++++++++++---------- dlls/dinput/effect_linuxinput.c | 2 +- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6b52de4..6c2a9ed 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -213,7 +213,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { } void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { - int i; + unsigned int i; FIXME("diaf.dwSize = %d\n", lpdiActionFormat->dwSize); FIXME("diaf.dwActionSize = %d\n", lpdiActionFormat->dwActionSize); @@ -221,7 +221,7 @@ void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions); FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction); for (i=0;i<lpdiActionFormat->dwNumActions;i++) { - FIXME("diaf.rgoAction[%d]:\n", i); + FIXME("diaf.rgoAction[%u]:\n", i); FIXME("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData); FIXME("\tdwSemantics=%x\n", lpdiActionFormat->rgoAction[i].dwSemantics); FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags); @@ -250,8 +250,9 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( { IDirectInputImpl *This = (IDirectInputImpl *)iface; DIDEVICEINSTANCEA devInstance; - int i, j, r; - + unsigned int i; + int j, r; + TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), lpCallback, pvRef, dwFlags); @@ -261,7 +262,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!dinput_devices[i]->enum_deviceA) continue; for (j = 0, r = -1; r != 0; j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); if ((r = dinput_devices[i]->enum_deviceA(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; @@ -280,8 +281,9 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( { IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); DIDEVICEINSTANCEW devInstance; - int i, j, r; - + unsigned int i; + int j, r; + TRACE("(this=%p,0x%04x '%s',%p,%p,%04x)\n", This, dwDevType, _dump_DIDEVTYPE_value(dwDevType), lpCallback, pvRef, dwFlags); @@ -291,7 +293,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!dinput_devices[i]->enum_deviceW) continue; for (j = 0, r = -1; r != 0; j++) { devInstance.dwSize = sizeof(devInstance); - TRACE(" - checking device %d ('%s')\n", i, dinput_devices[i]->name); + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); if ((r = dinput_devices[i]->enum_deviceW(dwDevType, dwFlags, &devInstance, This->dwVersion, j))) { if (lpCallback(&devInstance,pvRef) == DIENUM_STOP) return 0; @@ -479,7 +481,7 @@ static HRESULT WINAPI IDirectInput7AImpl_CreateDeviceEx(LPDIRECTINPUT7A iface, R { IDirectInputImpl *This = (IDirectInputImpl *)iface; HRESULT ret_value = DIERR_DEVICENOTREG; - int i; + unsigned int i; TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); @@ -515,7 +517,7 @@ static HRESULT WINAPI IDirectInput7WImpl_CreateDeviceEx(LPDIRECTINPUT7W iface, R { IDirectInputImpl *This = impl_from_IDirectInput7W( iface ); HRESULT ret_value = DIERR_DEVICENOTREG; - int i; + unsigned int i; TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter); diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index 9b1cb1b..3395a37 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -406,7 +406,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( } if (dwFlags & DIEP_TYPESPECIFICPARAMS) { - int expectedsize = 0; + DWORD expectedsize = 0; if (This->effect.type == FF_PERIODIC) { expectedsize = sizeof(DIPERIODIC); } else if (This->effect.type == FF_CONSTANT) { diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index bcac66a..4146f1d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -781,7 +781,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty( LPCDIPROPHEADER ph) { JoystickImpl *This = (JoystickImpl *)iface; - int i; + DWORD i; TRACE("(%p,%s,%p)\n",This,debugstr_guid(rguid),ph); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 6b3a186..4dcd61e 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -835,7 +835,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; if (ph->dwHow == DIPH_DEVICE) { - int i; + DWORD i; TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { /* Scale dead-zone */ @@ -862,7 +862,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, case (DWORD)DIPROP_DEADZONE: { LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { - int i; + DWORD i; TRACE("deadzone(%d) all\n", pd->dwData); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { This->props[i].lDeadZone = pd->dwData; @@ -893,7 +893,7 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface, LPCDIPROPDWORD pd = (LPCDIPROPDWORD)ph; if (ph->dwHow == DIPH_DEVICE) { - int i; + DWORD i; TRACE("saturation(%d) all\n", pd->dwData); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++)

1 0

Rob Shearman : advapi32: Output the last error when services tests fail.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 637c3125bafb94e533bc6b9fa60add5600b2fc55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=637c3125bafb94e533bc6b9fa… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Sep 29 22:30:29 2008 +0100 advapi32: Output the last error when services tests fail. --- dlls/advapi32/tests/service.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index da62b0b..d28aad1 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -649,7 +649,7 @@ static void test_get_displayname(void) /* Delete the service */ ret = DeleteService(svc_handle); - ok(ret, "Expected success\n"); + ok(ret, "Expected success (err=%d)\n", GetLastError()); CloseServiceHandle(svc_handle); CloseServiceHandle(scm_handle); @@ -1985,7 +1985,7 @@ static void test_refcount(void) /* Check if we can close the handle to the Service Control Manager */ ret = CloseServiceHandle(scm_handle); - ok(ret, "Expected success\n"); + ok(ret, "Expected success (err=%d)\n", GetLastError()); /* Get a new handle to the Service Control Manager */ scm_handle = OpenSCManagerA(NULL, NULL, GENERIC_ALL); @@ -1997,7 +1997,7 @@ static void test_refcount(void) /* Delete the service */ ret = DeleteService(svc_handle4); - ok(ret, "Expected success\n"); + ok(ret, "Expected success (err=%d)\n", GetLastError()); /* We cannot create the same service again as it's still marked as 'being deleted'. * The reason is that we still have 4 open handles to this service even though we @@ -2023,13 +2023,13 @@ static void test_refcount(void) /* Close all the handles to the service and try again */ ret = CloseServiceHandle(svc_handle4); - ok(ret, "Expected success\n"); + ok(ret, "Expected success (err=%d)\n", GetLastError()); ret = CloseServiceHandle(svc_handle3); - ok(ret, "Expected success\n"); + ok(ret, "Expected success (err=%d)\n", GetLastError()); ret = CloseServiceHandle(svc_handle2); - ok(ret, "Expected success\n"); + ok(ret, "Expected success (err=%d)\n", GetLastError()); ret = CloseServiceHandle(svc_handle1); - ok(ret, "Expected success\n"); + ok(ret, "Expected success (err=%d)\n", GetLastError()); /* Wait a while. Doing a CreateService too soon will result again * in an ERROR_SERVICE_MARKED_FOR_DELETE error. @@ -2044,7 +2044,7 @@ static void test_refcount(void) /* Delete the service */ ret = DeleteService(svc_handle5); - ok(ret, "Expected success\n"); + ok(ret, "Expected success (err=%d)\n", GetLastError()); /* Wait a while. Just in case one of the following tests does a CreateService again */ Sleep(1000);

1 0

Lei Zhang : comctl32: Avoid a divide by zero in listview.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 60d97040f88d4050a5d53df236a2bb2dd668a839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d97040f88d4050a5d53df23… Author: Lei Zhang <thestig(a)google.com> Date: Mon Sep 29 13:38:54 2008 -0700 comctl32: Avoid a divide by zero in listview. --- dlls/comctl32/listview.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 70555e8..34e6208 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1713,7 +1713,8 @@ static void LISTVIEW_UpdateScroll(const LISTVIEW_INFO *infoPtr) if(vertInfo.nPage < infoPtr->nItemHeight) vertInfo.nPage = infoPtr->nItemHeight; - vertInfo.nPage /= infoPtr->nItemHeight; + if (infoPtr->nItemHeight > 0) + vertInfo.nPage /= infoPtr->nItemHeight; } else if (uView != LVS_LIST) /* LVS_ICON, or LVS_SMALLICON */ {

1 0

Jacek Caban : urlmon: Fixed potential null dereference.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: ec34ad38ef0b6ca7b02454e5af66d91cc9b27ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec34ad38ef0b6ca7b02454e5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 28 17:44:56 2008 +0200 urlmon: Fixed potential null dereference. --- dlls/urlmon/bindctx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 328254c..044b817 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -511,7 +511,8 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb hres = IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown*)bsc); IBindStatusCallback_Release(bsc); if(FAILED(hres)) { - IBindStatusCallback_Release(prev); + if(prev) + IBindStatusCallback_Release(prev); return hres; }

1 0

Rob Shearman : comcat: Fix mixing of HRESULT and LSTATUS types in COMCAT_CLSID_IEnumGUID_Next, COMCAT_IEnumCATEGORYINFO_Next and COMCAT_CATID_IEnumGUID_Next.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 65de799958bb9d07c124333a8d0bf7e0cc4ed5a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65de799958bb9d07c124333a8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 30 13:54:57 2008 +0100 comcat: Fix mixing of HRESULT and LSTATUS types in COMCAT_CLSID_IEnumGUID_Next, COMCAT_IEnumCATEGORYINFO_Next and COMCAT_CATID_IEnumGUID_Next. (Found by PreFast.) --- dlls/comcat/information.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c index cd5a9ea..d2d4df8 100644 --- a/dlls/comcat/information.c +++ b/dlls/comcat/information.c @@ -373,7 +373,8 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Next( if (This == NULL || rgelt == NULL) return E_POINTER; if (This->key) while (fetched < celt) { - HRESULT res; + LSTATUS res; + HRESULT hr; WCHAR catid[39]; DWORD cName = 39; HKEY subkey; @@ -383,16 +384,16 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Next( if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; ++(This->next_index); - res = CLSIDFromString(catid, &rgelt->catid); - if (FAILED(res)) continue; + hr = CLSIDFromString(catid, &rgelt->catid); + if (FAILED(hr)) continue; res = RegOpenKeyExW(This->key, catid, 0, KEY_READ, &subkey); if (res != ERROR_SUCCESS) continue; - res = COMCAT_GetCategoryDesc(subkey, This->lcid, - rgelt->szDescription, 128); + hr = COMCAT_GetCategoryDesc(subkey, This->lcid, + rgelt->szDescription, 128); RegCloseKey(subkey); - if (FAILED(res)) continue; + if (FAILED(hr)) continue; rgelt->lcid = This->lcid; ++fetched; @@ -677,7 +678,8 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Next( if (This == NULL || rgelt == NULL) return E_POINTER; if (This->key) while (fetched < celt) { - HRESULT res; + LSTATUS res; + HRESULT hr; WCHAR clsid[39]; DWORD cName = 39; HKEY subkey; @@ -687,15 +689,15 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Next( if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; ++(This->next_index); - res = CLSIDFromString(clsid, rgelt); - if (FAILED(res)) continue; + hr = CLSIDFromString(clsid, rgelt); + if (FAILED(hr)) continue; res = RegOpenKeyExW(This->key, clsid, 0, KEY_READ, &subkey); if (res != ERROR_SUCCESS) continue; - res = COMCAT_IsClassOfCategories(subkey, This->categories); + hr = COMCAT_IsClassOfCategories(subkey, This->categories); RegCloseKey(subkey); - if (res != S_OK) continue; + if (hr != S_OK) continue; ++fetched; ++rgelt; @@ -868,7 +870,8 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Next( if (This == NULL || rgelt == NULL) return E_POINTER; if (This->key) while (fetched < celt) { - HRESULT res; + LSTATUS res; + HRESULT hr; WCHAR catid[39]; DWORD cName = 39; @@ -877,8 +880,8 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Next( if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; ++(This->next_index); - res = CLSIDFromString(catid, rgelt); - if (FAILED(res)) continue; + hr = CLSIDFromString(catid, rgelt); + if (FAILED(hr)) continue; ++fetched; ++rgelt;

1 0

Rob Shearman : d3d8: Fix incorrect ordering of brackets in IDirect3DVertexShader8Impl_GetDevice .
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 941801c5483b75c68e8c8968d93f0576c23ffcf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=941801c5483b75c68e8c8968d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 30 13:54:45 2008 +0100 d3d8: Fix incorrect ordering of brackets in IDirect3DVertexShader8Impl_GetDevice. The comparison should be (D3D_OK == hr && myDevice), not (D3D_OK == (hr && myDevice)). (Found with PreFast.) --- dlls/d3d8/vertexshader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index 89555bd..3af93b4 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -70,7 +70,8 @@ static HRESULT WINAPI IDirect3DVertexShader8Impl_GetDevice(IDirect3DVertexShader HRESULT hr = D3D_OK; TRACE("(%p) : Relay\n", This); - if (D3D_OK == (hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice) && myDevice != NULL)) { + hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice); + if (D3D_OK == hr && myDevice != NULL) { hr = IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); IWineD3DDevice_Release(myDevice); } else {

1 0

Rob Shearman : avifil32: Fix treating the return values of mmio* functions as HRESULTs instead of MMRESULTs .
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: c9d24bdc3e498f509c40771a8a7f7bb5fe33037b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9d24bdc3e498f509c40771a8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 30 13:55:35 2008 +0100 avifil32: Fix treating the return values of mmio* functions as HRESULTs instead of MMRESULTs. (Found by PreFast.) --- dlls/avifil32/extrachunk.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/avifil32/extrachunk.c b/dlls/avifil32/extrachunk.c index 45096e8..5b87623 100644 --- a/dlls/avifil32/extrachunk.c +++ b/dlls/avifil32/extrachunk.c @@ -145,7 +145,7 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck, { FOURCC ckid; FOURCC fccType; - HRESULT hr; + MMRESULT mmr; /* pre-conditions */ assert(extra != NULL); @@ -171,12 +171,13 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck, TRACE(": find ckid=0x%08X fccType=0x%08X\n", ckid, fccType); for (;;) { - hr = mmioDescend(hmmio, lpck, lpckParent, 0); - if (hr != S_OK) { + mmr = mmioDescend(hmmio, lpck, lpckParent, 0); + if (mmr != MMSYSERR_NOERROR) { /* No extra chunks in front of desired chunk? */ - if (flags == 0 && hr == MMIOERR_CHUNKNOTFOUND) - hr = AVIERR_OK; - return hr; + if (flags == 0 && mmr == MMIOERR_CHUNKNOTFOUND) + return AVIERR_OK; + else + return AVIERR_FILEREAD; } /* Have we found what we search for? */ @@ -187,10 +188,15 @@ HRESULT FindChunkAndKeepExtras(LPEXTRACHUNKS extra,HMMIO hmmio,MMCKINFO *lpck, /* Skip padding chunks, the others put into the extrachunk-structure */ if (lpck->ckid == ckidAVIPADDING || lpck->ckid == mmioFOURCC('p','a','d','d')) - hr = mmioAscend(hmmio, lpck, 0); + { + mmr = mmioAscend(hmmio, lpck, 0); + if (mmr != MMSYSERR_NOERROR) return AVIERR_FILEREAD; + } else - hr = ReadChunkIntoExtra(extra, hmmio, lpck); - if (FAILED(hr)) - return hr; + { + HRESULT hr = ReadChunkIntoExtra(extra, hmmio, lpck); + if (FAILED(hr)) + return hr; + } } }

1 0

Rob Shearman : avifil32: Fix type of variable used to store the result of ICCompress in AVIFILE_EncodeFrame .
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 171762827c36d973fc53a27d19c05e077fb24be0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171762827c36d973fc53a27d1… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 30 13:55:29 2008 +0100 avifil32: Fix type of variable used to store the result of ICCompress in AVIFILE_EncodeFrame. (Found by PreFast.) --- dlls/avifil32/icmstream.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 8ac2e33..a5b221a 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -821,14 +821,14 @@ static HRESULT AVIFILE_EncodeFrame(IAVIStreamImpl *This, do { DWORD idxCkid = 0; - HRESULT hr; + DWORD res; - hr = ICCompress(This->hic,icmFlags,This->lpbiCur,This->lpCur,lpbi,lpBits, - &idxCkid, &idxFlags, This->lCurrent, dwRequest, dwCurQual, - noPrev ? NULL:This->lpbiPrev, noPrev ? NULL:This->lpPrev); - if (hr == ICERR_NEWPALETTE) { + res = ICCompress(This->hic,icmFlags,This->lpbiCur,This->lpCur,lpbi,lpBits, + &idxCkid, &idxFlags, This->lCurrent, dwRequest, dwCurQual, + noPrev ? NULL:This->lpbiPrev, noPrev ? NULL:This->lpPrev); + if (res == ICERR_NEWPALETTE) { FIXME(": codec has changed palette -- unhandled!\n"); - } else if (hr != ICERR_OK) + } else if (res != ICERR_OK) return AVIERR_COMPRESSOR; /* need to check for framesize */

1 0

Rob Shearman : oledlg: Fix the type of ret in UIINSERTOBJECTDLG_PopulateObjectTypes.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 6357f9c02cb8b2990257ae03ea9e5f3ab8655bd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6357f9c02cb8b2990257ae03e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Sep 30 13:55:22 2008 +0100 oledlg: Fix the type of ret in UIINSERTOBJECTDLG_PopulateObjectTypes. It is only used for storing the result of RegEnumKeyW so it should be LSTATUS instead of HRESULT. --- dlls/oledlg/insobjdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index e875048..07c8a81 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -340,7 +340,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) HKEY hkclsids; HKEY hkey; CLSID clsid; - HRESULT ret; + LSTATUS ret; WCHAR keydesc[MAX_PATH]; WCHAR keyname[MAX_PATH]; WCHAR szclsid[128];

1 0