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

Jacek Caban : wininet: Added test of request with a long URL.
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: 9e497aeca2658c33625618fd63731a8150721dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e497aeca2658c33625618fd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 17 19:14:47 2016 +0200 wininet: Added test of request with a long URL. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index d42c3e7..29dd965 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4717,6 +4717,27 @@ static void test_http_read(int port) CloseHandle(server_req_rec_event); } +static void test_long_url(int port) +{ + char long_path[INTERNET_MAX_PATH_LENGTH*2] = "/echo_request?"; + char buf[sizeof(long_path)*2]; + test_request_t req; + BOOL ret; + + memset(long_path+strlen(long_path), 'x', sizeof(long_path)-strlen(long_path)); + long_path[sizeof(long_path)-1] = 0; + open_simple_request(&req, "localhost", port, NULL, long_path); + + ret = HttpSendRequestA(req.request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req.request, 200); + + receive_simple_request(req.request, buf, sizeof(buf)); + ok(strstr(buf, long_path) != NULL, "long pathnot found in %s\n", buf); + + close_request(&req); +} + static void test_http_connection(void) { struct server_info si; @@ -4767,6 +4788,7 @@ static void test_http_connection(void) test_basic_auth_credentials_reuse(si.port); test_async_read(si.port); test_http_read(si.port); + test_long_url(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit");

1 0

Henri Verbeet : wined3d: Make wined3d_device_get_ps_consts_b() consistent with wined3d_device_get_ps_consts_f().
by Alexandre Julliard May 18, 2016

May 18, 2016

Module: wine Branch: master Commit: d701a76ca1d184a620d4d42e39693e68a3fc4ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d701a76ca1d184a620d4d42e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 19:42:00 2016 +0200 wined3d: Make wined3d_device_get_ps_consts_b() consistent with wined3d_device_get_ps_consts_f(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9fc49ea..dd7f46a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3189,7 +3189,7 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantB(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, count, data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 43ae2eb..da83b56 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2640,17 +2640,17 @@ HRESULT CDECL wined3d_device_set_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) + unsigned int start_idx, unsigned int count, BOOL *constants) { - UINT count = min(bool_count, WINED3D_MAX_CONSTS_B - start_register); - - TRACE("device %p, start_register %u, constants %p, bool_count %u.\n", - device, start_register, constants, bool_count); + TRACE("device %p, start_idx %u, count %u,constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_B) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_B) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_b[start_register], count * sizeof(BOOL)); + if (count > WINED3D_MAX_CONSTS_B - start_idx) + count = WINED3D_MAX_CONSTS_B - start_idx; + memcpy(constants, &device->state.ps_consts_b[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3d6a641..01699df 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -70,7 +70,7 @@ @ cdecl wined3d_device_get_predication(ptr ptr) @ cdecl wined3d_device_get_primitive_type(ptr ptr) @ cdecl wined3d_device_get_ps_cb(ptr long) -@ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) +@ cdecl wined3d_device_get_ps_consts_b(ptr long long ptr) @ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr) @ cdecl wined3d_device_get_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_ps_resource_view(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 63550a1..a770d7f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2123,7 +2123,7 @@ void __cdecl wined3d_device_get_primitive_type(const struct wined3d_device *devi enum wined3d_primitive_type *primitive_topology); struct wined3d_buffer * __cdecl wined3d_device_get_ps_cb(const struct wined3d_device *device, UINT idx); HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *device, - UINT start_register, BOOL *constants, UINT bool_count); + unsigned int start_idx, unsigned int count, BOOL *constants); HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device,

1 0

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

May 18, 2016

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

Henri Verbeet : wined3d: Emit position / attribute 0 last in draw_primitive_immediate_mode().
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: abad305c1ae9a524e97eeaa05cf5f6d22dfe6f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abad305c1ae9a524e97eeaa05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:54 2016 +0200 wined3d: Emit position / attribute 0 last in draw_primitive_immediate_mode(). Emitting the position / attribute 0 provokes the actual vertex emission, so needs to happen last. This fixes a regression introduced by commit f3c155cc56eb31fa9294d388e755208a2633c398. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c086491..45fa524 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -214,9 +214,9 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const unsigned int element_idx; stride_idx = get_stride_idx(idx_data, idx_size, state->base_vertex_index, start_idx, vertex_idx); - for (element_idx = 0; use_map; use_map >>= 1, ++element_idx) + for (element_idx = MAX_ATTRIBS - 1; use_map; use_map &= ~(1u << element_idx), --element_idx) { - if (!(use_map & 1u)) + if (!(use_map & 1u << element_idx)) continue; ptr = si->elements[element_idx].data.addr + si->elements[element_idx].stride * stride_idx; @@ -329,12 +329,6 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const stride_idx = get_stride_idx(idx_data, idx_size, state->base_vertex_index, start_idx, vertex_idx); - if (position) - { - ptr = position + stride_idx * si->elements[WINED3D_FFP_POSITION].stride; - ops->position[si->elements[WINED3D_FFP_POSITION].format->emit_idx](ptr); - } - if (normal) { ptr = normal + stride_idx * si->elements[WINED3D_FFP_NORMAL].stride; @@ -379,6 +373,12 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const ops->texcoord[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx]( GL_TEXTURE0_ARB + context->tex_unit_map[texture_idx], ptr); } + + if (position) + { + ptr = position + stride_idx * si->elements[WINED3D_FFP_POSITION].stride; + ops->position[si->elements[WINED3D_FFP_POSITION].format->emit_idx](ptr); + } } gl_info->gl_ops.gl.p_glEnd();

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i().
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: f69cf783df233e9ded04c4df193d39d1b465d424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69cf783df233e9ded04c4df1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:53 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bfbee07..1938016 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3158,7 +3158,8 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantI(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_ps_consts_i(device->wined3d_device, + reg_idx, count, (struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1c25f1b..d827528 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2681,17 +2681,17 @@ HRESULT CDECL wined3d_device_set_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) + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_i[start_register], count * sizeof(int) * 4); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(constants, &device->state.ps_consts_i[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4219b53..c4446b8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -72,7 +72,7 @@ @ cdecl wined3d_device_get_ps_cb(ptr long) @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr) -@ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b01e8e4..af320a4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2127,7 +2127,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx);

1 0

Henri Verbeet : wined3d: Only allow 256 vertex shader vec4's.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: aa5ccba8684bef5d7f6d409c68fdf39de22a22a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa5ccba8684bef5d7f6d409c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:45 2016 +0200 wined3d: Only allow 256 vertex shader vec4's. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 11 +++-------- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 17 ++++++----------- dlls/wined3d/stateblock.c | 26 +++----------------------- dlls/wined3d/wined3d_private.h | 7 ++++--- 5 files changed, 18 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa5ccba8684bef5d7f6d4…

1 0

Michael Stefaniuc : include: Use inline functions for common RECT helpers.
by Alexandre Julliard May 17, 2016

May 17, 2016

Module: wine Branch: master Commit: 5f494bfeb4df0ccec6f7853860de24b2eeab0670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f494bfeb4df0ccec6f785386… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 16 02:49:34 2016 +0200 include: Use inline functions for common RECT helpers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/uitools.c | 1 + dlls/user32/uitools.c | 1 + include/winuser.h | 38 +++++++++++++++++++++++++++++++++++--- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index e1ddf2b..1be709c 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_NO_INLINE_RECT #include "wine/test.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 68c3c8e..efaf356 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -21,6 +21,7 @@ #include <stdarg.h> +#define WINE_NO_INLINE_RECT #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/include/winuser.h b/include/winuser.h index 0c527fb..2b56a0c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3771,7 +3771,6 @@ WINUSERAPI BOOL WINAPI IsGUIThread(BOOL); WINUSERAPI BOOL WINAPI IsHungAppWindow(HWND); WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU); -WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI IsTouchWindow(HWND,PULONG); WINUSERAPI BOOL WINAPI IsWinEventHookInstalled(DWORD); WINUSERAPI BOOL WINAPI IsWindow(HWND); @@ -3982,8 +3981,6 @@ WINUSERAPI HWND WINAPI SetParent(HWND,HWND); WINUSERAPI BOOL WINAPI SetPropA(HWND,LPCSTR,HANDLE); WINUSERAPI BOOL WINAPI SetPropW(HWND,LPCWSTR,HANDLE); #define SetProp WINELIB_NAME_AW(SetProp) -WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); -WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); WINUSERAPI INT WINAPI SetScrollInfo(HWND,INT,const SCROLLINFO*,BOOL); WINUSERAPI INT WINAPI SetScrollPos(HWND,INT,INT,BOOL); WINUSERAPI BOOL WINAPI SetScrollRange(HWND,INT,INT,INT,BOOL); @@ -4092,6 +4089,41 @@ WINUSERAPI INT WINAPI wvsprintfA(LPSTR,LPCSTR,__ms_va_list); WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list); #define wvsprintf WINELIB_NAME_AW(wvsprintf) +#if !defined(__WINESRC__) || defined(WINE_NO_INLINE_RECT) + +WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); +WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); +WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); + +#else + +/* Inline versions of common RECT helpers */ + +static inline BOOL WINAPI IsRectEmpty(const RECT *rect) +{ + if (!rect) return TRUE; + return ((rect->left >= rect->right) || (rect->top >= rect->bottom)); +} + +static inline BOOL WINAPI SetRect(LPRECT rect, INT left, INT top, INT right, INT bottom) +{ + if (!rect) return FALSE; + rect->left = left; + rect->right = right; + rect->top = top; + rect->bottom = bottom; + return TRUE; +} + +static inline BOOL WINAPI SetRectEmpty(LPRECT rect) +{ + if (!rect) return FALSE; + rect->left = rect->right = rect->top = rect->bottom = 0; + return TRUE; +} + +#endif /* !defined(__WINESRC__) || defined(WINE_NO_INLINE_RECT) */ + /* Undocumented functions */ /* NOTE: This is SYSTEM.3, not USER.182, which is also named KillSystemTimer */

1 0

Andrey Gusev : msvcp90: Fix a typo in comment.
by Alexandre Julliard May 17, 2016

May 17, 2016

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

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

May 17, 2016

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

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

May 17, 2016

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