wine-commits July 2011

wine-commits@winehq.org

2 participants
838 discussions

Jay Yang : shell32: Have the default shell view call SHChangeNotifyRegister with unixfs pidls.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: cde4993d625decec31d25485c7a588a3b772ef8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde4993d625decec31d25485c… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Mon Jul 11 17:35:35 2011 -0400 shell32: Have the default shell view call SHChangeNotifyRegister with unixfs pidls. --- dlls/shell32/shlview.c | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 1367afb..da613da 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -728,13 +728,28 @@ static LRESULT ShellView_OnCreate(IShellViewImpl *This) hr = IShellFolder_QueryInterface(This->pSFParent, &IID_IPersistFolder2, (LPVOID*)&ppf2); if (hr == S_OK) { + LPITEMIDLIST raw_pidl; SHChangeNotifyEntry ntreg; - hr = IPersistFolder2_GetCurFolder(ppf2, (LPITEMIDLIST*)&ntreg.pidl); - if (hr == S_OK) + hr = IPersistFolder2_GetCurFolder(ppf2, (LPITEMIDLIST*)&raw_pidl); + if(SUCCEEDED(hr)) { + LPITEMIDLIST computer_pidl; + SHGetFolderLocation(NULL,CSIDL_DRIVES,NULL,0,&computer_pidl); + if(ILIsParent(computer_pidl,raw_pidl,FALSE)) + { + /* Normalize the pidl to unixfs to workaround an issue with + * sending notifications on dos paths + */ + WCHAR path[MAX_PATH]; + SHGetPathFromIDListW(raw_pidl,path); + SHParseDisplayName(path,NULL,(LPITEMIDLIST*)&ntreg.pidl,0,NULL); + SHFree(raw_pidl); + } + else + ntreg.pidl = raw_pidl; ntreg.fRecursive = TRUE; - This->hNotify = SHChangeNotifyRegister(This->hWnd, SHCNF_IDLIST, SHCNE_ALLEVENTS, + This->hNotify = SHChangeNotifyRegister(This->hWnd, SHCNRF_InterruptLevel, SHCNE_ALLEVENTS, SHV_CHANGE_NOTIFY, 1, &ntreg); SHFree((LPITEMIDLIST)ntreg.pidl); }

1 0

Jay Yang : shell32: Make IExplorerBrowser respond to CWM_GETISHELLBROWSER.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 481dcb4b4bc8c8fbdb27cd0b1f482a60ee34d3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481dcb4b4bc8c8fbdb27cd0b1… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Mon Jul 11 17:35:31 2011 -0400 shell32: Make IExplorerBrowser respond to CWM_GETISHELLBROWSER. --- dlls/shell32/ebrowser.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index aee1804..f398228 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -743,6 +743,11 @@ static LRESULT main_on_wm_size(ExplorerBrowserImpl *This) return TRUE; } +static LRESULT main_on_cwm_getishellbrowser(ExplorerBrowserImpl *This) +{ + return (LRESULT)&This->IShellBrowser_iface; +} + static LRESULT CALLBACK main_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { ExplorerBrowserImpl *This = (ExplorerBrowserImpl*)GetWindowLongPtrW(hWnd, GWLP_USERDATA); @@ -751,6 +756,7 @@ static LRESULT CALLBACK main_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LP { case WM_CREATE: return main_on_wm_create(hWnd, (CREATESTRUCTW*)lParam); case WM_SIZE: return main_on_wm_size(This); + case CWM_GETISHELLBROWSER: return main_on_cwm_getishellbrowser(This); default: return DefWindowProcW(hWnd, uMessage, wParam, lParam); }

1 0

Lucas Fialho Zawacki : dinput: EnumDevicesBySemantics enumerating all kinds of joysticks.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: bc5d32bec6c37271769c66dd59c15a5d1aab37ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc5d32bec6c37271769c66dd5… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Jul 11 22:37:36 2011 -0300 dinput: EnumDevicesBySemantics enumerating all kinds of joysticks. --- dlls/dinput/dinput_main.c | 54 +++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/device.c | 3 ++ 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 0f84e7c..821a9a0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -847,6 +847,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); DIDEVICEINSTANCEA didevi; LPDIRECTINPUTDEVICE8A lpdid; + DWORD callbackFlags; int i, j; @@ -865,12 +866,36 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); + /* Enumerate all the joysticks */ + for (i = 0; i < NB_DINPUT_DEVICES; i++) + { + BOOL enumSuccess; + + if (!dinput_devices[i]->enum_deviceA) continue; + + for (j = 0, enumSuccess = -1; enumSuccess != 0; j++) + { + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); + + callbackFlags = 0; + /* Default behavior is to enumerate attached game controllers */ + enumSuccess = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); + if (enumSuccess) + { + IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); + + if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) + return DI_OK; + } + } + } + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - DWORD callbackFlags = 0; + callbackFlags = 0; IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); @@ -898,6 +923,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( IDirectInputImpl *This = impl_from_IDirectInput8W(iface); DIDEVICEINSTANCEW didevi; LPDIRECTINPUTDEVICE8W lpdid; + DWORD callbackFlags; int i, j; FIXME("(this=%p,%s,%p,%p,%p,%04x): semi-stub\n", This, debugstr_w(ptszUserName), lpdiActionFormat, @@ -905,12 +931,36 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); + /* Enumerate all the joysticks */ + for (i = 0; i < NB_DINPUT_DEVICES; i++) + { + BOOL enumSuccess; + + if (!dinput_devices[i]->enum_deviceW) continue; + + for (j = 0, enumSuccess = -1; enumSuccess != 0; j++) + { + TRACE(" - checking device %u ('%s')\n", i, dinput_devices[i]->name); + + callbackFlags = 0; + /* Default behavior is to enumerate attached game controllers */ + enumSuccess = dinput_devices[i]->enum_deviceW(DI8DEVCLASS_GAMECTRL, DIEDFL_ATTACHEDONLY | dwFlags, &didevi, This->dwVersion, j); + if (enumSuccess) + { + IDirectInput_CreateDevice(iface, &didevi.guidInstance, &lpdid, NULL); + + if (lpCallback(&didevi, lpdid, callbackFlags, 0, pvRef) == DIENUM_STOP) + return DI_OK; + } + } + } + if (dwFlags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; /* Enumerate keyboard and mouse */ for(i=0; i < sizeof(guids)/sizeof(guids[0]); i++) { - DWORD callbackFlags = 0; + callbackFlags = 0; IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 94b1f2d..cedad80 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -166,6 +166,9 @@ static BOOL CALLBACK enumeration_callback( hr = IDirectInputDevice8_SetActionMap(lpdid, data->lpdiaf, NULL, 0); ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); + /* Some joysticks may have no suitable actions and thus should not be tested */ + if (hr == DI_NOEFFECT) return DIENUM_CONTINUE; + /* Test buffer size */ memset(&dp, 0, sizeof(dp)); dp.diph.dwSize = sizeof(dp);

1 0

Lucas Fialho Zawacki : dinput: BuildActionMap and SetActionMap stubs for generic joystick.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: dc044e156d35708ceb4dcbc76e30fca6c1fd0a04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc044e156d35708ceb4dcbc76… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Jul 11 22:36:56 2011 -0300 dinput: BuildActionMap and SetActionMap stubs for generic joystick. --- dlls/dinput/joystick.c | 60 +++++++++++++++++++++++++++++++++++++ dlls/dinput/joystick_linux.c | 8 ++-- dlls/dinput/joystick_linuxinput.c | 8 ++-- dlls/dinput/joystick_osx.c | 8 ++-- dlls/dinput/joystick_private.h | 6 ++++ 5 files changed, 78 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 1be6f31..68dcc6a 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -426,6 +426,66 @@ HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, return JoystickWGenericImpl_GetDeviceState(IDirectInputDevice8W_from_impl(This), len, ptr); } + +HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, + LPDIACTIONFORMATW lpdiaf, + LPCWSTR lpszUserName, + DWORD dwFlags) +{ + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + + return DI_NOEFFECT; +} + +HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, + LPDIACTIONFORMATA lpdiaf, + LPCSTR lpszUserName, + DWORD dwFlags) +{ + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); + DIACTIONFORMATW diafW; + HRESULT hr; + + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); + _copy_diactionformatAtoW(&diafW, lpdiaf); + + hr = JoystickWGenericImpl_BuildActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + + _copy_diactionformatWtoA(lpdiaf, &diafW); + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + + return hr; +} + +HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, + LPDIACTIONFORMATW lpdiaf, + LPCWSTR lpszUserName, + DWORD dwFlags) +{ + FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags); + + return DI_NOEFFECT; +} + +HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, + LPDIACTIONFORMATA lpdiaf, + LPCSTR lpszUserName, + DWORD dwFlags) +{ + JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); + DIACTIONFORMATW diafW; + HRESULT hr; + + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions); + _copy_diactionformatAtoW(&diafW, lpdiaf); + + hr = JoystickWGenericImpl_SetActionMap(&This->base.IDirectInputDevice8W_iface, &diafW, NULL, dwFlags); + + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); + + return hr; +} + /* * This maps the read value (from the input event) to a value in the * 'wanted' range. diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5541522..3ad592d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -682,8 +682,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, - IDirectInputDevice8AImpl_BuildActionMap, - IDirectInputDevice8AImpl_SetActionMap, + JoystickAGenericImpl_BuildActionMap, + JoystickAGenericImpl_SetActionMap, IDirectInputDevice8AImpl_GetImageInfo }; @@ -718,8 +718,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile, - IDirectInputDevice8WImpl_BuildActionMap, - IDirectInputDevice8WImpl_SetActionMap, + JoystickWGenericImpl_BuildActionMap, + JoystickWGenericImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c11edc7..afdee1e 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1417,8 +1417,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, - IDirectInputDevice8AImpl_BuildActionMap, - IDirectInputDevice8AImpl_SetActionMap, + JoystickAGenericImpl_BuildActionMap, + JoystickAGenericImpl_SetActionMap, IDirectInputDevice8AImpl_GetImageInfo }; @@ -1453,8 +1453,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile, - IDirectInputDevice8WImpl_BuildActionMap, - IDirectInputDevice8WImpl_SetActionMap, + JoystickWGenericImpl_BuildActionMap, + JoystickWGenericImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 439c8ad..756a682 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -972,8 +972,8 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_SendDeviceData, IDirectInputDevice7AImpl_EnumEffectsInFile, IDirectInputDevice7AImpl_WriteEffectToFile, - IDirectInputDevice8AImpl_BuildActionMap, - IDirectInputDevice8AImpl_SetActionMap, + JoystickAGenericImpl_BuildActionMap, + JoystickAGenericImpl_SetActionMap, IDirectInputDevice8AImpl_GetImageInfo }; @@ -1008,8 +1008,8 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice2WImpl_SendDeviceData, IDirectInputDevice7WImpl_EnumEffectsInFile, IDirectInputDevice7WImpl_WriteEffectToFile, - IDirectInputDevice8WImpl_BuildActionMap, - IDirectInputDevice8WImpl_SetActionMap, + JoystickWGenericImpl_BuildActionMap, + JoystickWGenericImpl_SetActionMap, IDirectInputDevice8WImpl_GetImageInfo }; diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index a332e24..71d91f1 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -86,4 +86,10 @@ HRESULT WINAPI JoystickWGenericImpl_Poll(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_H HRESULT WINAPI JoystickAGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, DWORD len, LPVOID ptr) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickAGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickWGenericImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; + +HRESULT WINAPI JoystickAGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface, LPDIACTIONFORMATA lpdiaf, LPCSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; +HRESULT WINAPI JoystickWGenericImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags) DECLSPEC_HIDDEN; + #endif /* __WINE_DLLS_DINPUT_JOYSTICK_PRIVATE_H */

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10PixelShader iface.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: f196050f289121b26cdadb9c572a6a29a791ed14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f196050f289121b26cdadb9c5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 01:56:39 2011 +0200 d3d10core: COM cleanup for the ID3D10PixelShader iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/shader.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 17c3bae..457ba09 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -194,7 +194,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct /* ID3D10PixelShader */ struct d3d10_pixel_shader { - const struct ID3D10PixelShaderVtbl *vtbl; + ID3D10PixelShader ID3D10PixelShader_iface; LONG refcount; struct wined3d_shader *wined3d_shader; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 149afa9..4df04f1 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -952,7 +952,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if } TRACE("Created pixel shader %p.\n", object); - *shader = (ID3D10PixelShader *)object; + *shader = &object->ID3D10PixelShader_iface; return S_OK; } diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 79131e1..57c26bc 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -421,7 +421,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct static inline struct d3d10_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) { - return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, vtbl); + return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, ID3D10PixelShader_iface); } /* IUnknown methods */ @@ -448,7 +448,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelSh static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *iface) { - struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)iface; + struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -461,7 +461,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *ifac static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *iface) { - struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)iface; + struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -536,7 +536,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ struct d3d10_shader_info shader_info; HRESULT hr; - shader->vtbl = &d3d10_pixel_shader_vtbl; + shader->ID3D10PixelShader_iface.lpVtbl = &d3d10_pixel_shader_vtbl; shader->refcount = 1; shader_info.output_signature = &shader->output_signature;

