May 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/monthcal: Added support for MCS_SHORTDAYSOFWEEK style.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 7912acaab91d9ee5c88ac5bba6f45fc8b01a26b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7912acaab91d9ee5c88ac5bba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:07 2016 +0300 comctl32/monthcal: Added support for MCS_SHORTDAYSOFWEEK style. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 19 +++++++++++++++---- include/commctrl.rh | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9d5b42e..92e5367 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1156,6 +1156,18 @@ static void MONTHCAL_PaintLeadTrailMonths(const MONTHCAL_INFO *infoPtr, HDC hdc, } } +static int get_localized_dayname(const MONTHCAL_INFO *infoPtr, unsigned int day, WCHAR *buff, unsigned int count) +{ + LCTYPE lctype; + + if (infoPtr->dwStyle & MCS_SHORTDAYSOFWEEK) + lctype = LOCALE_SSHORTESTDAYNAME1 + day; + else + lctype = LOCALE_SABBREVDAYNAME1 + day; + + return GetLocaleInfoW(LOCALE_USER_DEFAULT, lctype, buff, count); +} + /* paint a calendar area */ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { @@ -1196,7 +1208,7 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const i = infoPtr->firstDay; for(j = 0; j < 7; j++) { - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + (i+j+6)%7, buf, countof(buf)); + get_localized_dayname(infoPtr, (i + j + 6) % 7, buf, countof(buf)); DrawTextW(hdc, buf, strlenW(buf), &r, DT_CENTER | DT_VCENTER | DT_SINGLELINE); OffsetRect(&r, infoPtr->width_increment, 0); } @@ -2500,8 +2512,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) size.cx = sz.cx = 0; for (i = 0; i < 7; i++) { - if(GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, - buff, countof(buff))) + if (get_localized_dayname(infoPtr, i, buff, countof(buff))) { GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz); if (sz.cx > size.cx) size.cx = sz.cx; @@ -2703,7 +2714,7 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, infoPtr->dwStyle = lpss->styleNew; /* make room for week numbers */ - if ((lpss->styleNew ^ lpss->styleOld) & MCS_WEEKNUMBERS) + if ((lpss->styleNew ^ lpss->styleOld) & (MCS_WEEKNUMBERS | MCS_SHORTDAYSOFWEEK)) MONTHCAL_UpdateSize(infoPtr); return 0; diff --git a/include/commctrl.rh b/include/commctrl.rh index 863e141..b778ee7 100644 --- a/include/commctrl.rh +++ b/include/commctrl.rh @@ -186,6 +186,7 @@ #define MCS_NOTODAY 0x0010 #define MCS_NOTODAYCIRCLE 0x0008 #define MCS_NOTRAILINGDATES 0x0040 +#define MCS_SHORTDAYSOFWEEK 0x0080 /* Datetime Control */ #define DTS_SHORTDATEFORMAT 0x0000

1 0

Nikolay Sivov : comctl32/monthcal: Take into account day name width when setting calendar column width.
by Alexandre Julliard 18 May '16

18 May '16

Module: wine Branch: master Commit: 2f2651a14eb4b5035b5ca19862ce7ca8cc0ee81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f2651a14eb4b5035b5ca1986… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 21:21:08 2016 +0300 comctl32/monthcal: Take into account day name width when setting calendar column width. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 92e5367..36acb41 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -118,7 +118,6 @@ typedef struct HFONT hFont; HFONT hBoldFont; int textHeight; - int textWidth; int height_increment; int width_increment; INT delta; /* scroll rate; # of months that the */ @@ -2494,9 +2493,10 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) INT xdiv, dx, dy, i, j, x, y, c_dx, c_dy; WCHAR buff[80]; TEXTMETRICW tm; - SIZE size, sz; + INT day_width; RECT client; HFONT font; + SIZE size; HDC hdc; GetClientRect(infoPtr->hwndSelf, &client); @@ -2508,27 +2508,30 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) GetTextMetricsW(hdc, &tm); infoPtr->textHeight = tm.tmHeight + tm.tmExternalLeading + tm.tmInternalLeading; - /* find largest abbreviated day name for current locale */ - size.cx = sz.cx = 0; + /* find widest day name for current locale and font */ + day_width = 0; for (i = 0; i < 7; i++) { + SIZE sz; + if (get_localized_dayname(infoPtr, i, buff, countof(buff))) { GetTextExtentPoint32W(hdc, buff, lstrlenW(buff), &sz); - if (sz.cx > size.cx) size.cx = sz.cx; + if (sz.cx > day_width) day_width = sz.cx; } else /* locale independent fallback on failure */ { - static const WCHAR SunW[] = { 'S','u','n',0 }; - - GetTextExtentPoint32W(hdc, SunW, lstrlenW(SunW), &size); + static const WCHAR sunW[] = { 'S','u','n' }; + GetTextExtentPoint32W(hdc, sunW, countof(sunW), &sz); + day_width = sz.cx; break; } } - infoPtr->textWidth = size.cx + 2; + day_width += 2; /* recalculate the height and width increments and offsets */ + size.cx = 0; GetTextExtentPoint32W(hdc, O0W, 2, &size); /* restore the originally selected font */ @@ -2537,7 +2540,7 @@ static void MONTHCAL_UpdateSize(MONTHCAL_INFO *infoPtr) xdiv = (infoPtr->dwStyle & MCS_WEEKNUMBERS) ? 8 : 7; - infoPtr->width_increment = size.cx * 2 + 4; + infoPtr->width_increment = max(day_width, size.cx * 2 + 4); infoPtr->height_increment = infoPtr->textHeight; /* calculate title area */

