wine-commits February 2017

2 participants
838 discussions

Hugh McMaster : appwiz.cpl: Do not overwrite application IDs when changing registry keys.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 46aefc7ea8a23ef00404b3d63978c74490156a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46aefc7ea8a23ef00404b3d63… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Dec 21 12:19:58 2016 +0000 appwiz.cpl: Do not overwrite application IDs when changing registry keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c03ea1971b3a16291615cac25e169aeb78290c8a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index dd84827..8119d07 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -152,7 +152,8 @@ static void FreeAppInfo(APPINFO *info) static BOOL ReadApplicationsFromRegistry(HKEY root) { HKEY hkeyApp; - int i, id = 0; + int i; + static int id = 0; DWORD sizeOfSubKeyName, displen, uninstlen; DWORD dwNoModify, dwType, value, size; WCHAR subKeyName[256];

7 years, 3 months

Alexandre Julliard : wineconsole: Leave room for wide characters only when using a DBCS codepage.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 071c11783763ef8a145c7dd34f7b5ea71c1f08cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=071c11783763ef8a145c7dd34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 22 14:23:54 2016 +0100 wineconsole: Leave room for wide characters only when using a DBCS codepage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 29533e4844761c499c16be73e2db7dc055776fdf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/wineconsole/user.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 40a0757..f119d19 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -458,6 +458,7 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, TEXTMETRICW tm; HDC hDC; HFONT hFont, hOldFont; + CPINFO cpinfo; if (!(hDC = GetDC(hWnd))) return NULL; if (!(hFont = CreateFontIndirectW(lf))) @@ -470,12 +471,16 @@ HFONT WCUSER_CopyFont(struct config_data* config, HWND hWnd, const LOGFONTW* lf, SelectObject(hDC, hOldFont); ReleaseDC(hWnd, hDC); - config->cell_width = tm.tmMaxCharWidth; + config->cell_width = tm.tmAveCharWidth; config->cell_height = tm.tmHeight + tm.tmExternalLeading; config->font_weight = tm.tmWeight; lstrcpyW(config->face_name, lf->lfFaceName); if (el) *el = tm.tmExternalLeading; + /* FIXME: use maximum width for DBCS codepages since some chars take two cells */ + if (GetCPInfo( GetConsoleOutputCP(), &cpinfo ) && cpinfo.MaxCharSize > 1) + config->cell_width = tm.tmMaxCharWidth; + return hFont; }

7 years, 3 months

Hugh McMaster : appwiz.cpl: Remove list entries left over from an earlier uninstall.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 64d37d9482c259a9b0e8bb062aec741e8914b014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d37d9482c259a9b0e8bb062… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 16 12:20:40 2016 +0000 appwiz.cpl: Remove list entries left over from an earlier uninstall. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 537768b67520408d97ab032cd4bcc6c6d39105b1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/appwiz.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.c b/dlls/appwiz.cpl/appwiz.c index 9d53e79..dd84827 100644 --- a/dlls/appwiz.cpl/appwiz.c +++ b/dlls/appwiz.cpl/appwiz.c @@ -298,7 +298,7 @@ static BOOL ReadApplicationsFromRegistry(HKEY root) } /* registry key */ - info->regroot = root; + RegOpenKeyExW(root, NULL, 0, KEY_READ, &info->regroot); lstrcpyW(info->regkey, subKeyName); info->path = command; @@ -497,7 +497,6 @@ static void UninstallProgram(int id, DWORD button) PROCESS_INFORMATION info; WCHAR errormsg[MAX_STRING_LEN]; WCHAR sUninstallFailed[MAX_STRING_LEN]; - HKEY hkey; BOOL res; LoadStringW(hInst, IDS_UNINSTALL_FAILED, sUninstallFailed, @@ -533,9 +532,8 @@ static void UninstallProgram(int id, DWORD button) MB_ICONQUESTION) == IDYES) { /* delete the application's uninstall entry */ - RegOpenKeyExW(iter->regroot, PathUninstallW, 0, KEY_READ, &hkey); - RegDeleteKeyW(hkey, iter->regkey); - RegCloseKey(hkey); + RegDeleteKeyW(iter->regroot, iter->regkey); + RegCloseKey(iter->regroot); } }

