April 2013 - Wine-commits - list.winehq.org

André Hentschel : winegcc: Set target based on forced pointer size.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 504925a8f70c1e99e7c4637826f8ced15649ff80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=504925a8f70c1e99e7c463782… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 21 16:58:53 2013 +0200 winegcc: Set target based on forced pointer size. --- tools/winegcc/winegcc.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 06aa200..1469b8a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -343,11 +343,9 @@ static int check_platform( struct options *opts, const char *file ) if (!memcmp( header, "\177ELF", 4 )) { if (header[4] == 2) /* 64-bit */ - ret = (opts->force_pointer_size == 8 || - (!opts->force_pointer_size && (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64))); + ret = (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64); else - ret = (opts->force_pointer_size == 4 || - (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64)); + ret = (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64); } } close( fd ); @@ -370,13 +368,13 @@ static char *get_lib_dir( struct options *opts ) strcpy( p, libwine ); if (check_platform( opts, buffer )) goto found; if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; - if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64)) + if (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64) { strcpy( p, "32" ); strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; } - if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64))) + if (opts->target_cpu == CPU_x86_64 || opts->target_cpu == CPU_ARM64) { strcpy( p, "64" ); strcat( p, libwine ); @@ -1406,6 +1404,10 @@ int main(int argc, char **argv) } else if (strcmp("-m64", argv[i]) == 0) { + if (opts.target_cpu == CPU_x86) + opts.target_cpu = CPU_x86_64; + else if (opts.target_cpu == CPU_ARM) + opts.target_cpu = CPU_ARM64; opts.force_pointer_size = 8; raw_linker_arg = 1; }

1 0

André Hentschel : winegcc: Add support for Multiarch Architecture Specifiers.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: c11da76dc588cfdcb2328c92dce5188304935ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c11da76dc588cfdcb2328c92d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 21 16:59:47 2013 +0200 winegcc: Add support for Multiarch Architecture Specifiers. --- tools/winegcc/winegcc.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1469b8a..4b0d3e8 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -361,7 +361,7 @@ static char *get_lib_dir( struct options *opts ) for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) { - char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen(libwine) + 3 ); + char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + strlen("/arm-linux-gnueabi") + strlen(libwine) + 1 ); strcpy( buffer, stdlibpath[i] ); p = buffer + strlen(buffer); while (p > buffer && p[-1] == '/') p--; @@ -380,6 +380,18 @@ static char *get_lib_dir( struct options *opts ) strcat( p, libwine ); if (check_platform( opts, buffer )) goto found; } + switch(opts->target_cpu) + { + case CPU_x86: strcpy( p, "/i386-linux-gnu" ); break; + case CPU_x86_64: strcpy( p, "/x86_64-linux-gnu" ); break; + case CPU_ARM: strcpy( p, "/arm-linux-gnueabi" ); break; + case CPU_ARM64: strcpy( p, "/aarch64-linux-gnu" ); break; + case CPU_POWERPC: strcpy( p, "/powerpc-linux-gnu" ); break; + default: + assert(0); + } + strcat( p, libwine ); + if (check_platform( opts, buffer )) goto found; free( buffer ); continue;

1 0

