wine-commits June 2012

wine-commits@winehq.org

3 participants
827 discussions

Alexandre Julliard : opengl32: Make the WGL driver context-specific.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 83be88953bc5a4fa6d3cd53f81c09f493e2dd86a URL: http://source.winehq.org/git/wine.git/?a=commit;h=83be88953bc5a4fa6d3cd53f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 29 15:53:37 2012 +0200 opengl32: Make the WGL driver context-specific. --- dlls/gdi32/driver.c | 2 +- dlls/opengl32/wgl.c | 83 +++++++++++++++++++++++++++----------------- dlls/winex11.drv/opengl.c | 5 +-- include/wine/gdi_driver.h | 4 +- 4 files changed, 55 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83be88953bc5a4fa6d3cd…

1 0

Alexandre Julliard : opengl32: Don' t allow making a thread current in multiple threads.
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Alexandre Julliard : opengl32: Move checks of the context thread id to opengl32.
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Alexandre Julliard : opengl32: Use proper handles for GL contexts and pass a context pointer to the WGL driver functions .
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Dmitry Timoshkov : gdiplus: Add a bunch of tests for TIFF image properties.
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Dmitry Timoshkov : gdiplus: Add some tests for GdipGetPropertyItemSize and GdipGetPropertyItem.
by Alexandre Julliard 29 Jun '12

29 Jun '12

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 : gdiplus: Implement GdipGetPropertyItem.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 670445b22b9ce027bc35c40359499447ef4f8632 URL: http://source.winehq.org/git/wine.git/?a=commit;h=670445b22b9ce027bc35c4035… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 13:26:49 2012 +0900 gdiplus: Implement GdipGetPropertyItem. --- dlls/gdiplus/image.c | 144 +++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 131 insertions(+), 13 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 63f3a65..d1affae 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2475,19 +2475,6 @@ GpStatus WINGDIPAPI GdipGetPropertyIdList(GpImage *image, UINT num, PROPID *list return hr == S_OK ? Ok : hresult_to_status(hr); } -GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID id, UINT size, - PropertyItem* buffer) -{ - static int calls; - - TRACE("(%p, %u, %u, %p)\n", image, id, size, buffer); - - if(!(calls++)) - FIXME("not implemented\n"); - - return InvalidParameter; -} - static UINT propvariant_size(PROPVARIANT *value) { switch (value->vt & ~VT_VECTOR) @@ -2553,6 +2540,137 @@ GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID propid, UINT return Ok; } +#ifndef PropertyTagTypeSByte +#define PropertyTagTypeSByte 6 +#define PropertyTagTypeSShort 8 +#define PropertyTagTypeFloat 11 +#define PropertyTagTypeDouble 12 +#endif + +static UINT vt_to_itemtype(UINT vt) +{ + static const struct + { + UINT vt, type; + } vt2type[] = + { + { VT_I1, PropertyTagTypeSByte }, + { VT_UI1, PropertyTagTypeByte }, + { VT_I2, PropertyTagTypeSShort }, + { VT_UI2, PropertyTagTypeShort }, + { VT_I4, PropertyTagTypeSLONG }, + { VT_UI4, PropertyTagTypeLong }, + { VT_I8, PropertyTagTypeSRational }, + { VT_UI8, PropertyTagTypeRational }, + { VT_R4, PropertyTagTypeFloat }, + { VT_R8, PropertyTagTypeDouble }, + { VT_LPSTR, PropertyTagTypeASCII }, + { VT_BLOB, PropertyTagTypeUndefined } + }; + UINT i; + for (i = 0; i < sizeof(vt2type)/sizeof(vt2type[0]); i++) + { + if (vt2type[i].vt == vt) return vt2type[i].type; + } + FIXME("not supported variant type %u\n", vt); + return 0; +} + +static GpStatus propvariant_to_item(PROPVARIANT *value, PropertyItem *item, + UINT size, PROPID id) +{ + UINT item_size, item_type; + + item_size = propvariant_size(value); + if (size != item_size + sizeof(PropertyItem)) return InvalidParameter; + + item_type = vt_to_itemtype(value->vt & ~VT_VECTOR); + if (!item_type) return InvalidParameter; + + item->value = item + 1; + + switch (value->vt & ~VT_VECTOR) + { + case VT_I1: + case VT_UI1: + if (!(value->vt & VT_VECTOR)) + *(BYTE *)item->value = value->u.bVal; + else + memcpy(item->value, value->u.caub.pElems, item_size); + break; + case VT_I2: + case VT_UI2: + if (!(value->vt & VT_VECTOR)) + *(USHORT *)item->value = value->u.uiVal; + else + memcpy(item->value, value->u.caui.pElems, item_size); + break; + case VT_I4: + case VT_UI4: + case VT_R4: + if (!(value->vt & VT_VECTOR)) + *(ULONG *)item->value = value->u.ulVal; + else + memcpy(item->value, value->u.caul.pElems, item_size); + break; + case VT_I8: + case VT_UI8: + case VT_R8: + if (!(value->vt & VT_VECTOR)) + *(ULONGLONG *)item->value = value->u.uhVal.QuadPart; + else + memcpy(item->value, value->u.cauh.pElems, item_size); + break; + case VT_LPSTR: + memcpy(item->value, value->u.pszVal, item_size); + break; + case VT_BLOB: + memcpy(item->value, value->u.blob.pBlobData, item_size); + break; + default: + FIXME("not supported variant type %d\n", value->vt); + return InvalidParameter; + } + + item->length = item_size; + item->type = item_type; + item->id = id; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID propid, UINT size, + PropertyItem *buffer) +{ + GpStatus stat; + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT id, value; + + TRACE("(%p,%#x,%u,%p)\n", image, propid, size, buffer); + + if (!image || !buffer) return InvalidParameter; + + if (image->type != ImageTypeBitmap) + { + FIXME("Not implemented for type %d\n", image->type); + return NotImplemented; + } + + reader = ((GpBitmap *)image)->metadata_reader; + if (!reader) return PropertyNotFound; + + id.vt = VT_UI2; + id.u.uiVal = propid; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + if (FAILED(hr)) return PropertyNotFound; + + stat = propvariant_to_item(&value, buffer, size, propid); + PropVariantClear(&value); + + return stat; +} + GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT* size, UINT* num) { static int calls;

