August 2009 - Wine-commits - list.winehq.org

Austin English : dxdiag: Add basic command line parsing.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 93e7c6b23a3d1e0274b3eef44ad26cfa73c85cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e7c6b23a3d1e0274b3eef44… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 26 15:38:02 2009 -0500 dxdiag: Add basic command line parsing. Based on a patch by Dan Kegel. --- programs/dxdiag/main.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c index d8a4866..5334b22 100644 --- a/programs/dxdiag/main.c +++ b/programs/dxdiag/main.c @@ -20,9 +20,77 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> +#include "wine/debug.h" #include "wine/unicode.h" +WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); + +/* + Process options [/WHQL:ON|OFF][/X outfile][/T outfile] + Returns TRUE if options were present, FALSE otherwise + FIXME: Native behavior seems to be: + Only one of /X and /T is allowed, /WHQL must come before /X and /T, + quotes are optional around the filename, even if it contains spaces. +*/ + +static BOOL ProcessCommandLine(LPWSTR cmdline) +{ + const WCHAR *s = cmdline; + WCHAR outfile[MAX_PATH+1]; + int opt_t = FALSE; + int opt_x = FALSE; + int opt_help = FALSE; + int opt_given = FALSE; + int want_arg = FALSE; + + outfile[0] = 0; + while (*s) { + /* Skip whitespace before arg */ + while (*s == ' ') + s++; + /* Check for option */ + if (*s != '-' && *s != '/') + return FALSE; + s++; + switch (*s++) { + case 'T': + case 't': opt_t = TRUE; want_arg = TRUE; opt_given = TRUE; break; + case 'X': + case 'x': opt_x = TRUE; want_arg = TRUE; opt_given = TRUE; break; + case 'W': + case 'w': + opt_given = TRUE; + while (isalphaW(*s) || *s == ':') + s++; + break; + default: opt_help = TRUE; opt_given = TRUE; break; + } + /* Skip any spaces before next option or filename */ + while (*s == ' ') + s++; + if (want_arg) { + int i; + if (*s == '"') + s++; + for (i=0; i < MAX_PATH && *s && *s != '"'; i++, s++) + outfile[i] = *s; + outfile[i] = 0; + break; + } + } + if (opt_help) + WINE_FIXME("help unimplemented\n"); + if (opt_t) + WINE_FIXME("/t unimplemented\n"); + if (opt_x) + WINE_FIXME("/x unimplemented\n"); + return opt_given; +} + int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) { + if (ProcessCommandLine(cmdline)) + return 0; + return 0; }

1 0