1 0

Michael Stefaniuc : d3d10core: Use unsafe_impl_from_ID3D10PixelShader for an app provided iface.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 887a4ff3cc630e0353c744cac31f48389e0a6afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=887a4ff3cc630e0353c744cac… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 01:55:11 2011 +0200 d3d10core: Use unsafe_impl_from_ID3D10PixelShader for an app provided iface. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 2 +- dlls/d3d10core/shader.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 50d31b0..17c3bae 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -203,6 +203,7 @@ struct d3d10_pixel_shader HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_device *device, const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; +struct d3d10_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN; HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 0f4b75f..149afa9 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -133,7 +133,7 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetShader(ID3D10Device *iface, ID3D10PixelShader *shader) { struct d3d10_device *This = impl_from_ID3D10Device(iface); - struct d3d10_pixel_shader *ps = (struct d3d10_pixel_shader *)shader; + struct d3d10_pixel_shader *ps = unsafe_impl_from_ID3D10PixelShader(shader); TRACE("iface %p, shader %p\n", iface, shader); diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index fe112dc..79131e1 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -419,6 +419,11 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct return S_OK; } +static inline struct d3d10_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, vtbl); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelShader *iface, @@ -553,3 +558,12 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_ return S_OK; } + +struct d3d10_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_pixel_shader_vtbl); + + return impl_from_ID3D10PixelShader(iface); +}

