April 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : glu32: Implement gluErrorUnicodeStringEXT.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: b4e31e023260ce3a13f92570d1e604a9b1462fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e31e023260ce3a13f92570d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 20:47:27 2017 +0200 glu32: Implement gluErrorUnicodeStringEXT. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 18 ++++++++++++++++++ dlls/glu32/glu32.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index bdcb620..ee4986e 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -271,6 +271,24 @@ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode ) } /*********************************************************************** + * gluErrorUnicodeStringEXT (GLU32.@) + */ +const WCHAR * WINAPI wine_gluErrorUnicodeStringEXT( GLenum errCode ) +{ + static WCHAR errorsW[NB_ERRORS][64]; + unsigned int i, j; + + for (i = 0; i < NB_ERRORS; i++) + { + if (errors[i].err != errCode) continue; + if (!errorsW[i][0]) /* errors use only ASCII, do a simple mapping */ + for (j = 0; errors[i].str[j]; j++) errorsW[i][j] = (WCHAR)errors[i].str[j]; + return errorsW[i]; + } + return NULL; +} + +/*********************************************************************** * gluScaleImage (GLU32.@) */ int WINAPI wine_gluScaleImage( GLenum format, GLint widthin, GLint heightin, GLenum typein, const void *datain, diff --git a/dlls/glu32/glu32.spec b/dlls/glu32/glu32.spec index 8f98fec..5b416fd 100644 --- a/dlls/glu32/glu32.spec +++ b/dlls/glu32/glu32.spec @@ -15,7 +15,7 @@ @ stdcall gluEndSurface(ptr) wine_gluEndSurface @ stdcall gluEndTrim(ptr) wine_gluEndTrim @ stdcall gluErrorString(long) wine_gluErrorString -@ stub gluErrorUnicodeStringEXT +@ stdcall gluErrorUnicodeStringEXT(long) wine_gluErrorUnicodeStringEXT @ stdcall gluGetNurbsProperty(ptr long ptr) wine_gluGetNurbsProperty @ stdcall gluGetString(long) wine_gluGetString @ stdcall gluGetTessProperty(ptr long ptr) wine_gluGetTessProperty

1 0

Henri Verbeet : wined3d: Handle formats with conversions outside surface_upload_from_surface().
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: c2c1ffe416ca9ba49ac3e355c82e9024004e5c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c1ffe416ca9ba49ac3e355c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:31 2017 +0200 wined3d: Handle formats with conversions outside surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 23 +++++++++++++++++++++-- dlls/wined3d/surface.c | 5 ----- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d8b6ef9..362276d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3599,6 +3599,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, enum wined3d_resource_type type; HRESULT hr; struct wined3d_context *context; + RECT r; TRACE("device %p, src_texture %p, dst_texture %p.\n", device, src_texture, dst_texture); @@ -3670,8 +3671,26 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, { for (j = 0; j < level_count; ++j) { - src_surface = src_texture->sub_resources[i * src_levels + j + src_skip_levels].u.surface; - dst_surface = dst_texture->sub_resources[i * dst_levels + j].u.surface; + unsigned int src_sub_resource_idx = i * src_levels + j + src_skip_levels; + unsigned int dst_sub_resource_idx = i * dst_levels + j; + + /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ + if (dst_texture->resource.format->convert + || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) + { + SetRect(&r, 0, 0, wined3d_texture_get_level_width(dst_texture, j), + wined3d_texture_get_level_height(dst_texture, j)); + if (FAILED(hr = wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &r, + src_texture, src_sub_resource_idx, &r, 0, NULL, WINED3D_TEXF_POINT))) + { + WARN("Failed to update surface, hr %#x.\n", hr); + return hr; + } + continue; + } + + src_surface = src_texture->sub_resources[src_sub_resource_idx].u.surface; + dst_surface = dst_texture->sub_resources[dst_sub_resource_idx].u.surface; if (FAILED(hr = surface_upload_from_surface(dst_surface, NULL, src_surface, NULL))) { WARN("Failed to update surface, hr %#x.\n", hr); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 889a8d1..56fbaf2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -930,11 +930,6 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P return WINED3DERR_INVALIDCALL; } - /* Use wined3d_texture_blt() instead of uploading directly if we need conversion. */ - if (dst_format->convert || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) - return wined3d_texture_blt(dst_texture, dst_sub_resource_idx, &dst_rect, - src_texture, src_sub_resource_idx, src_rect, 0, NULL, WINED3D_TEXF_POINT); - context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info;

1 0

Henri Verbeet : wined3d: Source resources are always non-NULL in wined3d_cs_exec_blt_sub_resource( ).
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: cefd06380c981ecb9da6a06a76351757aad06936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cefd06380c981ecb9da6a06a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 23:44:29 2017 +0200 wined3d: Source resources are always non-NULL in wined3d_cs_exec_blt_sub_resource(). Since fills no longer go through the blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c408eb0..78a3e1d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1744,17 +1744,14 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * } else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_2D) { - struct wined3d_surface *dst_surface, *src_surface = NULL; + struct wined3d_surface *dst_surface, *src_surface; struct wined3d_texture *dst_texture, *src_texture; RECT dst_rect, src_rect; dst_texture = texture_from_resource(op->dst_resource); + src_texture = texture_from_resource(op->src_resource); dst_surface = dst_texture->sub_resources[op->dst_sub_resource_idx].u.surface; - if (op->src_resource) - { - src_texture = texture_from_resource(op->src_resource); - src_surface = src_texture->sub_resources[op->src_sub_resource_idx].u.surface; - } + src_surface = src_texture->sub_resources[op->src_sub_resource_idx].u.surface; SetRect(&dst_rect, op->dst_box.left, op->dst_box.top, op->dst_box.right, op->dst_box.bottom); SetRect(&src_rect, op->src_box.left, op->src_box.top, op->src_box.right, op->src_box.bottom);

1 0

Alexandre Julliard : wrc: Only add translations for specific fields in version blocks.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 8f08aee04d101834336120f1fd480f2400d21f7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f08aee04d101834336120f1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 11:19:08 2017 +0200 wrc: Only add translations for specific fields in version blocks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/wine_common_ver.rc | 12 ++++++------ tools/wrc/po.c | 18 +++++++++++++++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/include/wine/wine_common_ver.rc b/include/wine/wine_common_ver.rc index b1b054d..39a17d6 100644 --- a/include/wine/wine_common_ver.rc +++ b/include/wine/wine_common_ver.rc @@ -125,14 +125,14 @@ FILESUBTYPE WINE_FILESUBTYPE /* LANG_ENGLISH/SUBLANG_DEFAULT, WINE_CODEPAGE */ BLOCK "0409" WINE_CODEPAGE_STR { - VALUE "CompanyName", "#msgctxt#do not translate#Microsoft Corporation" /* GameGuard depends on this */ + VALUE "CompanyName", "Microsoft Corporation" /* GameGuard depends on this */ VALUE "FileDescription", WINE_FILEDESCRIPTION_STR - VALUE "FileVersion", "#msgctxt#do not translate#" WINE_FILEVERSION_STR - VALUE "InternalName", "#msgctxt#do not translate#" WINE_FILENAME - VALUE "LegalCopyright", "#msgctxt#do not translate#" WINE_LEGALCOPYRIGHT - VALUE "OriginalFilename", "#msgctxt#do not translate#" WINE_FILENAME_STR + VALUE "FileVersion", WINE_FILEVERSION_STR + VALUE "InternalName", WINE_FILENAME + VALUE "LegalCopyright", WINE_LEGALCOPYRIGHT + VALUE "OriginalFilename", WINE_FILENAME_STR VALUE "ProductName", WINE_PRODUCTNAME_STR - VALUE "ProductVersion", "#msgctxt#do not translate#" WINE_PRODUCTVERSION_STR + VALUE "ProductVersion", WINE_PRODUCTVERSION_STR WINE_EXTRAVALUES } } diff --git a/tools/wrc/po.c b/tools/wrc/po.c index c28c7d8..7b09f10 100644 --- a/tools/wrc/po.c +++ b/tools/wrc/po.c @@ -917,6 +917,21 @@ static ver_block_t *get_version_langcharset_block( ver_block_t *block ) return NULL; } +static int version_value_needs_translation( const ver_value_t *val ) +{ + int ret; + char *key; + + if (val->type != val_str) return 0; + if (!(key = convert_msgid_ascii( val->key, 0 ))) return 0; + + /* most values contain version numbers or file names, only translate a few specific ones */ + ret = (!strcasecmp( key, "FileDescription" ) || !strcasecmp( key, "ProductName" )); + + free( key ); + return ret; +} + static void add_pot_versioninfo( po_file_t po, const resource_t *res ) { ver_value_t *val; @@ -924,7 +939,8 @@ static void add_pot_versioninfo( po_file_t po, const resource_t *res ) if (!langcharset) return; for (val = langcharset->values; val; val = val->next) - add_po_string( po, val->value.str, NULL, NULL ); + if (version_value_needs_translation( val )) + add_po_string( po, val->value.str, NULL, NULL ); } static void add_po_versioninfo( const resource_t *english, const resource_t *res )

