October 2013 - Wine-commits

Akihiro Sagawa : gdi32: Fix empty glyph handling in the dib driver.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: b138c36c1137b8cc7111d88b7debbd15d9b59fe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b138c36c1137b8cc7111d88b7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 1 22:03:16 2013 +0900 gdi32: Fix empty glyph handling in the dib driver. --- dlls/gdi32/dibdrv/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index f3aaeb6..2c865c0 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -694,13 +694,14 @@ static struct cached_glyph *cache_glyph_bitmap( HDC hdc, struct cached_font *fon if (ret != GDI_ERROR) break; } if (ret == GDI_ERROR) return NULL; + if (!ret) metrics.gmBlackBoxX = metrics.gmBlackBoxY = 0; /* empty glyph */ bit_count = get_glyph_depth( font->aa_flags ); stride = get_dib_stride( metrics.gmBlackBoxX, bit_count ); size = metrics.gmBlackBoxY * stride; glyph = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( struct cached_glyph, bits[size] )); if (!glyph) return NULL; - if (!ret) goto done; /* zero-size glyph */ + if (!size) goto done; /* empty glyph */ if (bit_count == 8) pad = padding[ metrics.gmBlackBoxX % 4 ];

1 0

Akihiro Sagawa : gdi32: Return fake BBox when requesting empty glyph metrics.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: db86409db66362c56031429ec124e65064e4f0bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=db86409db66362c56031429ec… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Oct 1 22:03:18 2013 +0900 gdi32: Return fake BBox when requesting empty glyph metrics. --- dlls/gdi32/freetype.c | 4 ++-- dlls/gdi32/tests/font.c | 24 ++++++++---------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index bd4c895..15f401a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6520,8 +6520,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, width = (right - left) >> 6; height = (top - bottom) >> 6; - lpgm->gmBlackBoxX = width; - lpgm->gmBlackBoxY = height; + lpgm->gmBlackBoxX = width ? width : 1; + lpgm->gmBlackBoxY = height ? height : 1; lpgm->gmptGlyphOrigin.x = origin_x >> 6; lpgm->gmptGlyphOrigin.y = origin_y >> 6; abc->abcA = left >> 6; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a6f439b..f6e4d07 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4120,10 +4120,8 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); else ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); - todo_wine { - ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); - } + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } memset(&gm, 0xab, sizeof(gm)); @@ -4135,10 +4133,8 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); else ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); - todo_wine { - ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); - } + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } memset(&gm, 0xab, sizeof(gm)); @@ -4150,10 +4146,8 @@ static void test_GetGlyphOutline(void) ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); else ok(ret == 0, "%2d:GetGlyphOutlineW should return 0, got %d\n", fmt[i], ret); - todo_wine { - ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); - } + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } memset(&gm, 0xab, sizeof(gm)); @@ -4163,10 +4157,8 @@ static void test_GetGlyphOutline(void) { if (fmt[i] == GGO_METRICS) { ok(ret != GDI_ERROR, "%2d:GetGlyphOutlineW should succeed, got %d\n", fmt[i], ret); - todo_wine { - ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); - ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); - } + ok(gm.gmBlackBoxX == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxX); + ok(gm.gmBlackBoxY == 1, "%2d:expected 1, got %u\n", fmt[i], gm.gmBlackBoxY); } else ok(ret == GDI_ERROR, "%2d:GetGlyphOutlineW should return GDI_ERROR, got %d\n", fmt[i], ret);

1 0

Francois Gouget : winmm: Fix two error messages to not point users to a MIDI Mapper configuration applet we don 't have.
by Alexandre Julliard 01 Oct '13

01 Oct '13

1 0