Alexandre Julliard : gdi32: Replace some macros by inline functions in the region code.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: a34c6f436d4bd271dfa88d7740226b1fc7d3c6b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34c6f436d4bd271dfa88d774… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 21:40:05 2013 +0200 gdi32: Replace some macros by inline functions in the region code. --- dlls/gdi32/region.c | 189 ++++++++++++++++++++++++-------------------------- 1 files changed, 91 insertions(+), 98 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index caa4ff6..12f106b 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -118,15 +118,12 @@ static const struct gdi_obj_funcs region_funcs = REGION_DeleteObject /* pDeleteObject */ }; -/* 1 if two RECTs overlap. - * 0 if two RECTs do not overlap. - */ -#define EXTENTCHECK(r1, r2) \ - ((r1)->right > (r2)->left && \ - (r1)->left < (r2)->right && \ - (r1)->bottom > (r2)->top && \ - (r1)->top < (r2)->bottom) - +/* Check if two RECTs overlap. */ +static inline BOOL overlapping( const RECT *r1, const RECT *r2 ) +{ + return (r1->right > r2->left && r1->left < r2->right && + r1->bottom > r2->top && r1->top < r2->bottom); +} static BOOL add_rect( WINEREGION *reg, INT left, INT top, INT right, INT bottom ) { @@ -146,18 +143,16 @@ static BOOL add_rect( WINEREGION *reg, INT left, INT top, INT right, INT bottom return TRUE; } -#define EMPTY_REGION(pReg) do { \ - (pReg)->numRects = 0; \ - (pReg)->extents.left = (pReg)->extents.top = 0; \ - (pReg)->extents.right = (pReg)->extents.bottom = 0; \ - } while(0) - -#define INRECT(r, x, y) \ - ( ( ((r).right > x)) && \ - ( ((r).left <= x)) && \ - ( ((r).bottom > y)) && \ - ( ((r).top <= y)) ) +static inline void empty_region( WINEREGION *reg ) +{ + reg->numRects = 0; + reg->extents.left = reg->extents.top = reg->extents.right = reg->extents.bottom = 0; +} +static inline BOOL is_in_rect( const RECT *rect, int x, int y ) +{ + return (rect->right > x && rect->left <= x && rect->bottom > y && rect->top <= y); +} /* * number of points to buffer before sending them off @@ -194,6 +189,22 @@ typedef struct _POINTBLOCK { /* + * This structure contains all of the information needed + * to run the bresenham algorithm. + * The variables may be hardcoded into the declarations + * instead of using this structure to make use of + * register declarations. + */ +struct bres_info +{ + INT minor_axis; /* minor axis */ + INT d; /* decision variable */ + INT m, m1; /* slope and slope+1 */ + INT incr1, incr2; /* error increments */ +}; + + +/* * In scan converting polygons, we want to choose those pixels * which are inside the polygon. Thus, we add .5 to the starting * x coordinate for both left and right edges. Now we choose the @@ -212,76 +223,58 @@ typedef struct _POINTBLOCK { * If it is moving to the left, then we don't want it to flip until * we traverse an entire pixel. */ -#define BRESINITPGON(dy, x1, x2, xStart, d, m, m1, incr1, incr2) { \ - int dx; /* local storage */ \ -\ - /* \ - * if the edge is horizontal, then it is ignored \ - * and assumed not to be processed. Otherwise, do this stuff. \ - */ \ - if ((dy) != 0) { \ - xStart = (x1); \ - dx = (x2) - xStart; \ - if (dx < 0) { \ - m = dx / (dy); \ - m1 = m - 1; \ - incr1 = -2 * dx + 2 * (dy) * m1; \ - incr2 = -2 * dx + 2 * (dy) * m; \ - d = 2 * m * (dy) - 2 * dx - 2 * (dy); \ - } else { \ - m = dx / (dy); \ - m1 = m + 1; \ - incr1 = 2 * dx - 2 * (dy) * m1; \ - incr2 = 2 * dx - 2 * (dy) * m; \ - d = -2 * m * (dy) + 2 * dx; \ - } \ - } \ -} - -#define BRESINCRPGON(d, minval, m, m1, incr1, incr2) { \ - if (m1 > 0) { \ - if (d > 0) { \ - minval += m1; \ - d += incr1; \ - } \ - else { \ - minval += m; \ - d += incr2; \ - } \ - } else {\ - if (d >= 0) { \ - minval += m1; \ - d += incr1; \ - } \ - else { \ - minval += m; \ - d += incr2; \ - } \ - } \ -} - -/* - * This structure contains all of the information needed - * to run the bresenham algorithm. - * The variables may be hardcoded into the declarations - * instead of using this structure to make use of - * register declarations. - */ -typedef struct { - INT minor_axis; /* minor axis */ - INT d; /* decision variable */ - INT m, m1; /* slope and slope+1 */ - INT incr1, incr2; /* error increments */ -} BRESINFO; - +static inline void bres_init_polygon( int dy, int x1, int x2, struct bres_info *bres ) +{ + int dx; -#define BRESINITPGONSTRUCT(dmaj, min1, min2, bres) \ - BRESINITPGON(dmaj, min1, min2, bres.minor_axis, bres.d, \ - bres.m, bres.m1, bres.incr1, bres.incr2) + /* + * if the edge is horizontal, then it is ignored + * and assumed not to be processed. Otherwise, do this stuff. + */ + if (!dy) return; -#define BRESINCRPGONSTRUCT(bres) \ - BRESINCRPGON(bres.d, bres.minor_axis, bres.m, bres.m1, bres.incr1, bres.incr2) + bres->minor_axis = x1; + dx = x2 - x1; + if (dx < 0) + { + bres->m = dx / dy; + bres->m1 = bres->m - 1; + bres->incr1 = -2 * dx + 2 * dy * bres->m1; + bres->incr2 = -2 * dx + 2 * dy * bres->m; + bres->d = 2 * bres->m * dy - 2 * dx - 2 * dy; + } + else + { + bres->m = dx / (dy); + bres->m1 = bres->m + 1; + bres->incr1 = 2 * dx - 2 * dy * bres->m1; + bres->incr2 = 2 * dx - 2 * dy * bres->m; + bres->d = -2 * bres->m * dy + 2 * dx; + } +} +static inline void bres_incr_polygon( struct bres_info *bres ) +{ + if (bres->m1 > 0) { + if (bres->d > 0) { + bres->minor_axis += bres->m1; + bres->d += bres->incr1; + } + else { + bres->minor_axis += bres->m; + bres->d += bres->incr2; + } + } else { + if (bres->d >= 0) { + bres->minor_axis += bres->m1; + bres->d += bres->incr1; + } + else { + bres->minor_axis += bres->m; + bres->d += bres->incr2; + } + } +} /* @@ -338,7 +331,7 @@ typedef struct { typedef struct _EdgeTableEntry { INT ymax; /* ycoord at which we exit this edge. */ - BRESINFO bres; /* Bresenham info to run the edge */ + struct bres_info bres; /* Bresenham info to run the edge */ struct _EdgeTableEntry *next; /* next in the list */ struct _EdgeTableEntry *back; /* for insertion sort */ struct _EdgeTableEntry *nextWETE; /* for winding num rule */ @@ -395,7 +388,7 @@ typedef struct _ScanLineListBlock { pAET->back = pPrevAET; \ } \ else { \ - BRESINCRPGONSTRUCT(pAET->bres); \ + bres_incr_polygon(&pAET->bres); \ pPrevAET = pAET; \ pAET = pAET->next; \ } \ @@ -417,7 +410,7 @@ typedef struct _ScanLineListBlock { pAET->back = pPrevAET; \ } \ else { \ - BRESINCRPGONSTRUCT(pAET->bres); \ + bres_incr_polygon(&pAET->bres); \ pPrevAET = pAET; \ pAET = pAET->next; \ } \ @@ -477,7 +470,7 @@ static BOOL init_region( WINEREGION *pReg, INT n ) { if (!(pReg->rects = HeapAlloc(GetProcessHeap(), 0, n * sizeof( RECT )))) return FALSE; pReg->size = n; - EMPTY_REGION(pReg); + empty_region(pReg); return TRUE; } @@ -713,7 +706,7 @@ BOOL WINAPI SetRectRgn( HRGN hrgn, INT left, INT top, obj->numRects = 1; } else - EMPTY_REGION(obj); + empty_region(obj); GDI_ReleaseObj( hrgn ); return TRUE; @@ -1080,9 +1073,9 @@ BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y ) { int i; - if (obj->numRects > 0 && INRECT(obj->extents, x, y)) + if (obj->numRects > 0 && is_in_rect(&obj->extents, x, y)) for (i = 0; i < obj->numRects; i++) - if (INRECT (obj->rects[i], x, y)) + if (is_in_rect(&obj->rects[i], x, y)) { ret = TRUE; break; @@ -1122,7 +1115,7 @@ BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect ) RECT *pCurRect, *pRectEnd; /* this is (just) a useful optimization */ - if ((obj->numRects > 0) && EXTENTCHECK(&obj->extents, &rc)) + if ((obj->numRects > 0) && overlapping(&obj->extents, &rc)) { for (pCurRect = obj->rects, pRectEnd = pCurRect + obj->numRects; pCurRect < pRectEnd; pCurRect++) @@ -1973,7 +1966,7 @@ static BOOL REGION_IntersectRegion(WINEREGION *newReg, WINEREGION *reg1, { /* check for trivial reject */ if ( (!(reg1->numRects)) || (!(reg2->numRects)) || - (!EXTENTCHECK(&reg1->extents, &reg2->extents))) + (!overlapping(&reg1->extents, &reg2->extents))) newReg->numRects = 0; else if (!REGION_RegionOp (newReg, reg1, reg2, REGION_IntersectO, NULL, NULL)) return FALSE; @@ -2296,7 +2289,7 @@ static BOOL REGION_SubtractRegion(WINEREGION *regD, WINEREGION *regM, WINEREGION { /* check for trivial reject */ if ( (!(regM->numRects)) || (!(regS->numRects)) || - (!EXTENTCHECK(&regM->extents, &regS->extents)) ) + (!overlapping(&regM->extents, &regS->extents)) ) return REGION_CopyRegion(regD, regM); if (!REGION_RegionOp (regD, regM, regS, REGION_SubtractO, REGION_SubtractNonO1, NULL)) @@ -2510,7 +2503,7 @@ static void REGION_CreateETandAET(const INT *Count, INT nbpolygons, * initialize integer edge algorithm */ dy = bottom->y - top->y; - BRESINITPGONSTRUCT(dy, top->x, bottom->x, pETEs->bres); + bres_init_polygon(dy, top->x, bottom->x, &pETEs->bres); REGION_InsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock);

