January 2014 - Wine-Commits

André Hentschel : ntdll: Use boolean return values in boolean functions.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: d7fb376db4067e25fb92ee4e8dad602808d01842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fb376db4067e25fb92ee4e8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:26:53 2014 +0100 ntdll: Use boolean return values in boolean functions. --- dlls/ntdll/sec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index b9eeccd..b733f77 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1145,13 +1145,13 @@ BOOLEAN WINAPI RtlFirstFreeAce( ace = (PACE_HEADER)(acl+1); for (i=0;i<acl->AceCount;i++) { if ((BYTE *)ace >= (BYTE *)acl + acl->AclSize) - return 0; + return FALSE; ace = (PACE_HEADER)(((BYTE*)ace)+ace->AceSize); } if ((BYTE *)ace >= (BYTE *)acl + acl->AclSize) - return 0; + return FALSE; *x = ace; - return 1; + return TRUE; } /************************************************************************** @@ -1349,7 +1349,7 @@ BOOLEAN WINAPI RtlValidAcl(PACL pAcl) __EXCEPT_PAGE_FAULT { WARN("(%p): invalid pointer!\n", pAcl); - return 0; + return FALSE; } __ENDTRY return ret;

1 0

Andrew Eikum : winmm: Clean up ACM stream after query.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 8695369dc5e0d6f2ff750ce00127f0b1c4eb6939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8695369dc5e0d6f2ff750ce00… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jan 17 14:45:43 2014 -0600 winmm: Clean up ACM stream after query. --- dlls/winmm/waveform.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 01a54b4..6b259ff 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -915,8 +915,11 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, return mr; /* yes it can. initialize the audioclient and return success */ - if(is_query) + if(is_query){ + acmStreamClose(device->acm_handle, 0); + device->acm_handle = NULL; return MMSYSERR_NOERROR; + } hr = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST,

1 0

André Hentschel : ver: Use boolean return values in boolean functions.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: b30032579f83ee1fc0f28756d2f120d3d1fcdbbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30032579f83ee1fc0f28756d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:26:52 2014 +0100 ver: Use boolean return values in boolean functions. --- dlls/ver.dll16/version.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ver.dll16/version.c b/dlls/ver.dll16/version.c index 5e6692f..5abe1c4 100644 --- a/dlls/ver.dll16/version.c +++ b/dlls/ver.dll16/version.c @@ -181,7 +181,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /* Read in NE header */ nehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); - if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return 0; + if ( sizeof(nehd) != LZRead( lzfd, (LPSTR)&nehd, sizeof(nehd) ) ) return FALSE; resTabSize = nehd.ne_restab - nehd.ne_rsrctab; if ( !resTabSize ) @@ -284,7 +284,7 @@ static BOOL find_pe_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, /* Read in PE header */ pehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); - if ( sizeof(pehd) != LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ) ) return 0; + if ( sizeof(pehd) != LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ) ) return FALSE; resDataDir = pehd.OptionalHeader.DataDirectory+IMAGE_DIRECTORY_ENTRY_RESOURCE; if ( !resDataDir->Size )

1 0

Austin English : kernel32: Quiet a noisy FIXME.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: ea765ae005183181099c29c49ec46cd324c6272d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea765ae005183181099c29c49… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 27 15:57:59 2014 -0800 kernel32: Quiet a noisy FIXME. --- dlls/kernel32/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d42d120..ca21e09 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3849,7 +3849,8 @@ HRESULT WINAPI RegisterApplicationRestart(PCWSTR pwzCommandLine, DWORD dwFlags) */ DWORD WINAPI WTSGetActiveConsoleSessionId(void) { - FIXME("stub\n"); + static int once; + if (!once++) FIXME("stub\n"); return 0; }

1 0

Dmitry Timoshkov : scrrun: IEnumVARIANT::Next shouldn' t fetch anything if asked number of folder elements is 0.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 6da1993129dcb706f4f38121a615e664659c5ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da1993129dcb706f4f38121a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:36:00 2014 +0900 scrrun: IEnumVARIANT::Next shouldn't fetch anything if asked number of folder elements is 0. --- dlls/scrrun/filesystem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 0292ab8..bc1cc79 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -509,6 +509,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel if (fetched) *fetched = 0; + if (!celt) return S_OK; + if (!handle) { handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); @@ -516,7 +518,7 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel This->data.u.foldercoll.find = handle; } - else if (celt) + else FindNextFileW(handle, &data); do

1 0

