April 2019 - Wine-Commits - list.winehq.org

Martin Storsjo : msvcrt: Implement _get_environ and _get_wenviron.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: f20be3b00cee829ada0c7b4ed67af8f63b6aeff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f20be3b00cee829ada0c7b4e… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Apr 10 15:51:55 2019 +0300 msvcrt: Implement _get_environ and _get_wenviron. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/environ.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/environ.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index cce62bc..cc180e8 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -310,3 +310,19 @@ int CDECL _wgetenv_s(MSVCRT_size_t *pReturnValue, MSVCRT_wchar_t *buffer, MSVCRT strcpyW(buffer, e); return 0; } + +/********************************************************************* + * _get_environ (MSVCRT.@) + */ +void CDECL MSVCRT__get_environ(char ***ptr) +{ + *ptr = MSVCRT__environ; +} + +/********************************************************************* + * _get_wenviron (MSVCRT.@) + */ +void CDECL MSVCRT__get_wenviron(MSVCRT_wchar_t ***ptr) +{ + *ptr = MSVCRT__wenviron; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0c2881d..5be4b4c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -501,7 +501,7 @@ @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_doserrno(ptr) -# stub _get_environ(ptr) +@ cdecl _get_environ(ptr) MSVCRT__get_environ @ cdecl _get_errno(ptr) # stub _get_fileinfo(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @@ -512,7 +512,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() -# stub _get_wenviron(ptr) +@ cdecl _get_wenviron(ptr) MSVCRT__get_wenviron @ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor @ cdecl _get_winminor(ptr) MSVCRT__get_winminor # stub _get_winver(ptr) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index fdfe81f..11b79f0 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -47,6 +47,8 @@ void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); static char ***(__cdecl *p__p__environ)(void); static WCHAR ***(__cdecl *p__p__wenviron)(void); +static void (*p_get_environ)(char ***); +static void (*p_get_wenviron)(WCHAR ***); static char ***p_environ; static WCHAR ***p_wenviron; @@ -59,6 +61,8 @@ static void init(void) p__p__wenviron = (void *)GetProcAddress(hmod, "__p__wenviron"); p_environ = (void *)GetProcAddress(hmod, "_environ"); p_wenviron = (void *)GetProcAddress(hmod, "_wenviron"); + p_get_environ = (void *)GetProcAddress(hmod, "_get_environ"); + p_get_wenviron = (void *)GetProcAddress(hmod, "_get_wenviron"); } static void test_system(void) @@ -95,6 +99,16 @@ static void test__environ(void) else win_skip( "__p__environ() is not available\n" ); + if (p_get_environ) + { + char **retptr; + p_get_environ(&retptr); + ok( retptr == *p_environ, + "Expected _environ pointers to be identical\n" ); + } + else + win_skip( "_get_environ() is not available\n" ); + /* Note that msvcrt from Windows versions older than Vista * expects the mode pointer parameter to be valid.*/ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -151,6 +165,16 @@ static void test__wenviron(void) else win_skip( "__p__wenviron() is not available\n" ); + if (p_get_wenviron) + { + WCHAR **retptr; + p_get_wenviron(&retptr); + ok( retptr == NULL, + "Expected _wenviron pointers to be NULL\n" ); + } + else + win_skip( "_get_wenviron() is not available\n" ); + /* __getmainargs doesn't initialize _wenviron. */ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -191,6 +215,14 @@ static void test__wenviron(void) "Expected _wenviron pointers to be identical\n" ); } + if (p_get_wenviron) + { + WCHAR **retptr; + p_get_wenviron(&retptr); + ok( retptr == *p_wenviron, + "Expected _wenviron pointers to be identical\n" ); + } + for (i = 0; ; i++) { if ((*p_wenviron)[i])

1 0

Alexandre Julliard : msvcp60: Rename clog variable to avoid conflict with builtin function.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 403674a9746fe195c7ca532f086a49f42f34274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=403674a9746fe195c7ca532f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 10:13:49 2019 +0200 msvcp60: Rename clog variable to avoid conflict with builtin function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 10 +++++----- dlls/msvcp60/msvcp60.spec | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index 079c4fa..f439339 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -13873,10 +13873,10 @@ static basic_filebuf_char filebuf_char_log; struct { basic_ostream_char obj; basic_ios_char vbase; -} clog = { { 0 } }; +} MSVCP_clog = { { 0 } }; /* ?_Ptr_clog(a)std@@3PAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A */ /* ?_Ptr_clog(a)std@@3PEAV?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)EA */ -basic_ostream_char *_Ptr_clog = &clog.obj; +basic_ostream_char *_Ptr_clog = &MSVCP_clog.obj; static basic_filebuf_wchar filebuf_short_log; /* ?wclog(a)std@@3V?$basic_ostream(a)GU?$char_traits(a)G@std@@@1(a)A */ @@ -13939,7 +13939,7 @@ void __cdecl ios_base_Init__Init_dtor(void *this) if(!ios_base_Init__Init_cnt) { basic_ostream_char_flush(&cout.obj); basic_ostream_char_flush(&cerr.obj); - basic_ostream_char_flush(&clog.obj); + basic_ostream_char_flush(&MSVCP_clog.obj); } } @@ -14079,7 +14079,7 @@ void init_io(void *base) basic_ostream_short_ctor(&wcerr.obj, &filebuf_wchar_stderr.base, FALSE/*FIXME*/, TRUE, TRUE); basic_filebuf_char_ctor_file(&filebuf_char_log, stderr); - basic_ostream_char_ctor(&clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE, TRUE); + basic_ostream_char_ctor(&MSVCP_clog.obj, &filebuf_char_log.base, FALSE/*FIXME*/, TRUE, TRUE); basic_filebuf_short_ctor_file(&filebuf_short_log, stderr); basic_ostream_short_ctor(&uclog.obj, &filebuf_short_log.base, FALSE/*FIXME*/, TRUE, TRUE); @@ -14117,7 +14117,7 @@ void free_io(void) basic_ostream_wchar_vbase_dtor(&wcerr.obj); basic_filebuf_wchar_dtor(&filebuf_wchar_stderr); - basic_ostream_char_vbase_dtor(&clog.obj); + basic_ostream_char_vbase_dtor(&MSVCP_clog.obj); basic_filebuf_char_dtor(&filebuf_char_log); basic_ostream_wchar_vbase_dtor(&uclog.obj); diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec index f496430..196ac6a 100644 --- a/dlls/msvcp60/msvcp60.spec +++ b/dlls/msvcp60/msvcp60.spec @@ -2515,7 +2515,7 @@ @ stub -arch=win64 ?clear(a)ios_base@std@@QEAAXF(a)Z @ thiscall -arch=win32 ?clear(a)ios_base@std@@QAEXH_N(a)Z(ptr long long) ios_base_clear_reraise @ cdecl -arch=win64 ?clear(a)ios_base@std@@QEAAXH_N(a)Z(ptr long long) ios_base_clear_reraise -@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A clog +@ extern ?clog(a)std@@3V?$basic_ostream(a)DU?$char_traits(a)D@std@@@1(a)A MSVCP_clog @ thiscall -arch=win32 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_char_close @ cdecl -arch=win64 ?close@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@QEAAPEAV12(a)XZ(ptr) basic_filebuf_char_close @ thiscall -arch=win32 ?close@?$basic_filebuf(a)GU?$char_traits(a)G@std@@@std@@QAEPAV12(a)XZ(ptr) basic_filebuf_wchar_close

