October 2011 - Wine-commits

Alexandre Julliard : gdi32: Get rid of the return value in DIB conversion functions, they never fail now.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: a413916802df65f169c783f88372ab5dbf05f9ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=a413916802df65f169c783f88… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 00:15:29 2011 +0200 gdi32: Get rid of the return value in DIB conversion functions, they never fail now. --- dlls/gdi32/dibdrv/dc.c | 3 +- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 10 ++---- dlls/gdi32/dibdrv/primitives.c | 68 +++++---------------------------------- 4 files changed, 15 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 883a60a..29528f5 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -290,7 +290,8 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit __TRY { - ret = dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect ); + dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect ); + ret = TRUE; } __EXCEPT_PAGE_FAULT { diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 0be8ffa..7eae7cb 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -141,7 +141,7 @@ typedef struct primitive_funcs void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); - BOOL (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); + void (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); BOOL (* create_rop_masks)(const dib_info *dib, const dib_info *hatch, const rop_mask *fg, const rop_mask *bg, rop_mask_bits *bits); void (* stretch_row)(const dib_info *dst_dib, const POINT *dst_start, diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 2dcd33a..67eda57 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1349,13 +1349,9 @@ HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) rect.right = orig_dib.width; rect.bottom = orig_dib.height; - if(pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect)) - { - pdev->brush_rects = pattern_brush; - pdev->defer &= ~DEFER_BRUSH; - } - else - free_dib_info(&pdev->brush_dib); + pdev->brush_dib.funcs->convert_to(&pdev->brush_dib, &orig_dib, &rect); + pdev->brush_rects = pattern_brush; + pdev->defer &= ~DEFER_BRUSH; free_dib_info(&orig_dib); } GlobalUnlock((HGLOBAL)logbrush.lbHatch); diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 051177d..47e5f77 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1141,7 +1141,7 @@ static inline BOOL bit_fields_match(const dib_info *d1, const dib_info *d2) d1->blue_mask == d2->blue_mask; } -static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_rect) { DWORD *dst_start = get_pixel_ptr_32(dst, 0, 0), *dst_pixel, src_val; int x, y, pad_size = (dst->width - (src_rect->right - src_rect->left)) * 4; @@ -1376,16 +1376,10 @@ static BOOL convert_to_8888(dib_info *dst, const dib_info *src, const RECT *src_ } break; } - - default: - FIXME("Unsupported conversion: %d -> 8888\n", src->bit_count); - return FALSE; } - - return TRUE; } -static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_rect) { DWORD *dst_start = get_pixel_ptr_32(dst, 0, 0), *dst_pixel, src_val; int x, y, pad_size = (dst->width - (src_rect->right - src_rect->left)) * 4; @@ -1648,16 +1642,10 @@ static BOOL convert_to_32(dib_info *dst, const dib_info *src, const RECT *src_re } break; } - - default: - FIXME("Unsupported conversion: %d -> 32\n", src->bit_count); - return FALSE; } - - return TRUE; } -static BOOL convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_24(dst, 0, 0), *dst_pixel; DWORD src_val; @@ -1897,16 +1885,10 @@ static BOOL convert_to_24(dib_info *dst, const dib_info *src, const RECT *src_re } break; } - - default: - FIXME("Unsupported conversion: %d -> 24\n", src->bit_count); - return FALSE; } - - return TRUE; } -static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_rect) { WORD *dst_start = get_pixel_ptr_16(dst, 0, 0), *dst_pixel; INT x, y, pad_size = ((dst->width + 1) & ~1) * 2 - (src_rect->right - src_rect->left) * 2; @@ -2145,16 +2127,10 @@ static BOOL convert_to_555(dib_info *dst, const dib_info *src, const RECT *src_r } break; } - - default: - FIXME("Unsupported conversion: %d -> 555\n", src->bit_count); - return FALSE; - } - return TRUE; } -static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_rect) { WORD *dst_start = get_pixel_ptr_16(dst, 0, 0), *dst_pixel; INT x, y, pad_size = ((dst->width + 1) & ~1) * 2 - (src_rect->right - src_rect->left) * 2; @@ -2417,13 +2393,7 @@ static BOOL convert_to_16(dib_info *dst, const dib_info *src, const RECT *src_re } break; } - - default: - FIXME("Unsupported conversion: %d -> 16\n", src->bit_count); - return FALSE; - } - return TRUE; } static inline BOOL color_tables_match(const dib_info *d1, const dib_info *d2) @@ -2434,7 +2404,7 @@ static inline BOOL color_tables_match(const dib_info *d1, const dib_info *d2) return !memcmp(d1->color_table, d2->color_table, d1->color_table_size * sizeof(d1->color_table[0])); } -static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_8(dst, 0, 0), *dst_pixel; INT x, y, pad_size = ((dst->width + 3) & ~3) - (src_rect->right - src_rect->left); @@ -2695,16 +2665,10 @@ static BOOL convert_to_8(dib_info *dst, const dib_info *src, const RECT *src_rec } break; } - - default: - FIXME("Unsupported conversion: %d -> 8\n", src->bit_count); - return FALSE; - } - return TRUE; } -static BOOL convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_4(dst, 0, 0), *dst_pixel, dst_val; INT x, y, pad_size = ((dst->width + 7) & ~7) / 2 - (src_rect->right - src_rect->left + 1) / 2; @@ -3088,17 +3052,10 @@ static BOOL convert_to_4(dib_info *dst, const dib_info *src, const RECT *src_rec } break; } - - default: - FIXME("Unsupported conversion: %d -> 4\n", src->bit_count); - return FALSE; - } - - return TRUE; } -static BOOL convert_to_1(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_1(dib_info *dst, const dib_info *src, const RECT *src_rect) { BYTE *dst_start = get_pixel_ptr_1(dst, 0, 0), *dst_pixel, dst_val; INT x, y, pad_size = ((dst->width + 31) & ~31) / 8 - (src_rect->right - src_rect->left + 7) / 8; @@ -3490,18 +3447,11 @@ static BOOL convert_to_1(dib_info *dst, const dib_info *src, const RECT *src_rec } break; } - - default: - FIXME("Unsupported conversion: %d -> 1\n", src->bit_count); - return FALSE; - } - return TRUE; } -static BOOL convert_to_null(dib_info *dst, const dib_info *src, const RECT *src_rect) +static void convert_to_null(dib_info *dst, const dib_info *src, const RECT *src_rect) { - return FALSE; } static BOOL create_rop_masks_32(const dib_info *dib, const dib_info *hatch, const rop_mask *fg, const rop_mask *bg, rop_mask_bits *bits)