Piotr Caban : msvcrt: Add _wtoi64_l implementation.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 3868bf06b25b16ab8e92f0c51416a2eb325d0fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3868bf06b25b16ab8e92f0c51… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:28:29 2013 +0200 msvcrt: Add _wtoi64_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4323e45..646137d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1609,7 +1609,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 57bd107..b82a58e 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1967,7 +1967,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b70d4fb..0a0adf6 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1291,7 +1291,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 36cf2e4..382a52e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1264,7 +1264,7 @@ @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 -@ stub _wtoi64_l +@ cdecl -ret64 _wtoi64_l(wstr ptr) msvcrt._wtoi64_l @ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wtol_l(wstr ptr) msvcrt._wtol_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7cfc370..acf53aa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1229,8 +1229,8 @@ @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) MSVCRT__wtoi -@ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 -# stub -ret64 _wtoi64_l(wstr ptr) +@ cdecl -ret64 _wtoi64(wstr) +@ cdecl -ret64 _wtoi64_l(wstr ptr) @ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l @ cdecl _wtol(wstr) MSVCRT__wtol @ cdecl _wtol_l(wstr ptr) MSVCRT__wtol_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1cf2276..4b23671 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1888,3 +1888,38 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcsstr(const MSVCRT_wchar_t *str, const MSVCRT_wcha { return strstrW(str, sub); } + +/********************************************************************* + * _wtoi64_l (MSVCRT.@) + */ +__int64 CDECL _wtoi64_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + ULONGLONG RunningTotal = 0; + char bMinus = 0; + + while (isspaceW(*str)) { + str++; + } /* while */ + + if (*str == '+') { + str++; + } else if (*str == '-') { + bMinus = 1; + str++; + } /* if */ + + while (*str >= '0' && *str <= '9') { + RunningTotal = RunningTotal * 10 + *str - '0'; + str++; + } /* while */ + + return bMinus ? -RunningTotal : RunningTotal; +} + +/********************************************************************* + * _wtoi64 (MSVCRT.@) + */ +__int64 CDECL _wtoi64(const MSVCRT_wchar_t *str) +{ + return _wtoi64_l(str, NULL); +}

1 0