1 0

Alexandre Julliard : msvcrt/tests: Add a function pointer to bypass builtin printf().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 7b83b6b9dedca9d0256b0430b4758bf45edaa4e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b83b6b9dedca9d0256b0430… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 19:29:15 2019 +0200 msvcrt/tests: Add a function pointer to bypass builtin printf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 300 +++++++++++++++++++++++---------------------- 1 file changed, 151 insertions(+), 149 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b83b6b9dedca9d0256b…

1 0

Alexandre Julliard : include: Default to the standards-compliant version of swprintf().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 9b63daca51e859166adcbf687ce857feab30ff44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b63daca51e859166adcbf68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 10:04:28 2019 +0200 include: Default to the standards-compliant version of swprintf(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 20 ++++++++++++++++++-- include/msvcrt/wchar.h | 19 +++++++++++++++++-- programs/reg/export.c | 12 ++++++------ programs/reg/reg.c | 8 ++++---- programs/regedit/framewnd.c | 3 ++- programs/regedit/regproc.c | 14 +++++++------- programs/taskmgr/graph.c | 6 +++--- programs/taskmgr/taskmgr.c | 2 +- programs/wordpad/wordpad.c | 2 +- 9 files changed, 59 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b63daca51e859166adc…

1 0

Alexandre Julliard : include: Add cast to avoid a compiler warning on MSVC.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: d97d922afd5215327aa3613fae07c977a5ef4f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d97d922afd5215327aa3613f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 11 09:18:46 2019 +0200 include: Add cast to avoid a compiler warning on MSVC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46991 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 6a981d6..aa4dc0d 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -290,7 +290,7 @@ static inline const char *wine_dbgstr_wn( const WCHAR *str, int n ) *dst++ = hex[(c >> 4) & 0x0f]; *dst++ = hex[c & 0x0f]; } - else *dst++ = c; + else *dst++ = (char)c; } } *dst++ = '"';

