wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Stefan Dösinger : d3d9/tests: Range fog is not used with table fog.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: f708da1c1c4bc9e66fa9bf14fe8e6404df7f622f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f708da1c1c4bc9e66fa9bf14f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 3 17:24:36 2011 +0200 d3d9/tests: Range fog is not used with table fog. --- dlls/d3d9/tests/visual.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 1857e2e..f583a89 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1284,6 +1284,98 @@ static void fog_test(IDirect3DDevice9 *device) skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping some fog tests\n"); } + /* Test RANGEFOG vs FOGTABLEMODE */ + if ((caps.RasterCaps & (D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_FOGRANGE)) == + (D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_FOGRANGE)) + { + struct sVertex untransformed_3[] = + { + {-1.0,-1.0, 0.4999f, 0xFFFF0000, 0xFF000000 }, + {-1.0, 1.0, 0.4999f, 0xFFFF0000, 0xFF000000 }, + { 1.0,-1.0, 0.4999f, 0xFFFF0000, 0xFF000000 }, + { 1.0, 1.0, 0.4999f, 0xFFFF0000, 0xFF000000 }, + }; + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Clear failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_RANGEFOGENABLE, TRUE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + + /* z=0.4999, set the fogstart to 0.5 and fogend slightly higher. If range fog + * is not used, the fog coordinate will be equal to fogstart and the quad not + * fogged. If range fog is used the fog coordinate will be slightly higher and + * the fog coordinate will be > fogend, so we get a fully fogged quad. The fog + * is calculated per vertex and interpolated, so even the center of the screen + * where the difference doesn't matter will be fogged, but check the corners in + * case a d3d/gl implementation decides to calculate the fog factor per fragment */ + start = 0.5f; + end = 0.50001f; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + + /* Table fog: Range fog is not used */ + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_BeginScene failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, untransformed_3, sizeof(*untransformed_3)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + } + color = getPixelColor(device, 10, 10); + ok(color == 0x00ff0000, "Rangefog with table fog returned color 0x%08x\n", color); + color = getPixelColor(device, 630, 10); + ok(color == 0x00ff0000, "Rangefog with table fog returned color 0x%08x\n", color); + color = getPixelColor(device, 10, 470); + ok(color == 0x00ff0000, "Rangefog with table fog returned color 0x%08x\n", color); + color = getPixelColor(device, 630, 470); + ok(color == 0x00ff0000, "Rangefog with table fog returned color 0x%08x\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed, hr %#x.\n", hr); + + /* Vertex fog: Rangefog is used */ + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_DrawPrimitiveUP returned %#08x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, untransformed_3, sizeof(*untransformed_3)); + ok(SUCCEEDED(hr), "IDirect3DDevice9_DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "IDirect3DDevice9_EndScene failed, hr %#x.\n", hr); + } + color = getPixelColor(device, 10, 10); + ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + color = getPixelColor(device, 630, 10); + ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + color = getPixelColor(device, 10, 470); + ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + color = getPixelColor(device, 630, 470); + ok(color == 0x0000ff00, "Rangefog with vertex fog returned color 0x%08x\n", color); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_RANGEFOGENABLE, FALSE); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed, hr %#x.\n", hr); + } + else + { + skip("Range fog or table fog not supported, skipping range fog tests\n"); + } + /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); ok(hr == D3D_OK, "Turning off fog calculations returned %08x\n", hr);

1 0