1 0

Frédéric Delanoy : French translation for release 1.9.10
by Jeremy Newman 18 May '16

18 May '16

Module: website Branch: master Commit: a1a9525fb8c3ab31b5a69aa4f67588ea3afa3a5b URL: http://source.winehq.org/git/website.git/?a=commit;h=a1a9525fb8c3ab31b5a69a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed May 18 11:43:30 2016 +0200 French translation for release 1.9.10 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016051701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016051701.xml b/news/fr/2016051701.xml new file mode 100644 index 0000000..41ffbd2 --- /dev/null +++ b/news/fr/2016051701.xml @@ -0,0 +1,15 @@ +<news> +<date>17 mai 2016</date> +<title>Sortie de Wine 1.9.10</title> +<body> +La version de développement 1.9.10 de Wine est disponible. +<a href="{$root}/announce/1.9.10">Nouveautés</a> de cette version : +<ul> + <li>Option de rendu haute résolution (« Retina ») sous Mac OS X.</li> + <li>Énumération de répertoires plus compatible.</li> + <li>Quelques correctifs dans le moteur d'exécution C++.</li> + <li>Améliorations dans la sortie vidéo.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.10.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Józef Kucia : ddraw/tests: Test creating flippable cubemaps.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 76d4f54c558c8e3760f730247df3cd8703b806a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d4f54c558c8e3760f730247… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:29 2016 +0200 ddraw/tests: Test creating flippable cubemaps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 424235f..133d105 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5991,6 +5991,8 @@ static void test_flip(void) IDirectDrawSurface7 *frontbuffer, *backbuffer1, *backbuffer2, *backbuffer3, *surface; DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; DDSURFACEDESC2 surface_desc; + D3DDEVICEDESC7 device_desc; + IDirect3DDevice7 *device; BOOL sysmem_primary; IDirectDraw7 *ddraw; DWORD expected_caps; @@ -6227,6 +6229,54 @@ static void test_flip(void) IDirectDrawSurface7_Release(frontbuffer); } + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create 3D device.\n"); + goto done; + } + hr = IDirect3DDevice7_GetCaps(device, &device_desc); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + IDirect3DDevice7_Release(device); + if (!(device_desc.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("Cubemaps are not supported.\n"); + goto done; + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_COMPLEX | DDSCAPS_FLIP | DDSCAPS_TEXTURE; + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + surface_desc.dwBackBufferCount = 3; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_FLIP; + surface_desc.dwFlags |= DDSD_BACKBUFFERCOUNT; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_COMPLEX; + surface_desc.ddsCaps.dwCaps |= DDSCAPS_FLIP; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + + surface_desc.ddsCaps.dwCaps |= DDSCAPS_COMPLEX; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + surface_desc.dwBackBufferCount = 1; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + surface_desc.dwBackBufferCount = 0; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &frontbuffer, NULL); + ok(hr == DDERR_INVALIDCAPS, "Got unexpected hr %#x.\n", hr); + +done: refcount = IDirectDraw7_Release(ddraw); ok(refcount == 0, "The ddraw object was not properly freed, refcount %u.\n", refcount); DestroyWindow(window);

1 0

