October 2019 - Wine-Commits

Joseph Kogut : iphlpapi: Report success in NotifyIpInterfaceChange.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 713f4568e6d0467e585775828bd725caa0f4faa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=713f4568e6d0467e58577582… Author: Joseph Kogut <joseph.kogut(a)gmail.com> Date: Mon Oct 14 19:25:39 2019 -0700 iphlpapi: Report success in NotifyIpInterfaceChange. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47935 Signed-off-by: Joseph Kogut <joseph.kogut(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1f823b401d..8c7c9018c4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2758,7 +2758,7 @@ DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_ FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", family, callback, context, init_notify, handle); if (handle) *handle = NULL; - return ERROR_NOT_SUPPORTED; + return NO_ERROR; }

1 0

Alex Henrie : winex11: Copy icon color table in 256-color mode (Valgrind).
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 7dd3abe69f6c48eb57391cc88932da49c02caac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dd3abe69f6c48eb57391cc8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 15 19:00:59 2019 -0600 winex11: Copy icon color table in 256-color mode (Valgrind). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/bitblt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 4eec3288e2..973af40c33 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -924,13 +924,14 @@ static void free_ximage_bits( struct gdi_image_bits *bits ) XFree( bits->ptr ); } -/* only for use on sanitized BITMAPINFO structures */ static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse ) { if (info->bmiHeader.biCompression == BI_BITFIELDS) return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD); if (coloruse == DIB_PAL_COLORS) return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD); + if (!info->bmiHeader.biClrUsed && info->bmiHeader.biBitCount <= 8) + return FIELD_OFFSET( BITMAPINFO, bmiColors[1 << info->bmiHeader.biBitCount] ); return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] ); }

1 0

Jacek Caban : kernelbase: Update SetNamedPipeHandleState debug trace.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 293dae8fdcf7e812145621af5ab76dd8d495168c URL: https://source.winehq.org/git/wine.git/?a=commit;h=293dae8fdcf7e812145621af… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 17 15:17:47 2019 +0200 kernelbase: Update SetNamedPipeHandleState debug trace. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/sync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index d2cd346270..781a729ae9 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -1255,9 +1255,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetNamedPipeHandleState( HANDLE pipe, LPDWORD mode IO_STATUS_BLOCK iosb; NTSTATUS status = STATUS_SUCCESS; - /* should be a fixme, but this function is called a lot by the RPC - * runtime, and it slows down InstallShield a fair bit. */ - WARN( "semi-stub: %p %p/%d %p %p\n", pipe, mode, mode ? *mode : 0, count, timeout ); + TRACE( "%p %p/%d %p %p\n", pipe, mode, mode ? *mode : 0, count, timeout ); + if (count || timeout) FIXME( "Unsupported arguments\n" ); if (mode) {

1 0

Alexandre Julliard : programs: Make all program entrypoints cdecl.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

1 0

Zebediah Figura : quartz/videorenderer: Get the window DC in VideoRenderer_SendSampleData().
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 9cef48941e4965171e9bc49037199f2b4d2a53c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cef48941e4965171e9bc490… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:50 2019 -0500 quartz/videorenderer: Get the window DC in VideoRenderer_SendSampleData(). Partly because we cannot depend on the filter being destroyed on the same thread as it was allocated from. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 11a1183355..87365d9212 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -155,6 +155,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, AM_MEDIA_TYPE amt; HRESULT hr = S_OK; BITMAPINFOHEADER *bmiHeader; + HDC dc; TRACE("(%p)->(%p, %d)\n", This, data, size); @@ -178,18 +179,15 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, return VFW_E_RUNTIME_ERROR; } - if (!This->baseControlWindow.baseWindow.hDC) { - ERR("Cannot get DC from window!\n"); - return E_FAIL; - } - TRACE("Src Rect: %s\n", wine_dbgstr_rect(&This->SourceRect)); TRACE("Dst Rect: %s\n", wine_dbgstr_rect(&This->DestRect)); - StretchDIBits(This->baseControlWindow.baseWindow.hDC, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, + dc = GetDC(This->baseControlWindow.baseWindow.hWnd); + StretchDIBits(dc, This->DestRect.left, This->DestRect.top, This->DestRect.right -This->DestRect.left, This->DestRect.bottom - This->DestRect.top, This->SourceRect.left, This->SourceRect.top, This->SourceRect.right - This->SourceRect.left, This->SourceRect.bottom - This->SourceRect.top, data, (BITMAPINFO *)bmiHeader, DIB_RGB_COLORS, SRCCOPY); + ReleaseDC(This->baseControlWindow.baseWindow.hWnd, dc); return S_OK; }

