January 2012 - Wine-commits

Francois Gouget : po: Remove English strings from the Esperanto translation .
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: dc1473dd6ad65fae4c6c011439ed8b5054fea102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc1473dd6ad65fae4c6c01143… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jan 19 00:22:45 2012 +0100 po: Remove English strings from the Esperanto translation. --- po/eo.po | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/po/eo.po b/po/eo.po index eb518eb..e3a6994 100644 --- a/po/eo.po +++ b/po/eo.po @@ -478,7 +478,7 @@ msgstr "&Implicita Presilo" #: comdlg32.rc:223 msgid "[none]" -msgstr "[none]" +msgstr "" #: comdlg32.rc:224 msgid "Specific &Printer" @@ -7139,7 +7139,7 @@ msgstr "Vere" #: oleaut32.rc:28 oleview.rc:145 msgid "False" -msgstr "False" +msgstr "" #: oleaut32.rc:31 msgid "On" @@ -7531,7 +7531,7 @@ msgstr "" #: shdoclc.rc:100 shell32.rc:94 msgid "&Select" -msgstr "&Select" +msgstr "" #: shdoclc.rc:102 msgid "&Cell" @@ -7850,11 +7850,11 @@ msgstr "Pri %s" #: shell32.rc:333 msgid "Wine &license" -msgstr "Wine &license" +msgstr "" #: shell32.rc:338 msgid "Running on %s" -msgstr "Running on %s" +msgstr "" #: shell32.rc:339 msgid "Wine was brought to you by:" @@ -7903,15 +7903,15 @@ msgstr "Komentario" #: shell32.rc:143 msgid "Owner" -msgstr "Owner" +msgstr "" #: shell32.rc:144 msgid "Group" -msgstr "Group" +msgstr "" #: shell32.rc:145 msgid "Original location" -msgstr "Original location" +msgstr "" #: shell32.rc:146 msgid "Date deleted" @@ -8401,11 +8401,11 @@ msgstr "&Ignoru" #: user32.rc:84 msgid "&Try Again" -msgstr "&Try Again" +msgstr "" #: user32.rc:85 msgid "&Continue" -msgstr "&Continue" +msgstr "" #: user32.rc:91 msgid "Select Window" @@ -10091,7 +10091,7 @@ msgstr "Seræu sekvanta\tF3" #: notepad.rc:55 wordpad.rc:52 msgid "&Replace...\tCtrl+H" -msgstr "&Replace...\tCtrl+H" +msgstr "" #: notepad.rc:58 progman.rc:53 regedit.rc:78 winefile.rc:86 #, fuzzy @@ -10592,7 +10592,7 @@ msgstr "&Aløustigu la fenestron" #: progman.rc:41 taskmgr.rc:41 winefile.rc:63 winhlp32.rc:44 msgid "&Options" -msgstr "&Options" +msgstr "" #: progman.rc:42 msgid "&Arrange automatically" @@ -13412,15 +13412,15 @@ msgstr "" #: winhlp32.rc:48 winhlp32.rc:69 msgid "Small" -msgstr "Small" +msgstr "" #: winhlp32.rc:49 winhlp32.rc:70 msgid "Normal" -msgstr "Normal" +msgstr "" #: winhlp32.rc:50 winhlp32.rc:71 msgid "Large" -msgstr "Large" +msgstr "" #: winhlp32.rc:54 #, fuzzy @@ -13465,7 +13465,7 @@ msgstr "Eraro dum la legado de helpdosiero `%s'" #: winhlp32.rc:85 msgid "Summary" -msgstr "Summary" +msgstr "" #: winhlp32.rc:84 msgid "&Index"

1 0

Michael Stefaniuc : dsound: Get rid of some LPDIRECTSOUND3DBUFFER usage.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: a5d212002121b366ba6857e8d993e9173f352b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d212002121b366ba6857e8d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 19 01:13:04 2012 +0100 dsound: Get rid of some LPDIRECTSOUND3DBUFFER usage. --- dlls/dsound/sound3d.c | 109 ++++++++++++++++++------------------------------- 1 files changed, 40 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5d212002121b366ba685…

1 0

