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

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMFRAME.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: c050cdb3d21fcdd6cc4e21c275b737497aab2e15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c050cdb3d21fcdd6cc4e21c27… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 19 08:34:15 2013 +0200 d3drm: Avoid LPDIRECT3DRMFRAME. --- dlls/d3drm/d3drm.c | 95 ++++++++++++++++++++++++---------------------- dlls/d3drm/frame.c | 79 +++++++++++++------------------------ dlls/d3drm/light.c | 14 ++----- dlls/d3drm/meshbuilder.c | 7 +-- dlls/d3drm/tests/d3drm.c | 18 ++++---- dlls/d3drm/viewport.c | 21 +++------- include/d3drm.h | 22 ++++++----- include/d3drmobj.h | 80 +++++++++++++++++++------------------- 8 files changed, 151 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c050cdb3d21fcdd6cc4e2…

1 0

Jactry Zeng : include: Added missing declarations to msvcrt.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: a35db4e7e34c642789cb42602b20ea3eeac8a35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35db4e7e34c642789cb42602… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Fri Apr 19 14:24:26 2013 +0800 include: Added missing declarations to msvcrt. --- include/msvcrt/string.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/msvcrt/string.h b/include/msvcrt/string.h index 5c83631..d1dca89 100644 --- a/include/msvcrt/string.h +++ b/include/msvcrt/string.h @@ -42,14 +42,20 @@ static inline void* memccpy(void *s1, const void *s2, int c, size_t n) { return #endif /* _CRT_MEMORY_DEFINED */ int __cdecl _strcmpi(const char*,const char*); +int __cdecl _strcoll_l(const char*, const char*, _locale_t); char* __cdecl _strdup(const char*); char* __cdecl _strerror(const char*); errno_t __cdecl strerror_s(char*,size_t,int); int __cdecl _stricmp(const char*,const char*); int __cdecl _stricoll(const char*,const char*); +int __cdecl _stricoll_l(const char*, const char*, _locale_t); char* __cdecl _strlwr(char*); errno_t __cdecl _strlwr_s(char*,size_t); +int __cdecl _strncoll(const char*, const char*, size_t); +int __cdecl _strncoll_l(const char*, const char*, size_t, _locale_t); int __cdecl _strnicmp(const char*,const char*,size_t); +int __cdecl _strnicoll(const char*, const char*, size_t); +int __cdecl _strnicoll_l(const char*, const char*, size_t, _locale_t); char* __cdecl _strnset(char*,int,size_t); char* __cdecl _strrev(char*); char* __cdecl _strset(char*,int); @@ -86,9 +92,14 @@ size_t __cdecl strxfrm(char*,const char*,size_t); wchar_t* __cdecl _wcsdup(const wchar_t*); int __cdecl _wcsicmp(const wchar_t*,const wchar_t*); int __cdecl _wcsicoll(const wchar_t*,const wchar_t*); +int __cdecl _wcsicoll_l(const wchar_t*, const wchar_t*, _locale_t); wchar_t* __cdecl _wcslwr(wchar_t*); +int __cdecl _wcscoll_l(const wchar_t*, const wchar_t*, _locale_t); +int __cdecl _wcsncoll(const wchar_t*, const wchar_t*, size_t); +int __cdecl _wcsncoll_l(const wchar_t*, const wchar_t*, size_t, _locale_t); int __cdecl _wcsnicmp(const wchar_t*,const wchar_t*,size_t); int __cdecl _wcsnicoll(const wchar_t*,const wchar_t*,size_t); +int __cdecl _wcsnicoll_l(const wchar_t*, const wchar_t*, size_t, _locale_t); wchar_t* __cdecl _wcsnset(wchar_t*,wchar_t,size_t); wchar_t* __cdecl _wcsrev(wchar_t*); wchar_t* __cdecl _wcsset(wchar_t*,wchar_t);

1 0

Alexandre Julliard : user32: Move the common parts of ScrollDC into user32 and the null driver.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 04ad06353d458baef467e67b1516b1b023bb6e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=04ad06353d458baef467e67b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 19 12:27:59 2013 +0200 user32: Move the common parts of ScrollDC into user32 and the null driver. --- dlls/user32/driver.c | 14 ++- dlls/user32/painting.c | 104 +++++++++++++++++++- dlls/user32/user_private.h | 2 +- dlls/winemac.drv/Makefile.in | 1 - dlls/winemac.drv/scroll.c | 188 ------------------------------------ dlls/winemac.drv/winemac.drv.spec | 1 - dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/scroll.c | 192 ------------------------------------- dlls/winex11.drv/window.c | 35 +++++++ dlls/winex11.drv/winex11.drv.spec | 2 +- 10 files changed, 146 insertions(+), 394 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04ad06353d458baef467e…

1 0

Michael Stefaniuc : d3dx9_36: Remove left over "stub" from a TRACE calls.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 938b62079cc0e31e20ce470a4ecf9a622545d57a URL: http://source.winehq.org/git/wine.git/?a=commit;h=938b62079cc0e31e20ce470a4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 19 11:11:16 2013 +0200 d3dx9_36: Remove left over "stub" from a TRACE calls. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4ef900e..7c1e1ae 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1361,7 +1361,7 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetTechniqueByName(ID3DXBaseEffect struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_technique *tech = get_technique_by_name(This, name); - TRACE("iface %p, name %s stub\n", This, debugstr_a(name)); + TRACE("iface %p, name %s\n", This, debugstr_a(name)); if (tech) { @@ -2092,7 +2092,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetVectorArray(ID3DXBaseEffect *iface, struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); struct d3dx_parameter *param = get_valid_parameter(This, parameter); - TRACE("iface %p, parameter %p, vector %p, count %u stub\n", This, parameter, vector, count); + TRACE("iface %p, parameter %p, vector %p, count %u\n", This, parameter, vector, count); if (param && param->element_count && param->element_count >= count) {

1 0

Michael Stefaniuc : msdaps: Remove left over "stub" from a TRACE().
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 8a9ab424ff81f4b889dfa53e7bf767d7b326d895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a9ab424ff81f4b889dfa53e7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 19 11:21:12 2013 +0200 msdaps: Remove left over "stub" from a TRACE(). --- dlls/msdaps/usrmarshal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 85b2606..ff5ae28 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -806,7 +806,7 @@ HRESULT __RPC_STUB ICommand_Execute_Stub(ICommand* This, IUnknown *pUnkOuter, RE IUnknown *obj = NULL; HRESULT hr; - TRACE("(%p)->(%p, %s, %08lx, %ld, %p, %d, %p, %p, %ld, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), + TRACE("(%p)->(%p, %s, %08lx, %ld, %p, %d, %p, %p, %ld, %p, %p, %p, %p)\n", This, pUnkOuter, debugstr_guid(riid), hAccessor, cParamSets, pGuid, ulGuidOffset, pInputParams, pOutputParams, cBindings, rgBindings, rgStatus, pcRowsAffected, ppRowset);

1 0

Nikolay Sivov : ole32: Store SMWR storage instance role separately.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 5132f60298dfaffa44a31cbea6d579c779705067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5132f60298dfaffa44a31cbea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 12:37:01 2013 +0400 ole32: Store SMWR storage instance role separately. --- dlls/ole32/storage32.c | 12 +++++++++--- dlls/ole32/storage32.h | 7 +++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index aa82b66..db47423 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -385,9 +385,8 @@ static HRESULT WINAPI StorageBaseImpl_QueryInterface( { *ppvObject = &This->IPropertySetStorage_iface; } - /* locking interface is report for writer only */ - else if (IsEqualGUID(&IID_IDirectWriterLock, riid) && - (This->openFlags == (STGM_DIRECT_SWMR|STGM_READWRITE|STGM_SHARE_DENY_WRITE))) + /* locking interface is reported for writer only */ + else if (IsEqualGUID(&IID_IDirectWriterLock, riid) && This->lockingrole == SWMR_Writer) { *ppvObject = &This->IDirectWriterLock_iface; } @@ -2785,6 +2784,13 @@ static HRESULT StorageImpl_Construct( This->base.ref = 1; This->base.create = create; + if (openFlags == (STGM_DIRECT_SWMR|STGM_READWRITE|STGM_SHARE_DENY_WRITE)) + This->base.lockingrole = SWMR_Writer; + else if (openFlags == (STGM_DIRECT_SWMR|STGM_READ|STGM_SHARE_DENY_NONE)) + This->base.lockingrole = SWMR_Reader; + else + This->base.lockingrole = SWMR_None; + This->base.reverted = 0; /* diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index b037847..8cb330f 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -163,6 +163,12 @@ HRESULT FileLockBytesImpl_Construct(HANDLE hFile, DWORD openFlags, LPCWSTR pwcsN HRESULT STORAGE_CreateOleStream(IStorage*, DWORD) DECLSPEC_HIDDEN; HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName) DECLSPEC_HIDDEN; +enum swmr_mode +{ + SWMR_None, + SWMR_Writer, + SWMR_Reader +}; /**************************************************************************** * StorageBaseImpl definitions. @@ -223,6 +229,7 @@ struct StorageBaseImpl * the transacted snapshot or cache. */ StorageBaseImpl *transactedChild; + enum swmr_mode lockingrole; }; /* virtual methods for StorageBaseImpl objects */

1 0

Nikolay Sivov : ole32: Remove some casts that are not needed.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 3b9568802a1080f989fc08685aa58c23b2a89864 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b9568802a1080f989fc08685… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 13:29:47 2013 +0400 ole32: Remove some casts that are not needed. --- dlls/ole32/storage32.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index db47423..d3e351b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2615,9 +2615,7 @@ static HRESULT StorageImpl_StreamWriteAt(StorageBaseImpl *base, DirRef index, stream = *StorageImpl_GetCachedBlockChainStream(This, index); if (!stream) return E_OUTOFMEMORY; - hr = BlockChainStream_WriteAt(stream, offset, size, buffer, bytesWritten); - - return hr; + return BlockChainStream_WriteAt(stream, offset, size, buffer, bytesWritten); } } @@ -3008,7 +3006,7 @@ end: } else { - StorageImpl_Flush((StorageBaseImpl*)This); + StorageImpl_Flush(&This->base); *result = This; } @@ -3048,9 +3046,9 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) HeapFree(GetProcessHeap(), 0, This); } -static HRESULT StorageImpl_Flush(StorageBaseImpl* iface) +static HRESULT StorageImpl_Flush(StorageBaseImpl *storage) { - StorageImpl *This = (StorageImpl*) iface; + StorageImpl *This = (StorageImpl*)storage; int i; HRESULT hr; TRACE("(%p)\n", This); @@ -3851,20 +3849,17 @@ HRESULT StorageImpl_ReadRawDirEntry(StorageImpl *This, ULONG index, BYTE *buffer HRESULT StorageImpl_WriteRawDirEntry(StorageImpl *This, ULONG index, const BYTE *buffer) { ULARGE_INTEGER offset; - HRESULT hr; ULONG bytesRead; offset.u.HighPart = 0; offset.u.LowPart = index * RAW_DIRENTRY_SIZE; - hr = BlockChainStream_WriteAt( + return BlockChainStream_WriteAt( This->rootBlockChain, offset, RAW_DIRENTRY_SIZE, buffer, &bytesRead); - - return hr; } /****************************************************************************** @@ -4036,13 +4031,11 @@ HRESULT StorageImpl_WriteDirEntry( DirRef index, const DirEntry* buffer) { - BYTE currentEntry[RAW_DIRENTRY_SIZE]; - HRESULT writeRes; + BYTE currentEntry[RAW_DIRENTRY_SIZE]; UpdateRawDirEntry(currentEntry, buffer); - writeRes = StorageImpl_WriteRawDirEntry(This, index, currentEntry); - return writeRes; + return StorageImpl_WriteRawDirEntry(This, index, currentEntry); } static BOOL StorageImpl_ReadBigBlock( @@ -5187,7 +5180,7 @@ static HRESULT TransactedSnapshotImpl_Construct(StorageBaseImpl *parentStorage, /* parentStorage already has 1 reference, which we take over here. */ (*result)->transactedParent = parentStorage; - parentStorage->transactedChild = (StorageBaseImpl*)*result; + parentStorage->transactedChild = &(*result)->base; (*result)->base.storageDirEntry = TransactedSnapshotImpl_CreateStubEntry(*result, parentStorage->storageDirEntry); } @@ -5199,7 +5192,7 @@ static HRESULT TransactedSnapshotImpl_Construct(StorageBaseImpl *parentStorage, } } - if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, (*result)); + if (FAILED(hr)) HeapFree(GetProcessHeap(), 0, *result); return hr; }