1 0

Zebediah Figura : gdi32: Implement GetCharWidthFloat().
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 068093f1aad8b94f6bf1c9bea75ff9f637bcdbea URL: https://source.winehq.org/git/wine.git/?a=commit;h=068093f1aad8b94f6bf1c9be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 26 09:17:03 2019 -0500 gdi32: Implement GetCharWidthFloat(). Needed by Cygwin's mintty.exe. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 57 +++++++++++++++++++++++++++++++++++++++++-------- dlls/gdi32/tests/font.c | 46 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index b06ff6d354..d451f30c3e 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -36,6 +36,7 @@ #include "winreg.h" #include "gdi_private.h" #include "wine/exception.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -3471,23 +3472,61 @@ done: /************************************************************************* * GetCharWidthFloatA [GDI32.@] */ -BOOL WINAPI GetCharWidthFloatA(HDC hdc, UINT iFirstChar, - UINT iLastChar, PFLOAT pxBuffer) +BOOL WINAPI GetCharWidthFloatA( HDC hdc, UINT first, UINT last, float *buffer ) { - FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer); - return FALSE; + WCHAR *wstr; + int i, wlen; + char *str; + + if (!(str = FONT_GetCharsByRangeA( hdc, first, last, &i ))) + return FALSE; + wstr = FONT_mbtowc( hdc, str, i, &wlen, NULL ); + heap_free(str); + + for (i = 0; i < wlen; ++i) + { + if (!GetCharWidthFloatW( hdc, wstr[i], wstr[i], &buffer[i] )) + { + heap_free(wstr); + return FALSE; + } + } + heap_free(wstr); + return TRUE; } /************************************************************************* * GetCharWidthFloatW [GDI32.@] */ -BOOL WINAPI GetCharWidthFloatW(HDC hdc, UINT iFirstChar, - UINT iLastChar, PFLOAT pxBuffer) +BOOL WINAPI GetCharWidthFloatW( HDC hdc, UINT first, UINT last, float *buffer ) { - FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer); - return FALSE; -} + DC *dc = get_dc_ptr( hdc ); + int *ibuffer; + PHYSDEV dev; + BOOL ret; + UINT i; + + TRACE("dc %p, first %#x, last %#x, buffer %p\n", dc, first, last, buffer); + + if (!dc) return FALSE; + if (!(ibuffer = heap_alloc( (last - first + 1) * sizeof(int) ))) + { + release_dc_ptr( dc ); + return FALSE; + } + + dev = GET_DC_PHYSDEV( dc, pGetCharWidth ); + if ((ret = dev->funcs->pGetCharWidth( dev, first, last, ibuffer ))) + { + float scale = fabs( dc->xformVport2World.eM11 ) / 16.0f; + for (i = first; i <= last; ++i) + buffer[i - first] = ibuffer[i - first] * scale; + } + + heap_free(ibuffer); + return ret; +} /*********************************************************************** * * diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b57effd349..ccae09edc1 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7189,6 +7189,51 @@ static void test_GetCharWidthInfo(void) ReleaseDC(NULL, hdc); } +static int CALLBACK get_char_width_proc(const LOGFONTA *lf, + const TEXTMETRICA *tm, DWORD type, LPARAM ctx) +{ + HFONT font = CreateFontIndirectA(lf); + HDC dc = GetDC(NULL); + const char c = 'm'; + ABCFLOAT abcf; + int i, i32; + BOOL ret; + float f; + ABC abc; + + SelectObject(dc, font); + + ret = GetCharWidthFloatA(dc, c, c, &f); + ok(ret, "%s: GetCharWidthFloat() failed\n", lf->lfFaceName); + ret = GetCharWidth32A(dc, c, c, &i32); + ok(ret, "%s: GetCharWidth32A() failed\n", lf->lfFaceName); + ret = GetCharWidthA(dc, c, c, &i); + ok(ret, "%s: GetCharWidthA() failed\n", lf->lfFaceName); + ok(i == i32, "%s: mismatched widths %d/%d\n", lf->lfFaceName, i, i32); + ok((float)i / 16.0f == f, "%s: mismatched widths %d/%.8e\n", lf->lfFaceName, i, f); + + ret = GetCharABCWidthsFloatA(dc, c, c, &abcf); + ok(ret, "%s: GetCharABCWidths() failed\n", lf->lfFaceName); + if (GetCharABCWidthsA(dc, c, c, &abc)) + ok((float)abc.abcB == abcf.abcfB, "%s: mismatched widths %d/%.8e\n", + lf->lfFaceName, abc.abcB, abcf.abcfB); + + ReleaseDC(NULL, dc); + DeleteObject(font); + return 1; +} + +static void test_char_width(void) +{ + HDC dc = GetDC(NULL); + LOGFONTA lf = {0}; + + lf.lfCharSet = DEFAULT_CHARSET; + EnumFontFamiliesExA(dc, &lf, get_char_width_proc, 0, 0); + + ReleaseDC(NULL, dc); +} + START_TEST(font) { static const char *test_names[] = @@ -7271,6 +7316,7 @@ START_TEST(font) test_bitmap_font_glyph_index(); test_GetCharWidthI(); test_long_names(); + test_char_width(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Gijs Vermeulen : advapi32/tests: Fix test_process_security with non-English locale.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 70bb6551553345ace6ab329a513d9d97492f0591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70bb6551553345ace6ab329a… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Thu Oct 17 13:47:30 2019 +0200 advapi32/tests: Fix test_process_security with non-English locale. Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index aee4587425..5f65ed385d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3004,7 +3004,10 @@ static void test_process_security(void) ret = LookupAccountSidA( NULL, UsersSid, account, &acc_size, domain, &dom_size, &use ); ok(ret, "LookupAccountSid failed with %d\n", ret); todo_wine ok(use == SidTypeGroup, "expect SidTypeGroup, got %d\n", use); - todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); + if (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH) + skip("Non-English locale (test with hardcoded 'None')\n"); + else + todo_wine ok(!strcmp(account, "None"), "expect None, got %s\n", account); res = GetTokenInformation( token, TokenUser, NULL, 0, &size ); ok(!res, "Expected failure, got %d\n", res);

