March 2011 - Wine-commits - list.winehq.org

Vincent Povirk : gdiplus: Use GdipFillPath to implement GdipFillPolygon.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 86d55d43c5f49ac5e87196cb1d4153626e292e18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86d55d43c5f49ac5e87196cb1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:42:30 2011 -0600 gdiplus: Use GdipFillPath to implement GdipFillPolygon. --- dlls/gdiplus/graphics.c | 46 +++++++++++----------------------------------- 1 files changed, 11 insertions(+), 35 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 262828b..f2ebfba 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3511,10 +3511,8 @@ GpStatus WINGDIPAPI GdipFillPieI(GpGraphics *graphics, GpBrush *brush, INT x, GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPointF *points, INT count, GpFillMode fillMode) { - INT save_state; - GpPointF *ptf = NULL; - POINT *pti = NULL; - GpStatus retval = Ok; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %p, %d, %d)\n", graphics, brush, points, count, fillMode); @@ -3524,41 +3522,19 @@ GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf = GdipAlloc(count * sizeof(GpPointF)); - pti = GdipAlloc(count * sizeof(POINT)); - if(!ptf || !pti){ - retval = OutOfMemory; - goto end; - } - - memcpy(ptf, points, count * sizeof(GpPointF)); + stat = GdipCreatePath(fillMode, &path); - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE - : WINDING)); - - transform_and_round_points(graphics, pti, ptf, count); - - BeginPath(graphics->hdc); - Polygon(graphics->hdc, pti, count); - EndPath(graphics->hdc); - - brush_fill_path(graphics, brush); + if (stat == Ok) + { + stat = GdipAddPathPolygon(path, points, count); - RestoreDC(graphics->hdc, save_state); + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); -end: - GdipFree(ptf); - GdipFree(pti); + GdipDeletePath(path); + } - return retval; + return stat; } GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush,

1 0

Vincent Povirk : gdiplus: Use GdipFillPath to implement GdipFillPolygonI.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 5190f8a5f1c41b10a1b7d1d0837cf78cebd41862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5190f8a5f1c41b10a1b7d1d08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:45:41 2011 -0600 gdiplus: Use GdipFillPath to implement GdipFillPolygonI. --- dlls/gdiplus/graphics.c | 47 ++++++++++------------------------------------- 1 files changed, 10 insertions(+), 37 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f2ebfba..b0b4d08 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3540,10 +3540,8 @@ GpStatus WINGDIPAPI GdipFillPolygon(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpPoint *points, INT count, GpFillMode fillMode) { - INT save_state, i; - GpPointF *ptf = NULL; - POINT *pti = NULL; - GpStatus retval = Ok; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %p, %d, %d)\n", graphics, brush, points, count, fillMode); @@ -3553,44 +3551,19 @@ GpStatus WINGDIPAPI GdipFillPolygonI(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) + stat = GdipCreatePath(fillMode, &path); + + if (stat == Ok) { - FIXME("graphics object has no HDC\n"); - return Ok; - } + stat = GdipAddPathPolygonI(path, points, count); - ptf = GdipAlloc(count * sizeof(GpPointF)); - pti = GdipAlloc(count * sizeof(POINT)); - if(!ptf || !pti){ - retval = OutOfMemory; - goto end; - } + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); - for(i = 0; i < count; i ++){ - ptf[i].X = (REAL) points[i].X; - ptf[i].Y = (REAL) points[i].Y; + GdipDeletePath(path); } - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - SetPolyFillMode(graphics->hdc, (fillMode == FillModeAlternate ? ALTERNATE - : WINDING)); - - transform_and_round_points(graphics, pti, ptf, count); - - BeginPath(graphics->hdc); - Polygon(graphics->hdc, pti, count); - EndPath(graphics->hdc); - - brush_fill_path(graphics, brush); - - RestoreDC(graphics->hdc, save_state); - -end: - GdipFree(ptf); - GdipFree(pti); - - return retval; + return stat; } GpStatus WINGDIPAPI GdipFillPolygon2(GpGraphics *graphics, GpBrush *brush,

