November 2012 - Wine-Commits

Vincent Povirk : gdiplus: Implement GdipCloneImage for metafiles with a handle.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: d8a855305f177ad2315a9c4840a6f174c5f90805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a855305f177ad2315a9c484… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 14:33:50 2012 -0500 gdiplus: Implement GdipCloneImage for metafiles with a handle. --- dlls/gdiplus/image.c | 34 ++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 24 ++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3ee024c..3918301 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1382,10 +1382,40 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) return stat; } + else if (image->type == ImageTypeMetafile && ((GpMetafile*)image)->hemf) + { + GpMetafile *result, *metafile; + + metafile = (GpMetafile*)image; + + result = GdipAlloc(sizeof(*result)); + if (!result) + return OutOfMemory; + + result->image.type = ImageTypeMetafile; + result->image.format = image->format; + result->image.flags = image->flags; + result->image.frame_count = 1; + result->image.xres = image->xres; + result->image.yres = image->yres; + result->bounds = metafile->bounds; + result->unit = metafile->unit; + result->metafile_type = metafile->metafile_type; + result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL); + + if (!result->hemf) + { + GdipFree(result); + return OutOfMemory; + } + + *cloneImage = &result->image; + return Ok; + } else { - ERR("GpImage with no IPicture or bitmap?!\n"); - return NotImplemented; + WARN("GpImage with no image data (metafile in wrong state?)\n"); + return InvalidParameter; } } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f283c06..3366f0e 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -474,6 +474,7 @@ static void test_emfonly(void) { GpStatus stat; GpMetafile *metafile; + GpImage *clone; GpGraphics *graphics; HDC hdc, metafile_dc; HENHMETAFILE hemf; @@ -560,6 +561,29 @@ static void test_emfonly(void) expect(Ok, stat); expect(0xff0000ff, color); + stat = GdipCloneImage((GpImage*)metafile, &clone); + expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, clone, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + GdipDisposeImage(clone); + } + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Reimplement GdipCreateMetafileFromEmf without using IPicture.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 91a3e5fc10b7fb0faae5498ae8bfb0d83478514b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a3e5fc10b7fb0faae5498ae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 15:37:16 2012 -0500 gdiplus: Reimplement GdipCreateMetafileFromEmf without using IPicture. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 70 ++++++++++++++++------------------------ dlls/gdiplus/image.c | 3 +- dlls/gdiplus/metafile.c | 38 +++++++++++++++++++++ 4 files changed, 70 insertions(+), 43 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 53f978c..13a63e6 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -58,6 +58,7 @@ extern GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **r extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; +extern MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) DECLSPEC_HIDDEN; extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; @@ -280,6 +281,7 @@ struct GpMetafile{ GpUnit unit; MetafileType metafile_type; HENHMETAFILE hemf; + int preserve_hemf; /* if true, hemf belongs to the app and should not be deleted */ /* recording */ HDC record_dc; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7380c5d..b3eaa86d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2350,62 +2350,43 @@ GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND hwnd, GpGraphics **graphics) GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, GpMetafile **metafile) { - IStream *stream = NULL; - UINT read; - ENHMETAHEADER *copy; - GpStatus retval = Ok; + ENHMETAHEADER header; + MetafileType metafile_type; TRACE("(%p,%i,%p)\n", hemf, delete, metafile); if(!hemf || !metafile) return InvalidParameter; - read = GetEnhMetaFileBits(hemf, 0, NULL); - copy = GdipAlloc(read); - GetEnhMetaFileBits(hemf, read, (BYTE *)copy); - - if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){ - ERR("could not make stream\n"); - GdipFree(copy); - retval = GenericError; - goto err; - } + if (GetEnhMetaFileHeader(hemf, sizeof(header), &header) == 0) + return GenericError; - *metafile = GdipAlloc(sizeof(GpMetafile)); - if(!*metafile){ - retval = OutOfMemory; - goto err; - } + metafile_type = METAFILE_GetEmfType(hemf); - if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, - (LPVOID*) &((*metafile)->image.picture)) != S_OK) - { - retval = GenericError; - goto err; - } + if (metafile_type == MetafileTypeInvalid) + return GenericError; + *metafile = GdipAlloc(sizeof(GpMetafile)); + if (!*metafile) + return OutOfMemory; (*metafile)->image.type = ImageTypeMetafile; - memcpy(&(*metafile)->image.format, &ImageFormatWMF, sizeof(GUID)); - (*metafile)->image.palette = NULL; - (*metafile)->image.xres = (REAL)copy->szlDevice.cx; - (*metafile)->image.yres = (REAL)copy->szlDevice.cy; - (*metafile)->bounds.X = (REAL)copy->rclBounds.left; - (*metafile)->bounds.Y = (REAL)copy->rclBounds.top; - (*metafile)->bounds.Width = (REAL)(copy->rclBounds.right - copy->rclBounds.left); - (*metafile)->bounds.Height = (REAL)(copy->rclBounds.bottom - copy->rclBounds.top); + (*metafile)->image.format = ImageFormatEMF; + (*metafile)->image.frame_count = 1; + (*metafile)->image.xres = (REAL)header.szlDevice.cx; + (*metafile)->image.yres = (REAL)header.szlDevice.cy; + (*metafile)->bounds.X = (REAL)header.rclBounds.left; + (*metafile)->bounds.Y = (REAL)header.rclBounds.top; + (*metafile)->bounds.Width = (REAL)(header.rclBounds.right - header.rclBounds.left); + (*metafile)->bounds.Height = (REAL)(header.rclBounds.bottom - header.rclBounds.top); (*metafile)->unit = UnitPixel; - - if(delete) - DeleteEnhMetaFile(hemf); + (*metafile)->metafile_type = metafile_type; + (*metafile)->hemf = hemf; + (*metafile)->preserve_hemf = !delete; TRACE("<-- %p\n", *metafile); -err: - if (retval != Ok) - GdipFree(*metafile); - IStream_Release(stream); - return retval; + return Ok; } GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, @@ -2431,7 +2412,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, hemf = SetWinMetaFileBits(read, copy, NULL, NULL); GdipFree(copy); - retval = GdipCreateMetafileFromEmf(hemf, FALSE, metafile); + /* FIXME: We should store and use hwmf instead of converting to hemf */ + retval = GdipCreateMetafileFromEmf(hemf, TRUE, metafile); if (retval == Ok) { @@ -2443,9 +2425,13 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, placeable->BoundingBox.Left); (*metafile)->bounds.Height = (REAL)(placeable->BoundingBox.Bottom - placeable->BoundingBox.Top); + (*metafile)->metafile_type = MetafileTypeWmfPlaceable; + (*metafile)->image.format = ImageFormatWMF; if (delete) DeleteMetaFile(hwmf); } + else + DeleteEnhMetaFile(hemf); return retval; } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3918301..73f08b9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2189,7 +2189,8 @@ static GpStatus free_image_data(GpImage *image) GpMetafile *metafile = (GpMetafile*)image; GdipFree(metafile->comment_data); DeleteEnhMetaFile(CloseEnhMetaFile(metafile->record_dc)); - DeleteEnhMetaFile(metafile->hemf); + if (!metafile->preserve_hemf) + DeleteEnhMetaFile(metafile->hemf); if (metafile->record_graphics) { WARN("metafile closed while recording\n"); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 030b2a2..4345ece 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -548,3 +548,41 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, return stat; } + +static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, + int nObj, LPARAM lpData) +{ + MetafileType *result = (MetafileType*)lpData; + + if (lpEMFR->iType == EMR_GDICOMMENT) + { + const EMRGDICOMMENT *comment = (const EMRGDICOMMENT*)lpEMFR; + + if (comment->cbData >= 4 && memcmp(comment->Data, "EMF+", 4) == 0) + { + const EmfPlusRecordHeader *header = (const EmfPlusRecordHeader*)&comment->Data[4]; + + if (4 + sizeof(EmfPlusRecordHeader) <= comment->cbData && + header->Type == EmfPlusRecordTypeHeader) + { + if ((header->Flags & 1) == 1) + *result = MetafileTypeEmfPlusDual; + else + *result = MetafileTypeEmfPlusOnly; + } + } + else + *result = MetafileTypeEmf; + } + else + *result = MetafileTypeEmf; + + return FALSE; +} + +MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) +{ + MetafileType result = MetafileTypeInvalid; + EnumEnhMetaFile(NULL, hemf, get_metafile_type_proc, &result, NULL); + return result; +}

