wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

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

17 Oct '19

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 17 Oct '19

17 Oct '19

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@_ReaderWriterLock@details@Concurrency@@QEAA_NXZ @ stub ?_UnderlyingYield@details@Concurrency@@YAXXZ @ cdecl ?_Value@_SpinCount@details@Concurrency@@SAIXZ() msvcr120.?_Value@_SpinCount@details@Concurrency@@SAIXZ -@ stub ?_Yield@_Context@details@Concurrency@@SAXXZ +@ cdecl ?_Yield@_Context@details@Concurrency@@SAXXZ() msvcr120.?_Yield@_Context@details@Concurrency@@SAXXZ @ stub -arch=i386 ?cancel@agent@Concurrency@@QAE_NXZ @ stub -arch=win64 ?cancel@agent@Concurrency@@QEAA_NXZ @ stub ?current@location@Concurrency@@SA?AV12@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@Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z @ cdecl ?_Value@_SpinCount@details@Concurrency@@SAIXZ() SpinCount__Value -@ stub ?_Yield@_Context@details@Concurrency@@SAXXZ +@ cdecl ?_Yield@_Context@details@Concurrency@@SAXXZ() Context_Yield @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@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@Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z @ cdecl ?_Value@_SpinCount@details@Concurrency@@SAIXZ() SpinCount__Value -@ stub ?_Yield@_Context@details@Concurrency@@SAXXZ +@ cdecl ?_Yield@_Context@details@Concurrency@@SAXXZ() Context_Yield @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z(ptr ptr) __ExceptionPtrAssign @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@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@Z @ stub -arch=win64 ?_ValidateWrite@@YAHPEAXI@Z @ cdecl ?_Value@_SpinCount@details@Concurrency@@SAIXZ() msvcr120.?_Value@_SpinCount@details@Concurrency@@SAIXZ -@ stub ?_Yield@_Context@details@Concurrency@@SAXXZ +@ cdecl ?_Yield@_Context@details@Concurrency@@SAXXZ() msvcr120.?_Yield@_Context@details@Concurrency@@SAXXZ @ cdecl -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX@Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPAXPBX@Z @ cdecl -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z(ptr ptr) msvcr120.?__ExceptionPtrAssign@@YAXPEAXPEBX@Z @ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0@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@Context@Concurrency@@SAXXZ */ +/* ?_Yield@_Context@details@Concurrency@@SAXXZ */ void __cdecl Context_Yield(void) { FIXME("()\n");

1 0

Alexandre Julliard : libport: Add codepage 28601 (Latin/Thai).
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: 4f6397116994a3ad93f4d155e42b8056fff10c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f6397116994a3ad93f4d155… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 17 18:23:37 2019 +0200 libport: Add codepage 28601 (Latin/Thai). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/Makefile.in | 1 + libs/port/c_28601.c | 725 ++++++++++++++++++++++++++++++++++++++++++++++++++ libs/port/cptable.c | 4 +- loader/wine.inf.in | 1 + tools/make_unicode | 1 + 5 files changed, 731 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f6397116994a3ad93f4…

1 0

Alexandre Julliard : programs: Make all program entrypoints cdecl.
by Alexandre Julliard 17 Oct '19

17 Oct '19

1 0

Nikolay Sivov : include: Add some more MF reader/writer API definitions.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: db080b0c7fd19944e7474a18ca7bad64af859cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db080b0c7fd19944e7474a18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 17 08:40:40 2019 +0300 include: Add some more MF reader/writer API definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 93 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index cbfeef812c..93920a2d38 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -46,6 +46,13 @@ typedef [v1_enum] enum MF_SOURCE_READER_FLAG MF_SOURCE_READERF_ALLEFFECTSREMOVED = 0x00000200, } MF_SOURCE_READER_FLAG; +enum +{ + MF_SINK_WRITER_INVALID_STREAM_INDEX = 0xffffffff, + MF_SINK_WRITER_ALL_STREAMS = 0xfffffffe, + MF_SINK_WRITER_MEDIASINK = 0xffffffff, +}; + typedef struct _MF_SINK_WRITER_STATISTICS { DWORD cb; @@ -116,6 +123,20 @@ interface IMFSourceReaderCallback : IUnknown [in] IMFMediaEvent *event); } +[ + object, + uuid(cf839fe6-8c2a-4dd2-b6ea-c22d6961af05), + local +] +interface IMFSourceReaderCallback2 : IMFSourceReaderCallback +{ + HRESULT OnTransformChange(); + + HRESULT OnStreamError( + [in] DWORD stream_index, + [in] HRESULT status); +} + interface IMFMediaSource; [ @@ -138,6 +159,32 @@ interface IMFSourceReader : IUnknown HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); } +[ + object, + uuid(7b981cf0-560e-4116-9875-b099895f23d7), + local +] +interface IMFSourceReaderEx : IMFSourceReader +{ + HRESULT SetNativeMediaType( + [in] DWORD stream_index, + [in] IMFMediaType *media_type, + [out] DWORD *stream_flags); + + HRESULT AddTransformForStream( + [in] DWORD stream_index, + [in] IUnknown *transform); + + HRESULT RemoveAllTransformsForStream( + [in] DWORD stream_index); + + HRESULT GetTransformForStream( + [in] DWORD stream_index, + [in] DWORD transform_index, + [out] GUID *category, + [out] IMFTransform **transform); +} + [ object, uuid(3137f1cd-fe5e-4805-a5d8-fb477448cb3d), @@ -169,6 +216,52 @@ interface IMFSinkWriterEx : IMFSinkWriter [out] IMFTransform **transform); } +[ + object, + uuid(17c3779e-3cde-4ede-8c60-3899f5f53ad6), + local +] +interface IMFSinkWriterEncoderConfig : IUnknown +{ + HRESULT SetTargetMediaType( + [in] DWORD stream_index, + [in] IMFMediaType *media_type, + [in] IMFAttributes *encoding_parameters); + + HRESULT PlaceEncodingParameters( + [in] DWORD stream_index, + [in] IMFAttributes *encoding_parameters); +} + +[ + object, + uuid(666f76de-33d2-41b9-a458-29ed0a972c58), + local +] +interface IMFSinkWriterCallback : IUnknown +{ + HRESULT OnFinalize( + [in] HRESULT status); + + HRESULT OnMarker( + [in] DWORD stream_index, + [in] void *context); +} + +[ + object, + uuid(2456bd58-c067-4513-84fe-8d0c88ffdc61), + local +] +interface IMFSinkWriterCallback2 : IMFSinkWriterCallback +{ + HRESULT OnTransformChange(); + + HRESULT OnStreamError( + [in] DWORD stream_index, + [in] HRESULT status); +} + [ object, uuid(e7fe2e12-661c-40da-92f9-4f002ab67627),

1 0

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

17 Oct '19

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 : quartz/videorenderer: Get the window DC in VideoRenderer_SendSampleData().
by Alexandre Julliard 17 Oct '19

17 Oct '19

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 : strmbase: Get rid of the unused "hInstance" field of the BaseWindow structure.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: f3a766bfe4465c373ae0ecb0e6b0eccb0ec9918e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3a766bfe4465c373ae0ecb0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:49 2019 -0500 strmbase: Get rid of the unused "hInstance" 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 | 3 +-- include/wine/strmbase.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 82bb814827..c99a529fa2 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -110,7 +110,6 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) winclass.lpfnWndProc = WndProcW; winclass.cbWndExtra = sizeof(BaseWindow*); - winclass.hInstance = This->hInstance; winclass.hbrBackground = GetStockObject(BLACK_BRUSH); winclass.lpszClassName = class_nameW; if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) @@ -121,7 +120,7 @@ HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) This->hWnd = CreateWindowExW(0, class_nameW, windownameW, WS_SIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - NULL, NULL, This->hInstance, NULL); + NULL, NULL, NULL, NULL); if (!This->hWnd) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 13544f414b..cc06e70447 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -359,7 +359,6 @@ typedef struct tagBaseWindow HWND hWnd; LONG Width; LONG Height; - HINSTANCE hInstance; HDC hDC; const struct BaseWindowFuncTable* pFuncsTable;

