September 2012 - Wine-Commits

Detlef Riekenberg : d3dx9_36/tests: Fix copy & paste error in ok messages.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: a695062447ef35d7a78bcb209178362c6f149e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a695062447ef35d7a78bcb209… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Sep 25 23:35:00 2012 +0200 d3dx9_36/tests: Fix copy & paste error in ok messages. --- dlls/d3dx9_36/tests/texture.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 06e69e2..3c2cd95 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -1314,9 +1314,9 @@ static void test_D3DXCreateTextureFromFileInMemory(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc returned %#x, expected %#x\n", hr, D3D_OK); ok(desc.Width == 4, "Width is %u, expected 4\n", desc.Width); - ok(desc.Height == 4, "Width is %u, expected 4\n", desc.Height); + ok(desc.Height == 4, "Height is %u, expected 4\n", desc.Height); hr = IDirect3DTexture9_LockRect(texture, 0, &lock_rect, NULL, D3DLOCK_READONLY); - ok(hr == D3D_OK, "IDirect3DTexture9_LockTexture returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "IDirect3DTexture9_LockRect returned %#x, expected %#x\n", hr, D3D_OK); if (SUCCEEDED(hr)) { for (i = 0; i < 16; i++)

1 0

Michael Stefaniuc : dsound: Don' t bother shrinking the secondary buffer list.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 4e06eead8f446f0167e6c92f0cc09f943122a7cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e06eead8f446f0167e6c92f0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Sep 25 23:23:31 2012 +0200 dsound: Don't bother shrinking the secondary buffer list. --- dlls/dsound/dsound.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index a7a6f13..666f29f 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #include <stdio.h> @@ -1090,22 +1091,21 @@ HRESULT DirectSoundDevice_RemoveBuffer( RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); - for (i = 0; i < device->nrofbuffers; i++) - if (device->buffers[i] == pDSB) - break; - - if (i < device->nrofbuffers) { - /* Put the last buffer of the list in the (now empty) position */ - device->buffers[i] = device->buffers[device->nrofbuffers - 1]; - device->nrofbuffers--; - device->buffers = HeapReAlloc(GetProcessHeap(),0,device->buffers,sizeof(LPDIRECTSOUNDBUFFER8)*device->nrofbuffers); - TRACE("buffer count is now %d\n", device->nrofbuffers); - } - - if (device->nrofbuffers == 0) { - HeapFree(GetProcessHeap(),0,device->buffers); + if (device->nrofbuffers == 1) { + assert(device->buffers[0] == pDSB); + HeapFree(GetProcessHeap(), 0, device->buffers); device->buffers = NULL; + } else { + for (i = 0; i < device->nrofbuffers; i++) { + if (device->buffers[i] == pDSB) { + /* Put the last buffer of the list in the (now empty) position */ + device->buffers[i] = device->buffers[device->nrofbuffers - 1]; + break; + } + } } + device->nrofbuffers--; + TRACE("buffer count is now %d\n", device->nrofbuffers); RtlReleaseResource(&(device->buffer_list_lock));

1 0

Hans Leidekker : hnetcfg: Add a typelib.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 3edae31d7a25fe58da987a2fe985646af51297d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3edae31d7a25fe58da987a2fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 09:36:52 2012 +0200 hnetcfg: Add a typelib. --- dlls/hnetcfg/Makefile.in | 1 + dlls/hnetcfg/hnetcfg_tlb.idl | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/hnetcfg/Makefile.in b/dlls/hnetcfg/Makefile.in index 63f3150..198a6bb 100644 --- a/dlls/hnetcfg/Makefile.in +++ b/dlls/hnetcfg/Makefile.in @@ -11,5 +11,6 @@ C_SRCS = \ service.c IDL_R_SRCS = hnetcfg.idl +IDL_TLB_SRCS = hnetcfg_tlb.idl @MAKE_DLL_RULES@ diff --git a/dlls/hnetcfg/hnetcfg_tlb.idl b/dlls/hnetcfg/hnetcfg_tlb.idl new file mode 100644 index 0000000..6a202b2 --- /dev/null +++ b/dlls/hnetcfg/hnetcfg_tlb.idl @@ -0,0 +1,21 @@ +/* + * Typelib for hnetcfg + * + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "netfw.idl"

1 0

Gerald Pfeifer : d3dx9_36: Fix initialization of header in save_dds_surface_to_memory. save_dds_surface_to_memory.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: f807666d2b38e39d4df8ad2725c3ce6ecf15f6f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f807666d2b38e39d4df8ad272… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Sep 25 19:38:32 2012 -0400 d3dx9_36: Fix initialization of header in save_dds_surface_to_memory. save_dds_surface_to_memory. --- dlls/d3dx9_36/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ab6a9f6..daa6cfe 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -473,7 +473,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur header = ID3DXBuffer_GetBufferPointer(buffer); pixels = (BYTE *)(header + 1); - memset(header, 0, sizeof(header)); + memset(header, 0, sizeof(*header)); header->signature = MAKEFOURCC('D','D','S',' '); header->size = sizeof(*header); header->flags = DDS_CAPS | DDS_HEIGHT | DDS_WIDTH | DDS_PITCH | DDS_PIXELFORMAT | DDS_MIPMAPCOUNT;

1 0

Alexandre Julliard : winex11: Store the full visual info for the default visual.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 988f2fde86a877f3b99ae384bd6b2410892c5bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988f2fde86a877f3b99ae384b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 25 15:51:03 2012 +0200 winex11: Store the full visual info for the default visual. --- dlls/winex11.drv/bitblt.c | 10 +++--- dlls/winex11.drv/brush.c | 19 ++---------- dlls/winex11.drv/clipboard.c | 36 +++-------------------- dlls/winex11.drv/desktop.c | 6 ++-- dlls/winex11.drv/init.c | 4 +- dlls/winex11.drv/mouse.c | 4 +- dlls/winex11.drv/opengl.c | 8 ++-- dlls/winex11.drv/palette.c | 30 ++++++++++---------- dlls/winex11.drv/window.c | 33 ++++++--------------- dlls/winex11.drv/x11drv.h | 3 +- dlls/winex11.drv/x11drv_main.c | 61 +++++++++++++++++++++++---------------- dlls/winex11.drv/xrender.c | 35 +++++++++-------------- 12 files changed, 101 insertions(+), 148 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=988f2fde86a877f3b99ae…

1 0

Henri Verbeet : wined3d: wined3d_device_get_texture_stage_state() never fails.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: c0a83b1d960ac6863a9a9eb3e6ef323ed15ea2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a83b1d960ac6863a9a9eb3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 10:12:14 2012 +0200 wined3d: wined3d_device_get_texture_stage_state() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 17 ++++++++--------- dlls/wined3d/device.c | 15 ++++++--------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5dc3d53..6f7cce7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1785,7 +1785,6 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); const struct tss_lookup *l; - HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, Type, value); @@ -1801,10 +1800,10 @@ static HRESULT WINAPI d3d8_device_GetTextureStageState(IDirect3DDevice8 *iface, if (l->sampler_state) *value = wined3d_device_get_sampler_state(device->wined3d_device, stage, l->state); else - hr = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state, value); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1012d04..71e2ca3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1752,7 +1752,6 @@ static HRESULT WINAPI d3d9_device_GetTextureStageState(IDirect3DDevice9Ex *iface DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD *value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); @@ -1763,10 +1762,10 @@ static HRESULT WINAPI d3d9_device_GetTextureStageState(IDirect3DDevice9Ex *iface } wined3d_mutex_lock(); - hr = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, tss_lookup[state], value); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, tss_lookup[state]); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f4b403f..1ec8176 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2401,12 +2401,12 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, device->legacyTextureBlending = TRUE; - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_OP, &colorop); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG1, &colorarg1); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG2, &colorarg2); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_OP, &alphaop); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1, &alphaarg1); - wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG2, &alphaarg2); + colorop = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_OP); + colorarg1 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG1); + colorarg2 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_COLOR_ARG2); + alphaop = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_OP); + alphaarg1 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG1); + alphaarg2 = wined3d_device_get_texture_stage_state(device->wined3d_device, 0, WINED3D_TSS_ALPHA_ARG2); if (colorop == WINED3D_TOP_SELECT_ARG1 && colorarg1 == WINED3DTA_TEXTURE && alphaop == WINED3D_TOP_SELECT_ARG1 && alphaarg1 == WINED3DTA_TEXTURE) @@ -4543,7 +4543,6 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); const struct tss_lookup *l; - HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); @@ -4623,12 +4622,12 @@ static HRESULT d3d_device7_GetTextureStageState(IDirect3DDevice7 *iface, } else { - hr = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state, value); + *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, l->state); } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d_device7_GetTextureStageState_FPUSetup(IDirect3DDevice7 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ae5283..d27e802 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3435,22 +3435,19 @@ void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, device_invalidate_state(device, STATE_TEXTURESTAGE(stage, state)); } -HRESULT CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, - UINT stage, enum wined3d_texture_stage_state state, DWORD *value) +DWORD CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, + UINT stage, enum wined3d_texture_stage_state state) { - TRACE("device %p, stage %u, state %s, value %p.\n", - device, stage, debug_d3dtexturestate(state), value); + TRACE("device %p, stage %u, state %s.\n", + device, stage, debug_d3dtexturestate(state)); if (state > WINED3D_HIGHEST_TEXTURE_STATE) { WARN("Invalid state %#x passed.\n", state); - return WINED3D_OK; + return 0; } - *value = device->updateStateBlock->state.texture_states[stage][state]; - TRACE("Returning %#x.\n", *value); - - return WINED3D_OK; + return device->updateStateBlock->state.texture_states[stage][state]; } HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 091f6d5..bedd63f 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -86,7 +86,7 @@ @ cdecl wined3d_device_get_swapchain(ptr long) @ cdecl wined3d_device_get_swapchain_count(ptr) @ cdecl wined3d_device_get_texture(ptr long ptr) -@ cdecl wined3d_device_get_texture_stage_state(ptr long long ptr) +@ cdecl wined3d_device_get_texture_stage_state(ptr long long) @ cdecl wined3d_device_get_transform(ptr long ptr) @ cdecl wined3d_device_get_vertex_declaration(ptr) @ cdecl wined3d_device_get_vertex_shader(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ec099b5..e9c0cb1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2160,8 +2160,8 @@ struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct win UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_texture(const struct wined3d_device *device, UINT stage, struct wined3d_texture **texture); -HRESULT __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device *device, - UINT stage, enum wined3d_texture_stage_state state, DWORD *value); +DWORD __cdecl wined3d_device_get_texture_stage_state(const struct wined3d_device *device, + UINT stage, enum wined3d_texture_stage_state state); void __cdecl wined3d_device_get_transform(const struct wined3d_device *device, enum wined3d_transform_state state, struct wined3d_matrix *matrix); struct wined3d_vertex_declaration * __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: wined3d_device_set_texture_stage_state() never fails.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 26c071400900bc80298228ec4c66640fa2475427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26c071400900bc80298228ec4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 10:12:13 2012 +0200 wined3d: wined3d_device_set_texture_stage_state() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/device.c | 14 ++++++-------- include/wine/wined3d.h | 2 +- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 4a96c2f..5dc3d53 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1812,7 +1812,6 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); const struct tss_lookup *l; - HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, type, value); @@ -1828,10 +1827,10 @@ static HRESULT WINAPI d3d8_device_SetTextureStageState(IDirect3DDevice8 *iface, if (l->sampler_state) wined3d_device_set_sampler_state(device->wined3d_device, stage, l->state, value); else - hr = wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_ValidateDevice(IDirect3DDevice8 *iface, DWORD *pass_count) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d194642..1012d04 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1773,7 +1773,6 @@ static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface DWORD stage, D3DTEXTURESTAGESTATETYPE state, DWORD value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, state, value); @@ -1784,10 +1783,10 @@ static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface } wined3d_mutex_lock(); - hr = wined3d_device_set_texture_stage_state(device->wined3d_device, stage, tss_lookup[state], value); + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, tss_lookup[state], value); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_GetSamplerState(IDirect3DDevice9Ex *iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 86cd5c1..f4b403f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4684,7 +4684,6 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); const struct tss_lookup *l; - HRESULT hr = D3D_OK; TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, stage, state, value); @@ -4766,12 +4765,12 @@ static HRESULT d3d_device7_SetTextureStageState(IDirect3DDevice7 *iface, } else { - hr = wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); + wined3d_device_set_texture_stage_state(device->wined3d_device, stage, l->state, value); } wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d_device7_SetTextureStageState_FPUSetup(IDirect3DDevice7 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0d78257..1ae5283 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3343,7 +3343,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, return hr; } -HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, +void CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *device, UINT stage, enum wined3d_texture_stage_state state, DWORD value) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -3355,14 +3355,14 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi if (state > WINED3D_HIGHEST_TEXTURE_STATE) { WARN("Invalid state %#x passed.\n", state); - return WINED3D_OK; + return; } if (stage >= gl_info->limits.texture_stages) { WARN("Attempting to set stage %u which is higher than the max stage %u, ignoring.\n", stage, gl_info->limits.texture_stages - 1); - return WINED3D_OK; + return; } old_value = device->updateStateBlock->state.texture_states[stage][state]; @@ -3372,14 +3372,14 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi if (device->isRecordingState) { TRACE("Recording... not performing anything.\n"); - return WINED3D_OK; + return; } /* Checked after the assignments to allow proper stateblock recording. */ if (old_value == value) { TRACE("Application is setting the old value over, nothing to do.\n"); - return WINED3D_OK; + return; } if (stage > device->stateBlock->state.lowest_disabled_stage @@ -3389,7 +3389,7 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi /* Colorop change above lowest disabled stage? That won't change * anything in the GL setup. Changes in other states are important on * disabled stages too. */ - return WINED3D_OK; + return; } if (state == WINED3D_TSS_COLOR_OP) @@ -3433,8 +3433,6 @@ HRESULT CDECL wined3d_device_set_texture_stage_state(struct wined3d_device *devi } device_invalidate_state(device, STATE_TEXTURESTAGE(stage, state)); - - return WINED3D_OK; } HRESULT CDECL wined3d_device_get_texture_stage_state(const struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 040fbfe..ec099b5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2230,7 +2230,7 @@ HRESULT __cdecl wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride); HRESULT __cdecl wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider); HRESULT __cdecl wined3d_device_set_texture(struct wined3d_device *device, UINT stage, struct wined3d_texture *texture); -HRESULT __cdecl wined3d_device_set_texture_stage_state(struct wined3d_device *device, +void __cdecl wined3d_device_set_texture_stage_state(struct wined3d_device *device, UINT stage, enum wined3d_texture_stage_state state, DWORD value); void __cdecl wined3d_device_set_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix);

