July 2011 - Wine-Commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Add basic "for" tests.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 63a6a80d40a107f734b8a0c8617ba1302643cb7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a6a80d40a107f734b8a0c86… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 11 23:34:05 2011 +0200 cmd/tests: Add basic "for" tests. --- programs/cmd/tests/test_builtins.cmd | 23 +++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 ++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 11f6f10..3af488e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -78,6 +78,29 @@ if /i not foo==FOO echo if /i seems to be broken if /I foo==FOO echo if /I seems to work if /I not foo==FOO echo if /I seems to be broken +echo -----------Testing for ----------- +for %%i in (A B C) do echo %%i +for %%i in (A B C) do call :forTestFun1 %%i +goto :endForTestFun1 +:forTestFun1 +echo %1 +goto :eof +:endForTestFun1 +for %%i in (X) do ( + for %%j in (Y) do ( + echo %%i %%j )) +for %%i in (A B) do ( + for %%j in (C D) do ( + echo %%i %%j )) +for %%i in (A B) do ( + for %%j in (C D) do ( + call :forTestFun2 %%i %%j )) +goto :endForTestFun2 +:forTestFun2 +echo %1 %2 +goto :eof +:endForTestFun2 + echo -----------Testing del /a----------- del /f/q *.test > nul echo r > r.test diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index efc1795..2f3e285 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -78,6 +78,22 @@ Testing case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work if /I seems to work +-----------Testing for ----------- +A +B +C +A +B +C +(a)todo_wine@X Y +(a)todo_wine@A C +(a)todo_wine@A D +(a)todo_wine@B C +(a)todo_wine@B D +(a)todo_wine@A C +(a)todo_wine@A D +(a)todo_wine@B C +(a)todo_wine@B D -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0

Jay Yang : shell32: Have the default shell view call SHChangeNotifyRegister with unixfs pidls.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Michael Stefaniuc : d3d10core: Use unsafe_impl_from_ID3D10PixelShader for an app provided iface.
by Alexandre Julliard July 12, 2011

July 12, 2011

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 ID3D10PixelShader iface.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Henri Verbeet : wined3d: Make the shader parameter to shader_generate_main( ) const.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Michael Stefaniuc : d3d10core: Use unsafe_impl_from_ID3D10VertexShader for an app provided iface.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10VertexShader iface .
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Henri Verbeet : wined3d: Make the shader parameter to vshader_get_input() const.
by Alexandre Julliard July 12, 2011

July 12, 2011

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

Henri Verbeet : wined3d: Make the swapchain parameter to x11_copy_to_screen () const.
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: a86785d06519ffb9338fcee08492e1ed8fab958f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86785d06519ffb9338fcee08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 22:04:31 2011 +0200 wined3d: Make the swapchain parameter to x11_copy_to_screen() const. --- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 405d89f..4752e39 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -644,9 +644,9 @@ static const struct wined3d_swapchain_ops swapchain_gl_ops = }; /* Helper function that blits the front buffer contents to the target window. */ -void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) +void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) { - struct wined3d_surface *front; + const struct wined3d_surface *front; POINT offset = {0, 0}; HDC src_dc, dst_dc; RECT draw_rect; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d4c5e9f..f104a19 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2451,7 +2451,7 @@ struct wined3d_swapchain HWND backup_wnd; }; -void x11_copy_to_screen(struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; +void x11_copy_to_screen(const struct wined3d_swapchain *swapchain, const RECT *rect) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Only use state contained in the ffp_frag_settings structure in gen_arbfp_ffp_shader ().
by Alexandre Julliard July 12, 2011

July 12, 2011

Module: wine Branch: master Commit: 1f6f94675ec190c00e54578fbb0268f3d2be8096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6f94675ec190c00e54578fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 11 22:04:29 2011 +0200 wined3d: Only use state contained in the ffp_frag_settings structure in gen_arbfp_ffp_shader(). Note that the actual check looks off by one too. --- dlls/wined3d/arb_program_shader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b9586d5..66f1695 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5960,6 +5960,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, str BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; BOOL bump_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; BOOL luminance_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; + UINT lowest_disabled_stage; const char *textype; const char *instr, *sat; char colorcor_dst[8]; @@ -6018,6 +6019,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, str tfactor_used = TRUE; } } + lowest_disabled_stage = stage; /* Shader header */ if (!shader_buffer_init(&buffer)) @@ -6063,7 +6065,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, str srgb_sub_high, 0.0, 0.0, 0.0); } - if (ffp_clip_emul(&stateblock->state) && settings->emul_clipplanes) + if (lowest_disabled_stage < 7 && settings->emul_clipplanes) shader_addline(&buffer, "KIL fragment.texcoord[7];\n"); /* Generate texture sampling instructions) */

1 0