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

Alexandre Julliard : opengl32: Use proper handles for GL contexts and pass a context pointer to the WGL driver functions .
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 0045ec9dfb29a36e7b00357c90f3b57f642506e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0045ec9dfb29a36e7b00357c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 29 12:29:55 2012 +0200 opengl32: Use proper handles for GL contexts and pass a context pointer to the WGL driver functions. --- dlls/gdi32/driver.c | 15 ++-- dlls/opengl32/tests/opengl.c | 2 +- dlls/opengl32/wgl.c | 168 ++++++++++++++++++++++++++++++++++++------ dlls/winex11.drv/opengl.c | 107 ++++++++++----------------- include/wine/gdi_driver.h | 24 +++--- 5 files changed, 206 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0045ec9dfb29a36e7b003…

1 0

Alexandre Julliard : opengl32: Move checks of the context thread id to opengl32.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: d89f7f25631850be571ca1a93854d048e9e7c776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d89f7f25631850be571ca1a93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 29 14:13:13 2012 +0200 opengl32: Move checks of the context thread id to opengl32. --- dlls/gdi32/driver.c | 3 +- dlls/opengl32/wgl.c | 71 ++++++++++++++++++++++++++++++++++---------- dlls/winex11.drv/opengl.c | 23 +-------------- include/wine/gdi_driver.h | 2 +- 4 files changed, 58 insertions(+), 41 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 2b62c46..1dfdbb1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -682,9 +682,8 @@ static struct wgl_context *nulldrv_wglCreateContextAttribsARB( HDC hdc, struct w return 0; } -static BOOL nulldrv_wglDeleteContext( struct wgl_context *context ) +static void nulldrv_wglDeleteContext( struct wgl_context *context ) { - return FALSE; } static HDC nulldrv_wglGetCurrentDC(void) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index abd38e1..6906b56 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -86,6 +86,7 @@ extern BOOL WINAPI GdiSwapBuffers( HDC hdc ); struct wgl_handle { UINT handle; + DWORD tid; struct wgl_context *context; }; @@ -110,6 +111,13 @@ static inline HGLRC next_handle( struct wgl_handle *ptr ) return ULongToHandle( ptr->handle ); } +/* the current handle is assumed valid and doesn't need locking */ +static inline struct wgl_handle *get_current_handle_ptr(void) +{ + if (!NtCurrentTeb()->glCurrentRC) return NULL; + return &wgl_handles[LOWORD(NtCurrentTeb()->glCurrentRC)]; +} + static struct wgl_handle *get_handle_ptr( HGLRC handle ) { unsigned int index = LOWORD( handle ); @@ -191,12 +199,15 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) struct wgl_handle *ptr = get_handle_ptr( hglrc ); if (!ptr) return FALSE; - if (hglrc == NtCurrentTeb()->glCurrentRC) wglMakeCurrent( 0, 0 ); - if (!wgl_driver->p_wglDeleteContext( ptr->context )) + + if (ptr->tid && ptr->tid != GetCurrentThreadId()) { + SetLastError( ERROR_BUSY ); release_handle_ptr( ptr ); return FALSE; } + if (hglrc == NtCurrentTeb()->glCurrentRC) wglMakeCurrent( 0, 0 ); + wgl_driver->p_wglDeleteContext( ptr->context ); free_handle_ptr( ptr ); return TRUE; } @@ -206,18 +217,32 @@ BOOL WINAPI wglDeleteContext(HGLRC hglrc) */ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) { - struct wgl_handle *ptr = NULL; - BOOL ret; + BOOL ret = TRUE; + struct wgl_handle *ptr, *prev = get_current_handle_ptr(); - if (!hglrc && !hdc && !NtCurrentTeb()->glCurrentRC) + if (hglrc) + { + if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; + ret = wgl_driver->p_wglMakeCurrent( hdc, ptr->context ); + if (ret) + { + if (prev) prev->tid = 0; + ptr->tid = GetCurrentThreadId(); + NtCurrentTeb()->glCurrentRC = hglrc; + } + release_handle_ptr( ptr ); + } + else if (prev) + { + if (!wgl_driver->p_wglMakeCurrent( 0, NULL )) return FALSE; + prev->tid = 0; + NtCurrentTeb()->glCurrentRC = 0; + } + else if (!hdc) { SetLastError( ERROR_INVALID_HANDLE ); - return FALSE; + ret = FALSE; } - if (hglrc && !(ptr = get_handle_ptr( hglrc ))) return FALSE; - ret = wgl_driver->p_wglMakeCurrent( hdc, ptr ? ptr->context : NULL ); - if (ret) NtCurrentTeb()->glCurrentRC = hglrc; - release_handle_ptr( ptr ); return ret; } @@ -247,13 +272,27 @@ static HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int */ static BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC hglrc ) { - struct wgl_handle *ptr = NULL; - BOOL ret; + BOOL ret = TRUE; + struct wgl_handle *ptr, *prev = get_current_handle_ptr(); - if (hglrc && !(ptr = get_handle_ptr( hglrc ))) return FALSE; - ret = wgl_driver->p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr ? ptr->context : NULL ); - if (ret) NtCurrentTeb()->glCurrentRC = hglrc; - release_handle_ptr( ptr ); + if (hglrc) + { + if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; + ret = wgl_driver->p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr->context ); + if (ret) + { + if (prev) prev->tid = 0; + ptr->tid = GetCurrentThreadId(); + NtCurrentTeb()->glCurrentRC = hglrc; + } + release_handle_ptr( ptr ); + } + else if (prev) + { + if (!wgl_driver->p_wglMakeCurrent( 0, NULL )) return FALSE; + prev->tid = 0; + NtCurrentTeb()->glCurrentRC = 0; + } return ret; } diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e87fe5d..c278c46 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -115,7 +115,6 @@ struct wgl_context HDC hdc; BOOL has_been_current; BOOL sharing; - DWORD tid; BOOL gl3_context; XVisualInfo *vis; WineGLPixelFormat *fmt; @@ -1453,18 +1452,10 @@ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) /*********************************************************************** * glxdrv_wglDeleteContext */ -static BOOL glxdrv_wglDeleteContext(struct wgl_context *ctx) +static void glxdrv_wglDeleteContext(struct wgl_context *ctx) { TRACE("(%p)\n", ctx); - /* WGL doesn't allow deletion of a context which is current in another thread */ - if (ctx->tid != 0 && ctx->tid != GetCurrentThreadId()) - { - TRACE("Cannot delete context=%p because it is current in another thread.\n", ctx); - SetLastError(ERROR_BUSY); - return FALSE; - } - wine_tsx11_lock(); list_remove( &ctx->entry ); if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); @@ -1474,7 +1465,6 @@ static BOOL glxdrv_wglDeleteContext(struct wgl_context *ctx) wine_tsx11_unlock(); HeapFree( GetProcessHeap(), 0, ctx ); - return TRUE; } /** @@ -1551,15 +1541,12 @@ static GLXPixmap get_context_pixmap( HDC hdc, struct wgl_context *ctx ) static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) { BOOL ret; - struct wgl_context *prev_ctx = NtCurrentTeb()->glContext; struct x11drv_escape_get_drawable escape; TRACE("(%p,%p)\n", hdc, ctx); if (!ctx) { - if (prev_ctx) prev_ctx->tid = 0; - wine_tsx11_lock(); ret = pglXMakeCurrent(gdi_display, None, NULL); wine_tsx11_unlock(); @@ -1603,11 +1590,9 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) if (ret) { - if (prev_ctx) prev_ctx->tid = 0; NtCurrentTeb()->glContext = ctx; ctx->has_been_current = TRUE; - ctx->tid = GetCurrentThreadId(); ctx->hdc = hdc; ctx->read_hdc = hdc; ctx->drawables[0] = escape.drawable; @@ -1629,7 +1614,6 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) */ static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct wgl_context *ctx ) { - struct wgl_context *prev_ctx = NtCurrentTeb()->glContext; struct x11drv_escape_get_drawable escape_draw, escape_read; BOOL ret; @@ -1637,8 +1621,6 @@ static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct if (!ctx) { - if (prev_ctx) prev_ctx->tid = 0; - wine_tsx11_lock(); ret = pglXMakeCurrent(gdi_display, None, NULL); wine_tsx11_unlock(); @@ -1673,10 +1655,7 @@ static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct ret = pglXMakeContextCurrent(gdi_display, escape_draw.drawable, escape_read.drawable, ctx->ctx); if (ret) { - if (prev_ctx) prev_ctx->tid = 0; - ctx->has_been_current = TRUE; - ctx->tid = GetCurrentThreadId(); ctx->hdc = draw_hdc; ctx->read_hdc = read_hdc; ctx->drawables[0] = escape_draw.drawable; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 4626371..22214f2 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -234,7 +234,7 @@ struct wgl_funcs BOOL (*p_wglCopyContext)(struct wgl_context*,struct wgl_context*,UINT); struct wgl_context* (*p_wglCreateContext)(HDC); struct wgl_context* (*p_wglCreateContextAttribsARB)(HDC,struct wgl_context*,const int*); - BOOL (*p_wglDeleteContext)(struct wgl_context*); + void (*p_wglDeleteContext)(struct wgl_context*); HDC (*p_wglGetCurrentDC)(void); PROC (*p_wglGetProcAddress)(LPCSTR); BOOL (*p_wglMakeContextCurrentARB)(HDC,HDC,struct wgl_context*);

1 0

Dmitry Timoshkov : gdiplus: Add a bunch of tests for TIFF image properties.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: f88231b96ba2761a5e5354108919f71d3b130099 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f88231b96ba2761a5e5354108… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 13:28:34 2012 +0900 gdiplus: Add a bunch of tests for TIFF image properties. --- dlls/gdiplus/tests/image.c | 251 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 251 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f88231b96ba2761a5e535…

1 0

Alexandre Julliard : opengl32: Don' t allow making a thread current in multiple threads.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 676194383c0e37644e98586ca0a1a201d3dd2e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=676194383c0e37644e98586ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 29 15:15:57 2012 +0200 opengl32: Don't allow making a thread current in multiple threads. --- dlls/opengl32/tests/opengl.c | 27 ++++++++++++++++++--------- dlls/opengl32/wgl.c | 36 ++++++++++++++++++++++++++---------- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 03e8ed2..77b4cf5 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -694,24 +694,30 @@ static void test_bitmap_rendering( BOOL use_dib ) struct wgl_thread_param { HANDLE test_finished; + HWND hwnd; HGLRC hglrc; - BOOL hglrc_deleted; - DWORD last_error; + BOOL make_current; + BOOL make_current_error; + BOOL deleted; + DWORD deleted_error; }; static DWORD WINAPI wgl_thread(void *param) { struct wgl_thread_param *p = param; + HDC hdc = GetDC( p->hwnd ); SetLastError(0xdeadbeef); - p->hglrc_deleted = wglDeleteContext(p->hglrc); - p->last_error = GetLastError(); + p->make_current = wglMakeCurrent(hdc, p->hglrc); + p->make_current_error = GetLastError(); + p->deleted = wglDeleteContext(p->hglrc); + p->deleted_error = GetLastError(); + ReleaseDC( p->hwnd, hdc ); SetEvent(p->test_finished); - return 0; } -static void test_deletecontext(HDC hdc) +static void test_deletecontext(HWND hwnd, HDC hdc) { struct wgl_thread_param thread_params; HGLRC hglrc = wglCreateContext(hdc); @@ -740,14 +746,17 @@ static void test_deletecontext(HDC hdc) * This differs from GLX which does allow it but it delays actual deletion until the context becomes not current. */ thread_params.hglrc = hglrc; + thread_params.hwnd = hwnd; thread_params.test_finished = CreateEvent(NULL, FALSE, FALSE, NULL); thread_handle = CreateThread(NULL, 0, wgl_thread, &thread_params, 0, &tid); ok(!!thread_handle, "Failed to create thread, last error %#x.\n", GetLastError()); if(thread_handle) { WaitForSingleObject(thread_handle, INFINITE); - ok(thread_params.hglrc_deleted == FALSE, "Attempt to delete WGL context from another thread passed but should fail!\n"); - ok(thread_params.last_error == ERROR_BUSY, "Expected last error to be ERROR_BUSY, got %u\n", thread_params.last_error); + ok(!thread_params.make_current, "Attempt to make WGL context from another thread passed\n"); + ok(thread_params.make_current_error == ERROR_BUSY, "Expected last error to be ERROR_BUSY, got %u\n", thread_params.make_current_error); + ok(!thread_params.deleted, "Attempt to delete WGL context from another thread passed\n"); + ok(thread_params.deleted_error == ERROR_BUSY, "Expected last error to be ERROR_BUSY, got %u\n", thread_params.deleted_error); } CloseHandle(thread_params.test_finished); @@ -1469,6 +1478,7 @@ START_TEST(opengl) * any WGL call :( On Wine this would work but not on real Windows because there can be different implementations (software, ICD, MCD). */ init_functions(); + test_deletecontext(hwnd, hdc); /* The lack of wglGetExtensionsStringARB in general means broken software rendering or the lack of decent OpenGL support, skip tests in such cases */ if (!pwglGetExtensionsStringARB) { @@ -1477,7 +1487,6 @@ START_TEST(opengl) } test_getprocaddress(hdc); - test_deletecontext(hdc); test_makecurrent(hdc); test_setpixelformat(hdc); test_destroy(hdc); diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 6906b56..d0d9d83 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -223,12 +223,20 @@ BOOL WINAPI wglMakeCurrent(HDC hdc, HGLRC hglrc) if (hglrc) { if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; - ret = wgl_driver->p_wglMakeCurrent( hdc, ptr->context ); - if (ret) + if (!ptr->tid || ptr->tid == GetCurrentThreadId()) { - if (prev) prev->tid = 0; - ptr->tid = GetCurrentThreadId(); - NtCurrentTeb()->glCurrentRC = hglrc; + ret = wgl_driver->p_wglMakeCurrent( hdc, ptr->context ); + if (ret) + { + if (prev) prev->tid = 0; + ptr->tid = GetCurrentThreadId(); + NtCurrentTeb()->glCurrentRC = hglrc; + } + } + else + { + SetLastError( ERROR_BUSY ); + ret = FALSE; } release_handle_ptr( ptr ); } @@ -278,12 +286,20 @@ static BOOL WINAPI wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, HGLRC h if (hglrc) { if (!(ptr = get_handle_ptr( hglrc ))) return FALSE; - ret = wgl_driver->p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr->context ); - if (ret) + if (!ptr->tid || ptr->tid == GetCurrentThreadId()) + { + ret = wgl_driver->p_wglMakeContextCurrentARB( draw_hdc, read_hdc, ptr->context ); + if (ret) + { + if (prev) prev->tid = 0; + ptr->tid = GetCurrentThreadId(); + NtCurrentTeb()->glCurrentRC = hglrc; + } + } + else { - if (prev) prev->tid = 0; - ptr->tid = GetCurrentThreadId(); - NtCurrentTeb()->glCurrentRC = hglrc; + SetLastError( ERROR_BUSY ); + ret = FALSE; } release_handle_ptr( ptr ); }

1 0

Piotr Caban : msvcp90: Implement remaining functions in basic_stringbuf< char> class.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: d538c1eebec99d28f79988a710702069f9a914e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d538c1eebec99d28f79988a71… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 29 12:02:49 2012 +0200 msvcp90: Implement remaining functions in basic_stringbuf<char> class. --- dlls/msvcp90/ios.c | 182 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 157 insertions(+), 25 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 27694bf..9802f7d 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2611,17 +2611,80 @@ basic_stringbuf_char* __thiscall MSVCP_basic_stringbuf_char_vector_dtor(basic_st DEFINE_THISCALL_WRAPPER(basic_stringbuf_char_overflow, 8) int __thiscall basic_stringbuf_char_overflow(basic_stringbuf_char *this, int meta) { - FIXME("(%p %x) stub\n", this, meta); - return 0; + MSVCP_size_t oldsize, size; + char *ptr, *buf; + + TRACE("(%p %x)\n", this, meta); + + if(meta == EOF) + return !EOF; + if(this->state & STRINGBUF_no_write) + return EOF; + + ptr = basic_streambuf_char_pptr(&this->base); + if((this->state&STRINGBUF_append) && ptr<this->seekhigh) + basic_streambuf_char_setp_next(&this->base, basic_streambuf_char_pbase(&this->base), + this->seekhigh, basic_streambuf_char_epptr(&this->base)); + + if(ptr && ptr<basic_streambuf_char_epptr(&this->base)) + return (*basic_streambuf_char__Pninc(&this->base) = meta); + + oldsize = (ptr ? basic_streambuf_char_epptr(&this->base)-basic_streambuf_char_eback(&this->base): 0); + size = oldsize|0xf; + size += size/2; + buf = MSVCRT_operator_new(size); + if(!buf) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } + + if(!oldsize) { + this->seekhigh = buf; + basic_streambuf_char_setp(&this->base, buf, buf+size); + if(this->state & STRINGBUF_no_read) + basic_streambuf_char_setg(&this->base, buf, NULL, buf); + else + basic_streambuf_char_setg(&this->base, buf, buf, buf+1); + + this->state |= STRINGBUF_allocated; + }else { + ptr = basic_streambuf_char_eback(&this->base); + memcpy(buf, ptr, oldsize); + + this->seekhigh = buf+(this->seekhigh-ptr); + basic_streambuf_char_setp_next(&this->base, buf, + buf+(basic_streambuf_char_pptr(&this->base)-ptr), buf+size); + if(this->state & STRINGBUF_no_read) + basic_streambuf_char_setg(&this->base, buf, NULL, buf); + else + basic_streambuf_char_setg(&this->base, buf, + buf+(basic_streambuf_char_gptr(&this->base)-ptr), + basic_streambuf_char_pptr(&this->base)+1); + + MSVCRT_operator_delete(ptr); + } + + return (*basic_streambuf_char__Pninc(&this->base) = meta); } /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHH(a)Z */ /* ?pbackfail@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MEAAHH(a)Z */ DEFINE_THISCALL_WRAPPER(basic_stringbuf_char_pbackfail, 8) -int __thiscall basic_stringbuf_char_pbackfail(basic_stringbuf_char *this, int type) +int __thiscall basic_stringbuf_char_pbackfail(basic_stringbuf_char *this, int c) { - FIXME("(%p %x) stub\n", this, type); - return 0; + char *cur; + + TRACE("(%p %x)\n", this, c); + + cur = basic_streambuf_char_gptr(&this->base); + if(!cur || cur==basic_streambuf_char_eback(&this->base) + || (c!=EOF && c!=cur[-1] && this->state&STRINGBUF_no_write)) + return EOF; + + if(c != EOF) + cur[-1] = c; + basic_streambuf_char_gbump(&this->base, -1); + return c==EOF ? !EOF : c; } /* ?underflow@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAEHXZ */ @@ -2629,26 +2692,98 @@ int __thiscall basic_stringbuf_char_pbackfail(basic_stringbuf_char *this, int ty DEFINE_THISCALL_WRAPPER(basic_stringbuf_char_underflow, 4) int __thiscall basic_stringbuf_char_underflow(basic_stringbuf_char *this) { - FIXME("(%p) stub\n", this); - return 0; + char *ptr, *cur; + + TRACE("(%p)\n", this); + + cur = basic_streambuf_char_gptr(&this->base); + if(!cur || this->state&STRINGBUF_no_read) + return EOF; + + ptr = basic_streambuf_char_pptr(&this->base); + if(this->seekhigh < ptr) + this->seekhigh = ptr; + + ptr = basic_streambuf_char_egptr(&this->base); + if(this->seekhigh > ptr) + basic_streambuf_char_setg(&this->base, basic_streambuf_char_eback(&this->base), cur, this->seekhigh); + + if(cur < this->seekhigh) + return *cur; + return EOF; } /* ?seekoff@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAE?AV?$fpos(a)H@2(a)JHH@Z */ /* ?seekoff@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MEAA?AV?$fpos(a)H@2(a)_JHH@Z */ -DEFINE_THISCALL_WRAPPER(basic_stringbuf_char_seekoff, 16) -int __thiscall basic_stringbuf_char_seekoff(basic_stringbuf_char *this, int off, int way, int which) +DEFINE_THISCALL_WRAPPER(basic_stringbuf_char_seekoff, 20) +fpos_int* __thiscall basic_stringbuf_char_seekoff(basic_stringbuf_char *this, + fpos_int *ret, streamoff off, int way, int mode) { - FIXME("(%p %d %d %d) stub\n", this, off, way, which); - return 0; + char *beg, *cur_r, *cur_w; + + TRACE("(%p %p %ld %d %d)\n", this, ret, off, way, mode); + + cur_w = basic_streambuf_char_pptr(&this->base); + if(cur_w > this->seekhigh) + this->seekhigh = cur_w; + + ret->off = 0; + ret->state = 0; + + beg = basic_streambuf_char_eback(&this->base); + cur_r = basic_streambuf_char_gptr(&this->base); + if((mode & OPENMODE_in) && cur_r) { + if(way==SEEKDIR_cur && !(mode & OPENMODE_out)) + off += cur_r-beg; + else if(way == SEEKDIR_end) + off += this->seekhigh-beg; + else if(way != SEEKDIR_beg) + off = -1; + + if(off<0 || off>this->seekhigh-beg) { + off = -1; + }else { + basic_streambuf_char_gbump(&this->base, beg-cur_r+off); + if((mode & OPENMODE_out) && cur_w) { + basic_streambuf_char_setp_next(&this->base, beg, + basic_streambuf_char_gptr(&this->base), + basic_streambuf_char_epptr(&this->base)); + } + } + }else if((mode & OPENMODE_out) && cur_w) { + if(way == SEEKDIR_cur) + off += cur_w-beg; + else if(way == SEEKDIR_end) + off += this->seekhigh-beg; + else if(way != SEEKDIR_beg) + off = -1; + + if(off<0 || off>this->seekhigh-beg) + off = -1; + else + basic_streambuf_char_pbump(&this->base, beg-cur_w+off); + }else { + off = -1; + } + + ret->pos = off; + return ret; } /* ?seekpos@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z */ /* ?seekpos@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@MEAA?AV?$fpos(a)H@2(a)V32@H(a)Z */ -DEFINE_THISCALL_WRAPPER(basic_stringbuf_char_seekpos, 12) -int __thiscall basic_stringbuf_char_seekpos(basic_stringbuf_char *this, int pos_type, int openmode) +DEFINE_THISCALL_WRAPPER(basic_stringbuf_char_seekpos, 36) +fpos_int* __thiscall basic_stringbuf_char_seekpos(basic_stringbuf_char *this, + fpos_int *ret, fpos_int pos, int mode) { - FIXME("(%p %d %d) stub\n", this, pos_type, openmode); - return 0; + TRACE("(%p %p %s %d)\n", this, ret, debugstr_fpos_int(&pos), mode); + + if(pos.off==0 && pos.pos==-1 && pos.state==0) { + *ret = pos; + return ret; + } + + return basic_stringbuf_char_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); } /* ?str@?$basic_stringbuf(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXABV?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@2@@Z */ @@ -2672,24 +2807,21 @@ basic_string_char* __thiscall basic_stringbuf_char_str_get(basic_stringbuf_char TRACE("(%p)\n", this); - if(!(this->state & STRINGBUF_no_read) && basic_streambuf_char_gptr(&this->base)) { - ptr = basic_streambuf_char_eback(&this->base); - MSVCP_basic_string_char_ctor_cstr_len(ret, ptr, basic_streambuf_char_egptr(&this->base) - ptr); - return ret; - } - if(!(this->state & STRINGBUF_no_write) && basic_streambuf_char_pptr(&this->base)) { char *pptr; ptr = basic_streambuf_char_pbase(&this->base); pptr = basic_streambuf_char_pptr(&this->base); - MSVCP_basic_string_char_ctor_cstr_len(ret, ptr, (this->seekhigh < pptr ? pptr : this->seekhigh) - ptr); - return ret; + return MSVCP_basic_string_char_ctor_cstr_len(ret, ptr, (this->seekhigh < pptr ? pptr : this->seekhigh) - ptr); } - MSVCP_basic_string_char_ctor(ret); - return ret; + if(!(this->state & STRINGBUF_no_read) && basic_streambuf_char_gptr(&this->base)) { + ptr = basic_streambuf_char_eback(&this->base); + return MSVCP_basic_string_char_ctor_cstr_len(ret, ptr, basic_streambuf_char_egptr(&this->base) - ptr); + } + + return MSVCP_basic_string_char_ctor(ret); } /* ??0ios_base(a)std@@IAE(a)XZ */

1 0

Dmitry Timoshkov : gdiplus: Add some tests for GdipGetPropertyItemSize and GdipGetPropertyItem.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 0c681b1478838a627443656a6784cb67adf9d84b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c681b1478838a627443656a6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 13:27:39 2012 +0900 gdiplus: Add some tests for GdipGetPropertyItemSize and GdipGetPropertyItem. --- dlls/gdiplus/tests/image.c | 99 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 86 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index c373f13..274098f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -21,6 +21,7 @@ #define COBJMACROS #include <math.h> +#include <assert.h> #include "initguid.h" #include "windows.h" @@ -2711,22 +2712,32 @@ static void test_image_properties(void) UINT image_size; ImageType image_type; UINT prop_count; + UINT prop_count2; /* if win7 behaves differently */ + /* 1st property attributes */ + UINT prop_size; + UINT prop_size2; /* if win7 behaves differently */ + UINT prop_id; + UINT prop_id2; /* if win7 behaves differently */ } td[] = { - { pngimage, sizeof(pngimage), ImageTypeBitmap, 4 }, - /* Win7 reports 4 properties, while everybody else just 1 - { gifimage, sizeof(gifimage), ImageTypeBitmap, 1 }, */ - { jpgimage, sizeof(jpgimage), ImageTypeBitmap, 2 }, - { tiffimage, sizeof(tiffimage), ImageTypeBitmap, 16 }, - { bmpimage, sizeof(bmpimage), ImageTypeBitmap, 0 }, - { wmfimage, sizeof(wmfimage), ImageTypeMetafile, 0 } + { pngimage, sizeof(pngimage), ImageTypeBitmap, 4, ~0, 1, 20, 0x5110, 0x132 }, + { gifimage, sizeof(gifimage), ImageTypeBitmap, 1, 4, 4, 0, 0x5100, 0 }, + { jpgimage, sizeof(jpgimage), ImageTypeBitmap, 2, ~0, 128, 0, 0x5090, 0x5091 }, + { tiffimage, sizeof(tiffimage), ImageTypeBitmap, 16, 0, 4, 0, 0xfe, 0 }, + { bmpimage, sizeof(bmpimage), ImageTypeBitmap, 0, 0, 0, 0, 0, 0 }, + { wmfimage, sizeof(wmfimage), ImageTypeMetafile, 0, 0, 0, 0, 0, 0 } }; GpStatus status; GpImage *image; - UINT prop_count, i; - PROPID prop_id[16]; + UINT prop_count, prop_size, i; + PROPID prop_id[16] = { 0 }; ImageType image_type; + union + { + PropertyItem data; + char buf[256]; + } item; for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) { @@ -2744,12 +2755,35 @@ static void test_image_properties(void) if (td[i].image_data == pngimage || td[i].image_data == gifimage || td[i].image_data == jpgimage) todo_wine - ok(td[i].prop_count == prop_count, " %u: expected property count %u, got %u\n", - i, td[i].prop_count, prop_count); + ok(td[i].prop_count == prop_count || td[i].prop_count2 == prop_count, + " %u: expected property count %u or %u, got %u\n", + i, td[i].prop_count, td[i].prop_count2, prop_count); + else + ok(td[i].prop_count == prop_count || td[i].prop_count2 == prop_count, + " %u: expected property count %u or %u, got %u\n", + i, td[i].prop_count, td[i].prop_count2, prop_count); + + status = GdipGetPropertyItemSize(NULL, 0, &prop_size); + expect(InvalidParameter, status); + status = GdipGetPropertyItemSize(image, 0, NULL); + expect(InvalidParameter, status); + status = GdipGetPropertyItemSize(image, 0, &prop_size); + if (image_type == ImageTypeMetafile) + expect(NotImplemented, status); else - ok(td[i].prop_count == prop_count, " %u: expected property count %u, got %u\n", - i, td[i].prop_count, prop_count); + expect(PropertyNotFound, status); + status = GdipGetPropertyItem(NULL, 0, 0, &item.data); + expect(InvalidParameter, status); + status = GdipGetPropertyItem(image, 0, 0, NULL); + expect(InvalidParameter, status); + status = GdipGetPropertyItem(image, 0, 0, &item.data); + if (image_type == ImageTypeMetafile) + expect(NotImplemented, status); + else + expect(PropertyNotFound, status); + + /* FIXME: remove once Wine is fixed */ if (td[i].prop_count != prop_count) { GdipDisposeImage(image); @@ -2781,7 +2815,46 @@ static void test_image_properties(void) if (image_type == ImageTypeMetafile) expect(NotImplemented, status); else + { expect(Ok, status); + if (prop_count != 0) + ok(td[i].prop_id == prop_id[0] || td[i].prop_id2 == prop_id[0], + " %u: expected property id %#x or %#x, got %#x\n", + i, td[i].prop_id, td[i].prop_id2, prop_id[0]); + } + + if (status == Ok) + { + status = GdipGetPropertyItemSize(image, prop_id[0], &prop_size); + if (prop_count == 0) + expect(PropertyNotFound, status); + else + { + expect(Ok, status); + + assert(sizeof(item) >= prop_size); + ok(prop_size > sizeof(PropertyItem), "%u: got too small prop_size %u\n", + i, prop_size); + ok(td[i].prop_size + sizeof(PropertyItem) == prop_size || + td[i].prop_size2 + sizeof(PropertyItem) == prop_size, + " %u: expected property size %u or %u, got %u\n", + i, td[i].prop_size, td[i].prop_size2, prop_size); + + status = GdipGetPropertyItem(image, prop_id[0], 0, &item.data); + ok(status == InvalidParameter || status == GenericError /* Win7 */, + "%u: expected InvalidParameter, got %d\n", i, status); + status = GdipGetPropertyItem(image, prop_id[0], prop_size - 1, &item.data); + ok(status == InvalidParameter || status == GenericError /* Win7 */, + "%u: expected InvalidParameter, got %d\n", i, status); + status = GdipGetPropertyItem(image, prop_id[0], prop_size + 1, &item.data); + ok(status == InvalidParameter || status == GenericError /* Win7 */, + "%u: expected InvalidParameter, got %d\n", i, status); + status = GdipGetPropertyItem(image, prop_id[0], prop_size, &item.data); + expect(Ok, status); + ok(prop_id[0] == item.data.id, + "%u: expected property id %#x, got %#x\n", i, prop_id[0], item.data.id); + } + } GdipDisposeImage(image); }

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataHandler_GetValue.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 8b30ef11cf9a5bd7ffc1b0c22b8681dfa68dfefa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b30ef11cf9a5bd7ffc1b0c22… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 13:25:05 2012 +0900 windowscodecs: Implement MetadataHandler_GetValue. --- dlls/windowscodecs/metadatahandler.c | 79 ++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/metadata.c | 41 +++++++++++++++++- 2 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index a3eea1f..7072a95 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -213,11 +213,84 @@ static HRESULT WINAPI MetadataHandler_GetValueByIndex(IWICMetadataWriter *iface, return hr; } +static BOOL get_int_value(const PROPVARIANT *pv, LONGLONG *value) +{ + switch (pv->vt) + { + case VT_NULL: + case VT_EMPTY: + *value = 0; + break; + case VT_I1: + *value = pv->u.cVal; + break; + case VT_UI1: + *value = pv->u.bVal; + break; + case VT_I2: + *value = pv->u.iVal; + break; + case VT_UI2: + *value = pv->u.uiVal; + break; + case VT_I4: + *value = pv->u.lVal; + break; + case VT_UI4: + *value = pv->u.ulVal; + break; + case VT_I8: + case VT_UI8: + *value = pv->u.hVal.QuadPart; + break; + default: + FIXME("not supported variant type %d\n", pv->vt); + return FALSE; + } + return TRUE; +} + +/* FiXME: Use propsys.PropVariantCompareEx once it's implemented */ +static int propvar_cmp(const PROPVARIANT *v1, const PROPVARIANT *v2) +{ + LONGLONG value1, value2; + + if (!get_int_value(v1, &value1)) return -1; + if (!get_int_value(v2, &value2)) return -1; + + value1 -= value2; + if (value1) return value1 < 0 ? -1 : 1; + return 0; +} + static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface, - const PROPVARIANT *pvarSchema, const PROPVARIANT *pvarId, PROPVARIANT *pvarValue) + const PROPVARIANT *schema, const PROPVARIANT *id, PROPVARIANT *value) { - FIXME("(%p,%p,%p,%p): stub\n", iface, pvarSchema, pvarId, pvarValue); - return E_NOTIMPL; + UINT i; + HRESULT hr = WINCODEC_ERR_PROPERTYNOTFOUND; + MetadataHandler *This = impl_from_IWICMetadataWriter(iface); + + TRACE("(%p,%p,%p,%p)\n", iface, schema, id, value); + + if (!id) return E_INVALIDARG; + + EnterCriticalSection(&This->lock); + + for (i = 0; i < This->item_count; i++) + { + if (schema && This->items[i].schema.vt != VT_EMPTY) + { + if (propvar_cmp(schema, &This->items[i].schema) != 0) continue; + } + + if (propvar_cmp(id, &This->items[i].id) != 0) continue; + + hr = value ? PropVariantCopy(value, &This->items[i].value) : S_OK; + break; + } + + LeaveCriticalSection(&This->lock); + return hr; } static HRESULT WINAPI MetadataHandler_GetEnumerator(IWICMetadataWriter *iface, diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 76fd241..d3b2869 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -726,7 +726,46 @@ static void test_metadata_IFD(void) PropVariantClear(&value); hr = IWICMetadataReader_GetValueByIndex(reader, count, &schema, NULL, NULL); - ok(hr == E_INVALIDARG, "GetValueByIndex should fail\n"); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value); + ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "expected WINCODEC_ERR_PROPERTYNOTFOUND, got %#x\n", hr); + + hr = IWICMetadataReader_GetValue(reader, NULL, &id, NULL); + ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "expected WINCODEC_ERR_PROPERTYNOTFOUND, got %#x\n", hr); + + hr = IWICMetadataReader_GetValue(reader, &schema, NULL, NULL); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + hr = IWICMetadataReader_GetValue(reader, &schema, &id, NULL); + ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "expected WINCODEC_ERR_PROPERTYNOTFOUND, got %#x\n", hr); + + hr = IWICMetadataReader_GetValue(reader, &schema, NULL, &value); + ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr); + + id.vt = VT_UI2; + U(id).uiVal = 0xf00e; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, NULL); + ok(hr == S_OK, "GetValue error %#x\n", hr); + + /* schema is ignored by Ifd metadata reader */ + schema.vt = VT_UI4; + U(schema).ulVal = 0xdeadbeef; + hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value); + ok(hr == S_OK, "GetValue error %#x\n", hr); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(U(value).pszVal, "Hello World!"), "unexpected value: %s\n", U(value).pszVal); + PropVariantClear(&value); + + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + ok(hr == S_OK, "GetValue error %#x\n", hr); + ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt); + ok(!strcmp(U(value).pszVal, "Hello World!"), "unexpected value: %s\n", U(value).pszVal); + PropVariantClear(&value); hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader); ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr);