1 0

Alexandre Julliard : gdi32: Add a check for null bitfields in SetDIBits.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 34310d44792b334d4995b1830c4137d9b764eba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34310d44792b334d4995b1830… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 00:43:05 2011 +0200 gdi32: Add a check for null bitfields in SetDIBits. --- dlls/gdi32/dib.c | 9 +++++++++ dlls/gdi32/tests/bitmap.c | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 56efda7..20041ad 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -519,6 +519,15 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (src_info->bmiHeader.biCompression == BI_BITFIELDS) + { + DWORD *masks = (DWORD *)src_info->bmiColors; + if (!masks[0] || !masks[1] || !masks[2]) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + } src_bits.ptr = (void *)bits; src_bits.is_copy = FALSE; diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index eaf96a5..e069fa8 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -976,7 +976,7 @@ static void test_dib_formats(void) hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); - todo_wine ok( !ret, "SetDIBits succeeded with null bitfields\n" ); + ok( !ret, "SetDIBits succeeded with null bitfields\n" ); /* other functions don't check */ hdib = CreateDIBitmap( hdc, &bi->bmiHeader, 0, bits, bi, DIB_RGB_COLORS ); ok( hdib != NULL, "CreateDIBitmap failed with null bitfields\n" ); @@ -984,7 +984,7 @@ static void test_dib_formats(void) ret = SetDIBitsToDevice( memdc, 0, 0, 1, 1, 0, 0, 0, 1, data, bi, DIB_RGB_COLORS ); ok( ret, "SetDIBitsToDevice failed with null bitfields\n" ); ret = StretchDIBits( memdc, 0, 0, 1, 1, 0, 0, 1, 1, data, bi, DIB_RGB_COLORS, SRCCOPY ); - ok( ret, "StretchDIBits failed with null bitfields\n" ); + todo_wine ok( ret, "StretchDIBits failed with null bitfields\n" ); ret = GetDIBits(hdc, hbmp, 0, 2, data, bi, DIB_RGB_COLORS); ok( ret, "GetDIBits failed with null bitfields\n" ); bi->bmiHeader.biPlanes = 1; @@ -1004,7 +1004,7 @@ static void test_dib_formats(void) hdib = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); ok( hdib == NULL, "CreateDIBSection succeeded with null bitfields\n" ); ret = SetDIBits(hdc, hbmp, 0, 1, data, bi, DIB_RGB_COLORS); - todo_wine ok( !ret, "SetDIBits succeeded with null bitfields\n" ); + ok( !ret, "SetDIBits succeeded with null bitfields\n" ); /* garbage is ok though */ *(DWORD *)&bi->bmiColors[0] = 0x55;