1 0

Dmitry Timoshkov : gdiplus: Implement GdipGetPropertyItemSize.
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 9d953c5f793174d28f20df6c5a378ea09f01aeaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d953c5f793174d28f20df6c5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 13:25:57 2012 +0900 gdiplus: Implement GdipGetPropertyItemSize. --- dlls/gdiplus/image.c | 67 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e676a4e..63f3a65 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2488,20 +2488,69 @@ GpStatus WINGDIPAPI GdipGetPropertyItem(GpImage *image, PROPID id, UINT size, return InvalidParameter; } -GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID pid, - UINT* size) +static UINT propvariant_size(PROPVARIANT *value) { - static int calls; + switch (value->vt & ~VT_VECTOR) + { + case VT_EMPTY: + return 0; + case VT_I1: + case VT_UI1: + if (!(value->vt & VT_VECTOR)) return 1; + return value->u.caub.cElems; + case VT_I2: + case VT_UI2: + if (!(value->vt & VT_VECTOR)) return 2; + return value->u.caui.cElems * 2; + case VT_I4: + case VT_UI4: + case VT_R4: + if (!(value->vt & VT_VECTOR)) return 4; + return value->u.caul.cElems * 4; + case VT_I8: + case VT_UI8: + case VT_R8: + if (!(value->vt & VT_VECTOR)) return 8; + return value->u.cauh.cElems * 8; + case VT_LPSTR: + return value->u.pszVal ? strlen(value->u.pszVal) + 1 : 0; + case VT_BLOB: + return value->u.blob.cbSize; + default: + FIXME("not supported variant type %d\n", value->vt); + return 0; + } +} - TRACE("%p %x %p\n", image, pid, size); +GpStatus WINGDIPAPI GdipGetPropertyItemSize(GpImage *image, PROPID propid, UINT *size) +{ + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT id, value; - if(!size || !image) - return InvalidParameter; + TRACE("(%p,%#x,%p)\n", image, propid, size); - if(!(calls++)) - FIXME("not implemented\n"); + if (!size || !image) return InvalidParameter; - return NotImplemented; + if (image->type != ImageTypeBitmap) + { + FIXME("Not implemented for type %d\n", image->type); + return NotImplemented; + } + + reader = ((GpBitmap *)image)->metadata_reader; + if (!reader) return PropertyNotFound; + + id.vt = VT_UI2; + id.u.uiVal = propid; + hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value); + if (FAILED(hr)) return PropertyNotFound; + + *size = propvariant_size(&value); + if (*size) *size += sizeof(PropertyItem); + PropVariantClear(&value); + + return Ok; } GpStatus WINGDIPAPI GdipGetPropertySize(GpImage *image, UINT* size, UINT* num)

1 0

Dmitry Timoshkov : windowscodecs: Implement MetadataHandler_GetValue.
by Alexandre Julliard 29 Jun '12

29 Jun '12

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

Dmitry Timoshkov : include/basetsd.h: Fix int64 to int truncation warnings when compiling with a 64-bit PSDK compiler .
by Alexandre Julliard 29 Jun '12

29 Jun '12

Module: wine Branch: master Commit: 79969b6cc4bed59e7c24f03a001776b3816d9b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79969b6cc4bed59e7c24f03a0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jun 28 19:12:31 2012 +0900 include/basetsd.h: Fix int64 to int truncation warnings when compiling with a 64-bit PSDK compiler. --- include/basetsd.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 698dd5c..4a59897 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -153,12 +153,12 @@ typedef unsigned int UHALF_PTR, *PUHALF_PTR; static inline ULONG32 HandleToULong(const void *h) { - return (ULONG_PTR)h; + return (ULONG32)(ULONG_PTR)h; } static inline LONG32 HandleToLong(const void *h) { - return (LONG_PTR)h; + return (LONG32)(LONG_PTR)h; } static inline void *ULongToHandle(ULONG32 ul) @@ -173,32 +173,32 @@ static inline void *LongToHandle(LONG32 l) static inline ULONG32 PtrToUlong(const void *p) { - return (ULONG_PTR)p; + return (ULONG32)(ULONG_PTR)p; } static inline LONG32 PtrToLong(const void *p) { - return (LONG_PTR)p; + return (LONG32)(LONG_PTR)p; } static inline UINT32 PtrToUint(const void *p) { - return (UINT_PTR)p; + return (UINT32)(UINT_PTR)p; } static inline INT32 PtrToInt(const void *p) { - return (INT_PTR)p; + return (INT32)(INT_PTR)p; } static inline UINT16 PtrToUshort(const void *p) { - return (ULONG_PTR)p; + return (UINT16)(ULONG_PTR)p; } static inline INT16 PtrToShort(const void *p) { - return (LONG_PTR)p; + return (INT16)(LONG_PTR)p; } static inline void *IntToPtr(INT32 i)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2012