November 2007 - Wine-commits

Lei Zhang : shell32: rename My Video to My Videos.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 70c75dcd0d7d39b67547e9700eec52dfd5dbc6d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c75dcd0d7d39b67547e9700… Author: Lei Zhang <thestig(a)google.com> Date: Mon Nov 12 11:57:33 2007 -0800 shell32: rename My Video to My Videos. --- dlls/shell32/shell32_En.rc | 4 ++-- dlls/shell32/shellpath.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc index 5941917..053a89a 100644 --- a/dlls/shell32/shell32_En.rc +++ b/dlls/shell32/shell32_En.rc @@ -225,7 +225,7 @@ STRINGTABLE DISCARDABLE IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "My Music" - IDS_MYVIDEO "My Video" + IDS_MYVIDEO "My Videos" IDS_DESKTOPDIRECTORY "Desktop" IDS_NETHOOD "NetHood" IDS_TEMPLATES "Templates" @@ -242,6 +242,6 @@ STRINGTABLE DISCARDABLE IDS_ADMINTOOLS "Start Menu\\Programs\\Administrative Tools" IDS_COMMON_MUSIC "Documents\\My Music" IDS_COMMON_PICTURES "Documents\\My Pictures" - IDS_COMMON_VIDEO "Documents\\My Video" + IDS_COMMON_VIDEO "Documents\\My Videos" IDS_CDBURN_AREA "Local Settings\\Application Data\\Microsoft\\CD Burning" } diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 241b4a7..9e832c1 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -784,7 +784,7 @@ static const WCHAR HistoryW[] = {'H','i','s','t','o','r','y','\0'}; static const WCHAR Local_AppDataW[] = {'L','o','c','a','l',' ','A','p','p','D','a','t','a','\0'}; static const WCHAR My_MusicW[] = {'M','y',' ','M','u','s','i','c','\0'}; static const WCHAR My_PicturesW[] = {'M','y',' ','P','i','c','t','u','r','e','s','\0'}; -static const WCHAR My_VideoW[] = {'M','y',' ','V','i','d','e','o','\0'}; +static const WCHAR My_VideoW[] = {'M','y',' ','V','i','d','e','o','s','\0'}; static const WCHAR NetHoodW[] = {'N','e','t','H','o','o','d','\0'}; static const WCHAR PersonalW[] = {'P','e','r','s','o','n','a','l','\0'}; static const WCHAR PrintHoodW[] = {'P','r','i','n','t','H','o','o','d','\0'};

1 0

Rob Shearman : ole32: Release the stream in COM_RevokeRegisteredClassObject .
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: d881005c4f688b361a0b1d41d0d96ce68e244b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d881005c4f688b361a0b1d41d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 12 20:10:41 2007 +0000 ole32: Release the stream in COM_RevokeRegisteredClassObject. --- dlls/ole32/compobj.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 154ebc5..bb10e9f 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1960,6 +1960,7 @@ static void COM_RevokeRegisteredClassObject(RegisteredClass *curClass) memset(&zero, 0, sizeof(zero)); IStream_Seek(curClass->pMarshaledData, zero, STREAM_SEEK_SET, NULL); CoReleaseMarshalData(curClass->pMarshaledData); + IStream_Release(curClass->pMarshaledData); } HeapFree(GetProcessHeap(), 0, curClass);

1 0

Rob Shearman : ole32: Fix a memory leak in the HGLOBAL stream tests by telling CreateStreamOnHGlobal to free the memory it allocates , as we don't free it ourselves in this test.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 8ee930150c547d848eaee793e01a0aab7dad9c08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ee930150c547d848eaee793e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 12 20:11:01 2007 +0000 ole32: Fix a memory leak in the HGLOBAL stream tests by telling CreateStreamOnHGlobal to free the memory it allocates, as we don't free it ourselves in this test. --- dlls/ole32/tests/hglobalstream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 6338dfe..eb98a18 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -209,7 +209,7 @@ static IStream Test_Stream = { &StreamVtbl }; static void test_copyto(void) { IStream *pStream, *pStream2; - HRESULT hr = CreateStreamOnHGlobal(NULL, FALSE, &pStream); + HRESULT hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); static const char szHello[] = "Hello"; ULARGE_INTEGER cb; static const char *methods_copyto[] =

1 0