Michael Stefaniuc : dsound: Merge IDirectSound3DBuffer into the secondary buffer object.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: e0d81e55e22eff4f2be3926dfa6c1745b9438e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d81e55e22eff4f2be3926df… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 19 01:18:30 2012 +0100 dsound: Merge IDirectSound3DBuffer into the secondary buffer object. --- dlls/dsound/buffer.c | 22 +-- dlls/dsound/dsound_private.h | 22 +--- dlls/dsound/sound3d.c | 369 +++++++++++++++++++----------------------- 3 files changed, 174 insertions(+), 239 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e0d81e55e22eff4f2be39…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 478273849743be5b4710af2130166f71331231b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=478273849743be5b4710af213… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jan 19 10:26:55 2012 +0100 po: Update French translation. --- po/fr.po | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/po/fr.po b/po/fr.po index 564e377..35e1c8c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -13386,6 +13386,7 @@ msgstr "Erreur lors de l'enregistrement" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." msgstr "" +"Chargement des informations détaillées en cours ; veuillez patienter..." #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Akihiro Sagawa : wined3d: Let GetRasterStatus return D3D_OK, again.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: bd97589dbac60d1ed78ed1e49cf6ce6cee8c40b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd97589dbac60d1ed78ed1e49… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 18 23:33:53 2012 +0900 wined3d: Let GetRasterStatus return D3D_OK, again. --- dlls/wined3d/swapchain.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index de31fd3..3e3451d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -206,19 +206,46 @@ HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain struct wined3d_raster_status *raster_status) { static BOOL warned; + LARGE_INTEGER counter, freq_per_sec; + LONGLONG freq_per_frame, freq_per_line; + struct wined3d_display_mode mode; + /* No OpenGL equivalent */ if (!warned) { - FIXME("swapchain %p, raster_status %p stub!\n", swapchain, raster_status); + FIXME("swapchain %p, raster_status %p semi-stub!\n", swapchain, raster_status); warned = TRUE; } /* Obtaining the raster status is a widely implemented but optional * feature. When this method returns OK StarCraft 2 expects the - * raster_status->InVBlank value to actually change over time. To prevent - * StarCraft 2 from running in an infinite loop at startup this method - * returns INVALIDCALL. */ - return WINED3DERR_INVALIDCALL; + * raster_status->InVBlank value to actually change over time. + * And Endless Alice Crysis doesn't care even if this method fails. + * Thus this method returns OK and fakes raster_status by + * QueryPerformanceCounter. */ + + if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) + return WINED3DERR_INVALIDCALL; + + if (FAILED(wined3d_swapchain_get_display_mode(swapchain, &mode))) + return WINED3DERR_INVALIDCALL; + if (mode.refresh_rate == DEFAULT_REFRESH_RATE) + mode.refresh_rate = 60; + + freq_per_frame = freq_per_sec.QuadPart / mode.refresh_rate; + /* Assume 20 scan lines in the vertical blank */ + freq_per_line = freq_per_frame / (mode.height + 20); + raster_status->scan_line = (counter.QuadPart % freq_per_frame) / freq_per_line; + if (raster_status->scan_line < mode.height) + raster_status->in_vblank = FALSE; + else + { + raster_status->scan_line = 0; + raster_status->in_vblank = TRUE; + } + TRACE("Returning fake value, in_vblank %u, scan_line %u.\n", + raster_status->in_vblank, raster_status->scan_line); + return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: ddeff9815cbf5266ee38d476d3f417cc7b176017 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddeff9815cbf5266ee38d476d… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jan 18 22:31:37 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index 381571b..ba307b9 100644 --- a/po/lt.po +++ b/po/lt.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-17 22:20+0300\n" +"PO-Revision-Date: 2012-01-18 22:31+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -13250,7 +13250,7 @@ msgstr "Nepavyko išsaugoti" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "Įkeliama išsami informacija, prašome palaukti..." #: winefile.rc:26 msgid "&Open\tEnter"

1 0

