wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Jacek Caban : mshtml: Moved EvaluateNewWindow call to navigate_new_window.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 63205bf01d6c1ecb87f7a5b8100ad23d80b45585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63205bf01d6c1ecb87f7a5b81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 21 17:05:31 2017 +0200 mshtml: Moved EvaluateNewWindow call to navigate_new_window. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 26 ++++---------------------- dlls/mshtml/navigate.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2914073..5853220 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -971,8 +971,6 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, { HTMLWindow *This = impl_from_IHTMLWindow2(iface); HTMLOuterWindow *window = This->outer_window; - INewWindowManager *new_window_mgr; - BSTR uri_str; IUri *uri; HRESULT hres; @@ -980,6 +978,10 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, TRACE("(%p)->(%s %s %s %x %p)\n", This, debugstr_w(url), debugstr_w(name), debugstr_w(features), replace, pomWindowResult); + if(features) + FIXME("unsupported features argument %s\n", debugstr_w(features)); + if(replace) + FIXME("unsupported relace argument\n"); if(!window->doc_obj || !window->uri_nofrag) return E_UNEXPECTED; @@ -1006,26 +1008,6 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, return E_NOTIMPL; } - hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, - (void**)&new_window_mgr); - if(FAILED(hres)) { - FIXME("No INewWindowManager\n"); - return E_NOTIMPL; - } - - hres = IUri_GetDisplayUri(window->uri_nofrag, &uri_str); - if(SUCCEEDED(hres)) { - hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, url, name, uri_str, - features, !!replace, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); - window->doc_obj->has_popup = TRUE; - SysFreeString(uri_str); - } - INewWindowManager_Release(new_window_mgr); - if(FAILED(hres)) { - *pomWindowResult = NULL; - return S_OK; - } - hres = create_relative_uri(window, url, &uri); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 9dec64d..423d650 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2238,12 +2238,44 @@ HRESULT super_navigate(HTMLOuterWindow *window, IUri *uri, DWORD flags, const WC HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *name, request_data_t *request_data, IHTMLWindow2 **ret) { + INewWindowManager *new_window_mgr; + BSTR display_uri, context_url; IWebBrowser2 *web_browser; IHTMLWindow2 *new_window; IBindCtx *bind_ctx; nsChannelBSC *bsc; HRESULT hres; + hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, + (void**)&new_window_mgr); + if(SUCCEEDED(hres)) { + hres = IUri_GetDisplayUri(window->uri_nofrag, &context_url); + if(FAILED(hres)) + return hres; + + hres = IUri_GetDisplayUri(uri, &display_uri); + if(FAILED(hres)) { + SysFreeString(context_url); + return hres; + } + + hres = INewWindowManager_EvaluateNewWindow(new_window_mgr, display_uri, name, context_url, + NULL, FALSE, window->doc_obj->has_popup ? 0 : NWMF_FIRST, 0); + window->doc_obj->has_popup = TRUE; + SysFreeString(display_uri); + SysFreeString(context_url); + INewWindowManager_Release(new_window_mgr); + if(FAILED(hres)) { + if(ret) + *ret = NULL; + return S_OK; + } + }else { + FIXME("No INewWindowManager\n"); + return E_NOTIMPL; + } + + if(request_data) hres = create_channelbsc(NULL, request_data->headers, request_data->post_data, request_data->post_data_len, FALSE,

1 0

Hugh McMaster : regedit: Display data for all values in the GUI.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 4a70d335528e390c50206478eba16052c17b566c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a70d335528e390c50206478e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:19:27 2017 +0000 regedit: Display data for all values in the GUI. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index a3bc72f..b758564 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -129,8 +129,13 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz ListView_SetItemTextW(hwndLV, index, 2, buf); break; } + case REG_MULTI_SZ: + MakeMULTISZDisplayable(data); + ListView_SetItemTextW(hwndLV, index, 2, data); + break; case REG_BINARY: case REG_NONE: + default: { unsigned int i; BYTE *pData = data; @@ -143,17 +148,6 @@ void format_value_data(HWND hwndLV, int index, DWORD type, void *data, DWORD siz HeapFree(GetProcessHeap(), 0, strBinary); break; } - case REG_MULTI_SZ: - MakeMULTISZDisplayable(data); - ListView_SetItemTextW(hwndLV, index, 2, data); - break; - default: - { - WCHAR szText[128]; - LoadStringW(hInst, IDS_REGISTRY_VALUE_CANT_DISPLAY, szText, COUNT_OF(szText)); - ListView_SetItemTextW(hwndLV, index, 2, szText); - break; - } } }