1 0

Zebediah Figura : winex11: Resize the screen when changing CRTC modes.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 70d842b106d3ccbb0a786a41474903bddc4ea879 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70d842b106d3ccbb0a786a41… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:30:32 2019 -0500 winex11: Resize the screen when changing CRTC modes. Based on a patch by Gabriel Corona. According to the RandR spec for RRSetCrtcConfig: "The entire area of the CRTC must fit within the screen size, else a Match error results. As an example, rotating the screen so that a single CRTC fills the entire screen before and after may necessitate disabling the CRTC, resizing the screen, then re-enabling the CRTC at the new configuration to avoid an invalid intermediate configuration." This patch involves resizing the screen also when shrinking a CRTC, not just when expanding it past the current screen size. This is partially because we have no way to reliably determine the current display width (DisplayWidth() is never updated past opening the connection, and RandR exposes no way to retrieve the screen dimensions), and partially because it's probably what the user wants anyway (e.g. it's what the `xrandr` configuration app does when the screen size is not expliticly specified). This patch fixes TestBot failures on the Debian machines for ddraw, d3d8, and d3d9 device tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33290 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrandr.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 2fee851..9f63310 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -58,6 +58,7 @@ MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRSetCrtcConfig) +MAKE_FUNCPTR(XRRSetScreenSize) static typeof(XRRGetScreenResources) *pXRRGetScreenResourcesCurrent; static RRMode *xrandr12_modes; static int primary_crtc; @@ -102,6 +103,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRGetOutputInfo) LOAD_FUNCPTR(XRRGetScreenResources) LOAD_FUNCPTR(XRRSetCrtcConfig) + LOAD_FUNCPTR(XRRSetScreenSize) r = 2; #endif #undef LOAD_FUNCPTR @@ -320,8 +322,30 @@ static int xrandr12_get_current_mode(void) return ret; } +static void get_screen_size( XRRScreenResources *resources, unsigned int *width, unsigned int *height ) +{ + XRRCrtcInfo *crtc_info; + int i; + *width = *height = 0; + + for (i = 0; i < resources->ncrtc; ++i) + { + if (!(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[i] ))) + continue; + + if (crtc_info->mode != None) + { + *width = max(*width, crtc_info->x + crtc_info->width); + *height = max(*height, crtc_info->y + crtc_info->height); + } + + pXRRFreeCrtcInfo( crtc_info ); + } +} + static LONG xrandr12_set_current_mode( int mode ) { + unsigned int screen_width, screen_height; Status status = RRSetConfigFailed; XRRScreenResources *resources; XRRCrtcInfo *crtc_info; @@ -345,10 +369,41 @@ static LONG xrandr12_set_current_mode( int mode ) TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); + /* According to the RandR spec, the entire CRTC must fit inside the screen. + * Since we use the union of all enabled CRTCs to determine the necessary + * screen size, this might involve shrinking the screen, so we must disable + * the CRTC in question first. */ + + XGrabServer( gdi_display ); + + status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], + CurrentTime, crtc_info->x, crtc_info->y, None, + crtc_info->rotation, NULL, 0 ); + if (status != RRSetConfigSuccess) + { + XUngrabServer( gdi_display ); + ERR("Failed to disable CRTC.\n"); + pXRRFreeCrtcInfo( crtc_info ); + pXRRFreeScreenResources( resources ); + return DISP_CHANGE_FAILED; + } + + get_screen_size( resources, &screen_width, &screen_height ); + screen_width = max( screen_width, crtc_info->x + dd_modes[mode].width ); + screen_height = max( screen_height, crtc_info->y + dd_modes[mode].height ); + + pXRRSetScreenSize( gdi_display, root_window, screen_width, screen_height, + screen_width * DisplayWidthMM( gdi_display, default_visual.screen ) + / DisplayWidth( gdi_display, default_visual.screen ), + screen_height * DisplayHeightMM( gdi_display, default_visual.screen ) + / DisplayHeight( gdi_display, default_visual.screen )); + status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], CurrentTime, crtc_info->x, crtc_info->y, xrandr12_modes[mode], crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); + XUngrabServer( gdi_display ); + pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources );

