November 2010 - Wine-Commits

Amine Khaldi : shdocvw: Fix translations.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: ecd2e603e2cb6485ed6f78feaf8aec3e5415188c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd2e603e2cb6485ed6f78fea… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Nov 21 19:59:18 2010 +0100 shdocvw: Fix translations. --- dlls/shdocvw/De.rc | 8 ++++---- dlls/shdocvw/En.rc | 8 ++++---- dlls/shdocvw/Es.rc | 8 ++++---- dlls/shdocvw/Fr.rc | 8 ++++---- dlls/shdocvw/He.rc | 8 ++++---- dlls/shdocvw/It.rc | 8 ++++---- dlls/shdocvw/Ko.rc | 8 ++++---- dlls/shdocvw/Lt.rc | 8 ++++---- dlls/shdocvw/Nl.rc | 8 ++++---- dlls/shdocvw/Pl.rc | 8 ++++---- dlls/shdocvw/Pt.rc | 8 ++++---- dlls/shdocvw/Ro.rc | 2 +- dlls/shdocvw/Si.rc | 10 +++++----- dlls/shdocvw/Sr.rc | 16 ++++++++-------- dlls/shdocvw/Sv.rc | 8 ++++---- dlls/shdocvw/Uk.rc | 8 ++++---- 16 files changed, 66 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecd2e603e2cb6485ed6f7…

1 0

Austin English : mmdevapi/tests: Increase timeout in capture tests.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: aba65017d79221735cea1866bddb43e2a6375ade URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba65017d79221735cea1866b… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 22 22:23:44 2010 -0800 mmdevapi/tests: Increase timeout in capture tests. --- dlls/mmdevapi/tests/capture.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index a1d36e6..ed497df 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -87,7 +87,7 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) hr = IAudioCaptureClient_GetNextPacketSize(acc, NULL); ok(hr == E_POINTER, "IAudioCaptureClient_GetNextPacketSize(NULL) returns %08x\n", hr); - ok(WaitForSingleObject(handle, 1000) == WAIT_OBJECT_0, "Waiting on event handle failed!\n"); + ok(WaitForSingleObject(handle, 2000) == WAIT_OBJECT_0, "Waiting on event handle failed!\n"); /* frames can be 0 if no data is available yet.. */ hr = IAudioCaptureClient_GetNextPacketSize(acc, &frames);

1 0

