July 2007 - Wine-Commits - list.winehq.org

James Hawkins : msi: Keep track of the wildcard record index.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: ac1f717ab8789cb1288252009aac8821cbcd5918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1f717ab8789cb1288252009… Author: James Hawkins <truiken(a)gmail.com> Date: Fri Jul 27 11:11:54 2007 -0700 msi: Keep track of the wildcard record index. --- dlls/msi/tests/db.c | 53 ++++++++++++-------------------------------------- dlls/msi/where.c | 42 ++++++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 59 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 39ef6ac..3e38f20 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3703,68 +3703,41 @@ static void test_select_markers(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewExecute(view, rec); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); r = MsiViewFetch(view, &res); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); size = MAX_PATH; r = MsiRecordGetString(res, 1, buf, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmp(buf, "apple"), "Expected apple, got %s\n", buf); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buf, "apple"), "Expected apple, got %s\n", buf); size = MAX_PATH; r = MsiRecordGetString(res, 2, buf, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmp(buf, "two"), "Expected two, got %s\n", buf); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buf, "two"), "Expected two, got %s\n", buf); r = MsiRecordGetInteger(res, 3); - todo_wine - { - ok(r == 1, "Expected 1, got %d\n", r); - } + ok(r == 1, "Expected 1, got %d\n", r); MsiCloseHandle(res); r = MsiViewFetch(view, &res); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); size = MAX_PATH; r = MsiRecordGetString(res, 1, buf, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmp(buf, "apple"), "Expected apple, got %s\n", buf); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buf, "apple"), "Expected apple, got %s\n", buf); size = MAX_PATH; r = MsiRecordGetString(res, 2, buf, &size); - todo_wine - { - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(!lstrcmp(buf, "two"), "Expected two, got %s\n", buf); - } + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!lstrcmp(buf, "two"), "Expected two, got %s\n", buf); r = MsiRecordGetInteger(res, 3); - todo_wine - { - ok(r == 2, "Expected 2, got %d\n", r); - } + ok(r == 2, "Expected 2, got %d\n", r); MsiCloseHandle(res); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index c6a1181..5104e67 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -46,6 +46,7 @@ typedef struct tagMSIWHEREVIEW UINT row_count; UINT *reorder; struct expr *cond; + UINT rec_index; } MSIWHEREVIEW; static UINT WHERE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT *val ) @@ -156,24 +157,25 @@ static INT INT_evaluate_unary( INT lval, UINT op ) return 0; } -static const WCHAR *STRING_evaluate( const string_table *st, - MSIVIEW *table, UINT row, const struct expr *expr, const MSIRECORD *record ) +static const WCHAR *STRING_evaluate( MSIWHEREVIEW *wv, UINT row, + const struct expr *expr, + const MSIRECORD *record ) { UINT val = 0, r; switch( expr->type ) { case EXPR_COL_NUMBER_STRING: - r = table->ops->fetch_int( table, row, expr->u.col_number, &val ); + r = wv->table->ops->fetch_int( wv->table, row, expr->u.col_number, &val ); if( r != ERROR_SUCCESS ) return NULL; - return msi_string_lookup_id( st, val ); + return msi_string_lookup_id( wv->db->strings, val ); case EXPR_SVAL: return expr->u.sval; case EXPR_WILDCARD: - return MSI_RecordGetString( record, 1 ); + return MSI_RecordGetString( record, ++wv->rec_index ); default: ERR("Invalid expression type\n"); @@ -182,14 +184,14 @@ static const WCHAR *STRING_evaluate( const string_table *st, return NULL; } -static UINT STRCMP_Evaluate( const string_table *st, MSIVIEW *table, UINT row, - const struct expr *cond, INT *val, const MSIRECORD *record ) +static UINT STRCMP_Evaluate( MSIWHEREVIEW *wv, UINT row, const struct expr *cond, + INT *val, const MSIRECORD *record ) { int sr; const WCHAR *l_str, *r_str; - l_str = STRING_evaluate( st, table, row, cond->u.expr.left, record ); - r_str = STRING_evaluate( st, table, row, cond->u.expr.right, record ); + l_str = STRING_evaluate( wv, row, cond->u.expr.left, record ); + r_str = STRING_evaluate( wv, row, cond->u.expr.right, record ); if( l_str == r_str ) sr = 0; else if( l_str && ! r_str ) @@ -206,8 +208,8 @@ static UINT STRCMP_Evaluate( const string_table *st, MSIVIEW *table, UINT row, return ERROR_SUCCESS; } -static UINT WHERE_evaluate( MSIDATABASE *db, MSIVIEW *table, UINT row, - const struct expr *cond, INT *val, MSIRECORD *record ) +static UINT WHERE_evaluate( MSIWHEREVIEW *wv, UINT row, + struct expr *cond, INT *val, MSIRECORD *record ) { UINT r, tval; INT lval, rval; @@ -218,12 +220,12 @@ static UINT WHERE_evaluate( MSIDATABASE *db, MSIVIEW *table, UINT row, switch( cond->type ) { case EXPR_COL_NUMBER: - r = table->ops->fetch_int( table, row, cond->u.col_number, &tval ); + r = wv->table->ops->fetch_int( wv->table, row, cond->u.col_number, &tval ); *val = tval - 0x8000; return ERROR_SUCCESS; case EXPR_COL_NUMBER32: - r = table->ops->fetch_int( table, row, cond->u.col_number, &tval ); + r = wv->table->ops->fetch_int( wv->table, row, cond->u.col_number, &tval ); *val = tval - 0x80000000; return r; @@ -232,27 +234,27 @@ static UINT WHERE_evaluate( MSIDATABASE *db, MSIVIEW *table, UINT row, return ERROR_SUCCESS; case EXPR_COMPLEX: - r = WHERE_evaluate( db, table, row, cond->u.expr.left, &lval, record ); + r = WHERE_evaluate( wv, row, cond->u.expr.left, &lval, record ); if( r != ERROR_SUCCESS ) return r; - r = WHERE_evaluate( db, table, row, cond->u.expr.right, &rval, record ); + r = WHERE_evaluate( wv, row, cond->u.expr.right, &rval, record ); if( r != ERROR_SUCCESS ) return r; *val = INT_evaluate_binary( lval, cond->u.expr.op, rval ); return ERROR_SUCCESS; case EXPR_UNARY: - r = table->ops->fetch_int( table, row, cond->u.expr.left->u.col_number, &tval ); + r = wv->table->ops->fetch_int( wv->table, row, cond->u.expr.left->u.col_number, &tval ); if( r != ERROR_SUCCESS ) return r; *val = INT_evaluate_unary( tval, cond->u.expr.op ); return ERROR_SUCCESS; case EXPR_STRCMP: - return STRCMP_Evaluate( db->strings, table, row, cond, val, record ); + return STRCMP_Evaluate( wv, row, cond, val, record ); case EXPR_WILDCARD: - *val = MSI_RecordGetInteger( record, 1 ); + *val = MSI_RecordGetInteger( record, ++wv->rec_index ); return ERROR_SUCCESS; default: @@ -338,7 +340,8 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) for( i=0; i<count; i++ ) { val = 0; - r = WHERE_evaluate( wv->db, table, i, wv->cond, &val, record ); + wv->rec_index = 0; + r = WHERE_evaluate( wv, i, wv->cond, &val, record ); if( r != ERROR_SUCCESS ) return r; if( val ) @@ -603,6 +606,7 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, wv->row_count = 0; wv->reorder = NULL; wv->cond = cond; + wv->rec_index = 0; *view = (MSIVIEW*) wv; return ERROR_SUCCESS;

1 0

Roderick Colenbrander : wgl: Add WGL_NV_float_buffer and WGL_NV_texture_rectangle support.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 8873478e052fb186c252de1b6e9cb84d8c72fadd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8873478e052fb186c252de1b6… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 27 15:01:52 2007 +0200 wgl: Add WGL_NV_float_buffer and WGL_NV_texture_rectangle support. --- dlls/winex11.drv/opengl.c | 76 ++++++++++++++++++++++++++++++++++++++++++--- include/wine/wgl.h | 40 +++++++++++++++++++++++ 2 files changed, 111 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index db9eb44..89238ef 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -759,9 +759,17 @@ static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuf } } break ; - + case WGL_FLOAT_COMPONENTS_NV: + pop = iWGLAttr[++cur]; + PUSH2(oGLXAttr, GLX_FLOAT_COMPONENTS_NV, pop); + TRACE("pAttr[%d] = GLX_FLOAT_COMPONENTS_NV: %x\n", cur, pop); + break ; case WGL_BIND_TO_TEXTURE_RGB_ARB: case WGL_BIND_TO_TEXTURE_RGBA_ARB: + case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV: + case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV: + case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV: + case WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV: pop = iWGLAttr[++cur]; /** cannot be converted, see direct handling on * - wglGetPixelFormatAttribivARB @@ -2023,7 +2031,22 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, case WGL_TEXTURE_RGBA_ARB: object->use_render_texture = GL_RGBA; break; + + /* WGL_FLOAT_COMPONENTS_NV */ + case WGL_TEXTURE_FLOAT_R_NV: + object->use_render_texture = GL_FLOAT_R_NV; + break; + case WGL_TEXTURE_FLOAT_RG_NV: + object->use_render_texture = GL_FLOAT_RG_NV; + break; + case WGL_TEXTURE_FLOAT_RGB_NV: + object->use_render_texture = GL_FLOAT_RGB_NV; + break; + case WGL_TEXTURE_FLOAT_RGBA_NV: + object->use_render_texture = GL_FLOAT_RGBA_NV; + break; default: + ERR("Unknown texture format: %x\n", attr_v); SetLastError(ERROR_INVALID_DATA); goto create_failed; } @@ -2080,7 +2103,13 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, object->texture_bind_target = GL_TEXTURE_2D; break; } + case WGL_TEXTURE_RECTANGLE_NV: { + object->texture_target = GL_TEXTURE_RECTANGLE_NV; + object->texture_bind_target = GL_TEXTURE_BINDING_RECTANGLE_NV; + break; + } default: + ERR("Unknown texture target: %x\n", attr_v); SetLastError(ERROR_INVALID_DATA); goto create_failed; } @@ -2212,10 +2241,28 @@ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAtt SetLastError(ERROR_INVALID_HANDLE); return GL_FALSE; } - if (GL_RGBA == object->use_render_texture) { - *piValue = WGL_TEXTURE_RGBA_ARB; - } else { - *piValue = WGL_TEXTURE_RGB_ARB; + switch(object->use_render_texture) { + case GL_RGB: + *piValue = WGL_TEXTURE_RGB_ARB; + break; + case GL_RGBA: + *piValue = WGL_TEXTURE_RGBA_ARB; + break; + /* WGL_FLOAT_COMPONENTS_NV */ + case GL_FLOAT_R_NV: + *piValue = WGL_TEXTURE_FLOAT_R_NV; + break; + case GL_FLOAT_RG_NV: + *piValue = WGL_TEXTURE_FLOAT_RG_NV; + break; + case GL_FLOAT_RGB_NV: + *piValue = WGL_TEXTURE_FLOAT_RGB_NV; + break; + case GL_FLOAT_RGBA_NV: + *piValue = WGL_TEXTURE_FLOAT_RGBA_NV; + break; + default: + ERR("Unknown texture format: %x\n", object->use_render_texture); } } } @@ -2245,6 +2292,7 @@ static GLboolean WINAPI X11DRV_wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAtt case GL_TEXTURE_1D: *piValue = WGL_TEXTURE_1D_ARB; break; case GL_TEXTURE_2D: *piValue = WGL_TEXTURE_2D_ARB; break; case GL_TEXTURE_CUBE_MAP: *piValue = WGL_TEXTURE_CUBE_MAP_ARB; break; + case GL_TEXTURE_RECTANGLE_NV: *piValue = WGL_TEXTURE_RECTANGLE_NV; break; } } } @@ -2792,6 +2840,14 @@ static BOOL glxRequireExtension(const char *requiredExtension) return TRUE; } +static void register_extension_string(const char *ext) +{ + strcat(WineGLInfo.wglExtensions, " "); + strcat(WineGLInfo.wglExtensions, ext); + + TRACE("'%s'\n", ext); +} + static BOOL register_extension(const WineGLExtension * ext) { int i; @@ -2944,8 +3000,18 @@ static void X11DRV_WineGL_LoadExtensions(void) if (glxRequireExtension("GLX_ATI_render_texture") || glxRequireExtension("GLX_ARB_render_texture") || (glxRequireVersion(3) && glxRequireExtension("GLX_SGIX_pbuffer") && use_render_texture_emulation)) + { register_extension(&WGL_ARB_render_texture); + /* The WGL version of GLX_NV_float_buffer requires render_texture */ + if(glxRequireExtension("GLX_NV_float_buffer")) + register_extension_string("WGL_NV_float_buffer"); + + /* Again there's no GLX equivalent for this extension, so depend on the required GL extension */ + if(strstr(WineGLInfo.glExtensions, "GL_NV_texture_rectangle") != NULL) + register_extension_string("WGL_NV_texture_rectangle"); + } + /* EXT Extensions */ register_extension(&WGL_EXT_extensions_string); diff --git a/include/wine/wgl.h b/include/wine/wgl.h index e191407..14dfa42 100644 --- a/include/wine/wgl.h +++ b/include/wine/wgl.h @@ -139,6 +139,44 @@ #define WGL_AUX8_ARB 0x208F #define WGL_AUX9_ARB 0x2090 +/** WGL_NV_render_texture_rectangle */ +#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1 +#define WGL_TEXTURE_RECTANGLE_NV 0x20A2 +/** WGL_NV_render_depth_texture */ +#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4 +#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5 +#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6 +#define WGL_DEPTH_COMPONENT_NV 0x20A7 +/** WGL_NV_float_buffer */ +#define WGL_FLOAT_COMPONENTS_NV 0x20B0 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3 +#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4 +#define WGL_TEXTURE_FLOAT_R_NV 0x20B5 +#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6 +#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7 +#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8 +/** GL_NV_float_buffer */ +#define GL_FLOAT_R_NV 0x8880 +#define GL_FLOAT_RG_NV 0x8881 +#define GL_FLOAT_RGB_NV 0x8882 +#define GL_FLOAT_RGBA_NV 0x8883 +#define GL_FLOAT_R16_NV 0x8884 +#define GL_FLOAT_R32_NV 0x8885 +#define GL_FLOAT_RG16_NV 0x8886 +#define GL_FLOAT_RG32_NV 0x8887 +#define GL_FLOAT_RGB16_NV 0x8888 +#define GL_FLOAT_RGB32_NV 0x8889 +#define GL_FLOAT_RGBA16_NV 0x888A +#define GL_FLOAT_RGBA32_NV 0x888B +#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C +#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D +#define GL_FLOAT_RGBA_MODE_NV 0x888E + + /** * WGL_ATI_pixel_format_float / WGL_ARB_color_buffer_float */ @@ -189,3 +227,5 @@ #define GLX_AUX9_ATI 0x9820 #define GLX_BIND_TO_TEXTURE_LUMINANCE_ATI 0x9821 #define GLX_BIND_TO_TEXTURE_INTENSITY_ATI 0x9822 +/** GLX_NV_float_buffer */ +#define GLX_FLOAT_COMPONENTS_NV 0x20B0

1 0

Roderick Colenbrander : wgl: Fix a BadMatch error resulting from ignoring that iPixelFormat stars counting from 1 .
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 7d8c31075b09a3c0fcb483cabc3b22f5fdf87290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d8c31075b09a3c0fcb483cab… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Jul 27 14:59:01 2007 +0200 wgl: Fix a BadMatch error resulting from ignoring that iPixelFormat stars counting from 1. --- dlls/winex11.drv/opengl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index d6202e5..05f322e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -919,8 +919,8 @@ static BOOL init_formats(Display *display, int screen, Visual *visual) /* We have found an offscreen rendering format :) */ if(tmp_vis_id == 0) { - TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize, i); - WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize; + TRACE("Found offscreen format FBCONFIG_ID 0x%x corresponding to iPixelFormat %d at GLX index %d\n", tmp_fmt_id, WineGLPixelFormatListSize+1, i); + WineGLPixelFormatList[WineGLPixelFormatListSize].iPixelFormat = WineGLPixelFormatListSize+1; /* The index starts at 1 */ WineGLPixelFormatList[WineGLPixelFormatListSize].fbconfig = cfgs[i]; WineGLPixelFormatList[WineGLPixelFormatListSize].fmt_id = tmp_fmt_id; WineGLPixelFormatList[WineGLPixelFormatListSize].offscreenOnly = TRUE;

1 0

Stefan Dösinger : d3d8: Skip volume test if volume textures are not supported.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 5016f48daa19b025933dc59b13fdb3cf93f8bb71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5016f48daa19b025933dc59b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 15:27:58 2007 +0200 d3d8: Skip volume test if volume textures are not supported. --- dlls/d3d8/tests/volume.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/volume.c b/dlls/d3d8/tests/volume.c index 5d339c3..09767c2 100644 --- a/dlls/d3d8/tests/volume.c +++ b/dlls/d3d8/tests/volume.c @@ -125,6 +125,7 @@ START_TEST(volume) { HMODULE d3d8_handle; IDirect3DDevice8 *device_ptr; + D3DCAPS8 caps; d3d8_handle = LoadLibraryA("d3d8.dll"); if (!d3d8_handle) @@ -136,5 +137,11 @@ START_TEST(volume) device_ptr = init_d3d8(d3d8_handle); if (!device_ptr) return; + IDirect3DDevice8_GetDeviceCaps(device_ptr, &caps); + if(!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) { + skip("Volume textures not supported\n"); + return; + } + test_volume_get_container(device_ptr); }

1 0

Stefan Dösinger : wined3d: A more dynamic initialization of the gl pixel formats.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: 5c905b9e8ca77fe8e30a5e4a5c7962be71191b9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c905b9e8ca77fe8e30a5e4a5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 10:25:35 2007 +0200 wined3d: A more dynamic initialization of the gl pixel formats. --- dlls/wined3d/utils.c | 158 ++++++++++++++++++++++++++++---------------------- 1 files changed, 89 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c905b9e8ca77fe8e30a5…

1 0

Stefan Dösinger : wined3d: Store the gl format table in the gl info structure.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: d2016ff8929ad72fb3b5a0e3e443fbf4e8aa92c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2016ff8929ad72fb3b5a0e3e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 27 13:22:54 2007 +0200 wined3d: Store the gl format table in the gl info structure. --- dlls/wined3d/device.c | 19 ++++------------ dlls/wined3d/directx.c | 9 ++++++++ dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 18 ++++++++++++--- dlls/wined3d/surface_gdi.c | 16 +++++++------- dlls/wined3d/utils.c | 44 +++++++++++++++++++++++++++++---------- dlls/wined3d/volume.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++---- include/wine/wined3d_gl.h | 7 ++++++ 9 files changed, 81 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2016ff8929ad72fb3b5a…

1 0

Stefan Dösinger : wined3d: Split up the format table.
by Alexandre Julliard July 30, 2007

July 30, 2007

Module: wine Branch: master Commit: a0131a32729588d36dc93991a2e7154cc066d4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0131a32729588d36dc93991a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 23 11:13:37 2007 +0200 wined3d: Split up the format table. --- dlls/wined3d/device.c | 24 +++--- dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 25 +++-- dlls/wined3d/surface_gdi.c | 18 ++-- dlls/wined3d/utils.c | 210 +++++++++++++++++++++++++++------------ dlls/wined3d/volume.c | 15 ++-- dlls/wined3d/wined3d_private.h | 9 ++- 7 files changed, 197 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0131a32729588d36dc93…

1 0

appdb/ include/incl.php unit_test/run_tests.php
by WineHQ July 30, 2007

July 30, 2007

ChangeSet ID: 31289 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/29 20:56:39 Modified files: include : incl.php unit_test : run_tests.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Purge and check session message count before and after the unit tests. The unit tests generate a lot of session messages and we don't want to leave these around after the tests. Patch: http://cvs.winehq.org/patch.py?id=31289 Old revision New revision Changes Path 1.45 1.46 +6 -0 appdb/include/incl.php 1.16 1.17 +7 -1 appdb/unit_test/run_tests.php Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.45 appdb/include/incl.php:1.46 --- appdb/include/incl.php:1.45 30 Jul 2007 1:56:39 -0000 +++ appdb/include/incl.php 30 Jul 2007 1:56:39 -0000 @@ -273,6 +273,12 @@ function addmsg($text, $color = "black") } +function purgeSessionMessages() +{ + $sQuery = "truncate sessionMessages"; + query_parameters($sQuery); +} + /** * output msg_buffer and clear it. Index: appdb/unit_test/run_tests.php diff -u -p appdb/unit_test/run_tests.php:1.16 appdb/unit_test/run_tests.php:1.17 --- appdb/unit_test/run_tests.php:1.16 30 Jul 2007 1:56:39 -0000 +++ appdb/unit_test/run_tests.php 30 Jul 2007 1:56:39 -0000 @@ -17,11 +17,13 @@ if(!defined("DISABLE_EMAIL")) // default to the tests being successful $bTestSuccess = true; +// purge any session messages currently in the database +purgeSessionMessages(); + // retrieve counts of each of the tables so we can check again // at the end of the $oStartingTableCounts = new table_counts(); - include_once("test_user.php"); echo "\n"; @@ -43,6 +45,9 @@ include_once("test_appData.php"); echo "\n"; include_once("test_testData.php"); +// purge any session messages we generated during the test +purgeSessionMessages(); + // retrieve counts of each of the tables after our tests $oEndingTableCounts = new table_counts(); @@ -97,6 +102,7 @@ class table_counts 'testResults', 'user_list', 'user_privs', + 'sessionMessages', 'vendor'); $this->update_counts();

1 0

appdb/ include/monitor.php unit_test/test_om_o ...
by WineHQ July 30, 2007

July 30, 2007

ChangeSet ID: 31288 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/29 20:22:55 Modified files: include : monitor.php unit_test : test_om_objects.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Add objectManager support to the monitor class Patch: http://cvs.winehq.org/patch.py?id=31288 Old revision New revision Changes Path 1.16 1.17 +111 -10 appdb/include/monitor.php 1.21 1.22 +2 -0 appdb/unit_test/test_om_objects.php Index: appdb/include/monitor.php diff -u -p appdb/include/monitor.php:1.16 appdb/include/monitor.php:1.17 --- appdb/include/monitor.php:1.16 30 Jul 2007 1:22:55 -0000 +++ appdb/include/monitor.php 30 Jul 2007 1:22:55 -0000 @@ -19,22 +19,26 @@ class Monitor { * Constructor. * If $iMonitorId is provided, fetches Monitor. */ - function Monitor($iMonitorId="") + function Monitor($iMonitorId="", $oRow = null) { - if($iMonitorId) + if(!$iMonitorId && !$oRow) + return; + + if(!$oRow) { $sQuery = "SELECT * FROM appMonitors WHERE monitorId = '".$iMonitorId."'"; $hResult = query_appdb($sQuery); $oRow = mysql_fetch_object($hResult); - if($oRow) - { - $this->iMonitorId = $oRow->monitorId; - $this->iAppId = $oRow->appId; - $this->iVersionId = $oRow->versionId; - $this->iUserId = $oRow->userId; - } + } + + if($oRow) + { + $this->iMonitorId = $oRow->monitorId; + $this->iAppId = $oRow->appId; + $this->iVersionId = $oRow->versionId; + $this->iUserId = $oRow->userId; } } @@ -98,8 +102,12 @@ class Monitor { $hResult = query_parameters("DELETE FROM appMonitors WHERE monitorId = '?'", $this->iMonitorId); if(!$bSilent) $this->SendNotificationMail("delete"); - } + if(!$hResult) + return FALSE; + + return TRUE; + } function SendNotificationMail($sAction="add",$sMsg=null) { @@ -139,6 +147,99 @@ class Monitor { mail_appdb($sEmail, $sSubject ,$sMsg); } + function canEdit() + { + if($_SESSION['current']->hasPriv("admin") || + ($this->iUserId == $_SESSION['current']->iUserId)) + return TRUE; + + return FALSE; + } + + function mustBeQueued() + { + return FALSE; + } + + /* Stub */ + function display() + { + return ""; + } + + /* Stub */ + function getOutputEditorValues() + { + return FALSE; + } + + /* Stub */ + function objectGetHeader() + { + return null; + } + + function objectGetId() + { + return $this->iMonitorId; + } + + /* Stub */ + function objectGetTableRow() + { + return null; + } + + /* Stub */ + function objectMakeLink() + { + return ""; + } + + /* Stub */ + function objectMakeUrl() + { + return ""; + } + + /* Stub */ + function outputEditor() + { + return ""; + } + + function objectGetEntries($bQueued, $bRejected) + { + $hResult = query_parameters("SELECT * FROM appMonitors"); + + if(!$hResult) + return FALSE; + + return $hResult; + } + + function objectGetEntriesCount($bQueued, $bRejected) + { + $hResult = query_parameters("SELECT COUNT(DISTINCT monitorId) as count + FROM appMonitors"); + + if(!$hResult) + return FALSE; + + $oRow = mysql_fetch_object($hResult); + + if(!$oRow) + return FALSE; + + return $oRow->count; + } + + function allowAnonymousSubmissions() + { + /* That makes no sense */ + return FALSE; + } + /* Retrieve the user's monitored versions */ function getVersionsMonitored($oUser) { Index: appdb/unit_test/test_om_objects.php diff -u -p appdb/unit_test/test_om_objects.php:1.21 appdb/unit_test/test_om_objects.php:1.22 --- appdb/unit_test/test_om_objects.php:1.21 30 Jul 2007 1:22:55 -0000 +++ appdb/unit_test/test_om_objects.php 30 Jul 2007 1:22:55 -0000 @@ -11,6 +11,7 @@ require_once(BASE.'include/testData_queu require_once(BASE.'include/version_queue.php'); require_once(BASE.'include/application_queue.php'); require_once(BASE.'include/browse_newest_apps.php'); +require_once(BASE.'include/monitor.php'); /* internal function */ function test_class($sClassName, $aTestMethods) @@ -252,6 +253,7 @@ function test_object_methods() "distribution", "downloadurl", "maintainer", + "monitor", "note", "screenshot", "testData",

1 0

appdb/ admin/editAppNote.php include/note.php ...
by WineHQ July 30, 2007

July 30, 2007

ChangeSet ID: 31287 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/07/29 19:27:38 Modified files: admin : editAppNote.php include : note.php version.php unit_test : test_om_objects.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add objectManager support to the note class Patch: http://cvs.winehq.org/patch.py?id=31287 Old revision New revision Changes Path 1.32 1.33 +2 -2 appdb/admin/editAppNote.php 1.25 1.26 +105 -34 appdb/include/note.php 1.141 1.142 +1 -1 appdb/include/version.php 1.20 1.21 +1 -0 appdb/unit_test/test_om_objects.php

1 0