1 0

Alexandre Julliard : opengl32: Directly link to glu32.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: f89d01d94a71ae960d83c35b0c74336648894870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f89d01d94a71ae960d83c35b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 21:26:09 2017 +0200 opengl32: Directly link to glu32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/Makefile.in | 1 + dlls/opengl32/wgl.c | 76 ++++++++++------------------------------------- 2 files changed, 16 insertions(+), 61 deletions(-) diff --git a/dlls/opengl32/Makefile.in b/dlls/opengl32/Makefile.in index 4df6bce..3b1293e 100644 --- a/dlls/opengl32/Makefile.in +++ b/dlls/opengl32/Makefile.in @@ -1,6 +1,7 @@ MODULE = opengl32.dll IMPORTLIB = opengl32 IMPORTS = user32 gdi32 advapi32 +DELAYIMPORTS = glu32 EXTRADLLFLAGS = -Wl,--image-base,0x7a800000 C_SRCS = \ diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index d3d20bf..73be013 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1395,50 +1395,6 @@ BOOL WINAPI wglUseFontBitmapsW(HDC hdc, DWORD first, DWORD count, DWORD listBase return wglUseFontBitmaps_common( hdc, first, count, listBase, TRUE ); } -typedef void (WINAPI *_GLUfuncptr)(void); - -#define DECL_FUNCPTR(f) static typeof(f) *p##f -DECL_FUNCPTR(gluNewTess); -DECL_FUNCPTR(gluDeleteTess); -DECL_FUNCPTR(gluTessNormal); -DECL_FUNCPTR(gluTessBeginPolygon); -DECL_FUNCPTR(gluTessEndPolygon); -DECL_FUNCPTR(gluTessCallback); -DECL_FUNCPTR(gluTessBeginContour); -DECL_FUNCPTR(gluTessEndContour); -DECL_FUNCPTR(gluTessVertex); -#undef DECL_FUNCPTR - -static HMODULE load_libglu(void) -{ - static const WCHAR glu32W[] = {'g','l','u','3','2','.','d','l','l',0}; - static BOOL already_loaded; - static HMODULE module; - - if (already_loaded) return module; - already_loaded = TRUE; - - TRACE("Trying to load GLU library\n"); - module = LoadLibraryW( glu32W ); - if (!module) - { - WARN("Failed to load glu32\n"); - return NULL; - } -#define LOAD_FUNCPTR(f) p##f = (void *)GetProcAddress( module, #f ) - LOAD_FUNCPTR(gluNewTess); - LOAD_FUNCPTR(gluDeleteTess); - LOAD_FUNCPTR(gluTessBeginContour); - LOAD_FUNCPTR(gluTessNormal); - LOAD_FUNCPTR(gluTessBeginPolygon); - LOAD_FUNCPTR(gluTessCallback); - LOAD_FUNCPTR(gluTessEndContour); - LOAD_FUNCPTR(gluTessEndPolygon); - LOAD_FUNCPTR(gluTessVertex); -#undef LOAD_FUNCPTR - return module; -} - static void fixed_to_double(POINTFX fixed, UINT em_size, GLdouble vertex[3]) { vertex[0] = (fixed.x.value + (GLdouble)fixed.x.fract / (1 << 16)) / em_size; @@ -1565,17 +1521,15 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if(format == WGL_FONT_POLYGONS) { - if (!load_libglu()) + tess = gluNewTess(); + if(!tess) { ERR("glu32 is required for this function but isn't available\n"); return FALSE; } - - tess = pgluNewTess(); - if(!tess) return FALSE; - pgluTessCallback(tess, GLU_TESS_VERTEX, (_GLUfuncptr)tess_callback_vertex); - pgluTessCallback(tess, GLU_TESS_BEGIN, (_GLUfuncptr)tess_callback_begin); - pgluTessCallback(tess, GLU_TESS_END, tess_callback_end); + gluTessCallback(tess, GLU_TESS_VERTEX, (void *)tess_callback_vertex); + gluTessCallback(tess, GLU_TESS_BEGIN, (void *)tess_callback_begin); + gluTessCallback(tess, GLU_TESS_END, tess_callback_end); } GetObjectW(GetCurrentObject(hdc, OBJ_FONT), sizeof(lf), &lf); @@ -1633,8 +1587,8 @@ static BOOL wglUseFontOutlines_common(HDC hdc, if(format == WGL_FONT_POLYGONS) { funcs->gl.p_glNormal3d(0.0, 0.0, 1.0); - pgluTessNormal(tess, 0, 0, 1); - pgluTessBeginPolygon(tess, NULL); + gluTessNormal(tess, 0, 0, 1); + gluTessBeginPolygon(tess, NULL); } while(!vertices) @@ -1653,7 +1607,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, TRACE("\tstart %d, %d\n", pph->pfxStart.x.value, pph->pfxStart.y.value); if(format == WGL_FONT_POLYGONS) - pgluTessBeginContour(tess); + gluTessBeginContour(tess); else funcs->gl.p_glBegin(GL_LINE_LOOP); @@ -1661,7 +1615,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, { fixed_to_double(pph->pfxStart, em_size, vertices); if(format == WGL_FONT_POLYGONS) - pgluTessVertex(tess, vertices, vertices); + gluTessVertex(tess, vertices, vertices); else funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); vertices += 3; @@ -1684,7 +1638,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, ppc->apfx[i].x.value, ppc->apfx[i].y.value); fixed_to_double(ppc->apfx[i], em_size, vertices); if(format == WGL_FONT_POLYGONS) - pgluTessVertex(tess, vertices, vertices); + gluTessVertex(tess, vertices, vertices); else funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); vertices += 3; @@ -1732,7 +1686,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, vertices[1] = points[j].y; vertices[2] = 0.0; if(format == WGL_FONT_POLYGONS) - pgluTessVertex(tess, vertices, vertices); + gluTessVertex(tess, vertices, vertices); else funcs->gl.p_glVertex3d(vertices[0], vertices[1], vertices[2]); vertices += 3; @@ -1746,7 +1700,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, default: ERR("\t\tcurve type = %d\n", ppc->wType); if(format == WGL_FONT_POLYGONS) - pgluTessEndContour(tess); + gluTessEndContour(tess); else funcs->gl.p_glEnd(); goto error_in_list; @@ -1756,7 +1710,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, (ppc->cpfx - 1) * sizeof(POINTFX)); } if(format == WGL_FONT_POLYGONS) - pgluTessEndContour(tess); + gluTessEndContour(tess); else funcs->gl.p_glEnd(); pph = (TTPOLYGONHEADER*)((char*)pph + pph->cb); @@ -1765,7 +1719,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, error_in_list: if(format == WGL_FONT_POLYGONS) - pgluTessEndPolygon(tess); + gluTessEndPolygon(tess); funcs->gl.p_glTranslated((GLdouble)gm.gmCellIncX / em_size, (GLdouble)gm.gmCellIncY / em_size, 0.0); funcs->gl.p_glEndList(); HeapFree(GetProcessHeap(), 0, buf); @@ -1775,7 +1729,7 @@ error_in_list: error: DeleteObject(SelectObject(hdc, old_font)); if(format == WGL_FONT_POLYGONS) - pgluDeleteTess(tess); + gluDeleteTess(tess); return TRUE; }