Rob Shearman : ole32: Fix the condition in HMETAFILEPICT_UserFree to match that in METAFILEPICT_UserMarshal .
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: da0401860871b5b54d858d9aad8a915e66940c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0401860871b5b54d858d9aa… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 12 20:11:09 2007 +0000 ole32: Fix the condition in HMETAFILEPICT_UserFree to match that in METAFILEPICT_UserMarshal. Actually free the memory. --- dlls/ole32/usrmarshal.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index c1b5542..a1e1d89 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1420,14 +1420,16 @@ void __RPC_USER HMETAFILEPICT_UserFree(ULONG *pFlags, HMETAFILEPICT *phMfp) { TRACE("(%s, &%p)\n", debugstr_user_flags(pFlags), *phMfp); - if ((LOWORD(*pFlags) == MSHCTX_INPROC) && *phMfp) + if ((LOWORD(*pFlags) != MSHCTX_INPROC) && *phMfp) { METAFILEPICT *mfpict; mfpict = GlobalLock(*phMfp); /* FIXME: raise an exception if mfpict is NULL? */ - + HMETAFILE_UserFree(pFlags, &mfpict->hMF); GlobalUnlock(*phMfp); + + GlobalFree(*phMfp); } }

1 0

Rob Shearman : ole32: Use asynchronous I/ O for the named pipe server for local servers.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 24723913e08674d80bb41a13d38febbfa7bfd314 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24723913e08674d80bb41a13d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 12 20:13:41 2007 +0000 ole32: Use asynchronous I/O for the named pipe server for local servers. --- dlls/ole32/rpc.c | 97 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 68 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 9c3ab83..57570c1 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1712,7 +1712,7 @@ HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) while (tries++ < MAXTRIES) { TRACE("waiting for %s\n", debugstr_w(pipefn)); - + WaitNamedPipeW( pipefn, NMPWAIT_WAIT_FOREVER ); hPipe = CreateFileW(pipefn, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); if (hPipe == INVALID_HANDLE_VALUE) { @@ -1761,8 +1761,9 @@ struct local_server_params CLSID clsid; IStream *stream; HANDLE ready_event; + HANDLE stop_event; + HANDLE thread; BOOL multi_use; - HANDLE pipe; }; /* FIXME: should call to rpcss instead */ @@ -1780,40 +1781,44 @@ static DWORD WINAPI local_server_thread(LPVOID param) ULARGE_INTEGER newpos; ULONG res; BOOL multi_use = lsp->multi_use; + OVERLAPPED ovl; + HANDLE pipe_event; TRACE("Starting threader for %s.\n",debugstr_guid(&lsp->clsid)); + memset(&ovl, 0, sizeof(ovl)); get_localserver_pipe_name(pipefn, &lsp->clsid); - hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX, + hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - lsp->pipe = hPipe; SetEvent(lsp->ready_event); - HeapFree(GetProcessHeap(), 0, lsp); - if (hPipe == INVALID_HANDLE_VALUE) { FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); return 1; } + + ovl.hEvent = pipe_event = CreateEventW(NULL, FALSE, FALSE, NULL); while (1) { - if (!ConnectNamedPipe(hPipe,NULL)) + if (!ConnectNamedPipe(hPipe, &ovl)) { DWORD error = GetLastError(); + if (error == ERROR_IO_PENDING) + { + HANDLE handles[2] = { pipe_event, lsp->stop_event }; + DWORD ret; + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + if (ret != WAIT_OBJECT_0) + break; + } /* client already connected isn't an error */ - if (error != ERROR_PIPE_CONNECTED) + else if (error != ERROR_PIPE_CONNECTED) { - /* if error wasn't caused by RPC_StopLocalServer closing the - * pipe for us */ - if (error != ERROR_INVALID_HANDLE) - { - ERR("Failure during ConnectNamedPipe %u\n", error); - CloseHandle(hPipe); - } + ERR("ConnectNamedPipe failed with error %d\n", GetLastError()); break; } } @@ -1828,6 +1833,8 @@ static DWORD WINAPI local_server_thread(LPVOID param) hres = IStream_Seek(pStm,seekto,SEEK_SET,&newpos); if (hres) { FIXME("IStream_Seek failed, %x\n",hres); + CloseHandle(hPipe); + CloseHandle(pipe_event); return hres; } @@ -1837,11 +1844,14 @@ static DWORD WINAPI local_server_thread(LPVOID param) hres = IStream_Read(pStm,buffer,buflen,&res); if (hres) { FIXME("Stream Read failed, %x\n",hres); + CloseHandle(hPipe); + CloseHandle(pipe_event); HeapFree(GetProcessHeap(),0,buffer); return hres; } - WriteFile(hPipe,buffer,buflen,&res,NULL); + WriteFile(hPipe,buffer,buflen,&res,&ovl); + GetOverlappedResult(hPipe, &ovl, NULL, TRUE); HeapFree(GetProcessHeap(),0,buffer); FlushFileBuffers(hPipe); @@ -1852,11 +1862,11 @@ static DWORD WINAPI local_server_thread(LPVOID param) if (!multi_use) { TRACE("single use object, shutting down pipe %s\n", debugstr_w(pipefn)); - CloseHandle(hPipe); break; } } - IStream_Release(pStm); + CloseHandle(hPipe); + CloseHandle(pipe_event); return 0; } @@ -1864,30 +1874,59 @@ static DWORD WINAPI local_server_thread(LPVOID param) HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration) { DWORD tid; - HANDLE thread, ready_event; - struct local_server_params *lsp = HeapAlloc(GetProcessHeap(), 0, sizeof(*lsp)); + struct local_server_params *lsp; + + lsp = HeapAlloc(GetProcessHeap(), 0, sizeof(*lsp)); + if (!lsp) + return E_OUTOFMEMORY; lsp->clsid = *clsid; lsp->stream = stream; IStream_AddRef(stream); - lsp->ready_event = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + lsp->ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!lsp->ready_event) + { + HeapFree(GetProcessHeap(), 0, lsp); + return HRESULT_FROM_WIN32(GetLastError()); + } + lsp->stop_event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!lsp->stop_event) + { + CloseHandle(lsp->ready_event); + HeapFree(GetProcessHeap(), 0, lsp); + return HRESULT_FROM_WIN32(GetLastError()); + } lsp->multi_use = multi_use; - thread = CreateThread(NULL, 0, local_server_thread, lsp, 0, &tid); - if (!thread) + lsp->thread = CreateThread(NULL, 0, local_server_thread, lsp, 0, &tid); + if (!lsp->thread) + { + CloseHandle(lsp->ready_event); + CloseHandle(lsp->stop_event); + HeapFree(GetProcessHeap(), 0, lsp); return HRESULT_FROM_WIN32(GetLastError()); - CloseHandle(thread); + } - WaitForSingleObject(ready_event, INFINITE); - CloseHandle(ready_event); + WaitForSingleObject(lsp->ready_event, INFINITE); + CloseHandle(lsp->ready_event); + lsp->ready_event = NULL; - *registration = lsp->pipe; + *registration = lsp; return S_OK; } /* stops listening for a local server */ void RPC_StopLocalServer(void *registration) { - HANDLE pipe = registration; - CloseHandle(pipe); + struct local_server_params *lsp = registration; + + /* signal local_server_thread to stop */ + SetEvent(lsp->stop_event); + /* wait for it to exit */ + WaitForSingleObject(lsp->thread, INFINITE); + + IStream_Release(lsp->stream); + CloseHandle(lsp->stop_event); + CloseHandle(lsp->thread); + HeapFree(GetProcessHeap(), 0, lsp); }

