August 2015 - Wine-commits - list.winehq.org

Michael Stefaniuc : qcap: Just use the driver_info pointer from the parent.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: a6bf7bb01fefc6af6c24a801a69817e858090e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6bf7bb01fefc6af6c24a801a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Aug 2 23:19:52 2015 +0200 qcap: Just use the driver_info pointer from the parent. --- dlls/qcap/vfwcapture.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 1952596..f9530a0 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -103,7 +103,6 @@ static inline VfwCapture *impl_from_IPersistPropertyBag(IPersistPropertyBag *ifa typedef struct VfwPinImpl { BaseOutputPin pin; - Capture *driver_info; VfwCapture *parent; const IKsPropertySetVtbl * KSP_VT; } VfwPinImpl; @@ -554,7 +553,6 @@ PPB_Load( IPersistPropertyBag * iface, IPropertyBag *pPropBag, if (This->driver_info) { pin = (VfwPinImpl *)This->pOutputPin; - pin->driver_info = This->driver_info; pin->parent = This; This->init = TRUE; hr = S_OK; @@ -683,7 +681,7 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *iface, int iPosition, AM_MEDI if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; - hr = qcap_driver_get_format(This->driver_info, &vfw_pmt); + hr = qcap_driver_get_format(This->parent->driver_info, &vfw_pmt); if (SUCCEEDED(hr)) { CopyMediaType(pmt, vfw_pmt); DeleteMediaType(vfw_pmt); @@ -797,7 +795,7 @@ VfwPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) HRESULT hr; VfwPinImpl *This = (VfwPinImpl *)iface; - hr = qcap_driver_get_format(This->driver_info, &pmt); + hr = qcap_driver_get_format(This->parent->driver_info, &pmt); if (SUCCEEDED(hr)) { hr = BasePinImpl_EnumMediaTypes(iface, ppEnum); DeleteMediaType(pmt);

1 0

Hugh McMaster : kernel32: Restore the original console edit mode on Enter press, if the Insert key toggle is active.
by Alexandre Julliard 03 Aug '15

03 Aug '15

Module: wine Branch: master Commit: 68fb8c55258101818e2373726ef95ed0fbddb247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68fb8c55258101818e2373726… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 3 17:55:00 2015 +1000 kernel32: Restore the original console edit mode on Enter press, if the Insert key toggle is active. --- dlls/kernel32/editline.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 802bfe0..4dfa2cf 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -68,6 +68,7 @@ typedef struct WCEL_Context { can_wrap : 1, /* to 1 when multi-line edition can take place */ shall_echo : 1, /* to 1 when characters should be echo:ed when keyed-in */ insert : 1, /* to 1 when new characters are inserted (otherwise overwrite) */ + insertkey : 1, /* to 1 when the Insert key toggle is active */ can_pos_cursor : 1; /* to 1 when console can (re)position cursor */ unsigned histSize; unsigned histPos; @@ -763,24 +764,13 @@ static void WCEL_RepeatCount(WCEL_Context* ctx) static void WCEL_ToggleInsert(WCEL_Context* ctx) { - DWORD mode; CONSOLE_CURSOR_INFO cinfo; - if (GetConsoleMode(ctx->hConIn, &mode) && GetConsoleCursorInfo(ctx->hConOut, &cinfo)) + ctx->insertkey = !ctx->insertkey; + + if (GetConsoleCursorInfo(ctx->hConOut, &cinfo)) { - if ((mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) - { - mode &= ~ENABLE_INSERT_MODE; - cinfo.dwSize = 100; - ctx->insert = FALSE; - } - else - { - mode |= ENABLE_INSERT_MODE | ENABLE_EXTENDED_FLAGS; - cinfo.dwSize = 25; - ctx->insert = TRUE; - } - SetConsoleMode(ctx->hConIn, mode); + cinfo.dwSize = ctx->insertkey ? 100 : 25; SetConsoleCursorInfo(ctx->hConOut, &cinfo); } } @@ -990,6 +980,8 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) GetConsoleMode(hConsoleIn, &mode); ctx.insert = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); + if (ctx.insertkey) + ctx.insert = !ctx.insert; if (func) (func)(&ctx);

1 0

Łukasz Wojniłowicz : Polish translation for release 1.7.48
by Jeremy Newman 03 Aug '15

03 Aug '15

Module: website Branch: master Commit: 50b32caf59fdb3ef6bfcb8ef561bd3d9dcc9a68a URL: http://source.winehq.org/git/website.git/?a=commit;h=50b32caf59fdb3ef6bfcb8… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sun Aug 2 10:34:46 2015 +0200 Polish translation for release 1.7.48 --- news/pl/2015072801.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/pl/2015072801.xml b/news/pl/2015072801.xml new file mode 100644 index 0000000..4bee04a --- /dev/null +++ b/news/pl/2015072801.xml @@ -0,0 +1,16 @@ +<news> +<date>Lipiec 28, 2015</date> +<title>Wydano Wine 1.7.48</title> +<body> + Wydanie rozwojowe Wine 1.7.48 jest już dostępne. + <a href="{$root}/announce/1.7.48">Co nowego</a> w tym wydaniu: +<ul> + <li>Uzupełniono implementację OpenMP.</li> + <li>Obsługa strumienia WE/WY w bibliotece uruchomieniowej MSVCIRT C++.</li> + <li>Obsługa przyciągania do pikseli w DirectWrite.</li> + <li>Szersza obsługa dla głównych kontekstów OpenGL.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.48.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0