1 0

Vincent Povirk : gdiplus: Implement GdipFillRectangle based on GdipFillPath .
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 71eb248c3050a89c9e6291cabbaca1ae15142928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71eb248c3050a89c9e6291cab… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 16:51:48 2011 -0600 gdiplus: Implement GdipFillRectangle based on GdipFillPath. --- dlls/gdiplus/graphics.c | 79 ++++++---------------------------------- dlls/gdiplus/tests/graphics.c | 2 +- 2 files changed, 13 insertions(+), 68 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b0b4d08..a9f4cf3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3585,9 +3585,8 @@ GpStatus WINGDIPAPI GdipFillPolygon2I(GpGraphics *graphics, GpBrush *brush, GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[4]; - POINT pti[4]; + GpStatus stat; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, brush, x, y, width, height); @@ -3597,81 +3596,27 @@ GpStatus WINGDIPAPI GdipFillRectangle(GpGraphics *graphics, GpBrush *brush, if(graphics->busy) return ObjectBusy; - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y; - ptf[2].X = x + width; - ptf[2].Y = y + height; - ptf[3].X = x; - ptf[3].Y = y + height; - - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - - transform_and_round_points(graphics, pti, ptf, 4); + stat = GdipCreatePath(FillModeAlternate, &path); - BeginPath(graphics->hdc); - Polygon(graphics->hdc, pti, 4); - EndPath(graphics->hdc); + if (stat == Ok) + { + stat = GdipAddPathRectangle(path, x, y, width, height); - brush_fill_path(graphics, brush); + if (stat == Ok) + stat = GdipFillPath(graphics, brush, path); - RestoreDC(graphics->hdc, save_state); + GdipDeletePath(path); + } - return Ok; + return stat; } GpStatus WINGDIPAPI GdipFillRectangleI(GpGraphics *graphics, GpBrush *brush, INT x, INT y, INT width, INT height) { - INT save_state; - GpPointF ptf[4]; - POINT pti[4]; - TRACE("(%p, %p, %d, %d, %d, %d)\n", graphics, brush, x, y, width, height); - if(!graphics || !brush) - return InvalidParameter; - - if(graphics->busy) - return ObjectBusy; - - if(!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y; - ptf[2].X = x + width; - ptf[2].Y = y + height; - ptf[3].X = x; - ptf[3].Y = y + height; - - save_state = SaveDC(graphics->hdc); - EndPath(graphics->hdc); - - transform_and_round_points(graphics, pti, ptf, 4); - - BeginPath(graphics->hdc); - Polygon(graphics->hdc, pti, 4); - EndPath(graphics->hdc); - - brush_fill_path(graphics, brush); - - RestoreDC(graphics->hdc, save_state); - - return Ok; + return GdipFillRectangle(graphics, brush, x, y, width, height); } GpStatus WINGDIPAPI GdipFillRectangles(GpGraphics *graphics, GpBrush *brush, GDIPCONST GpRectF *rects, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ecdbe93..bd14ab6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2231,7 +2231,7 @@ static void test_fromMemoryBitmap(void) GdipDeleteGraphics(graphics); /* drawing writes to the memory provided */ - todo_wine expect(0x68, bits[10]); + expect(0x68, bits[10]); status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); expect(Ok, status);

1 0

Vincent Povirk : gdiplus: Remove the gdi32 line gradient drawing code.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 504b7c34d6850714578280f1c4c6a02310543507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=504b7c34d6850714578280f1c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Mar 10 17:15:24 2011 -0600 gdiplus: Remove the gdi32 line gradient drawing code. It's unused now. --- dlls/gdiplus/graphics.c | 120 ----------------------------------------------- 1 files changed, 0 insertions(+), 120 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a9f4cf3..479f26e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -597,126 +597,6 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) { switch (brush->bt) { - case BrushTypeLinearGradient: - { - GpLineGradient *line = (GpLineGradient*)brush; - RECT rc; - - SelectClipPath(graphics->hdc, RGN_AND); - if (GetClipBox(graphics->hdc, &rc) != NULLREGION) - { - GpPointF endpointsf[2]; - POINT endpointsi[2]; - POINT poly[4]; - - SelectObject(graphics->hdc, GetStockObject(NULL_PEN)); - - endpointsf[0] = line->startpoint; - endpointsf[1] = line->endpoint; - transform_and_round_points(graphics, endpointsi, endpointsf, 2); - - if (abs(endpointsi[0].x-endpointsi[1].x) > abs(endpointsi[0].y-endpointsi[1].y)) - { - /* vertical-ish gradient */ - int startx, endx; /* x co-ordinates of endpoints shifted to intersect the top of the visible rectangle */ - int startbottomx; /* x co-ordinate of start point shifted to intersect the bottom of the visible rectangle */ - int width; - COLORREF col; - HBRUSH hbrush, hprevbrush; - int leftx, rightx; /* x co-ordinates where the leftmost and rightmost gradient lines hit the top of the visible rectangle */ - int x; - int tilt; /* horizontal distance covered by a gradient line */ - - startx = roundr((rc.top - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); - endx = roundr((rc.top - endpointsf[1].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[1].X); - width = endx - startx; - startbottomx = roundr((rc.bottom - endpointsf[0].Y) * (endpointsf[1].Y - endpointsf[0].Y) / (endpointsf[0].X - endpointsf[1].X) + endpointsf[0].X); - tilt = startx - startbottomx; - - if (startx >= startbottomx) - { - leftx = rc.left; - rightx = rc.right + tilt; - } - else - { - leftx = rc.left + tilt; - rightx = rc.right; - } - - poly[0].y = rc.bottom; - poly[1].y = rc.top; - poly[2].y = rc.top; - poly[3].y = rc.bottom; - - for (x=leftx; x<=rightx; x++) - { - ARGB argb = blend_line_gradient(line, (x-startx)/(REAL)width); - col = ARGB2COLORREF(argb); - hbrush = CreateSolidBrush(col); - hprevbrush = SelectObject(graphics->hdc, hbrush); - poly[0].x = x - tilt - 1; - poly[1].x = x - 1; - poly[2].x = x; - poly[3].x = x - tilt; - Polygon(graphics->hdc, poly, 4); - SelectObject(graphics->hdc, hprevbrush); - DeleteObject(hbrush); - } - } - else if (endpointsi[0].y != endpointsi[1].y) - { - /* horizontal-ish gradient */ - int starty, endy; /* y co-ordinates of endpoints shifted to intersect the left of the visible rectangle */ - int startrighty; /* y co-ordinate of start point shifted to intersect the right of the visible rectangle */ - int height; - COLORREF col; - HBRUSH hbrush, hprevbrush; - int topy, bottomy; /* y co-ordinates where the topmost and bottommost gradient lines hit the left of the visible rectangle */ - int y; - int tilt; /* vertical distance covered by a gradient line */ - - starty = roundr((rc.left - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); - endy = roundr((rc.left - endpointsf[1].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[1].Y); - height = endy - starty; - startrighty = roundr((rc.right - endpointsf[0].X) * (endpointsf[0].X - endpointsf[1].X) / (endpointsf[1].Y - endpointsf[0].Y) + endpointsf[0].Y); - tilt = starty - startrighty; - - if (starty >= startrighty) - { - topy = rc.top; - bottomy = rc.bottom + tilt; - } - else - { - topy = rc.top + tilt; - bottomy = rc.bottom; - } - - poly[0].x = rc.right; - poly[1].x = rc.left; - poly[2].x = rc.left; - poly[3].x = rc.right; - - for (y=topy; y<=bottomy; y++) - { - ARGB argb = blend_line_gradient(line, (y-starty)/(REAL)height); - col = ARGB2COLORREF(argb); - hbrush = CreateSolidBrush(col); - hprevbrush = SelectObject(graphics->hdc, hbrush); - poly[0].y = y - tilt - 1; - poly[1].y = y - 1; - poly[2].y = y; - poly[3].y = y - tilt; - Polygon(graphics->hdc, poly, 4); - SelectObject(graphics->hdc, hprevbrush); - DeleteObject(hbrush); - } - } - /* else startpoint == endpoint */ - } - break; - } case BrushTypeSolidColor: { GpSolidFill *fill = (GpSolidFill*)brush;

1 0

Jacek Caban : mshtml: Correctly set NULL event.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 48aadd44aefda8bf4e87607787ac189b86d7bc5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48aadd44aefda8bf4e8760778… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 16 22:01:15 2011 +0100 mshtml: Correctly set NULL event. --- dlls/mshtml/htmlevent.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fc146d6..d1430cd 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -982,8 +982,10 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode return; event_obj = create_event(node, eid, nsevent); + doc->basedoc.window->event = &event_obj->IHTMLEventObj_iface; + }else { + doc->basedoc.window->event = NULL; } - doc->basedoc.window->event = &event_obj->IHTMLEventObj_iface; nsIDOMNode_GetNodeType(target, &node_type); nsnode = target;