Dylan Smith : winedbg: Resolve typedefs when checking for user defined type .
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 262e1bfa92be437e0e8c4969ce818c5c1303fd0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=262e1bfa92be437e0e8c4969c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 26 14:18:16 2009 -0400 winedbg: Resolve typedefs when checking for user defined type. All that matters is that the real type is a user defined type (e.g. structure, class, or union), so I used types_get_real_type instead of types_get_info to avoid issues with typedefs. --- programs/winedbg/types.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 9c21bd4..4a14143 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -263,8 +263,7 @@ BOOL types_udt_find_element(struct dbg_lvalue* lvalue, const char* name, long in char tmp[256]; struct dbg_type type; - if (!types_get_info(&lvalue->type, TI_GET_SYMTAG, &tag) || - tag != SymTagUDT) + if (!types_get_real_type(&lvalue->type, &tag) || tag != SymTagUDT) return FALSE; if (types_get_info(&lvalue->type, TI_GET_CHILDRENCOUNT, &count))

1 0

Dylan Smith : winedbg: Extract address from expression for listing source at address.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: fe8f6b80681a8a92973493e2408b8a1c2537857b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe8f6b80681a8a92973493e24… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 26 14:18:07 2009 -0400 winedbg: Extract address from expression for listing source at address. --- programs/winedbg/dbg.y | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index c1dcfd1..9b28fd1 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -182,8 +182,9 @@ list_arg: | pathname ':' tNUM { $$.FileName = $1; $$.LineNumber = $3; } | identifier { symbol_get_line(NULL, $1, &$$); } | pathname ':' identifier { symbol_get_line($1, $3, &$$); } - | '*' expr_lvalue { DWORD disp; $$.SizeOfStruct = sizeof($$); - SymGetLineFromAddr(dbg_curr_process->handle, (unsigned long)memory_to_linear_addr(& $2.addr), &disp, & $$); } + | '*' expr_lvalue { DWORD disp; ADDRESS64 addr; $$.SizeOfStruct = sizeof($$); + types_extract_as_address(&$2, &addr); + SymGetLineFromAddr(dbg_curr_process->handle, (unsigned long)memory_to_linear_addr(& addr), &disp, & $$); } ; run_command:

1 0

Rico Schüller : d3d10: Parse variable flag.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 739759bf8bca5206f09ad90019ca007ed90c9e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=739759bf8bca5206f09ad9001… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Aug 26 22:30:40 2009 +0200 d3d10: Parse variable flag. --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 6f95a96..a170d1d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -66,6 +66,7 @@ struct d3d10_effect_variable char *name; DWORD buffer_offset; DWORD annotation_count; + DWORD flag; }; struct d3d10_effect_local_buffer diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d05d6a6..71ec998 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -428,7 +428,10 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * read_dword(ptr, &v->buffer_offset); TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); - skip_dword_unknown(ptr, 2); + skip_dword_unknown(ptr, 1); + + read_dword(ptr, &v->flag); + TRACE("Variable flag: %#x.\n", v->flag); read_dword(ptr, &v->annotation_count); for(i = 0; i < v->annotation_count; ++i)

1 0

Rico Schüller : d3d10: Identify some more unknowns in parse_fx10.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 09e258a186bc0e6e8724fe8dd3a19facc7ab3072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e258a186bc0e6e8724fe8dd… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Aug 26 22:30:32 2009 +0200 d3d10: Identify some more unknowns in parse_fx10. --- dlls/d3d10/d3d10_private.h | 8 +++++++- dlls/d3d10/effect.c | 37 +++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 535a82d..6f95a96 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -114,15 +114,21 @@ struct d3d10_effect ID3D10Device *device; DWORD version; DWORD local_buffer_count; - DWORD localobjects_count; + DWORD variable_count; + DWORD object_count; DWORD sharedbuffers_count; DWORD sharedobjects_count; DWORD technique_count; DWORD index_offset; + DWORD texture_count; DWORD dephstencilstate_count; DWORD blendstate_count; DWORD rasterizerstate_count; DWORD samplerstate_count; + DWORD rendertargetview_count; + DWORD depthstencilview_count; + DWORD shader_call_count; + DWORD shader_compile_count; struct d3d10_effect_local_buffer *local_buffers; struct d3d10_effect_technique *techniques; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a5a32e1..d05d6a6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -547,19 +547,18 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->local_buffer_count); TRACE("Local buffer count: %u.\n", e->local_buffer_count); - /* Number of variables in local buffers? */ - read_dword(&ptr, &unknown); - FIXME("Unknown 0: %u\n", unknown); + read_dword(&ptr, &e->variable_count); + TRACE("Variable count: %u\n", e->variable_count); - read_dword(&ptr, &e->localobjects_count); - TRACE("Localobjects count: %u\n", e->localobjects_count); + read_dword(&ptr, &e->object_count); + TRACE("Object count: %u\n", e->object_count); read_dword(&ptr, &e->sharedbuffers_count); TRACE("Sharedbuffers count: %u\n", e->sharedbuffers_count); /* Number of variables in shared buffers? */ read_dword(&ptr, &unknown); - FIXME("Unknown 1: %u\n", unknown); + FIXME("Unknown 0: %u\n", unknown); read_dword(&ptr, &e->sharedobjects_count); TRACE("Sharedobjects count: %u\n", e->sharedobjects_count); @@ -571,9 +570,10 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Index offset: %#x\n", e->index_offset); read_dword(&ptr, &unknown); - FIXME("Unknown 2: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 3: %u\n", unknown); + FIXME("Unknown 1: %u\n", unknown); + + read_dword(&ptr, &e->texture_count); + TRACE("Texture count: %u\n", e->texture_count); read_dword(&ptr, &e->dephstencilstate_count); TRACE("Depthstencilstate count: %u\n", e->dephstencilstate_count); @@ -587,16 +587,17 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->samplerstate_count); TRACE("Samplerstate count: %u\n", e->samplerstate_count); - read_dword(&ptr, &unknown); - FIXME("Unknown 4: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 5: %u\n", unknown); + read_dword(&ptr, &e->rendertargetview_count); + TRACE("Rendertargetview count: %u\n", e->rendertargetview_count); - /* Number of function calls in all passes? */ - read_dword(&ptr, &unknown); - FIXME("Unknown 6: %u\n", unknown); - read_dword(&ptr, &unknown); - FIXME("Unknown 7: %u\n", unknown); + read_dword(&ptr, &e->depthstencilview_count); + TRACE("Depthstencilview count: %u\n", e->depthstencilview_count); + + read_dword(&ptr, &e->shader_call_count); + TRACE("Shader call count: %u\n", e->shader_call_count); + + read_dword(&ptr, &e->shader_compile_count); + TRACE("Shader compile count: %u\n", e->shader_compile_count); return parse_fx10_body(e, ptr, data_size - (ptr - data)); }