1 0

Henri Verbeet : d3d10: Introduce a state object variable structure.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 084e967c0dc78914698924fca7a557186efd1dc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084e967c0dc78914698924fca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 10:12:12 2012 +0200 d3d10: Introduce a state object variable structure. --- dlls/d3d10/d3d10_private.h | 11 +++++++++++ dlls/d3d10/effect.c | 36 +++++++++++++++++++++++++----------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e414742..9edc32c 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -100,6 +100,17 @@ struct d3d10_effect_shader_variable } shader; }; +struct d3d10_effect_state_object_variable +{ + union + { + D3D10_RASTERIZER_DESC rasterizer; + D3D10_DEPTH_STENCIL_DESC depth_stencil; + D3D10_BLEND_DESC blend; + D3D10_SAMPLER_DESC sampler; + } desc; +}; + /* ID3D10EffectType */ struct d3d10_effect_type { diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 8354ac0..97ce61e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -231,7 +231,7 @@ static const D3D10_SAMPLER_DESC default_sampler_desc = struct d3d10_effect_state_storage_info { D3D_SHADER_VARIABLE_TYPE id; - size_t size; + SIZE_T size; const void *default_state; }; @@ -1641,6 +1641,7 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const { const struct d3d10_effect_state_storage_info *storage_info; unsigned int count = max(v->type->element_count, 1); + struct d3d10_effect_state_object_variable *s; if (!(storage_info = get_storage_info(v->type->basetype))) { @@ -1649,31 +1650,36 @@ static HRESULT parse_fx10_local_variable(struct d3d10_effect_variable *v, const return E_FAIL; } + if (storage_info->size > sizeof(s->desc)) + { + ERR("Invalid storage size %#lx.\n", storage_info->size); + return E_FAIL; + } + for (i = 0; i < count; ++i) { struct d3d10_effect_variable *var; - unsigned char *desc; if (v->type->element_count) var = &v->elements[i]; else var = v; - if (!(desc = HeapAlloc(GetProcessHeap(), 0, storage_info->size))) + if (!(s = HeapAlloc(GetProcessHeap(), 0, sizeof(*s)))) { ERR("Failed to allocate backing store memory.\n"); return E_OUTOFMEMORY; } - memcpy(desc, storage_info->default_state, storage_info->size); - if (!parse_fx10_state_group(ptr, data, var->type->basetype, desc)) + memcpy(&s->desc, storage_info->default_state, storage_info->size); + if (!parse_fx10_state_group(ptr, data, var->type->basetype, &s->desc)) { ERR("Failed to read property list.\n"); - HeapFree(GetProcessHeap(), 0, desc); + HeapFree(GetProcessHeap(), 0, s); return E_FAIL; } - var->data = desc; + var->data = s; } } break; @@ -6019,6 +6025,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBackingStore(ID3 UINT index, D3D10_BLEND_DESC *desc) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_state_object_variable *s; TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); @@ -6031,7 +6038,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBackingStore(ID3 return E_FAIL; } - *desc = *(D3D10_BLEND_DESC *)v->data; + s = v->data; + *desc = s->desc.blend; return S_OK; } @@ -6237,6 +6245,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingS UINT index, D3D10_DEPTH_STENCIL_DESC *desc) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_state_object_variable *s; TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); @@ -6249,7 +6258,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingS return E_FAIL; } - *desc = *(D3D10_DEPTH_STENCIL_DESC *)v->data; + s = v->data; + *desc = s->desc.depth_stencil; return S_OK; } @@ -6455,6 +6465,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetBackingStor UINT index, D3D10_RASTERIZER_DESC *desc) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_state_object_variable *s; TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); @@ -6467,7 +6478,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetBackingStor return E_FAIL; } - *desc = *(D3D10_RASTERIZER_DESC *)v->data; + s = v->data; + *desc = s->desc.rasterizer; return S_OK; } @@ -6673,6 +6685,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(I UINT index, D3D10_SAMPLER_DESC *desc) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); + struct d3d10_effect_state_object_variable *s; TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); @@ -6685,7 +6698,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_sampler_variable_GetBackingStore(I return E_FAIL; } - *desc = *(D3D10_SAMPLER_DESC *)v->data; + s = v->data; + *desc = s->desc.sampler; return S_OK; }