1 0

Alexandre Julliard : gdi32: Add helper functions to manage blocks of points in CreatePolyPolygonRgn.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 6a9b775f36e80d1e8a776ccf904dbab11e255fc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a9b775f36e80d1e8a776ccf9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 21:57:32 2013 +0200 gdi32: Add helper functions to manage blocks of points in CreatePolyPolygonRgn. --- dlls/gdi32/region.c | 106 +++++++++++++++++++++++---------------------------- 1 files changed, 48 insertions(+), 58 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 12f106b..bc784dc 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -165,11 +165,39 @@ static inline BOOL is_in_rect( const RECT *rect, int x, int y ) * the buffers together */ -typedef struct _POINTBLOCK { +struct point_block +{ POINT pts[NUMPTSTOBUFFER]; - struct _POINTBLOCK *next; -} POINTBLOCK; + int count; + struct point_block *next; +}; + +static struct point_block *add_point( struct point_block *block, int x, int y ) +{ + if (block->count == NUMPTSTOBUFFER) + { + struct point_block *new = HeapAlloc( GetProcessHeap(), 0, sizeof(*new) ); + if (!new) return NULL; + block->next = new; + new->count = 0; + new->next = NULL; + block = new; + } + block->pts[block->count].x = x; + block->pts[block->count].y = y; + block->count++; + return block; +} +static void free_point_blocks( struct point_block *block ) +{ + while (block) + { + struct point_block *tmp = block->next; + HeapFree( GetProcessHeap(), 0, block ); + block = tmp; + } +} /* @@ -2665,33 +2693,30 @@ static void REGION_FreeStorage(ScanLineListBlock *pSLLBlock) * * Create an array of rectangles from a list of points. */ -static BOOL REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock, - POINTBLOCK *FirstPtBlock, WINEREGION *reg) +static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *reg ) { RECT *rects; POINT *pts; - POINTBLOCK *CurPtBlock; + struct point_block *pb; int i; RECT *extents; INT numRects; extents = &reg->extents; - numRects = ((numFullPtBlocks * NUMPTSTOBUFFER) + iCurPtBlock) >> 1; + for (pb = FirstPtBlock, numRects = 0; pb; pb = pb->next) numRects += pb->count; if (!init_region( reg, numRects )) return FALSE; reg->size = numRects; - CurPtBlock = FirstPtBlock; rects = reg->rects - 1; numRects = 0; extents->left = LARGE_COORDINATE, extents->right = SMALL_COORDINATE; - for ( ; numFullPtBlocks >= 0; numFullPtBlocks--) { + for (pb = FirstPtBlock; pb; pb = pb->next) + { /* the loop uses 2 points per iteration */ - i = NUMPTSTOBUFFER >> 1; - if (!numFullPtBlocks) - i = iCurPtBlock >> 1; - for (pts = CurPtBlock->pts; i--; pts += 2) { + i = pb->count / 2; + for (pts = pb->pts; i--; pts += 2) { if (pts->x == pts[1].x) continue; if (numRects && pts->x == rects->left && pts->y == rects->bottom && @@ -2710,7 +2735,6 @@ static BOOL REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock, if (rects->right > extents->right) extents->right = rects->right; } - CurPtBlock = CurPtBlock->next; } if (numRects) { @@ -2737,19 +2761,15 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, WINEREGION *obj; EdgeTableEntry *pAET; /* Active Edge Table */ INT y; /* current scanline */ - int iPts = 0; /* number of pts in buffer */ EdgeTableEntry *pWETE; /* Winding Edge Table Entry*/ ScanLineList *pSLL; /* current scanLineList */ - POINT *pts; /* output buffer */ EdgeTableEntry *pPrevAET; /* ptr to previous AET */ EdgeTable ET; /* header node for ET */ EdgeTableEntry AET; /* header node for AET */ EdgeTableEntry *pETEs; /* EdgeTableEntries pool */ ScanLineListBlock SLLBlock; /* header for scanlinelist */ int fixWAET = FALSE; - POINTBLOCK FirstPtBlock, *curPtBlock; /* PtBlock buffers */ - POINTBLOCK *tmpPtBlock; - int numFullPtBlocks = 0; + struct point_block FirstPtBlock, *block; /* PtBlock buffers */ INT poly, total; TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode); @@ -2774,10 +2794,11 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) return 0; - pts = FirstPtBlock.pts; REGION_CreateETandAET(Count, nbpolygons, Pts, &ET, &AET, pETEs, &SLLBlock); pSLL = ET.scanlines.next; - curPtBlock = &FirstPtBlock; + block = &FirstPtBlock; + FirstPtBlock.count = 0; + FirstPtBlock.next = NULL; if (mode != WINDING) { /* @@ -2799,21 +2820,8 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, * for each active edge */ while (pAET) { - pts->x = pAET->bres.minor_axis, pts->y = y; - pts++, iPts++; - - /* - * send out the buffer - */ - if (iPts == NUMPTSTOBUFFER) { - tmpPtBlock = HeapAlloc( GetProcessHeap(), 0, sizeof(POINTBLOCK)); - if(!tmpPtBlock) goto done; - curPtBlock->next = tmpPtBlock; - curPtBlock = tmpPtBlock; - pts = curPtBlock->pts; - numFullPtBlocks++; - iPts = 0; - } + block = add_point( block, pAET->bres.minor_axis, y ); + if (!block) goto done; EVALUATEEDGEEVENODD(pAET, pPrevAET, y); } REGION_InsertionSort(&AET); @@ -2846,22 +2854,8 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, * are in the Winding active edge table. */ if (pWETE == pAET) { - pts->x = pAET->bres.minor_axis, pts->y = y; - pts++, iPts++; - - /* - * send out the buffer - */ - if (iPts == NUMPTSTOBUFFER) { - tmpPtBlock = HeapAlloc( GetProcessHeap(), 0, - sizeof(POINTBLOCK) ); - if(!tmpPtBlock) goto done; - curPtBlock->next = tmpPtBlock; - curPtBlock = tmpPtBlock; - pts = curPtBlock->pts; - numFullPtBlocks++; - iPts = 0; - } + block = add_point( block, pAET->bres.minor_axis, y ); + if (!block) goto done; pWETE = pWETE->nextWETE; } EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET); @@ -2880,7 +2874,7 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, if (!(obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ))) goto done; - if (!REGION_PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, obj)) + if (!REGION_PtsToRegion(&FirstPtBlock, obj)) { HeapFree( GetProcessHeap(), 0, obj ); goto done; @@ -2893,11 +2887,7 @@ HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count, done: REGION_FreeStorage(SLLBlock.next); - for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) { - tmpPtBlock = curPtBlock->next; - HeapFree( GetProcessHeap(), 0, curPtBlock ); - curPtBlock = tmpPtBlock; - } + free_point_blocks( FirstPtBlock.next ); HeapFree( GetProcessHeap(), 0, pETEs ); return hrgn; }