1 0

Austin English : ole32: Add a stub for CoGetCurrentLogicalThreadId.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 57bc49099b72d3e4c9bafc9a4d9419d82f2258a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57bc49099b72d3e4c9bafc9a4… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Aug 26 13:07:06 2009 -0500 ole32: Add a stub for CoGetCurrentLogicalThreadId. --- dlls/ole32/ole2stubs.c | 9 +++++++++ dlls/ole32/ole32.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index 7c45704..b029a86 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -128,3 +128,12 @@ HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) FIXME("stub!\n"); return E_NOTIMPL; } + +/*********************************************************************** + * CoGetCurrentLogicalThreadId [OLE32.@] + */ +HRESULT WINAPI CoGetCurrentLogicalThreadId(GUID *pguid) +{ + FIXME(": stub\n"); + return E_NOTIMPL; +} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 97f2f3d..79e7686 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -25,7 +25,7 @@ @ stdcall CoGetCallerTID(ptr) @ stdcall CoGetClassObject(ptr long ptr ptr ptr) @ stdcall CoGetContextToken(ptr) -@ stub CoGetCurrentLogicalThreadId +@ stdcall CoGetCurrentLogicalThreadId(ptr) @ stdcall CoGetCurrentProcess() @ stub CoGetInstanceFromFile #@ stdcall (ptr ptr ptr long wstr long ptr) return 0,ERR_NOTIMPLEMENTED @ stub CoGetInstanceFromIStorage #@ stdcall (ptr ptr ptr long ptr long ptr) return 0,ERR_NOTIMPLEMENTED

1 0