1 0

Francois Gouget : msvcp60: Remove the msvcp90 debug channel from misc. c as it is unused.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: cdfaa90a8dfdd1981682c0e3a37c223f602c3169 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdfaa90a8dfdd1981682c0e3a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jun 29 08:32:07 2012 +0200 msvcp60: Remove the msvcp90 debug channel from misc.c as it is unused. --- dlls/msvcp60/misc.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 5390deb..4d51199 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -25,8 +25,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); + /* ??0_Mutex(a)std@@QAE(a)XZ */ /* ??0_Mutex(a)std@@QEAA(a)XZ */

1 0

Henri Verbeet : d3d9: Implement d3d9_GetAdapterModeCountEx().
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 8d4e3d0d5810d7a8b08cce4b0a6ac3e6ebb9d7e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4e3d0d5810d7a8b08cce4b0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 29 07:37:57 2012 +0200 d3d9: Implement d3d9_GetAdapterModeCountEx(). --- dlls/d3d8/directx.c | 3 ++- dlls/d3d9/directx.c | 18 +++++++++++++++--- dlls/dxgi/output.c | 3 ++- dlls/wined3d/directx.c | 19 ++++++++++++++++--- include/wine/wined3d.h | 4 ++-- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 893340e..19575b1 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -157,7 +157,8 @@ static UINT WINAPI d3d8_GetAdapterModeCount(IDirect3D8 *iface, UINT adapter) TRACE("iface %p, adapter %u.\n", iface, adapter); wined3d_mutex_lock(); - hr = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, 0); + hr = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter, + WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 97a5bcb..02b2360 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -164,7 +164,8 @@ static UINT WINAPI d3d9_GetAdapterModeCount(IDirect3D9Ex *iface, UINT adapter, D return 0; wined3d_mutex_lock(); - ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, wined3dformat_from_d3dformat(format)); + ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + wined3dformat_from_d3dformat(format), WINED3D_SCANLINE_ORDERING_UNKNOWN); wined3d_mutex_unlock(); return ret; @@ -477,9 +478,20 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_CreateDevice(IDirect3D9Ex *iface, U static UINT WINAPI d3d9_GetAdapterModeCountEx(IDirect3D9Ex *iface, UINT adapter, const D3DDISPLAYMODEFILTER *filter) { - FIXME("iface %p, adapter %u, filter %p stub!\n", iface, adapter, filter); + struct d3d9 *d3d9 = impl_from_IDirect3D9Ex(iface); + UINT ret; + + TRACE("iface %p, adapter %u, filter %p.\n", iface, adapter, filter); + + if (filter->Format != D3DFMT_X8R8G8B8 && filter->Format != D3DFMT_R5G6B5) + return 0; - return 0; + wined3d_mutex_lock(); + ret = wined3d_get_adapter_mode_count(d3d9->wined3d, adapter, + wined3dformat_from_d3dformat(filter->Format), filter->ScanLineOrdering); + wined3d_mutex_unlock(); + + return ret; } static HRESULT WINAPI d3d9_EnumAdapterModesEx(IDirect3D9Ex *iface, diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index ecc9a10..4876507 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -146,7 +146,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_output_GetDisplayModeList(IDXGIOutput *ifa wined3d_format = wined3dformat_from_dxgi_format(format); EnterCriticalSection(&dxgi_cs); - max_count = wined3d_get_adapter_mode_count(wined3d, This->adapter->ordinal, wined3d_format); + max_count = wined3d_get_adapter_mode_count(wined3d, This->adapter->ordinal, + wined3d_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!desc) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a9e41ce..aef06af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2892,7 +2892,7 @@ HMONITOR CDECL wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT a /* Note: dx9 supplies a format. Calls from d3d8 supply WINED3DFMT_UNKNOWN */ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, - enum wined3d_format_id format_id) + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering) { const struct wined3d_adapter *adapter; const struct wined3d_format *format; @@ -2901,7 +2901,8 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad UINT format_bits; DEVMODEW mode; - TRACE("wined3d %p, adapter_idx %u, format %s.\n", wined3d, adapter_idx, debug_d3dformat(format_id)); + TRACE("wined3d %p, adapter_idx %u, format %s, scanline_ordering %#x.\n", + wined3d, adapter_idx, debug_d3dformat(format_id), scanline_ordering); if (adapter_idx >= wined3d->adapter_count) return 0; @@ -2915,6 +2916,17 @@ UINT CDECL wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT ad while (EnumDisplaySettingsExW(adapter->DeviceName, j++, &mode, 0)) { + if (mode.dmFields & DM_DISPLAYFLAGS) + { + if (scanline_ordering == WINED3D_SCANLINE_ORDERING_PROGRESSIVE + && (mode.u2.dmDisplayFlags & DM_INTERLACED)) + continue; + + if (scanline_ordering == WINED3D_SCANLINE_ORDERING_INTERLACED + && !(mode.u2.dmDisplayFlags & DM_INTERLACED)) + continue; + } + if (format_id == WINED3DFMT_UNKNOWN) { /* This is for d3d8, do not enumerate P8 here. */ @@ -4406,7 +4418,8 @@ HRESULT CDECL wined3d_check_device_type(const struct wined3d *wined3d, UINT adap } /* If the requested display format is not available, don't continue. */ - mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, display_format); + mode_count = wined3d_get_adapter_mode_count(wined3d, adapter_idx, + display_format, WINED3D_SCANLINE_ORDERING_UNKNOWN); if (!mode_count) { TRACE("No available modes for display format %s.\n", debug_d3dformat(display_format)); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5e95917..f346455 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2043,8 +2043,8 @@ HRESULT __cdecl wined3d_get_adapter_display_mode(const struct wined3d *wined3d, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); HRESULT __cdecl wined3d_get_adapter_identifier(const struct wined3d *wined3d, UINT adapter_idx, DWORD flags, struct wined3d_adapter_identifier *identifier); -UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, - UINT adapter_idx, enum wined3d_format_id format_id); +UINT __cdecl wined3d_get_adapter_mode_count(const struct wined3d *wined3d, UINT adapter_idx, + enum wined3d_format_id format_id, enum wined3d_scanline_ordering scanline_ordering); HMONITOR __cdecl wined3d_get_adapter_monitor(const struct wined3d *wined3d, UINT adapter_idx); HRESULT __cdecl wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, WINED3DCAPS *caps);

1 0

Nikolay Sivov : msxml3: Support VT_UI1|VT_ARRAY variant debug output.
by Alexandre Julliard June 29, 2012

June 29, 2012

Module: wine Branch: master Commit: 17966321665c01f020fd0ceb8c9116c17a84618d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17966321665c01f020fd0ceb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 29 00:44:50 2012 +0400 msxml3: Support VT_UI1|VT_ARRAY variant debug output. --- dlls/msxml3/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 48d007f..1553e77 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -291,6 +291,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_ERROR: 0x%08x}", V_ERROR(v)); case VT_VARIANT|VT_BYREF: return wine_dbg_sprintf("{VT_VARIANT|VT_BYREF: %s}", debugstr_variant(V_VARIANTREF(v))); + case VT_UI1|VT_ARRAY: + return "{VT_UI1|VT_ARRAY}"; default: return wine_dbg_sprintf("{vt %d}", V_VT(v)); }

1 0