1 0

Paul Vriens : dsound/tests: Better check to see if class is not available.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 52ccb1415586ef601b62b1d112e9293911e3ad07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ccb1415586ef601b62b1d11… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Mon Nov 12 19:32:13 2007 +0100 dsound/tests: Better check to see if class is not available. --- dlls/dsound/tests/propset.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 1777059..1c65574 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -289,7 +289,7 @@ static void propset_private_tests(void) (void **)(&pcf)); /* some early versions of Direct Sound do not have this */ - if (pcf==0) + if (rc==CLASS_E_CLASSNOTAVAILABLE) return; /* direct sound private does have an IKsPropertySet */

1 0

Jacek Caban : shlwapi: Fixed SHPackDispParamsV spec declaration.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 9771c7393aceac3b0519bd5b9fdc7acb1b802a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9771c7393aceac3b0519bd5b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 19:17:28 2007 +0100 shlwapi: Fixed SHPackDispParamsV spec declaration. --- dlls/shlwapi/shlwapi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 45de674..0e63e9f 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -278,7 +278,7 @@ 278 stdcall -noname SHCreateWorkerWindowW(long long long long long long) 279 stdcall -noname SHInvokeDefaultCommand(ptr ptr ptr) 280 stdcall -noname SHRegGetIntW(ptr wstr long) -281 stdcall -noname SHPackDispParamsV(ptr ptr ptr ptr) +281 stdcall -noname SHPackDispParamsV(ptr ptr long ptr) 282 varargs -noname SHPackDispParams(ptr ptr long) 283 stub -noname IConnectionPoint_InvokeWithCancel 284 stdcall -noname IConnectionPoint_SimpleInvoke(ptr long ptr)