Alexandre Julliard : tools: Take into account the executable extension when looking for tools in the path .
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 1aea4efd7999a19265c44c8be85cee7064bec97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aea4efd7999a19265c44c8be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 27 13:35:46 2009 +0200 tools: Take into account the executable extension when looking for tools in the path. --- configure | 5 +++++ configure.ac | 1 + include/config.h.in | 3 +++ tools/winebuild/utils.c | 5 +++-- tools/winegcc/utils.c | 8 +++++--- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 1c42c9e..bcf67cf 100755 --- a/configure +++ b/configure @@ -3960,6 +3960,11 @@ else fi +cat >>confdefs.h <<_ACEOF +#define EXEEXT "$ac_exeext" +_ACEOF + + case $host in *-darwin*) if test "x$enable_win64" = "xyes" diff --git a/configure.ac b/configure.ac index 39eea85..c880ad3 100644 --- a/configure.ac +++ b/configure.ac @@ -105,6 +105,7 @@ AC_PROG_CC AC_PROG_CXX dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E AC_CHECK_TOOL(CPPBIN,cpp,cpp) +AC_DEFINE_UNQUOTED(EXEEXT,["$ac_exeext"],[Define to the file extension for executables.]) case $host in *-darwin*) diff --git a/include/config.h.in b/include/config.h.in index 5eb84c3..6956963 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -2,6 +2,9 @@ #define __WINE_CONFIG_H +/* Define to the file extension for executables. */ +#undef EXEEXT + /* Define to 1 if you have the <alias.h> header file. */ #undef HAVE_ALIAS_H diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index d11bd32..e0cd8bc 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -198,7 +198,7 @@ int output( const char *format, ... ) } /* find a build tool in the path, trying the various names */ -char *find_tool( const char * const *names ) +static char *find_tool( const char * const *names ) { static char **dirs; static unsigned int count, maxlen; @@ -231,7 +231,7 @@ char *find_tool( const char * const *names ) while (*names) { - len = strlen(*names) + 1; + len = strlen(*names) + sizeof(EXEEXT) + 1; file = xmalloc( maxlen + len ); for (i = 0; i < count; i++) @@ -241,6 +241,7 @@ char *find_tool( const char * const *names ) if (p == file) *p++ = '.'; if (p[-1] != '/') *p++ = '/'; strcpy( p, *names ); + strcat( p, EXEEXT ); if (!stat( file, &st ) && S_ISREG(st.st_mode) && (st.st_mode & 0111)) return file; } diff --git a/tools/winegcc/utils.c b/tools/winegcc/utils.c index 611ec42..66c7e41 100644 --- a/tools/winegcc/utils.c +++ b/tools/winegcc/utils.c @@ -308,14 +308,16 @@ void spawn(const strarray* prefix, const strarray* args, int ignore_errors) if (prefix) { + const char *p = strrchr(argv[0], '/'); + if (!p) p = argv[0]; + else p++; + for (i = 0; i < prefix->size; i++) { - const char* p; struct stat st; - if (!(p = strrchr(argv[0], '/'))) p = argv[0]; free( prog ); - prog = strmake("%s/%s", prefix->base[i], p); + prog = strmake("%s/%s%s", prefix->base[i], p, EXEEXT); if (stat(prog, &st) == 0 && S_ISREG(st.st_mode) && (st.st_mode & 0111)) { argv[0] = prog;

1 0

Andrew Eikum : gdiplus: Implement GdipIsVisibleRect.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: f5896a2be00dc25e6f04be76b9debaecf79f9514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5896a2be00dc25e6f04be76b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 26 18:03:13 2009 -0500 gdiplus: Implement GdipIsVisibleRect. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 53 +++++++++++-- dlls/gdiplus/tests/graphics.c | 163 +++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 4 files changed, 210 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5896a2be00dc25e6f04b…

1 0