1 0

Alexandre Julliard : gdi32: Add a helper for RGB to color index mapping to avoid redundant shifts.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: e79033e6fab04e35ded889efadd66ff710258e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e79033e6fab04e35ded889efa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 13 11:21:58 2011 +0200 gdi32: Add a helper for RGB to color index mapping to avoid redundant shifts. --- dlls/gdi32/dibdrv/primitives.c | 249 +++++++++++++++++++--------------------- 1 files changed, 120 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e79033e6fab04e35ded88…

1 0

Dan Kegel : msi: Initialize variable to placate static analyzers.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: c77395dc08ffa41da3b51278dcb8194951125d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77395dc08ffa41da3b51278d… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Oct 13 06:26:15 2011 -0700 msi: Initialize variable to placate static analyzers. --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c1ebe17..ce08940 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -350,7 +350,7 @@ done: static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWSTR szCommandLine) { - UINT r, i; + UINT i, r = ERROR_FUNCTION_FAILED; DWORD size; LPCWSTR cmd_ptr = szCommandLine; LPWSTR cmd, *codes = NULL;

1 0

Austin English : wined3d: Recognize "Brian Paul" as a mesa card vendor.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: aacbc7e2b7f711cb508c2b21cebafd40017e7ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aacbc7e2b7f711cb508c2b21c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Oct 12 19:23:46 2011 -0500 wined3d: Recognize "Brian Paul" as a mesa card vendor. --- dlls/wined3d/directx.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b393c69..7e63add 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1471,6 +1471,7 @@ static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_s return HW_VENDOR_INTEL; if (strstr(gl_vendor_string, "Mesa") + || strstr(gl_vendor_string, "Brian Paul") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.")) return HW_VENDOR_SOFTWARE;

1 0

Hans Leidekker : cryptnet: Respect proxy settings.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: a552a7a9f5b69c4b7fb1bc457c48bcd868bef9e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a552a7a9f5b69c4b7fb1bc457… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 13 10:14:16 2011 +0200 cryptnet: Respect proxy settings. --- dlls/cryptnet/cryptnet_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 6464908..e7f9f46 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -827,7 +827,7 @@ static BOOL CRYPT_Connect(const URL_COMPONENTSW *components, components->nPort, context, pCredentials, phInt, phInt); *phHost = NULL; - *phInt = InternetOpenW(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, + *phInt = InternetOpenW(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, context ? INTERNET_FLAG_ASYNC : 0); if (*phInt) {

1 0

Francois Gouget : comctl32/tests: Make impl_from_IStream() static.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 07cfe3ea51f1f0a49befa82fe4637a1abb74ae0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=07cfe3ea51f1f0a49befa82fe… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Oct 13 12:15:33 2011 +0200 comctl32/tests: Make impl_from_IStream() static. --- dlls/comctl32/tests/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 36c9b65..f783ce6 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -579,7 +579,7 @@ struct my_IStream ULONG iml_data_size; }; -struct my_IStream *impl_from_IStream(IStream *iface) +static struct my_IStream *impl_from_IStream(IStream *iface) { return CONTAINING_RECORD(iface, struct my_IStream, IStream_iface); }

1 0

Francois Gouget : po: Fix translations with a mismatched '\n' ending or mark them as fuzzy.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: 76ef1877008250ae6d479ad790f30b1ba2183f61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ef1877008250ae6d479ad79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 13 12:19:42 2011 +0200 po: Fix translations with a mismatched '\n' ending or mark them as fuzzy. --- po/fr.po | 2 +- po/it.po | 2 +- po/ko.po | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9583c10..7de4dc6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10525,7 +10525,7 @@ msgstr "(Aucun)" #: winecfg.rc:89 msgid "Audio test failed!" -msgstr "Échec du test audio !\n" +msgstr "Échec du test audio !" #: winecfg.rc:91 msgid "(System default)" diff --git a/po/it.po b/po/it.po index 68f9c48..7e5e78f 100644 --- a/po/it.po +++ b/po/it.po @@ -3627,7 +3627,7 @@ msgstr "Impossibile spostare il file di sostituzione nella posizione\n" #: winerror.mc:1606 msgid "Moving the replacement file failed\n" -msgstr "Spostamento del file di sostituzione fallito" +msgstr "Spostamento del file di sostituzione fallito\n" #: winerror.mc:1611 msgid "The journal is being deleted\n" diff --git a/po/ko.po b/po/ko.po index ffa5952..63c76b5 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7935,7 +7935,7 @@ msgstr "" "PAUSE 는 사용자가 아무 키나 누르라는 메세지를 화면에 보여줍니다.\n" "\n" "사용자가 화면에서 스크롤 하기 전에 이전 명령의 결과를 읽을 수 있도록\n" -"배치파일에서 주로 유용하게 사용합니다." +"배치파일에서 주로 유용하게 사용합니다.\n" #: cmd.rc:149 msgid "" @@ -10346,6 +10346,7 @@ msgid "(None)" msgstr "(없음)" #: winecfg.rc:89 +#, fuzzy msgid "Audio test failed!" msgstr "오디오 테스트 실패\n"

1 0

Piotr Caban : msvcrt: Don' t duplicate _setmbcp functionality inside _create_locale function.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: fea69b230546cd8145c67e9f94b3e8f0fa2bea2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fea69b230546cd8145c67e9f9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 13 12:24:59 2011 +0200 msvcrt: Don't duplicate _setmbcp functionality inside _create_locale function. --- dlls/msvcrt/locale.c | 14 +----------- dlls/msvcrt/mbcs.c | 57 +++++++++++++++++++++++++++++++++++++------------ dlls/msvcrt/msvcrt.h | 1 + 3 files changed, 45 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7e9cebe..0fbc0fe 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -747,7 +747,6 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) } memset(loc->locinfo, 0, sizeof(MSVCRT_threadlocinfo)); - memset(loc->mbcinfo, 0, sizeof(MSVCRT_threadmbcinfo)); loc->locinfo->lconv = MSVCRT_malloc(sizeof(struct MSVCRT_lconv)); if(!loc->locinfo->lconv) { @@ -840,18 +839,7 @@ MSVCRT__locale_t MSVCRT__create_locale(int category, const char *locale) } } - loc->mbcinfo->refcount = 1; - loc->mbcinfo->mbcodepage = loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage; - - for(i=0; i<256; i++) { - if(loc->locinfo->pclmap[i] != i) { - loc->mbcinfo->mbctype[i+1] |= 0x10; - loc->mbcinfo->mbcasemap[i] = loc->locinfo->pclmap[i]; - } else if(loc->locinfo->pcumap[i] != i) { - loc->mbcinfo->mbctype[i+1] |= 0x20; - loc->mbcinfo->mbcasemap[i] = loc->locinfo->pcumap[i]; - } - } + _setmbcp_l(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, loc->mbcinfo); if(lcid[MSVCRT_LC_MONETARY] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_MONETARY)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_MONETARY], loc, MSVCRT_LC_MONETARY)) { diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 96cea86..737f690 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -182,25 +182,25 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) } /********************************************************************* - * _setmbcp (MSVCRT.@) + * INTERNAL: _setmbcp_l */ -int CDECL _setmbcp(int cp) +int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) { const char format[] = ".%d"; - MSVCRT_pthreadmbcinfo mbcinfo = get_mbcinfo(); - char buf[32]; int newcp; CPINFO cpi; BYTE *bytes; WORD chartypes[256]; - WORD *curr_type; char bufA[256]; WCHAR bufW[256]; int charcount; int ret; int i; + if(!mbcinfo) + mbcinfo = get_mbcinfo(); + switch (cp) { case _MB_CP_ANSI: @@ -222,8 +222,8 @@ int CDECL _setmbcp(int cp) break; } - sprintf(buf, format, newcp); - mbcinfo->mblcid = MSVCRT_locale_to_LCID(buf); + sprintf(bufA, format, newcp); + mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA); if(mbcinfo->mblcid == -1) { WARN("Can't assign LCID to codepage (%d)\n", mbcinfo->mblcid); @@ -290,16 +290,37 @@ int CDECL _setmbcp(int cp) GetStringTypeW(CT_CTYPE1, bufW, charcount, chartypes); - curr_type = chartypes; + charcount = 0; for (i = 0; i < 256; i++) if (!(mbcinfo->mbctype[i + 1] & _M1)) { - if ((*curr_type) & C1_UPPER) - mbcinfo->mbctype[i + 1] |= _SBUP; - if ((*curr_type) & C1_LOWER) - mbcinfo->mbctype[i + 1] |= _SBLOW; - curr_type++; + if (chartypes[charcount] & C1_UPPER) + { + mbcinfo->mbctype[i + 1] |= _SBUP; + bufW[charcount] = tolowerW(bufW[charcount]); + } + else if (chartypes[charcount] & C1_LOWER) + { + mbcinfo->mbctype[i + 1] |= _SBLOW; + bufW[charcount] = toupperW(bufW[charcount]); + } + charcount++; + } + + ret = WideCharToMultiByte(newcp, 0, bufW, charcount, bufA, charcount, NULL, NULL); + if (ret != charcount) + ERR("WideCharToMultiByte failed for cp %d, ret=%d (exp %d), error=%d\n", newcp, ret, charcount, GetLastError()); + + charcount = 0; + for (i = 0; i < 256; i++) + { + if(!(mbcinfo->mbctype[i + 1] & _M1)) + { + if(mbcinfo->mbctype[i] & (C1_UPPER|C1_LOWER)) + mbcinfo->mbcasemap[i] = bufA[charcount]; + charcount++; } + } if (newcp == 932) /* CP932 only - set _MP and _MS */ { @@ -315,13 +336,21 @@ int CDECL _setmbcp(int cp) } mbcinfo->mbcodepage = newcp; - if(mbcinfo == MSVCRT_locale->mbcinfo) + if(MSVCRT_locale && mbcinfo == MSVCRT_locale->mbcinfo) memcpy(MSVCRT_mbctype, MSVCRT_locale->mbcinfo->mbctype, sizeof(MSVCRT_mbctype)); return 0; } /********************************************************************* + * _setmbcp (MSVCRT.@) + */ +int CDECL _setmbcp(int cp) +{ + return _setmbcp_l(cp, NULL); +} + +/********************************************************************* * _getmbcp (MSVCRT.@) */ int CDECL _getmbcp(void) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 65e00a1..14bf972 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -888,6 +888,7 @@ MSVCRT_pthreadmbcinfo get_mbcinfo(void); void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo); void free_mbcinfo(MSVCRT_pthreadmbcinfo); +int _setmbcp_l(int, MSVCRT_pthreadmbcinfo); #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int);