Dmitry Timoshkov : server: Fix generic access mapping for an event.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 5953851b8afc184e58727691d7dc737bd211a75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5953851b8afc184e58727691d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 16 18:32:52 2014 +0900 server: Fix generic access mapping for an event. --- dlls/advapi32/tests/security.c | 16 ++++++---------- server/event.c | 8 ++++---- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 2efe80e..6f98c70 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4600,14 +4600,14 @@ static void test_event_security(HANDLE token) STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS }; static const struct { - int todo, generic, mapped; + int generic, mapped; } map[] = { - { 0, 0, 0 }, - { 1, GENERIC_READ, STANDARD_RIGHTS_READ | EVENT_QUERY_STATE }, - { 1, GENERIC_WRITE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE }, - { 1, GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, - { 0, GENERIC_ALL, STANDARD_RIGHTS_ALL | EVENT_QUERY_STATE | EVENT_MODIFY_STATE } + { 0, 0 }, + { GENERIC_READ, STANDARD_RIGHTS_READ | EVENT_QUERY_STATE }, + { GENERIC_WRITE, STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE }, + { GENERIC_EXECUTE, STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE }, + { GENERIC_ALL, STANDARD_RIGHTS_ALL | EVENT_QUERY_STATE | EVENT_MODIFY_STATE } }; SetLastError(0xdeadbeef); @@ -4630,10 +4630,6 @@ static void test_event_security(HANDLE token) ok(ret, "DuplicateHandle error %d\n", GetLastError()); access = get_obj_access(dup); - if (map[i].todo) -todo_wine - ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); - else ok(access == map[i].mapped, "%d: expected %#x, got %#x\n", i, map[i].mapped, access); CloseHandle(dup); diff --git a/server/event.c b/server/event.c index b8515af..4d3c562 100644 --- a/server/event.c +++ b/server/event.c @@ -183,10 +183,10 @@ static void event_satisfied( struct object *obj, struct wait_queue_entry *entry static unsigned int event_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE | EVENT_QUERY_STATE; - if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; - if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | EVENT_ALL_ACCESS; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | EVENT_QUERY_STATE; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | EVENT_MODIFY_STATE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE; + if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | EVENT_QUERY_STATE | EVENT_MODIFY_STATE; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

André Hentschel : winspool: Use boolean return values in boolean functions.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 64601b7895f2e95a4b6b4f3e10e5fb83dd9b8a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64601b7895f2e95a4b6b4f3e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:26:48 2014 +0100 winspool: Use boolean return values in boolean functions. --- dlls/winspool.drv/info.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 8ddebb4..e554f94 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2855,7 +2855,7 @@ end: BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm) { FIXME("(%p,%d,%p): stub\n", hPrinter, Level, pForm); - return 1; + return TRUE; } /***************************************************************************** @@ -2864,7 +2864,7 @@ BOOL WINAPI AddFormA(HANDLE hPrinter, DWORD Level, LPBYTE pForm) BOOL WINAPI AddFormW(HANDLE hPrinter, DWORD Level, LPBYTE pForm) { FIXME("(%p,%d,%p): stub\n", hPrinter, Level, pForm); - return 1; + return TRUE; } /***************************************************************************** @@ -3357,7 +3357,7 @@ BOOL WINAPI ClosePrinter(HANDLE hPrinter) BOOL WINAPI DeleteFormA(HANDLE hPrinter, LPSTR pFormName) { FIXME("(%p,%s): stub\n", hPrinter, pFormName); - return 1; + return TRUE; } /***************************************************************************** @@ -3366,7 +3366,7 @@ BOOL WINAPI DeleteFormA(HANDLE hPrinter, LPSTR pFormName) BOOL WINAPI DeleteFormW(HANDLE hPrinter, LPWSTR pFormName) { FIXME("(%p,%s): stub\n", hPrinter, debugstr_w(pFormName)); - return 1; + return TRUE; } /*****************************************************************************

1 0

André Hentschel : imm32: Use boolean return value in boolean function.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: fd862ba74e288361b896a08e00786432177062c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd862ba74e288361b896a08e0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:26:45 2014 +0100 imm32: Use boolean return value in boolean function. --- dlls/imm32/imm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5991b8b..ccef19d 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1397,7 +1397,7 @@ BOOL WINAPI ImmGetCompositionWindow(HIMC hIMC, LPCOMPOSITIONFORM lpCompForm) return FALSE; *lpCompForm = data->IMC.cfCompForm; - return 1; + return TRUE; } /***********************************************************************

1 0

André Hentschel : ole32: Use boolean return value in boolean function.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: b1fed4e9f1c038e83a5ba4f2e9283e50f75c6cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1fed4e9f1c038e83a5ba4f2e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:26:43 2014 +0100 ole32: Use boolean return value in boolean function. --- dlls/ole32/stg_prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index cd87fbe..8c91a12 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2763,7 +2763,7 @@ BOOLEAN WINAPI StgConvertPropertyToVariant(const SERIALIZEDPROPERTYVALUE* prop, PropVariantInit(pvar); } - return 0; + return FALSE; } SERIALIZEDPROPERTYVALUE* WINAPI StgConvertVariantToProperty(const PROPVARIANT *pvar,

1 0

Dmitry Timoshkov : scrrun: IEnumVARIANT:: Next should stop once it has enumerated the asked number the folder elements.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 553078161dbddf7cca44837663ef6858a62dd760 URL: http://source.winehq.org/git/wine.git/?a=commit;h=553078161dbddf7cca4483766… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:36:11 2014 +0900 scrrun: IEnumVARIANT::Next should stop once it has enumerated the asked number the folder elements. --- dlls/scrrun/filesystem.c | 5 +++-- dlls/scrrun/tests/filesystem.c | 9 --------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 39b3241..630e7e3 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -526,8 +526,6 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel do { - if (count >= celt) break; - if (is_dir_data(&data)) { IFolder *folder; @@ -543,6 +541,9 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel V_DISPATCH(&var[count]) = (IDispatch*)folder; count++; } + + if (count >= celt) break; + } while (FindNextFileW(handle, &data)); if (fetched) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 02a29e5..c764ae7 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -885,17 +885,9 @@ static void test_FolderCollection(void) VariantInit(&var); fetched = 0; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); -if (i == 2) todo_wine -{ - ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); - ok(fetched == 1, "%d: got %d\n", i, fetched); - ok(V_VT(&var) == VT_DISPATCH, "%d: got type %d\n", i, V_VT(&var)); -} else -{ ok(hr == S_OK, "%d: got 0x%08x\n", i, hr); ok(fetched == 1, "%d: got %d\n", i, fetched); ok(V_VT(&var) == VT_DISPATCH, "%d: got type %d\n", i, V_VT(&var)); -} hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -915,7 +907,6 @@ if (i == 2) todo_wine VariantClear(&var); } -todo_wine ok(found_a == 1 && found_b == 1 && found_c == 1, "each folder should be found 1 time instead of %d/%d/%d\n", found_a, found_b, found_c);

1 0