1 0

Hans Leidekker : httpapi: Add a stub implementation of HttpAddUrl.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 7e22fc09434a6773caac6ab86199677ad71a72d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e22fc09434a6773caac6ab86… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 09:37:55 2012 +0200 httpapi: Add a stub implementation of HttpAddUrl. --- dlls/httpapi/httpapi.spec | 2 +- dlls/httpapi/httpapi_main.c | 9 +++++++++ include/http.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec index 7e5eede..4d35c84 100644 --- a/dlls/httpapi/httpapi.spec +++ b/dlls/httpapi/httpapi.spec @@ -1,5 +1,5 @@ @ stub HttpAddFragmentToCache -@ stub HttpAddUrl +@ stdcall HttpAddUrl(ptr wstr ptr) @ stub HttpAddUrlToConfigGroup @ stub HttpCancelHttpRequest @ stub HttpCreateAppPool diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c index 3375cb6..e71048f 100644 --- a/dlls/httpapi/httpapi_main.c +++ b/dlls/httpapi/httpapi_main.c @@ -176,3 +176,12 @@ ULONG WINAPI HttpCreateHttpHandle( PHANDLE handle, ULONG reserved ) FIXME( "(%p, %d): stub!\n", handle, reserved); return ERROR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * HttpAddUrl (HTTPAPI.@) + */ +ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved ) +{ + FIXME( "(%p, %s, %p): stub!\n", handle, debugstr_w(url), reserved ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/http.h b/include/http.h index b42cbca..8c2f21e 100644 --- a/include/http.h +++ b/include/http.h @@ -53,6 +53,7 @@ typedef enum _HTTP_SERVICE_CONFIG_ID ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); ULONG WINAPI HttpTerminate(ULONG,PVOID); +ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED);