7 years, 3 months

Hugh McMaster : kernel32: Use Emacs keymap mode immediately after wineconsole configuration change.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 577b41b1560ff0f3696e27ea78dfca83fc36ec6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=577b41b1560ff0f3696e27ea7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 13 11:09:23 2016 +0000 kernel32: Use Emacs keymap mode immediately after wineconsole configuration change. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a3ffc4f3fa4c3b11658dce4a941e9ffcbf34317) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/editline.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 6d2ad17..9eda65f 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -984,6 +984,8 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) } } + CONSOLE_GetEditionMode(hConsoleIn, &use_emacs); + GetConsoleMode(hConsoleIn, &mode); if (input_mode != mode) {

7 years, 3 months

Hugh McMaster : kernel32: Check for a valid pointer before yanking the line.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: bde2d0a8495ed734bc8ca4df06e568de6232cdfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde2d0a8495ed734bc8ca4df0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Dec 13 12:00:03 2016 +0000 kernel32: Check for a valid pointer before yanking the line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8cacba5ff942ee91124895bb10fec026556cdf6f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/editline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 78ea789..6d2ad17 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -635,7 +635,8 @@ static void WCEL_CapitalizeWord(WCEL_Context* ctx) static void WCEL_Yank(WCEL_Context* ctx) { - WCEL_InsertString(ctx, ctx->yanked); + if (ctx->yanked) + WCEL_InsertString(ctx, ctx->yanked); } static void WCEL_KillToEndOfLine(WCEL_Context* ctx)

7 years, 3 months

Alexandre Julliard : winex11: Also ignore BadWindow errors caused by XSendEvent.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 54fb8dddfb0c2eac08df72640461f6beea172635 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54fb8dddfb0c2eac08df72640… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 20 17:08:28 2016 +0100 winex11: Also ignore BadWindow errors caused by XSendEvent. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit adc349c38edd82902571fb7100014241205b3731) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index d4f5c84..89664a0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -208,8 +208,11 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = */ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) { - if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && - (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; + if ((event->request_code == X_SetInputFocus || + event->request_code == X_ChangeWindowAttributes || + event->request_code == X_SendEvent) && + (event->error_code == BadMatch || + event->error_code == BadWindow)) return TRUE; /* ignore a number of errors on gdi display caused by creating/destroying windows */ if (display == gdi_display)

7 years, 3 months

Nikolay Sivov : shell32: Don't access uninitialized buffer (Coverity).

by Alexandre Julliard

Module: wine Branch: oldstable Commit: fc49f58d0809bf89436f652a96787daf700c5ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc49f58d0809bf89436f652a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 14 22:16:11 2016 +0300 shell32: Don't access uninitialized buffer (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3c6cbc2f910ae1ee905e385ea06bb537cc3d901d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shellpath.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 1c3ab59..d06ba2f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4735,6 +4735,7 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t hr = E_INVALIDARG; break; case CSIDL_Type_NonExistent: + *tempW = 0; hr = S_FALSE; break; case CSIDL_Type_WindowsPath: @@ -4785,15 +4786,19 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t break; } + if (FAILED(hr)) + goto failed; + /* Expand environment strings if necessary */ if (*tempW == '%') + { hr = _SHExpandEnvironmentStrings(tempW, pathW); + if (FAILED(hr)) + goto failed; + } else strcpyW(pathW, tempW); - if (FAILED(hr)) - goto failed; - /* if we don't care about existing directories we are ready */ if (flags & KF_FLAG_DONT_VERIFY) goto done;

7 years, 3 months

Matteo Bruni : wined3d: Swizzle D3DCOLOR attributes in the GLSL FFP replacement when necessary.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 50909566f3be7bdc78d8331b5b14d75bac264765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50909566f3be7bdc78d8331b5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Jul 30 19:56:55 2016 +0200 wined3d: Swizzle D3DCOLOR attributes in the GLSL FFP replacement when necessary. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b62f4139eda58e8e25cbc58864fcea2599a20e97) Conflicts: dlls/wined3d/buffer.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/buffer.c | 8 +++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/utils.c | 4 ++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9b7f1c5..6e50458 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -721,9 +721,9 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte const struct wined3d_state *state) { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = buffer->resource.device; UINT start = 0, end = 0, len = 0, vertices; - const struct wined3d_gl_info *gl_info; BOOL decl_changed = FALSE; unsigned int i, j; BYTE *data; @@ -761,7 +761,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (!use_vs(state)) { - if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) + if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && !context->d3d_info->ffp_generic_attributes) fixup_flags |= WINED3D_BUFFER_FIXUP_D3DCOLOR; if (!context->d3d_info->xyzrhw) fixup_flags |= WINED3D_BUFFER_FIXUP_XYZRHW; @@ -863,13 +863,11 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte return; } - buffer_direct_upload(buffer, context->gl_info, flags); + buffer_direct_upload(buffer, gl_info, flags); return; } - gl_info = context->gl_info; - if(!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) { buffer_get_sysmem(buffer, context); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f6b16a5..414c1e2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2983,7 +2983,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st else { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); - slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] + slow_mask |= -(!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && !d3d_info->ffp_generic_attributes) & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); if (((stream_info->position_transformed && !d3d_info->xyzrhw) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a980c5b..abe12b1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5862,8 +5862,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr for (i = 0; i < ARRAY_SIZE(attrib_info); ++i) { if (attrib_info[i].name[0]) - shader_addline(buffer, "%s %s = vs_in%u;\n", - attrib_info[i].type, attrib_info[i].name, i); + shader_addline(buffer, "%s %s = vs_in%u%s;\n", attrib_info[i].type, attrib_info[i].name, + i, settings->swizzle_map & (1u << i) ? ".zyxw" : ""); } for (i = 0; i < MAX_TEXTURES; ++i) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 47ad93c..7159f96 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4804,6 +4804,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, else settings->flatshading = FALSE; + settings->swizzle_map = si->swizzle_map; + return; } @@ -4889,6 +4891,8 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, else settings->flatshading = FALSE; + settings->swizzle_map = si->swizzle_map; + settings->padding = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a8b2aff..316b6ea 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2010,6 +2010,8 @@ struct wined3d_ffp_vs_settings DWORD padding : 10; DWORD texgen[MAX_TEXTURES]; + + WORD swizzle_map; /* MAX_ATTRIBS, 16 */ }; struct wined3d_ffp_vs_desc