Piotr Caban : msvcrt: Don't forward bsearch to ntdll.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 5fce0724ed53b78fb8fc93c69e1db783db91387a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fce0724ed53b78fb8fc93c69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:28:54 2013 +0200 msvcrt: Don't forward bsearch to ntdll. --- dlls/msvcrt/misc.c | 14 ++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 75e75e6..effca2b 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -151,6 +151,20 @@ void* CDECL MSVCRT_bsearch_s(const void *key, const void *base, return NULL; } +static int CDECL compare_wrapper(void *ctx, const void *e1, const void *e2) +{ + int (__cdecl *compare)(const void *, const void *) = ctx; + return compare(e1, e2); +} + +/********************************************************************* + * bsearch (msvcrt.@) + */ +void* CDECL MSVCRT_bsearch(const void *key, const void *base, MSVCRT_size_t nmemb, + MSVCRT_size_t size, int (__cdecl *compar)(const void *, const void *)) +{ + return MSVCRT_bsearch_s(key, base, nmemb, size, compare_wrapper, compar); +} /********************************************************************* * _chkesp (MSVCRT.@) * diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index acf53aa..63e4f4c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1257,7 +1257,7 @@ @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi @ cdecl atol(str) ntdll.atol -@ cdecl bsearch(ptr ptr long long ptr) ntdll.bsearch +@ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc

1 0

Piotr Caban : msvcrt: Don't forward qsort to ntdll.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 7fb5cca3e4bc50d5a02f4be500915a98372869a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb5cca3e4bc50d5a02f4be50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:29:10 2013 +0200 msvcrt: Don't forward qsort to ntdll. --- dlls/msvcrt/misc.c | 9 +++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index effca2b..069f733 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -294,6 +294,15 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, } /********************************************************************* + * qsort (MSVCRT.@) + */ +void CDECL MSVCRT_qsort(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, + int (CDECL *compar)(const void*, const void*)) +{ + return MSVCRT_qsort_s(base, nmemb, size, compare_wrapper, compar); +} + +/********************************************************************* * _get_output_format (MSVCRT.@) */ unsigned int CDECL _get_output_format(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 63e4f4c..f8a4b73 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1389,7 +1389,7 @@ @ cdecl puts(str) MSVCRT_puts @ cdecl putwc(long ptr) MSVCRT_fputwc @ cdecl putwchar(long) MSVCRT__fputwchar -@ cdecl qsort(ptr long long ptr) ntdll.qsort +@ cdecl qsort(ptr long long ptr) MSVCRT_qsort @ cdecl qsort_s(ptr long long ptr ptr) MSVCRT_qsort_s @ cdecl raise(long) MSVCRT_raise @ cdecl rand() MSVCRT_rand

1 0

Piotr Caban : msvcrt: Don't forward wcsncmp to ntdll.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 26721c25f6e3e070b0c7c7cd6fb62c94a4a55811 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26721c25f6e3e070b0c7c7cd6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 1 11:29:22 2013 +0200 msvcrt: Don't forward wcsncmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f8a4b73..43daf0f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1492,7 +1492,7 @@ @ cdecl wcslen(wstr) MSVCRT_wcslen @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat @ cdecl wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s -@ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp +@ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp @ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4b23671..97d916f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1923,3 +1923,11 @@ __int64 CDECL _wtoi64(const MSVCRT_wchar_t *str) { return _wtoi64_l(str, NULL); } + +/********************************************************************* + * wcsncmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcsncmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, int n) +{ + return strncmpW(str1, str2, n); +}

1 0

Hans Leidekker : wmic: Convert integer property values to BSTR.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 471bcd7e134db2d7edc115859b794e285f829485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=471bcd7e134db2d7edc115859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 1 11:35:46 2013 +0200 wmic: Convert integer property values to BSTR. --- programs/wmic/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 8d89bf4..5aee4c1 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -229,6 +229,7 @@ static int query_prop( const WCHAR *alias, const WCHAR *propname ) } if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) { + VariantChangeType( &v, &v, 0, VT_BSTR ); output_string( fmtW, V_BSTR( &v ) ); VariantClear( &v ); }

1 0

Stefan Dösinger : wined3d: Don' t invert blits from offscreen surfaces.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 723e518312fa7a030b444e714c118c335ad57699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=723e518312fa7a030b444e714… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 1 13:05:39 2013 +0200 wined3d: Don't invert blits from offscreen surfaces. --- dlls/wined3d/arb_program_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 282c2d0..e1d2faa 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7460,7 +7460,8 @@ HRESULT arbfp_blit_surface(struct wined3d_device *device, DWORD filter, /* Now load the surface */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE) + && (src_surface->flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) == SFLAG_INDRAWABLE + && !surface_is_offscreen(src_surface)) { /* Without FBO blits transferring from the drawable to the texture is * expensive, because we have to flip the data in sysmem. Since we can

1 0

Jacek Caban : urlmon: Include values from 'Post Platform' registry key in user agent string.
by Alexandre Julliard 01 Oct '13

01 Oct '13

Module: wine Branch: master Commit: 7226c490980803fd98224c531e5f30dfd7fa2119 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7226c490980803fd98224c531… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 1 13:21:00 2013 +0200 urlmon: Include values from 'Post Platform' registry key in user agent string. --- dlls/urlmon/session.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 55 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index ce6ab4e..bb41c31 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -534,15 +534,26 @@ static void ensure_useragent(void) { OSVERSIONINFOW info = {sizeof(info)}; const WCHAR *os_type, *is_nt; - WCHAR buf[512]; + WCHAR buf[512], *ret, *tmp; + DWORD res, idx=0; + size_t len, size; BOOL is_wow; + HKEY key; static const WCHAR formatW[] = {'M','o','z','i','l','l','a','/','4','.','0', ' ','(','c','o','m','p','a','t','i','b','l','e',';', ' ','M','S','I','E',' ','8','.','0',';', ' ','W','i','n','d','o','w','s',' ','%','s','%','d','.','%','d',';', - ' ','%','s',';',' ','T','r','i','d','e','n','t','/','5','.','0',')',0}; + ' ','%','s',';',' ','T','r','i','d','e','n','t','/','5','.','0',0}; + static const WCHAR post_platform_keyW[] = + {'S','O','F','T','W','A','R','E', + '\\','M','i','c','r','o','s','o','f','t', + '\\','W','i','n','d','o','w','s', + '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n', + '\\','I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s', + '\\','5','.','0','\\','U','s','e','r',' ','A','g','e','n','t', + '\\','P','o','s','t',' ','P','l','a','t','f','o','r','m',0}; static const WCHAR ntW[] = {'N','T',' ',0}; static const WCHAR win32W[] = {'W','i','n','3','2',0}; static const WCHAR win64W[] = {'W','i','n','6','4',0}; @@ -563,7 +574,48 @@ static void ensure_useragent(void) os_type = win32W; sprintfW(buf, formatW, is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); - user_agent = heap_strdupW(buf); + len = strlenW(buf); + + size = len+40; + ret = heap_alloc(size * sizeof(WCHAR)); + if(!ret) + return; + + memcpy(ret, buf, len*sizeof(WCHAR)); + + res = RegOpenKeyW(HKEY_LOCAL_MACHINE, post_platform_keyW, &key); + if(res == ERROR_SUCCESS) { + DWORD value_len; + + while(1) { + value_len = sizeof(buf)/sizeof(WCHAR); + res = RegEnumValueW(key, idx, buf, &value_len, NULL, NULL, NULL, NULL); + if(res != ERROR_SUCCESS) + break; + idx++; + + if(len + value_len + 2 /* strlen("; ") */ + 1 /* trailing ')' */ >= size) { + tmp = heap_realloc(ret, (size*2+value_len)*sizeof(WCHAR)); + if(!tmp) + break; + ret = tmp; + size = size*2+value_len; + } + + ret[len++] = ';'; + ret[len++] = ' '; + memcpy(ret+len, buf, value_len*sizeof(WCHAR)); + len += value_len; + } + + RegCloseKey(key); + } + + ret[len++] = ')'; + ret[len++] = 0; + + user_agent = ret; + TRACE("Using user agent %s\n", debugstr_w(user_agent)); } LPWSTR get_useragent(void)

1 0