1 0

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10VertexShader iface .
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: cc0cc6a80fa69712856ebb328681b70fba90d940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc0cc6a80fa69712856ebb328… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 01:54:04 2011 +0200 d3d10core: COM cleanup for the ID3D10VertexShader iface. --- dlls/d3d10core/d3d10core_private.h | 2 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/shader.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 12fd54b..50d31b0 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -167,7 +167,7 @@ HRESULT d3d10_input_layout_init(struct d3d10_input_layout *layout, struct d3d10_ /* ID3D10VertexShader */ struct d3d10_vertex_shader { - const struct ID3D10VertexShaderVtbl *vtbl; + ID3D10VertexShader ID3D10VertexShader_iface; LONG refcount; struct wined3d_shader *wined3d_shader; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 302c91e..0f4b75f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -879,7 +879,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i } TRACE("Created vertex shader %p.\n", object); - *shader = (ID3D10VertexShader *)object; + *shader = &object->ID3D10VertexShader_iface; return S_OK; } diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 6720c21..fe112dc 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -135,7 +135,7 @@ void shader_free_signature(struct wined3d_shader_signature *s) static inline struct d3d10_vertex_shader *impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) { - return CONTAINING_RECORD(iface, struct d3d10_vertex_shader, vtbl); + return CONTAINING_RECORD(iface, struct d3d10_vertex_shader, ID3D10VertexShader_iface); } /* IUnknown methods */ @@ -162,7 +162,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_QueryInterface(ID3D10Vertex static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_AddRef(ID3D10VertexShader *iface) { - struct d3d10_vertex_shader *This = (struct d3d10_vertex_shader *)iface; + struct d3d10_vertex_shader *This = impl_from_ID3D10VertexShader(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u\n", This, refcount); @@ -175,7 +175,7 @@ static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_AddRef(ID3D10VertexShader *if static ULONG STDMETHODCALLTYPE d3d10_vertex_shader_Release(ID3D10VertexShader *iface) { - struct d3d10_vertex_shader *This = (struct d3d10_vertex_shader *)iface; + struct d3d10_vertex_shader *This = impl_from_ID3D10VertexShader(iface); ULONG refcount = InterlockedDecrement(&This->refcount); TRACE("%p decreasing refcount to %u\n", This, refcount); @@ -250,7 +250,7 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 struct d3d10_shader_info shader_info; HRESULT hr; - shader->vtbl = &d3d10_vertex_shader_vtbl; + shader->ID3D10VertexShader_iface.lpVtbl = &d3d10_vertex_shader_vtbl; shader->refcount = 1; shader_info.output_signature = &shader->output_signature;

1 0

Michael Stefaniuc : d3d10core: Use unsafe_impl_from_ID3D10VertexShader for an app provided iface.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: ec415eaf3c5d2c098e609752b4c8a3e66bb31d7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec415eaf3c5d2c098e609752b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 12 01:51:41 2011 +0200 d3d10core: Use unsafe_impl_from_ID3D10VertexShader for an app provided iface. --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/device.c | 2 +- dlls/d3d10core/shader.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 2bee04a..12fd54b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -176,6 +176,7 @@ struct d3d10_vertex_shader HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d10_device *device, const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; +struct d3d10_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) DECLSPEC_HIDDEN; /* ID3D10GeometryShader */ struct d3d10_geometry_shader diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3399b29..302c91e 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -151,7 +151,7 @@ static void STDMETHODCALLTYPE d3d10_device_VSSetShader(ID3D10Device *iface, ID3D10VertexShader *shader) { struct d3d10_device *This = impl_from_ID3D10Device(iface); - struct d3d10_vertex_shader *vs = (struct d3d10_vertex_shader *)shader; + struct d3d10_vertex_shader *vs = unsafe_impl_from_ID3D10VertexShader(shader); TRACE("iface %p, shader %p\n", iface, shader); diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index a7a40d5..6720c21 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -19,6 +19,7 @@ #include "config.h" #include "wine/port.h" +#include <assert.h> #include "d3d10core_private.h" @@ -132,6 +133,11 @@ void shader_free_signature(struct wined3d_shader_signature *s) HeapFree(GetProcessHeap(), 0, s->elements); } +static inline struct d3d10_vertex_shader *impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_vertex_shader, vtbl); +} + /* IUnknown methods */ static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_QueryInterface(ID3D10VertexShader *iface, @@ -267,6 +273,15 @@ HRESULT d3d10_vertex_shader_init(struct d3d10_vertex_shader *shader, struct d3d1 return S_OK; } +struct d3d10_vertex_shader *unsafe_impl_from_ID3D10VertexShader(ID3D10VertexShader *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d10_vertex_shader_vtbl); + + return impl_from_ID3D10VertexShader(iface); +} + static inline struct d3d10_geometry_shader *impl_from_ID3D10GeometryShader(ID3D10GeometryShader *iface) { return CONTAINING_RECORD(iface, struct d3d10_geometry_shader, ID3D10GeometryShader_iface);

1 0

Henri Verbeet : wined3d: Make the shader parameter to shader_generate_main( ) const.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: d67d7ebbcb3f67838e06da5fa5c97f1880f54b3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67d7ebbcb3f67838e06da5fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 22:04:33 2011 +0200 wined3d: Make the shader parameter to shader_generate_main() const. --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d0d8d08..bf9cb23 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1164,7 +1164,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, /* Shared code in order to generate the bulk of the shader string. * NOTE: A description of how to parse tokens can be found on MSDN. */ -void shader_generate_main(struct wined3d_shader *shader, struct wined3d_shader_buffer *buffer, +void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_shader_buffer *buffer, const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) { struct wined3d_device *device = shader->device; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b959543..682c21b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2633,8 +2633,8 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, const struct wined3d_shader_version *shader_version) DECLSPEC_HIDDEN; unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_maps *reg_maps, unsigned int max) DECLSPEC_HIDDEN; -void shader_generate_main(struct wined3d_shader *shader, struct wined3d_shader_buffer *buffer, - const struct wined3d_shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx) DECLSPEC_HIDDEN; +void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_shader_buffer *buffer, + const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) DECLSPEC_HIDDEN; BOOL shader_match_semantic(const char *semantic_name, WINED3DDECLUSAGE usage) DECLSPEC_HIDDEN; static inline BOOL shader_is_pshader_version(enum wined3d_shader_type type)

1 0

Henri Verbeet : wined3d: Make the shader parameter to vshader_get_input() const.
by Alexandre Julliard 12 Jul '11

12 Jul '11

Module: wine Branch: master Commit: 48881c0792947618b7f940e1a9f3d5800f752044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48881c0792947618b7f940e1a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 22:04:32 2011 +0200 wined3d: Make the shader parameter to vshader_get_input() const. --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 79a2759..d0d8d08 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1706,7 +1706,7 @@ static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_id return FALSE; } -BOOL vshader_get_input(struct wined3d_shader *shader, +BOOL vshader_get_input(const struct wined3d_shader *shader, BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) { WORD map = shader->reg_maps.input_registers; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f104a19..b959543 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2558,7 +2558,7 @@ int shader_addline(struct wined3d_shader_buffer *buffer, const char *fmt, ...) P int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *fmt, va_list args) DECLSPEC_HIDDEN; /* Vertex shader utility functions */ -extern BOOL vshader_get_input(struct wined3d_shader *shader, +BOOL vshader_get_input(const struct wined3d_shader *shader, BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; struct wined3d_vertex_shader

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
84
Older →

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 July 2011