7 years, 3 months

Matteo Bruni : d3d9/tests: Add a vertex blending test with D3DCOLOR weights.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 25263909aed0dd43a67a67687d18bfef2ddee942 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25263909aed0dd43a67a67687… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 29 21:01:53 2016 +0200 d3d9/tests: Add a vertex blending test with D3DCOLOR weights. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e592b541a1bfd4edf109e32918f4a5fabb3ade67) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/visual.c | 108 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 81 insertions(+), 27 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c91d02c..bb56bd6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19408,6 +19408,7 @@ static void test_texcoordindex(void) static void test_vertex_blending(void) { + IDirect3DVertexDeclaration9 *vertex_declaration; IDirect3DDevice9 *device; IDirect3D9 *d3d; D3DCAPS9 caps; @@ -19488,12 +19489,23 @@ static void test_vertex_blending(void) static const struct { + DWORD fvf; + D3DVERTEXELEMENT9 decl_elements[3]; struct { - struct vec3 position; - struct vec3 blendweights; - } - vertex_data[4]; + struct + { + struct vec3 position; + struct vec3 blendweights; + } + vertex_data_float[4]; + struct + { + struct vec3 position; + D3DCOLOR blendweights; + } + vertex_data_d3dcolor[4]; + } s; const POINT *quad_points; const POINT *empty_points; } @@ -19501,36 +19513,59 @@ static void test_vertex_blending(void) { /* upper right */ { - {{{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, - {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, - {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, - {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}, + D3DFVF_XYZB3, + {{0}}, + {{{{-1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}}, quad_upper_right_points, quad_upper_right_empty_points }, /* center */ { - {{{-1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, - {{-1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, - {{ 1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, - {{ 1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}}, + D3DFVF_XYZB3, + {{0}}, + {{{{-1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, + {{-1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.25f, 0.25f, 0.25f}}}}, quad_center_points, quad_center_empty_points }, - /* upper center */ + /* upper center */ { - {{{-1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, - {{-1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, - {{ 1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, - {{ 1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}}, + D3DFVF_XYZB3, + {{0}}, + {{{{-1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.5f, 0.0f, 0.0f}}}}, quad_upper_center_points, quad_upper_center_empty_points }, - /* full screen */ + /* full screen */ { - {{{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.0f}}, - {{-1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 0.0f}}, - {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 1.0f}}, - {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}, + D3DFVF_XYZB3, + {{0}}, + {{{{-1.0f, -1.0f, 0.0f}, {0.0f, 1.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}, {1.0f, 0.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}, {0.0f, 0.0f, 1.0f}}, + {{ 1.0f, 1.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}}}, quad_fullscreen_points, quad_fullscreen_empty_points - } + }, + /* D3DCOLOR, full screen */ + { + 0, + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {0, 12, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_BLENDWEIGHT, 0}, + D3DDECL_END() + }, + {{{{0}}}, + {{{-1.0f, -1.0f, 0.0f}, 0x0000ff00}, + {{-1.0f, 1.0f, 0.0f}, 0x00ff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0x000000ff}, + {{ 1.0f, 1.0f, 0.0f}, 0x00000000}}}, + quad_fullscreen_points, quad_fullscreen_empty_points + }, }; window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -19574,16 +19609,32 @@ static void test_vertex_blending(void) { const POINT *point; + if (tests[i].fvf) + { + hr = IDirect3DDevice9_SetFVF(device, tests[i].fvf); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + vertex_declaration = NULL; + } + else + { + hr = IDirect3DDevice9_CreateVertexDeclaration(device, tests[i].decl_elements, &vertex_declaration); + ok(SUCCEEDED(hr), "Failed to create vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, vertex_declaration); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + } + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZB3); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, tests[i].vertex_data, 6 * sizeof(float)); + if (tests[i].fvf) + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, + tests[i].s.vertex_data_float, sizeof(*tests[i].s.vertex_data_float)); + else + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, + tests[i].s.vertex_data_d3dcolor, sizeof(*tests[i].s.vertex_data_d3dcolor)); ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); @@ -19607,6 +19658,9 @@ static void test_vertex_blending(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + if (vertex_declaration) + IDirect3DVertexDeclaration9_Release(vertex_declaration); } refcount = IDirect3DDevice9_Release(device);

7 years, 3 months

Matteo Bruni : wined3d: Also check BLENDWEIGHT for immediate mode fallback.

by Alexandre Julliard

Module: wine Branch: oldstable Commit: 0a2226f1992a63f74e1d44f844435b8038ac4caf URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2226f1992a63f74e1d44f84… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jul 29 21:01:49 2016 +0200 wined3d: Also check BLENDWEIGHT for immediate mode fallback. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 75c8eba5250a96eb585a852c5381e5289a782290) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a15aad2..f6b16a5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2984,7 +2984,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); slow_mask |= -!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] - & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR)); + & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); if (((stream_info->position_transformed && !d3d_info->xyzrhw) || (stream_info->use_map & slow_mask)) && !stream_info->all_vbo)

7 years, 3 months

← Newer
1
...
5
6
7
8
9
10
11
...
84
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017