1 0

Jacek Caban : wininet: Decompress gzip data in refill_buffer to ensure that we have the data to report .
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 2bb3f4fa75c91eb89f9e361c2d99baa9a31d39dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bb3f4fa75c91eb89f9e361c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 01:01:19 2011 +0100 wininet: Decompress gzip data in refill_buffer to ensure that we have the data to report. --- dlls/wininet/http.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b027af9..7e27531 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2062,7 +2062,7 @@ static BOOL end_of_read_data( http_request_t *req ) } /* fetch some more data into the read buffer (the read section must be held) */ -static DWORD refill_buffer( http_request_t *req ) +static DWORD refill_read_buffer( http_request_t *req ) { int len = sizeof(req->read_buf); DWORD res; @@ -2092,7 +2092,7 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, while(read < size && !req->gzip_stream->end_of_data) { if(!req->read_size) { - if(!sync || refill_buffer(req) != ERROR_SUCCESS) + if((!sync && read) || (ret = refill_read_buffer(req)) != ERROR_SUCCESS) break; } @@ -2126,13 +2126,13 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, return ret; } -static void refill_gzip_buffer(http_request_t *req) +static DWORD refill_gzip_buffer(http_request_t *req) { DWORD res; int len; - if(!req->gzip_stream || !req->read_size || req->gzip_stream->buf_size == sizeof(req->gzip_stream->buf)) - return; + if(req->gzip_stream->buf_size == sizeof(req->gzip_stream->buf)) + return ERROR_SUCCESS; if(req->gzip_stream->buf_pos) { if(req->gzip_stream->buf_size) @@ -2144,15 +2144,20 @@ static void refill_gzip_buffer(http_request_t *req) sizeof(req->gzip_stream->buf) - req->gzip_stream->buf_size, FALSE, &len); if(res == ERROR_SUCCESS) req->gzip_stream->buf_size += len; + + return res; +} + +static DWORD refill_buffer( http_request_t *req ) +{ + return req->gzip_stream ? refill_gzip_buffer(req) : refill_read_buffer(req); } /* return the size of data available to be read immediately (the read section must be held) */ static DWORD get_avail_data( http_request_t *req ) { - if (req->gzip_stream) { - refill_gzip_buffer(req); + if (req->gzip_stream) return req->gzip_stream->buf_size; - } if (req->read_chunked && (req->contentLength == ~0u || req->contentLength == req->contentRead)) return 0; return min( req->read_size, req->contentLength - req->contentRead );

1 0

Jacek Caban : wininet: Ensure that we have data to report before sending INTERNET_STATUS_REQUEST_COMPLETE in HTTP_HttpEndRequestW .
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 685daf2006f8b6619206e33b28a65df4ec414386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=685daf2006f8b6619206e33b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 17 01:01:49 2011 +0100 wininet: Ensure that we have data to report before sending INTERNET_STATUS_REQUEST_COMPLETE in HTTP_HttpEndRequestW. --- dlls/wininet/http.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7e27531..9444f08 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4333,7 +4333,6 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ { INT responseLen; DWORD dwBufferSize; - INTERNET_ASYNC_RESULT iar; DWORD res = ERROR_SUCCESS; INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, @@ -4382,12 +4381,16 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ } } - iar.dwResult = (res==ERROR_SUCCESS ? (DWORD_PTR)request->hdr.hInternet : 0); - iar.dwError = res; + if (res == ERROR_SUCCESS) { + HTTP_ReceiveRequestData(request, TRUE); + }else { + INTERNET_ASYNC_RESULT iar = {0, res}; + + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, + INTERNET_STATUS_REQUEST_COMPLETE, &iar, + sizeof(INTERNET_ASYNC_RESULT)); + } - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, - INTERNET_STATUS_REQUEST_COMPLETE, &iar, - sizeof(INTERNET_ASYNC_RESULT)); return res; }

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: e7dfa0d5d7f5c0ed22141dbc81a240d91976aae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7dfa0d5d7f5c0ed22141dbc8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 16 20:26:41 2011 +0100 po: Update French translation. --- po/fr.po | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-) diff --git a/po/fr.po b/po/fr.po index f6985fc..7181833 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2807,7 +2807,6 @@ msgid "Signal pending\n" msgstr "Signal déjà en attente\n" #: winerror.mc:681 -#, fuzzy msgid "Max system-wide thread count reached\n" msgstr "Nombre maximal de threads du système atteint\n" @@ -4240,7 +4239,6 @@ msgid "Private dialog index\n" msgstr "Index de fenêtre de dialogue privé\n" #: winerror.mc:2476 -#, fuzzy msgid "List box ID not found\n" msgstr "ID de liste de choix non trouvée\n" @@ -4305,7 +4303,6 @@ msgid "Hook procedure not installed\n" msgstr "Procédure accrochée pas installée\n" #: winerror.mc:2556 -#, fuzzy msgid "Invalid list box message\n" msgstr "Message de liste de choix invalide\n" @@ -4314,7 +4311,6 @@ msgid "Invalid LB_SETCOUNT sent\n" msgstr "LB_SETCOUNT invalide envoyé\n" #: winerror.mc:2566 -#, fuzzy msgid "No tab stops on this list box\n" msgstr "Aucune marque de tabulation dans cette liste de choix\n" @@ -4384,7 +4380,6 @@ msgid "No system resources\n" msgstr "Ressources système insuffisantes\n" #: winerror.mc:2651 -#, fuzzy msgid "No non-paged system resources\n" msgstr "Ressources système non paginées insuffisantes\n" @@ -4397,7 +4392,6 @@ msgid "No working set quota\n" msgstr "Quota insuffisant pour l'espace de travail\n" #: winerror.mc:2666 -#, fuzzy msgid "No page file quota\n" msgstr "Quota insuffisant pour le fichier d'échange\n" @@ -4474,7 +4468,6 @@ msgid "Unknown component\n" msgstr "Composant inconnu\n" #: winerror.mc:2761 -#, fuzzy msgid "Unknown property\n" msgstr "Propriété inconnue\n" @@ -5007,7 +5000,6 @@ msgid "Invalid printer command\n" msgstr "Commande d'imprimante invalide\n" #: winerror.mc:3431 -#, fuzzy msgid "Invalid data type\n" msgstr "Type de donnée invalide\n" @@ -5323,7 +5315,6 @@ msgid "insert disk %s" msgstr "insérez le disque %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -6921,7 +6912,6 @@ msgid "An invalid parameter was passed to a system function." msgstr "Un paramètre non valide a été passé à une fonction système." #: winmm.rc:42 -#, fuzzy msgid "" "The specified format is not supported or cannot be translated. Use the " "Capabilities function to determine the supported formats." @@ -7128,7 +7118,6 @@ msgstr "" "commande." #: winmm.rc:77 -#, fuzzy msgid "" "Errors occurred in more than one device. Specify each command and device " "separately to determine which devices caused the error." @@ -7615,11 +7604,9 @@ msgstr "Problème de déréférencement d'alias" msgid "Inappropriate Authentication" msgstr "Authentification inappropriée" -# informations d'authentification? d'identification? #: wldap32.rc:76 -#, fuzzy msgid "Invalid Credentials" -msgstr "Autorisations invalides" +msgstr "Informations d'authentification invalides" #: wldap32.rc:77 msgid "Insufficient Rights" @@ -8083,7 +8070,6 @@ msgstr "" "REN <fichier> est la version courte de RENAME. Elle renomme un fichier.\n" #: cmd.rc:158 -#, fuzzy msgid "RENAME <filename> renames a file.\n" msgstr "RENAME <fichier> renomme un fichier.\n" @@ -8185,7 +8171,6 @@ msgstr "" "L'indicateur de vérification n'a pas de fonction dans Wine.\n" #: cmd.rc:204 -#, fuzzy msgid "VER displays the version of cmd you are running.\n" msgstr "VER affiche la version de cmd utilisée.\n" @@ -10487,7 +10472,6 @@ msgid "CD-ROM" msgstr "CD-ROM" #: winecfg.rc:86 -#, fuzzy msgid "" "You cannot add any more drives.\n" "\n" @@ -11405,7 +11389,6 @@ msgid "&System\tCtrl+1" msgstr "&Système\tCtrl+1" #: wordpad.rc:88 -#, fuzzy msgid "&Pale yellow\tCtrl+2" msgstr "&Jaune pâle\tCtrl+2"