1 0

Alexandre Julliard : gdi32: Convert the edges list to a standard list in CreatePolyPolygonRgn.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 31f0079f1c817cd70d3a17f1327b89fb9d8789cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f0079f1c817cd70d3a17f13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 22 22:41:51 2013 +0200 gdi32: Convert the edges list to a standard list in CreatePolyPolygonRgn. --- dlls/gdi32/region.c | 245 +++++++++++++++----------------------------------- 1 files changed, 74 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31f0079f1c817cd70d3a1…

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_R8->VARIANT.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: aeb7362ef321cd4de5b4070199c9b970b0f232a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb7362ef321cd4de5b407019… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 18 11:59:15 2013 +1000 oledb32: Implement DataConvert DBTYPE_R8->VARIANT. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 11 +++++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 37ae25e..8525c6c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -761,6 +761,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, V_VT(v) = VT_DECIMAL; hr = VarDecFromI8( *(LONGLONG*)src, &V_DECIMAL(v)); break; + case DBTYPE_R8: + V_VT(v) = VT_R8; + V_R8(v) = *(double*)src; + hr = S_OK; + break; case DBTYPE_BSTR: { BSTR s = *(WCHAR**)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 2a4caf2..d1f6c4e 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2536,6 +2536,7 @@ static void test_getconversionsize(void) static void test_converttovar(void) { static WCHAR strW[] = {'t','e','s','t',0}; + double dvalue = 123.56; IDataConvert *convert; DBSTATUS dst_status; DBLENGTH dst_len; @@ -2588,6 +2589,16 @@ static void test_converttovar(void) V_VT(&dst) = VT_EMPTY; dst_len = 0; dst_status = DBSTATUS_S_DEFAULT; + hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_VARIANT, sizeof(dvalue), &dst_len, &dvalue, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_R8, "got %d\n", V_VT(&dst)); + ok(V_R8(&dst) == 123.56, "got %f\n", V_R8(&dst)); + + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; i4 = 123; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr);

