April 2013 - Wine-Commits - list.winehq.org

Hans Leidekker : wininet: Fix a request string leak.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 578a1a6b26e62c1dcbda7cab5f3ea8815201c49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=578a1a6b26e62c1dcbda7cab5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 22 11:02:09 2013 +0200 wininet: Fix a request string leak. --- dlls/wininet/http.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 18279da..c28335a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4924,6 +4924,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->appInfo->proxyPassword, NULL)) { + heap_free(requestString); if(!drain_content(request, TRUE)) { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE);

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMMESH.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: cbf3ade4b933f4594ce17e9da803ed9bb3cdfba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf3ade4b933f4594ce17e9da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 22 15:18:46 2013 +0200 d3drm: Avoid LPDIRECT3DRMMESH. --- dlls/d3drm/d3drm.c | 24 +++++++++++------------- dlls/d3drm/meshbuilder.c | 26 +++++++++----------------- dlls/d3drm/tests/d3drm.c | 16 ++++++++-------- include/d3drm.h | 6 +++--- include/d3drmobj.h | 14 +++++++------- 5 files changed, 38 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbf3ade4b933f4594ce17…

1 0

Nikolay Sivov : msdaps: Added some proxy/ stubs for IDBDataSourceAdmin methods.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 0d623c784cdf673c4e1afa15ef775be50ea0bce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d623c784cdf673c4e1afa15e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 14:11:43 2013 +0400 msdaps: Added some proxy/stubs for IDBDataSourceAdmin methods. --- dlls/msdaps/usrmarshal.c | 66 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 52 insertions(+), 14 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 690077d..92bd802 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -321,14 +321,29 @@ HRESULT __RPC_STUB IDBDataSourceAdmin_CreateDataSource_Stub(IDBDataSourceAdmin* HRESULT CALLBACK IDBDataSourceAdmin_DestroyDataSource_Proxy(IDBDataSourceAdmin* This) { - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + IErrorInfo *error; + HRESULT hr; + + TRACE("(%p)\n", This); + hr = IDBDataSourceAdmin_RemoteDestroyDataSource_Proxy(This, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + return hr; } -HRESULT __RPC_STUB IDBDataSourceAdmin_DestroyDataSource_Stub(IDBDataSourceAdmin* This, IErrorInfo **ppErrorInfoRem) +HRESULT __RPC_STUB IDBDataSourceAdmin_DestroyDataSource_Stub(IDBDataSourceAdmin* This, IErrorInfo **error) { - FIXME("(%p, %p): stub\n", This, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p, %p)\n", This, error); + *error = NULL; + hr = IDBDataSourceAdmin_DestroyDataSource(This); + if(FAILED(hr)) GetErrorInfo(0, error); + + return hr; } HRESULT CALLBACK IDBDataSourceAdmin_GetCreationProperties_Proxy(IDBDataSourceAdmin* This, ULONG cPropertyIDSets, @@ -344,24 +359,47 @@ HRESULT __RPC_STUB IDBDataSourceAdmin_GetCreationProperties_Stub(IDBDataSourceAd const DBPROPIDSET *rgPropertyIDSets, ULONG *pcPropertyInfoSets, DBPROPINFOSET **prgPropertyInfoSets, DBCOUNTITEM *pcOffsets, DBBYTEOFFSET **prgDescOffsets, ULONG *pcbDescBuffer, - OLECHAR **ppDescBuffer, IErrorInfo **ppErrorInfoRem) + OLECHAR **ppDescBuffer, IErrorInfo **error) { - FIXME("(%p, %d, %p, %p, %p, %p, %p, %p, %p, %p): stub\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, - prgPropertyInfoSets, pcOffsets, prgDescOffsets, pcbDescBuffer, ppDescBuffer, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p, %d, %p, %p, %p, %p, %p, %p, %p, %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, pcOffsets, prgDescOffsets, pcbDescBuffer, ppDescBuffer, error); + *error = NULL; + hr = IDBDataSourceAdmin_GetCreationProperties(This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + prgPropertyInfoSets, ppDescBuffer); + if(FAILED(hr)) GetErrorInfo(0, error); + + return hr; } HRESULT CALLBACK IDBDataSourceAdmin_ModifyDataSource_Proxy(IDBDataSourceAdmin* This, ULONG cPropertySets, DBPROPSET rgPropertySets[]) { - FIXME("(%p, %d, %p): stub\n", This, cPropertySets, rgPropertySets); - return E_NOTIMPL; + IErrorInfo *error; + HRESULT hr; + + TRACE("(%p, %d, %p)\n", This, cPropertySets, rgPropertySets); + hr = IDBDataSourceAdmin_RemoteModifyDataSource_Proxy(This, cPropertySets, rgPropertySets, &error); + if(error) + { + SetErrorInfo(0, error); + IErrorInfo_Release(error); + } + + return hr; } HRESULT __RPC_STUB IDBDataSourceAdmin_ModifyDataSource_Stub(IDBDataSourceAdmin* This, ULONG cPropertySets, - DBPROPSET *rgPropertySets, IErrorInfo **ppErrorInfoRem) + DBPROPSET *rgPropertySets, IErrorInfo **error) { - FIXME("(%p, %d, %p, %p): stub\n", This, cPropertySets, rgPropertySets, ppErrorInfoRem); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p, %d, %p, %p)\n", This, cPropertySets, rgPropertySets, error); + *error = NULL; + hr = IDBDataSourceAdmin_ModifyDataSource(This, cPropertySets, rgPropertySets); + if(FAILED(hr)) GetErrorInfo(0, error); + + return hr; } HRESULT CALLBACK ISessionProperties_GetProperties_Proxy(ISessionProperties* This, ULONG cPropertyIDSets,

1 0

Jacek Caban : mshtml: Clean up OleCommandTarget_Exec.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: f359360228e3ed62e63853eddd5a2da8e0429196 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f359360228e3ed62e63853edd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 22 16:19:57 2013 +0200 mshtml: Clean up OleCommandTarget_Exec. --- dlls/mshtml/tests/htmldoc.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index ae8af82..de003f1 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2733,12 +2733,9 @@ static void test_save_history(IUnknown *unk) static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - if((!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer)) - && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup) - || (nCmdID != 63 && (!is_refresh || nCmdID != 37)))) + if(!pguidCmdGroup) { test_readyState(NULL); - if(!pguidCmdGroup) { switch(nCmdID) { case OLECMDID_SETPROGRESSMAX: CHECK_EXPECT2(Exec_SETPROGRESSMAX); @@ -2825,6 +2822,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { + if(nCmdID != 63 && (!is_refresh || nCmdID != 37)) + test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -2938,6 +2937,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -2955,6 +2955,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID switch(nCmdID) { case DOCHOST_DOCCANNAVIGATE: CHECK_EXPECT(Exec_DOCCANNAVIGATE); + + test_readyState(NULL); + ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); ok(V_VT(pvaIn) == VT_UNKNOWN, "V_VT(pvaIn) != VT_UNKNOWN\n"); @@ -2967,6 +2970,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID VARIANT var; HRESULT hres; + test_readyState(NULL); + ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut != NULL || broken(!pvaOut), "pvaOut != NULL\n"); ok(V_VT(pvaIn) == VT_ARRAY, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); @@ -3018,6 +3023,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { + test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -3047,6 +3053,8 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID } if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) { + test_readyState(NULL); + switch (nCmdID) { case OLECMDID_PAGEACTIONBLOCKED: /* win2k3 */ SET_EXPECT(SetStatusText);

1 0

Ken Thomases : winemac: Set up and drain autorelease pool in LogErrorv() so it's safe to call from background threads.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 72be23270ed36bc9508e48871891c068b879cef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72be23270ed36bc9508e48871… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Apr 21 21:31:28 2013 -0500 winemac: Set up and drain autorelease pool in LogErrorv() so it's safe to call from background threads. --- dlls/winemac.drv/cocoa_app.m | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 1ef453f..204734c 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1410,9 +1410,13 @@ void LogError(const char* func, NSString* format, ...) */ void LogErrorv(const char* func, NSString* format, va_list args) { + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + NSString* message = [[NSString alloc] initWithFormat:format arguments:args]; fprintf(stderr, "err:%s:%s", func, [message UTF8String]); [message release]; + + [pool release]; } /***********************************************************************

1 0

Marcus Meissner : dplayx: Remove unnecessary assigment (Coverity).
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: 03f519db3eda52336149947e40274072cbf973ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f519db3eda52336149947e4… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 19 22:47:58 2013 +0200 dplayx: Remove unnecessary assigment (Coverity). --- dlls/dplayx/dplay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 30a2ee3..4529c5e 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -1857,7 +1857,7 @@ static HRESULT WINAPI IDirectPlay4Impl_DeletePlayerFromGroup( IDirectPlay4 *ifac return DPERR_INVALIDGROUP; /* Find the player */ - if ( ( plist = DP_FindPlayer( This, player ) ) == NULL ) + if ( DP_FindPlayer( This, player ) == NULL ) return DPERR_INVALIDPLAYER; /* Remove the player shortcut from the group */

1 0

Marcus Meissner : wininet: Added missing return (Coverity).
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: d762b284d8e26254668b1577b7112780e8ce74ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=d762b284d8e26254668b1577b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Apr 19 22:25:43 2013 +0200 wininet: Added missing return (Coverity). --- dlls/wininet/urlcache.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 7f58a69..34337c6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -3098,6 +3098,7 @@ BOOL WINAPI CommitUrlCacheEntryW(LPCWSTR lpszUrlName, LPCWSTR lpszLocalFileName, heap_free(url); heap_free(header_info); heap_free(file_ext); + return FALSE; } ret = urlcache_entry_commit(url, lpszLocalFileName, ExpireTime, LastModifiedTime,

1 0

Gurmail Bassi : joy.cpl: Fixed incorrect variable reference.
by Alexandre Julliard April 22, 2013

April 22, 2013

Module: wine Branch: master Commit: fbed1f7a804353455b545b6320699921affa75a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbed1f7a804353455b545b632… Author: Gurmail Bassi <Gurmail.Bassi(a)mottmac.com> Date: Sat Apr 20 10:23:42 2013 +0100 joy.cpl: Fixed incorrect variable reference. --- dlls/joy.cpl/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 857cb69..8cb1824 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -414,7 +414,7 @@ static DWORD WINAPI input_thread(void *param) axes_pos[2][1] = state.lRz; /* Set pov values */ - for (j = 0; i < sizeof(pov_val)/sizeof(pov_val[0]); j++) + for (j = 0; j < sizeof(pov_val)/sizeof(pov_val[0]); j++) { if (state.rgdwPOV[0] == pov_val[j]) {

1 0

Jactry Zeng : msvcrt: Added _wfindfirst32 implementation.
by Alexandre Julliard April 19, 2013

April 19, 2013

Module: wine Branch: master Commit: 60faef8e3cfa9d8418a7e93bc732c079efd1e174 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60faef8e3cfa9d8418a7e93bc… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Fri Apr 19 19:18:48 2013 +0800 msvcrt: Added _wfindfirst32 implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 6 files changed, 46 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index de346c4..197a414 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1534,7 +1534,7 @@ @ cdecl _wexecvp(wstr ptr) msvcrt._wexecvp @ cdecl _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe @ cdecl _wfdopen(long wstr) msvcrt._wfdopen -@ stub _wfindfirst32 +@ cdecl _wfindfirst32(wstr ptr) msvcrt._wfindfirst32 @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 40f1470..d00f1a9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1897,7 +1897,7 @@ @ cdecl _wexecvp(wstr ptr) msvcrt._wexecvp @ cdecl _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe @ cdecl _wfdopen(long wstr) msvcrt._wfdopen -@ stub _wfindfirst32 +@ cdecl _wfindfirst32(wstr ptr) msvcrt._wfindfirst32 @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 30e3fa5..006204a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1194,7 +1194,7 @@ @ cdecl _wexecvp(wstr ptr) msvcrt._wexecvp @ cdecl _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe @ cdecl _wfdopen(long wstr) msvcrt._wfdopen -@ stub _wfindfirst32 +@ cdecl _wfindfirst32(wstr ptr) msvcrt._wfindfirst32 @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2db3042..ab9cea6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1188,7 +1188,7 @@ @ cdecl _wexecvp(wstr ptr) msvcrt._wexecvp @ cdecl _wexecvpe(wstr ptr ptr) msvcrt._wexecvpe @ cdecl _wfdopen(long wstr) msvcrt._wfdopen -@ stub _wfindfirst32 +@ cdecl _wfindfirst32(wstr ptr) msvcrt._wfindfirst32 @ stub _wfindfirst32i64 @ cdecl _wfindfirst64(wstr ptr) msvcrt._wfindfirst64 @ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 82824e9..fa87ac1 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -95,6 +95,26 @@ static void msvcrt_wfttofd( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddata strcpyW(ft->name, fd->cFileName); } +/* INTERNAL: Translate WIN32_FIND_DATAW to wfinddata32_t */ +static void msvcrt_wfttofd32(const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddata32_t* ft) +{ + DWORD dw; + + if (fd->dwFileAttributes == FILE_ATTRIBUTE_NORMAL) + ft->attrib = 0; + else + ft->attrib = fd->dwFileAttributes; + + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftCreationTime, &dw ); + ft->time_create = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastAccessTime, &dw ); + ft->time_access = dw; + RtlTimeToSecondsSince1970( (const LARGE_INTEGER *)&fd->ftLastWriteTime, &dw ); + ft->time_write = dw; + ft->size = fd->nFileSizeLow; + strcpyW(ft->name, fd->cFileName); +} + /* INTERNAL: Translate WIN32_FIND_DATAA to finddatai64_t */ static void msvcrt_fttofdi64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddatai64_t* ft) { @@ -385,6 +405,27 @@ MSVCRT_intptr_t CDECL MSVCRT__wfindfirst(const MSVCRT_wchar_t * fspec, struct MS } /********************************************************************* + * _wfindfirst32 (MSVCRT.@) + * + * Unicode version of _findfirst32. + */ +MSVCRT_intptr_t CDECL MSVCRT__wfindfirst32(const MSVCRT_wchar_t * fspec, struct MSVCRT__wfinddata32_t* ft) +{ + WIN32_FIND_DATAW find_data; + HANDLE hfind; + + hfind = FindFirstFileW(fspec, &find_data); + if (hfind == INVALID_HANDLE_VALUE) + { + msvcrt_set_errno(GetLastError()); + return -1; + } + msvcrt_wfttofd32(&find_data, ft); + TRACE(":got handle %p\n", hfind); + return (MSVCRT_intptr_t)hfind; +} + +/********************************************************************* * _findfirsti64 (MSVCRT.@) * * 64-bit version of _findfirst. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ff96b36..725e191 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1153,6 +1153,7 @@ @ cdecl _wexecvpe(wstr ptr ptr) @ cdecl _wfdopen(long wstr) MSVCRT__wfdopen @ cdecl _wfindfirst(wstr ptr) MSVCRT__wfindfirst +@ cdecl _wfindfirst32(wstr ptr) MSVCRT__wfindfirst32 @ cdecl _wfindfirst64(wstr ptr) MSVCRT__wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) MSVCRT__wfindfirsti64 @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32

1 0

Dmitry Timoshkov : kernel32: Check whether FreeLibrary actually has unloaded the module.
by Alexandre Julliard April 19, 2013

April 19, 2013

Module: wine Branch: master Commit: 7de3f1b5b59c6e42333e94f2c5a62656d0fab39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de3f1b5b59c6e42333e94f2c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Apr 19 18:48:31 2013 +0900 kernel32: Check whether FreeLibrary actually has unloaded the module. --- dlls/kernel32/tests/loader.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 9fd5091..8d26678 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1259,14 +1259,21 @@ todo_wine CloseHandle(handle); CloseHandle(process); - SetLastError(0xdeadbeef); handle = GetModuleHandle("winver.exe"); ok(!handle, "winver.exe shouldn't be loaded yet\n"); + SetLastError(0xdeadbeef); handle = LoadLibrary("winver.exe"); ok(handle != 0, "LoadLibrary error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = FreeLibrary(handle); - ok(ret, "LoadLibrary error %d\n", GetLastError()); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + handle = GetModuleHandle("winver.exe"); + /* manual call to LdrShutdownProcess doesn't prevent module unloading */ + if (param && test_dll_phase != 4) + ok(handle != 0, "winver.exe should not be unloaded\n"); + else + todo_wine + ok(!handle || broken(handle != 0) /* before win7 */, "winver.exe should be unloaded\n"); SetLastError(0xdeadbeef); ret = WaitForDebugEvent(&de, 0);

1 0