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

Dmitry Timoshkov : scrrun: Make IEnumVARIANT::Skip work after IEnumVARIANT ::Reset for a folder collection.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: eb2abf262ce8e354a8b775d7c33a296279808e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb2abf262ce8e354a8b775d7c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:35:52 2014 +0900 scrrun: Make IEnumVARIANT::Skip work after IEnumVARIANT::Reset for a folder collection. --- dlls/scrrun/filesystem.c | 77 ++++++++++++++++++++++++++-------------- dlls/scrrun/tests/filesystem.c | 3 +- 2 files changed, 51 insertions(+), 29 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f7664c3..7d09a82 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -467,6 +467,36 @@ static ULONG WINAPI foldercoll_enumvariant_Release(IEnumVARIANT *iface) return ref; } +static HANDLE start_enumeration(const WCHAR *path, WIN32_FIND_DATAW *data) +{ + static const WCHAR allW[] = {'*',0}; + WCHAR pathW[MAX_PATH]; + int len; + HANDLE handle; + + strcpyW(pathW, path); + len = strlenW(pathW); + if (pathW[len-1] != '\\') + strcatW(pathW, bsW); + strcatW(pathW, allW); + handle = FindFirstFileW(pathW, data); + if (handle == INVALID_HANDLE_VALUE) return 0; + + /* find first dir */ + while (1) + { + if (is_dir_data(data)) + break; + + if (!FindNextFileW(handle, data)) + { + FindClose(handle); + return 0; + } + } + return handle; +} + static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched) { struct enumvariant *This = impl_from_IEnumVARIANT(iface); @@ -481,32 +511,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel if (!handle) { - static const WCHAR allW[] = {'*',0}; - WCHAR pathW[MAX_PATH]; - BSTR parent = This->data.u.foldercoll.coll->path; - int len; - - strcpyW(pathW, parent); - len = SysStringLen(parent); - if (parent[len-1] != '\\') - strcatW(pathW, bsW); - strcatW(pathW, allW); - handle = FindFirstFileW(pathW, &data); - if (handle == INVALID_HANDLE_VALUE) - return S_FALSE; - - /* find first dir */ - while (1) - { - if (is_dir_data(&data)) - break; - else - if (!FindNextFileW(handle, &data)) - { - FindClose(handle); - return S_FALSE; - } - } + handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); + if (!handle) return S_FALSE; This->data.u.foldercoll.find = handle; } @@ -551,10 +557,27 @@ static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG cel TRACE("(%p)->(%d)\n", This, celt); - while (FindNextFileW(handle, &data) && celt) + if (!handle) + { + handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); + if (!handle) return S_FALSE; + + This->data.u.foldercoll.find = handle; + } + else + { + if (!FindNextFileW(handle, &data)) + return S_FALSE; + } + + do + { if (is_dir_data(&data)) --celt; + if (!celt) break; + } while (FindNextFileW(handle, &data)); + return celt ? S_FALSE : S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b0b527b..d6e094a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -929,9 +929,9 @@ todo_wine hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IEnumVARIANT_Skip(enumvar, 2); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IEnumVARIANT_Skip(enumvar, 0); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); VariantInit(&var2[0]); @@ -942,7 +942,6 @@ todo_wine ok(fetched == 0, "got %d\n", fetched); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 2, var2, &fetched); -todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); todo_wine ok(fetched == 1, "got %d\n", fetched);

1 0