1 0

Gijs Vermeulen : msvcrt: Add Concurrency::details::_Context::_Yield stub.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 170ab94bdebb0b8081b32ff908bfa215140c131a URL: https://source.winehq.org/git/wine.git/?a=commit;h=170ab94bdebb0b8081b32ff9… Author: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Date: Wed Oct 16 22:54:18 2019 +0200 msvcrt: Add Concurrency::details::_Context::_Yield stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46279 Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/scheduler.c | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 1535456097..9a8ef13aae 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -468,7 +468,7 @@ @ stub -arch=win64 ?_TryAcquireWrite(a)_ReaderWriterLock@details(a)Concurrency@@QEAA_NXZ @ stub ?_UnderlyingYield(a)details@Concurrency@@YAXXZ @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() msvcr120.?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ -@ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ +@ cdecl ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ() msvcr120.?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=i386 ?cancel(a)agent@Concurrency@@QAE_NXZ @ stub -arch=win64 ?cancel(a)agent@Concurrency@@QEAA_NXZ @ stub ?current(a)location@Concurrency@@SA?AV12(a)XZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 12a5e66e88..343f2bd3c9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -685,7 +685,7 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI(a)Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value -@ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ +@ cdecl ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ() Context_Yield @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 56e9986e0f..9938b1ff46 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -667,7 +667,7 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI(a)Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value -@ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ +@ cdecl ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ() Context_Yield @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c7a30b403c..89d240b567 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -663,7 +663,7 @@ @ stub -arch=win32 ?_ValidateWrite@@YAHPAXI(a)Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI(a)Z @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() msvcr120.?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ -@ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ +@ cdecl ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ() msvcr120.?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/scheduler.c index 53a9669fea..08a3242e6b 100644 --- a/dlls/msvcrt/scheduler.c +++ b/dlls/msvcrt/scheduler.c @@ -237,6 +237,7 @@ void __cdecl Context_Block(void) } /* ?Yield(a)Context@Concurrency@@SAXXZ */ +/* ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ */ void __cdecl Context_Yield(void) { FIXME("()\n");

