June 2012 - Wine-Commits - list.winehq.org

Hans Leidekker : wbemprox: Implement Win32_NetworkAdapter.Speed.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: e7e66e59aec4cc5479278003f65c0c2293941e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7e66e59aec4cc5479278003f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:34:41 2012 +0200 wbemprox: Implement Win32_NetworkAdapter.Speed. --- dlls/wbemprox/builtin.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 7a4ee56..849c017 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -91,6 +91,8 @@ static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; +static const WCHAR prop_speedW[] = + {'S','p','e','e','d',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; static const WCHAR prop_threadcountW[] = @@ -115,7 +117,8 @@ static const struct column col_networkadapter[] = { { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_interfaceindexW, CIM_SINT32 }, - { prop_netconnectionstatusW, CIM_UINT16 } + { prop_netconnectionstatusW, CIM_UINT16 }, + { prop_speedW, CIM_UINT64 } }; static const struct column col_os[] = { @@ -192,6 +195,7 @@ struct record_networkadapter const WCHAR *device_id; INT32 interface_index; UINT16 netconnection_status; + UINT64 speed; }; struct record_operatingsystem { @@ -299,6 +303,7 @@ static void fill_networkadapter( struct table *table ) rec->device_id = heap_strdupW( device_id ); rec->interface_index = aa->u.s.IfIndex; rec->netconnection_status = get_connection_status( aa->OperStatus ); + rec->speed = 1000000; offset += sizeof(*rec); } TRACE("created %u rows\n", num_rows);

1 0

Hans Leidekker : wbemprox: Add support for 64-bit integer types.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: fc6d667ac000659ad2ac12151476f8712174b48a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc6d667ac000659ad2ac12151… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:34:23 2012 +0200 wbemprox: Add support for 64-bit integer types. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/query.c | 69 +++++++++++++++++++++++++++++++------------- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index bc82945..837a47e 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 +IMPORTS = iphlpapi dxgi oleaut32 ole32 advapi32 user32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 35b6a0c..0f41d44 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -56,6 +56,9 @@ static UINT get_column_size( const struct table *table, UINT column ) case CIM_SINT32: case CIM_UINT32: return sizeof(INT32); + case CIM_SINT64: + case CIM_UINT64: + return sizeof(INT64); case CIM_DATETIME: case CIM_STRING: return sizeof(WCHAR *); @@ -78,7 +81,7 @@ static UINT get_row_size( const struct table *table ) return get_column_offset( table, table->num_cols - 1 ) + get_column_size( table, table->num_cols - 1 ); } -static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_PTR *val ) +static HRESULT get_value( const struct table *table, UINT row, UINT column, LONGLONG *val ) { UINT col_offset, row_size; const BYTE *ptr; @@ -89,14 +92,14 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ if (table->columns[column].type & CIM_FLAG_ARRAY) { - *val = (INT_PTR)*(const void **)ptr; + *val = (LONGLONG)(INT_PTR)*(const void **)ptr; return S_OK; } switch (table->columns[column].type & COL_TYPE_MASK) { case CIM_DATETIME: case CIM_STRING: - *val = (INT_PTR)*(const WCHAR **)ptr; + *val = (LONGLONG)(INT_PTR)*(const WCHAR **)ptr; break; case CIM_SINT16: *val = *(const INT16 *)ptr; @@ -110,6 +113,12 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ case CIM_UINT32: *val = *(const UINT32 *)ptr; break; + case CIM_SINT64: + *val = *(const INT64 *)ptr; + break; + case CIM_UINT64: + *val = *(const UINT64 *)ptr; + break; default: ERR("invalid column type %u\n", table->columns[column].type & COL_TYPE_MASK); *val = 0; @@ -122,10 +131,12 @@ static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) { static const WCHAR fmt_signedW[] = {'%','d',0}; static const WCHAR fmt_unsignedW[] = {'%','u',0}; + static const WCHAR fmt_signed64W[] = {'%','I','6','4','d',0}; + static const WCHAR fmt_unsigned64W[] = {'%','I','6','4','u',0}; static const WCHAR fmt_strW[] = {'\"','%','s','\"',0}; - INT_PTR val; + LONGLONG val; BSTR ret; - WCHAR number[12]; + WCHAR number[22]; UINT len; if (table->columns[column].type & CIM_FLAG_ARRAY) @@ -139,9 +150,9 @@ static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) { case CIM_DATETIME: case CIM_STRING: - len = strlenW( (const WCHAR *)val ) + 2; + len = strlenW( (const WCHAR *)(INT_PTR)val ) + 2; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - sprintfW( ret, fmt_strW, (const WCHAR *)val ); + sprintfW( ret, fmt_strW, (const WCHAR *)(INT_PTR)val ); return ret; case CIM_SINT16: @@ -154,6 +165,14 @@ static BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) sprintfW( number, fmt_unsignedW, val ); return SysAllocString( number ); + case CIM_SINT64: + wsprintfW( number, fmt_signed64W, val ); + return SysAllocString( number ); + + case CIM_UINT64: + wsprintfW( number, fmt_unsigned64W, val ); + return SysAllocString( number ); + default: FIXME("unhandled column type %u\n", table->columns[column].type & COL_TYPE_MASK); break; @@ -192,7 +211,7 @@ static void clear_table( struct table *table ) if (type == CIM_STRING || type == CIM_DATETIME || (type & CIM_FLAG_ARRAY)) { void *ptr; - if (get_value( table, i, j, (INT_PTR *)&ptr ) == S_OK) heap_free( ptr ); + if (get_value( table, i, j, (LONGLONG *)&ptr ) == S_OK) heap_free( ptr ); } } } @@ -207,9 +226,9 @@ void destroy_view( struct view *view ) heap_free( view ); } -static BOOL eval_like( INT_PTR lval, INT_PTR rval ) +static BOOL eval_like( LONGLONG lval, LONGLONG rval ) { - const WCHAR *p = (const WCHAR *)lval, *q = (const WCHAR *)rval; + const WCHAR *p = (const WCHAR *)(INT_PTR)lval, *q = (const WCHAR *)(INT_PTR)rval; while (*p && *q) { @@ -225,13 +244,13 @@ static BOOL eval_like( INT_PTR lval, INT_PTR rval ) return TRUE; } -static HRESULT eval_cond( const struct table *, UINT, const struct expr *, INT_PTR * ); +static HRESULT eval_cond( const struct table *, UINT, const struct expr *, LONGLONG * ); static BOOL eval_binary( const struct table *table, UINT row, const struct complex_expr *expr, - INT_PTR *val ) + LONGLONG *val ) { HRESULT lret, rret; - INT_PTR lval, rval; + LONGLONG lval, rval; lret = eval_cond( table, row, expr->left, &lval ); rret = eval_cond( table, row, expr->right, &rval ); @@ -274,12 +293,12 @@ static BOOL eval_binary( const struct table *table, UINT row, const struct compl } static HRESULT eval_unary( const struct table *table, UINT row, const struct complex_expr *expr, - INT_PTR *val ) + LONGLONG *val ) { HRESULT hr; UINT column; - INT_PTR lval; + LONGLONG lval; hr = get_column_index( table, expr->left->u.propval->name, &column ); if (hr != S_OK) @@ -305,7 +324,7 @@ static HRESULT eval_unary( const struct table *table, UINT row, const struct com } static HRESULT eval_propval( const struct table *table, UINT row, const struct property *propval, - INT_PTR *val ) + LONGLONG *val ) { HRESULT hr; @@ -319,7 +338,7 @@ static HRESULT eval_propval( const struct table *table, UINT row, const struct p } static HRESULT eval_cond( const struct table *table, UINT row, const struct expr *cond, - INT_PTR *val ) + LONGLONG *val ) { if (!cond) { @@ -335,7 +354,7 @@ static HRESULT eval_cond( const struct table *table, UINT row, const struct expr case EXPR_PROPVAL: return eval_propval( table, row, cond->u.propval, val ); case EXPR_SVAL: - *val = (INT_PTR)cond->u.sval; + *val = (LONGLONG)(INT_PTR)cond->u.sval; return S_OK; case EXPR_IVAL: case EXPR_BVAL: @@ -360,7 +379,7 @@ static HRESULT execute_view( struct view *view ) for (i = 0; i < view->table->num_rows; i++) { HRESULT hr; - INT_PTR val = 0; + LONGLONG val = 0; if (j >= len) { @@ -634,7 +653,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR { HRESULT hr; UINT column, row = view->result[index]; - INT_PTR val; + LONGLONG val; if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type ); if (!is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; @@ -650,7 +669,7 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR case CIM_STRING: case CIM_DATETIME: V_VT( ret ) = VT_BSTR; - V_BSTR( ret ) = SysAllocString( (const WCHAR *)val ); + V_BSTR( ret ) = SysAllocString( (const WCHAR *)(INT_PTR)val ); break; case CIM_SINT16: V_VT( ret ) = VT_I2; @@ -668,6 +687,14 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR V_VT( ret ) = VT_UI4; V_UI4( ret ) = val; break; + case CIM_SINT64: + V_VT( ret ) = VT_I8; + V_I8( ret ) = val; + break; + case CIM_UINT64: + V_VT( ret ) = VT_UI8; + V_UI8( ret ) = val; + break; default: ERR("unhandled column type %u\n", view->table->columns[column].type); return WBEM_E_FAILED;

1 0

Dmitry Timoshkov : windowscodecs: Suppress libtiff warnings.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 6207d9642cc2586394e5ae69ebeb0e9dcd8d8c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6207d9642cc2586394e5ae69e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 27 20:33:14 2012 +0900 windowscodecs: Suppress libtiff warnings. --- dlls/windowscodecs/tiffformat.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 5351098..64e23de 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -67,6 +67,8 @@ MAKE_FUNCPTR(TIFFReadEncodedStrip); MAKE_FUNCPTR(TIFFReadEncodedTile); MAKE_FUNCPTR(TIFFSetDirectory); MAKE_FUNCPTR(TIFFSetField); +MAKE_FUNCPTR(TIFFSetWarningHandler); +MAKE_FUNCPTR(TIFFSetWarningHandlerExt); MAKE_FUNCPTR(TIFFWriteDirectory); MAKE_FUNCPTR(TIFFWriteScanline); #undef MAKE_FUNCPTR @@ -99,6 +101,8 @@ static void *load_libtiff(void) LOAD_FUNCPTR(TIFFReadEncodedTile); LOAD_FUNCPTR(TIFFSetDirectory); LOAD_FUNCPTR(TIFFSetField); + LOAD_FUNCPTR(TIFFSetWarningHandler); + LOAD_FUNCPTR(TIFFSetWarningHandlerExt); LOAD_FUNCPTR(TIFFWriteDirectory); LOAD_FUNCPTR(TIFFWriteScanline); #undef LOAD_FUNCPTR @@ -107,6 +111,9 @@ static void *load_libtiff(void) result = libtiff_handle; + pTIFFSetWarningHandler(NULL); + pTIFFSetWarningHandlerExt(NULL); + LeaveCriticalSection(&init_tiff_cs); return result; }

1 0

Hans Leidekker : wbemprox: Store the result index in the class enumerator instead of the view.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: f1f4f1d9d70f9275425f07ddb3848e7a379ab430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f4f1d9d70f9275425f07ddb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:33:52 2012 +0200 wbemprox: Store the result index in the class enumerator instead of the view. --- dlls/wbemprox/class.c | 19 ++++++++++--------- dlls/wbemprox/query.c | 1 - dlls/wbemprox/wbemprox_private.h | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 524ba09..bb2c5e6 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -36,6 +36,7 @@ struct enum_class_object IEnumWbemClassObject IEnumWbemClassObject_iface; LONG refs; struct query *query; + UINT index; }; static inline struct enum_class_object *impl_from_IEnumWbemClassObject( @@ -92,11 +93,10 @@ static HRESULT WINAPI enum_class_object_Reset( IEnumWbemClassObject *iface ) { struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); - struct view *view = ec->query->view; TRACE("%p\n", iface); - view->index = 0; + ec->index = 0; return WBEM_S_NO_ERROR; } @@ -118,14 +118,14 @@ static HRESULT WINAPI enum_class_object_Next( if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); *puReturned = 0; - if (view->index + uCount > view->count) return WBEM_S_FALSE; + if (ec->index + uCount > view->count) return WBEM_S_FALSE; - hr = WbemClassObject_create( NULL, iface, view->index, (void **)apObjects ); + hr = WbemClassObject_create( NULL, iface, ec->index, (void **)apObjects ); if (hr != S_OK) return hr; - view->index++; + ec->index++; *puReturned = 1; - if (view->index == view->count) return WBEM_S_FALSE; + if (ec->index == view->count) return WBEM_S_FALSE; if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; } @@ -159,12 +159,12 @@ static HRESULT WINAPI enum_class_object_Skip( if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); - if (view->index + nCount >= view->count) + if (ec->index + nCount >= view->count) { - view->index = view->count - 1; + ec->index = view->count - 1; return WBEM_S_FALSE; } - view->index += nCount; + ec->index += nCount; return WBEM_S_NO_ERROR; } @@ -193,6 +193,7 @@ HRESULT EnumWbemClassObject_create( ec->IEnumWbemClassObject_iface.lpVtbl = &enum_class_object_vtbl; ec->refs = 1; ec->query = query; + ec->index = 0; *ppObj = &ec->IEnumWbemClassObject_iface; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 181549f..35b6a0c 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -172,7 +172,6 @@ HRESULT create_view( const struct property *proplist, const WCHAR *class, view->cond = cond; view->result = NULL; view->count = 0; - view->index = 0; *ret = view; return S_OK; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 9273744..db3cb3a 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -100,7 +100,6 @@ struct view const struct expr *cond; UINT *result; UINT count; - UINT index; }; struct query

1 0

Alexandre Julliard : winex11: Use the GET_DRAWABLE escape to implement wglMakeCurrent.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 7f4d3022d0f5f647bd4d9e049fadd4d8c0282235 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f4d3022d0f5f647bd4d9e049… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 27 13:58:23 2012 +0200 winex11: Use the GET_DRAWABLE escape to implement wglMakeCurrent. --- dlls/winex11.drv/opengl.c | 71 +++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 43 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index aa7faa8..9ae143e 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -631,26 +631,6 @@ static int describeContext(Wine_GLContext* ctx) { return ctx_vis_id; } -static BOOL describeDrawable( struct glx_physdev *physdev ) -{ - int tmp; - WineGLPixelFormat *fmt; - int fmt_count = 0; - - fmt = ConvertPixelFormatWGLtoGLX(gdi_display, physdev->pixel_format, TRUE /* Offscreen */, &fmt_count); - if(!fmt) return FALSE; - - TRACE(" HDC %p has:\n", physdev->dev.hdc); - TRACE(" - iPixelFormat %d\n", fmt->iPixelFormat); - TRACE(" - Drawable %lx\n", physdev->drawable); - TRACE(" - FBCONFIG_ID 0x%x\n", fmt->fmt_id); - - pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_VISUAL_ID, &tmp); - TRACE(" - VISUAL_ID 0x%x\n", tmp); - - return TRUE; -} - static int ConvertAttribWGLtoGLX(const int* iWGLAttr, int* oGLXAttr, Wine_GLPBuffer* pbuf) { int nAttribs = 0; unsigned cur = 0; @@ -1584,13 +1564,13 @@ static PROC glxdrv_wglGetProcAddress(LPCSTR lpszProc) return NULL; } -static GLXPixmap get_context_pixmap( struct glx_physdev *physdev, struct wine_glcontext *ctx ) +static GLXPixmap get_context_pixmap( HDC hdc, struct wine_glcontext *ctx ) { if (!ctx->pixmap) { BITMAP bmp; - GetObjectW( GetCurrentObject( physdev->dev.hdc, OBJ_BITMAP ), sizeof(bmp), &bmp ); + GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(bmp), &bmp ); wine_tsx11_lock(); ctx->pixmap = XCreatePixmap( gdi_display, root_window, @@ -1610,14 +1590,13 @@ static GLXPixmap get_context_pixmap( struct glx_physdev *physdev, struct wine_gl */ static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) { - struct glx_physdev *physdev = get_glxdrv_dev( dev ); + HDC hdc = dev->hdc; BOOL ret; Wine_GLContext *prev_ctx = NtCurrentTeb()->glContext; Wine_GLContext *ctx = (Wine_GLContext *) hglrc; + struct x11drv_escape_get_drawable escape; - TRACE("(%p,%p)\n", dev->hdc, hglrc); - - if (!has_opengl()) return FALSE; + TRACE("(%p,%p)\n", hdc, hglrc); if (hglrc == NULL) { @@ -1627,36 +1606,42 @@ static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) ret = pglXMakeCurrent(gdi_display, None, NULL); wine_tsx11_unlock(); NtCurrentTeb()->glContext = NULL; + return TRUE; } - else if (!physdev->pixel_format) + + escape.code = X11DRV_GET_DRAWABLE; + if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape.code), (LPCSTR)&escape.code, + sizeof(escape), (LPSTR)&escape )) + return FALSE; + + if (!escape.pixel_format) { WARN("Trying to use an invalid drawable\n"); SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - else if (ctx->fmt->iPixelFormat != physdev->pixel_format) + if (ctx->fmt->iPixelFormat != escape.pixel_format) { WARN( "mismatched pixel format hdc %p %u ctx %p %u\n", - dev->hdc, physdev->pixel_format, ctx, ctx->fmt->iPixelFormat ); + hdc, escape.pixel_format, ctx, ctx->fmt->iPixelFormat ); SetLastError( ERROR_INVALID_PIXEL_FORMAT ); return FALSE; } else { - Drawable drawable = physdev->drawable; - - if (physdev->type == DC_GL_BITMAP) drawable = get_context_pixmap( physdev, ctx ); + if (escape.gl_type == DC_GL_BITMAP) escape.drawable = get_context_pixmap( hdc, ctx ); wine_tsx11_lock(); if (TRACE_ON(wgl)) { - describeDrawable( physdev ); + int vis_id; + pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_VISUAL_ID, &vis_id); describeContext(ctx); + TRACE("hdc %p drawable %lx fmt %u vis %x ctx %p\n", hdc, + escape.drawable, escape.pixel_format, vis_id, ctx->ctx); } - TRACE(" make current for drawable %lx, ctx %p\n", drawable, ctx->ctx); - - ret = pglXMakeCurrent(gdi_display, drawable, ctx->ctx); + ret = pglXMakeCurrent(gdi_display, escape.drawable, ctx->ctx); if (ret) { @@ -1665,13 +1650,13 @@ static BOOL glxdrv_wglMakeCurrent(PHYSDEV dev, HGLRC hglrc) ctx->has_been_current = TRUE; ctx->tid = GetCurrentThreadId(); - ctx->hdc = dev->hdc; - ctx->read_hdc = dev->hdc; - ctx->drawables[0] = drawable; - ctx->drawables[1] = drawable; + ctx->hdc = hdc; + ctx->read_hdc = hdc; + ctx->drawables[0] = escape.drawable; + ctx->drawables[1] = escape.drawable; ctx->refresh_drawables = FALSE; - if (physdev->type == DC_GL_BITMAP) pglDrawBuffer(GL_FRONT_LEFT); + if (escape.gl_type == DC_GL_BITMAP) pglDrawBuffer(GL_FRONT_LEFT); } else SetLastError(ERROR_INVALID_HANDLE); @@ -1720,8 +1705,8 @@ static BOOL glxdrv_wglMakeContextCurrentARB( PHYSDEV draw_dev, PHYSDEV read_dev, if (!pglXMakeContextCurrent) return FALSE; - if (draw_physdev->type == DC_GL_BITMAP) draw_drawable = get_context_pixmap( draw_physdev, ctx ); - if (read_physdev->type == DC_GL_BITMAP) read_drawable = get_context_pixmap( read_physdev, ctx ); + if (draw_physdev->type == DC_GL_BITMAP) draw_drawable = get_context_pixmap( draw_physdev->dev.hdc, ctx ); + if (read_physdev->type == DC_GL_BITMAP) read_drawable = get_context_pixmap( read_physdev->dev.hdc, ctx ); wine_tsx11_lock(); ret = pglXMakeContextCurrent(gdi_display, draw_drawable, read_drawable, ctx->ctx);

1 0

Austin English : po: Add missing url tag to nl.po.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 3a44c305a89f47754a336df45e45f1401490c605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a44c305a89f47754a336df45… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 27 11:20:59 2012 -0700 po: Add missing url tag to nl.po. --- po/nl.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/nl.po b/po/nl.po index 5987d35..eb032f1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -132,7 +132,7 @@ msgstr "" "en installeren.\n" "\n" "Noot: Het wordt aanbevolen om distributiepakketten te gebruiken. Zie <a " -"href=http://wiki.winehq.org/Gecko voor details." +"href=http://wiki.winehq.org/Gecko</a> voor details." #: appwiz.rc:106 appwiz.rc:121 msgid "&Install"

1 0

Henri Verbeet : d3d9: Implement d3d9_device_GetDisplayModeEx().
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 0ce894f27431a3d24ba11d4d3bb405f7d15fccef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce894f27431a3d24ba11d4d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 27 19:02:29 2012 +0200 d3d9: Implement d3d9_device_GetDisplayModeEx(). --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 30 ++++++++++++++++++++++++++---- dlls/d3d9/swapchain.c | 2 +- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/swapchain.c | 8 ++++---- include/wine/wined3d.h | 6 +++--- 6 files changed, 40 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 22d3b88..62a8e70 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -421,7 +421,7 @@ static HRESULT WINAPI d3d8_device_GetDisplayMode(IDirect3DDevice8 *iface, D3DDIS TRACE("iface %p, mode %p.\n", iface, mode); wined3d_mutex_lock(); - hr = wined3d_device_get_display_mode(device->wined3d_device, 0, &wined3d_mode); + hr = wined3d_device_get_display_mode(device->wined3d_device, 0, &wined3d_mode, NULL); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 44f6490..d4256fc 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -363,7 +363,7 @@ static HRESULT WINAPI d3d9_device_GetDisplayMode(IDirect3DDevice9Ex *iface, UINT TRACE("iface %p, swapchain %u, mode %p.\n", iface, swapchain, mode); wined3d_mutex_lock(); - hr = wined3d_device_get_display_mode(device->wined3d_device, swapchain, &wined3d_mode); + hr = wined3d_device_get_display_mode(device->wined3d_device, swapchain, &wined3d_mode, NULL); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) @@ -2930,12 +2930,34 @@ static HRESULT WINAPI d3d9_device_ResetEx(IDirect3DDevice9Ex *iface, return E_NOTIMPL; } -static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface, +static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface, UINT swapchain_idx, D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation) { - FIXME("iface %p, swapchain_idx %u, mode %p, rotation %p stub!\n", iface, swapchain_idx, mode, rotation); + struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + struct wined3d_display_mode wined3d_mode; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, swapchain_idx %u, mode %p, rotation %p.\n", + iface, swapchain_idx, mode, rotation); + + if (mode->Size != sizeof(*mode)) + return D3DERR_INVALIDCALL; + + wined3d_mutex_lock(); + hr = wined3d_device_get_display_mode(device->wined3d_device, swapchain_idx, &wined3d_mode, + (enum wined3d_display_rotation *)rotation); + wined3d_mutex_unlock(); + + if (SUCCEEDED(hr)) + { + mode->Width = wined3d_mode.width; + mode->Height = wined3d_mode.height; + mode->RefreshRate = wined3d_mode.refresh_rate; + mode->Format = d3dformat_from_wined3dformat(wined3d_mode.format_id); + mode->ScanLineOrdering = wined3d_mode.scanline_ordering; + } + + return hr; } static const struct IDirect3DDevice9ExVtbl d3d9_device_vtbl = diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index b8439a9..d73e6a8 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -175,7 +175,7 @@ static HRESULT WINAPI d3d9_swapchain_GetDisplayMode(IDirect3DSwapChain9 *iface, TRACE("iface %p, mode %p.\n", iface, mode); wined3d_mutex_lock(); - hr = wined3d_swapchain_get_display_mode(swapchain->wined3d_swapchain, &wined3d_mode); + hr = wined3d_swapchain_get_display_mode(swapchain->wined3d_swapchain, &wined3d_mode, NULL); wined3d_mutex_unlock(); if (SUCCEEDED(hr)) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index df64800..8c01184 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3715,17 +3715,18 @@ HRESULT CDECL wined3d_device_get_device_caps(const struct wined3d_device *device device->create_parms.device_type, caps); } -HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, - UINT swapchain_idx, struct wined3d_display_mode *mode) +HRESULT CDECL wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, + struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { struct wined3d_swapchain *swapchain; HRESULT hr; - TRACE("device %p, swapchain_idx %u, mode %p.\n", device, swapchain_idx, mode); + TRACE("device %p, swapchain_idx %u, mode %p, rotation %p.\n", + device, swapchain_idx, mode, rotation); if (SUCCEEDED(hr = wined3d_device_get_swapchain(device, swapchain_idx, &swapchain))) { - hr = wined3d_swapchain_get_display_mode(swapchain, mode); + hr = wined3d_swapchain_get_display_mode(swapchain, mode, rotation); wined3d_swapchain_decref(swapchain); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ea6e466..6dbd2d7 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -239,7 +239,7 @@ HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain if (!QueryPerformanceCounter(&counter) || !QueryPerformanceFrequency(&freq_per_sec)) return WINED3DERR_INVALIDCALL; - if (FAILED(wined3d_swapchain_get_display_mode(swapchain, &mode))) + if (FAILED(wined3d_swapchain_get_display_mode(swapchain, &mode, NULL))) return WINED3DERR_INVALIDCALL; if (mode.refresh_rate == DEFAULT_REFRESH_RATE) mode.refresh_rate = 60; @@ -261,14 +261,14 @@ HRESULT CDECL wined3d_swapchain_get_raster_status(const struct wined3d_swapchain } HRESULT CDECL wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, - struct wined3d_display_mode *mode) + struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation) { HRESULT hr; - TRACE("swapchain %p, mode %p.\n", swapchain, mode); + TRACE("swapchain %p, mode %p, rotation %p.\n", swapchain, mode, rotation); hr = wined3d_get_adapter_display_mode(swapchain->device->wined3d, - swapchain->device->adapter->ordinal, mode, NULL); + swapchain->device->adapter->ordinal, mode, rotation); TRACE("Returning w %u, h %u, refresh rate %u, format %s.\n", mode->width, mode->height, mode->refresh_rate, debug_d3dformat(mode->format_id)); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1c6ef15..5d4111d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2117,8 +2117,8 @@ HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_devi HRESULT __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device, struct wined3d_surface **depth_stencil); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); -HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, - UINT swapchain_idx, struct wined3d_display_mode *mode); +HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, + struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_surface *dst_surface); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, @@ -2366,7 +2366,7 @@ HRESULT __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain UINT backbuffer_idx, enum wined3d_backbuffer_type backbuffer_type, struct wined3d_surface **backbuffer); struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); HRESULT __cdecl wined3d_swapchain_get_display_mode(const struct wined3d_swapchain *swapchain, - struct wined3d_display_mode *mode); + struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_swapchain_get_front_buffer_data(const struct wined3d_swapchain *swapchain, struct wined3d_surface *dst_surface); HRESULT __cdecl wined3d_swapchain_get_gamma_ramp(const struct wined3d_swapchain *swapchain,

1 0

Henri Verbeet : d3d9: Implement d3d9_GetAdapterDisplayModeEx().
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 2c8834dffdc5325e7e5be72e7ba750a8c014664e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8834dffdc5325e7e5be72e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 27 19:02:28 2012 +0200 d3d9: Implement d3d9_GetAdapterDisplayModeEx(). --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 27 ++++++++++++++++++++++++--- dlls/d3d9/tests/d3d9ex.c | 42 ++++++++++++++++++++++++------------------ dlls/ddraw/ddraw.c | 14 +++++++------- dlls/ddraw/device.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 30 +++++++++++++++++++++++++++--- dlls/wined3d/swapchain.c | 5 +++-- include/wine/wined3d.h | 11 ++++++++++- 9 files changed, 99 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c8834dffdc5325e7e5be…

1 0

Jacek Caban : mshtml: Don't release nselem in HTMLElement_destructor.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: b225c73aa880d865a238bfc9e8b125ed46f06291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b225c73aa880d865a238bfc9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 27 16:53:52 2012 +0200 mshtml: Don't release nselem in HTMLElement_destructor. --- dlls/mshtml/htmlelem.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 1556cc7..62df8b8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1578,8 +1578,6 @@ void HTMLElement_destructor(HTMLDOMNode *iface) ConnectionPointContainer_Destroy(&This->cp_container); - if(This->nselem) - nsIDOMHTMLElement_Release(This->nselem); if(This->style) { This->style->elem = NULL; IHTMLStyle_Release(&This->style->IHTMLStyle_iface);

1 0

Hans Leidekker : wbemprox: Implement Win32_ComputerSystem. TotalPhysicalMemory.
by Alexandre Julliard June 28, 2012

June 28, 2012

Module: wine Branch: master Commit: 0c899bf440d6f76cc17e5ed0993fbd7b71056742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c899bf440d6f76cc17e5ed09… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 27 11:35:45 2012 +0200 wbemprox: Implement Win32_ComputerSystem.TotalPhysicalMemory. --- dlls/wbemprox/builtin.c | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index a41679a..a40fff6 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -99,7 +99,10 @@ static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; static const WCHAR prop_threadcountW[] = {'T','h','r','e','a','d','C','o','u','n','t',0}; +static const WCHAR prop_totalphysicalmemoryW[] = + {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; +/* column definitions must be kept in sync with record structures below */ static const struct column col_bios[] = { { prop_descriptionW, CIM_STRING }, @@ -113,7 +116,8 @@ static const struct column col_compsys[] = { prop_manufacturerW, CIM_STRING }, { prop_modelW, CIM_STRING }, { prop_numlogicalprocessorsW, CIM_UINT32 }, - { prop_numprocessorsW, CIM_UINT32 } + { prop_numprocessorsW, CIM_UINT32 }, + { prop_totalphysicalmemoryW, CIM_UINT64 } }; static const struct column col_networkadapter[] = { @@ -195,6 +199,7 @@ struct record_computersystem const WCHAR *model; UINT32 num_logical_processors; UINT32 num_processors; + UINT64 total_physical_memory; }; struct record_networkadapter { @@ -247,6 +252,15 @@ static UINT get_processor_count(void) return info.NumberOfProcessors; } +static UINT64 get_total_physical_memory(void) +{ + MEMORYSTATUSEX status; + + status.dwLength = sizeof(status); + if (!GlobalMemoryStatusEx( &status )) return 1024 * 1024 * 1024; + return status.ullTotalPhys; +} + static void fill_compsys( struct table *table ) { struct record_computersystem *rec; @@ -259,6 +273,7 @@ static void fill_compsys( struct table *table ) rec->model = compsys_modelW; rec->num_logical_processors = get_processor_count(); rec->num_processors = rec->num_logical_processors; + rec->total_physical_memory = get_total_physical_memory(); TRACE("created 1 row\n"); table->num_rows = 1;

1 0