1 0

Hans Leidekker : hnetcfg: Add IDispatch support for INetFwMgr, INetFwPolicy and INetFwProfile.
by Alexandre Julliard Sept. 26, 2012

Sept. 26, 2012

Module: wine Branch: master Commit: 4619b529cf26ac923bca7b2a88a4548bd9f50d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4619b529cf26ac923bca7b2a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 09:37:23 2012 +0200 hnetcfg: Add IDispatch support for INetFwMgr, INetFwPolicy and INetFwProfile. --- dlls/hnetcfg/apps.c | 5 ++++- dlls/hnetcfg/hnetcfg_private.h | 3 +++ dlls/hnetcfg/manager.c | 36 ++++++++++++++++++++++++++++-------- dlls/hnetcfg/policy.c | 36 ++++++++++++++++++++++++++++-------- dlls/hnetcfg/profile.c | 36 ++++++++++++++++++++++++++++-------- 5 files changed, 91 insertions(+), 25 deletions(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 0418865..38c0d00 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -106,7 +106,10 @@ static ITypeInfo *typeinfo[last_tid]; static REFIID tid_id[] = { &IID_INetFwAuthorizedApplication, - &IID_INetFwAuthorizedApplications + &IID_INetFwAuthorizedApplications, + &IID_INetFwMgr, + &IID_INetFwPolicy, + &IID_INetFwProfile }; HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) diff --git a/dlls/hnetcfg/hnetcfg_private.h b/dlls/hnetcfg/hnetcfg_private.h index bd92392..05b0aee 100644 --- a/dlls/hnetcfg/hnetcfg_private.h +++ b/dlls/hnetcfg/hnetcfg_private.h @@ -20,6 +20,9 @@ enum type_id { INetFwAuthorizedApplication_tid, INetFwAuthorizedApplications_tid, + INetFwMgr_tid, + INetFwPolicy_tid, + INetFwProfile_tid, last_tid }; diff --git a/dlls/hnetcfg/manager.c b/dlls/hnetcfg/manager.c index 6192c2d..1d548b4 100644 --- a/dlls/hnetcfg/manager.c +++ b/dlls/hnetcfg/manager.c @@ -96,8 +96,9 @@ static HRESULT WINAPI fw_manager_GetTypeInfoCount( { fw_manager *This = impl_from_INetFwMgr( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_manager_GetTypeInfo( @@ -108,8 +109,8 @@ static HRESULT WINAPI fw_manager_GetTypeInfo( { fw_manager *This = impl_from_INetFwMgr( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwMgr_tid, ppTInfo ); } static HRESULT WINAPI fw_manager_GetIDsOfNames( @@ -121,9 +122,18 @@ static HRESULT WINAPI fw_manager_GetIDsOfNames( DISPID *rgDispId ) { fw_manager *This = impl_from_INetFwMgr( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwMgr_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_manager_Invoke( @@ -138,10 +148,20 @@ static HRESULT WINAPI fw_manager_Invoke( UINT *puArgErr ) { fw_manager *This = impl_from_INetFwMgr( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwMgr_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwMgr_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_manager_get_LocalPolicy( diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index dd5a1fe..e340ffb 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -95,8 +95,9 @@ static HRESULT WINAPI fw_policy_GetTypeInfoCount( { fw_policy *This = impl_from_INetFwPolicy( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_policy_GetTypeInfo( @@ -107,8 +108,8 @@ static HRESULT WINAPI fw_policy_GetTypeInfo( { fw_policy *This = impl_from_INetFwPolicy( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwPolicy_tid, ppTInfo ); } static HRESULT WINAPI fw_policy_GetIDsOfNames( @@ -120,9 +121,18 @@ static HRESULT WINAPI fw_policy_GetIDsOfNames( DISPID *rgDispId ) { fw_policy *This = impl_from_INetFwPolicy( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwPolicy_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_policy_Invoke( @@ -137,10 +147,20 @@ static HRESULT WINAPI fw_policy_Invoke( UINT *puArgErr ) { fw_policy *This = impl_from_INetFwPolicy( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwPolicy_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwPolicy_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_policy_get_CurrentProfile( diff --git a/dlls/hnetcfg/profile.c b/dlls/hnetcfg/profile.c index f1d724d..835e82e 100644 --- a/dlls/hnetcfg/profile.c +++ b/dlls/hnetcfg/profile.c @@ -95,8 +95,9 @@ static HRESULT WINAPI fw_profile_GetTypeInfoCount( { fw_profile *This = impl_from_INetFwProfile( iface ); - FIXME("%p %p\n", This, pctinfo); - return E_NOTIMPL; + TRACE("%p %p\n", This, pctinfo); + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI fw_profile_GetTypeInfo( @@ -107,8 +108,8 @@ static HRESULT WINAPI fw_profile_GetTypeInfo( { fw_profile *This = impl_from_INetFwProfile( iface ); - FIXME("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + TRACE("%p %u %u %p\n", This, iTInfo, lcid, ppTInfo); + return get_typeinfo( INetFwProfile_tid, ppTInfo ); } static HRESULT WINAPI fw_profile_GetIDsOfNames( @@ -120,9 +121,18 @@ static HRESULT WINAPI fw_profile_GetIDsOfNames( DISPID *rgDispId ) { fw_profile *This = impl_from_INetFwProfile( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); - return E_NOTIMPL; + TRACE("%p %s %p %u %u %p\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo( INetFwProfile_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, rgszNames, cNames, rgDispId ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_profile_Invoke( @@ -137,10 +147,20 @@ static HRESULT WINAPI fw_profile_Invoke( UINT *puArgErr ) { fw_profile *This = impl_from_INetFwProfile( iface ); + ITypeInfo *typeinfo; + HRESULT hr; - FIXME("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), + TRACE("%p %d %s %d %d %p %p %p %p\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + + hr = get_typeinfo( INetFwProfile_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &This->INetFwProfile_iface, dispIdMember, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr ); + ITypeInfo_Release( typeinfo ); + } + return hr; } static HRESULT WINAPI fw_profile_get_Type(

1 0