January 2012 - Wine-Commits

Henri Verbeet : wined3d: Get rid of wined3d_surface_set_format().
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: a206f43648304f3c54b03f98765677ae0b5eecd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a206f43648304f3c54b03f987… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:09 2012 +0100 wined3d: Get rid of wined3d_surface_set_format(). --- dlls/d3d8/device.c | 9 ++++++++- dlls/wined3d/surface.c | 24 ------------------------ dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.h | 1 - 4 files changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 16a0b37..043f582 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -932,6 +932,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; UINT src_w, src_h; + HRESULT hr; TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", iface, pSourceSurface, pSourceRects, cRects, pDestinationSurface, pDestPoints); @@ -961,7 +962,13 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(IDirect3DDevice8 *iface, else if (WINED3DFMT_UNKNOWN == destFormat) { TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", iface); - wined3d_surface_set_format(Dest->wined3d_surface, srcFormat); + if (FAILED(hr = wined3d_surface_update_desc(Dest->wined3d_surface, wined3d_desc.width, wined3d_desc.height, + srcFormat, wined3d_desc.multisample_type, wined3d_desc.multisample_quality))) + { + WARN("Failed to update surface desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; + } } /* Quick if complete copy ... */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2cf01f9..4945041 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3378,30 +3378,6 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, return WINED3D_OK; } -HRESULT CDECL wined3d_surface_set_format(struct wined3d_surface *surface, enum wined3d_format_id format_id) -{ - const struct wined3d_format *format = wined3d_get_format(&surface->resource.device->adapter->gl_info, format_id); - - TRACE("surface %p, format %s.\n", surface, debug_d3dformat(format_id)); - - if (surface->resource.format->id != WINED3DFMT_UNKNOWN) - { - FIXME("The format of the surface must be WINED3DFORMAT_UNKNOWN.\n"); - return WINED3DERR_INVALIDCALL; - } - - surface->resource.size = wined3d_format_calculate_size(format, surface->resource.device->surface_alignment, - surface->pow2Width, surface->pow2Height); - surface->flags |= (WINED3DFMT_D16_LOCKABLE == format_id) ? SFLAG_LOCKABLE : 0; - surface->resource.format = format; - - TRACE("size %u, byte_count %u\n", surface->resource.size, format->byte_count); - TRACE("glFormat %#x, glInternal %#x, glType %#x.\n", - format->glFormat, format->glInternal, format->glType); - - return WINED3D_OK; -} - static void convert_r32_float_r16_float(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8279aa6..f0821fb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -211,7 +211,6 @@ @ cdecl wined3d_surface_releasedc(ptr ptr) @ cdecl wined3d_surface_restore(ptr) @ cdecl wined3d_surface_set_color_key(ptr long ptr) -@ cdecl wined3d_surface_set_format(ptr long) @ cdecl wined3d_surface_set_mem(ptr ptr) @ cdecl wined3d_surface_set_overlay_position(ptr long long) @ cdecl wined3d_surface_set_palette(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b423dd8..5759f4a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2328,7 +2328,6 @@ HRESULT __cdecl wined3d_surface_releasedc(struct wined3d_surface *surface, HDC d HRESULT __cdecl wined3d_surface_restore(struct wined3d_surface *surface); HRESULT __cdecl wined3d_surface_set_color_key(struct wined3d_surface *surface, DWORD flags, const struct wined3d_color_key *color_key); -HRESULT __cdecl wined3d_surface_set_format(struct wined3d_surface *surface, enum wined3d_format_id format_id); HRESULT __cdecl wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem); HRESULT __cdecl wined3d_surface_set_overlay_position(struct wined3d_surface *surface, LONG x, LONG y); HRESULT __cdecl wined3d_surface_set_palette(struct wined3d_surface *surface, struct wined3d_palette *palette);

1 0

Henri Verbeet : include: Add some missing DDLOCK constants.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: e1f6a81a2d870e01fb66a971bfab1758c646bccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f6a81a2d870e01fb66a971b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:10 2012 +0100 include: Add some missing DDLOCK constants. --- include/ddraw.h | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/ddraw.h b/include/ddraw.h index 5b1c621..5feddf4 100644 --- a/include/ddraw.h +++ b/include/ddraw.h @@ -1397,14 +1397,18 @@ DECLARE_INTERFACE_(IDirectDraw,IUnknown) /* flags for Lock() */ -#define DDLOCK_SURFACEMEMORYPTR 0x00000000 -#define DDLOCK_WAIT 0x00000001 -#define DDLOCK_EVENT 0x00000002 -#define DDLOCK_READONLY 0x00000010 -#define DDLOCK_WRITEONLY 0x00000020 -#define DDLOCK_NOSYSLOCK 0x00000800 -#define DDLOCK_NOOVERWRITE 0x00001000 -#define DDLOCK_DISCARDCONTENTS 0x00002000 +#define DDLOCK_SURFACEMEMORYPTR __MSABI_LONG(0x00000000) +#define DDLOCK_WAIT __MSABI_LONG(0x00000001) +#define DDLOCK_EVENT __MSABI_LONG(0x00000002) +#define DDLOCK_READONLY __MSABI_LONG(0x00000010) +#define DDLOCK_WRITEONLY __MSABI_LONG(0x00000020) +#define DDLOCK_NOSYSLOCK __MSABI_LONG(0x00000800) +#define DDLOCK_NOOVERWRITE __MSABI_LONG(0x00001000) +#define DDLOCK_DISCARDCONTENTS __MSABI_LONG(0x00002000) +#define DDLOCK_OKTOSWAP __MSABI_LONG(0x00002000) +#define DDLOCK_DONOTWAIT __MSABI_LONG(0x00004000) +#define DDLOCK_HASVOLUMETEXTUREBOXRECT __MSABI_LONG(0x00008000) +#define DDLOCK_NODIRTYUPDATE __MSABI_LONG(0x00010000) /*****************************************************************************

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: 68371e848120595d5cbacbeae02adb90a2d743c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68371e848120595d5cbacbeae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 13 00:25:19 2012 +0100 po: Update German translation. --- po/de.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 6158153..594c925 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-10 23:39+0100\n" +"PO-Revision-Date: 2012-01-12 21:12+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -585,13 +585,11 @@ msgid "&Hue:" msgstr "&Farbe:" #: comdlg32.rc:290 -#, fuzzy msgctxt "Saturation" msgid "&Sat:" msgstr "&Sätt:" #: comdlg32.rc:292 -#, fuzzy msgctxt "Luminance" msgid "&Lum:" msgstr "H&ell:"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: 77882728c707f82b77177dff6f5af6efa4f34fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77882728c707f82b77177dff6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 12 21:08:52 2012 +0100 po: Update French translation. --- po/fr.po | 203 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 101 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77882728c707f82b77177…

1 0

André Hentschel : setupapi: Add stub for CM_Get_Class_Registry_PropertyW.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: 88baa9e700027b4d57cc8c5589c3a4e8843b31c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88baa9e700027b4d57cc8c558… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 12 21:05:08 2012 +0100 setupapi: Add stub for CM_Get_Class_Registry_PropertyW. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 69b35f6..3d687b3 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -53,7 +53,7 @@ @ stub CM_Get_Class_Name_ExA @ stub CM_Get_Class_Name_ExW @ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyA -@ stub CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 5c8fd80..d3825d9 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -64,7 +64,7 @@ @ stub CM_Get_Class_Name_ExA @ stub CM_Get_Class_Name_ExW @ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr long long ptr) -@ stub CM_Get_Class_Registry_PropertyW +@ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 41f6d2f..ba437b7 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -398,6 +398,16 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULON } /*********************************************************************** + * CM_Get_Class_Registry_PropertyW (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULONG regdatatype, + PVOID buf, ULONG len, ULONG flags, HMACHINE machine) +{ + FIXME("%p %u %p %p %u 0x%08x %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID buf, ULONG len,

1 0

Matteo Bruni : wined3d: Modify depth-stencil location flags only after allocating the new location .
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: cbf641e9e03b993b121f523ed397acc8c1b5dfc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf641e9e03b993b121f523ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 12 17:05:19 2012 +0100 wined3d: Modify depth-stencil location flags only after allocating the new location. --- dlls/wined3d/device.c | 16 +++++++++------- dlls/wined3d/drawprim.c | 13 ++++++++----- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1e60439..8633c65 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -600,7 +600,7 @@ static BOOL is_full_clear(const struct wined3d_surface *target, const RECT *draw } static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context *context, - DWORD location, const RECT *draw_rect, UINT rect_count, const RECT *clear_rect) + DWORD location, const RECT *draw_rect, UINT rect_count, const RECT *clear_rect, RECT *out_rect) { RECT current_rect, r; @@ -615,7 +615,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context if (EqualRect(&r, draw_rect)) { /* current_rect ⊇ draw_rect, modify only. */ - surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); + SetRect(out_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); return; } @@ -626,7 +626,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context if (!clear_rect) { /* Full clear, modify only. */ - surface_modify_ds_location(ds, location, draw_rect->right, draw_rect->bottom); + *out_rect = *draw_rect; return; } @@ -634,14 +634,14 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context if (EqualRect(&r, draw_rect)) { /* clear_rect ⊇ draw_rect, modify only. */ - surface_modify_ds_location(ds, location, draw_rect->right, draw_rect->bottom); + *out_rect = *draw_rect; return; } } /* Full load. */ surface_load_ds_location(ds, context, location); - surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); + SetRect(out_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); } /* Do not call while under the GL lock. */ @@ -656,6 +656,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count GLbitfield clear_mask = 0; BOOL render_offscreen; unsigned int i; + RECT ds_rect; /* When we're clearing parts of the drawable, make sure that the target surface is well up to date in the * drawable. After the clear we'll mark the drawable up to date, so we have to make sure that this is true @@ -701,7 +702,8 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count if (!render_offscreen && fb->depth_stencil != device->onscreen_depth_stencil) device_switch_onscreen_ds(device, context, fb->depth_stencil); - prepare_ds_clear(fb->depth_stencil, context, location, draw_rect, rect_count, clear_rect); + prepare_ds_clear(fb->depth_stencil, context, location, + draw_rect, rect_count, clear_rect, &ds_rect); } if (!context_apply_clear_state(context, device, rt_count, fb)) @@ -732,7 +734,7 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count { DWORD location = render_offscreen ? fb->depth_stencil->draw_binding : SFLAG_INDRAWABLE; - surface_modify_location(fb->depth_stencil, location, TRUE); + surface_modify_ds_location(fb->depth_stencil, location, ds_rect.right, ds_rect.bottom); glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZWRITEENABLE)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 707e364..a5e81db 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -634,11 +634,6 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId IntersectRect(&r, &draw_rect, &current_rect); if (!EqualRect(&r, &draw_rect)) surface_load_ds_location(ds, context, location); - - if (state->render_states[WINED3D_RS_ZWRITEENABLE]) - { - surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); - } } } @@ -649,6 +644,14 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId return; } + if (device->fb.depth_stencil && state->render_states[WINED3D_RS_ZWRITEENABLE]) + { + struct wined3d_surface *ds = device->fb.depth_stencil; + DWORD location = context->render_offscreen ? ds->draw_binding : SFLAG_INDRAWABLE; + + surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); + } + if ((!context->gl_info->supported[WINED3D_GL_VERSION_2_0] || (!glPointParameteri && !context->gl_info->supported[NV_POINT_SPRITE])) && context->render_offscreen

1 0

André Hentschel : setupapi: Add stub for CM_Get_Class_Registry_PropertyA.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: 0309066f15f2a6fa40f362f3b431f1869af580d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0309066f15f2a6fa40f362f3b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Jan 12 21:05:01 2012 +0100 setupapi: Add stub for CM_Get_Class_Registry_PropertyA. --- dlls/cfgmgr32/cfgmgr32.spec | 2 ++ dlls/setupapi/setupapi.spec | 2 ++ dlls/setupapi/stubs.c | 10 ++++++++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 24c4cf3..69b35f6 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -52,6 +52,8 @@ @ stub CM_Get_Class_NameW @ stub CM_Get_Class_Name_ExA @ stub CM_Get_Class_Name_ExW +@ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyA +@ stub CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index eceef49..5c8fd80 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -63,6 +63,8 @@ @ stub CM_Get_Class_NameW @ stub CM_Get_Class_Name_ExA @ stub CM_Get_Class_Name_ExW +@ stdcall CM_Get_Class_Registry_PropertyA(ptr long ptr ptr long long ptr) +@ stub CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth @ stub CM_Get_Depth_Ex @ stub CM_Get_DevNode_Registry_PropertyA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 1617f71..41f6d2f 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -388,6 +388,16 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) } /*********************************************************************** + * CM_Get_Class_Registry_PropertyA (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULONG regdatatype, + PVOID buf, ULONG len, ULONG flags, HMACHINE machine) +{ + FIXME("%p %u %p %p %u 0x%08x %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Set_Class_Registry_PropertyA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, PVOID buf, ULONG len,

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DCUBEMAP_FACES typedef.
by Alexandre Julliard Jan. 13, 2012

Jan. 13, 2012

Module: wine Branch: master Commit: a44b062aed558c7aea64c51db19e88767032517a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44b062aed558c7aea64c51db… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 12 21:43:11 2012 +0100 wined3d: Get rid of the WINED3DCUBEMAP_FACES typedef. --- dlls/d3d10core/device.c | 2 +- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 2 +- dlls/ddraw/ddraw.c | 19 ++++++++++--------- dlls/dxgi/device.c | 2 +- include/wine/wined3d.h | 21 ++++++++++----------- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 772726d..065c643 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1364,7 +1364,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) + WINED3DPOOL pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) { struct d3d10_device *device = device_from_wined3d_device_parent(device_parent); struct d3d10_texture2d *texture; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 043f582..dcdefff 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2812,7 +2812,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) + WINED3DPOOL pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) { IDirect3DDevice8Impl *device = device_from_device_parent(device_parent); IDirect3DSurface8Impl *d3d_surface; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 444d6b4..c46bd59 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3102,7 +3102,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) + WINED3DPOOL pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) { struct IDirect3DDevice9Impl *device = device_from_device_parent(device_parent); IDirect3DSurface9Impl *d3d_surface; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index c54f878..e413ae6 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5333,7 +5333,7 @@ static void CDECL device_parent_mode_changed(struct wined3d_device_parent *devic static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, - WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) + WINED3DPOOL pool, UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface) { struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); IDirectDrawSurfaceImpl *surf = NULL; @@ -5345,31 +5345,32 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * device_parent, container_parent, width, height, format, usage, pool, level, face, surface); searchcaps.dwCaps2 &= ~DDSCAPS2_CUBEMAP_ALLFACES; - switch(face) + switch (face) { - case WINED3DCUBEMAP_FACE_POSITIVE_X: + case WINED3D_CUBEMAP_FACE_POSITIVE_X: TRACE("Asked for positive x\n"); if (searchcaps.dwCaps2 & DDSCAPS2_CUBEMAP) { searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEX; } surf = ddraw->tex_root; break; - case WINED3DCUBEMAP_FACE_NEGATIVE_X: + case WINED3D_CUBEMAP_FACE_NEGATIVE_X: TRACE("Asked for negative x\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEX; break; - case WINED3DCUBEMAP_FACE_POSITIVE_Y: + case WINED3D_CUBEMAP_FACE_POSITIVE_Y: TRACE("Asked for positive y\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEY; break; - case WINED3DCUBEMAP_FACE_NEGATIVE_Y: + case WINED3D_CUBEMAP_FACE_NEGATIVE_Y: TRACE("Asked for negative y\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEY; break; - case WINED3DCUBEMAP_FACE_POSITIVE_Z: + case WINED3D_CUBEMAP_FACE_POSITIVE_Z: TRACE("Asked for positive z\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_POSITIVEZ; break; - case WINED3DCUBEMAP_FACE_NEGATIVE_Z: + case WINED3D_CUBEMAP_FACE_NEGATIVE_Z: TRACE("Asked for negative z\n"); searchcaps.dwCaps2 |= DDSCAPS2_CUBEMAP_NEGATIVEZ; break; - default: {ERR("Unexpected cube face\n");} /* Stupid compiler */ + default: + ERR("Unexpected cube face.\n"); } if (!surf) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 39c1a21..ed5aba0 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -191,7 +191,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac hr = device_parent->ops->create_surface(device_parent, NULL, desc->Width, desc->Height, wined3dformat_from_dxgi_format(desc->Format), usage, WINED3DPOOL_DEFAULT, 0, - WINED3DCUBEMAP_FACE_POSITIVE_X, &wined3d_surface); + WINED3D_CUBEMAP_FACE_POSITIVE_X, &wined3d_surface); if (FAILED(hr)) { ERR("CreateSurface failed, returning %#x\n", hr); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5759f4a..ea9493c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -648,16 +648,15 @@ enum wined3d_basis_type WINED3D_BASIS_INTERPOLATE = 2, }; -typedef enum _WINED3DCUBEMAP_FACES -{ - WINED3DCUBEMAP_FACE_POSITIVE_X = 0, - WINED3DCUBEMAP_FACE_NEGATIVE_X = 1, - WINED3DCUBEMAP_FACE_POSITIVE_Y = 2, - WINED3DCUBEMAP_FACE_NEGATIVE_Y = 3, - WINED3DCUBEMAP_FACE_POSITIVE_Z = 4, - WINED3DCUBEMAP_FACE_NEGATIVE_Z = 5, - WINED3DCUBEMAP_FACE_FORCE_DWORD = 0xffffffff -} WINED3DCUBEMAP_FACES; +enum wined3d_cubemap_face +{ + WINED3D_CUBEMAP_FACE_POSITIVE_X = 0, + WINED3D_CUBEMAP_FACE_NEGATIVE_X = 1, + WINED3D_CUBEMAP_FACE_POSITIVE_Y = 2, + WINED3D_CUBEMAP_FACE_NEGATIVE_Y = 3, + WINED3D_CUBEMAP_FACE_POSITIVE_Z = 4, + WINED3D_CUBEMAP_FACE_NEGATIVE_Z = 5, +}; typedef enum _WINED3DTEXTUREFILTERTYPE { @@ -1986,7 +1985,7 @@ struct wined3d_device_parent_ops void (__cdecl *mode_changed)(struct wined3d_device_parent *device_parent); HRESULT (__cdecl *create_surface)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, DWORD usage, WINED3DPOOL pool, - UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface); + UINT level, enum wined3d_cubemap_face face, struct wined3d_surface **surface); HRESULT (__cdecl *create_rendertarget)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, enum wined3d_multisample_type multisample_type, DWORD multisample_quality, BOOL lockable, struct wined3d_surface **surface);

1 0

Francois Gouget : winhlp32: Standardize the 'Not yet implemented' messages.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

1 0

Jacek Caban : jscript: Run sanity check with invoke_version 0.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: afcb9a013067d5bcaf04bdba6e186e0f5977b156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcb9a013067d5bcaf04bdba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 12 13:43:38 2012 +0100 jscript: Run sanity check with invoke_version 0. --- dlls/jscript/tests/run.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 66f70b9..e5bd072 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -108,7 +108,7 @@ static const CHAR test_valA[] = "testVal"; static BOOL strict_dispid_check; static const char *test_name = "(null)"; static IDispatch *script_disp; -static int invoke_version = 2; +static int invoke_version; static IActiveScriptError *script_error; /* Returns true if the user interface is in English. Note that this does not @@ -1680,6 +1680,7 @@ START_TEST(run) if(!check_jscript()) { win_skip("Broken engine, probably too old\n"); }else if(argc > 2) { + invoke_version = 2; run_from_file(argv[2]); }else { trace("invoke version 0\n");

1 0