May 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/header: Use proper return type for HDM_CREATEDRAGIMAGE handler.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: ac75a00b0dccf56396c6ee13e3cb4a91a1b5c397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac75a00b0dccf56396c6ee13e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 12 23:00:03 2016 +0300 comctl32/header: Use proper return type for HDM_CREATEDRAGIMAGE handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/header.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 7c632f3..fb6a815 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1005,7 +1005,7 @@ HEADER_FreeCallbackItems(HEADER_ITEM *lpItem) lpItem->iImage = I_IMAGECALLBACK; } -static LRESULT +static HIMAGELIST HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem) { HEADER_ITEM *lpItem; @@ -1019,7 +1019,7 @@ HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem) HFONT hFont; if (iItem >= infoPtr->uNumItem) - return FALSE; + return NULL; if (!infoPtr->bRectsValid) HEADER_SetItemBounds(infoPtr); @@ -1047,12 +1047,12 @@ HEADER_CreateDragImage (HEADER_INFO *infoPtr, INT iItem) DeleteDC(hMemoryDC); if (hMemory == NULL) /* if anything failed */ - return FALSE; - + return NULL; + himl = ImageList_Create(width, height, ILC_COLORDDB, 1, 1); ImageList_Add(himl, hMemory, NULL); DeleteObject(hMemory); - return (LRESULT)himl; + return himl; } static LRESULT @@ -1836,7 +1836,7 @@ HEADER_MouseMove (HEADER_INFO *infoPtr, LPARAM lParam) { if (!HEADER_SendNotifyWithHDItemT(infoPtr, HDN_BEGINDRAG, infoPtr->iMoveItem, NULL)) { - HIMAGELIST hDragItem = (HIMAGELIST)HEADER_CreateDragImage(infoPtr, infoPtr->iMoveItem); + HIMAGELIST hDragItem = HEADER_CreateDragImage(infoPtr, infoPtr->iMoveItem); if (hDragItem != NULL) { HEADER_ITEM *lpItem = &infoPtr->items[infoPtr->iMoveItem]; @@ -2067,7 +2067,7 @@ HEADER_WindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) /* case HDM_CLEARFILTER: */ case HDM_CREATEDRAGIMAGE: - return HEADER_CreateDragImage (infoPtr, (INT)wParam); + return (LRESULT)HEADER_CreateDragImage (infoPtr, (INT)wParam); case HDM_DELETEITEM: return HEADER_DeleteItem (infoPtr, (INT)wParam);

1 0

Andrew Eikum : winegstreamer: Flip video output.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 6107b36e561fad97a96249b438aff4a9f3007176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6107b36e561fad97a96249b43… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 12 14:27:04 2016 -0500 winegstreamer: Flip video output. Gstreamer handles video top-down, but Windows's dshow handles it bottom-up. So let's insert a videoflip filter to fix the discrepancy instead of relying on videorenderer to flip it like we did before. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 137 ++++++++++++++++++++++++++++++++------- dlls/winegstreamer/gsttffilter.c | 8 --- 2 files changed, 114 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6107b36e561fad97a9624…

1 0

Andrew Eikum : winegstreamer: Add YUV to ARGB32 transformation filter.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 008e4d3e86073c77c173fdaa339cbb6fa06cfd85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=008e4d3e86073c77c173fdaa3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 12 14:27:00 2016 -0500 winegstreamer: Add YUV to ARGB32 transformation filter. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_guids.h | 3 +- dlls/winegstreamer/gst_private.h | 3 +- dlls/winegstreamer/gsttffilter.c | 116 +++++++++++++++++++++++++++++++++++++-- dlls/winegstreamer/main.c | 35 +++++++++--- 4 files changed, 141 insertions(+), 16 deletions(-) diff --git a/dlls/winegstreamer/gst_guids.h b/dlls/winegstreamer/gst_guids.h index 6b45bc4..b445dc5 100644 --- a/dlls/winegstreamer/gst_guids.h +++ b/dlls/winegstreamer/gst_guids.h @@ -23,4 +23,5 @@ DEFINE_GUID(CLSID_Gstreamer_AudioConvert, 0x334b2ec9, 0xf2b5, 0x40b9, 0x84, 0x32 DEFINE_GUID(CLSID_Gstreamer_Mp3, 0x728dcf55, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); DEFINE_GUID(CLSID_Gstreamer_Splitter, 0xf9d8d64e, 0xa144, 0x47dc, 0x8e, 0xe0, 0xf5, 0x34, 0x98, 0x37, 0x2c, 0x29); DEFINE_GUID(WINESUBTYPE_Gstreamer, 0xffffffff, 0x128f, 0x4dd1, 0xad, 0x22, 0xbe, 0xcf, 0xa6, 0x6c, 0xe7, 0xaa); -DEFINE_GUID(CLSID_Gstreamer_YUV, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x01); +DEFINE_GUID(CLSID_Gstreamer_YUV2RGB, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x01); +DEFINE_GUID(CLSID_Gstreamer_YUV2ARGB, 0x2d5507df, 0x5ac9, 0x4bb9, 0x9c, 0x09, 0xb2, 0x80, 0xfc, 0x0b, 0xce, 0x02); diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 4b29f21..a1f201c 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -39,7 +39,8 @@ void dump_AM_MEDIA_TYPE(const AM_MEDIA_TYPE * pmt); IUnknown * CALLBACK Gstreamer_AudioConvert_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Mp3_create(IUnknown *pUnkOuter, HRESULT *phr); -IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *pUnkOuter, HRESULT *phr); +IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *pUnkOuter, HRESULT *phr); +IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *pUnkOuter, HRESULT *phr); IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr); DWORD Gstreamer_init(void); diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 2209c5e..52aa267 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -677,7 +677,7 @@ static HRESULT WINAPI Gstreamer_YUV_ConnectInput(TransformFilter *tf, PIN_DIRECT return S_OK; } -static HRESULT WINAPI Gstreamer_YUV_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +static HRESULT WINAPI Gstreamer_YUV2RGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) { GstTfImpl *This = (GstTfImpl*)tf; GstCaps *capsin, *capsout; @@ -748,13 +748,13 @@ static HRESULT WINAPI Gstreamer_YUV_SetMediaType(TransformFilter *tf, PIN_DIRECT return hr; } -static const TransformFilterFuncTable Gstreamer_YUV_vtbl = { +static const TransformFilterFuncTable Gstreamer_YUV2RGB_vtbl = { Gstreamer_transform_DecideBufferSize, Gstreamer_transform_ProcessBegin, Gstreamer_transform_ProcessData, Gstreamer_transform_ProcessEnd, Gstreamer_YUV_QueryConnect, - Gstreamer_YUV_SetMediaType, + Gstreamer_YUV2RGB_SetMediaType, Gstreamer_YUV_ConnectInput, Gstreamer_transform_Cleanup, Gstreamer_transform_EndOfStream, @@ -764,7 +764,7 @@ static const TransformFilterFuncTable Gstreamer_YUV_vtbl = { Gstreamer_transform_QOS }; -IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkouter, HRESULT *phr) +IUnknown * CALLBACK Gstreamer_YUV2RGB_create(IUnknown *punkouter, HRESULT *phr) { IUnknown *obj = NULL; @@ -776,7 +776,113 @@ IUnknown * CALLBACK Gstreamer_YUV_create(IUnknown *punkouter, HRESULT *phr) return NULL; } - *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_YUV, "videoconvert", &Gstreamer_YUV_vtbl, (LPVOID*)&obj); + *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_YUV2RGB, "videoconvert", &Gstreamer_YUV2RGB_vtbl, (LPVOID*)&obj); + + TRACE("returning %p\n", obj); + + return obj; +} + +static HRESULT WINAPI Gstreamer_YUV2ARGB_SetMediaType(TransformFilter *tf, PIN_DIRECTION dir, const AM_MEDIA_TYPE *amt) +{ + GstTfImpl *This = (GstTfImpl*)tf; + GstCaps *capsin, *capsout; + AM_MEDIA_TYPE *outpmt = &This->tf.pmt; + HRESULT hr; + int avgtime; + LONG width, height; + + TRACE("%p 0x%x %p\n", This, dir, amt); + + mark_wine_thread(); + + if (dir != PINDIR_INPUT) + return S_OK; + + if (Gstreamer_YUV_QueryConnect(&This->tf, amt) == S_FALSE || !amt->pbFormat) + return E_FAIL; + + FreeMediaType(outpmt); + CopyMediaType(outpmt, amt); + + if (IsEqualGUID(&amt->formattype, &FORMAT_VideoInfo)) { + VIDEOINFOHEADER *vih = (VIDEOINFOHEADER*)outpmt->pbFormat; + avgtime = vih->AvgTimePerFrame; + width = vih->bmiHeader.biWidth; + height = vih->bmiHeader.biHeight; + if (vih->bmiHeader.biHeight > 0) + vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; + vih->bmiHeader.biBitCount = 32; + vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = width * abs(height) * 3; + } else { + VIDEOINFOHEADER2 *vih = (VIDEOINFOHEADER2*)outpmt->pbFormat; + avgtime = vih->AvgTimePerFrame; + width = vih->bmiHeader.biWidth; + height = vih->bmiHeader.biHeight; + if (vih->bmiHeader.biHeight > 0) + vih->bmiHeader.biHeight = -vih->bmiHeader.biHeight; + vih->bmiHeader.biBitCount = 32; + vih->bmiHeader.biCompression = BI_RGB; + vih->bmiHeader.biSizeImage = width * abs(height) * 3; + } + if (!avgtime) + avgtime = 10000000 / 30; + + outpmt->subtype = MEDIASUBTYPE_ARGB32; + + capsin = gst_caps_new_simple("video/x-raw", + "format", G_TYPE_STRING, + gst_video_format_to_string( + gst_video_format_from_fourcc(amt->subtype.Data1)), + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", GST_TYPE_FRACTION, 10000000, avgtime, + NULL); + capsout = gst_caps_new_simple("video/x-raw", + "format", G_TYPE_STRING, "BGRA", + "width", G_TYPE_INT, width, + "height", G_TYPE_INT, height, + "framerate", GST_TYPE_FRACTION, 10000000, avgtime, + NULL); + + hr = Gstreamer_transform_ConnectInput(This, amt, capsin, capsout); + gst_caps_unref(capsin); + gst_caps_unref(capsout); + + This->cbBuffer = width * height * 4; + return hr; +} + +static const TransformFilterFuncTable Gstreamer_YUV2ARGB_vtbl = { + Gstreamer_transform_DecideBufferSize, + Gstreamer_transform_ProcessBegin, + Gstreamer_transform_ProcessData, + Gstreamer_transform_ProcessEnd, + Gstreamer_YUV_QueryConnect, + Gstreamer_YUV2ARGB_SetMediaType, + Gstreamer_YUV_ConnectInput, + Gstreamer_transform_Cleanup, + Gstreamer_transform_EndOfStream, + Gstreamer_transform_BeginFlush, + Gstreamer_transform_EndFlush, + Gstreamer_transform_NewSegment, + Gstreamer_transform_QOS +}; + +IUnknown * CALLBACK Gstreamer_YUV2ARGB_create(IUnknown *punkouter, HRESULT *phr) +{ + IUnknown *obj = NULL; + + TRACE("%p %p\n", punkouter, phr); + + if (!Gstreamer_init()) + { + *phr = E_FAIL; + return NULL; + } + + *phr = Gstreamer_transform_create(punkouter, &CLSID_Gstreamer_YUV2ARGB, "videoconvert", &Gstreamer_YUV2ARGB_vtbl, (LPVOID*)&obj); TRACE("returning %p\n", obj); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 7b9cd31..2bb69f4 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -43,8 +43,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); static const WCHAR wGstreamer_Splitter[] = {'G','S','t','r','e','a','m','e','r',' ','s','p','l','i','t','t','e','r',' ','f','i','l','t','e','r',0}; -static const WCHAR wGstreamer_YUV[] = -{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_YUV2RGB[] = +{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','t','o',' ','R','G','B',' ','f','i','l','t','e','r',0}; +static const WCHAR wGstreamer_YUV2ARGB[] = +{'G','S','t','r','e','a','m','e','r',' ','Y','U','V',' ','t','o',' ','A','R','G','B',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_Mp3[] = {'G','S','t','r','e','a','m','e','r',' ','M','p','3',' ','f','i','l','t','e','r',0}; static const WCHAR wGstreamer_AudioConvert[] = @@ -115,9 +117,17 @@ static const AMOVIESETUP_PIN amfYUVPin[] = }, }; -static const AMOVIESETUP_FILTER amfYUV = -{ &CLSID_Gstreamer_YUV, - wGstreamer_YUV, +static const AMOVIESETUP_FILTER amfYUV2RGB = +{ &CLSID_Gstreamer_YUV2RGB, + wGstreamer_YUV2RGB, + MERIT_UNLIKELY, + 2, + amfYUVPin +}; + +static const AMOVIESETUP_FILTER amfYUV2ARGB = +{ &CLSID_Gstreamer_YUV2ARGB, + wGstreamer_YUV2ARGB, MERIT_UNLIKELY, 2, amfYUVPin @@ -184,11 +194,18 @@ FactoryTemplate const g_Templates[] = { &amfSplitter, }, { - wGstreamer_YUV, - &CLSID_Gstreamer_YUV, - Gstreamer_YUV_create, + wGstreamer_YUV2RGB, + &CLSID_Gstreamer_YUV2RGB, + Gstreamer_YUV2RGB_create, + NULL, + &amfYUV2RGB, + }, + { + wGstreamer_YUV2ARGB, + &CLSID_Gstreamer_YUV2ARGB, + Gstreamer_YUV2ARGB_create, NULL, - &amfYUV, + &amfYUV2ARGB, }, { wGstreamer_Mp3,

1 0

Andrey Gusev : wined3d: Fix a typo in FIXME() messages.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 05132fa73561282589b56f123aae994cdd0a177d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05132fa73561282589b56f123… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 9 18:09:43 2016 +0300 wined3d: Fix a typo in FIXME() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e2e3ec9..70a4b03 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3875,7 +3875,7 @@ const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_t D3DTEXTUREFILTERTYPE_TO_STR(WINED3D_TEXF_GAUSSIAN_QUAD); #undef D3DTEXTUREFILTERTYPE_TO_STR default: - FIXME("Unrecognied texture filter type 0x%08x.\n", filter_type); + FIXME("Unrecognized texture filter type 0x%08x.\n", filter_type); return "unrecognized"; } } @@ -4113,7 +4113,7 @@ const char *debug_fbostatus(GLenum status) { FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNDEFINED); #undef FBOSTATUS_TO_STR default: - FIXME("Unrecognied FBO status 0x%08x\n", status); + FIXME("Unrecognized FBO status 0x%08x.\n", status); return "unrecognized"; } } @@ -4131,7 +4131,7 @@ const char *debug_glerror(GLenum error) { GLERROR_TO_STR(GL_INVALID_FRAMEBUFFER_OPERATION); #undef GLERROR_TO_STR default: - FIXME("Unrecognied GL error 0x%08x\n", error); + FIXME("Unrecognized GL error 0x%08x.\n", error); return "unrecognized"; } }

1 0

Piotr Caban : msvcp110: Fix num_put<char> structure layout.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 77184106c8c2bff7db9ea5d20b3b3330196befc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77184106c8c2bff7db9ea5d20… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:12 2016 +0200 msvcp110: Fix num_put<char> structure layout. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 37 ++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.h | 2 ++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 89465b5..06b2ca1 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7124,7 +7124,9 @@ DEFINE_THISCALL_WRAPPER(num_put_char__Init, 8) void __thiscall num_put_char__Init(num_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER < 110 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -7869,7 +7871,9 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar__Init, 8) void __thiscall num_put_wchar__Init(num_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER < 110 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -8104,6 +8108,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Put(const num_put *this, ostre return ret; } +#if _MSVCP_VER < 110 /* ?_Putc@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PBDI(a)Z */ /* ?_Putc@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEBD_K(a)Z */ /* ?_Putc@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@PBDI(a)Z */ @@ -8124,6 +8129,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Putc(const num_put *this, ostr *ret = dest; return ret; } +#endif /* ?_Putgrouped@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PBDI_W(a)Z */ /* ?_Putgrouped@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEBD_K_W(a)Z */ @@ -8208,6 +8214,27 @@ ostreambuf_iterator_wchar* __cdecl num_put_short__Fput(const num_put *this, ostr return NULL; } +#if _MSVCP_VER < 110 +static void num_put_wchar_wide_put(const num_put *this, + ostreambuf_iterator_wchar *dest, ios_base *base, + const char *buf, MSVCP_size_t count) +{ + num_put_wchar__Putc(this, dest, *dest, buf, count); +} +#else +static void num_put_wchar_wide_put(const num_put *this, + ostreambuf_iterator_wchar *dest, ios_base *base, + const char *buf, MSVCP_size_t count) +{ + ctype_wchar *ctype; + MSVCP_size_t i; + + ctype = ctype_wchar_use_facet(IOS_LOCALE(base)); + for(i=0; i<count; i++) + ostreambuf_iterator_wchar_put(dest, ctype_wchar_widen_ch(ctype, buf[i])); +} +#endif + /* TODO: This function should be removed when num_put_wchar__Fput is implemented */ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, char *buf, @@ -8258,7 +8285,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ base->wide = 0; if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { - num_put_wchar__Putc(this, &dest, dest, buf, 1); + num_put_wchar_wide_put(this, &dest, base, buf, 1); buf++; } if(adjustfield != FMTFLAG_left) { @@ -8272,7 +8299,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ else if(!buf[i]) num_put_wchar__Rep(this, &dest, dest, sep, 1); else - num_put_wchar__Putc(this, &dest, dest, buf+i, 1); + num_put_wchar_wide_put(this, &dest, base, buf+i, 1); } return num_put_wchar__Rep(this, ret, dest, fill, pad); @@ -8351,10 +8378,10 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ base->wide = 0; if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { - num_put_wchar__Putc(this, &dest, dest, buf, 1); + num_put_wchar_wide_put(this, &dest, base, buf, 1); buf++; }else if((adjustfield & FMTFLAG_internal) && (buf[1]=='x' || buf[1]=='X')) { - num_put_wchar__Putc(this, &dest, dest, buf, 2); + num_put_wchar_wide_put(this, &dest, base, buf, 2); buf += 2; } if(adjustfield != FMTFLAG_left) { @@ -8366,7 +8393,7 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ if(!buf[i]) num_put_wchar__Rep(this, &dest, dest, sep, 1); else - num_put_wchar__Putc(this, &dest, dest, buf+i, 1); + num_put_wchar_wide_put(this, &dest, base, buf+i, 1); } return num_put_wchar__Rep(this, ret, dest, fill, pad); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 4a42332..aa7322f 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -550,7 +550,9 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get*, ist /* class num_put<wchar> */ typedef struct { locale_facet facet; +#if _MSVCP_VER < 110 _Cvtvec cvt; +#endif } num_put; num_put* num_put_char_use_facet(const locale*);

1 0

Alex Henrie : riched20: Don' t call UpdateWindow after setting the background color.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: e60b2766987c09dd3ea13adc57df11ee03c05f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e60b2766987c09dd3ea13adc5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 9 08:57:12 2016 -0600 riched20: Don't call UpdateWindow after setting the background color. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 - dlls/riched20/tests/editor.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 7ac94ca..85395e7 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3626,7 +3626,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, editor->hbrBackground = CreateSolidBrush(editor->rgbBackColor); } ITextHost_TxInvalidateRect(editor->texthost, NULL, TRUE); - ITextHost_TxViewChange(editor->texthost, TRUE); return lColor; } case EM_GETMODIFY: diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6a77d9a..31d5128 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8337,6 +8337,17 @@ static void test_rtf_specials(void) DestroyWindow( edit ); } +static void test_background(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + + /* set the background color to black */ + ValidateRect(hwndRichEdit, NULL); + SendMessageA(hwndRichEdit, EM_SETBKGNDCOLOR, FALSE, RGB(0, 0, 0)); + ok(GetUpdateRect(hwndRichEdit, NULL, FALSE), "Update rectangle is empty!\n"); + + DestroyWindow(hwndRichEdit); +} START_TEST( editor ) { @@ -8408,6 +8419,7 @@ START_TEST( editor ) test_EM_SETFONTSIZE(); test_alignment_style(); test_rtf_specials(); + test_background(); /* Set the environment variable WINETEST_RICHED20 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0

Gerald Pfeifer : riched20: Properly clear all of a buffer of type WCHAR.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 8fb1802b9c07eabd5740107d33ac7c851a1e2f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fb1802b9c07eabd5740107d3… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue May 10 09:57:39 2016 -0500 riched20: Properly clear all of a buffer of type WCHAR. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ae9c0a5..6a77d9a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3822,7 +3822,7 @@ static void test_EM_SETTEXTEX(void) getText.flags = GT_DEFAULT; getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; - memset(buf, 0, MAX_BUF_LEN); + memset(buf, 0, sizeof(buf)); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem2) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n"); @@ -3837,7 +3837,7 @@ static void test_EM_SETTEXTEX(void) getText.flags = GT_USECRLF; /* <-- asking for CR -> CRLF conversion */ getText.lpDefaultChar = NULL; getText.lpUsedDefChar = NULL; - memset(buf, 0, MAX_BUF_LEN); + memset(buf, 0, sizeof(buf)); SendMessageA(hwndRichEdit, EM_GETTEXTEX, (WPARAM)&getText, (LPARAM)buf); ok(lstrcmpW(buf, TestItem1) == 0, "EM_GETTEXTEX results not what was set by EM_SETTEXTEX\n");

1 0

Piotr Caban : msvcp110: Don't allocate empty buffers in _Locinfo:: _Locinfo_ctor.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: 5a427e5124d0ca587a363d37d98cfd625d702365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a427e5124d0ca587a363d37d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:04 2016 +0200 msvcp110: Don't allocate empty buffers in _Locinfo::_Locinfo_ctor. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 13 ++++++------- dlls/msvcp90/msvcp90.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 24cacc7..0a06da2 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -69,6 +69,7 @@ LCID* __cdecl ___lc_handle_func(void); #if _MSVCP_VER < 100 #define locale_string basic_string_char +#define locale_string_char_ctor(this) MSVCP_basic_string_char_ctor(this) #define locale_string_char_ctor_cstr(this,str) MSVCP_basic_string_char_ctor_cstr(this,str) #define locale_string_char_copy_ctor(this,copy) MSVCP_basic_string_char_copy_ctor(this,copy) #define locale_string_char_dtor(this) MSVCP_basic_string_char_dtor(this) @@ -76,6 +77,7 @@ LCID* __cdecl ___lc_handle_func(void); #define locale_string_char_assign(this,assign) MSVCP_basic_string_char_assign(this,assign) #else #define locale_string _Yarn_char +#define locale_string_char_ctor(this) _Yarn_char_ctor(this) #define locale_string_char_ctor_cstr(this,str) _Yarn_char_ctor_cstr(this,str) #define locale_string_char_copy_ctor(this,copy) _Yarn_char_copy_ctor(this,copy) #define locale_string_char_dtor(this) _Yarn_char_dtor(this) @@ -512,9 +514,6 @@ void* __thiscall _Timevec__Getptr(_Timevec *this) _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int category, const char *locstr) { const char *locale = NULL; -#if _MSVCP_VER >= 110 - static const wchar_t empty[] = { '\0' }; -#endif /* This function is probably modifying more global objects */ FIXME("(%p %d %s) semi-stub\n", locinfo, category, locstr); @@ -523,11 +522,11 @@ _Locinfo* __cdecl _Locinfo__Locinfo_ctor_cat_cstr(_Locinfo *locinfo, int categor throw_exception(EXCEPTION_RUNTIME_ERROR, "bad locale name"); _Lockit_ctor_locktype(&locinfo->lock, _LOCK_LOCALE); - locale_string_char_ctor_cstr(&locinfo->days, ""); - locale_string_char_ctor_cstr(&locinfo->months, ""); + locale_string_char_ctor(&locinfo->days); + locale_string_char_ctor(&locinfo->months); #if _MSVCP_VER >= 110 - locale_string_wchar_ctor_cstr(&locinfo->wdays, empty); - locale_string_wchar_ctor_cstr(&locinfo->wmonths, empty); + locale_string_wchar_ctor(&locinfo->wdays); + locale_string_wchar_ctor(&locinfo->wmonths); #endif locale_string_char_ctor_cstr(&locinfo->oldlocname, setlocale(LC_ALL, NULL)); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 2d0f4f8..4a42332 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -142,6 +142,7 @@ typedef struct char null_str; } _Yarn_char; +_Yarn_char* __thiscall _Yarn_char_ctor(_Yarn_char*); _Yarn_char* __thiscall _Yarn_char_ctor_cstr(_Yarn_char*, const char*); _Yarn_char* __thiscall _Yarn_char_copy_ctor(_Yarn_char*, const _Yarn_char*); const char* __thiscall _Yarn_char_c_str(const _Yarn_char*);

1 0

Kirill K. Smirnov : mciavi32: Propely handle Heap[Re]Alloc failure.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: ed79f458174d9db8e41d2b166fcc8acde7dfdeb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed79f458174d9db8e41d2b166… Author: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Date: Sun May 8 19:10:44 2016 +0300 mciavi32: Propely handle Heap[Re]Alloc failure. Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mmoutput.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index d3badb6..c932ab4 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -229,14 +229,16 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, alb->numAudioBlocks, mmck->cksize); if (wma->lpWaveFormat) { if (alb->numAudioBlocks >= alb->numAudioAllocated) { - alb->numAudioAllocated += 32; - if (!wma->lpAudioIndex) - wma->lpAudioIndex = HeapAlloc(GetProcessHeap(), 0, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - else - wma->lpAudioIndex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, - alb->numAudioAllocated * sizeof(struct MMIOPos)); - if (!wma->lpAudioIndex) return FALSE; + DWORD newsize = alb->numAudioAllocated + 32; + struct MMIOPos* newindex; + + if (!wma->lpAudioIndex) + newindex = HeapAlloc(GetProcessHeap(), 0, newsize * sizeof(struct MMIOPos)); + else + newindex = HeapReAlloc(GetProcessHeap(), 0, wma->lpAudioIndex, newsize * sizeof(struct MMIOPos)); + if (!newindex) return FALSE; + alb->numAudioAllocated = newsize; + wma->lpAudioIndex = newindex; } wma->lpAudioIndex[alb->numAudioBlocks].dwOffset = mmck->dwDataOffset; wma->lpAudioIndex[alb->numAudioBlocks].dwSize = mmck->cksize;

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard May 14, 2016

May 14, 2016

Module: wine Branch: master Commit: da5bffdbe8e7ce07af104aeb46e77b001ce5cbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5bffdbe8e7ce07af104aeb4… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue May 10 18:09:45 2016 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 96 +++++++++++++++++----------------------------------------------- 1 file changed, 25 insertions(+), 71 deletions(-) diff --git a/po/de.po b/po/de.po index 16acac1..b650350 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-01-11 12:42+0100\n" +"PO-Revision-Date: 2016-05-10 18:09+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -11646,116 +11646,86 @@ msgid "The operation completed successfully\n" msgstr "Der Vorgang wurde erfolgreich abgeschlossen\n" #: reg.rc:35 -#, fuzzy -#| msgid "Error: Invalid key name\n" msgid "reg: Invalid key name\n" -msgstr "Fehler: Ungültiger Schlüssel\n" +msgstr "reg: Ungültiger Schlüsselname\n" #: reg.rc:36 -#, fuzzy -#| msgid "Error: Invalid command line parameters\n" msgid "reg: Invalid command line parameters\n" -msgstr "Fehler: Ungültige Befehlszeilenargumente\n" +msgstr "reg: Ungültige Befehlszeilenargumente\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to access remote machine\n" msgid "reg: Unable to access remote machine\n" -msgstr "Fehler: Auf den Remoterechner kann nicht zugegriffen werden\n" +msgstr "reg: Auf den Remoterechner kann nicht zugegriffen werden\n" #: reg.rc:38 -#, fuzzy -#| msgid "" -#| "Error: The system was unable to find the specified registry key or value\n" msgid "" "reg: The system was unable to find the specified registry key or value\n" msgstr "" -"Fehler: Der angegebene Schlüssel oder Wert konnte nicht gefunden werden\n" +"reg: Das System konnte den angegebenen Schlüssel oder Wert nicht finden\n" #: reg.rc:39 -#, fuzzy -#| msgid "Error: Unsupported type\n" msgid "reg: Unsupported registry data type [%1]\n" -msgstr "Fehler: Nicht unterstützter Typ\n" +msgstr "reg: Nicht unterstützter Registrierungsdatentyp [%1]\n" #: reg.rc:40 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid integer\n" -msgstr "" -"Uninstaller: Auf die Option '--remove' muss eine Anwendungs-GUID folgen\n" +msgstr "reg: Auf die Option [/d] muss eine gültige Ganzzahl folgen\n" #: reg.rc:41 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid hexadecimal value\n" -msgstr "" -"Uninstaller: Auf die Option '--remove' muss eine Anwendungs-GUID folgen\n" +msgstr "reg: Auf die Option [/d] muss ein gültiger Hexadezimalwert folgen\n" #: reg.rc:42 msgid "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" -msgstr "" +msgstr "reg: Unbehandelter Registrierungsdatentyp [/t 0x%1!x!, /d %2]\n" #: reg.rc:43 -#, fuzzy -#| msgid "The specified file already exists. Do you want to replace it?" msgid "The registry value '%1' already exists. Do you want to overwrite it?" -msgstr "Die angegebene Datei existiert bereits. Möchten Sie sie ersetzen?" +msgstr "Der Wert '%1' existiert bereits. Möchten Sie ihn ersetzen?" #: reg.rc:47 msgid "The registry operation was cancelled\n" -msgstr "" +msgstr "Der Registrierungsvorgang wurde abgebrochen\n" #: reg.rc:48 regedit.rc:204 msgid "(Default)" msgstr "(Standard)" #: reg.rc:49 -#, fuzzy -#| msgid "Are you sure you want to delete these values?" msgid "Are you sure you want to delete the registry value '%1'?" -msgstr "Möchten Sie diese Werte wirklich löschen?" +msgstr "Sind Sie sicher, dass Sie den Wert '%1' löschen möchten?" #: reg.rc:50 -#, fuzzy -#| msgid "Are you sure you want to delete value '%s'?" msgid "Are you sure you want to delete all registry values in '%1'?" -msgstr "Möchten Sie den Wert '%s' wirklich löschen?" +msgstr "Sind Sie sicher, dass Sie alle Werte in '%1' löschen möchten?" #: reg.rc:51 -#, fuzzy -#| msgid "Are you sure you want to delete '%1'?" msgid "Are you sure you want to delete the registry key '%1'?" -msgstr "Sind Sie sicher, dass Sie '%1' löschen möchten?" +msgstr "Sind Sie sicher, dass Sie den Schlüssel '%1' löschen möchten?" #: reg.rc:52 -#, fuzzy -#| msgid "" -#| "uninstaller: The option '--remove' must be followed by an application " -#| "GUID\n" msgid "reg: The option [/d] must be followed by a valid string\n" -msgstr "" -"Uninstaller: Auf die Option '--remove' muss eine Anwendungs-GUID folgen\n" +msgstr "reg: Auf die Option [/d] muss eine gültige Zeichenkette folgen\n" #: reg.rc:53 msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: Es konnten nicht alle Werte in '%1' gelöscht werden. Es ist ein " +"unerwarteter Fehler aufgetreten.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: Der angegebene Vorgang konnte nicht abgeschlossen werden. Es ist ein " +"unerwarteter Fehler aufgetreten.\n" #: reg.rc:55 msgid "Search complete. Number of matches found: %1!d!\n" -msgstr "" +msgstr "Suche abgeschlossen. Gefundene Übereinstimmungen: %1!d!\n" #: regedit.rc:34 msgid "&Registry" @@ -13212,8 +13182,6 @@ msgstr "" "Einstellungen in diesen Reitern vornehmen können." #: winecfg.rc:159 -#, fuzzy -#| msgid "&Add application..." msgid "Add appli&cation..." msgstr "Anw. &hinzufügen..." @@ -13277,7 +13245,7 @@ msgstr "&Neue Überschreibung für:" #: winecfg.rc:196 msgid "A&dd" -msgstr "" +msgstr "&Hinzufügen" #: winecfg.rc:197 msgid "Existing &overrides:" @@ -13304,10 +13272,8 @@ msgid "&Native (Windows)" msgstr "&Native (Windows)" #: winecfg.rc:211 -#, fuzzy -#| msgid "Bui&ltin then Native" msgid "Buil&tin then Native" -msgstr "Bui&ltin dann Native" +msgstr "Buil&tin dann Native" #: winecfg.rc:212 msgid "Nati&ve then Builtin" @@ -13330,26 +13296,20 @@ msgstr "" "nicht bearbeitet werden." #: winecfg.rc:236 -#, fuzzy -#| msgid "&Add..." msgid "A&dd..." msgstr "&Hinzufügen..." #: winecfg.rc:238 -#, fuzzy -#| msgid "Autodetect" msgid "Aut&odetect" -msgstr "Automatisch" +msgstr "&Automatisch" #: winecfg.rc:241 msgid "&Path:" msgstr "&Pfad:" #: winecfg.rc:248 winecfg.rc:38 -#, fuzzy -#| msgid "Show &Advanced" msgid "Show Advan&ced" -msgstr "&Erweitert" +msgstr "&Erweitert anzeigen" #: winecfg.rc:249 msgid "De&vice:" @@ -13368,8 +13328,6 @@ msgid "S&erial:" msgstr "S&erien-Nr.:" #: winecfg.rc:258 -#, fuzzy -#| msgid "Show &dot files" msgid "&Show dot files" msgstr "D&ot-Dateien anzeigen" @@ -13450,8 +13408,6 @@ msgid "Select the Unix target directory, please." msgstr "Bitte wählen Sie das Unix-Zielverzeichnis." #: winecfg.rc:37 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" msgstr "&Erweitert ausblenden" @@ -13916,13 +13872,11 @@ msgid "Configuration error" msgstr "Konfigurationsfehler" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." msgstr "" -"Die Größe des Zeichenpuffers muss mindestens der Fenstergröße entsprechen" +"Die Größe des Zeichenpuffers muss mindestens der Fenstergröße entsprechen." #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0