Dmitry Timoshkov : scrrun/tests: Add more tests for IFolderCollection using a dedicated temporary directory.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 9c6deb2b72dfb44f272a88feb916d8a2ea3f702f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6deb2b72dfb44f272a88feb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:35:43 2014 +0900 scrrun/tests: Add more tests for IFolderCollection using a dedicated temporary directory. --- dlls/scrrun/tests/filesystem.c | 118 ++++++++++++++++++++++++++++++++-------- 1 file changed, 95 insertions(+), 23 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 6942a3d..7c0fe7b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -786,20 +786,26 @@ static void test_GetFolder(void) static void test_FolderCollection(void) { + static const WCHAR fooW[] = {'\\','f','o','o',0}; static const WCHAR aW[] = {'\\','a',0}; static const WCHAR bW[] = {'\\','b',0}; + static const WCHAR cW[] = {'\\','c',0}; IFolderCollection *folders; - WCHAR buffW[MAX_PATH], pathW[MAX_PATH], path2W[MAX_PATH]; + WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; IEnumVARIANT *enumvar, *clone; - LONG count, count2, ref, ref2; + LONG count, ref, ref2, i; IUnknown *unk, *unk2; IFolder *folder; ULONG fetched; - VARIANT var; + VARIANT var, var2[2]; HRESULT hr; BSTR str; + int found_a = 0, found_b = 0, found_c = 0; - GetTempPathW(MAX_PATH, buffW); + GetTempPathW(MAX_PATH, pathW); + GetTempFileNameW(pathW, fooW, 0, buffW); + DeleteFileW(buffW); + CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); hr = IFileSystem3_GetFolder(fs3, str, &folder); @@ -813,6 +819,10 @@ static void test_FolderCollection(void) lstrcatW(pathW, aW); CreateDirectoryW(pathW, NULL); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, bW); + CreateDirectoryW(pathW, NULL); + hr = IFolder_get_SubFolders(folder, &folders); ok(hr == S_OK, "got 0x%08x\n", hr); IFolder_Release(folder); @@ -820,17 +830,19 @@ static void test_FolderCollection(void) count = 0; hr = IFolderCollection_get_Count(folders, &count); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count > 0, "got %d\n", count); +todo_wine + ok(count == 2, "got %d\n", count); - lstrcpyW(path2W, buffW); - lstrcatW(path2W, bW); - CreateDirectoryW(path2W, NULL); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, cW); + CreateDirectoryW(pathW, NULL); /* every time property is requested it scans directory */ - count2 = 0; - hr = IFolderCollection_get_Count(folders, &count2); + count = 0; + hr = IFolderCollection_get_Count(folders, &count); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count2 > count, "got %d, %d\n", count, count2); +todo_wine + ok(count == 3, "got %d\n", count); hr = IFolderCollection_get__NewEnum(folders, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -870,29 +882,89 @@ static void test_FolderCollection(void) hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); + for (i = 0; i < 3; i++) + { + 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); + + str = NULL; + hr = IFolder_get_Name(folder, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (!lstrcmpW(str, aW + 1)) + found_a++; + else if (!lstrcmpW(str, bW + 1)) + found_b++; + else if (!lstrcmpW(str, cW + 1)) + found_c++; + SysFreeString(str); + + IFolder_Release(folder); + 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); + VariantInit(&var); - fetched = 0; + fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); - ok(V_VT(&var) == VT_DISPATCH, "got type %d\n", V_VT(&var)); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(fetched == 0, "got %d\n", fetched); - hr = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IFolder, (void**)&folder); + hr = IEnumVARIANT_Reset(enumvar); ok(hr == S_OK, "got 0x%08x\n", hr); - - str = NULL; - hr = IFolder_get_Name(folder, &str); + hr = IEnumVARIANT_Skip(enumvar, 2); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IEnumVARIANT_Skip(enumvar, 0); ok(hr == S_OK, "got 0x%08x\n", hr); - SysFreeString(str); - IFolder_Release(folder); - VariantClear(&var); + VariantInit(&var2[0]); + VariantInit(&var2[1]); + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 0, var2, &fetched); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fetched == 0, "got %d\n", fetched); + fetched = -1; + hr = IEnumVARIANT_Next(enumvar, 2, var2, &fetched); +todo_wine + ok(hr == S_FALSE, "got 0x%08x\n", hr); +todo_wine + ok(fetched == 1, "got %d\n", fetched); + ok(V_VT(&var2[0]) == VT_DISPATCH, "got type %d\n", V_VT(&var2[0])); + VariantClear(&var2[0]); + VariantClear(&var2[1]); IEnumVARIANT_Release(enumvar); IUnknown_Release(unk); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, aW); + RemoveDirectoryW(pathW); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, bW); + RemoveDirectoryW(pathW); + lstrcpyW(pathW, buffW); + lstrcatW(pathW, cW); RemoveDirectoryW(pathW); - RemoveDirectoryW(path2W); + RemoveDirectoryW(buffW); IFolderCollection_Release(folders); }

1 0

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

Jan. 29, 2014