1 0

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize DBTYPE_STR-> DBTYPE_WSTR.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 9d4284cc0dce54074814619a6b8c057a5b17e0c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4284cc0dce54074814619a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 23 13:46:10 2013 +1000 oledb32: Implement GetConversionSize DBTYPE_STR->DBTYPE_WSTR. --- dlls/oledb32/convert.c | 6 ++++++ dlls/oledb32/tests/convert.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 8525c6c..f2c4c29 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1108,6 +1108,12 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, { switch (src_type) { + case DBTYPE_STR: + if(src_len) + *dst_len = (*src_len + 1) * sizeof(WCHAR); + else + *dst_len = (strlen(src) + 1) * sizeof(WCHAR); + break; case DBTYPE_WSTR: if(src_len) *dst_len = (*src_len) + sizeof(WCHAR); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index d1f6c4e..51dc0f6 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2484,6 +2484,7 @@ static void test_getconversionsize(void) HRESULT hr; BSTR str; static WCHAR strW[] = {'t','e','s','t',0}; + static char strTest[] = "test"; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2530,6 +2531,23 @@ static void test_getconversionsize(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(dst_len == 22, "%ld\n", dst_len); + dst_len = 0; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, NULL, &dst_len, strTest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 10 || broken(dst_len == 12), "%ld\n", dst_len); + + dst_len = 0; + src_len = 2; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, &src_len, &dst_len, strTest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 6, "%ld\n", dst_len); + + dst_len = 0; + src_len = 20; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, &src_len, &dst_len, strTest); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 42, "%ld\n", dst_len); + IDataConvert_Release(convert); }