1 0

Alexandre Julliard : glu32: Implement gluErrorString.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 89edb2eee28db6fbf4984f9f6dd6ff1a0cc2335d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89edb2eee28db6fbf4984f9f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 7 20:09:18 2017 +0200 glu32: Implement gluErrorString. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 6a00df9..bdcb620 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -32,6 +32,67 @@ WINE_DEFAULT_DEBUG_CHANNEL(glu); +static const struct { GLuint err; const char *str; } errors[] = +{ + { GL_NO_ERROR, "no error" }, + { GL_INVALID_ENUM, "invalid enumerant" }, + { GL_INVALID_VALUE, "invalid value" }, + { GL_INVALID_OPERATION, "invalid operation" }, + { GL_STACK_OVERFLOW, "stack overflow" }, + { GL_STACK_UNDERFLOW, "stack underflow" }, + { GL_OUT_OF_MEMORY, "out of memory" }, + { GL_TABLE_TOO_LARGE, "table too large" }, + { GL_INVALID_FRAMEBUFFER_OPERATION_EXT, "invalid framebuffer operation" }, + { GLU_INVALID_ENUM, "invalid enumerant" }, + { GLU_INVALID_VALUE, "invalid value" }, + { GLU_OUT_OF_MEMORY, "out of memory" }, + { GLU_INCOMPATIBLE_GL_VERSION, "incompatible gl version" }, + { GLU_TESS_ERROR1, "gluTessBeginPolygon() must precede a gluTessEndPolygon()" }, + { GLU_TESS_ERROR2, "gluTessBeginContour() must precede a gluTessEndContour()" }, + { GLU_TESS_ERROR3, "gluTessEndPolygon() must follow a gluTessBeginPolygon()" }, + { GLU_TESS_ERROR4, "gluTessEndContour() must follow a gluTessBeginContour()" }, + { GLU_TESS_ERROR5, "a coordinate is too large" }, + { GLU_TESS_ERROR6, "need combine callback" }, + { GLU_NURBS_ERROR1, "spline order un-supported" }, + { GLU_NURBS_ERROR2, "too few knots" }, + { GLU_NURBS_ERROR3, "valid knot range is empty" }, + { GLU_NURBS_ERROR4, "decreasing knot sequence knot" }, + { GLU_NURBS_ERROR5, "knot multiplicity greater than order of spline" }, + { GLU_NURBS_ERROR6, "gluEndCurve() must follow gluBeginCurve()" }, + { GLU_NURBS_ERROR7, "gluBeginCurve() must precede gluEndCurve()" }, + { GLU_NURBS_ERROR8, "missing or extra geometric data" }, + { GLU_NURBS_ERROR9, "can't draw piecewise linear trimming curves" }, + { GLU_NURBS_ERROR10, "missing or extra domain data" }, + { GLU_NURBS_ERROR11, "missing or extra domain data" }, + { GLU_NURBS_ERROR12, "gluEndTrim() must precede gluEndSurface()" }, + { GLU_NURBS_ERROR13, "gluBeginSurface() must precede gluEndSurface()" }, + { GLU_NURBS_ERROR14, "curve of improper type passed as trim curve" }, + { GLU_NURBS_ERROR15, "gluBeginSurface() must precede gluBeginTrim()" }, + { GLU_NURBS_ERROR16, "gluEndTrim() must follow gluBeginTrim()" }, + { GLU_NURBS_ERROR17, "gluBeginTrim() must precede gluEndTrim()" }, + { GLU_NURBS_ERROR18, "invalid or missing trim curve" }, + { GLU_NURBS_ERROR19, "gluBeginTrim() must precede gluPwlCurve()" }, + { GLU_NURBS_ERROR20, "piecewise linear trimming curve referenced twice" }, + { GLU_NURBS_ERROR21, "piecewise linear trimming curve and nurbs curve mixed" }, + { GLU_NURBS_ERROR22, "improper usage of trim data type" }, + { GLU_NURBS_ERROR23, "nurbs curve referenced twice" }, + { GLU_NURBS_ERROR24, "nurbs curve and piecewise linear trimming curve mixed" }, + { GLU_NURBS_ERROR25, "nurbs surface referenced twice" }, + { GLU_NURBS_ERROR26, "invalid property" }, + { GLU_NURBS_ERROR27, "gluEndSurface() must follow gluBeginSurface()" }, + { GLU_NURBS_ERROR28, "intersecting or misoriented trim curves" }, + { GLU_NURBS_ERROR29, "intersecting trim curves" }, + { GLU_NURBS_ERROR30, "UNUSED" }, + { GLU_NURBS_ERROR31, "unconnected trim curves" }, + { GLU_NURBS_ERROR32, "unknown knot error" }, + { GLU_NURBS_ERROR33, "negative vertex count encountered" }, + { GLU_NURBS_ERROR34, "negative byte-stride encountered" }, + { GLU_NURBS_ERROR35, "unknown type descriptor" }, + { GLU_NURBS_ERROR36, "null control point reference" }, + { GLU_NURBS_ERROR37, "duplicate point on piecewise linear trimming curve" }, +}; +#define NB_ERRORS (sizeof(errors) / sizeof(errors[0])) + typedef void (*_GLUfuncptr)(void); /* The only non-trivial bit of this is the *Tess* functions. Here we @@ -72,7 +133,6 @@ static void (*p_gluDisk)( GLUquadric* quad, GLdouble inner, GLdouble outer, GLi static void (*p_gluEndCurve)( GLUnurbs* nurb ); static void (*p_gluEndSurface)( GLUnurbs* nurb ); static void (*p_gluEndTrim)( GLUnurbs* nurb ); -static const GLubyte * (*p_gluErrorString)( GLenum error ); static void (*p_gluGetNurbsProperty)( GLUnurbs* nurb, GLenum property, GLfloat* data ); static void (*p_gluGetTessProperty)( GLUtesselator* tess, GLenum which, GLdouble* data ); static void (*p_gluLoadSamplingMatrices)( GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view ); @@ -202,8 +262,12 @@ int WINAPI wine_gluUnProject( GLdouble winx, GLdouble winy, GLdouble winz, const */ const GLubyte * WINAPI wine_gluErrorString( GLenum errCode ) { - if (!LOAD_FUNCPTR( gluErrorString )) return (const GLubyte *)"unknown error"; - return p_gluErrorString( errCode ); + unsigned int i; + + for (i = 0; i < NB_ERRORS; i++) + if (errors[i].err == errCode) return (const GLubyte *)errors[i].str; + + return NULL; } /***********************************************************************