1 0

Jacek Caban : hlink: Added HlinkGetSpecialReference implementation.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 93d87ca37fc83fe50d4bf9095e0299685df11817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d87ca37fc83fe50d4bf9095… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 12 19:17:45 2007 +0100 hlink: Added HlinkGetSpecialReference implementation. --- dlls/hlink/hlink_main.c | 53 ++++++++++++++++++++++++++++++++++++++++++++- dlls/hlink/tests/hlink.c | 31 ++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/hlink_main.c b/dlls/hlink/hlink_main.c index b0b407a..a786b62 100644 --- a/dlls/hlink/hlink_main.c +++ b/dlls/hlink/hlink_main.c @@ -278,8 +278,57 @@ HRESULT WINAPI HlinkIsShortcut(LPCWSTR pwzFileName) HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference) { - FIXME("(%u %p) stub\n", uReference, ppwzReference); - return E_NOTIMPL; + DWORD res, type, size = 100; + LPCWSTR value_name; + WCHAR *buf; + HKEY hkey; + + static const WCHAR start_pageW[] = {'S','t','a','r','t',' ','P','a','g','e',0}; + static const WCHAR search_pageW[] = {'S','e','a','r','c','h',' ','P','a','g','e',0}; + + static const WCHAR ie_main_keyW[] = + {'S','o','f','t','w','a','r','e', + '\\','M','i','c','r','o','s','o','f','t','\\', + 'I','n','t','e','r','n','e','t',' ','E','x','p','l','o','r','e','r', + '\\','M','a','i','n',0}; + + TRACE("(%u %p)\n", uReference, ppwzReference); + + *ppwzReference = NULL; + + switch(uReference) { + case HLSR_HOME: + value_name = start_pageW; + break; + case HLSR_SEARCHPAGE: + value_name = search_pageW; + break; + case HLSR_HISTORYFOLDER: + return E_NOTIMPL; + default: + return E_INVALIDARG; + } + + res = RegOpenKeyW(HKEY_CURRENT_USER, ie_main_keyW, &hkey); + if(res != ERROR_SUCCESS) { + WARN("Could not open key: %u\n", res); + return HRESULT_FROM_WIN32(res); + } + + buf = CoTaskMemAlloc(size); + res = RegQueryValueExW(hkey, value_name, NULL, &type, (PBYTE)buf, &size); + buf = CoTaskMemRealloc(buf, size); + if(res == ERROR_MORE_DATA) + res = RegQueryValueExW(hkey, value_name, NULL, &type, (PBYTE)buf, &size); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS) { + WARN("Could not query value %s: %u\n", debugstr_w(value_name), res); + CoTaskMemFree(buf); + return HRESULT_FROM_WIN32(res); + } + + *ppwzReference = buf; + return S_OK; } HRESULT WINAPI HlinkTranslateURL(LPCWSTR pwzURL, DWORD grfFlags, LPWSTR *ppwzTranslatedURL) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 172d7b7..4d3a3e2 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -316,6 +316,36 @@ static void test_persist(void) IHlink_Release(lnk); } +static void test_special_reference(void) +{ + LPWSTR ref; + HRESULT hres; + + hres = HlinkGetSpecialReference(HLSR_HOME, &ref); + todo_wine + ok(hres == S_OK, "HlinkGetSpecialReference(HLSR_HOME) failed: %08x\n", hres); + todo_wine + ok(ref != NULL, "ref == NULL\n"); + CoTaskMemFree(ref); + + hres = HlinkGetSpecialReference(HLSR_SEARCHPAGE, &ref); + todo_wine + ok(hres == S_OK, "HlinkGetSpecialReference(HLSR_SEARCHPAGE) failed: %08x\n", hres); + todo_wine + ok(ref != NULL, "ref == NULL\n"); + CoTaskMemFree(ref); + + ref = (void*)0xdeadbeef; + hres = HlinkGetSpecialReference(HLSR_HISTORYFOLDER, &ref); + ok(hres == E_NOTIMPL, "HlinkGetSpecialReference(HLSR_HISTORYFOLDER) failed: %08x\n", hres); + ok(ref == NULL, "ref=%p\n", ref); + + ref = (void*)0xdeadbeef; + hres = HlinkGetSpecialReference(4, &ref); + ok(hres == E_INVALIDARG, "HlinkGetSpecialReference(HLSR_HISTORYFOLDER) failed: %08x\n", hres); + ok(ref == NULL, "ref=%p\n", ref); +} + START_TEST(hlink) { CoInitialize(NULL); @@ -323,6 +353,7 @@ START_TEST(hlink) test_HlinkIsShortcut(); test_reference(); test_persist(); + test_special_reference(); CoUninitialize(); }

