January 2007 - Wine-Commits

Stefan Dösinger : wined3d: Catch nop pixel shader changes.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 4e0f7ccd7d63d65fed899f0fea86ab633e34e7bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0f7ccd7d63d65fed899f0fe… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 4 00:07:45 2007 +0100 wined3d: Catch nop pixel shader changes. --- dlls/wined3d/device.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6a51771..f53f339 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3260,6 +3260,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); + return WINED3D_OK; + } else if(oldShader == pShader) { + /* Checked here to allow proper stateblock recording */ + TRACE("App is setting the old shader over, nothing to do\n"); + return WINED3D_OK; } if (NULL != pShader) { @@ -5832,7 +5837,7 @@ static void device_reapply_stateblock(IW /* Temporaryily mark all render states dirty to force reapplication * until the context management for is integrated with the state management - * The same for the pixel shader, vertex declaration + * The same for the pixel shader, vertex declaration and vertex shader * Sampler states and texture stage states are marked * dirty my StateBlock::Apply already. */ @@ -5841,6 +5846,7 @@ static void device_reapply_stateblock(IW } IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VSHADER); /* Restore recording */ This->isRecordingState = oldRecording;

1 0

Stefan Dösinger : wined3d: Catch NOP vertex declaration changes.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: cd9a3517f3ee5309979c7ea3cb734576f37d0560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9a3517f3ee5309979c7ea3c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 4 00:07:00 2007 +0100 wined3d: Catch NOP vertex declaration changes. --- dlls/wined3d/device.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a1aab0d..6a51771 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2151,10 +2151,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; /* Update the current state block */ - This->updateStateBlock->fvf = fvf; This->updateStateBlock->changed.fvf = TRUE; This->updateStateBlock->set.fvf = TRUE; + if(This->updateStateBlock->fvf == fvf) { + TRACE("Application is setting the old fvf over, nothing to do\n"); + return WINED3D_OK; + } + + This->updateStateBlock->fvf = fvf; TRACE("(%p) : FVF Shader FVF set to %x\n", This, fvf); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); return WINED3D_OK; @@ -3218,6 +3223,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); + return WINED3D_OK; + } else if(pDecl == oldDecl) { + /* Checked after the assignment to allow proper stateblock recording */ + TRACE("Application is setting the old declaration over, nothing to do\n"); + return WINED3D_OK; } if (NULL != pDecl) { @@ -5822,13 +5832,15 @@ static void device_reapply_stateblock(IW /* Temporaryily mark all render states dirty to force reapplication * until the context management for is integrated with the state management - * The same for the pixel shader, sampler states and texture stage states are marked - * dirty my StateBlock::Apply already + * The same for the pixel shader, vertex declaration + * Sampler states and texture stage states are marked + * dirty my StateBlock::Apply already. */ for(i = 1; i < WINEHIGHEST_RENDER_STATE; i++) { IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(i)); } IWineD3DDeviceImpl_MarkStateDirty(This, STATE_PIXELSHADER); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); /* Restore recording */ This->isRecordingState = oldRecording;

1 0