1 0

Zebediah Figura : qcap: Get rid of an unnecessary allocation and copy.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 2011518d30b7af6ff715d59cc1edcf5aa5ead45a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2011518d30b7af6ff715d59c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:02 2019 -0500 qcap: Get rid of an unnecessary allocation and copy. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index fb10cce..7444329 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -367,7 +367,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) HRESULT hr; IMediaSample *pSample = NULL; ULONG framecount = 0; - unsigned char *pTarget, *pOutput; + unsigned char *pTarget; capBox->image_size = capBox->height * capBox->width * 3; if (!(capBox->image_data = heap_alloc(capBox->image_size))) @@ -378,8 +378,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) return 0; } - pOutput = CoTaskMemAlloc(capBox->width * capBox->height * capBox->bitDepth / 8); - while (1) { EnterCriticalSection(&capBox->CritSect); @@ -410,8 +408,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } } - memcpy(pOutput, capBox->image_data, len); - Resize(capBox, pTarget, pOutput); + Resize(capBox, pTarget, capBox->image_data); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); @@ -428,7 +425,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } LeaveCriticalSection(&capBox->CritSect); - CoTaskMemFree(pOutput); return 0; }

1 0

Zebediah Figura : qcap: Get rid of V4l_Unprepare().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: b42f79129d416db4c791ac732c5ec37b043bbf6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b42f79129d416db4c791ac73… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:31:59 2019 -0500 qcap: Get rid of V4l_Unprepare(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 809ce7a..752751a 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -131,11 +131,6 @@ static HRESULT V4l_Prepare(Capture *device) return S_OK; } -static void V4l_Unprepare(Capture *device) -{ - heap_free(device->image_data); -} - HRESULT qcap_driver_destroy(Capture *capBox) { TRACE("%p\n", capBox); @@ -439,7 +434,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { TRACE("Return %x, stop IFilterGraph\n", hr); - V4l_Unprepare(capBox); + heap_free(capBox->image_data); capBox->thread = 0; capBox->stopped = TRUE; break; @@ -559,7 +554,7 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr); } - V4l_Unprepare(capBox); + heap_free(capBox->image_data); } *state = State_Stopped;

1 0