Andrew Eikum : gdiplus: Implement GdipIsVisiblePoint.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: d06dd2d7cb1511c15a5bc71a68caa656f418ba47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d06dd2d7cb1511c15a5bc71a6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 26 18:03:11 2009 -0500 gdiplus: Implement GdipIsVisiblePoint. --- dlls/gdiplus/graphics.c | 34 +++++--- dlls/gdiplus/tests/graphics.c | 180 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+), 11 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 297393a..3d35f74 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3252,7 +3252,11 @@ GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics *graphics, BOOL *res) GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics *graphics, REAL x, REAL y, BOOL *result) { - FIXME("(%p, %.2f, %.2f, %p) stub\n", graphics, x, y, result); + GpStatus stat; + GpRegion* rgn; + GpPointF pt; + + TRACE("(%p, %.2f, %.2f, %p)\n", graphics, x, y, result); if(!graphics || !result) return InvalidParameter; @@ -3260,20 +3264,28 @@ GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics *graphics, REAL x, REAL y, BOO if(graphics->busy) return ObjectBusy; - return NotImplemented; -} + pt.X = x; + pt.Y = y; + if((stat = GdipTransformPoints(graphics, CoordinateSpaceDevice, + CoordinateSpaceWorld, &pt, 1)) != Ok) + return stat; -GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics *graphics, INT x, INT y, BOOL *result) -{ - FIXME("(%p, %d, %d, %p) stub\n", graphics, x, y, result); + if((stat = GdipCreateRegion(&rgn)) != Ok) + return stat; - if(!graphics || !result) - return InvalidParameter; + if((stat = get_visible_clip_region(graphics, rgn)) != Ok) + goto cleanup; - if(graphics->busy) - return ObjectBusy; + stat = GdipIsVisibleRegionPoint(rgn, pt.X, pt.Y, graphics, result); - return NotImplemented; +cleanup: + GdipDeleteRegion(rgn); + return stat; +} + +GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics *graphics, INT x, INT y, BOOL *result) +{ + return GdipIsVisiblePoint(graphics, (REAL)x, (REAL)y, result); } GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 26794d8..f74f7af 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1928,6 +1928,185 @@ static void test_fromMemoryBitmap(void) GdipDisposeImage((GpImage*)bitmap); } +static void test_GdipIsVisiblePoint(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + HDC hdc = GetDC(0); + REAL x, y; + BOOL val; + + ok(hdc != NULL, "Expected HDC to be initialized\n"); + + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + ok(graphics != NULL, "Expected graphics to be initialized\n"); + + /* null parameters */ + status = GdipIsVisiblePoint(NULL, 0, 0, &val); + expect(InvalidParameter, status); + + status = GdipIsVisiblePoint(graphics, 0, 0, NULL); + expect(InvalidParameter, status); + + status = GdipIsVisiblePointI(NULL, 0, 0, &val); + expect(InvalidParameter, status); + + status = GdipIsVisiblePointI(graphics, 0, 0, NULL); + expect(InvalidParameter, status); + + x = 0; + y = 0; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == TRUE, "Expected (%.2f, %.2f) to be visible\n", x, y); + + x = -10; + y = 0; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "Expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 0; + y = -5; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "Expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 1; + y = 1; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == TRUE, "Expected (%.2f, %.2f) to be visible\n", x, y); + + status = GdipSetClipRect(graphics, 10, 20, 30, 40, CombineModeReplace); + expect(Ok, status); + + x = 1; + y = 1; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 15.5; + y = 40.5; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == TRUE, "After clipping, expected (%.2f, %.2f) to be visible\n", x, y); + + /* translate into the center of the rect */ + GdipTranslateWorldTransform(graphics, 25, 40, MatrixOrderAppend); + + x = 0; + y = 0; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == TRUE, "Expected (%.2f, %.2f) to be visible\n", x, y); + + x = 25; + y = 40; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "Expected (%.2f, %.2f) not to be visible\n", x, y); + + GdipTranslateWorldTransform(graphics, -25, -40, MatrixOrderAppend); + + /* corner cases */ + x = 9; + y = 19; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 9.25; + y = 19.25; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 9.5; + y = 19.5; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == TRUE, "After clipping, expected (%.2f, %.2f) to be visible\n", x, y); + + x = 9.75; + y = 19.75; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == TRUE, "After clipping, expected (%.2f, %.2f) to be visible\n", x, y); + + x = 10; + y = 20; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == TRUE, "After clipping, expected (%.2f, %.2f) to be visible\n", x, y); + + x = 40; + y = 20; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 39; + y = 59; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == TRUE, "After clipping, expected (%.2f, %.2f) to be visible\n", x, y); + + x = 39.25; + y = 59.25; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == TRUE, "After clipping, expected (%.2f, %.2f) to be visible\n", x, y); + + x = 39.5; + y = 39.5; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 39.75; + y = 59.75; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 40; + y = 60; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 40.15; + y = 60.15; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + x = 10; + y = 60; + status = GdipIsVisiblePoint(graphics, x, y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + /* integer version */ + x = 25; + y = 30; + status = GdipIsVisiblePointI(graphics, (INT)x, (INT)y, &val); + expect(Ok, status); + ok(val == TRUE, "After clipping, expected (%.2f, %.2f) to be visible\n", x, y); + + x = 50; + y = 100; + status = GdipIsVisiblePointI(graphics, (INT)x, (INT)y, &val); + expect(Ok, status); + ok(val == FALSE, "After clipping, expected (%.2f, %.2f) not to be visible\n", x, y); + + GdipDeleteGraphics(graphics); + ReleaseDC(0, hdc); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1955,6 +2134,7 @@ START_TEST(graphics) test_GdipDrawLinesI(); test_GdipDrawString(); test_GdipGetVisibleClipBounds(); + test_GdipIsVisiblePoint(); test_Get_Release_DC(); test_BeginContainer2(); test_transformpoints();

1 0

Andrew Eikum : gdiplus: Add utility function get_visible_clip_region.
by Alexandre Julliard 27 Aug '09

27 Aug '09

Module: wine Branch: master Commit: 39f6f491a6b3ecf185be6bf59bf289ff261afe62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f6f491a6b3ecf185be6bf59… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 26 18:03:08 2009 -0500 gdiplus: Add utility function get_visible_clip_region. --- dlls/gdiplus/graphics.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7b9dbd6..297393a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1062,6 +1062,33 @@ static GpStatus get_graphics_bounds(GpGraphics* graphics, GpRectF* rect) return Ok; } +/* on success, rgn will contain the region of the graphics object which + * is visible after clipping has been applied */ +static GpStatus get_visible_clip_region(GpGraphics *graphics, GpRegion *rgn) +{ + GpStatus stat; + GpRectF rectf; + GpRegion* tmp; + + if((stat = get_graphics_bounds(graphics, &rectf)) != Ok) + return stat; + + if((stat = GdipCreateRegion(&tmp)) != Ok) + return stat; + + if((stat = GdipCombineRegionRect(tmp, &rectf, CombineModeReplace)) != Ok) + goto end; + + if((stat = GdipCombineRegionRegion(tmp, graphics->clip, CombineModeIntersect)) != Ok) + goto end; + + stat = GdipCombineRegionRegion(rgn, tmp, CombineModeReplace); + +end: + GdipDeleteRegion(tmp); + return stat; +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { TRACE("(%p, %p)\n", hdc, graphics); @@ -3123,7 +3150,6 @@ GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics *graphics, GpRectF *rect { GpRegion *clip_rgn; GpStatus stat; - GpRectF wnd_rect; TRACE("(%p, %p)\n", graphics, rect); @@ -3133,18 +3159,11 @@ GpStatus WINGDIPAPI GdipGetVisibleClipBounds(GpGraphics *graphics, GpRectF *rect if(graphics->busy) return ObjectBusy; - /* get window bounds */ - if((stat = get_graphics_bounds(graphics, &wnd_rect)) != Ok) - return stat; - /* intersect window and graphics clipping regions */ if((stat = GdipCreateRegion(&clip_rgn)) != Ok) return stat; - if((stat = GdipCombineRegionRect(clip_rgn, &wnd_rect, CombineModeIntersect)) != Ok) - goto cleanup; - - if((stat = GdipCombineRegionRegion(clip_rgn, graphics->clip, CombineModeIntersect)) != Ok) + if((stat = get_visible_clip_region(graphics, clip_rgn)) != Ok) goto cleanup; /* get bounds of the region */

1 0