1 0

Dmitry Timoshkov : advapi32: Add more file access permissions tests.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 2dfae4a73328b3e4b582f78ef199af4993f37445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dfae4a73328b3e4b582f78ef… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Mar 17 17:22:31 2011 +0800 advapi32: Add more file access permissions tests. --- dlls/advapi32/tests/security.c | 136 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 133 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 43406eb..5409c35 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -813,7 +813,7 @@ cleanup: DeleteFileA(file); RemoveDirectoryA(path); - + /* Test file access permissions for a file with FILE_ATTRIBUTE_ARCHIVE */ SetLastError(0xdeadbeef); rc = GetTempPath(sizeof(wintmpdir), wintmpdir); ok(rc, "GetTempPath error %d\n", GetLastError()); @@ -840,6 +840,7 @@ cleanup: rc = GetFileSecurity(file, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, sd, sdSize, &retSize); ok(rc, "GetFileSecurity error %d\n", GetLastError()); + ok(retSize == sdSize || broken(retSize == 0) /* NT4 */, "expected %d, got %d\n", sdSize, retSize); SetLastError(0xdeadbeef); rc = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, TRUE, &token); @@ -887,6 +888,14 @@ todo_wine { granted = 0xdeadbeef; status = 0xdeadbeef; SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, DELETE, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == DELETE, "expected DELETE, got %#x\n", granted); + + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); rc = AccessCheck(sd, token, FILE_DELETE_CHILD, &mapping, &priv_set, &priv_set_len, &granted, &status); ok(rc, "AccessCheck error %d\n", GetLastError()); ok(status == 1, "expected 1, got %d\n", status); @@ -915,9 +924,130 @@ todo_wine { ok(!rc, "AccessCheck should fail\n"); ok(GetLastError() == ERROR_GENERIC_NOT_MAPPED, "expected ERROR_GENERIC_NOT_MAPPED, got %d\n", GetLastError()); + /* Test file access permissions for a file with FILE_ATTRIBUTE_READONLY */ + SetLastError(0xdeadbeef); + fh = CreateFile(file, FILE_READ_DATA, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok(fh != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + retSize = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = WriteFile(fh, "1", 1, &retSize, NULL); + ok(!rc, "WriteFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(retSize == 0, "expected 0, got %d\n", retSize); + CloseHandle(fh); + + rc = GetFileAttributes(file); + rc &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; +todo_wine + ok(rc == (FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY), + "expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x\n", rc); + + SetLastError(0xdeadbeef); + rc = SetFileAttributes(file, FILE_ATTRIBUTE_ARCHIVE); + ok(rc, "SetFileAttributes error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + rc = DeleteFile(file); + ok(rc, "DeleteFile error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + fh = CreateFile(file, FILE_READ_DATA, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_READONLY, 0); + ok(fh != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + retSize = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = WriteFile(fh, "1", 1, &retSize, NULL); + ok(!rc, "WriteFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + ok(retSize == 0, "expected 0, got %d\n", retSize); + CloseHandle(fh); + + rc = GetFileAttributes(file); + rc &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; + ok(rc == (FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY), + "expected FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY got %#x\n", rc); + + retSize = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = GetFileSecurity(file, OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, + sd, sdSize, &retSize); + ok(rc, "GetFileSecurity error %d\n", GetLastError()); + ok(retSize == sdSize || broken(retSize == 0) /* NT4 */, "expected %d, got %d\n", sdSize, retSize); + + priv_set_len = sizeof(priv_set); + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_READ_DATA, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_READ_DATA, "expected FILE_READ_DATA, got %#x\n", granted); + + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_WRITE_DATA, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_WRITE_DATA, "expected FILE_WRITE_DATA, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_EXECUTE, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_EXECUTE, "expected FILE_EXECUTE, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, DELETE, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == DELETE, "expected DELETE, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_DELETE_CHILD, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_DELETE_CHILD, "expected FILE_DELETE_CHILD, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, 0x1ff, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == 0x1ff, "expected 0x1ff, got %#x\n", granted); +} + granted = 0xdeadbeef; + status = 0xdeadbeef; + SetLastError(0xdeadbeef); + rc = AccessCheck(sd, token, FILE_ALL_ACCESS, &mapping, &priv_set, &priv_set_len, &granted, &status); + ok(rc, "AccessCheck error %d\n", GetLastError()); +todo_wine { + ok(status == 1, "expected 1, got %d\n", status); + ok(granted == FILE_ALL_ACCESS, "expected FILE_ALL_ACCESS, got %#x\n", granted); +} + SetLastError(0xdeadbeef); + rc = DeleteFile(file); + ok(!rc, "DeleteFile should fail\n"); + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + rc = SetFileAttributes(file, FILE_ATTRIBUTE_ARCHIVE); + ok(rc, "SetFileAttributes error %d\n", GetLastError()); + SetLastError(0xdeadbeef); + rc = DeleteFile(file); + ok(rc, "DeleteFile error %d\n", GetLastError()); + CloseHandle(token); - HeapFree(GetProcessHeap (), 0, sd); - DeleteFile(file); + HeapFree(GetProcessHeap(), 0, sd); } static void test_AccessCheck(void)

1 0

Maarten Lankhorst : kernel32: CreateProcessA should not call CreateProcessW directly.
by Alexandre Julliard 17 Mar '11

17 Mar '11

Module: wine Branch: master Commit: 8b163d6fb600b62c4995b0c92f48316d9821b7ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b163d6fb600b62c4995b0c92… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 16 19:38:08 2011 +0100 kernel32: CreateProcessA should not call CreateProcessW directly. --- dlls/kernel32/process.c | 109 ++++++++++++++++++++++++++--------------------- 1 files changed, 60 insertions(+), 49 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 4ef8f2a..1956649 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2166,55 +2166,11 @@ static LPWSTR get_file_name( LPCWSTR appname, LPWSTR cmdline, LPWSTR buffer, } -/********************************************************************** - * CreateProcessA (KERNEL32.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, - DWORD flags, LPVOID env, LPCSTR cur_dir, - LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) -{ - BOOL ret = FALSE; - WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; - UNICODE_STRING desktopW, titleW; - STARTUPINFOW infoW; - - desktopW.Buffer = NULL; - titleW.Buffer = NULL; - if (app_name && !(app_nameW = FILE_name_AtoW( app_name, TRUE ))) goto done; - if (cmd_line && !(cmd_lineW = FILE_name_AtoW( cmd_line, TRUE ))) goto done; - if (cur_dir && !(cur_dirW = FILE_name_AtoW( cur_dir, TRUE ))) goto done; - - if (startup_info->lpDesktop) RtlCreateUnicodeStringFromAsciiz( &desktopW, startup_info->lpDesktop ); - if (startup_info->lpTitle) RtlCreateUnicodeStringFromAsciiz( &titleW, startup_info->lpTitle ); - - memcpy( &infoW, startup_info, sizeof(infoW) ); - infoW.lpDesktop = desktopW.Buffer; - infoW.lpTitle = titleW.Buffer; - - if (startup_info->lpReserved) - FIXME("StartupInfo.lpReserved is used, please report (%s)\n", - debugstr_a(startup_info->lpReserved)); - - ret = CreateProcessW( app_nameW, cmd_lineW, process_attr, thread_attr, - inherit, flags, env, cur_dirW, &infoW, info ); -done: - HeapFree( GetProcessHeap(), 0, app_nameW ); - HeapFree( GetProcessHeap(), 0, cmd_lineW ); - HeapFree( GetProcessHeap(), 0, cur_dirW ); - RtlFreeUnicodeString( &desktopW ); - RtlFreeUnicodeString( &titleW ); - return ret; -} - - -/********************************************************************** - * CreateProcessW (KERNEL32.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, - LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, - LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, - LPPROCESS_INFORMATION info ) +/* Steam hotpatches CreateProcessA and W, so to prevent it from crashing use an internal function */ +static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, + LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, + LPPROCESS_INFORMATION info ) { BOOL retv = FALSE; HANDLE hFile = 0; @@ -2346,6 +2302,61 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, /********************************************************************** + * CreateProcessA (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessA( LPCSTR app_name, LPSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, + DWORD flags, LPVOID env, LPCSTR cur_dir, + LPSTARTUPINFOA startup_info, LPPROCESS_INFORMATION info ) +{ + BOOL ret = FALSE; + WCHAR *app_nameW = NULL, *cmd_lineW = NULL, *cur_dirW = NULL; + UNICODE_STRING desktopW, titleW; + STARTUPINFOW infoW; + + desktopW.Buffer = NULL; + titleW.Buffer = NULL; + if (app_name && !(app_nameW = FILE_name_AtoW( app_name, TRUE ))) goto done; + if (cmd_line && !(cmd_lineW = FILE_name_AtoW( cmd_line, TRUE ))) goto done; + if (cur_dir && !(cur_dirW = FILE_name_AtoW( cur_dir, TRUE ))) goto done; + + if (startup_info->lpDesktop) RtlCreateUnicodeStringFromAsciiz( &desktopW, startup_info->lpDesktop ); + if (startup_info->lpTitle) RtlCreateUnicodeStringFromAsciiz( &titleW, startup_info->lpTitle ); + + memcpy( &infoW, startup_info, sizeof(infoW) ); + infoW.lpDesktop = desktopW.Buffer; + infoW.lpTitle = titleW.Buffer; + + if (startup_info->lpReserved) + FIXME("StartupInfo.lpReserved is used, please report (%s)\n", + debugstr_a(startup_info->lpReserved)); + + ret = create_process_impl( app_nameW, cmd_lineW, process_attr, thread_attr, + inherit, flags, env, cur_dirW, &infoW, info ); +done: + HeapFree( GetProcessHeap(), 0, app_nameW ); + HeapFree( GetProcessHeap(), 0, cmd_lineW ); + HeapFree( GetProcessHeap(), 0, cur_dirW ); + RtlFreeUnicodeString( &desktopW ); + RtlFreeUnicodeString( &titleW ); + return ret; +} + + +/********************************************************************** + * CreateProcessW (KERNEL32.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessW( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_ATTRIBUTES process_attr, + LPSECURITY_ATTRIBUTES thread_attr, BOOL inherit, DWORD flags, + LPVOID env, LPCWSTR cur_dir, LPSTARTUPINFOW startup_info, + LPPROCESS_INFORMATION info ) +{ + return create_process_impl( app_name, cmd_line, process_attr, thread_attr, + inherit, flags, env, cur_dir, startup_info, info); +} + + +/********************************************************************** * exec_process */ static void exec_process( LPCWSTR name )

1 0