1 0

Jacek Caban : mshtml: Moved exec_editmode implementation to a helper function in editor.c.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: cf6288e2ab8761df4db312568eab1c2a882db182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf6288e2ab8761df4db312568… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 12:57:59 2013 +0200 mshtml: Moved exec_editmode implementation to a helper function in editor.c. --- dlls/mshtml/editor.c | 102 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/olecmd.c | 99 +---------------------------------------- 3 files changed, 104 insertions(+), 98 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 0a58d1f..cfab2ed 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -26,6 +26,7 @@ #include "winuser.h" #include "ole2.h" #include "mshtmcid.h" +#include "shlguid.h" #include "wine/debug.h" @@ -1263,3 +1264,104 @@ HRESULT editor_is_dirty(HTMLDocument *This) return modified ? S_OK : S_FALSE; } + +HRESULT setup_edit_mode(HTMLDocumentObj *doc) +{ + IMoniker *mon; + HRESULT hres; + + if(doc->usermode == EDITMODE) + return S_OK; + + doc->usermode = EDITMODE; + + if(doc->basedoc.window->mon) { + CLSID clsid = IID_NULL; + hres = IMoniker_GetClassID(doc->basedoc.window->mon, &clsid); + if(SUCCEEDED(hres)) { + /* We should use IMoniker::Save here */ + FIXME("Use CLSID %s\n", debugstr_guid(&clsid)); + } + } + + if(doc->frame) + IOleInPlaceFrame_SetStatusText(doc->frame, NULL); + + doc->basedoc.window->readystate = READYSTATE_UNINITIALIZED; + + if(doc->client) { + IOleCommandTarget *cmdtrg; + + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&cmdtrg); + if(SUCCEEDED(hres)) { + VARIANT var; + + V_VT(&var) = VT_I4; + V_I4(&var) = 0; + IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); + + IOleCommandTarget_Release(cmdtrg); + } + } + + if(doc->hostui) { + DOCHOSTUIINFO hostinfo; + + memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); + hostinfo.cbSize = sizeof(DOCHOSTUIINFO); + hres = IDocHostUIHandler_GetHostInfo(doc->hostui, &hostinfo); + if(SUCCEEDED(hres)) + /* FIXME: use hostinfo */ + TRACE("hostinfo = {%u %08x %08x %s %s}\n", + hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, + debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); + } + + update_doc(&doc->basedoc, UPDATE_UI); + + if(doc->basedoc.window->mon) { + /* FIXME: We should find nicer way to do this */ + remove_target_tasks(doc->basedoc.task_magic); + + mon = doc->basedoc.window->mon; + IMoniker_AddRef(mon); + }else { + static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + + hres = CreateURLMoniker(NULL, about_blankW, &mon); + if(FAILED(hres)) { + FIXME("CreateURLMoniker failed: %08x\n", hres); + return hres; + } + } + + hres = IPersistMoniker_Load(&doc->basedoc.IPersistMoniker_iface, TRUE, mon, NULL, 0); + IMoniker_Release(mon); + if(FAILED(hres)) + return hres; + + if(doc->ui_active) { + if(doc->ip_window) + call_set_active_object(doc->ip_window, NULL); + if(doc->hostui) + IDocHostUIHandler_HideUI(doc->hostui); + } + + if(doc->ui_active) { + RECT rcBorderWidths; + + if(doc->hostui) + IDocHostUIHandler_ShowUI(doc->hostui, DOCHOSTUITYPE_AUTHOR, + &doc->basedoc.IOleInPlaceActiveObject_iface, &doc->basedoc.IOleCommandTarget_iface, + doc->frame, doc->ip_window); + + if(doc->ip_window) + call_set_active_object(doc->ip_window, &doc->basedoc.IOleInPlaceActiveObject_iface); + + memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); + if(doc->frame) + IOleInPlaceFrame_SetBorderSpace(doc->frame, &rcBorderWidths); + } + + return S_OK; +} diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f141bdf..c610ef5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -952,6 +952,7 @@ void update_title(HTMLDocumentObj*) DECLSPEC_HIDDEN; HRESULT do_query_service(IUnknown*,REFGUID,REFIID,void**) DECLSPEC_HIDDEN; /* editor */ +HRESULT setup_edit_mode(HTMLDocumentObj*) DECLSPEC_HIDDEN; void init_editor(HTMLDocument*) DECLSPEC_HIDDEN; void handle_edit_event(HTMLDocument*,nsIDOMEvent*) DECLSPEC_HIDDEN; HRESULT editor_exec_copy(HTMLDocument*,DWORD,VARIANT*,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index bda06b5..8d94209 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -592,109 +592,12 @@ static HRESULT exec_browsemode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in static HRESULT exec_editmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - IMoniker *mon; - HRESULT hres; - TRACE("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); if(in || out) FIXME("unsupported args\n"); - if(This->doc_obj->usermode == EDITMODE) - return S_OK; - - This->doc_obj->usermode = EDITMODE; - - if(This->window->mon) { - CLSID clsid = IID_NULL; - hres = IMoniker_GetClassID(This->window->mon, &clsid); - if(SUCCEEDED(hres)) { - /* We should use IMoniker::Save here */ - FIXME("Use CLSID %s\n", debugstr_guid(&clsid)); - } - } - - if(This->doc_obj->frame) - IOleInPlaceFrame_SetStatusText(This->doc_obj->frame, NULL); - - This->window->readystate = READYSTATE_UNINITIALIZED; - - if(This->doc_obj->client) { - IOleCommandTarget *cmdtrg; - - hres = IOleClientSite_QueryInterface(This->doc_obj->client, &IID_IOleCommandTarget, - (void**)&cmdtrg); - if(SUCCEEDED(hres)) { - VARIANT var; - - V_VT(&var) = VT_I4; - V_I4(&var) = 0; - IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); - - IOleCommandTarget_Release(cmdtrg); - } - } - - if(This->doc_obj->hostui) { - DOCHOSTUIINFO hostinfo; - - memset(&hostinfo, 0, sizeof(DOCHOSTUIINFO)); - hostinfo.cbSize = sizeof(DOCHOSTUIINFO); - hres = IDocHostUIHandler_GetHostInfo(This->doc_obj->hostui, &hostinfo); - if(SUCCEEDED(hres)) - /* FIXME: use hostinfo */ - TRACE("hostinfo = {%u %08x %08x %s %s}\n", - hostinfo.cbSize, hostinfo.dwFlags, hostinfo.dwDoubleClick, - debugstr_w(hostinfo.pchHostCss), debugstr_w(hostinfo.pchHostNS)); - } - - update_doc(This, UPDATE_UI); - - if(This->window->mon) { - /* FIXME: We should find nicer way to do this */ - remove_target_tasks(This->task_magic); - - mon = This->window->mon; - IMoniker_AddRef(mon); - }else { - static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; - - hres = CreateURLMoniker(NULL, about_blankW, &mon); - if(FAILED(hres)) { - FIXME("CreateURLMoniker failed: %08x\n", hres); - return hres; - } - } - - hres = IPersistMoniker_Load(&This->IPersistMoniker_iface, TRUE, mon, NULL, 0); - IMoniker_Release(mon); - if(FAILED(hres)) - return hres; - - if(This->doc_obj->ui_active) { - if(This->doc_obj->ip_window) - call_set_active_object(This->doc_obj->ip_window, NULL); - if(This->doc_obj->hostui) - IDocHostUIHandler_HideUI(This->doc_obj->hostui); - } - - if(This->doc_obj->ui_active) { - RECT rcBorderWidths; - - if(This->doc_obj->hostui) - IDocHostUIHandler_ShowUI(This->doc_obj->hostui, DOCHOSTUITYPE_AUTHOR, - &This->IOleInPlaceActiveObject_iface, &This->IOleCommandTarget_iface, - This->doc_obj->frame, This->doc_obj->ip_window); - - if(This->doc_obj->ip_window) - call_set_active_object(This->doc_obj->ip_window, &This->IOleInPlaceActiveObject_iface); - - memset(&rcBorderWidths, 0, sizeof(rcBorderWidths)); - if(This->doc_obj->frame) - IOleInPlaceFrame_SetBorderSpace(This->doc_obj->frame, &rcBorderWidths); - } - - return S_OK; + return setup_edit_mode(This->doc_obj); } static HRESULT exec_htmleditmode(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out)

