July 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32/tests: Remove a duplicate todo test.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 9d3adf687bcb4e0cdf403bdf3712c368e9805ffe URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d3adf687bcb4e0cdf403bdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 6 10:10:34 2018 +0200 user32/tests: Remove a duplicate todo test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cb918fa..80c699f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -774,37 +774,6 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { { 0 } }; /* ShowWindow(SW_SHOWMAXIMIZED) for a resized not visible popup window */ -static const struct message WmShowMaxPopupResizedSeq_todo[] = { - { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, - { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, - { WM_NCCALCSIZE, sent|wparam, TRUE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, - { HCBT_ACTIVATE, hook }, - { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam, 0, 0 }, - { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, - { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, - { WM_NCPAINT, sent|wparam|optional, 1 }, - { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, - { WM_ACTIVATEAPP, sent|wparam, 1 }, - { WM_NCACTIVATE, sent }, - { WM_ACTIVATE, sent|wparam, 1 }, - { HCBT_SETFOCUS, hook }, - { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, - { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, - { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, - { WM_GETTEXT, sent|optional }, - { WM_NCPAINT, sent|wparam|optional, 1 }, - { WM_ERASEBKGND, sent|optional }, - { WM_WINDOWPOSCHANGED, sent }, - /* WinNT4.0 sends WM_MOVE */ - { WM_MOVE, sent|defwinproc|optional }, - { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, - { 0 } -}; static const struct message WmShowMaxPopupResizedSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, @@ -827,7 +796,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_GETTEXT, sent|optional }, - { WM_NCPAINT, sent|optional }, /* We'll check WM_NCPAINT behaviour in another test */ + { WM_NCPAINT, sent|wparam|optional, 1 }, { WM_ERASEBKGND, sent|optional }, { WM_WINDOWPOSCHANGED, sent }, /* WinNT4.0 sends WM_MOVE */ @@ -4752,18 +4721,6 @@ static void test_showwindow(void) DestroyWindow(hwnd); flush_sequence(); - /* Test again, this time the NC_PAINT message */ - hwnd = CreateWindowExA(0, "TestWindowClass", "Test popup", WS_POPUP | WS_MAXIMIZE, - 100, 100, 200, 200, 0, 0, 0, NULL); - ok (hwnd != 0, "Failed to create popup window\n"); - SetWindowPos(hwnd, 0, 10, 10, 200, 200, SWP_NOZORDER | SWP_NOACTIVATE); - flush_sequence(); - ShowWindow(hwnd, SW_SHOWMAXIMIZED); - ok_sequence(WmShowMaxPopupResizedSeq_todo, - "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); - DestroyWindow(hwnd); - flush_sequence(); - /* Test 2: * 1. Create invisible maximized popup window. * 2. Show it maximized.

1 0

Michael Stefaniuc : dinput: Avoid ARRAY_SIZE-like macros.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 870a87677331a610ca8ada774adaf514eca9b311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=870a87677331a610ca8ada77… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:16 2018 +0200 dinput: Avoid ARRAY_SIZE-like macros. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/data_formats.c | 12 +++++------- dlls/dinput/dinput_main.c | 13 ++++++------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/data_formats.c b/dlls/dinput/data_formats.c index 5fac7b7..9c9f00f 100644 --- a/dlls/dinput/data_formats.c +++ b/dlls/dinput/data_formats.c @@ -25,8 +25,6 @@ #include "windef.h" #include "dinput.h" -#define numObjects(x) (sizeof(x) / sizeof(x[0])) - static const DIOBJECTDATAFORMAT dfDIJoystick[] = { { &GUID_XAxis,DIJOFS_X,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, { &GUID_YAxis,DIJOFS_Y,DIDFT_OPTIONAL|DIDFT_AXIS|DIDFT_ANYINSTANCE,0}, @@ -79,7 +77,7 @@ const DIDATAFORMAT c_dfDIJoystick = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE), - numObjects(dfDIJoystick), + ARRAY_SIZE(dfDIJoystick), (LPDIOBJECTDATAFORMAT)dfDIJoystick }; @@ -255,7 +253,7 @@ const DIDATAFORMAT c_dfDIJoystick2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE2), - numObjects(dfDIJoystick2), + ARRAY_SIZE(dfDIJoystick2), (LPDIOBJECTDATAFORMAT)dfDIJoystick2 }; @@ -274,7 +272,7 @@ const DIDATAFORMAT c_dfDIMouse = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE), - numObjects(dfDIMouse), + ARRAY_SIZE(dfDIMouse), (LPDIOBJECTDATAFORMAT)dfDIMouse }; @@ -297,7 +295,7 @@ const DIDATAFORMAT c_dfDIMouse2 = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, sizeof(DIMOUSESTATE2), - numObjects(dfDIMouse2), + ARRAY_SIZE(dfDIMouse2), (LPDIOBJECTDATAFORMAT)dfDIMouse2 }; @@ -565,6 +563,6 @@ const DIDATAFORMAT c_dfDIKeyboard = { sizeof(DIOBJECTDATAFORMAT), DIDF_RELAXIS, 256, - numObjects(dfDIKeyboard), + ARRAY_SIZE(dfDIKeyboard), (LPDIOBJECTDATAFORMAT)dfDIKeyboard }; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a592174..e4538a0 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -92,7 +92,6 @@ static const struct dinput_device *dinput_devices[] = &joystick_linux_device, &joystick_osx_device }; -#define NB_DINPUT_DEVICES (sizeof(dinput_devices)/sizeof(dinput_devices[0])) static HINSTANCE DINPUT_instance = NULL; @@ -409,7 +408,7 @@ static HRESULT WINAPI IDirectInputAImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -449,7 +448,7 @@ static HRESULT WINAPI IDirectInputWImpl_EnumDevices( if (!This->initialized) return DIERR_NOTINITIALIZED; - for (i = 0; i < NB_DINPUT_DEVICES; i++) { + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceW) continue; for (j = 0, r = S_OK; SUCCEEDED(r); j++) { devInstance.dwSize = sizeof(devInstance); @@ -750,7 +749,7 @@ static HRESULT create_device(IDirectInputImpl *This, REFGUID rguid, REFIID riid, return DIERR_NOTINITIALIZED; /* Loop on all the devices to see if anyone matches the given GUID */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT ret; @@ -1006,7 +1005,7 @@ static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics( } /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1107,7 +1106,7 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( didevi.dwSize = sizeof(didevi); /* Enumerate all the joysticks */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { HRESULT enumSuccess; @@ -1330,7 +1329,7 @@ static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UI #undef X /* Enumerate all joysticks in order */ - for (i = 0; i < NB_DINPUT_DEVICES; i++) + for (i = 0; i < ARRAY_SIZE(dinput_devices); i++) { if (!dinput_devices[i]->enum_deviceA) continue;

1 0

Zebediah Figura : winemac.drv: Wake up the display on user input.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 60edba563bbf95d15b7691fc9facbd97fce3f7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60edba563bbf95d15b7691fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 5 16:02:32 2018 -0500 winemac.drv: Wake up the display on user input. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index e49a445..6558824 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -23,6 +23,13 @@ #include "config.h" +#include <IOKit/pwr_mgt/IOPMLib.h> +#define GetCurrentThread Mac_GetCurrentThread +#define LoadResource Mac_LoadResource +#include <CoreServices/CoreServices.h> +#undef GetCurrentThread +#undef LoadResource + #include "macdrv.h" #include "winuser.h" #include "wine/unicode.h" @@ -1551,13 +1558,44 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) } +static WNDPROC desktop_orig_wndproc; + +#define WM_WINE_NOTIFY_ACTIVITY WM_USER + +static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case WM_WINE_NOTIFY_ACTIVITY: + { + /* This wakes from display sleep, but doesn't affect the screen saver. */ + static IOPMAssertionID assertion; + IOPMAssertionDeclareUserActivity(CFSTR("Wine user input"), kIOPMUserActiveLocal, &assertion); + + /* This prevents the screen saver, but doesn't wake from display sleep. */ + /* It's deprecated, but there's no better alternative. */ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + UpdateSystemActivity(UsrActivity); +#pragma clang diagnostic pop + break; + } + } + return desktop_orig_wndproc( hwnd, msg, wp, lp ); +} + /********************************************************************** * CreateWindow (MACDRV.@) */ BOOL CDECL macdrv_CreateWindow(HWND hwnd) { if (hwnd == GetDesktopWindow()) + { + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( GetDesktopWindow(), + GWLP_WNDPROC, (LONG_PTR)desktop_wndproc_wrapper ); + macdrv_init_clipboard(); + } return TRUE; }

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 0f5d528f70fe41a05a56110d26b933727b169f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f5d528f70fe41a05a56110d… Author: Kim Malmo <berencamlost(a)msn.com> Date: Fri Jul 6 17:09:20 2018 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 74 ++++++++++++++----------------------------------------------- 1 file changed, 17 insertions(+), 57 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index b5d496d..40775b0 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-06-09 23:18+0200\n" +"PO-Revision-Date: 2018-07-06 19:05+0200\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -3436,32 +3436,24 @@ msgid "Publishers..." msgstr "Utgivere..." #: inetcpl.rc:123 -#, fuzzy -#| msgid "LAN Connection" msgid "Connections" -msgstr "Lokal nettverksforbindelse" +msgstr "Nettverksforbindelser" #: inetcpl.rc:125 -#, fuzzy -#| msgid "&Local server" msgid "Proxy server" -msgstr "&Lokal tjener" +msgstr "Mellomtjener" #: inetcpl.rc:126 msgid "Use a proxy server" -msgstr "" +msgstr "Bruk en mellomtjener" #: inetcpl.rc:127 -#, fuzzy -#| msgid "Address" msgid "Address:" -msgstr "Adresse" +msgstr "Adresse:" #: inetcpl.rc:129 -#, fuzzy -#| msgid "No Ports" msgid "Port:" -msgstr "Ingen porter" +msgstr "Port:" #: inetcpl.rc:31 msgid "Internet Settings" @@ -4451,7 +4443,7 @@ msgstr "Katalognavnet er ugyldig.\n" #: winerror.mc:918 msgid "Extended attributes didn't fit.\n" -msgstr "De utvidede atributtene fikk ikke plass.\n" +msgstr "De utvidede egenskapene fikk ikke plass.\n" #: winerror.mc:923 msgid "Extended attribute file corrupt.\n" @@ -4467,7 +4459,7 @@ msgstr "Ugyldig referanse for utvidet atributt.\n" #: winerror.mc:938 msgid "Extended attributes not supported.\n" -msgstr "Utvidede atributter støttes ikke.\n" +msgstr "Utvidede egenskaper støttes ikke.\n" #: winerror.mc:943 msgid "Mutex not owned by caller.\n" @@ -6799,7 +6791,7 @@ msgstr "&Format:" #: msacm32.rc:47 msgid "&Attributes:" -msgstr "&Attributter:" +msgstr "&Egenskaper:" #: mshtml.rc:39 msgid "Hyperlink" @@ -8559,7 +8551,7 @@ msgstr "Dato opprettet:" #: shell32.rc:369 shell32.rc:406 msgid "Attributes:" -msgstr "Attributter:" +msgstr "Egenskaper:" #: shell32.rc:371 shell32.rc:408 winefile.rc:174 msgid "H&idden" @@ -8599,7 +8591,7 @@ msgstr "Endret" #: shell32.rc:141 winefile.rc:172 winefile.rc:114 msgid "Attributes" -msgstr "Attributter" +msgstr "Egenskaper" #: shell32.rc:143 msgid "Size available" @@ -9241,10 +9233,12 @@ msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" msgstr "" +"SSL-sertifikatdato som ble mottatt fra tjeneren er feil. Sertifikatet er " +"utgått.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "SSL-sertifikatets vertsnavn-felt er feil.\n" #: winmm.rc:32 msgid "The specified command was carried out." @@ -12020,7 +12014,7 @@ msgstr "Kopier program:" #: progman.rc:152 msgid "Program Group Attributes" -msgstr "Programgruppeattributter" +msgstr "Programgruppe-egenskaper" #: progman.rc:156 msgid "&Group file:" @@ -12028,7 +12022,7 @@ msgstr "&Gruppefil:" #: progman.rc:168 msgid "Program Attributes" -msgstr "Programattributter" +msgstr "Programegenskaper" #: progman.rc:172 progman.rc:212 msgid "&Command line:" @@ -15664,41 +15658,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -15762,6 +15721,7 @@ msgstr "" "[/A] Bare kopier filer som er markert som arkiv.\n" "[/M] Bare kopier filer som er markert som arkiv; fjern denne\n" "\tmerkingen etterpå.\n" +"[/K] Kopier filegenskaper, uten denne blir ikke egenskapene preservert.\n" "[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n" "\t\tden oppgitte datoen. Hvis ingen dato oppgis kopieres det bare hvis\n" "\t\tmålet er eldre enn kilden.\n"

1 0

Zebediah Figura : amstream: Use CBaseFilter::FindPin().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: fbbde62103c58eb6b41b89de44036dc5d6055d71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbbde62103c58eb6b41b89de… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:44 2018 +0200 amstream: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastreamfilter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 5abcb2f..8636718 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -159,9 +159,8 @@ static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface, static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, LPCWSTR id, IPin **pin) { - FIXME("(%p)->(%s,%p): Stub!\n", iface, debugstr_w(id), pin); - - return E_NOTIMPL; + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); + return BaseFilterImpl_FindPin(&This->filter.IBaseFilter_iface, id, pin); } static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter *iface, FILTER_INFO *info)

1 0

Zebediah Figura : strmbase: Use CBaseFilter::FindPin().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: d69a26b21b4bd0c1b95cd19f4885bb0cec821404 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d69a26b21b4bd0c1b95cd19f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 00:34:42 2018 +0200 strmbase: Use CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 9 --------- include/wine/strmbase.h | 1 - 2 files changed, 10 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 139c581..4d7069d 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -427,15 +427,6 @@ HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *s /** IBaseFilter implementation **/ -HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) -{ - TransformFilter *This = impl_from_IBaseFilter(iface); - - TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_w(Id), ppPin); - - return E_NOTIMPL; -} - static HRESULT WINAPI TransformFilter_InputPin_EndOfStream(IPin * iface) { BaseInputPin* This = impl_BaseInputPin_from_IPin(iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b07dfa2..83a9084 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -260,7 +260,6 @@ ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Pause(IBaseFilter * iface); HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart); -HRESULT WINAPI TransformFilterImpl_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin); HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm); HRESULT TransformFilter_Construct( const IBaseFilterVtbl *filterVtbl, LONG filter_size, const CLSID* pClsid, const TransformFilterFuncTable* pFuncsTable, IBaseFilter ** ppTransformFilter);

1 0

Zebediah Figura : strmbase: Avoid leaking pFilter in CBaseFilter::FindPin( ).
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: bf8637e42b07597e36baca8dc4baebd7aabd9960 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf8637e42b07597e36baca8d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jul 5 20:02:39 2018 +0200 strmbase: Avoid leaking pFilter in CBaseFilter::FindPin(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 7d33f80..9b14cf0 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -160,6 +160,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin IPin_Release(pin); return hr; } + if (info.pFilter) IBaseFilter_Release(info.pFilter); if (!strcmpW(id, info.achName)) {

1 0

Zebediah Figura : psapi/tests: Call GetPerformanceInfo() after NtQuerySystemInformation().
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: f01b9ab4c15061ba64a4748374c4ccd5d22788eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f01b9ab4c15061ba64a47483… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 6 00:05:39 2018 +0200 psapi/tests: Call GetPerformanceInfo() after NtQuerySystemInformation(). For some reason, this gives consistently much more accurate results. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 99d081f..e61cf02 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -238,11 +238,6 @@ static void test_GetPerformanceInfo(void) ok(!ret, "GetPerformanceInfo unexpectedly succeeded\n"); ok(GetLastError() == ERROR_BAD_LENGTH, "expected error=ERROR_BAD_LENGTH but got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = GetPerformanceInfo(&info, sizeof(info)); - ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); - ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); - if (!pNtQuerySystemInformation) win_skip("NtQuerySystemInformation not found, skipping tests\n"); else @@ -259,6 +254,10 @@ static void test_GetPerformanceInfo(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); ok(size >= sizeof(SYSTEM_PERFORMANCE_INFORMATION), "incorrect length %d\n", size); + SetLastError(0xdeadbeef); + ret = GetPerformanceInfo(&info, sizeof(info)); + ok(ret, "GetPerformanceInfo failed with %d\n", GetLastError()); + ok(info.cb == sizeof(PERFORMANCE_INFORMATION), "got %d\n", info.cb); ok(check_with_margin(info.CommitTotal, sys_performance_info->TotalCommittedPages, 288), "expected approximately %ld but got %d\n", info.CommitTotal, sys_performance_info->TotalCommittedPages);

1 0

Zebediah Figura : psapi/tests: Avoid using PROCESS_ALL_ACCESS.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 81242f747efc733afbf987f7bc7d168dd4fa2fc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81242f747efc733afbf987f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 6 00:05:37 2018 +0200 psapi/tests: Avoid using PROCESS_ALL_ACCESS. Since its value changed in Windows Vista. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index aba05274..3fec5d7 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -56,7 +56,7 @@ static BOOL init_func_ptrs(void) return TRUE; } -static HANDLE hpSR, hpQI, hpVR, hpQV, hpAA; +static HANDLE hpSR, hpQI, hpVR, hpQV; static const HANDLE hBad = (HANDLE)0xdeadbeef; static void test_EnumProcesses(void) @@ -726,10 +726,15 @@ static void test_ws_functions(void) { PSAPI_WS_WATCH_INFORMATION wswi[4096]; ULONG_PTR pages[4096]; + HANDLE ws_handle; char *addr; unsigned int i; BOOL ret; + ws_handle = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_SET_QUOTA | + PROCESS_SET_INFORMATION, FALSE, GetCurrentProcessId()); + ok(!!ws_handle, "got error %u\n", GetLastError()); + SetLastError(0xdeadbeef); EmptyWorkingSet(NULL); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); @@ -739,7 +744,7 @@ static void test_ws_functions(void) todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - ret = EmptyWorkingSet(hpAA); + ret = EmptyWorkingSet(ws_handle); ok(ret == 1, "failed with %d\n", GetLastError()); SetLastError( 0xdeadbeef ); @@ -755,7 +760,7 @@ static void test_ws_functions(void) ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() ); } SetLastError(0xdeadbeef); - ret = InitializeProcessForWsWatch(hpAA); + ret = InitializeProcessForWsWatch(ws_handle); ok(ret == 1, "failed with %d\n", GetLastError()); addr = VirtualAlloc(NULL, 1, MEM_COMMIT, PAGE_READWRITE); @@ -817,9 +822,8 @@ START_TEST(psapi_main) hpQI = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); hpVR = OpenProcess(PROCESS_VM_READ, FALSE, pid); hpQV = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); - hpAA = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid); - if(hpSR && hpQI && hpVR && hpQV && hpAA) + if(hpSR && hpQI && hpVR && hpQV) { test_EnumProcesses(); test_EnumProcessModules(); @@ -837,5 +841,4 @@ START_TEST(psapi_main) CloseHandle(hpQI); CloseHandle(hpVR); CloseHandle(hpQV); - CloseHandle(hpAA); }

1 0

Zebediah Figura : psapi/tests: Link statically to psapi.
by Alexandre Julliard July 6, 2018

July 6, 2018

Module: wine Branch: master Commit: 06deefdb4c390fc490c762c3ff1fcadd79e72cb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06deefdb4c390fc490c762c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 6 00:05:36 2018 +0200 psapi/tests: Link statically to psapi. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/Makefile.in | 2 +- dlls/psapi/tests/psapi_main.c | 220 ++++++++++++++++-------------------------- 2 files changed, 83 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06deefdb4c390fc490c7…

1 0