January 2014 - Wine-commits

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

29 Jan '14

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

Austin English : kernel32: Quiet a noisy FIXME.
by Alexandre Julliard 29 Jan '14

29 Jan '14

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 : server: Fix generic access mapping for an event.
by Alexandre Julliard 29 Jan '14

29 Jan '14

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

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

29 Jan '14

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 : explorer: Check return of IShellFolder_GetDisplayNameOf (Coverity).
by Alexandre Julliard 29 Jan '14

29 Jan '14

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

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

29 Jan '14

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

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

29 Jan '14

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 : winspool: Use boolean return values in boolean functions.
by Alexandre Julliard 29 Jan '14

29 Jan '14

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 : version: Use boolean return value in boolean function.
by Alexandre Julliard 29 Jan '14

29 Jan '14

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

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

29 Jan '14

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