Stefan Dösinger : wined3d: Disable range fog with per-pixel fog.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 9bcd58f312af374a3345dc72e66686fbc2b2bfcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bcd58f312af374a3345dc72e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Sep 10 23:05:33 2011 +0200 wined3d: Disable range fog with per-pixel fog. --- dlls/wined3d/state.c | 51 +++++++++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 31c62a4..8cf02ef 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -898,6 +898,7 @@ static void state_stencilwrite(struct wined3d_context *context, const struct win static void state_fog_vertexpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); if (!state->render_states[WINED3DRS_FOGENABLE]) @@ -912,6 +913,13 @@ static void state_fog_vertexpart(struct wined3d_context *context, const struct w checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT)"); context->fog_coord = FALSE; } + + /* Range fog is only used with per-vertex fog in d3d */ + if (gl_info->supported[NV_FOG_DISTANCE]) + { + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); + } return; } @@ -926,13 +934,33 @@ static void state_fog_vertexpart(struct wined3d_context *context, const struct w checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FOG_COORDINATE_EXT)"); context->fog_coord = TRUE; } - } else { + } + else + { /* Otherwise, use the fragment depth */ if(context->fog_coord) { glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT); checkGLcall("glFogi(GL_FOG_COORDINATE_SOURCE_EXT, GL_FRAGMENT_DEPTH_EXT)"); context->fog_coord = FALSE; } + + if (state->render_states[WINED3DRS_RANGEFOGENABLE]) + { + if (gl_info->supported[NV_FOG_DISTANCE]) + { + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV)"); + } + else + { + WARN("Range fog enabled, but not supported by this GL implementation.\n"); + } + } + else if (gl_info->supported[NV_FOG_DISTANCE]) + { + glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); + checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); + } } } @@ -1137,24 +1165,6 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st } } -static void state_rangefog_w(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3DRS_RANGEFOGENABLE]) - WARN("Range fog enabled, but not supported by this GL implementation.\n"); -} - -static void state_rangefog(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - if (state->render_states[WINED3DRS_RANGEFOGENABLE]) - { - glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV); - checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_RADIAL_NV)"); - } else { - glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV); - checkGLcall("glFogi(GL_FOG_DISTANCE_MODE_NV, GL_EYE_PLANE_ABSOLUTE_NV)"); - } -} - void state_fogcolor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { float col[4]; @@ -5376,8 +5386,7 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog_vertexpart}, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog }, NV_FOG_DISTANCE }, - { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), state_rangefog_w }, WINED3D_GL_EXT_NONE }, + { STATE_RENDER(WINED3DRS_RANGEFOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_CLIPPING), { STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_CLIPPLANEENABLE), { STATE_RENDER(WINED3DRS_CLIPPING), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_LIGHTING), { STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, WINED3D_GL_EXT_NONE },

1 0

Stefan Dösinger : ddraw/tests: Not all GPUs support dwZBufferBitDepth=24 on Windows.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: e28041c9a6935cc9dfe9dbf8d71159dbaf349895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28041c9a6935cc9dfe9dbf8d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 29 19:50:16 2011 +0200 ddraw/tests: Not all GPUs support dwZBufferBitDepth=24 on Windows. --- dlls/ddraw/tests/dsurface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index 6b23c70..12026d8 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3987,7 +3987,7 @@ static void zbufferbitdepth_test(void) } }, { - 24, ZFMT_SUPPORTED_ALWAYS, + 24, ZFMT_SUPPORTED_HWDEPENDENT, { sizeof(DDPIXELFORMAT), DDPF_ZBUFFER, 0, {24}, {0}, {0x00ffffff}, {0x00000000}, {0x00000000}

1 0

Frédéric Delanoy : cmd/tests: Add RENAME tests.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: cf826fe010f297eb1899591d60bf437677f5ca69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf826fe010f297eb1899591d6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 14 23:39:10 2011 +0200 cmd/tests: Add RENAME tests. --- programs/cmd/tests/test_builtins.cmd | 32 +++++++++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index cd30e4f..35ab181 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -879,7 +879,37 @@ rmdir "foo:" cd .. rmdir "foo bar" -echo ----------- Testing mkdir ----------- +echo ------------ Testing rename ------------ +mkdir foobar & cd foobar +echo ... ren and rename are synonymous ... +echo > foo +rename foo bar +if exist foo echo foo should be renamed! +if exist bar echo foo renamed to bar +ren bar foo +if exist bar echo bar should be renamed! +if exist foo echo bar renamed to foo +echo ... name collision ... +echo foo>foo +echo bar>bar +ren foo bar 2> nul +type foo +type bar +rem no-op +ren foo foo +mkdir baz +ren foo baz\abc +echo ... rename in other directory ... +if not exist baz\abc ( + echo rename impossible in other directory + if exist foo echo original file still present +) else ( + echo shouldn't rename in other directory! + if not exist foo echo original file not present anymore +) +cd .. & rd /s/q foobar + +echo ------------ Testing mkdir ------------ call :setError 0 echo ... md and mkdir are synonymous ... mkdir foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 19536fe..31b1780 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -594,7 +594,17 @@ r.test not found after delete, good del /q * succeeded on file1 del /q * succeeded on file2.dat ------------ Testing del /s -------------- ------------ Testing mkdir ----------- +------------ Testing rename ------------ +... ren and rename are synonymous ... +foo renamed to bar +bar renamed to foo +... name collision ... +foo +bar +... rename in other directory ... +@todo_wine@rename impossible in other directory +@todo_wine@original file still present +------------ Testing mkdir ------------ ... md and mkdir are synonymous ... 0 0

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_ps_consts_i() const.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 73a4deb0b84f6fcd66e3155b73e818e59f5740c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a4deb0b84f6fcd66e3155b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:32 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_ps_consts_i() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0bcdf8d..ed43810 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3160,7 +3160,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_ps_consts_i(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count) { UINT count = min(vector4i_count, MAX_CONST_I - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f439f73..6c31e14 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2235,7 +2235,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *devi UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count); -HRESULT __cdecl wined3d_device_get_ps_consts_i(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_raster_status(struct wined3d_device *device, UINT swapchain_idx, WINED3DRASTER_STATUS *raster_status);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_ps_consts_b() const.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: fc488f49494303e0054cfb4d8360f1bdbffdb2f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc488f49494303e0054cfb4d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:31 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_ps_consts_b() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bb4969c..0bcdf8d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3117,7 +3117,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_ps_consts_b(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count) { UINT count = min(bool_count, MAX_CONST_B - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 940246c..f439f73 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2231,7 +2231,7 @@ HRESULT __cdecl wined3d_device_get_palette_entries(struct wined3d_device *device UINT palette_idx, PALETTEENTRY *entries); struct wined3d_shader * __cdecl wined3d_device_get_pixel_shader(const struct wined3d_device *device); void __cdecl wined3d_device_get_primitive_type(struct wined3d_device *device, WINED3DPRIMITIVETYPE *primitive_topology); -HRESULT __cdecl wined3d_device_get_ps_consts_b(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_ps_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count);

1 0

Henri Verbeet : wined3d: Flush after surface updates.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: 8009a4947b35ef69923531039f5c7c159f6203c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8009a4947b35ef69923531039… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:30 2011 +0200 wined3d: Flush after surface updates. This is similar to 5d1d07abcf3deab4397a0008ae8c44493a721c6a. We need to flush to ensure resource updates are visible in other contexts, since otherwise GL doesn't make any ordering guarantees between contexts. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9116f5f..22f194a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2436,6 +2436,9 @@ void surface_upload_data(const struct wined3d_surface *surface, const struct win LEAVE_GL(); + if (wined3d_settings.strict_draw_ordering) + wglFlush(); + if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) { struct wined3d_device *device = surface->resource.device;

1 0

Henri Verbeet : ddraw: Get rid of some unused macros.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: b741cd02c3645cbc18eb59a04d3c04447a08d8b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b741cd02c3645cbc18eb59a04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:29 2011 +0200 ddraw: Get rid of some unused macros. --- dlls/ddraw/ddraw_private.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7737b12..9721915 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -242,10 +242,6 @@ IDirectDrawSurfaceImpl *unsafe_impl_from_IDirectDrawSurface7(IDirectDrawSurface7 IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture(IDirect3DTexture *iface) DECLSPEC_HIDDEN; IDirectDrawSurfaceImpl *unsafe_impl_from_IDirect3DTexture2(IDirect3DTexture2 *iface) DECLSPEC_HIDDEN; -/* Get the number of bytes per pixel for a given surface */ -#define PFGET_BPP(pf) (pf.dwFlags&DDPF_PALETTEINDEXED8?1:((pf.dwRGBBitCount+7)/8)) -#define GET_BPP(desc) PFGET_BPP(desc.ddpfPixelFormat) - #define DDRAW_INVALID_HANDLE ~0U enum ddraw_handle_type

1 0

Henri Verbeet : ddraw: Get rid of the surfaces field in IDirectDrawImpl.
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: f60b54d952d85e300eeb7142a80320436fa18c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60b54d952d85e300eeb7142a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 20:17:28 2011 +0200 ddraw: Get rid of the surfaces field in IDirectDrawImpl. --- dlls/ddraw/ddraw.c | 1 - dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/main.c | 5 ++--- dlls/ddraw/surface.c | 1 - 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index f981cf5..53230cb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2633,7 +2633,6 @@ static HRESULT ddraw_create_surface(IDirectDrawImpl *This, DDSURFACEDESC2 *pDDSD } /* Increase the surface counter, and attach the surface */ - InterlockedIncrement(&This->surfaces); list_add_head(&This->surface_list, &(*ppSurf)->surface_list_entry); TRACE("Created surface %p.\n", *ppSurf); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e0706fc..7737b12 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -114,7 +114,6 @@ struct IDirectDrawImpl * because of IParent */ struct list surface_list; - LONG surfaces; /* FVF management */ struct FvfToDecl *decls; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 38f4814..b3c19e7 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -960,9 +960,8 @@ DllMain(HINSTANCE hInstDLL, ERR("(%p) EnumSurfaces failed, prepare for trouble\n", ddraw); } - /* Check the surface count */ - if(ddraw->surfaces > 0) - ERR("DDraw %p still has %d surfaces attached\n", ddraw, ddraw->surfaces); + if (!list_empty(&ddraw->surface_list)) + ERR("DDraw %p still has surfaces attached.\n", ddraw); /* Release all hanging references to destroy the objects. This * restores the screen mode too diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 10d9dc4..1b6d6ff 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5098,7 +5098,6 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren ddraw_free_handle(&surface->ddraw->d3ddevice->handle_table, surface->Handle - 1, DDRAW_HANDLE_SURFACE); /* Reduce the ddraw surface count. */ - InterlockedDecrement(&surface->ddraw->surfaces); list_remove(&surface->surface_list_entry); HeapFree(GetProcessHeap(), 0, surface);

1 0

Andrew Eikum : winealsa.drv: Allow creation of the default device even if all real devices failed to open .
by Alexandre Julliard 15 Sep '11

15 Sep '11

Module: wine Branch: master Commit: e7a652395be382942e0392e17798e374926eba8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a652395be382942e0392e17… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 14 11:24:26 2011 -0500 winealsa.drv: Allow creation of the default device even if all real devices failed to open. --- dlls/winealsa.drv/mmdevdrv.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 1d1ce6f..e754738 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -238,7 +238,8 @@ int WINAPI AUDDRV_GetPriority(void) } static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, - UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW) + UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW, + BOOL count_failed) { static const WCHAR dashW[] = {' ','-',' ',0}; int err, device; @@ -276,6 +277,8 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, if((err = snd_pcm_open(&handle, devnode, stream, SND_PCM_NONBLOCK)) < 0){ WARN("The device \"%s\" failed to open, pretending it doesn't exist: %d (%s)\n", devnode, err, snd_strerror(err)); + if(count_failed) + ++(*num); continue; } @@ -328,7 +331,7 @@ static HRESULT alsa_get_card_devices(EDataFlow flow, WCHAR **ids, char **keys, } static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, - UINT *num) + UINT *num, BOOL count_failed) { int err, card; @@ -365,7 +368,8 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, } MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(flow, ids, keys, num, ctl, card, cardnameW); + alsa_get_card_devices(flow, ids, keys, num, ctl, card, cardnameW, + count_failed); HeapFree(GetProcessHeap(), 0, cardnameW); @@ -386,7 +390,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, TRACE("%d %p %p %p %p\n", flow, ids, keys, num, def_index); - hr = alsa_enum_devices(flow, NULL, NULL, num); + hr = alsa_enum_devices(flow, NULL, NULL, num, TRUE); if(FAILED(hr)) return hr; @@ -411,7 +415,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, memcpy((*keys)[0], defname, sizeof(defname)); *def_index = 0; - hr = alsa_enum_devices(flow, (*ids) + 1, (*keys) + 1, num); + hr = alsa_enum_devices(flow, (*ids) + 1, (*keys) + 1, num, FALSE); if(FAILED(hr)){ int i; for(i = 0; i < *num; ++i){

1 0

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