Henri Verbeet : wined3d: Get rid of the mostly unused blockType field in struct wined3d_stateblock.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: e1cd2453b9756077d51473f71ba370bc73030001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1cd2453b9756077d51473f71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:18 2012 +0100 wined3d: Get rid of the mostly unused blockType field in struct wined3d_stateblock. --- dlls/wined3d/stateblock.c | 6 +----- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b00fb84..304a326 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -924,8 +924,7 @@ HRESULT CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblo unsigned int i; DWORD map; - TRACE("Applying stateblock %p of type %#x to device %p.\n", - stateblock, stateblock->blockType, device); + TRACE("Applying stateblock %p to device %p.\n", stateblock, device); if (stateblock->changed.vertexShader) wined3d_device_set_vertex_shader(device, stateblock->state.vertex_shader); @@ -1105,8 +1104,6 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) TRACE("stateblock %p.\n", stateblock); - stateblock->blockType = WINED3D_SBT_INIT; - memset(stateblock->changed.pixelShaderConstantsF, 0, device->d3d_pshader_constantF * sizeof(BOOL)); memset(stateblock->changed.vertexShaderConstantsF, 0, device->d3d_vshader_constantF * sizeof(BOOL)); @@ -1344,7 +1341,6 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - stateblock->blockType = type; for (i = 0; i < LIGHTMAP_SIZE; i++) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9d1208..5ca9d23 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2310,7 +2310,6 @@ struct wined3d_stateblock { LONG ref; /* Note: Ref counting not required */ struct wined3d_device *device; - enum wined3d_stateblock_type blockType; /* Array indicating whether things have been set or changed */ struct wined3d_saved_states changed;

1 0

Henri Verbeet : wined3d: Respect SFLAG_PIN_SYSMEM when creating a surface DIB section.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: d0d094dea21152d2b645282b7387f8e0b4409896 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d094dea21152d2b645282b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:19 2012 +0100 wined3d: Respect SFLAG_PIN_SYSMEM when creating a surface DIB section. --- dlls/wined3d/surface.c | 23 ++++++++++++++++------- 1 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index df5855e..f38c148 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -514,9 +514,6 @@ static HRESULT surface_create_dib_section(struct wined3d_surface *surface) surface->flags |= SFLAG_DIBSECTION; - HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); - surface->resource.heapMemory = NULL; - return WINED3D_OK; } @@ -1986,9 +1983,17 @@ static void gdi_surface_map(struct wined3d_surface *surface, const RECT *rect, D if (!(surface->flags & SFLAG_DIBSECTION)) { + HRESULT hr; + /* This happens on gdi surfaces if the application set a user pointer * and resets it. Recreate the DIB section. */ - surface_create_dib_section(surface); + if (FAILED(hr = surface_create_dib_section(surface))) + { + ERR("Failed to create dib section, hr %#x.\n", hr); + return; + } + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.heapMemory = NULL; surface->resource.allocatedMemory = surface->dib.bitmap_data; } } @@ -3843,8 +3848,12 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) return WINED3DERR_INVALIDCALL; /* Use the DIB section from now on if we are not using a PBO. */ - if (!(surface->flags & SFLAG_PBO)) + if (!(surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + { + HeapFree(GetProcessHeap(), 0, surface->resource.heapMemory); + surface->resource.heapMemory = NULL; surface->resource.allocatedMemory = surface->dib.bitmap_data; + } } /* Map the surface. */ @@ -3857,7 +3866,7 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) /* Sync the DIB with the PBO. This can't be done earlier because Map() * activates the allocatedMemory. */ - if (surface->flags & SFLAG_PBO) + if (surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); if (surface->resource.format->id == WINED3DFMT_P8_UINT @@ -3920,7 +3929,7 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) } /* Copy the contents of the DIB over to the PBO. */ - if ((surface->flags & SFLAG_PBO) && surface->resource.allocatedMemory) + if ((surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) && surface->resource.allocatedMemory) memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->resource.size); /* We locked first, so unlock now. */

1 0