1 0

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

17 Oct '19

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

Zebediah Figura : strmbase: Get rid of the "pfnGetClassWindowStyles" callback.
by Alexandre Julliard 17 Oct '19

17 Oct '19

Module: wine Branch: master Commit: b0b2c7d69980eb35c1f69eada273e9f2278aa985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0b2c7d69980eb35c1f69ead… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 16 19:36:47 2019 -0500 strmbase: Get rid of the "pfnGetClassWindowStyles" callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/videorenderer.c | 18 ++++-------------- dlls/quartz/vmr9.c | 12 ------------ dlls/strmbase/window.c | 22 ++++++---------------- include/wine/strmbase.h | 6 ------ 4 files changed, 10 insertions(+), 48 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 87491d8851..a16a422e2d 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -53,6 +53,8 @@ typedef struct VideoRendererImpl LONG VideoWidth; LONG VideoHeight; LONG FullScreenMode; + + DWORD saved_style; } VideoRendererImpl; static inline VideoRendererImpl *impl_from_BaseWindow(BaseWindow *iface) @@ -392,17 +394,6 @@ static void video_renderer_start_stream(BaseRenderer *iface) } } -static LPWSTR WINAPI VideoRenderer_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx) -{ - static const WCHAR classnameW[] = { 'W','i','n','e',' ','A','c','t','i','v','e','M','o','v','i','e',' ','C','l','a','s','s',0 }; - - *pClassStyles = 0; - *pWindowStyles = WS_SIZEBOX; - *pWindowStylesEx = 0; - - return (LPWSTR)classnameW; -} - static RECT WINAPI VideoRenderer_GetDefaultRect(BaseWindow *iface) { VideoRendererImpl *This = impl_from_BaseWindow(iface); @@ -441,7 +432,6 @@ static const BaseRendererFuncTable BaseFuncTable = }; static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { - VideoRenderer_GetClassWindowStyles, VideoRenderer_GetDefaultRect, VideoRenderer_OnSize }; @@ -674,7 +664,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, FIXME("(%p/%p)->(%d): stub !!!\n", This, iface, FullScreenMode); if (FullScreenMode) { - This->baseControlWindow.baseWindow.WindowStyles = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); + This->saved_style = GetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE); ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_HIDE); SetParent(This->baseControlWindow.baseWindow.hWnd, 0); SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, WS_POPUP); @@ -684,7 +674,7 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface, } else { ShowWindow(This->baseControlWindow.baseWindow.hWnd, SW_HIDE); SetParent(This->baseControlWindow.baseWindow.hWnd, This->baseControlWindow.hwndOwner); - SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, This->baseControlWindow.baseWindow.WindowStyles); + SetWindowLongW(This->baseControlWindow.baseWindow.hWnd, GWL_STYLE, This->saved_style); GetClientRect(This->baseControlWindow.baseWindow.hWnd, &This->DestRect); SetWindowPos(This->baseControlWindow.baseWindow.hWnd,0,This->DestRect.left,This->DestRect.top,This->DestRect.right,This->DestRect.bottom,SWP_NOZORDER|SWP_SHOWWINDOW); This->WindowPos = This->DestRect; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index d3fdfb13a3..536703fbff 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -568,17 +568,6 @@ static const BaseRendererFuncTable BaseFuncTable = .renderer_pin_query_interface = vmr_pin_query_interface, }; -static LPWSTR WINAPI VMR9_GetClassWindowStyles(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx) -{ - static WCHAR classnameW[] = { 'I','V','M','R','9',' ','C','l','a','s','s', 0 }; - - *pClassStyles = 0; - *pWindowStyles = WS_SIZEBOX; - *pWindowStylesEx = 0; - - return classnameW; -} - static RECT WINAPI VMR9_GetDefaultRect(BaseWindow *This) { struct quartz_vmr* pVMR9 = impl_from_BaseWindow(This); @@ -604,7 +593,6 @@ static BOOL WINAPI VMR9_OnSize(BaseWindow *This, LONG Width, LONG Height) } static const BaseWindowFuncTable renderer_BaseWindowFuncTable = { - VMR9_GetClassWindowStyles, VMR9_GetDefaultRect, VMR9_OnSize, }; diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index fbf0edc78c..142336bc19 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -110,33 +110,24 @@ HRESULT WINAPI BaseWindow_Destroy(BaseWindow *This) HRESULT WINAPI BaseWindowImpl_PrepareWindow(BaseWindow *This) { - WNDCLASSW winclass; + static const WCHAR class_nameW[] = {'w','i','n','e','_','s','t','r','m','b','a','s','e','_','w','i','n','d','o','w',0}; static const WCHAR windownameW[] = { 'A','c','t','i','v','e','M','o','v','i','e',' ','W','i','n','d','o','w',0 }; + WNDCLASSW winclass = {0}; - This->pClassName = This->pFuncsTable->pfnGetClassWindowStyles(This, &This->ClassStyles, &This->WindowStyles, &This->WindowStylesEx); - - winclass.style = This->ClassStyles; winclass.lpfnWndProc = WndProcW; - winclass.cbClsExtra = 0; winclass.cbWndExtra = sizeof(BaseWindow*); winclass.hInstance = This->hInstance; - winclass.hIcon = NULL; - winclass.hCursor = NULL; winclass.hbrBackground = GetStockObject(BLACK_BRUSH); - winclass.lpszMenuName = NULL; - winclass.lpszClassName = This->pClassName; + winclass.lpszClassName = class_nameW; if (!RegisterClassW(&winclass) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) { ERR("Unable to register window class: %u\n", GetLastError()); return E_FAIL; } - This->hWnd = CreateWindowExW(This->WindowStylesEx, - This->pClassName, windownameW, - This->WindowStyles, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, - CW_USEDEFAULT, NULL, NULL, This->hInstance, - NULL); + This->hWnd = CreateWindowExW(0, class_nameW, windownameW, WS_SIZEBOX, + CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + NULL, NULL, This->hInstance, NULL); if (!This->hWnd) { @@ -305,7 +296,6 @@ HRESULT WINAPI BaseControlWindowImpl_put_WindowStyle(IVideoWindow *iface, LONG W SetWindowLongW(This->baseWindow.hWnd, GWL_STYLE, WindowStyle); SetWindowPos(This->baseWindow.hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); - This->baseWindow.WindowStyles = WindowStyle; return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 34a558ab8e..11397170ed 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -360,23 +360,17 @@ typedef struct tagBaseWindow LONG Width; LONG Height; HINSTANCE hInstance; - LPWSTR pClassName; - DWORD ClassStyles; - DWORD WindowStyles; - DWORD WindowStylesEx; HDC hDC; const struct BaseWindowFuncTable* pFuncsTable; } BaseWindow; -typedef LPWSTR (WINAPI *BaseWindow_GetClassWindowStyles)(BaseWindow *This, DWORD *pClassStyles, DWORD *pWindowStyles, DWORD *pWindowStylesEx); typedef RECT (WINAPI *BaseWindow_GetDefaultRect)(BaseWindow *This); typedef BOOL (WINAPI *BaseWindow_OnSize)(BaseWindow *This, LONG Height, LONG Width); typedef struct BaseWindowFuncTable { /* Required */ - BaseWindow_GetClassWindowStyles pfnGetClassWindowStyles; BaseWindow_GetDefaultRect pfnGetDefaultRect; /* Optional, WinProc Related */ BaseWindow_OnSize pfnOnSize;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
62
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 2019