1 0

Rob Shearman : kernel32: Implement GetThreadId.
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 8296548bb51d27991960c3c79778e9570f7224c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8296548bb51d27991960c3c79… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 12 20:09:40 2007 +0000 kernel32: Implement GetThreadId. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/thread.c | 30 ++++++++++++++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2bf20c1..581383c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -629,6 +629,7 @@ @ stdcall GetTempPathA(long ptr) @ stdcall GetTempPathW(long ptr) @ stdcall GetThreadContext(long ptr) +@ stdcall GetThreadId(ptr) # @ stub GetThreadIOPendingFlag @ stdcall GetThreadLocale() @ stdcall GetThreadPriority(long) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index e96ca2d..ee89a82 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -518,6 +518,36 @@ BOOL WINAPI GetThreadTimes( return TRUE; } +/********************************************************************** + * GetThreadId [KERNEL32.@] + * + * Retrieve the identifier of a thread. + * + * PARAMS + * Thread [I] The thread to retrive the identifier of. + * + * RETURNS + * Success: Identifier of the target thread. + * Failure: 0 + */ +DWORD WINAPI GetThreadId(HANDLE Thread) +{ + THREAD_BASIC_INFORMATION tbi; + NTSTATUS status; + + TRACE("(%p)\n", Thread); + + status = NtQueryInformationThread(Thread, ThreadBasicInformation, &tbi, + sizeof(tbi), NULL); + if (status) + { + SetLastError( RtlNtStatusToDosError(status) ); + return 0; + } + + return HandleToULong(tbi.ClientId.UniqueThread); +} + /********************************************************************** * VWin32_BoostThreadGroup [KERNEL.535] diff --git a/include/winbase.h b/include/winbase.h index 65eb62d..2c97d4b 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1682,6 +1682,7 @@ WINBASEAPI UINT WINAPI GetTempFileNameW(LPCWSTR,LPCWSTR,UINT,LPWSTR); WINBASEAPI DWORD WINAPI GetTempPathA(DWORD,LPSTR); WINBASEAPI DWORD WINAPI GetTempPathW(DWORD,LPWSTR); #define GetTempPath WINELIB_NAME_AW(GetTempPath) +WINBASEAPI DWORD WINAPI GetThreadId(HANDLE); WINBASEAPI DWORD WINAPI GetTickCount(void); WINBASEAPI ULONGLONG WINAPI GetTickCount64(void); WINBASEAPI DWORD WINAPI GetTimeZoneInformation(LPTIME_ZONE_INFORMATION);

1 0

Rob Shearman : ole32: Fail before constructing an object in CreateStreamOnHGlobal to avoid a memory leak .
by Alexandre Julliard 13 Nov '07

13 Nov '07

Module: wine Branch: master Commit: 4edca3cf4d52e40b45e829bd817c98be5bd1831a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4edca3cf4d52e40b45e829bd8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Nov 12 20:10:32 2007 +0000 ole32: Fail before constructing an object in CreateStreamOnHGlobal to avoid a memory leak. --- dlls/ole32/hglobalstream.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index e6d2f73..2175214 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -721,6 +721,9 @@ HRESULT WINAPI CreateStreamOnHGlobal( { HGLOBALStreamImpl* newStream; + if (!ppstm) + return E_INVALIDARG; + newStream = HGLOBALStreamImpl_Construct(hGlobal, fDeleteOnRelease);

1 0