1 0

Jacek Caban : mshtml: Use nsAString_InitDepend in SetDesignMode call.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 6a7db8967ff9f6e4db1333cb054295da87609909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a7db8967ff9f6e4db1333cb0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 12:58:08 2013 +0200 mshtml: Use nsAString_InitDepend in SetDesignMode call. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 113f33a..ccb2a56 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2949,7 +2949,7 @@ HRESULT update_window_doc(HTMLInnerWindow *window) static const PRUnichar onW[] = {'o','n',0}; - nsAString_Init(&mode_str, onW); + nsAString_InitDepend(&mode_str, onW); nsres = nsIDOMHTMLDocument_SetDesignMode(window->doc->nsdoc, &mode_str); nsAString_Finish(&mode_str); if(NS_FAILED(nsres))

1 0

Jacek Caban : mshtml: Added partial IHTMLDocument2:: put_designMode implementation.
by Alexandre Julliard 23 Apr '13

23 Apr '13

Module: wine Branch: master Commit: 0a346e21020d3af7b187824692305716fb30c679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a346e21020d3af7b18782469… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 23 12:58:18 2013 +0200 mshtml: Added partial IHTMLDocument2::put_designMode implementation. --- dlls/mshtml/htmldoc.c | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7168bab..36308f0 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -413,8 +413,23 @@ static HRESULT WINAPI HTMLDocument_get_scripts(IHTMLDocument2 *iface, IHTMLEleme static HRESULT WINAPI HTMLDocument_put_designMode(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + HRESULT hres; + + static const WCHAR onW[] = {'o','n',0}; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(strcmpiW(v, onW)) { + FIXME("Unsupported arg %s\n", debugstr_w(v)); + return E_NOTIMPL; + } + + hres = setup_edit_mode(This->doc_obj); + if(FAILED(hres)) + return hres; + + call_property_onchanged(&This->cp_container, 1014); + return S_OK; } static HRESULT WINAPI HTMLDocument_get_designMode(IHTMLDocument2 *iface, BSTR *p)

1 0