Eryk Wieliczko : msvcrt: Implement _wfindnext64i32.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: 40874d91d9651a9f70394588e1e3e5a773b2625b URL: http://source.winehq.org/git/wine.git/?a=commit;h=40874d91d9651a9f70394588e… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Sat Nov 20 15:15:00 2010 +0100 msvcrt: Implement _wfindnext64i32. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 19 +++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c35e42b..8e71b31 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1345,7 +1345,7 @@ @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 -@ stub _wfindnext64i32 +@ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index abc7db0..5e52a28 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1198,7 +1198,7 @@ @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 -@ stub _wfindnext64i32 +@ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2d5cc32..6b2d664 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1185,7 +1185,7 @@ @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 -@ stub _wfindnext64i32 +@ cdecl _wfindnext64i32(wstr ptr) msvcrt._wfindnext64i32 @ cdecl _wfopen(wstr wstr) msvcrt._wfopen @ cdecl _wfopen_s(ptr wstr wstr) msvcrt._wfopen_s @ cdecl _wfreopen(wstr wstr ptr) msvcrt._wfreopen diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 415c9eb..1e8fd8d 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -557,6 +557,25 @@ int CDECL MSVCRT__wfindnexti64(MSVCRT_intptr_t hand, struct MSVCRT__wfinddatai64 } /********************************************************************* + * _wfindnext64i32 (MSVCRT.@) + * + * Unicode version of _findnext64i32. + */ +int CDECL MSVCRT__wfindnext64i32(MSVCRT_intptr_t hand, struct MSVCRT__wfinddata64i32_t * ft) +{ + WIN32_FIND_DATAW find_data; + + if (!FindNextFileW((HANDLE)hand, &find_data)) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return -1; + } + + msvcrt_wfttofd64i32(&find_data,ft); + return 0; +} + +/********************************************************************* * _getcwd (MSVCRT.@) * * Get the current working directory. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index de3dded..11d0a49 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1117,6 +1117,7 @@ @ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 @ cdecl _wfindnext(long ptr) MSVCRT__wfindnext # stub _wfindnext64 +@ cdecl _wfindnext64i32(long ptr) MSVCRT__wfindnext64i32 @ cdecl _wfindnexti64(long ptr) MSVCRT__wfindnexti64 @ cdecl _wfopen(wstr wstr) MSVCRT__wfopen @ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for PoSetPowerState.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: b9e676febd53888f9780ffda7fe65bf19fce180b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e676febd53888f9780ffda7… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Nov 21 16:58:54 2010 +0100 ntoskrnl.exe: Add stub for PoSetPowerState. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 18317e2..d2c0340 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1541,6 +1541,15 @@ VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Cou } /***************************************************** + * PoSetPowerState (NTOSKRNL.EXE.@) + */ +POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT DeviceObject, POWER_STATE_TYPE Type, POWER_STATE State) +{ + FIXME("(%p %u %u) stub\n", DeviceObject, Type, State.DeviceState); + return State; +} + +/***************************************************** * DllMain */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 74c53e9..06976fd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -830,7 +830,7 @@ @ stub PoRequestPowerIrp @ stub PoRequestShutdownEvent @ stub PoSetHiberRange -@ stub PoSetPowerState +@ stdcall PoSetPowerState(ptr long long) @ stub PoSetSystemState @ stub PoShutdownBugCheck @ stub PoStartNextPowerIrp diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 3fa355f..950d93a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1129,6 +1129,7 @@ MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION); +POWER_STATE WINAPI PoSetPowerState(PDEVICE_OBJECT,POWER_STATE_TYPE,POWER_STATE); NTSTATUS WINAPI PsCreateSystemThread(PHANDLE,ULONG,POBJECT_ATTRIBUTES,HANDLE,PCLIENT_ID,PKSTART_ROUTINE,PVOID); #define PsGetCurrentProcess() IoGetCurrentProcess() #define PsGetCurrentThread() ((PETHREAD)KeGetCurrentThread())

1 0