1 0

Bernhard Loos : server: PIPE_TYPE_BYTE | PIPE_READMODE_MESSAGE is invalid for named pipes.
by Alexandre Julliard 13 Oct '11

13 Oct '11

Module: wine Branch: master Commit: c368df486565a83f7f0268a260306b0825e9a0bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c368df486565a83f7f0268a26… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Oct 12 14:50:40 2011 +0200 server: PIPE_TYPE_BYTE | PIPE_READMODE_MESSAGE is invalid for named pipes. --- dlls/kernel32/tests/pipe.c | 13 +++++++++++++ server/named_pipe.c | 3 ++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index ab85ad5..3484c62 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -71,6 +71,19 @@ static void test_CreateNamedPipe(int pipemode) ok(hnp == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_NAME, "CreateNamedPipe should fail if name doesn't start with \\\\.\\pipe\n"); + if (pipemode == PIPE_TYPE_BYTE) + { + /* Bad parameter checks */ + hnp = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_READMODE_MESSAGE, + /* nMaxInstances */ 1, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp == INVALID_HANDLE_VALUE && GetLastError() == ERROR_INVALID_PARAMETER, + "CreateNamedPipe should fail with PIPE_TYPE_BYTE | PIPE_READMODE_MESSAGE\n"); + } + hnp = CreateNamedPipe(NULL, PIPE_ACCESS_DUPLEX, pipemode | PIPE_WAIT, 1, 1024, 1024, NMPWAIT_USE_DEFAULT_WAIT, NULL); diff --git a/server/named_pipe.c b/server/named_pipe.c index d720b17..590adca 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -950,7 +950,8 @@ DECL_HANDLER(create_named_pipe) struct unicode_str name; struct directory *root = NULL; - if (!req->sharing || (req->sharing & ~(FILE_SHARE_READ | FILE_SHARE_WRITE))) + if (!req->sharing || (req->sharing & ~(FILE_SHARE_READ | FILE_SHARE_WRITE)) || + (!(req->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) && (req->flags & NAMED_PIPE_MESSAGE_STREAM_READ))) { set_error( STATUS_INVALID_PARAMETER ); return;

1 0