1 0

Jacek Caban : mshtml: Added IHTMLTableCell:: colSpan property implementation.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: e2a9d203cd781f2ce26b501d8429feb9309fd4fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a9d203cd781f2ce26b501d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 7 19:19:15 2017 +0200 mshtml: Added IHTMLTableCell::colSpan property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltablecell.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 17 +++++++++++++++++ 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 8e3a8d1..12895a2 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -135,15 +135,36 @@ static HRESULT WINAPI HTMLTableCell_get_rowSpan(IHTMLTableCell *iface, LONG *p) static HRESULT WINAPI HTMLTableCell_put_colSpan(IHTMLTableCell *iface, LONG v) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + if(v <= 0) + return E_INVALIDARG; + + nsres = nsIDOMHTMLTableCellElement_SetColSpan(This->nscell, v); + if(NS_FAILED(nsres)) { + ERR("SetColSpan failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableCell_get_colSpan(IHTMLTableCell *iface, LONG *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLTableCellElement_GetColSpan(This->nscell, p); + if(NS_FAILED(nsres)) { + ERR("GetColSpan failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableCell_put_align(IHTMLTableCell *iface, BSTR v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index ac0ddff..db1de1f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7325,6 +7325,23 @@ static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) ok(hres == S_OK, "get_rowSpan failed: %08x\n", hres); ok(lval == 2, "rowSpan = %d\n", lval); + hres = IHTMLTableCell_get_colSpan(cell, &lval); + ok(hres == S_OK, "get_rowSpan failed: %08x\n", hres); + ok(lval == 1, "rowSpan = %d\n", lval); + + hres = IHTMLTableCell_put_colSpan(cell, -1); + ok(hres == E_INVALIDARG, "put_rowSpan failed: %08x\n", hres); + + hres = IHTMLTableCell_put_colSpan(cell, 0); + ok(hres == E_INVALIDARG, "put_rowSpan failed: %08x\n", hres); + + hres = IHTMLTableCell_put_colSpan(cell, 2); + ok(hres == S_OK, "put_rowSpan failed: %08x\n", hres); + + hres = IHTMLTableCell_get_colSpan(cell, &lval); + ok(hres == S_OK, "get_rowSpan failed: %08x\n", hres); + ok(lval == 2, "rowSpan = %d\n", lval); + IHTMLTableCell_Release(cell); }

1 0

Jacek Caban : mshtml: Added IHTMLTableCell:: rowSpan property implementation.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: b1c7b89125c6fb52a65a87e70bec7fd2678a9b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1c7b89125c6fb52a65a87e70… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 7 19:19:09 2017 +0200 mshtml: Added IHTMLTableCell::rowSpan property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmltablecell.c | 29 +++++++++++++++++++++++++---- dlls/mshtml/tests/dom.c | 41 ++++++++++++++++++++++++++++++----------- 2 files changed, 55 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmltablecell.c b/dlls/mshtml/htmltablecell.c index 64a5862..8e3a8d1 100644 --- a/dlls/mshtml/htmltablecell.c +++ b/dlls/mshtml/htmltablecell.c @@ -100,15 +100,36 @@ static HRESULT WINAPI HTMLTableCell_Invoke(IHTMLTableCell *iface, DISPID dispIdM static HRESULT WINAPI HTMLTableCell_put_rowSpan(IHTMLTableCell *iface, LONG v) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%d)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%d)\n", This, v); + + if(v <= 0) + return E_INVALIDARG; + + nsres = nsIDOMHTMLTableCellElement_SetRowSpan(This->nscell, v); + if(NS_FAILED(nsres)) { + ERR("SetRowSpan failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableCell_get_rowSpan(IHTMLTableCell *iface, LONG *p) { HTMLTableCell *This = impl_from_IHTMLTableCell(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLTableCellElement_GetRowSpan(This->nscell, p); + if(NS_FAILED(nsres)) { + ERR("GetRowSpan failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLTableCell_put_colSpan(IHTMLTableCell *iface, LONG v) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7524d55..ac0ddff 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7234,23 +7234,31 @@ static void test_tr_elem(IHTMLElement *elem) IHTMLTableRow_Release(row); } -static void test_td_elem(IHTMLElement *elem) +static void test_td_elem(IHTMLDocument2 *doc, IHTMLElement *div) { IHTMLTableCell *cell; + IHTMLElement *elem; HRESULT hres; LONG lval; BSTR str; VARIANT vbg, vDefaultbg; + test_elem_set_innerhtml((IUnknown*)div, + "<table id=\"tbl\"><tbody>" + " <tr></tr>" + " <tr id=\"row2\"><td id=\"td1\">td1 text</td><td id=\"td2\">td2 text</td><td></td></tr>" + " <tr></tr>" + "</tbody></table>"); + + elem = get_doc_elem_by_id(doc, "td1"); hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTableCell, (void**)&cell); ok(hres == S_OK, "Could not get IHTMLTableRow iface: %08x\n", hres); - if(FAILED(hres)) - return; + IHTMLElement_Release(elem); lval = 0xdeadbeef; hres = IHTMLTableCell_get_cellIndex(cell, &lval); ok(hres == S_OK, "get cellIndex failed: %08x\n", hres); - ok(lval == 1, "Expected 1, got %d\n", lval); + ok(!lval, "Expected 0, got %d\n", lval); str = a2bstr("left"); hres = IHTMLTableCell_put_align(cell, str); @@ -7300,6 +7308,23 @@ static void test_td_elem(IHTMLElement *elem) ok(hres == S_OK, "put_bgColor failed: %08x\n", hres); VariantClear(&vDefaultbg); + hres = IHTMLTableCell_get_rowSpan(cell, &lval); + ok(hres == S_OK, "get_rowSpan failed: %08x\n", hres); + ok(lval == 1, "rowSpan = %d\n", lval); + + hres = IHTMLTableCell_put_rowSpan(cell, -1); + ok(hres == E_INVALIDARG, "put_rowSpan failed: %08x\n", hres); + + hres = IHTMLTableCell_put_rowSpan(cell, 0); + ok(hres == E_INVALIDARG, "put_rowSpan failed: %08x\n", hres); + + hres = IHTMLTableCell_put_rowSpan(cell, 2); + ok(hres == S_OK, "put_rowSpan failed: %08x\n", hres); + + hres = IHTMLTableCell_get_rowSpan(cell, &lval); + ok(hres == S_OK, "get_rowSpan failed: %08x\n", hres); + ok(lval == 2, "rowSpan = %d\n", lval); + IHTMLTableCell_Release(cell); } @@ -8543,13 +8568,6 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, "td2"); - ok(elem != NULL, "elem == NULL\n"); - if(elem) { - test_td_elem(elem); - IHTMLElement_Release(elem); - } - elem = get_doc_elem_by_id(doc, "row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) { @@ -9246,6 +9264,7 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } + test_td_elem(doc, div); test_attr(doc, div); test_blocked(doc, div); test_elem_names(doc);

1 0

Jacek Caban : wininet: Don' t use returned read size if read failed in gzip_read.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 7d8cf318a40ed01a496056e12fecf374b654e966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8cf318a40ed01a496056e12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 7 17:31:02 2017 +0200 wininet: Don't use returned read size if read failed in gzip_read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fd58b1f..321d569 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -466,10 +466,10 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW } res = gzip_stream->parent_stream->vtbl->read(gzip_stream->parent_stream, req, gzip_stream->buf+gzip_stream->buf_size, sizeof(gzip_stream->buf)-gzip_stream->buf_size, &current_read, allow_blocking); - gzip_stream->buf_size += current_read; if(res != ERROR_SUCCESS) break; + gzip_stream->buf_size += current_read; if(!current_read) { WARN("unexpected end of data\n"); gzip_stream->end_of_data = TRUE;

1 0

Józef Kucia : wined3d: Simply use view size as drawable size for resources other than 2d textures.
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: 84e7a04be27330547e61a16691e23e8a2be26aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e7a04be27330547e61a1669… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 7 14:45:12 2017 +0200 wined3d: Simply use view size as drawable size for resources other than 2d 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/wined3d/view.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7e8d192..22fd7de 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -347,9 +347,8 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg if (view->resource->type != WINED3D_RTYPE_TEXTURE_2D) { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(view->resource->type)); - *width = 0; - *height = 0; + *width = view->width; + *height = view->height; return; }

1 0