1 0

Zebediah Figura : strmbase: Get rid of the unused "hDC" field of the BaseWindow structure.
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: 3e7a804790a8c3ab2d1b7ab393f21a375d3e467a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e7a804790a8c3ab2d1b7ab3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:51 2019 -0500 strmbase: Get rid of the unused "hDC" field of the BaseWindow structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 6 ------ include/wine/strmbase.h | 1 - 2 files changed, 7 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index c99a529fa2..23f37de52b 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -130,8 +130,6 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) SetWindowLongPtrW(This->hWnd, 0, (LONG_PTR)This); - This->hDC = GetDC(This->hWnd); - return S_OK; } @@ -140,10 +138,6 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) if (!This->hWnd) return S_OK; - if (This->hDC) - ReleaseDC(This->hWnd, This->hDC); - This->hDC = NULL; - SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cc06e70447..5be7caa371 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -359,7 +359,6 @@ typedef struct tagBaseWindow HWND hWnd; LONG Width; LONG Height; - HDC hDC; const struct BaseWindowFuncTable* pFuncsTable; } BaseWindow;

1 0

Zebediah Figura : strmbase: Get rid of BaseWindowImpl_OnSize().
by Alexandre Julliard Oct. 17, 2019

Oct. 17, 2019

Module: wine Branch: master Commit: a17f2ecb69d35b66608b9eb96b40ade1001ac7df URL: https://source.winehq.org/git/wine.git/?a=commit;h=a17f2ecb69d35b66608b9eb9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:48 2019 -0500 strmbase: Get rid of BaseWindowImpl_OnSize(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 3 ++- dlls/quartz/vmr9.c | 3 ++- dlls/strmbase/window.c | 12 +++--------- include/wine/strmbase.h | 1 - 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a16a422e2d..11a1183355 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -415,7 +415,8 @@ static BOOL WINAPI VideoRenderer_OnSize(BaseWindow *iface, LONG Width, LONG Heig This->DestRect.top, This->DestRect.right - This->DestRect.left, This->DestRect.bottom - This->DestRect.top); - return BaseWindowImpl_OnSize(iface, Width, Height); + + return TRUE; } static const BaseRendererFuncTable BaseFuncTable = diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 536703fbff..59a5152cf5 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -589,7 +589,8 @@ static BOOL WINAPI VMR9_OnSize(BaseWindow *This, LONG Width, LONG Height) pVMR9->target_rect.top, pVMR9->target_rect.right - pVMR9->target_rect.left, pVMR9->target_rect.bottom - pVMR9->target_rect.top); - return BaseWindowImpl_OnSize(This, Width, Height); + + return TRUE; } static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 142336bc19..82bb814827 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -74,20 +74,14 @@ static LRESULT CALLBACK WndProcW(HWND hwnd, UINT message, WPARAM wparam, LPARAM case WM_SIZE: if (This->pFuncsTable->pfnOnSize) return This->pFuncsTable->pfnOnSize(This, LOWORD(lparam), HIWORD(lparam)); - else - return BaseWindowImpl_OnSize(This, LOWORD(lparam), HIWORD(lparam)); + + This->Width = LOWORD(lparam); + This->Height = HIWORD(lparam); } return DefWindowProcW(hwnd, message, wparam, lparam); } -BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Width, LONG Height) -{ - This->Width = Width; - This->Height = Height; - return TRUE; -} - HRESULT WINAPI BaseWindow_Init(BaseWindow *pBaseWindow, const BaseWindowFuncTable* pFuncsTable) { if (!pFuncsTable) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 11397170ed..13544f414b 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -381,7 +381,6 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *pBaseWindow); HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This); HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This); -BOOL WINAPI BaseWindowImpl_OnSize(BaseWindow *This, LONG Height, LONG Width); enum strmbase_type_id {

1 0