Henri Verbeet : ddraw: Just pin all version 1 surfaces.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 67d4be0347f39e5c6b8536dcaa91b405ed359b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d4be0347f39e5c6b8536dca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:20 2012 +0100 ddraw: Just pin all version 1 surfaces. --- dlls/ddraw/surface.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 60f29dc..595d141 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5474,15 +5474,16 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; } + /* Some applications assume surfaces will always be mapped at the same + * address. Some of those also assume that this address is valid even when + * the surface isn't mapped, and that updates done this way will be + * visible on the screen. The game Nox is such an application, + * Commandos: Behind Enemy Lines is another. */ + if (version == 1) + flags |= WINED3D_SURFACE_PIN_SYSMEM; + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* Some applications assume that the primary surface will always be - * mapped at the same address. Some of those also assume that this - * address is valid even when the surface isn't mapped, and that - * updates done this way will be visible on the screen. The game Nox - * is such an application. */ - if (version == 1) - flags |= WINED3D_SURFACE_PIN_SYSMEM; usage |= WINED3DUSAGE_RENDERTARGET; desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; }

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DDECLMETHOD typedef.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: c35c30fa6883025e873c8630073d59876d464d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35c30fa6883025e873c86300… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:21 2012 +0100 wined3d: Get rid of the WINED3DDECLMETHOD typedef. --- dlls/d3d10core/inputlayout.c | 2 +- dlls/d3d8/vertexdeclaration.c | 2 +- dlls/wined3d/utils.c | 22 ++++++++++++---------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 20 ++++++++++---------- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index dfc4ad7..d6ae787 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -80,7 +80,7 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME e->input_slot = f->InputSlot; e->offset = f->AlignedByteOffset; e->output_slot = is.elements[j].register_idx; - e->method = WINED3DDECLMETHOD_DEFAULT; + e->method = WINED3D_DECL_METHOD_DEFAULT; e->usage = 0; e->usage_idx = 0; diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 7ca8783..659256f 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -335,7 +335,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 element->input_slot = stream; element->offset = offset; element->output_slot = reg; - element->method = WINED3DDECLMETHOD_DEFAULT; + element->method = WINED3D_DECL_METHOD_DEFAULT; element->usage = wined3d_usage_lookup[reg].usage; element->usage_idx = wined3d_usage_lookup[reg].usage_idx; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 35775df..879015e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1934,19 +1934,21 @@ const char *debug_d3dusagequery(DWORD usagequery) return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } -const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method) { - switch (method) { +const char *debug_d3ddeclmethod(enum wined3d_decl_method method) +{ + switch (method) + { #define WINED3DDECLMETHOD_TO_STR(u) case u: return #u - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_DEFAULT); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALU); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALV); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_CROSSUV); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_UV); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUP); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUPPRESAMPLED); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_DEFAULT); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_PARTIAL_U); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_PARTIAL_V); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_CROSS_UV); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_UV); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_LOOKUP); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_LOOKUP_PRESAMPLED); #undef WINED3DDECLMETHOD_TO_STR default: - FIXME("Unrecognized %u declaration method!\n", method); + FIXME("Unrecognized declaration method %#x.\n", method); return "unrecognized"; } } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 576fe7c..6539964 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -289,7 +289,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].input_slot = 0; elements[idx].offset = offset; elements[idx].output_slot = 0; - elements[idx].method = WINED3DDECLMETHOD_DEFAULT; + elements[idx].method = WINED3D_DECL_METHOD_DEFAULT; elements[idx].usage = usage; elements[idx].usage_idx = usage_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ca9d23..9efbdb0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,7 +2491,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_H const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN; const char *debug_d3dusage(DWORD usage) DECLSPEC_HIDDEN; const char *debug_d3dusagequery(DWORD usagequery) DECLSPEC_HIDDEN; -const char *debug_d3ddeclmethod(WINED3DDECLMETHOD method) DECLSPEC_HIDDEN; +const char *debug_d3ddeclmethod(enum wined3d_decl_method method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(BYTE usage) DECLSPEC_HIDDEN; const char *debug_d3dprimitivetype(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; const char *debug_d3drenderstate(enum wined3d_render_state state) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f1e389d..e82b721 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -719,16 +719,16 @@ enum wined3d_stateblock_type WINED3D_SBT_RECORDED = 4, /* WineD3D private */ }; -typedef enum _WINED3DDECLMETHOD -{ - WINED3DDECLMETHOD_DEFAULT = 0, - WINED3DDECLMETHOD_PARTIALU = 1, - WINED3DDECLMETHOD_PARTIALV = 2, - WINED3DDECLMETHOD_CROSSUV = 3, - WINED3DDECLMETHOD_UV = 4, - WINED3DDECLMETHOD_LOOKUP = 5, - WINED3DDECLMETHOD_LOOKUPPRESAMPLED = 6 -} WINED3DDECLMETHOD; +enum wined3d_decl_method +{ + WINED3D_DECL_METHOD_DEFAULT = 0, + WINED3D_DECL_METHOD_PARTIAL_U = 1, + WINED3D_DECL_METHOD_PARTIAL_V = 2, + WINED3D_DECL_METHOD_CROSS_UV = 3, + WINED3D_DECL_METHOD_UV = 4, + WINED3D_DECL_METHOD_LOOKUP = 5, + WINED3D_DECL_METHOD_LOOKUP_PRESAMPLED = 6, +}; typedef enum _WINED3DDECLUSAGE {

1 0