1 0

Nikolay Sivov : ole32: Simplify IEnumSTATSTG initialization.
by Alexandre Julliard 19 Apr '13

19 Apr '13

Module: wine Branch: master Commit: 448a44ca5f586400ee1bda3e104df516f985441a URL: http://source.winehq.org/git/wine.git/?a=commit;h=448a44ca5f586400ee1bda3e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 19 13:38:13 2013 +0400 ole32: Simplify IEnumSTATSTG initialization. --- dlls/ole32/storage32.c | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d3e351b..425fd12 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -732,9 +732,6 @@ static HRESULT WINAPI StorageBaseImpl_EnumElements( if (newEnum) { *ppenum = &newEnum->IEnumSTATSTG_iface; - - IEnumSTATSTG_AddRef(*ppenum); - return S_OK; } @@ -5599,36 +5596,30 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Clone( IEnumSTATSTG** ppenum) { IEnumSTATSTGImpl* const This = impl_from_IEnumSTATSTG(iface); - IEnumSTATSTGImpl* newClone; if (This->parentStorage->reverted) return STG_E_REVERTED; - /* - * Perform a sanity check on the parameters. - */ if (ppenum==0) return E_INVALIDARG; newClone = IEnumSTATSTGImpl_Construct(This->parentStorage, This->storageDirEntry); - + if (!newClone) + { + *ppenum = NULL; + return E_OUTOFMEMORY; + } /* * The new clone enumeration must point to the same current node as - * the ole one. + * the old one. */ memcpy(newClone->name, This->name, sizeof(newClone->name)); *ppenum = &newClone->IEnumSTATSTG_iface; - /* - * Don't forget to nail down a reference to the clone before - * returning it. - */ - IEnumSTATSTGImpl_AddRef(*ppenum); - return S_OK; } @@ -5658,13 +5649,11 @@ static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( newEnumeration = HeapAlloc(GetProcessHeap(), 0, sizeof(IEnumSTATSTGImpl)); - if (newEnumeration!=0) + if (newEnumeration) { - /* - * Set-up the virtual function table and reference count. - */ newEnumeration->IEnumSTATSTG_iface.lpVtbl = &IEnumSTATSTGImpl_Vtbl; - newEnumeration->ref = 0; + newEnumeration->ref = 1; + newEnumeration->name[0] = 0; /* * We want to nail-down the reference to the storage in case the @@ -5673,12 +5662,7 @@ static IEnumSTATSTGImpl* IEnumSTATSTGImpl_Construct( newEnumeration->parentStorage = parentStorage; IStorage_AddRef(&newEnumeration->parentStorage->IStorage_iface); - newEnumeration->storageDirEntry = storageDirEntry; - - /* - * Make sure the current node of the iterator is the first one. - */ - IEnumSTATSTGImpl_Reset(&newEnumeration->IEnumSTATSTG_iface); + newEnumeration->storageDirEntry = storageDirEntry; } return newEnumeration;

1 0

Dmitry Timoshkov : kernel32: Check whether FreeLibrary actually has unloaded the module.
by Alexandre Julliard 19 Apr '13

19 Apr '13

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

Jactry Zeng : msvcrt: Added _wfindfirst32 implementation.
by Alexandre Julliard 19 Apr '13

19 Apr '13

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