wine-commits October 2016

wine-commits@winehq.org

2 participants
451 discussions

Nikolay Sivov : dbghelp: Recognize DW_FORM_flag_present.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 23c24693ddee41b5c758f2e9e3ddc9ea1d4252a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c24693ddee41b5c758f2e9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 26 03:08:17 2016 +0300 dbghelp: Recognize DW_FORM_flag_present. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 99f56bf78d68684bd066d599792cec19885c9bee) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dwarf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 655c586..dcbcf0a 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -462,6 +462,7 @@ static void dwarf2_swallow_attribute(dwarf2_traverse_context_t* ctx, switch (abbrev_attr->form) { + case DW_FORM_flag_present: step = 0; break; case DW_FORM_ref_addr: case DW_FORM_addr: step = ctx->word_size; break; case DW_FORM_flag: @@ -509,6 +510,11 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, TRACE("flag<0x%lx>\n", attr->u.uvalue); break; + case DW_FORM_flag_present: + attr->u.uvalue = 1; + TRACE("flag_present\n"); + break; + case DW_FORM_data1: attr->u.uvalue = dwarf2_get_byte(data); TRACE("data1<%lu>\n", attr->u.uvalue);

1 0

Jacek Caban : mshtml: Fixed OnStopBinding if it' s called called after we aborted document binding.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 9a82df1863dbb366446d299e029c670623c76b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a82df1863dbb366446d299e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 27 13:43:32 2016 +0200 mshtml: Fixed OnStopBinding if it's called called after we aborted document binding. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b0c759a3b91e2c7b5934b18f0faaecdcc6254bf7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mshtml/navigate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index ed61ab0..38220ac 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1388,10 +1388,10 @@ static HRESULT nsChannelBSC_stop_binding(BSCallback *bsc, HRESULT result) { nsChannelBSC *This = nsChannelBSC_from_BSCallback(bsc); - if(result != E_ABORT) { + if(result != E_ABORT && This->is_doc_channel && This->bsc.window) { if(FAILED(result)) handle_navigation_error(This, result); - else if(This->is_doc_channel && This->nschannel) { + else if(This->nschannel) { result = async_stop_request(This); if(SUCCEEDED(result)) return S_OK;

1 0

Xiaoshan Sun : comctl32/dsa: Handle overflow in DSA_InsertItem().
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 8f7e06418c06ed41754f9a0b37585ead64cd2ded URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f7e06418c06ed41754f9a0b3… Author: Xiaoshan Sun <sunxs(a)is.iscas.ac.cn> Date: Sun Jul 24 14:44:40 2016 +0300 comctl32/dsa: Handle overflow in DSA_InsertItem(). Signed-off-by: Xiaoshan Sun <sunxs(a)is.iscas.ac.cn> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0d57ff3d1f63f7486733f8619f3916867ebd26c5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/dsa.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index a73a54a..d5e8234 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -267,6 +267,9 @@ INT WINAPI DSA_InsertItem (HDSA hdsa, INT nIndex, LPVOID pSrc) nNewItems = hdsa->nMaxCount + hdsa->nGrow; nSize = hdsa->nItemSize * nNewItems; + if (nSize / hdsa->nItemSize != nNewItems) + return -1; + lpTemp = ReAlloc (hdsa->pData, nSize); if (!lpTemp) return -1;

1 0

Alistair Leslie-Hughes : comctl32/trackbar: Use WM_CTLCOLORSTATIC when painting background.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 124f418bdbdbb7f291a79e44e4b41c8b67d1537c URL: http://source.winehq.org/git/wine.git/?a=commit;h=124f418bdbdbb7f291a79e44e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jul 24 14:31:52 2016 +0300 comctl32/trackbar: Use WM_CTLCOLORSTATIC when painting background. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 430108c92af50b25e399fc41b15600b13719c26f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/trackbar.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index d534502..880acc7 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -956,8 +956,11 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) if (GetWindowTheme (infoPtr->hwndSelf)) { DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); } - else - FillRect (hdc, &rcClient, GetSysColorBrush(COLOR_BTNFACE)); + else { + HBRUSH brush = (HBRUSH)SendMessageW(infoPtr->hwndNotify, WM_CTLCOLORSTATIC, + (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); + FillRect (hdc, &rcClient, brush ? brush : GetSysColorBrush(COLOR_BTNFACE)); + } if (gcdrf != CDRF_DODEFAULT) notify_customdraw(infoPtr, &nmcd, CDDS_POSTERASE); }

1 0

Nikolay Sivov : comctl32/trackbar: Fix mouse position to thumb position conversion rounding.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: eae8f0aa6babb35dda297b546a62b736c0ba5b75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eae8f0aa6babb35dda297b546… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 15 00:37:35 2016 +0300 comctl32/trackbar: Fix mouse position to thumb position conversion rounding. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a237bdb603b36550abb57502d0fa1c27a57d7f6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/trackbar.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 7ce1a51..d534502 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -34,6 +34,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -203,7 +204,7 @@ TRACKBAR_ConvertPlaceToPosition (const TRACKBAR_INFO *infoPtr, int place) pos = infoPtr->lRangeMin; TRACE("%.2f\n", pos); - return (LONG)(pos + 0.5); + return (LONG)floor(pos + 0.5); }

1 0

Nikolay Sivov : comctl32/trackbar: Update thumb on range change.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: e2cad8c78d69b057f959d233f3086b15020e77f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2cad8c78d69b057f959d233f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 14 23:39:53 2016 +0300 comctl32/trackbar: Update thumb on range change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cd55d747429980dea37295d0d6ce68e7b3c01686) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 23 +++++++++++++++++++++++ dlls/comctl32/trackbar.c | 16 ++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index adb1b12..918cf1a 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -687,6 +687,7 @@ static void test_position(void) static void test_range(void) { HWND hWndTrackbar; + RECT rect1, rect2; int r; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); @@ -752,6 +753,28 @@ static void test_range(void) ok_sequence(sequences, TRACKBAR_SEQ_INDEX, range_test_seq, "range test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, parent_range_test_seq, "parent range test sequence", TRUE); + /* TBM_SETRANGE updates thumb visual position (rectangle) if needed */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, TRUE, MAKELONG(-10, 10)); + ok(r == 0, "got %d\n", r); + RedrawWindow(hWndTrackbar, NULL, 0, RDW_UPDATENOW); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect2); + ok(!EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + + /* change range back, don't force repaint */ + r = SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-10, 0)); + ok(r == 0, "got %d\n", r); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect1, &rect2), "thumb rectangle not updated\n"); + DestroyWindow(hWndTrackbar); } diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 12c3e9d..7ce1a51 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1249,21 +1249,21 @@ TRACKBAR_SetRange (TRACKBAR_INFO *infoPtr, BOOL redraw, LONG range) infoPtr->lRangeMin = (SHORT)LOWORD(range); infoPtr->lRangeMax = (SHORT)HIWORD(range); - if (infoPtr->lPos < infoPtr->lRangeMin) { + /* clip position to new min/max limit */ + if (infoPtr->lPos < infoPtr->lRangeMin) infoPtr->lPos = infoPtr->lRangeMin; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } - if (infoPtr->lPos > infoPtr->lRangeMax) { + if (infoPtr->lPos > infoPtr->lRangeMax) infoPtr->lPos = infoPtr->lRangeMax; - infoPtr->flags |= TB_THUMBPOSCHANGED; - } infoPtr->lPageSize = (infoPtr->lRangeMax - infoPtr->lRangeMin) / 5; if (infoPtr->lPageSize == 0) infoPtr->lPageSize = 1; - if (changed && (infoPtr->dwStyle & TBS_AUTOTICKS)) - TRACKBAR_RecalculateTics (infoPtr); + if (changed) { + if (infoPtr->dwStyle & TBS_AUTOTICKS) + TRACKBAR_RecalculateTics (infoPtr); + infoPtr->flags |= TB_THUMBPOSCHANGED; + } if (redraw) TRACKBAR_InvalidateAll(infoPtr);

1 0

Andrew Eikum : winepulse.drv: Don' t hold PA-owned buffer between capture callbacks.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 6b14bf5a106fb4691d310fd442038aa6e05f3fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b14bf5a106fb4691d310fd44… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jul 26 12:51:16 2016 -0500 winepulse.drv: Don't hold PA-owned buffer between capture callbacks. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ee2310f7674c95b1ebc6229e3acd5b2bc408ba73) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 55 +++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 4d7e40b..ed91f71 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -173,8 +173,8 @@ struct ACImpl { INT32 locked; UINT32 bufsize_frames, bufsize_bytes, capture_period, pad, started, peek_ofs, wri_offs_bytes, lcl_offs_bytes; - UINT32 tmp_buffer_bytes, held_bytes; - BYTE *local_buffer, *tmp_buffer; + UINT32 tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len; + BYTE *local_buffer, *tmp_buffer, *peek_buffer; void *locked_ptr; pa_stream *stream; @@ -760,28 +760,42 @@ static void pulse_rd_loop(ACImpl *This, size_t bytes) dst = p->data; while (rem) { - pa_stream_peek(This->stream, (const void**)&src, &src_len); - assert(src_len); - assert(This->peek_ofs < src_len); - src += This->peek_ofs; - src_len -= This->peek_ofs; - assert(src_len <= bytes); + if (This->peek_len) { + copy = min(rem, This->peek_len - This->peek_ofs); - copy = rem; - if (copy > src_len) - copy = src_len; - memcpy(dst, src, rem); - src += copy; - src_len -= copy; - dst += copy; - rem -= copy; + memcpy(dst, This->peek_buffer + This->peek_ofs, copy); - if (!src_len) { - This->peek_ofs = 0; - pa_stream_drop(This->stream); - } else + rem -= copy; + dst += copy; This->peek_ofs += copy; + if(This->peek_len == This->peek_ofs) + This->peek_len = 0; + } else { + pa_stream_peek(This->stream, (const void**)&src, &src_len); + + copy = min(rem, src_len); + + memcpy(dst, src, rem); + + dst += copy; + rem -= copy; + + if (copy < src_len) { + if (src_len > This->peek_buffer_len) { + HeapFree(GetProcessHeap(), 0, This->peek_buffer); + This->peek_buffer = HeapAlloc(GetProcessHeap(), 0, src_len); + This->peek_buffer_len = src_len; + } + + memcpy(This->peek_buffer, src + copy, src_len - copy); + This->peek_len = src_len - copy; + This->peek_ofs = 0; + } + + pa_stream_drop(This->stream); + } } + bytes -= This->capture_period; } } @@ -1032,6 +1046,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) IUnknown_Release(This->marshal); IMMDevice_Release(This->parent); HeapFree(GetProcessHeap(), 0, This->tmp_buffer); + HeapFree(GetProcessHeap(), 0, This->peek_buffer); HeapFree(GetProcessHeap(), 0, This->local_buffer); HeapFree(GetProcessHeap(), 0, This); }

1 0

Andrew Eikum : winepulse.drv: Buffer data locally when needed.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 026c3adbe5d904d54d686db21d298062c0f2d416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026c3adbe5d904d54d686db21… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 19 10:48:24 2016 -0600 winepulse.drv: Buffer data locally when needed. PulseAudio doesn't make any buffer size guarantees. With some hardware and some configurations, PulseAudio will fail to allocate the full buffer requested by the application. So, we have to store the data within winepulse until there is enough room in the PulseAudio buffer to accept it. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1245f8335c31a6078ed50fc17cff4d60877c72a4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 274 ++++++++++++++++++++++++++++++++---------- 1 file changed, 212 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026c3adbe5d904d54d686…

1 0

Jeremy Audiger : wined3d: Add Nvidia GT 740M to the GPU list.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: ef8adb1feb77317c13cd45f6ded8fe71c7cad649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8adb1feb77317c13cd45f6d… Author: Jeremy Audiger <audiger(a)live.fr> Date: Fri Jul 29 12:38:42 2016 +0000 wined3d: Add Nvidia GT 740M to the GPU list. Signed-off-by: Jérémy Audiger <audiger(a)live.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a7681a877c9aa953b750593a3ff249c79d9a1f8f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9e9e15e..51a26be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1274,6 +1274,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1777,6 +1778,7 @@ cards_nvidia_binary[] = {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ {"GT 750M", CARD_NVIDIA_GEFORCE_GT750M}, /* Geforce 700 - midend mobile */ + {"GT 740M", CARD_NVIDIA_GEFORCE_GT740M}, /* Geforce 700 - midend mobile */ {"GT 730M", CARD_NVIDIA_GEFORCE_GT730M}, /* Geforce 700 - midend mobile */ {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ @@ -2137,6 +2139,7 @@ cards_nvidia_mesa[] = {"NV118", CARD_NVIDIA_GEFORCE_840M}, {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ + {"NV108", CARD_NVIDIA_GEFORCE_GT740M}, {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7d3796..58bf0f5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1618,6 +1618,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, + CARD_NVIDIA_GEFORCE_GT740M = 0x1292, CARD_NVIDIA_GEFORCE_GT750M = 0x0fe9, CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380,

1 0

Nikolay Sivov : ucrtbase: Implement _get_narrow_winmain_command_line/ _get_wide_winmain_command_line.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 5edf349cffef54538dc0e9073dd1c9e61982a7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5edf349cffef54538dc0e9073… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 12:24:24 2016 +0200 ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1411d800ee660b92798a0edbbc414e51a090da59) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 +- dlls/msvcrt/data.c | 54 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index f7de559..4c9a653 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -43,11 +43,11 @@ @ cdecl _get_initial_narrow_environment() ucrtbase._get_initial_narrow_environment @ stub _get_initial_wide_environment @ cdecl _get_invalid_parameter_handler() ucrtbase._get_invalid_parameter_handler -@ stub _get_narrow_winmain_command_line +@ cdecl _get_narrow_winmain_command_line() ucrtbase._get_narrow_winmain_command_line @ cdecl _get_pgmptr(ptr) ucrtbase._get_pgmptr @ cdecl _get_terminate() ucrtbase._get_terminate @ cdecl _get_thread_local_invalid_parameter_handler() ucrtbase._get_thread_local_invalid_parameter_handler -@ stub _get_wide_winmain_command_line +@ cdecl _get_wide_winmain_command_line() ucrtbase._get_wide_winmain_command_line @ cdecl _get_wpgmptr(ptr) ucrtbase._get_wpgmptr @ cdecl _getdllprocaddr(long str long) ucrtbase._getdllprocaddr @ cdecl _getpid() ucrtbase._getpid diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index b665333..4da8666 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -684,3 +684,57 @@ int CDECL _initialize_wide_environment(void) FIXME("stub\n"); return 0; } + +/********************************************************************* + * _get_narrow_winmain_command_line (UCRTBASE.@) + */ +char* CDECL _get_narrow_winmain_command_line(void) +{ + static char *narrow_command_line; + char *s; + + if (narrow_command_line) + return narrow_command_line; + + s = GetCommandLineA(); + while (*s && *s != ' ' && *s != '\t') + { + if (*s++ == '"') + { + while (*s && *s++ != '"') + ; + } + } + + while (*s == ' ' || *s == '\t') + s++; + + return narrow_command_line = s; +} + +/********************************************************************* + * _get_wide_winmain_command_line (UCRTBASE.@) + */ +MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) +{ + static MSVCRT_wchar_t *wide_command_line; + MSVCRT_wchar_t *s; + + if (wide_command_line) + return wide_command_line; + + s = GetCommandLineW(); + while (*s && *s != ' ' && *s != '\t') + { + if (*s++ == '"') + { + while (*s && *s++ != '"') + ; + } + } + + while (*s == ' ' || *s == '\t') + s++; + + return wide_command_line = s; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 26acae7..b5f752f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -368,7 +368,7 @@ @ cdecl _get_initial_narrow_environment() @ stub _get_initial_wide_environment @ cdecl _get_invalid_parameter_handler() -@ stub _get_narrow_winmain_command_line +@ cdecl _get_narrow_winmain_command_line() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @@ -379,7 +379,7 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected -@ stub _get_wide_winmain_command_line +@ cdecl _get_wide_winmain_command_line() @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch()

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
46
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 October 2016