1 0

Alexandre Julliard : gdi32: Store the font file name in Unicode in the font cache.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 24cdd74c6fe1f1f3eea3c29446e51305f88f8392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24cdd74c6fe1f1f3eea3c2944… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 13:16:26 2012 +0100 gdi32: Store the font file name in Unicode in the font cache. --- dlls/gdi32/freetype.c | 129 ++++++++++++++++++++++--------------------------- 1 files changed, 58 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24cdd74c6fe1f1f3eea3c…

1 0

Jacek Caban : widl: Define PROXY_DELEGATION in dlldata.c when needed.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 218b1951dba68361e4ce8e746dff952ced80d2d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=218b1951dba68361e4ce8e746… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:27:32 2012 +0100 widl: Define PROXY_DELEGATION in dlldata.c when needed. --- tools/widl/header.h | 1 + tools/widl/proxy.c | 7 ++++++- tools/widl/widl.c | 14 +++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 6d056db..bf5f426 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -47,6 +47,7 @@ extern int need_proxy(const type_t *iface); extern int need_inline_stubs(const type_t *iface); extern int need_stub_files(const statement_list_t *stmts); extern int need_proxy_file(const statement_list_t *stmts); +extern int need_proxy_delegation(const statement_list_t *stmts); extern int need_inline_stubs_file(const statement_list_t *stmts); extern const var_t *is_callas(const attr_list_t *list); extern void write_args(FILE *h, const var_list_t *arg, const char *name, int obj, int do_indent); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index e0690e4..0c0d7ce 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -778,7 +778,12 @@ int need_stub(const type_t *iface) int need_proxy_file(const statement_list_t *stmts) { - return does_any_iface(stmts, need_proxy); + return does_any_iface(stmts, need_proxy); +} + +int need_proxy_delegation(const statement_list_t *stmts) +{ + return does_any_iface(stmts, need_delegation); } int need_inline_stubs(const type_t *iface) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index fc3d0d9..8186b77 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -340,7 +340,7 @@ static void free_filename_nodes(struct list *list) } } -static void write_dlldata_list(struct list *filenames) +static void write_dlldata_list(struct list *filenames, int define_proxy_delegation) { FILE *dlldata; filename_node_t *node; @@ -351,6 +351,8 @@ static void write_dlldata_list(struct list *filenames) fprintf(dlldata, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); fprintf(dlldata, "- Do not edit ***/\n\n"); + if (define_proxy_delegation) + fprintf(dlldata, "#define PROXY_DELEGATION\n"); fprintf(dlldata, "#include <objbase.h>\n"); fprintf(dlldata, "#include <rpcproxy.h>\n\n"); start_cplusplus_guard(dlldata); @@ -380,15 +382,19 @@ static char *eat_space(char *s) void write_dlldata(const statement_list_t *stmts) { struct list filenames = LIST_INIT(filenames); + int define_proxy_delegation = 0; filename_node_t *node; FILE *dlldata; if (!do_dlldata || !need_proxy_file(stmts)) return; + define_proxy_delegation = need_proxy_delegation(stmts); + dlldata = fopen(dlldata_name, "r"); if (dlldata) { static char marker[] = "REFERENCE_PROXY_FILE"; + static const char delegation_define[] = "#define PROXY_DELEGATION"; char *line = NULL; size_t len = 0; @@ -409,6 +415,8 @@ void write_dlldata(const statement_list_t *stmts) *end = '\0'; if (start < end) add_filename_node(&filenames, start); + }else if (!define_proxy_delegation && strncmp(start, delegation_define, sizeof(delegation_define)-1)) { + define_proxy_delegation = 1; } } @@ -427,7 +435,7 @@ void write_dlldata(const statement_list_t *stmts) } add_filename_node(&filenames, proxy_token); - write_dlldata_list(&filenames); + write_dlldata_list(&filenames, define_proxy_delegation); free_filename_nodes(&filenames); } @@ -676,7 +684,7 @@ int main(int argc,char *argv[]) for ( ; optind < argc; ++optind) add_filename_node(&filenames, argv[optind]); - write_dlldata_list(&filenames); + write_dlldata_list(&filenames, 0 /* FIXME */ ); free_filename_nodes(&filenames); return 0; }

