December 2013 - Wine-Commits

André Hentschel : include: Add bdaiface.idl.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 5430fafa8535bad4eb9bb6eabff0c5d1f8ea3565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5430fafa8535bad4eb9bb6eab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 29 23:36:49 2013 +0100 include: Add bdaiface.idl. --- .gitignore | 1 + include/Makefile.in | 3 + include/bdaiface.idl | 778 ++++++++++++++++++++++++++++++++++++++++++++++ include/bdaiface_enums.h | 89 ++++++ include/bdatypes.h | 264 ++++++++++++++++ 5 files changed, 1135 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5430fafa8535bad4eb9bb…

1 0

André Hentschel : propsys: Add stub for PSGetPropertyDescriptionListFromString.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: e8ac5892e847448761b63f56ae734f417dc63f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ac5892e847448761b63f56a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 29 23:36:46 2013 +0100 propsys: Add stub for PSGetPropertyDescriptionListFromString. --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 6 ++++++ include/propsys.idl | 1 + 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index 15386d7..a64d53a 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -81,7 +81,7 @@ @ stub PSGetNamedPropertyFromPropertyStorage @ stdcall PSGetPropertyDescription(ptr ptr ptr) @ stub PSGetPropertyDescriptionByName -@ stub PSGetPropertyDescriptionListFromString +@ stdcall PSGetPropertyDescriptionListFromString(ptr ptr ptr) @ stub PSGetPropertyFromPropertyStorage @ stub PSGetPropertyKeyFromName @ stub PSGetPropertySystem diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 8d05ad0..ad96aab 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -159,6 +159,12 @@ HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY propkey, REFIID riid, voi return E_NOTIMPL; } +HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR proplist, REFIID riid, void **ppv) +{ + FIXME("%s, %p, %p\n", debugstr_w(proplist), riid, ppv); + return E_NOTIMPL; +} + HRESULT WINAPI PSRefreshPropertySchema(void) { FIXME("\n"); diff --git a/include/propsys.idl b/include/propsys.idl index 993686d..0117090 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -802,6 +802,7 @@ cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") +cpp_quote("HRESULT WINAPI PSGetPropertyDescriptionListFromString(LPCWSTR,REFIID,void **);") cpp_quote("HRESULT WINAPI PSRefreshPropertySchema(void);") /* TODO: Add remainder of the C api here */

1 0

Frédéric Delanoy : winealsa.drv: Use BOOL type where appropriate.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 901fff3c07541e9f54892206ce8e8ec637c12a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901fff3c07541e9f54892206c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Nov 30 01:47:02 2013 +0100 winealsa.drv: Use BOOL type where appropriate. --- dlls/winealsa.drv/midi.c | 14 +++++++------- dlls/winealsa.drv/mmdevdrv.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 748fa79..4e74440 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -216,11 +216,11 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static int midi_warn = 1; +static BOOL midi_warn = TRUE; /************************************************************************** * midiOpenSeq [internal] */ -static int midiOpenSeq(int create_client) +static int midiOpenSeq(BOOL create_client) { if (numOpenMidiSeq == 0) { if (snd_seq_open(&midiSeq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0) @@ -229,7 +229,7 @@ static int midiOpenSeq(int create_client) { WARN("Error opening ALSA sequencer.\n"); } - midi_warn = 0; + midi_warn = FALSE; return -1; } @@ -474,7 +474,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_INVALFLAG; } - if (midiOpenSeq(1) < 0) { + if (midiOpenSeq(TRUE) < 0) { return MMSYSERR_ERROR; } @@ -732,7 +732,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) case MOD_FMSYNTH: case MOD_MIDIPORT: case MOD_SYNTH: - if (midiOpenSeq(1) < 0) { + if (midiOpenSeq(TRUE) < 0) { return MMSYSERR_ALLOCATED; } break; @@ -1221,7 +1221,7 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* * * Initializes the MIDI devices information variables */ -static LONG ALSA_MidiInit(void) +static BOOL ALSA_MidiInit(void) { static BOOL bInitDone = FALSE; snd_seq_client_info_t *cinfo; @@ -1234,7 +1234,7 @@ static LONG ALSA_MidiInit(void) bInitDone = TRUE; /* try to open device */ - if (midiOpenSeq(0) == -1) { + if (midiOpenSeq(FALSE) == -1) { return TRUE; } diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6e854e4..3cfad3a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -770,7 +770,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient int err; snd_pcm_stream_t stream; snd_config_t *lconf; - static int handle_underrun = 1; + static BOOL handle_underrun = TRUE; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -816,7 +816,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient if(err == -EINVAL){ ERR_(winediag)("PulseAudio \"%s\" %d without handle_underrun. Audio may hang." " Please upgrade to alsa_plugins >= 1.0.24\n", alsa_name, err); - handle_underrun = 0; + handle_underrun = FALSE; } }else err = -EINVAL;

1 0

Nikolay Sivov : ntdll: Allow NULL return length argument in NtAdjustPrivilegesToken().
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: fd65b0a1c3f5f981cc110ca9e6a0edb6323e1296 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd65b0a1c3f5f981cc110ca9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 2 09:38:09 2013 +0400 ntdll: Allow NULL return length argument in NtAdjustPrivilegesToken(). --- dlls/advapi32/security.c | 5 +++-- dlls/advapi32/tests/security.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/nt.c | 2 +- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 359b1e2..a77bad4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -611,8 +611,9 @@ AdjustTokenPrivileges( HANDLE TokenHandle, BOOL DisableAllPrivileges, { NTSTATUS status; - TRACE("\n"); - + TRACE("(%p %d %p %d %p %p)\n", TokenHandle, DisableAllPrivileges, NewState, BufferLength, + PreviousState, ReturnLength); + status = NtAdjustPrivilegesToken(TokenHandle, DisableAllPrivileges, NewState, BufferLength, PreviousState, ReturnLength); diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index fe31b5c..4de588f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4760,6 +4760,41 @@ static void test_default_dacl_owner_sid(void) CloseHandle( handle ); } +static void test_AdjustTokenPrivileges(void) +{ + TOKEN_PRIVILEGES tp, prev; + HANDLE token; + DWORD len; + LUID luid; + BOOL ret; + + if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) + return; + + if (!LookupPrivilegeValueA(NULL, SE_BACKUP_NAME, &luid)) + { + CloseHandle(token); + return; + } + + tp.PrivilegeCount = 1; + tp.Privileges[0].Luid = luid; + tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + + len = 0xdeadbeef; + ret = AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), NULL, &len); + ok(ret, "got %d\n", ret); + ok(len == 0xdeadbeef, "got length %d\n", len); + + /* revert */ + tp.PrivilegeCount = 1; + tp.Privileges[0].Luid = luid; + tp.Privileges[0].Attributes = 0; + AdjustTokenPrivileges(token, FALSE, &tp, sizeof(TOKEN_PRIVILEGES), &prev, NULL); + + CloseHandle(token); +} + START_TEST(security) { init(); @@ -4800,4 +4835,5 @@ START_TEST(security) test_CreateRestrictedToken(); test_TokenIntegrityLevel(); test_default_dacl_owner_sid(); + test_AdjustTokenPrivileges(); } diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index db8272f..ce648de 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -223,7 +223,7 @@ NTSTATUS WINAPI NtAdjustPrivilegesToken( ret = wine_server_call( req ); if (PreviousState) { - *ReturnLength = reply->len + FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ); + if (ReturnLength) *ReturnLength = reply->len + FIELD_OFFSET( TOKEN_PRIVILEGES, Privileges ); PreviousState->PrivilegeCount = reply->len / sizeof(LUID_AND_ATTRIBUTES); } }

1 0

André Hentschel : comctl32/tests: Make toolbar. c compile with -D__WINESRC__.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: e810a58494bd43e2344b5dfb65a0f47cf3ca2613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e810a58494bd43e2344b5dfb6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 2 00:17:51 2013 +0100 comctl32/tests: Make toolbar.c compile with -D__WINESRC__. --- dlls/comctl32/tests/toolbar.c | 393 +++++++++++++++++++++-------------------- 1 files changed, 198 insertions(+), 195 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e810a58494bd43e2344b5…

1 0

André Hentschel : comctl32/tests: Make rebar. c compile with -D__WINESRC__.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: af9073accbcee69fb67a7f5b73fb6be3ee7f1b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af9073accbcee69fb67a7f5b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 2 00:17:49 2013 +0100 comctl32/tests: Make rebar.c compile with -D__WINESRC__. --- dlls/comctl32/tests/rebar.c | 132 +++++++++++++++++++++--------------------- 1 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af9073accbcee69fb67a7…

1 0

Michael Stefaniuc : quartz: Cast to the correct type instead to void pointer.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: bacd9abbc0bb53993b4ee9b370bf33548f3e6780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bacd9abbc0bb53993b4ee9b37… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 1 22:37:30 2013 +0100 quartz: Cast to the correct type instead to void pointer. --- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/tests/avisplitter.c | 2 +- dlls/quartz/tests/dsoundrender.c | 2 +- dlls/quartz/tests/filtermapper.c | 2 +- dlls/quartz/tests/videorenderer.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index cca746b..720ba2d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5278,7 +5278,7 @@ static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceC IMediaEventSink *pEventSink; HRESULT eshr; - eshr = IMediaFilter_QueryInterface(iface, &IID_IMediaEventSink, (LPVOID)&pEventSink); + eshr = IMediaFilter_QueryInterface(iface, &IID_IMediaEventSink, (void **)&pEventSink); if (SUCCEEDED(eshr)) { IMediaEventSink_Notify(pEventSink, EC_CLOCK_CHANGED, 0, 0); diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index f9da610..2fa7f91 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -128,7 +128,7 @@ static void test_basefilter(void) ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, (void *)&base); + IUnknown_QueryInterface(pAviSplitter, &IID_IBaseFilter, (void **)&base); if (base == NULL) { /* test_query_interface handles this case */ diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 745a32f..c613423 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -179,7 +179,7 @@ static void test_basefilter(void) ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pDSRender, &IID_IBaseFilter, (void *)&base); + IUnknown_QueryInterface(pDSRender, &IID_IBaseFilter, (void **)&base); if (base == NULL) { /* test_query_interface handles this case */ diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index b52d17e..a67df1d 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -233,7 +233,7 @@ static void test_legacy_filter_registration(void) ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); if (FAILED(hr)) goto out; - hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterMapper, (LPVOID)&pMapper); + hr = IFilterMapper2_QueryInterface(pMapper2, &IID_IFilterMapper, (void **)&pMapper); ok(hr == S_OK, "IFilterMapper2_QueryInterface failed with %x\n", hr); if (FAILED(hr)) goto out; diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index ce1ac29..35e6f10 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -110,7 +110,7 @@ static void test_basefilter(void) ULONG ref; HRESULT hr; - IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void *)&base); + IUnknown_QueryInterface(pVideoRenderer, &IID_IBaseFilter, (void **)&base); if (base == NULL) { /* test_query_interface handles this case */

1 0

Michael Stefaniuc : comctl32/tests: Make monthcal. c compile with -D__WINESRC__.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 4b59a4266a6c04f28594dff7667149e851986d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b59a4266a6c04f28594dff76… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sun Dec 1 22:33:53 2013 +0100 comctl32/tests: Make monthcal.c compile with -D__WINESRC__. --- dlls/comctl32/tests/monthcal.c | 415 ++++++++++++++++++++-------------------- 1 files changed, 209 insertions(+), 206 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b59a4266a6c04f28594d…

1 0

Stefan Leichter : dbghelp: Add a null check for optional output parameter for function SymFromAddr.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 89832cde4eb2e8d2dc9570cf4840fcaff19b8429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89832cde4eb2e8d2dc9570cf4… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Dec 1 22:07:20 2013 +0100 dbghelp: Add a null check for optional output parameter for function SymFromAddr. --- dlls/dbghelp/symbol.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e6401a9..8c482c7 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1229,7 +1229,8 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, if ((sym = symt_find_nearest(pair.effective, Address)) == NULL) return FALSE; symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); - *Displacement = Address - Symbol->Address; + if (Displacement) + *Displacement = Address - Symbol->Address; return TRUE; }

1 0

Francois Gouget : msvcrt: Standardize on using a comparison operator to ensure we return 0 or 1.
by Alexandre Julliard Dec. 2, 2013

Dec. 2, 2013

Module: wine Branch: master Commit: 0b5b54e9f4b0b5d11e463000d92db7a981290f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5b54e9f4b0b5d11e463000d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Dec 1 16:26:14 2013 +0100 msvcrt: Standardize on using a comparison operator to ensure we return 0 or 1. --- dlls/msvcrt/math.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4ec225c..6bcc2b7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1217,7 +1217,7 @@ double CDECL MSVCRT__copysign(double num, double sign) */ int CDECL MSVCRT__finite(double num) { - return (isfinite(num)?1:0); /* See comment for _isnan() */ + return isfinite(num) != 0; /* See comment for _isnan() */ } /********************************************************************* @@ -1246,7 +1246,7 @@ INT CDECL MSVCRT__isnan(double num) /* Some implementations return -1 for true(glibc), msvcrt/crtdll return 1. * Do the same, as the result may be used in calculations */ - return isnan(num) ? 1 : 0; + return isnan(num) != 0; } /*********************************************************************

1 0