Józef Kucia : wined3d: Implement SM4 round_ne instruction.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: b922dcc6f143d6470d2ba1ad367d67c952113739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b922dcc6f143d6470d2ba1ad3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:30 2016 +0200 wined3d: Implement SM4 round_ne instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 266f5f5..3c59dd1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5352,6 +5352,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RESINFO */ NULL, /* WINED3DSIH_RET */ shader_hw_ret, + /* WINED3DSIH_ROUND_NE */ NULL, /* WINED3DSIH_ROUND_NI */ NULL, /* WINED3DSIH_ROUND_PI */ NULL, /* WINED3DSIH_ROUND_Z */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f8c4a99..9236bf6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3329,6 +3329,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IMIN: instruction = "min"; break; case WINED3DSIH_MAX: instruction = "max"; break; case WINED3DSIH_MIN: instruction = "min"; break; + case WINED3DSIH_ROUND_NE: instruction = "roundEven"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; case WINED3DSIH_ROUND_PI: instruction = "ceil"; break; case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; @@ -8255,6 +8256,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RESINFO */ shader_glsl_resinfo, /* WINED3DSIH_RET */ shader_glsl_ret, + /* WINED3DSIH_ROUND_NE */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_PI */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_Z */ shader_glsl_map2gl, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8f8b727..f8c335c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -157,6 +157,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_REP */ "rep", /* WINED3DSIH_RESINFO */ "resinfo", /* WINED3DSIH_RET */ "ret", + /* WINED3DSIH_ROUND_NE */ "round_ne", /* WINED3DSIH_ROUND_NI */ "round_ni", /* WINED3DSIH_ROUND_PI */ "round_pi", /* WINED3DSIH_ROUND_Z */ "round_z", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 35e6659..b922012 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -157,6 +157,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_OR = 0x3c, WINED3D_SM4_OP_RESINFO = 0x3d, WINED3D_SM4_OP_RET = 0x3e, + WINED3D_SM4_OP_ROUND_NE = 0x40, WINED3D_SM4_OP_ROUND_NI = 0x41, WINED3D_SM4_OP_ROUND_PI = 0x42, WINED3D_SM4_OP_ROUND_Z = 0x43, @@ -656,6 +657,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_OR, WINED3DSIH_OR, "u", "uu"}, {WINED3D_SM4_OP_RESINFO, WINED3DSIH_RESINFO, "f", "iR"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, + {WINED3D_SM4_OP_ROUND_NE, WINED3DSIH_ROUND_NE, "f", "f"}, {WINED3D_SM4_OP_ROUND_NI, WINED3DSIH_ROUND_NI, "f", "f"}, {WINED3D_SM4_OP_ROUND_PI, WINED3DSIH_ROUND_PI, "f", "f"}, {WINED3D_SM4_OP_ROUND_Z, WINED3DSIH_ROUND_Z, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 274f620..59c5800 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -647,6 +647,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_REP, WINED3DSIH_RESINFO, WINED3DSIH_RET, + WINED3DSIH_ROUND_NE, WINED3DSIH_ROUND_NI, WINED3DSIH_ROUND_PI, WINED3DSIH_ROUND_Z,

1 0

Józef Kucia : d3d11: Fix default view descriptions for 2D array textures.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 445ed18b729c8b72fed18b5c919f40a8aab25e67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=445ed18b729c8b72fed18b5c9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:31 2016 +0200 d3d11: Fix default view descriptions for 2D array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 4 ++-- dlls/d3d11/tests/d3d11.c | 4 ++-- dlls/d3d11/view.c | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7c66fe2..133d64b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1307,7 +1307,7 @@ static void test_create_depthstencil_view(void) U(dsv_desc).Texture2DArray.MipSlice); ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", U(dsv_desc).Texture2DArray.FirstArraySlice); - todo_wine ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, + ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); ID3D10DepthStencilView_Release(dsview); @@ -1518,7 +1518,7 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Texture2DArray.MipSlice); ok(!U(rtv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", U(rtv_desc).Texture2DArray.FirstArraySlice); - todo_wine ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", + ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", U(rtv_desc).Texture2DArray.ArraySize); ID3D10RenderTargetView_Release(rtview); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 03b6113..86f1d24 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1835,7 +1835,7 @@ static void test_create_depthstencil_view(void) U(dsv_desc).Texture2DArray.MipSlice); ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", U(dsv_desc).Texture2DArray.FirstArraySlice); - todo_wine ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, + ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize); ID3D11DepthStencilView_Release(dsview); @@ -2047,7 +2047,7 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Texture2DArray.MipSlice); ok(!U(rtv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n", U(rtv_desc).Texture2DArray.FirstArraySlice); - todo_wine ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", + ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n", U(rtv_desc).Texture2DArray.ArraySize); ID3D11RenderTargetView_Release(rtview); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index c4487d3..5d37d03 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -60,7 +60,7 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1DARRAY; desc->u.Texture1DArray.MipSlice = 0; desc->u.Texture1DArray.FirstArraySlice = 0; - desc->u.Texture1DArray.ArraySize = 1; + desc->u.Texture1DArray.ArraySize = texture_desc.ArraySize; } return S_OK; @@ -100,13 +100,13 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DARRAY; desc->u.Texture2DArray.MipSlice = 0; desc->u.Texture2DArray.FirstArraySlice = 0; - desc->u.Texture2DArray.ArraySize = 1; + desc->u.Texture2DArray.ArraySize = texture_desc.ArraySize; } else { desc->ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY; desc->u.Texture2DMSArray.FirstArraySlice = 0; - desc->u.Texture2DMSArray.ArraySize = 1; + desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize; } } @@ -156,7 +156,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1DARRAY; desc->u.Texture1DArray.MipSlice = 0; desc->u.Texture1DArray.FirstArraySlice = 0; - desc->u.Texture1DArray.ArraySize = 1; + desc->u.Texture1DArray.ArraySize = texture_desc.ArraySize; } return S_OK; @@ -197,13 +197,13 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY; desc->u.Texture2DArray.MipSlice = 0; desc->u.Texture2DArray.FirstArraySlice = 0; - desc->u.Texture2DArray.ArraySize = 1; + desc->u.Texture2DArray.ArraySize = texture_desc.ArraySize; } else { desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY; desc->u.Texture2DMSArray.FirstArraySlice = 0; - desc->u.Texture2DMSArray.ArraySize = 1; + desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize; } }