1 0

Piotr Caban : msvcrt: Fixed %Lf format handling in scanf.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: bab686e7d1483376e0bbec8e8f29d0ba61a317c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab686e7d1483376e0bbec8e8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 1 15:27:01 2012 +0100 msvcrt: Fixed %Lf format handling in scanf. --- dlls/msvcrt/scanf.h | 2 +- dlls/msvcrt/tests/scanf.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index cc2b861..3d02e8c 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -379,7 +379,7 @@ _FUNCTION_ { } st = 1; if (!suppress) { - if (L_prefix) _SET_NUMBER_(long double); + if (L_prefix) _SET_NUMBER_(double); else if (l_prefix) _SET_NUMBER_(double); else _SET_NUMBER_(float); } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index fb9d8e8..7c9f8d4 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -31,6 +31,7 @@ static void test_sscanf( void ) char c; void *ptr; float res1= -82.6267f, res2= 27.76f, res11, res12; + double double_res; static const char pname[]=" St. Petersburg, Florida\n"; int hour=21,min=59,sec=20; int number,number_so_far; @@ -99,6 +100,16 @@ static void test_sscanf( void ) ok( ret == 2, "expected 2, got %u\n", ret); ok( (res11 == res1) && (res12 == res2), "Error reading floats\n"); + /* Check double */ + ret = sprintf(buffer, "%lf", 32.715); + ok(ret == 9, "expected 9, got %u\n", ret); + ret = sscanf(buffer, "%lf", &double_res); + ok(ret == 1, "expected 1, got %u\n", ret); + ok(double_res == 32.715, "Got %lf, expected %lf\n", double_res, 32.715); + ret = sscanf(buffer, "%Lf", &double_res); + ok(ret == 1, "expected 1, got %u\n", ret); + ok(double_res == 32.715, "Got %lf, expected %lf\n", double_res, 32.715); + /* check strings */ ret = sprintf(buffer," %s", pname); ok( ret == 26, "expected 26, got %u\n", ret);