Module: wine Branch: master Commit: fc678b4e1157afb3560059eb9b68914ddaccd785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc678b4e1157afb3560059eb9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 27 22:26:50 2014 +0100 version: Use boolean return value in boolean function. --- dlls/version/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index adb1a97..d5d8452 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -200,7 +200,7 @@ static BOOL find_ne_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) /* 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 )

1 0

Frédéric Delanoy : msxml3/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: fd096ddbc9b1e00d1eb32b01531b78071c8cc568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd096ddbc9b1e00d1eb32b015… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:38 2014 +0100 msxml3/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/msxml3/tests/domdoc.c | 21 +++------------------ dlls/msxml3/tests/httpreq.c | 19 ++----------------- 2 files changed, 5 insertions(+), 35 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9c698c2..e33db88 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -45,21 +45,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static int g_unexpectedcall, g_expectedcall; struct msxmlsupported_data_t @@ -102,7 +87,7 @@ static const char *debugstr_msxml_guid(REFIID riid) else if (IsEqualIID(&IID_IMXNamespaceManager, riid)) return "IMXNamespaceManager"; else - return debugstr_guid(riid); + return wine_dbgstr_guid(riid); } static void get_class_support_data(struct msxmlsupported_data_t *table) @@ -10839,7 +10824,7 @@ static void test_supporterrorinfo(void) if (hr == S_OK) { hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, *iid); - ok(hr == S_OK, "got 0x%08x for %s\n", hr, debugstr_guid(*iid)); + ok(hr == S_OK, "got 0x%08x for %s\n", hr, wine_dbgstr_guid(*iid)); IUnknown_Release(unk); } @@ -10875,7 +10860,7 @@ static void test_supporterrorinfo(void) if (hr == S_OK) { hr = ISupportErrorInfo_InterfaceSupportsErrorInfo(errorinfo, *iid); - ok(hr == S_OK, "%d: got 0x%08x for %s\n", ptr->type, hr, debugstr_guid(*iid)); + ok(hr == S_OK, "%d: got 0x%08x for %s\n", ptr->type, hr, wine_dbgstr_guid(*iid)); IUnknown_Release(unk); } diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index ad074de..d74b01a 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -87,21 +87,6 @@ DEFINE_EXPECT(htmldoc2_get_all); DEFINE_EXPECT(htmldoc2_get_url); DEFINE_EXPECT(collection_get_length); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static int g_unexpectedcall, g_expectedcall; static BSTR alloc_str_from_narrow(const char *str) @@ -1099,7 +1084,7 @@ static HRESULT WINAPI sp_QueryInterface(IServiceProvider *iface, REFIID riid, vo return S_OK; } - ok(0, "unexpected query interface: %s\n", debugstr_guid(riid)); + ok(0, "unexpected query interface: %s\n", wine_dbgstr_guid(riid)); return E_NOINTERFACE; } @@ -1158,7 +1143,7 @@ static HRESULT WINAPI sp_QueryService(IServiceProvider *iface, REFGUID service, { } else - ok(0, "unexpected request: sid %s, riid %s\n", debugstr_guid(service), debugstr_guid(riid)); + ok(0, "unexpected request: sid %s, riid %s\n", wine_dbgstr_guid(service), wine_dbgstr_guid(riid)); return E_NOTIMPL; }

1 0

Dmitry Timoshkov : scrrun: Make IFolderCollection:: get_Count use is_dir_data() helper.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: bd25ef789ce571b9bd99c20ef361578fb191ae09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd25ef789ce571b9bd99c20ef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:35:48 2014 +0900 scrrun: Make IFolderCollection::get_Count use is_dir_data() helper. --- dlls/scrrun/filesystem.c | 2 +- dlls/scrrun/tests/filesystem.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index bfb201c..f7664c3 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -913,7 +913,7 @@ static HRESULT WINAPI foldercoll_get_Count(IFolderCollection *iface, LONG *count do { - if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + if (is_dir_data(&data)) *count += 1; } while (FindNextFileW(handle, &data)); FindClose(handle); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 7c0fe7b..b0b527b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -830,7 +830,6 @@ static void test_FolderCollection(void) count = 0; hr = IFolderCollection_get_Count(folders, &count); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 2, "got %d\n", count); lstrcpyW(pathW, buffW); @@ -841,7 +840,6 @@ todo_wine count = 0; hr = IFolderCollection_get_Count(folders, &count); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine ok(count == 3, "got %d\n", count); hr = IFolderCollection_get__NewEnum(folders, NULL);

1 0

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

Jan. 29, 2014

Module: wine Branch: master Commit: 758ebb2121e9461df2b0c2ad10f229c746cad774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758ebb2121e9461df2b0c2ad1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:35:56 2014 +0900 scrrun: IEnumVARIANT::Skip shouldn't skip anything if asked number of folder elements is 0. --- dlls/scrrun/filesystem.c | 2 ++ dlls/scrrun/tests/filesystem.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 7d09a82..0292ab8 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -557,6 +557,8 @@ static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG cel TRACE("(%p)->(%d)\n", This, celt); + if (!celt) return S_OK; + if (!handle) { handle = start_enumeration(This->data.u.foldercoll.coll->path, &data); diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index d6e094a..b1de309 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -931,7 +931,6 @@ todo_wine hr = IEnumVARIANT_Skip(enumvar, 2); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IEnumVARIANT_Skip(enumvar, 0); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); VariantInit(&var2[0]);

1 0

Dmitry Timoshkov : scrrun: IEnumVARIANT:: Next should handle FindNextFileW failure.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 8f69ecdff748bbe13c17cb08f75ff99239238dfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f69ecdff748bbe13c17cb08f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:36:04 2014 +0900 scrrun: IEnumVARIANT::Next should handle FindNextFileW failure. --- dlls/scrrun/filesystem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index bc1cc79..1cf1ea1 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -519,7 +519,10 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel This->data.u.foldercoll.find = handle; } else - FindNextFileW(handle, &data); + { + if (!FindNextFileW(handle, &data)) + return S_FALSE; + } do {

1 0

Dmitry Timoshkov : scrrun: IEnumVARIANT:: Next should always return number of fetched folder elements.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: f5279ad37db5e6c1f5d900b08322868a972cbf70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5279ad37db5e6c1f5d900b08… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 28 11:36:07 2014 +0900 scrrun: IEnumVARIANT::Next should always return number of fetched folder elements. --- dlls/scrrun/filesystem.c | 5 +---- dlls/scrrun/tests/filesystem.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1cf1ea1..39b3241 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -545,13 +545,10 @@ static HRESULT WINAPI foldercoll_enumvariant_Next(IEnumVARIANT *iface, ULONG cel } } while (FindNextFileW(handle, &data)); - if (count < celt) - return S_FALSE; - if (fetched) *fetched = count; - return S_OK; + return (count < celt) ? S_FALSE : S_OK; } static HRESULT WINAPI foldercoll_enumvariant_Skip(IEnumVARIANT *iface, ULONG celt) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b1de309..02a29e5 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -942,7 +942,6 @@ todo_wine fetched = -1; hr = IEnumVARIANT_Next(enumvar, 2, var2, &fetched); ok(hr == S_FALSE, "got 0x%08x\n", hr); -todo_wine ok(fetched == 1, "got %d\n", fetched); ok(V_VT(&var2[0]) == VT_DISPATCH, "got type %d\n", V_VT(&var2[0])); VariantClear(&var2[0]);

1 0

Austin English : wtsapi32: Quiet a couple of noisy FIXME's.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 15d3c513b9f8136e256b31c9c23e9f2d406416c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15d3c513b9f8136e256b31c9c… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jan 27 15:43:00 2014 -0800 wtsapi32: Quiet a couple of noisy FIXME's. --- dlls/wtsapi32/wtsapi32.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 898b95d..314ec6b 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -120,7 +120,9 @@ BOOL WINAPI WTSEnumerateServersW(LPWSTR pDomainName, DWORD Reserved, DWORD Versi BOOL WINAPI WTSEnumerateSessionsA(HANDLE hServer, DWORD Reserved, DWORD Version, PWTS_SESSION_INFOA* ppSessionInfo, DWORD* pCount) { - FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, + static int once; + + if (!once++) FIXME("Stub %p 0x%08x 0x%08x %p %p\n", hServer, Reserved, Version, ppSessionInfo, pCount); if (!ppSessionInfo || !pCount) return FALSE; @@ -153,7 +155,9 @@ BOOL WINAPI WTSEnumerateSessionsW(HANDLE hServer, DWORD Reserved, DWORD Version, */ void WINAPI WTSFreeMemory(PVOID pMemory) { - FIXME("Stub %p\n", pMemory); + static int once; + + if (!once++) FIXME("Stub %p\n", pMemory); } /************************************************************

1 0

André Hentschel : explorer: Check return of IShellFolder_GetDisplayNameOf (Coverity).
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 9ab0eab9e9d8ed09f9c7ce1b7ae4b6107362ff23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab0eab9e9d8ed09f9c7ce1b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 19 20:55:39 2014 +0100 explorer: Check return of IShellFolder_GetDisplayNameOf (Coverity). --- programs/explorer/startmenu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/startmenu.c b/programs/explorer/startmenu.c index 745e590..e9c651b 100644 --- a/programs/explorer/startmenu.c +++ b/programs/explorer/startmenu.c @@ -151,8 +151,8 @@ static struct menu_item* add_shell_item(struct menu_item* parent, LPITEMIDLIST p { STRRET strret; - IShellFolder_GetDisplayNameOf(parent->folder, pidl, SHGDN_INFOLDER, &strret); - StrRetToStrW(&strret, NULL, &item->displayname); + if (SUCCEEDED(IShellFolder_GetDisplayNameOf(parent->folder, pidl, SHGDN_INFOLDER, &strret))) + StrRetToStrW(&strret, NULL, &item->displayname); flags = SFGAO_FOLDER; IShellFolder_GetAttributesOf(parent->folder, 1, (LPCITEMIDLIST*)&pidl, &flags);

1 0

Frédéric Delanoy : xmllite/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 8610af58fef5c73b3d9faf393a122152203eb580 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8610af58fef5c73b3d9faf393… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:49 2014 +0100 xmllite/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/xmllite/tests/reader.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 0888a7e..1f3d306 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -40,17 +40,6 @@ static HRESULT (WINAPI *pCreateXmlReaderInputWithEncodingName)(IUnknown *stream, BOOL hint, LPCWSTR base_uri, IXmlReaderInput **ppInput); -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} static WCHAR *a2w(const char *str) { @@ -169,7 +158,7 @@ static void ok_iids_(const input_iids_t *iids, const IID **expected, const IID * for (i = 0; i < size; i++) { ok_(__FILE__, line)(IsEqualGUID(&iids->iids[i], expected[i]) || (exp_broken ? broken(IsEqualGUID(&iids->iids[i], exp_broken[i])) : FALSE), - "Wrong IID(%d), got (%s)\n", i, debugstr_guid(&iids->iids[i])); + "Wrong IID(%d), got %s\n", i, wine_dbgstr_guid(&iids->iids[i])); } } #define ok_iids(got, exp, brk, todo) ok_iids_(got, exp, brk, todo, __LINE__)

1 0

Jacek Caban : atl80: Share registrar.c with atl100.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 62cc1da580250265a9083af4c21cfec1ae2f7419 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62cc1da580250265a9083af4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 29 10:25:10 2014 +0100 atl80: Share registrar.c with atl100. --- dlls/atl80/Makefile.in | 5 +++-- dlls/atl80/atl80.spec | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/atl80/Makefile.in b/dlls/atl80/Makefile.in index e05e197..cbd10ec 100644 --- a/dlls/atl80/Makefile.in +++ b/dlls/atl80/Makefile.in @@ -1,12 +1,13 @@ MODULE = atl80.dll IMPORTLIB = atl80 -IMPORTS = atl100 oleaut32 user32 ole32 gdi32 advapi32 uuid +IMPORTS = oleaut32 user32 ole32 gdi32 advapi32 uuid EXTRADEFS = -D_ATL_VER=_ATL_VER_80 PARENTSRC = ../atl100 C_SRCS = \ atl.c \ atl80.c \ - atl_ax.c + atl_ax.c \ + registrar.c RC_SRCS = atl80.rc diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 88d74ed..fb5fae8 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -9,7 +9,7 @@ 19 stdcall AtlRegisterTypeLib(ptr wstr) 20 stdcall AtlComModuleRevokeClassObjects(ptr) 22 stdcall AtlComModuleUnregisterServer(ptr long ptr) -23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) 24 stdcall AtlWaitWithMessageLoop(long) 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) @@ -45,7 +45,7 @@ 58 stdcall AtlModuleAddTermFunc(ptr ptr long) 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar +61 stdcall AtlCreateRegistrar(ptr) 62 stub AtlWinModuleRegisterClassExW 63 stub AtlWinModuleRegisterClassExA 64 stdcall AtlCallTermFunc(ptr)

1 0

Frédéric Delanoy : mscoree/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: cb71d30c360578aa065a05146bed9393d3f5074a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb71d30c360578aa065a05146… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:36 2014 +0100 mscoree/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/mscoree/tests/debugging.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/mscoree/tests/debugging.c b/dlls/mscoree/tests/debugging.c index bd961ed..2515793 100644 --- a/dlls/mscoree/tests/debugging.c +++ b/dlls/mscoree/tests/debugging.c @@ -36,21 +36,6 @@ static HRESULT (WINAPI *pCreateDebuggingInterfaceFromVersion)(int, LPCWSTR, IUnk const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; -static const char *debugstr_guid(REFIID riid) -{ - static char buf[50]; - - if(!riid) - return "(null)"; - - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], - riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], - riid->Data4[5], riid->Data4[6], riid->Data4[7]); - - return buf; -} - static HRESULT WINAPI ManagedCallback2_QueryInterface(ICorDebugManagedCallback2 *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ICorDebugManagedCallback2, riid)) @@ -59,7 +44,7 @@ static HRESULT WINAPI ManagedCallback2_QueryInterface(ICorDebugManagedCallback2 return S_OK; } - ok(0, "unexpected riid (%s)\n", debugstr_guid(riid)); + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; @@ -167,7 +152,7 @@ static HRESULT WINAPI ManagedCallback_QueryInterface(ICorDebugManagedCallback *i return S_OK; } - ok(0, "unexpected riid (%s)\n", debugstr_guid(riid)); + ok(0, "unexpected riid %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE; }

1 0

Michael Stefaniuc : dmstyle: Remove the redundant "IDirectMusicStyle8" from method names.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 377002161067cd687d51bf58103cf322667de0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=377002161067cd687d51bf581… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 28 23:15:03 2014 +0100 dmstyle: Remove the redundant "IDirectMusicStyle8" from method names. --- dlls/dmstyle/style.c | 87 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 30 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 7e27934..c1c2a7b 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -87,110 +87,137 @@ static const IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl = { }; /* IDirectMusicStyle8Impl IDirectMusicStyle8 part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_QueryInterface (LPDIRECTMUSICSTYLE8 iface, REFIID riid, LPVOID *ppobj) { +static HRESULT WINAPI IDirectMusicStyle8Impl_QueryInterface(IDirectMusicStyle8 *iface, REFIID riid, + void **ppobj) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); return IDirectMusicStyle8Impl_IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); } -static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef (LPDIRECTMUSICSTYLE8 iface) { +static ULONG WINAPI IDirectMusicStyle8Impl_AddRef(IDirectMusicStyle8 *iface) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); return IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); } -static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_Release (LPDIRECTMUSICSTYLE8 iface) { +static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); return IDirectMusicStyle8Impl_IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); } /* IDirectMusicStyle8Impl IDirectMusicStyle(8) part: */ -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetBand (LPDIRECTMUSICSTYLE8 iface, WCHAR* pwszName, IDirectMusicBand** ppBand) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetBand(IDirectMusicStyle8 *iface, WCHAR *pwszName, + IDirectMusicBand **ppBand) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppBand); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumBand (LPDIRECTMUSICSTYLE8 iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumBand(IDirectMusicStyle8 *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetDefaultBand (LPDIRECTMUSICSTYLE8 iface, IDirectMusicBand** ppBand) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultBand(IDirectMusicStyle8 *iface, + IDirectMusicBand **ppBand) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p): stub\n", This, ppBand); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumMotif (LPDIRECTMUSICSTYLE8 iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumMotif(IDirectMusicStyle8 *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetMotif (LPDIRECTMUSICSTYLE8 iface, WCHAR* pwszName, IDirectMusicSegment** ppSegment) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, WCHAR *pwszName, + IDirectMusicSegment **ppSegment) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppSegment); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetDefaultChordMap (LPDIRECTMUSICSTYLE8 iface, IDirectMusicChordMap** ppChordMap) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface, + IDirectMusicChordMap **ppChordMap) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p): stub\n", This, ppChordMap); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumChordMap (LPDIRECTMUSICSTYLE8 iface, DWORD dwIndex, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumChordMap(IDirectMusicStyle8 *iface, DWORD dwIndex, + WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %p): stub\n", This, dwIndex, pwszName); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetChordMap (LPDIRECTMUSICSTYLE8 iface, WCHAR* pwszName, IDirectMusicChordMap** ppChordMap) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetChordMap(IDirectMusicStyle8 *iface, WCHAR *pwszName, + IDirectMusicChordMap **ppChordMap) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p, %p): stub\n", This, pwszName, ppChordMap); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetTimeSignature (LPDIRECTMUSICSTYLE8 iface, DMUS_TIMESIGNATURE* pTimeSig) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetTimeSignature(IDirectMusicStyle8 *iface, + DMUS_TIMESIGNATURE *pTimeSig) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p): stub\n", This, pTimeSig); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetEmbellishmentLength (LPDIRECTMUSICSTYLE8 iface, DWORD dwType, DWORD dwLevel, DWORD* pdwMin, DWORD* pdwMax) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetEmbellishmentLength(IDirectMusicStyle8 *iface, + DWORD dwType, DWORD dwLevel, DWORD *pdwMin, DWORD *pdwMax) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %d, %p, %p): stub\n", This, dwType, dwLevel, pdwMin, pdwMax); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_GetTempo (LPDIRECTMUSICSTYLE8 iface, double* pTempo) { +static HRESULT WINAPI IDirectMusicStyle8Impl_GetTempo(IDirectMusicStyle8 *iface, double *pTempo) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %p): stub\n", This, pTempo); return S_OK; } -static HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumPattern (LPDIRECTMUSICSTYLE8 iface, DWORD dwIndex, DWORD dwPatternType, WCHAR* pwszName) { +static HRESULT WINAPI IDirectMusicStyle8Impl_EnumPattern(IDirectMusicStyle8 *iface, DWORD dwIndex, + DWORD dwPatternType, WCHAR *pwszName) +{ ICOM_THIS_MULTI(IDirectMusicStyle8Impl, StyleVtbl, iface); FIXME("(%p, %d, %d, %p): stub\n", This, dwIndex, dwPatternType, pwszName); return S_OK; } static const IDirectMusicStyle8Vtbl DirectMusicStyle8_Style_Vtbl = { - IDirectMusicStyle8Impl_IDirectMusicStyle8_QueryInterface, - IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef, - IDirectMusicStyle8Impl_IDirectMusicStyle8_Release, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetBand, - IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumBand, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetDefaultBand, - IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumMotif, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetMotif, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetDefaultChordMap, - IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumChordMap, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetChordMap, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetTimeSignature, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetEmbellishmentLength, - IDirectMusicStyle8Impl_IDirectMusicStyle8_GetTempo, - IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumPattern + IDirectMusicStyle8Impl_QueryInterface, + IDirectMusicStyle8Impl_AddRef, + IDirectMusicStyle8Impl_Release, + IDirectMusicStyle8Impl_GetBand, + IDirectMusicStyle8Impl_EnumBand, + IDirectMusicStyle8Impl_GetDefaultBand, + IDirectMusicStyle8Impl_EnumMotif, + IDirectMusicStyle8Impl_GetMotif, + IDirectMusicStyle8Impl_GetDefaultChordMap, + IDirectMusicStyle8Impl_EnumChordMap, + IDirectMusicStyle8Impl_GetChordMap, + IDirectMusicStyle8Impl_GetTimeSignature, + IDirectMusicStyle8Impl_GetEmbellishmentLength, + IDirectMusicStyle8Impl_GetTempo, + IDirectMusicStyle8Impl_EnumPattern }; /* IDirectMusicStyle8Impl IDirectMusicObject part: */

1 0

Frédéric Delanoy : urlmon/tests: Use common wine_dbgstr_guid implementation from test.h.
by Alexandre Julliard Jan. 29, 2014

Jan. 29, 2014

Module: wine Branch: master Commit: 781a0a009a2a39d28d72807c660b3990703e5424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=781a0a009a2a39d28d72807c6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Jan 25 15:24:46 2014 +0100 urlmon/tests: Use common wine_dbgstr_guid implementation from test.h. --- dlls/urlmon/tests/protocol.c | 24 +++++-------------- dlls/urlmon/tests/url.c | 54 ++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=781a0a009a2a39d28d728…

1 0