1 0

Francois Gouget : wined3d: Make wined3d_texture_set_dirty() static.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 08736f50486e60489b86b15acc19010ec5375814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08736f50486e60489b86b15ac… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:39:46 2016 +0200 wined3d: Make wined3d_texture_set_dirty() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3a03bb6..53dbb2f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -116,6 +116,11 @@ void wined3d_texture_validate_location(struct wined3d_texture *texture, TRACE("New locations flags are %s.\n", wined3d_debug_location(sub_resource->locations)); } +static void wined3d_texture_set_dirty(struct wined3d_texture *texture) +{ + texture->flags &= ~(WINED3D_TEXTURE_RGB_VALID | WINED3D_TEXTURE_SRGB_VALID); +} + void wined3d_texture_invalidate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) { @@ -430,11 +435,6 @@ void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined wined3d_resource_update_draw_binding(&texture->resource); } -void wined3d_texture_set_dirty(struct wined3d_texture *texture) -{ - texture->flags &= ~(WINED3D_TEXTURE_RGB_VALID | WINED3D_TEXTURE_SRGB_VALID); -} - /* Context activation is done by the caller. */ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 59c5800..7ac0319 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2586,7 +2586,6 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

1 0

Andrey Gusev : d3d11/tests: Fix a typo in define.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: a41519d2a3405702fc77cdae875a1a9d8c64cf3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a41519d2a3405702fc77cdae8… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 14:30:27 2016 +0300 d3d11/tests: Fix a typo in define. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 86f1d24..591a009 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -239,7 +239,7 @@ static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, check_texture_sub_resource_color_(line, texture, sub_resource_idx, expected_color, max_diff); } -#define check_texture_sub_resource_float(t, s, c, d) check_texture_sub_resource_flot_(__LINE__, t, s, c, d) +#define check_texture_sub_resource_float(t, s, c, d) check_texture_sub_resource_float_(__LINE__, t, s, c, d) static void check_texture_sub_resource_float_(unsigned int line, ID3D11Texture2D *texture, unsigned int sub_resource_idx, float expected_value, BYTE max_diff) {

1 0

Andrey Gusev : msvcp90: Fix a typo in comment.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 2b8bfcc79a1747bfd484d9fc04c55d6331bf9867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8bfcc79a1747bfd484d9fc0… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 17 13:23:26 2016 +0300 msvcp90: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 06b2ca1..96f2221 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -6311,7 +6311,7 @@ num_get* num_get_char_use_facet(const locale *loc) * Updates first so it points past the number, all digits are skipped. * Returns how exponent needs to changed. * Size of dest buffer is not specified, assuming it's not smaller than 32: - * strlen(+0.e+) + 22(digits) + 4(expontent) + 1(nullbyte) + * strlen(+0.e+) + 22(digits) + 4(exponent) + 1(nullbyte) */ int __cdecl num_get_char__Getffld(const num_get *this, char *dest, istreambuf_iterator_char *first, istreambuf_iterator_char *last, const locale *loc)

1 0

Andrey Gusev : ole32: Fix a typo in comment.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: e6199d6640a67051fc9f9c24d7b969e38e0fb940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6199d6640a67051fc9f9c24d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 17 13:57:42 2016 +0300 ole32: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/marshal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index bdde38b..e0a3c3d 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -766,7 +766,7 @@ static HRESULT proxy_manager_construct( EnterCriticalSection(&apt->cs); /* FIXME: we are dependent on the ordering in here to make sure a proxy's - * IRemUnknown proxy doesn't get destroyed before the regual proxy does + * IRemUnknown proxy doesn't get destroyed before the regular proxy does * because we need the IRemUnknown proxy during the destruction of the * regular proxy. Ideally, we should maintain a separate list for the * IRemUnknown proxies that need late destruction */

1 0