1 0

Hugh McMaster : regedit: Display all registry data types in the GUI.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 878a0a4e14b8e38f0d6909c4d522f8d2a1d54a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878a0a4e14b8e38f0d6909c4d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:19:06 2017 +0000 regedit: Display all registry data types in the GUI. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 1365259..a3bc72f 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -281,7 +281,10 @@ static void OnGetDispInfo(NMLVDISPINFOW* plvdi) plvdi->item.pszText = g_pszDefaultValueName; break; case 1: - switch (((LINE_INFO*)plvdi->item.lParam)->dwValType) { + { + DWORD data_type = ((LINE_INFO *)plvdi->item.lParam)->dwValType; + + switch (data_type) { case REG_SZ: plvdi->item.pszText = reg_szT; break; @@ -311,14 +314,14 @@ static void OnGetDispInfo(NMLVDISPINFOW* plvdi) break; default: { - WCHAR szUnknownFmt[64]; - LoadStringW(hInst, IDS_REGISTRY_UNKNOWN_TYPE, szUnknownFmt, COUNT_OF(szUnknownFmt)); - wsprintfW(buffer, szUnknownFmt, plvdi->item.lParam); + WCHAR fmt[] = {'0','x','%','x',0}; + wsprintfW(buffer, fmt, data_type); plvdi->item.pszText = buffer; break; } } break; + } case 2: plvdi->item.pszText = g_szValueNotSet; break;

1 0

Hugh McMaster : regedit: Fail when parsing any hex data type that is greater than ULONG_MAX on Windows.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 8803b9616bce64066a7a087148d49caa1adb8f6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8803b9616bce64066a7a08714… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 21 12:18:53 2017 +0000 regedit: Fail when parsing any hex data type that is greater than ULONG_MAX on Windows. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 5 +++-- programs/regedit/tests/regedit.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e75ebec..bc488d3 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <errno.h> #include <limits.h> #include <stdio.h> #include <stdlib.h> @@ -319,8 +320,8 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line) DWORD val; /* "hex(xx):" is special */ - val = strtoulW(*line, &end, 16); - if (!**line || *end != ')' || *(end + 1) != ':') + val = wcstoul(*line, &end, 16); + if (!**line || *end != ')' || *(end + 1) != ':' || (val == ~0u && errno == ERANGE)) return FALSE; parser->data_type = val; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 96091f8..79f7571 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -464,7 +464,7 @@ static void test_basic_import(void) verify_reg(hkey, "Wine13f", 0xffff, "Value", 6, 0); verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0); verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0); - todo_wine verify_reg_nonexist(hkey, "Wine13i"); + verify_reg_nonexist(hkey, "Wine13i"); RegCloseKey(hkey);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: c0312bf79e6558ed5cfca114751a65e0040d8adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0312bf79e6558ed5cfca1147… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 21 14:13:56 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/ru.po b/po/ru.po index 101e986..bb93b02 100644 --- a/po/ru.po +++ b/po/ru.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: 2017-06-08 13:21+0300\n" +"PO-Revision-Date: 2017-06-21 14:12+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12064,10 +12064,8 @@ msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgstr "regedit: неизвестная управляющая последовательность [\\%1!c!]\n" #: regedit.rc:420 -#, fuzzy -#| msgid "regedit: Unsupported registry data type [%1]\n" msgid "regedit: Unsupported registry data type [0x%1!x!]\n" -msgstr "regedit: тип данных [%1] не поддерживается\n" +msgstr "regedit: тип данных [0x%1!x!] не поддерживается\n" #: regedit.rc:421 msgid "regedit: Unexpected end of line in '%1'.\n" @@ -12257,7 +12255,7 @@ msgstr "Вы точно хотите удалить ключ реестра «%1 #: regedit.rc:199 msgid "Expands or collapses the selected node" -msgstr "" +msgstr "Разворачивает или сворачивает выбранный раздел" #: regedit.rc:231 msgid "Collapse"

1 0

Zebediah Figura : quartz: Use nAvgBytesPerSec to calculate length.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: e994c62e3e66aebe137a3f2b15bdf3246fdaa08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e994c62e3e66aebe137a3f2b1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 19 14:15:32 2017 -0500 quartz: Use nAvgBytesPerSec to calculate length. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 6 +++--- dlls/quartz/waveparser.c | 18 +++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 9e8f69c..7902955 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -115,9 +115,9 @@ static REFERENCE_TIME time_from_pos(DSoundRenderImpl *This, DWORD pos) { static DWORD pos_from_time(DSoundRenderImpl *This, REFERENCE_TIME time) { WAVEFORMATEX *wfx = (WAVEFORMATEX*)This->renderer.pInputPin->pin.mtCurrent.pbFormat; REFERENCE_TIME ret = time; - ret *= wfx->nSamplesPerSec; + ret *= wfx->nAvgBytesPerSec; ret /= 10000000; - ret *= wfx->nBlockAlign; + ret -= ret % wfx->nBlockAlign; return ret; } @@ -424,7 +424,7 @@ static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_ TRACE("Format = %p\n", format); TRACE("wFormatTag = %x %x\n", format->wFormatTag, WAVE_FORMAT_PCM); TRACE("nChannels = %d\n", format->nChannels); - TRACE("nSamplesPerSec = %d\n", format->nAvgBytesPerSec); + TRACE("nSamplesPerSec = %d\n", format->nSamplesPerSec); TRACE("nAvgBytesPerSec = %d\n", format->nAvgBytesPerSec); TRACE("nBlockAlign = %d\n", format->nBlockAlign); TRACE("wBitsPerSample = %d\n", format->wBitsPerSample); diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index 6e8c664..f6bea2c 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -43,9 +43,8 @@ typedef struct WAVEParserImpl ParserImpl Parser; LONGLONG StartOfFile; /* in media time */ LONGLONG EndOfFile; - DWORD dwSampleSize; - DWORD nSamplesPerSec; - DWORD dwLength; + DWORD nAvgBytesPerSec; + DWORD nBlockAlign; } WAVEParserImpl; static inline WAVEParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) @@ -62,7 +61,7 @@ static LONGLONG bytepos_to_duration(WAVEParserImpl *This, LONGLONG bytepos) { LONGLONG duration = BYTES_FROM_MEDIATIME(bytepos - This->StartOfFile); duration *= 10000000; - duration /= (This->dwSampleSize * This->nSamplesPerSec); + duration /= This->nAvgBytesPerSec; return duration; } @@ -71,11 +70,11 @@ static LONGLONG duration_to_bytepos(WAVEParserImpl *This, LONGLONG duration) { LONGLONG bytepos; - bytepos = (This->dwSampleSize * This->nSamplesPerSec); + bytepos = This->nAvgBytesPerSec; bytepos *= duration; bytepos /= 10000000; + bytepos -= bytepos % This->nBlockAlign; bytepos += BYTES_FROM_MEDIATIME(This->StartOfFile); - bytepos -= bytepos % This->dwSampleSize; return MEDIATIME_FROM_BYTES(bytepos); } @@ -252,7 +251,6 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, PIN_INFO piOutput; AM_MEDIA_TYPE amt; WAVEParserImpl * pWAVEParser = impl_from_IBaseFilter(This->pin.pinInfo.pFilter); - LONGLONG length, avail; piOutput.dir = PINDIR_OUTPUT; piOutput.pFilter = &pWAVEParser->Parser.filter.IBaseFilter_iface; @@ -321,10 +319,8 @@ static HRESULT WAVEParser_InputPin_PreConnect(IPin * iface, IPin * pConnectPin, props->cbPrefix = 0; props->cbBuffer = 4096; props->cBuffers = 3; - pWAVEParser->dwSampleSize = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; - IAsyncReader_Length(This->pReader, &length, &avail); - pWAVEParser->dwLength = length / (ULONGLONG)pWAVEParser->dwSampleSize; - pWAVEParser->nSamplesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nSamplesPerSec; + pWAVEParser->nBlockAlign = ((WAVEFORMATEX*)amt.pbFormat)->nBlockAlign; + pWAVEParser->nAvgBytesPerSec = ((WAVEFORMATEX*)amt.pbFormat)->nAvgBytesPerSec; hr = Parser_AddPin(&(pWAVEParser->Parser), &piOutput, props, &amt); CoTaskMemFree(amt.pbFormat);

1 0

Zebediah Figura : quartz: Restore a comment explaining mediatime.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: e1d14d2665be5615cad7db519ef3cc2dd067cc8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d14d2665be5615cad7db519… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 19 14:15:31 2017 -0500 quartz: Restore a comment explaining mediatime. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/quartz_private.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 7cad3a7..a9855e9 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -33,6 +33,7 @@ #include "wine/strmbase.h" #include "wine/list.h" +/* see IAsyncReader::Request on MSDN for the explanation of this */ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define SEC_FROM_MEDIATIME(time) ((time) / 10000000) #define BYTES_FROM_MEDIATIME(time) SEC_FROM_MEDIATIME(time)

1 0

Alexandre Julliard : wineandroid: Add a stub implementation of EnumDisplaySettingsEx.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 1aa8cf05000cfc7f560835dc01ab3afb2f2a2fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa8cf05000cfc7f560835dc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 15:53:58 2017 +0200 wineandroid: Add a stub implementation of EnumDisplaySettingsEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 39 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 40 insertions(+) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 75905a4..54be12a 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -268,6 +268,45 @@ BOOL CDECL ANDROID_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC pr } +/*********************************************************************** + * ANDROID_EnumDisplaySettingsEx + */ +BOOL CDECL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags) +{ + static const WCHAR dev_name[CCHDEVICENAME] = + { 'W','i','n','e',' ','A','n','d','r','o','i','d',' ','d','r','i','v','e','r',0 }; + + devmode->dmSize = offsetof( DEVMODEW, dmICMMethod ); + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + memcpy( devmode->dmDeviceName, dev_name, sizeof(dev_name) ); + devmode->dmDriverExtra = 0; + devmode->u2.dmDisplayFlags = 0; + devmode->dmDisplayFrequency = 0; + devmode->u1.s2.dmPosition.x = 0; + devmode->u1.s2.dmPosition.y = 0; + devmode->u1.s2.dmDisplayOrientation = 0; + devmode->u1.s2.dmDisplayFixedOutput = 0; + + if (n == ENUM_CURRENT_SETTINGS || n == ENUM_REGISTRY_SETTINGS) n = 0; + if (n == 0) + { + devmode->dmPelsWidth = screen_width; + devmode->dmPelsHeight = screen_height; + devmode->dmBitsPerPel = screen_bpp; + devmode->dmDisplayFrequency = 60; + devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + TRACE( "mode %d -- %dx%d %d bpp @%d Hz\n", n, + devmode->dmPelsWidth, devmode->dmPelsHeight, + devmode->dmBitsPerPel, devmode->dmDisplayFrequency ); + return TRUE; + } + TRACE( "mode %d -- not present\n", n ); + SetLastError( ERROR_NO_MORE_FILES ); + return FALSE; +} + + static const struct gdi_dc_funcs android_drv_funcs = { NULL, /* pAbortDoc */ diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 8e98baa..3439ff6 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -11,6 +11,7 @@ @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors +@ cdecl EnumDisplaySettingsEx(ptr long ptr long) ANDROID_EnumDisplaySettingsEx @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow @ cdecl DestroyWindow(long) ANDROID_DestroyWindow

1 0

Alexandre Julliard : wineandroid: Add a stub implementation of ChangeDisplaySettingsEx.
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 508d7a33e38ab5faf524327b7680132accc83e98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=508d7a33e38ab5faf524327b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 21 15:53:40 2017 +0200 wineandroid: Add a stub implementation of ChangeDisplaySettingsEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 11 +++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 871e41d..75905a4 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -207,6 +207,17 @@ static INT ANDROID_GetDeviceCaps( PHYSDEV dev, INT cap ) /*********************************************************************** + * ANDROID_ChangeDisplaySettingsEx + */ +LONG CDECL ANDROID_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, + HWND hwnd, DWORD flags, LPVOID lpvoid ) +{ + FIXME( "(%s,%p,%p,0x%08x,%p)\n", debugstr_w( devname ), devmode, hwnd, flags, lpvoid ); + return DISP_CHANGE_SUCCESSFUL; +} + + +/*********************************************************************** * ANDROID_GetMonitorInfo */ BOOL CDECL ANDROID_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 918140f..8e98baa 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -9,6 +9,7 @@ @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx +@ cdecl ChangeDisplaySettingsEx(ptr ptr long long long) ANDROID_ChangeDisplaySettingsEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow

1 0

Dmitry Timoshkov : cmd: '$E' in the prompt should be interpreted as an escape code (0x1b).
by Alexandre Julliard 21 Jun '17

21 Jun '17

Module: wine Branch: master Commit: 586e171d6fc81db670d290ebcc84fc467db7c49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=586e171d6fc81db670d290ebc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 21 16:24:11 2017 +0800 cmd: '$E' in the prompt should be interpreted as an escape code (0x1b). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/wcmdmain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1aa3c1c..102e485 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -379,7 +379,7 @@ static void WCMD_show_prompt (void) { while (*q) q++; break; case 'E': - *q++ = '\E'; + *q++ = '\x1b'; break; case 'F': *q++ = ')';

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017