Eryk Wieliczko : msvcrt: Implement _ctime32/64_s.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: 504e68ac2491e5743b257337633a383e11fa05d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=504e68ac2491e5743b2573376… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Sat Nov 20 14:49:53 2010 +0100 msvcrt: Implement _ctime32/64_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/msvcrt.spec | 4 +- dlls/msvcrt/time.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6e860e8..a305cb2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -560,9 +560,9 @@ @ varargs _cscanf_s(str) msvcrt._cscanf_s @ varargs _cscanf_s_l(str ptr) msvcrt._cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 -@ stub _ctime32_s +@ cdecl _ctime32_s(str long ptr) msvcrt._ctime32_s @ cdecl _ctime64(ptr) msvcrt._ctime64 -@ stub _ctime64_s +@ cdecl _ctime64_s(str long ptr) msvcrt._ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait @ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 17785be..36f522c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -399,9 +399,9 @@ @ varargs _cscanf_s(str) msvcrt._cscanf_s @ varargs _cscanf_s_l(str ptr) msvcrt._cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 -@ stub _ctime32_s +@ cdecl _ctime32_s(str ptr long) msvcrt._ctime32_s @ cdecl _ctime64(ptr) msvcrt._ctime64 -@ stub _ctime64_s +@ cdecl _ctime64_s(str ptr long) msvcrt._ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait @ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 663e1b7..33bfb33 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -391,9 +391,9 @@ @ varargs _cscanf_s(str) msvcrt._cscanf_s @ varargs _cscanf_s_l(str ptr) msvcrt._cscanf_s_l @ cdecl _ctime32(ptr) msvcrt._ctime32 -@ stub _ctime32_s +@ cdecl _ctime32_s(str long ptr) msvcrt._ctime32_s @ cdecl _ctime64(ptr) msvcrt._ctime64 -@ stub _ctime64_s +@ cdecl _ctime64_s(str long ptr) msvcrt._ctime64_s @ cdecl _cwait(ptr long long) msvcrt._cwait @ varargs _cwprintf(wstr) msvcrt._cwprintf @ stub _cwprintf_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3db6fa4..e65c152 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -356,9 +356,9 @@ @ varargs _cscanf_s(str) @ varargs _cscanf_s_l(str ptr) @ cdecl _ctime32(ptr) MSVCRT__ctime32 -# stub _ctime32_s +@ cdecl _ctime32_s(str long ptr) MSVCRT__ctime32_s @ cdecl _ctime64(ptr) MSVCRT__ctime64 -# stub _ctime64_s +@ cdecl _ctime64_s(str long ptr) MSVCRT__ctime64_s @ extern _ctype MSVCRT__ctype @ cdecl _cwait(ptr long long) @ varargs _cwprintf(wstr) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b345a7f..7ccdc7d 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -902,6 +902,28 @@ char * CDECL MSVCRT__ctime64(const MSVCRT___time64_t *time) } /********************************************************************* + * _ctime64_s (MSVCRT.@) + */ +int CDECL MSVCRT__ctime64_s(char *res, MSVCRT_size_t len, const MSVCRT___time64_t *time) +{ + struct MSVCRT_tm *t; + if( !MSVCRT_CHECK_PMT( res != NULL ) || !MSVCRT_CHECK_PMT( len >= 26 ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + res[0] = '\0'; + if( !MSVCRT_CHECK_PMT( time != NULL ) || !MSVCRT_CHECK_PMT( time > 0 ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + t = MSVCRT__localtime64( time ); + strcpy( res, MSVCRT_asctime( t ) ); + return 0; +} + +/********************************************************************* * _ctime32 (MSVCRT.@) */ char * CDECL MSVCRT__ctime32(const MSVCRT___time32_t *time) @@ -913,6 +935,28 @@ char * CDECL MSVCRT__ctime32(const MSVCRT___time32_t *time) } /********************************************************************* + * _ctime32_s (MSVCRT.@) + */ +int CDECL MSVCRT__ctime32_s(char *res, MSVCRT_size_t len, const MSVCRT___time32_t *time) +{ + struct MSVCRT_tm *t; + if( !MSVCRT_CHECK_PMT( res != NULL ) || !MSVCRT_CHECK_PMT( len >= 26 ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + res[0] = '\0'; + if( !MSVCRT_CHECK_PMT( time != NULL ) || !MSVCRT_CHECK_PMT( time > 0 ) ) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + t = MSVCRT__localtime32( time ); + strcpy( res, MSVCRT_asctime( t ) ); + return 0; +} + +/********************************************************************* * ctime (MSVCRT.@) */ #ifdef _WIN64

1 0

Damjan Jovanovic : iexplore: Use a better file description.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: 01ab7df67f0ccc54deb69ae89a647110f4997992 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01ab7df67f0ccc54deb69ae89… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue Nov 23 11:06:11 2010 +0200 iexplore: Use a better file description. --- programs/iexplore/iexplore.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/iexplore/iexplore.rc b/programs/iexplore/iexplore.rc index f37481a..acf7959 100644 --- a/programs/iexplore/iexplore.rc +++ b/programs/iexplore/iexplore.rc @@ -17,7 +17,7 @@ */ #define WINE_OLESELFREGISTER -#define WINE_FILEDESCRIPTION_STR "Wine core exe" +#define WINE_FILEDESCRIPTION_STR "Wine Internet Explorer" #define WINE_FILENAME_STR "iexplore.exe" #define WINE_FILEVERSION 6,0,2900,2180 #define WINE_FILEVERSION_STR "6.0.2900.2180"

1 0