1 0

Piotr Caban : comctl32: Don't update rebar layout if it doesn' t change in REBAR_HandleUDDrag.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: d2f4893cb697f9c1b2b390c9ce12a443d843f04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f4893cb697f9c1b2b390c9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 1 15:27:57 2012 +0100 comctl32: Don't update rebar layout if it doesn't change in REBAR_HandleUDDrag. --- dlls/comctl32/rebar.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 02d9064..105363c 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2136,6 +2136,8 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) if(yOff < 0) { /* Place the band above the current top row */ + if(iHitBand==0 && (infoPtr->uNumBands==1 || REBAR_GetBand(infoPtr, 1)->fStyle&RBBS_BREAK)) + return; DPA_DeletePtr(infoPtr->bands, iHitBand); hitBand->fStyle &= RBBS_BREAK; REBAR_GetBand(infoPtr, 0)->fStyle |= RBBS_BREAK; @@ -2145,6 +2147,8 @@ REBAR_HandleUDDrag (REBAR_INFO *infoPtr, const POINT *ptsmove) else if(yOff > REBAR_GetBand(infoPtr, infoPtr->uNumBands - 1)->rcBand.bottom) { /* Place the band below the current bottom row */ + if(iHitBand == infoPtr->uNumBands-1 && hitBand->fStyle&RBBS_BREAK) + return; DPA_DeletePtr(infoPtr->bands, iHitBand); hitBand->fStyle |= RBBS_BREAK; infoPtr->iGrabbedBand = DPA_InsertPtr(

1 0

Hans Leidekker : winhttp: Fix the error returned from WinHttpGetProxyForUrl when autodetection fails .
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 8ca3e80ddd7bf291ec118e147f64559726cb7259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca3e80ddd7bf291ec118e147… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 1 14:45:59 2012 +0100 winhttp: Fix the error returned from WinHttpGetProxyForUrl when autodetection fails. --- dlls/winhttp/session.c | 4 +--- dlls/winhttp/tests/winhttp.c | 24 +++++++++++++++++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8ffcda1..3617b20 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -2024,10 +2024,8 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO } if (options->dwFlags & WINHTTP_AUTOPROXY_AUTO_DETECT && !WinHttpDetectAutoProxyConfigUrl( options->dwAutoDetectFlags, &detected_pac_url )) - { - set_last_error( ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR ); goto done; - } + if (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL) pac_url = options->lpszAutoConfigUrl; else pac_url = detected_pac_url; diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3bc686f..0f237d9 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2620,6 +2620,7 @@ static void test_WinHttpGetIEProxyConfigForCurrentUser(void) static void test_WinHttpGetProxyForUrl(void) { static const WCHAR urlW[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR wpadW[] = {'h','t','t','p',':','/','/','w','p','a','d','/','w','p','a','d','.','d','a','t',0}; static const WCHAR emptyW[] = {0}; BOOL ret; DWORD error; @@ -2693,8 +2694,29 @@ static void test_WinHttpGetProxyForUrl(void) options.dwAutoDetectFlags = WINHTTP_AUTO_DETECT_TYPE_DNS_A; memset( &info, 0, sizeof(info) ); + SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); - if (ret) + error = GetLastError(); + if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + else + { + trace("%u\n", info.dwAccessType); + trace("%s\n", wine_dbgstr_w(info.lpszProxy)); + trace("%s\n", wine_dbgstr_w(info.lpszProxyBypass)); + GlobalFree( info.lpszProxy ); + GlobalFree( info.lpszProxyBypass ); + } + + options.dwFlags = WINHTTP_AUTOPROXY_CONFIG_URL; + options.dwAutoDetectFlags = 0; + options.lpszAutoConfigUrl = wpadW; + + memset( &info, 0, sizeof(info) ); + SetLastError(0xdeadbeef); + ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); + error = GetLastError(); + if (!ret) ok( error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); + else { trace("%u\n", info.dwAccessType); trace("%s\n", wine_dbgstr_w(info.lpszProxy));

1 0

Nikolay Sivov : dwrite: Support nine more script ranges up to code point 0x0bff.
by Alexandre Julliard Nov. 1, 2012

Nov. 1, 2012

Module: wine Branch: master Commit: 4d2164c936d5d0a0c162761a5f25a24ffc48ec01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2164c936d5d0a0c162761a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 09:16:43 2012 -0400 dwrite: Support nine more script ranges up to code point 0x0bff. --- dlls/dwrite/analyzer.c | 29 +++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 0a0642a..6794c10 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -30,12 +30,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Bengali = 3, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, + Script_Devanagari = 18, Script_Greek = 23, + Script_Gujarati = 24, + Script_Gurmukhi = 25, Script_Hebrew = 29, Script_Latin = 38, + Script_NKo = 48, + Script_Oriya = 53, + Script_Syriac = 64, + Script_Tamil = 68, + Script_Thaana = 70, Script_Symbol = 77, Script_Unknown = (UINT16)-1 }; @@ -87,6 +96,26 @@ static const struct script_range script_ranges[] = { { Script_Hebrew, 0x590, 0x5ff }, /* Arabic: U+0600–U+06FF */ { Script_Arabic, 0x600, 0x6ff }, + /* Syriac: U+0600–U+06FF */ + { Script_Syriac, 0x700, 0x74f }, + /* Arabic Supplement: U+0750–U+077F */ + { Script_Arabic, 0x750, 0x77f }, + /* Thaana: U+0780–U+07BF */ + { Script_Thaana, 0x780, 0x7bf }, + /* N'Ko: U+07C0–U+07FF */ + { Script_NKo, 0x7c0, 0x7ff }, + /* Devanagari: U+0900–U+097F */ + { Script_Devanagari, 0x900, 0x97f }, + /* Bengali: U+0980–U+09FF */ + { Script_Bengali, 0x980, 0x9ff }, + /* Gurmukhi: U+0A00–U+0A7F */ + { Script_Gurmukhi, 0xa00, 0xa7f }, + /* Gujarati: U+0A80–U+0AFF */ + { Script_Gujarati, 0xa80, 0xaff }, + /* Oriya: U+0B00–U+0B7F */ + { Script_Oriya, 0xb00, 0xb7f }, + /* Tamil: U+0B80–U+0BFF */ + { Script_Tamil, 0xb80, 0xbff }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 648759f..dbd0307 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -399,12 +399,21 @@ struct sa_test { enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Bengali = 3, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, + Script_Devanagari = 18, Script_Greek = 23, + Script_Gujarati = 24, + Script_Gurmukhi = 25, Script_Hebrew = 29, Script_Latin = 38, + Script_NKo = 48, + Script_Oriya = 53, + Script_Syriac = 64, + Script_Tamil = 68, + Script_Thaana = 70, Script_Symbol = 77 }; @@ -532,6 +541,61 @@ static struct sa_test sa_tests[] = { { 9, 10, { Script_Hebrew, DWRITE_SCRIPT_SHAPES_DEFAULT } }, { 19, 10, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Syriac */ + {0x710,0x712,0x712,0x714,'.',0}, 1, + { { 0, 5, { Script_Syriac, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Arabic Supplement */ + {0x750,0x760,0x76d,'.',0}, 1, + { { 0, 4, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Thaana */ + {0x780,0x78e,0x798,0x7a6,0x7b0,'.',0}, 1, + { { 0, 6, { Script_Thaana, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* N'Ko */ + {0x7c0,0x7ca,0x7e8,0x7eb,0x7f6,'.',0}, 1, + { { 0, 6, { Script_NKo, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Thaana */ + {0x780,0x798,0x7a5,0x7a6,0x7b0,'.',0}, 1, + { { 0, 6, { Script_Thaana, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Devanagari */ + {0x926,0x947,0x935,0x928,0x93e,0x917,0x930,0x940,'.',0}, 1, + { { 0, 9, { Script_Devanagari, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Bengali */ + {0x9ac,0x9be,0x982,0x9b2,0x9be,'.',0}, 1, + { { 0, 6, { Script_Bengali, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Gurmukhi */ + {0xa17,0xa41,0xa30,0xa2e,0xa41,0xa16,0xa40,'.',0}, 1, + { { 0, 8, { Script_Gurmukhi, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Gujarati */ + {0xa97,0xac1,0xa9c,0xab0,0xabe,0xaa4,0xac0,'.',0}, 1, + { { 0, 8, { Script_Gujarati, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Oriya */ + {0xb13,0xb21,0xb3c,0xb3f,0xb06,'.',0}, 1, + { { 0, 6, { Script_Oriya, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Tamil */ + {0xba4,0xbae,0xbbf,0xbb4,0xbcd,'.',0}, 1, + { { 0, 6, { Script_Tamil, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0