Stefan Dösinger : wined3d: Break the viewport out of the vertex declaration state.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 0d700bef5decbd03cd4f1f6838c7e99ef5539d50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d700bef5decbd03cd4f1f683… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 4 00:05:05 2007 +0100 wined3d: Break the viewport out of the vertex declaration state. --- dlls/wined3d/device.c | 16 ---------------- dlls/wined3d/state.c | 27 +++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 676f875..a1aab0d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3055,26 +3055,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl TRACE("Recording... not performing anything\n"); return WINED3D_OK; } - This->viewport_changed = TRUE; - - ENTER_GL(); TRACE("(%p) : x=%d, y=%d, wid=%d, hei=%d, minz=%f, maxz=%f\n", This, pViewport->X, pViewport->Y, pViewport->Width, pViewport->Height, pViewport->MinZ, pViewport->MaxZ); - glDepthRange(pViewport->MinZ, pViewport->MaxZ); - checkGLcall("glDepthRange"); - /* Note: GL requires lower left, DirectX supplies upper left */ - /* TODO: replace usage of renderTarget with context management */ - glViewport(pViewport->X, - (((IWineD3DSurfaceImpl *)This->render_targets[0])->currentDesc.Height - (pViewport->Y + pViewport->Height)), - pViewport->Width, pViewport->Height); - - checkGLcall("glViewport"); - - LEAVE_GL(); - - /* Todo: move the gl code too */ IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VIEWPORT); return WINED3D_OK; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 935bd90..38d7883 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2059,8 +2059,6 @@ static void vertexdeclaration(DWORD stat */ if (useVertexShaderFunction) { device->posFixup[1] = device->render_offscreen ? -1.0 : 1.0; - device->posFixup[2] = 0.9 / stateblock->viewport.Width; - device->posFixup[3] = -0.9 / stateblock->viewport.Height; } } @@ -2071,7 +2069,9 @@ static void vertexdeclaration(DWORD stat /* TODO: Move this mainly to the viewport state and only apply when the vp has changed * or transformed / untransformed was switched */ - if(!isStateDirty(stateblock->wineD3DDevice, STATE_TRANSFORM(WINED3DTS_PROJECTION))) { + if(wasrhw != device->last_was_rhw && + !isStateDirty(stateblock->wineD3DDevice, STATE_TRANSFORM(WINED3DTS_PROJECTION)) && + !isStateDirty(stateblock->wineD3DDevice, STATE_VIEWPORT)) { transform_projection(STATE_TRANSFORM(WINED3DTS_PROJECTION), stateblock); } /* World matrix needs reapplication here only if we're switching between rhw and non-rhw @@ -2097,6 +2097,25 @@ static void vertexdeclaration(DWORD stat } } +static void viewport(DWORD state, IWineD3DStateBlockImpl *stateblock) { + glDepthRange(stateblock->viewport.MinZ, stateblock->viewport.MaxZ); + checkGLcall("glDepthRange"); + /* Note: GL requires lower left, DirectX supplies upper left */ + /* TODO: replace usage of renderTarget with context management */ + glViewport(stateblock->viewport.X, + (((IWineD3DSurfaceImpl *)stateblock->wineD3DDevice->render_targets[0])->currentDesc.Height - (stateblock->viewport.Y + stateblock->viewport.Height)), + stateblock->viewport.Width, stateblock->viewport.Height); + + checkGLcall("glViewport"); + + stateblock->wineD3DDevice->posFixup[2] = 0.9 / stateblock->viewport.Width; + stateblock->wineD3DDevice->posFixup[3] = -0.9 / stateblock->viewport.Height; + if(!isStateDirty(stateblock->wineD3DDevice, STATE_TRANSFORM(D3DTS_PROJECTION))) { + transform_projection(STATE_TRANSFORM(D3DTS_PROJECTION), stateblock); + } + +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -3114,6 +3133,6 @@ const struct StateEntry StateTable[] = { /* , STATE_STREAMSRC */ STATE_VDECL, vertexdeclaration }, { /* , STATE_VDECL */ STATE_VDECL, vertexdeclaration }, { /* , STATE_VSHADER */ STATE_VDECL, vertexdeclaration }, - { /* , STATE_VIEWPORT */ STATE_VDECL, vertexdeclaration }, + { /* , STATE_VIEWPORT */ STATE_VIEWPORT, viewport }, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e5dc23..a63e577 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -565,7 +565,6 @@ typedef struct IWineD3DDeviceImpl /* Optimization */ BOOL view_ident; /* true iff view matrix is identity */ BOOL last_was_rhw; /* true iff last draw_primitive was in xyzrhw mode */ - BOOL viewport_changed; /* Was the viewport changed since the last draw? */ GLenum tracking_parm; /* Which source is tracking current colour */ LONG tracking_color; /* used iff GL_COLOR_MATERIAL was enabled */ #define DISABLED_TRACKING 0 /* Disabled */

1 0

Vitaliy Margolen : dinput: Implement mouse GetObjectInfo on top of base class.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: f2a3ad24812b394a22b84debd1317a58910e5bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2a3ad24812b394a22b84debd… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 3 23:04:39 2007 -0700 dinput: Implement mouse GetObjectInfo on top of base class. --- dlls/dinput/mouse.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 81e520e..91136b6 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -654,6 +654,51 @@ static HRESULT WINAPI SysMouseAImpl_GetC return DI_OK; } +/****************************************************************************** + * GetObjectInfo : get information about a device object such as a button + * or axis + */ +static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, + LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow) +{ + static const WCHAR x_axisW[] = {'X','-','A','x','i','s',0}; + static const WCHAR y_axisW[] = {'X','-','A','x','i','s',0}; + static const WCHAR wheelW[] = {'W','h','e','e','l',0}; + static const WCHAR buttonW[] = {'B','u','t','t','o','n',' ','%','d',0}; + HRESULT res; + + res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); + if (res != DI_OK) return res; + + if (IsEqualGUID(&pdidoi->guidType, &GUID_XAxis)) strcpyW(pdidoi->tszName, x_axisW); + else if (IsEqualGUID(&pdidoi->guidType, &GUID_YAxis)) strcpyW(pdidoi->tszName, y_axisW); + else if (IsEqualGUID(&pdidoi->guidType, &GUID_ZAxis)) strcpyW(pdidoi->tszName, wheelW); + else if (pdidoi->dwType & DIDFT_BUTTON) + wsprintfW(pdidoi->tszName, buttonW, DIDFT_GETINSTANCE(pdidoi->dwType) - 3); + + _dump_OBJECTINSTANCEW(pdidoi); + return res; +} + +static HRESULT WINAPI SysMouseAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, + LPDIDEVICEOBJECTINSTANCEA pdidoi, DWORD dwObj, DWORD dwHow) +{ + HRESULT res; + DIDEVICEOBJECTINSTANCEW didoiW; + DWORD dwSize = pdidoi->dwSize; + + didoiW.dwSize = sizeof(didoiW); + res = SysMouseWImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface, &didoiW, dwObj, dwHow); + if (res != DI_OK) return res; + + memset(pdidoi, 0, pdidoi->dwSize); + memcpy(pdidoi, &didoiW, FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, tszName)); + pdidoi->dwSize = dwSize; + WideCharToMultiByte(CP_ACP, 0, didoiW.tszName, -1, pdidoi->tszName, + sizeof(pdidoi->tszName), NULL, NULL); + + return res; +} /****************************************************************************** * GetDeviceInfo : get information about a device's identity @@ -707,7 +752,7 @@ static const IDirectInputDevice8AVtbl Sy IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, - IDirectInputDevice2AImpl_GetObjectInfo, + SysMouseAImpl_GetObjectInfo, SysMouseAImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, @@ -749,7 +794,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, - IDirectInputDevice2WImpl_GetObjectInfo, + SysMouseWImpl_GetObjectInfo, SysMouseWImpl_GetDeviceInfo, XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel, XCAST(Initialize)IDirectInputDevice2AImpl_Initialize,

1 0

Vitaliy Margolen : dinput: Move keyboard to using new GetObjectInfo.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 20ba784aace697fed167bb702e175c0f1b0a1a29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ba784aace697fed167bb702… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 3 23:04:31 2007 -0700 dinput: Move keyboard to using new GetObjectInfo. --- dlls/dinput/keyboard.c | 58 +++++++++++------------------------------------ 1 files changed, 14 insertions(+), 44 deletions(-) diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index ce04ff9..b77e258 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -415,33 +415,18 @@ SysKeyboardAImpl_GetObjectInfo( DWORD dwObj, DWORD dwHow) { - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - DIDEVICEOBJECTINSTANCEA ddoi; - DWORD dwSize = pdidoi->dwSize; - - TRACE("(this=%p,%p,%d,0x%08x)\n", This, pdidoi, dwObj, dwHow); - - if (dwHow == DIPH_BYID) { - WARN(" querying by id not supported yet...\n"); - return DI_OK; - } + HRESULT res; - memset(pdidoi, 0, dwSize); - memset(&ddoi, 0, sizeof(ddoi)); + res = IDirectInputDevice2AImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); + if (res != DI_OK) return res; - ddoi.dwSize = dwSize; - ddoi.guidType = GUID_Key; - ddoi.dwOfs = dwObj; - ddoi.dwType = DIDFT_MAKEINSTANCE(dwObj) | DIDFT_BUTTON; - if (!GetKeyNameTextA(((dwObj & 0x7f) << 16) | ((dwObj & 0x80) << 17), ddoi.tszName, sizeof(ddoi.tszName))) + if (!GetKeyNameTextA((DIDFT_GETINSTANCE(pdidoi->dwType) & 0x80) << 17 | + (DIDFT_GETINSTANCE(pdidoi->dwType) & 0x7f) << 16, + pdidoi->tszName, sizeof(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; - /* And return our just filled device object instance structure */ - memcpy(pdidoi, &ddoi, (dwSize < sizeof(ddoi) ? dwSize : sizeof(ddoi))); - _dump_OBJECTINSTANCEA(pdidoi); - - return DI_OK; + return res; } static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, @@ -449,33 +434,18 @@ static HRESULT WINAPI SysKeyboardWImpl_G DWORD dwObj, DWORD dwHow) { - SysKeyboardImpl *This = (SysKeyboardImpl *)iface; - DIDEVICEOBJECTINSTANCEW ddoi; - DWORD dwSize = pdidoi->dwSize; - - TRACE("(this=%p,%p,%d,0x%08x)\n", This, pdidoi, dwObj, dwHow); - - if (dwHow == DIPH_BYID) { - WARN(" querying by id not supported yet...\n"); - return DI_OK; - } + HRESULT res; - memset(pdidoi, 0, dwSize); - memset(&ddoi, 0, sizeof(ddoi)); + res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); + if (res != DI_OK) return res; - ddoi.dwSize = dwSize; - ddoi.guidType = GUID_Key; - ddoi.dwOfs = dwObj; - ddoi.dwType = DIDFT_MAKEINSTANCE(dwObj) | DIDFT_BUTTON; - if (!GetKeyNameTextW(((dwObj & 0x7f) << 16) | ((dwObj & 0x80) << 17), ddoi.tszName, sizeof(ddoi.tszName))) + if (!GetKeyNameTextW((DIDFT_GETINSTANCE(pdidoi->dwType) & 0x80) << 17 | + (DIDFT_GETINSTANCE(pdidoi->dwType) & 0x7f) << 16, + pdidoi->tszName, sizeof(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; - /* And return our just filled device object instance structure */ - memcpy(pdidoi, &ddoi, (dwSize < sizeof(ddoi) ? dwSize : sizeof(ddoi))); - _dump_OBJECTINSTANCEW(pdidoi); - - return DI_OK; + return res; } /******************************************************************************

1 0

Vitaliy Margolen : dinput: Implement GetObjectInfo[A|W] in base device class.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 0edc6e26a75159efc63965bb029d372ed06525f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edc6e26a75159efc63965bb0… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Wed Jan 3 23:04:24 2007 -0700 dinput: Implement GetObjectInfo[A|W] in base device class. --- dlls/dinput/device.c | 79 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 72 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 944091c..460c7ee 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -294,6 +294,12 @@ void release_DataFormat(DataFormat * for format->user_df = NULL; } +inline LPDIOBJECTDATAFORMAT dataformat_to_odf(LPCDIDATAFORMAT df, int idx) +{ + if (idx < 0 || idx >= df->dwNumObjs) return NULL; + return (LPDIOBJECTDATAFORMAT)((LPBYTE)df->rgodf + idx * df->dwObjSize); +} + /* Make all instances sequential */ static void calculate_ids(LPDIDATAFORMAT df) { @@ -971,10 +977,29 @@ HRESULT WINAPI IDirectInputDevice2AImpl_ DWORD dwObj, DWORD dwHow) { - FIXME("(this=%p,%p,%d,0x%08x): stub!\n", - iface, pdidoi, dwObj, dwHow); - - return DI_OK; + DIDEVICEOBJECTINSTANCEW didoiW; + HRESULT res; + + if (!pdidoi || + (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A))) + return DIERR_INVALIDPARAM; + + didoiW.dwSize = sizeof(didoiW); + res = IDirectInputDevice2WImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface, &didoiW, dwObj, dwHow); + if (res == DI_OK) + { + DWORD dwSize = pdidoi->dwSize; + + memset(pdidoi, 0, pdidoi->dwSize); + pdidoi->dwSize = dwSize; + pdidoi->guidType = didoiW.guidType; + pdidoi->dwOfs = didoiW.dwOfs; + pdidoi->dwType = didoiW.dwType; + pdidoi->dwFlags = didoiW.dwFlags; + } + + return res; } HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( @@ -983,9 +1008,49 @@ HRESULT WINAPI IDirectInputDevice2WImpl_ DWORD dwObj, DWORD dwHow) { - FIXME("(this=%p,%p,%d,0x%08x): stub!\n", - iface, pdidoi, dwObj, dwHow); - + IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; + DWORD dwSize = pdidoi->dwSize; + LPDIOBJECTDATAFORMAT odf; + int idx = -1; + + TRACE("(%p) %d(0x%08x) -> %p\n", This, dwHow, dwObj, pdidoi); + + if (!pdidoi || + (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W))) + return DIERR_INVALIDPARAM; + + switch (dwHow) + { + case DIPH_BYOFFSET: + if (!This->data_format.offsets) break; + for (idx = This->data_format.wine_df->dwNumObjs - 1; idx >= 0; idx--) + if (This->data_format.offsets[idx] == dwObj) break; + break; + case DIPH_BYID: + dwObj &= 0x00ffffff; + for (idx = This->data_format.wine_df->dwNumObjs - 1; idx >= 0; idx--) + if ((dataformat_to_odf(This->data_format.wine_df, idx)->dwType & 0x00ffffff) == dwObj) + break; + break; + + case DIPH_BYUSAGE: + FIXME("dwHow = DIPH_BYUSAGE not implemented\n"); + break; + default: + WARN("invalid parameter: dwHow = %08x\n", dwHow); + return DIERR_INVALIDPARAM; + } + if (idx < 0) return DIERR_OBJECTNOTFOUND; + + odf = dataformat_to_odf(This->data_format.wine_df, idx); + memset(pdidoi, 0, pdidoi->dwSize); + pdidoi->dwSize = dwSize; + pdidoi->guidType = *odf->pguid; + pdidoi->dwOfs = This->data_format.offsets ? This->data_format.offsets[idx] : odf->dwOfs; + pdidoi->dwType = odf->dwType; + pdidoi->dwFlags = odf->dwFlags; + return DI_OK; }