Zebediah Figura : qcap: Get rid of V4l_GetFrame().
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: e32dead36300cb79510a86c6417dd17995939370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e32dead36300cb79510a86c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:01 2019 -0500 qcap: Get rid of V4l_GetFrame(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index ab39b71..fb10cce 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -361,27 +361,13 @@ static void Resize(const Capture * capBox, LPBYTE output, const BYTE *input) } } -static void V4l_GetFrame(Capture *device, unsigned char **buffer) -{ - while (video_read(device->fd, device->image_data, device->image_size) == -1) - { - if (errno != EAGAIN) - { - ERR("Failed to read frame: %s\n", strerror(errno)); - break; - } - } - TRACE("Successfully read a frame.\n"); - *buffer = device->image_data; -} - static DWORD WINAPI ReadThread(LPVOID lParam) { Capture * capBox = lParam; HRESULT hr; IMediaSample *pSample = NULL; ULONG framecount = 0; - unsigned char *pTarget, *pInput, *pOutput; + unsigned char *pTarget, *pOutput; capBox->image_size = capBox->height * capBox->width * 3; if (!(capBox->image_data = heap_alloc(capBox->image_size))) @@ -414,9 +400,17 @@ static DWORD WINAPI ReadThread(LPVOID lParam) TRACE("Data length: %d KB\n", len / 1024); IMediaSample_GetPointer(pSample, &pTarget); - /* FIXME: Check return values.. */ - V4l_GetFrame(capBox, &pInput); - memcpy(pOutput, pInput, len); + + while (video_read(capBox->fd, capBox->image_data, capBox->image_size) == -1) + { + if (errno != EAGAIN) + { + ERR("Failed to read frame: %s\n", strerror(errno)); + break; + } + } + + memcpy(pOutput, capBox->image_data, len); Resize(capBox, pTarget, pOutput); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr);

1 0

Zebediah Figura : qcap: Make the image buffer a local variable.
by Alexandre Julliard April 11, 2019

April 11, 2019

Module: wine Branch: master Commit: 7aa9a04f26be828b5db0200f2c59d00f99afa586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7aa9a04f26be828b5db0200f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 10 22:32:03 2019 -0500 qcap: Make the image buffer a local variable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 7444329..32c2c02 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -105,9 +105,6 @@ struct _Capture int fd, mmap; BOOL iscommitted, stopped; - int image_size; - unsigned char *image_data; - HANDLE thread; }; @@ -367,10 +364,11 @@ static DWORD WINAPI ReadThread(LPVOID lParam) HRESULT hr; IMediaSample *pSample = NULL; ULONG framecount = 0; - unsigned char *pTarget; + unsigned char *pTarget, *image_data; + unsigned int image_size; - capBox->image_size = capBox->height * capBox->width * 3; - if (!(capBox->image_data = heap_alloc(capBox->image_size))) + image_size = capBox->height * capBox->width * 3; + if (!(image_data = heap_alloc(image_size))) { ERR("Failed to allocate memory.\n"); capBox->thread = 0; @@ -399,7 +397,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) IMediaSample_GetPointer(pSample, &pTarget); - while (video_read(capBox->fd, capBox->image_data, capBox->image_size) == -1) + while (video_read(capBox->fd, image_data, image_size) == -1) { if (errno != EAGAIN) { @@ -408,7 +406,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } } - Resize(capBox, pTarget, capBox->image_data); + Resize(capBox, pTarget, image_data); hr = BaseOutputPinImpl_Deliver((BaseOutputPin *)capBox->pOut, pSample); TRACE("%p -> Frame %u: %x\n", capBox, ++framecount, hr); IMediaSample_Release(pSample); @@ -416,7 +414,6 @@ static DWORD WINAPI ReadThread(LPVOID lParam) if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { TRACE("Return %x, stop IFilterGraph\n", hr); - heap_free(capBox->image_data); capBox->thread = 0; capBox->stopped = TRUE; break; @@ -425,6 +422,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) } LeaveCriticalSection(&capBox->CritSect); + heap_free(image_data); return 0; } @@ -535,7 +533,6 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr); } - heap_free(capBox->image_data); } *state = State_Stopped;

1 0