Eryk Wieliczko : msvcrt: Implement _wfindfirst64i32.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: 7d50809705d83e55b05e857c7a785bc4e8a3b7d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d50809705d83e55b05e857c7… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Sat Nov 20 14:49:54 2010 +0100 msvcrt: Implement _wfindfirst64i32. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/dir.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a305cb2..c35e42b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1341,7 +1341,7 @@ @ stub _wfindfirst32 @ stub _wfindfirst32i64 @ stub _wfindfirst64 -@ stub _wfindfirst64i32 +@ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 36f522c..abc7db0 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1194,7 +1194,7 @@ @ stub _wfindfirst32 @ stub _wfindfirst32i64 @ stub _wfindfirst64 -@ stub _wfindfirst64i32 +@ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 33bfb33..2d5cc32 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1181,7 +1181,7 @@ @ stub _wfindfirst32 @ stub _wfindfirst32i64 @ stub _wfindfirst64 -@ stub _wfindfirst64i32 +@ cdecl _wfindfirst64i32(wstr ptr) msvcrt._wfindfirst64i32 @ stub _wfindnext32 @ stub _wfindnext32i64 @ stub _wfindnext64 diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index f175ac0..415c9eb 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -156,6 +156,26 @@ static void msvcrt_wfttofdi64( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfindd strcpyW(ft->name, fd->cFileName); } +/* INTERNAL: Translate WIN32_FIND_DATAW to wfinddata64i32_t */ +static void msvcrt_wfttofd64i32( const WIN32_FIND_DATAW *fd, struct MSVCRT__wfinddata64i32_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); +} + /********************************************************************* * _chdir (MSVCRT.@) * @@ -370,6 +390,27 @@ MSVCRT_intptr_t CDECL MSVCRT__findfirst64i32(const char * fspec, struct MSVCRT__ } /********************************************************************* + * _wfindfirst64i32 (MSVCRT.@) + * + * Unicode version of _findfirst64i32. + */ +MSVCRT_intptr_t CDECL MSVCRT__wfindfirst64i32(const MSVCRT_wchar_t * fspec, struct MSVCRT__wfinddata64i32_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_wfttofd64i32(&find_data,ft); + TRACE(":got handle %p\n",hfind); + return (MSVCRT_intptr_t)hfind; +} + +/********************************************************************* * _wfindfirsti64 (MSVCRT.@) * * Unicode version of _findfirsti64. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e65c152..de3dded 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1114,6 +1114,7 @@ @ cdecl _wfindfirst(wstr ptr) MSVCRT__wfindfirst # stub _wfindfirst64 @ cdecl _wfindfirsti64(wstr ptr) MSVCRT__wfindfirsti64 +@ cdecl _wfindfirst64i32(wstr ptr) MSVCRT__wfindfirst64i32 @ cdecl _wfindnext(long ptr) MSVCRT__wfindnext # stub _wfindnext64 @ cdecl _wfindnexti64(long ptr) MSVCRT__wfindnexti64

1 0

Paul Vriens : comctl32/tests: Fix shell32 test failures on NT4/W2K.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: a9c31ed90e83540f12725d19adc515d23ae51cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9c31ed90e83540f12725d19a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Nov 20 17:42:38 2010 +0100 comctl32/tests: Fix shell32 test failures on NT4/W2K. --- dlls/comctl32/tests/propsheet.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index d687003..42cb4c8 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -621,12 +621,12 @@ static const struct message property_sheet_seq[] = { { WM_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_GETICON, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/ - { WM_ACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, + /*{ WM_ACTIVATE, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_ACTIVATE, sent|id, 0, 0, RECEIVER_PAGE }, { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, { WM_ACTIVATEAPP, sent|id, 0, 0, RECEIVER_PAGE }, { WM_DESTROY, sent|id, 0, 0, RECEIVER_SHEET_WINPROC }, - { WM_DESTROY, sent|id, 0, 0, RECEIVER_PAGE }, + { WM_DESTROY, sent|id, 0, 0, RECEIVER_PAGE },*/ /*{ WM_NCDESTROY, sent|id, 0, 0, RECEIVER_PAGE }, { WM_NCDESTROY, sent|id, 0, 0, RECEIVER_SHEET_WINPROC },*/ { 0 } @@ -663,13 +663,6 @@ static LRESULT CALLBACK sheet_callback_messages_proc (HWND hwnd, UINT msg, WPARA { save_message(hwnd, msg, wParam, lParam, RECEIVER_SHEET_WINPROC); - switch (msg) - { - case WM_CTLCOLORSTATIC: - keybd_event(VK_ESCAPE, 0, 0, 0); - break; - } - return CallWindowProc (oldWndProc, hwnd, msg, wParam, lParam); } @@ -719,7 +712,7 @@ static void test_messages(void) memset(&psh, 0, sizeof(psh)); psh.dwSize = sizeof(psh); psh.dwFlags = PSH_NOAPPLYNOW | PSH_WIZARD | PSH_USECALLBACK - /*| PSH_MODELESS */ | PSH_USEICONID; + | PSH_MODELESS | PSH_USEICONID; psh.pszCaption = "test caption"; psh.nPages = 1; psh.hwndParent = GetDesktopWindow();

1 0

Matteo Bruni : d3dx9/tests: Remove a D3DXPlaneNormalize test.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: 8c0a8ac514ea27a604f69be507bc5d6278691b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c0a8ac514ea27a604f69be50… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sat Nov 20 17:13:15 2010 +0100 d3dx9/tests: Remove a D3DXPlaneNormalize test. --- dlls/d3dx9_36/tests/math.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6d192f9..e455a96 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -617,10 +617,6 @@ static void D3DXPlaneTest(void) expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; D3DXPlaneNormalize(&gotplane, &nulplane); expect_plane(expectedplane, gotplane); - nulplane.a = 0.0; nulplane.b = 0.0f, nulplane.c = 0.0f; nulplane.d = 4.3f; - expectedplane.a = 0.0f; expectedplane.b = 0.0f; expectedplane.c = 0.0f; expectedplane.d = 0.0f; - D3DXPlaneNormalize(&gotplane, &nulplane); - expect_plane(expectedplane, gotplane); /*_______________D3DXPlaneTransform____________*/ expectedplane.a = 49.0f; expectedplane.b = -98.0f; expectedplane.c = 55.0f; expectedplane.d = -165.0f;

1 0

Austin English : wined3d: Add detection for Nvidia GT 330.
by Alexandre Julliard Nov. 23, 2010

Nov. 23, 2010

Module: wine Branch: master Commit: 90f428cd85a1e1c8b62c702afe88a8f6d18cb1d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90f428cd85a1e1c8b62c702af… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Nov 22 23:21:37 2010 +0000 wined3d: Add detection for Nvidia GT 330. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9a9753e..cfdf3f5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1081,6 +1081,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", DRIVER_NVIDIA_GEFORCE6, 896 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX460, "NVIDIA GeForce GTX 460", DRIVER_NVIDIA_GEFORCE6, 768 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX465, "NVIDIA GeForce GTX 465", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1421,6 +1422,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GTX 470", CARD_NVIDIA_GEFORCE_GTX470}, /* Geforce 400 - midend high */ {"GTX 465", CARD_NVIDIA_GEFORCE_GTX465}, /* Geforce 400 - midend */ {"GTX 460", CARD_NVIDIA_GEFORCE_GTX460}, /* Geforce 400 - midend */ + {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ {"GTS 360M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GT 330M", CARD_NVIDIA_GEFORCE_GT325M}, /* Geforce 300 - midend mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6d472a9..63eec76 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1396,6 +1396,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX275 = 0x05e6, CARD_NVIDIA_GEFORCE_GTX280 = 0x05e1, CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, + CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, CARD_NVIDIA_GEFORCE_GTX460 = 0x0e22, CARD_NVIDIA_GEFORCE_GTX465 = 0x06c4,

1 0