1 0

Mike McCormack : kernel32: Don' t try update version resources with invalid data, as it fails on Windows 2003.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: b4bc2c362851cb4e3789b47e8c9e1a000f0dbe8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4bc2c362851cb4e3789b47e8… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 3 22:37:38 2007 +0900 kernel32: Don't try update version resources with invalid data, as it fails on Windows 2003. --- dlls/kernel32/tests/resource.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 964f17a..47bfc7c 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -161,31 +161,15 @@ static void update_resources_delete( voi todo_wine ok( r, "EndUpdateResouce failed\n"); } -struct verhdr { - WORD wLength; - WORD wValueLength; - WORD wType; - WCHAR key[1]; -}; - void update_resources_version(void) { HANDLE res = NULL; BOOL r; - struct verhdr hdr; char foo[] = "red and white"; res = BeginUpdateResource( filename, TRUE ); ok( res != NULL, "BeginUpdateResource failed\n"); - memset( &hdr, 0, sizeof hdr ); - r = UpdateResource( res, - RT_VERSION, - MAKEINTRESOURCE(VS_VERSION_INFO), - MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), - &hdr, sizeof hdr ); - ok( r, "UpdateResouce failed\n"); - r = UpdateResource( res, MAKEINTRESOURCE(0x1230), MAKEINTRESOURCE(0x4567), @@ -219,10 +203,10 @@ void check_empty( IMAGE_RESOURCE_DIRECTO todo_wine ok( !memcmp( pad, "PADDINGXXPADDING", 16), "padding wrong\n"); } -void check_version( IMAGE_RESOURCE_DIRECTORY *dir ) +void check_not_empty( IMAGE_RESOURCE_DIRECTORY *dir ) { ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries should be 0 instead of %d\n", dir->NumberOfNamedEntries); - todo_wine ok( dir->NumberOfIdEntries == 2, "NumberOfIdEntries should be 2 instead of %d\n", dir->NumberOfIdEntries); + todo_wine ok( dir->NumberOfIdEntries == 1, "NumberOfIdEntries should be 1 instead of %d\n", dir->NumberOfIdEntries); } void check_exe( res_check_func fn ) @@ -287,6 +271,6 @@ START_TEST(resource) update_resources_delete(); check_exe( check_empty ); update_resources_version(); - check_exe( check_version ); + check_exe( check_not_empty ); DeleteFile( filename ); }

1 0

Roderick Colenbrander : wgl: Fix piAttributes NULL crash.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: e4eac235f1a779bea629d409f54caecdf0696093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4eac235f1a779bea629d409f… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Jan 4 00:15:54 2007 +0100 wgl: Fix piAttributes NULL crash. --- dlls/winex11.drv/opengl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e0ce8b0..ebc980e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -605,6 +605,10 @@ static int ConvertAttribWGLtoGLX(const i int wantColorBits = 0; int sz_alpha = 0; + /* The list of WGL attributes is allowed to be NULL, so don't return -1 (error) but just 0 */ + if(iWGLAttr == NULL) + return 0; + while (0 != iWGLAttr[cur]) { TRACE("pAttr[%d] = %x\n", cur, iWGLAttr[cur]); @@ -1963,7 +1967,7 @@ static HPBUFFERARB WINAPI X11DRV_wglCrea } PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth); PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight); - while (0 != *piAttribList) { + while (piAttribList && 0 != *piAttribList) { int attr_v; switch (*piAttribList) { case WGL_TEXTURE_FORMAT_ARB: {

1 0

Andrew Talbot : ddraw: Declare some functions static.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 7c95df77ae13eaf0b7700a497bc6262388cb1d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c95df77ae13eaf0b7700a497… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 3 19:11:49 2007 +0000 ddraw: Declare some functions static. --- dlls/ddraw/utils.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index 32005f5..bf31780 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -624,7 +624,7 @@ DDRAW_dump_PTR(const void *in) { DPRINTF("%p", *((const void * const*) in)); } -void +static void DDRAW_dump_DDCOLORKEY(const DDCOLORKEY *ddck) { DPRINTF(" Low : %d - High : %d", ddck->dwColorSpaceLowValue, ddck->dwColorSpaceHighValue); @@ -719,7 +719,7 @@ DDRAW_dump_flags_(DWORD flags, DPRINTF("\n"); } -void +static void DDRAW_dump_pixelformat_flag(DWORD flagmask) { static const flag_info flags[] =

1 0

Andrew Talbot : comdlg32: Declare some items static.
by Alexandre Julliard Jan. 4, 2007

Jan. 4, 2007

Module: wine Branch: master Commit: 6bb00a3c0ec3b1bf430363dafd24b2026c8582e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bb00a3c0ec3b1bf430363daf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Wed Jan 3 13:47:44 2007 +0000 comdlg32: Declare some items static. --- dlls/comdlg32/cdlg32.c | 4 ++-- dlls/comdlg32/filedlg.c | 2 +- dlls/comdlg32/fontdlg.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/cdlg32.c b/dlls/comdlg32/cdlg32.c index 91144a8..57f3036 100644 --- a/dlls/comdlg32/cdlg32.c +++ b/dlls/comdlg32/cdlg32.c @@ -38,8 +38,8 @@ HINSTANCE COMDLG32_hInstance = 0; static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES; -HINSTANCE SHELL32_hInstance = 0; -HINSTANCE SHFOLDER_hInstance = 0; +static HINSTANCE SHELL32_hInstance; +static HINSTANCE SHFOLDER_hInstance; /* ITEMIDLIST */ LPITEMIDLIST (WINAPI *COMDLG32_PIDL_ILClone) (LPCITEMIDLIST); diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 2addb9c..5fcdfd0 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -227,7 +227,7 @@ static LPITEMIDLIST GetPidlFromName(IShe static void *MemAlloc(UINT size); static void MemFree(void *mem); -INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +static INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); LRESULT SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode); static INT_PTR FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed); diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 510d4de..cd36ed3 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -47,8 +47,8 @@ static const WCHAR chooseFontW[] = {'C', static HIMAGELIST himlTT = 0; #define TTBITMAP_XSIZE 20 /* x-size of the bitmaps */ -INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +static INT_PTR CALLBACK FormatCharDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +static INT_PTR CALLBACK FormatCharDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); /* There is a table here of all charsets, and the sample text for each. * There is a second table that translates a charset into an index into

1 0