wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Piotr Caban : msvcrt: Added _set_output_format implementation.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 9c4be83a78c5a105d4e3305d9977c213a4503a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c4be83a78c5a105d4e3305d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 10:39:30 2013 +0100 msvcrt: Added _set_output_format implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 17 ++++++++++++++++- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/printf.h | 23 +++++++++++++---------- include/msvcrt/stdio.h | 1 + 9 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5938d54..93bddbf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1270,7 +1270,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 81b3fc2..7f6b0d9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1632,7 +1632,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6b7a318..a2e2929 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -931,7 +931,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 81a265d..998349f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -924,7 +924,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 2da2429..75e75e6 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +static unsigned int output_format; /********************************************************************* * _beep (MSVCRT.@) @@ -283,7 +284,21 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, */ unsigned int CDECL _get_output_format(void) { - return 0; + return output_format; +} + +/********************************************************************* + * _set_output_format (MSVCRT.@) + */ +unsigned int CDECL _set_output_format(unsigned int new_output_format) +{ + unsigned int ret = output_format; + + if(!MSVCRT_CHECK_PMT(new_output_format==0 || new_output_format==MSVCRT__TWO_DIGIT_EXPONENT)) + return ret; + + output_format = new_output_format; + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3bbbe93..07e2984 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -982,6 +982,7 @@ int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT_strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); +unsigned int __cdecl _get_output_format(void); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b6ae261..99072aa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -894,7 +894,7 @@ @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) @ cdecl _set_fmode(long) -# stub _set_output_format(long) +@ cdecl _set_output_format(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) MSVCRT__setjmp diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index d02115e..3ccb1c4 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -307,22 +307,25 @@ static inline void FUNC_NAME(pf_fixup_exponent)(char *buf) if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') && isdigit(tmp[2]) && isdigit(tmp[3])) { - char final; + BOOL two_digit_exp = (_get_output_format() == MSVCRT__TWO_DIGIT_EXPONENT); + + tmp += 2; + if(isdigit(tmp[2])) { + if(two_digit_exp && tmp[0]=='0') { + tmp[0] = tmp[1]; + tmp[1] = tmp[2]; + tmp[2] = tmp[3]; + } - if (isdigit(tmp[4])) return; /* Exponent already 3 digits */ + }else if(two_digit_exp) { + return; + } - tmp += 2; - final = tmp[2]; + tmp[3] = tmp[2]; tmp[2] = tmp[1]; tmp[1] = tmp[0]; tmp[0] = '0'; - - if(final == '\0') { - tmp[3] = '\0'; - if(buf[0] == ' ') - memmove(buf, buf + 1, (tmp - buf) + 3); - } } } diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index f6bf3b5..a01859e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -182,6 +182,7 @@ int __cdecl vprintf_s(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); +unsigned int __cdecl _set_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED

1 0

Piotr Caban : wmi: Match parameters list with function we're forwarding to.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 57fb89200f55460d0f73791d46da7eadd5044e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fb89200f55460d0f73791d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:38 2013 +0100 wmi: Match parameters list with function we're forwarding to. --- dlls/wmi/wmi.spec | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wmi/wmi.spec b/dlls/wmi/wmi.spec index c6ae3cc..4291d4d 100644 --- a/dlls/wmi/wmi.spec +++ b/dlls/wmi/wmi.spec @@ -1,25 +1,25 @@ -@ stdcall CloseTrace(long) advapi32.CloseTrace -@ stdcall ControlTraceA(long long ptr long) advapi32.ControlTraceA -@ stdcall ControlTraceW(long long ptr long) advapi32.ControlTraceW +@ stdcall CloseTrace(int64) advapi32.CloseTrace +@ stdcall ControlTraceA(int64 str ptr long) advapi32.ControlTraceA +@ stdcall ControlTraceW(int64 wstr ptr long) advapi32.ControlTraceW @ stdcall CreateTraceInstanceId(long ptr) advapi32.CreateTraceInstanceId -@ stdcall EnableTrace(long long long ptr long) advapi32.EnableTrace -@ stdcall GetTraceEnableFlags(long) advapi32.GetTraceEnableFlags -@ stdcall GetTraceEnableLevel(long) advapi32.GetTraceEnableLevel -@ stdcall GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle -@ stdcall OpenTraceA(ptr) advapi32.OpenTraceA -@ stdcall OpenTraceW(ptr) advapi32.OpenTraceW +@ stdcall EnableTrace(long long long ptr int64) advapi32.EnableTrace +@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags +@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel +@ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle +@ stdcall -ret64 OpenTraceA(ptr) advapi32.OpenTraceA +@ stdcall -ret64 OpenTraceW(ptr) advapi32.OpenTraceW @ stdcall ProcessTrace(ptr long ptr ptr) advapi32.ProcessTrace @ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA @ stdcall QueryAllTracesW(ptr long ptr) advapi32.QueryAllTracesW -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsA -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsW +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) advapi32.RegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW @ stdcall RemoveTraceCallback(ptr) advapi32.RemoveTraceCallback @ stdcall SetTraceCallback(ptr ptr) advapi32.SetTraceCallback -@ stdcall StartTraceA(ptr ptr ptr) advapi32.StartTraceA -@ stdcall StartTraceW(ptr ptr ptr) advapi32.StartTraceW -@ stdcall TraceEvent(long ptr) advapi32.TraceEvent -@ stdcall TraceEventInstance(long ptr ptr ptr) advapi32.TraceEventInstance -@ stdcall UnregisterTraceGuids(long) advapi32.UnregisterTraceGuids +@ stdcall StartTraceA(ptr str ptr) advapi32.StartTraceA +@ stdcall StartTraceW(ptr wstr ptr) advapi32.StartTraceW +@ stdcall TraceEvent(int64 ptr) advapi32.TraceEvent +@ stdcall TraceEventInstance(int64 ptr ptr ptr) advapi32.TraceEventInstance +@ stdcall UnregisterTraceGuids(int64) advapi32.UnregisterTraceGuids @ stdcall WmiCloseBlock() advapi32.WmiCloseBlock @ stdcall WmiDevInstToInstanceNameA() advapi32.WmiDevInstToInstanceNameA @ stdcall WmiDevInstToInstanceNameW() advapi32.WmiDevInstToInstanceNameW

1 0

Piotr Caban : imagehlp: Match parameters list with function we' re forwarding to.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 60cf24a972bcaecbcc5592305627675d701033bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cf24a972bcaecbcc5592305… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:27 2013 +0100 imagehlp: Match parameters list with function we're forwarding to. --- dlls/imagehlp/imagehlp.spec | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index 3ba9efa..744b339 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -3,7 +3,7 @@ @ stdcall CheckSumMappedFile(ptr long ptr ptr) @ stdcall EnumerateLoadedModules64(long ptr ptr) dbghelp.EnumerateLoadedModules64 @ stdcall EnumerateLoadedModules(long ptr ptr) dbghelp.EnumerateLoadedModules -@ stdcall FindDebugInfoFile(str str str) dbghelp.FindDebugInfoFile +@ stdcall FindDebugInfoFile(str str ptr) dbghelp.FindDebugInfoFile @ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) dbghelp.FindDebugInfoFileEx @ stdcall FindExecutableImage(str str str) dbghelp.FindExecutableImage @ stdcall FindExecutableImageEx(str str ptr ptr ptr) dbghelp.FindExecutableImageEx @@ -38,16 +38,16 @@ @ stdcall RemovePrivateCvSymbolic(ptr ptr ptr) @ stub RemovePrivateCvSymbolicEx @ stdcall RemoveRelocations(ptr) -@ stdcall SearchTreeForFile(str str str) dbghelp.SearchTreeForFile +@ stdcall SearchTreeForFile(str str ptr) dbghelp.SearchTreeForFile @ stdcall SetImageConfigInformation(ptr ptr) @ stdcall SplitSymbols(str str str long) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk64 @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk @ stdcall SymCleanup(long) dbghelp.SymCleanup -@ stdcall SymEnumSourceFiles(long long str ptr ptr) dbghelp.SymEnumSourceFiles +@ stdcall SymEnumSourceFiles(ptr int64 str ptr ptr) dbghelp.SymEnumSourceFiles @ stub SymEnumSym -@ stdcall SymEnumSymbols(long long str ptr ptr) dbghelp.SymEnumSymbols -@ stdcall SymEnumTypes(long long ptr ptr) dbghelp.SymEnumTypes +@ stdcall SymEnumSymbols(ptr int64 str ptr ptr) dbghelp.SymEnumSymbols +@ stdcall SymEnumTypes(ptr int64 ptr ptr) dbghelp.SymEnumTypes @ stdcall SymEnumerateModules64(long ptr ptr) dbghelp.SymEnumerateModules64 @ stdcall SymEnumerateModules(long ptr ptr) dbghelp.SymEnumerateModules @ stdcall SymEnumerateSymbols64(long int64 ptr ptr) dbghelp.SymEnumerateSymbols64 @@ -55,7 +55,7 @@ @ stub SymEnumerateSymbolsW64 @ stub SymEnumerateSymbolsW @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) dbghelp.SymFindFileInPath -@ stdcall SymFromAddr(long long ptr ptr) dbghelp.SymFromAddr +@ stdcall SymFromAddr(ptr int64 ptr ptr) dbghelp.SymFromAddr @ stdcall SymFromName(long str ptr) dbghelp.SymFromName @ stdcall SymFunctionTableAccess64(long int64) dbghelp.SymFunctionTableAccess64 @ stdcall SymFunctionTableAccess(long long) dbghelp.SymFunctionTableAccess @@ -74,7 +74,7 @@ @ stdcall SymGetModuleInfoW64(long int64 ptr) dbghelp.SymGetModuleInfoW64 @ stdcall SymGetModuleInfoW(long long ptr) dbghelp.SymGetModuleInfoW @ stdcall SymGetOptions() dbghelp.SymGetOptions -@ stdcall SymGetSearchPath(long str long) dbghelp.SymGetSearchPath +@ stdcall SymGetSearchPath(long ptr long) dbghelp.SymGetSearchPath @ stdcall SymGetSymFromAddr64(long int64 ptr ptr) dbghelp.SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) dbghelp.SymGetSymFromAddr @ stdcall SymGetSymFromName64(long str ptr) dbghelp.SymGetSymFromName64 @@ -83,8 +83,8 @@ @ stdcall SymGetSymNext(long ptr) dbghelp.SymGetSymNext @ stdcall SymGetSymPrev64(long ptr) dbghelp.SymGetSymPrev64 @ stdcall SymGetSymPrev(long ptr) dbghelp.SymGetSymPrev -@ stdcall SymGetTypeFromName(long long str ptr) dbghelp.SymGetTypeFromName -@ stdcall SymGetTypeInfo(long long long long ptr) dbghelp.SymGetTypeInfo +@ stdcall SymGetTypeFromName(ptr int64 str ptr) dbghelp.SymGetTypeFromName +@ stdcall SymGetTypeInfo(ptr int64 long long ptr) dbghelp.SymGetTypeInfo @ stdcall SymInitialize(long str long) dbghelp.SymInitialize @ stdcall SymLoadModule64(long long str str int64 long) dbghelp.SymLoadModule64 @ stdcall SymLoadModule(long long str str long long) dbghelp.SymLoadModule

1 0

Piotr Caban : shell32: Match parameters list with function we' re forwarding to.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 6a0f7521ed439bada37573996524f2d1a699b8c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a0f7521ed439bada37573996… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:15 2013 +0100 shell32: Match parameters list with function we're forwarding to. --- dlls/shell32/shell32.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index 790cc9f..0f991a4 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -114,7 +114,7 @@ 119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW 120 stdcall -noname FileMenu_AbortInitMenu() 121 stdcall -noname SHFlushClipboard() - 122 stdcall -private @(long long long str long) shell.dll16.RunDLL_CallEntry16 + 122 stdcall -private @(long long ptr str long) shell.dll16.RunDLL_CallEntry16 123 stdcall -noname SHFreeUnusedLibraries() 124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long) 125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr) @@ -445,13 +445,13 @@ @ stdcall StrCmpNIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrCmpNW(wstr wstr long) shlwapi.StrCmpNW @ stdcall StrCpyNA (ptr str long) kernel32.lstrcpynA -@ stdcall StrCpyNW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrCpyNW(ptr wstr long) shlwapi.StrCpyNW @ stdcall StrNCmpA(str str long) shlwapi.StrCmpNA @ stdcall StrNCmpIA(str str long) shlwapi.StrCmpNIA @ stdcall StrNCmpIW(wstr wstr long) shlwapi.StrCmpNIW @ stdcall StrNCmpW(wstr wstr long) shlwapi.StrCmpNW @ stdcall StrNCpyA (ptr str long) kernel32.lstrcpynA -@ stdcall StrNCpyW(wstr wstr long) shlwapi.StrCpyNW +@ stdcall StrNCpyW(ptr wstr long) shlwapi.StrCpyNW @ stdcall StrRChrA(str str long) shlwapi.StrRChrA @ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA @ stdcall StrRChrIW(wstr wstr long) shlwapi.StrRChrIW

1 0

Piotr Caban : d3dx10: Match parameters list with function we' re forwarding to.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 9f855ae4bb61ff5fed518397b8cebac36fa3e32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f855ae4bb61ff5fed518397b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:01 2013 +0100 d3dx10: Match parameters list with function we're forwarding to. --- dlls/d3dx10_33/d3dx10_33.spec | 8 ++++---- dlls/d3dx10_34/d3dx10_34.spec | 8 ++++---- dlls/d3dx10_35/d3dx10_35.spec | 8 ++++---- dlls/d3dx10_36/d3dx10_36.spec | 8 ++++---- dlls/d3dx10_37/d3dx10_37.spec | 8 ++++---- dlls/d3dx10_38/d3dx10_38.spec | 8 ++++---- dlls/d3dx10_39/d3dx10_39.spec | 8 ++++---- dlls/d3dx10_40/d3dx10_40.spec | 8 ++++---- dlls/d3dx10_41/d3dx10_41.spec | 8 ++++---- dlls/d3dx10_42/d3dx10_42.spec | 8 ++++---- dlls/d3dx10_43/d3dx10_43.spec | 8 ++++---- 11 files changed, 44 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f855ae4bb61ff5fed518…

1 0

Nikolay Sivov : hlink: Implement IHlinkBrowseContext_SetCurrentHlink().
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 29d37bd71468f5d10abe6e1bceb1eab1e17f8132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d37bd71468f5d10abe6e1bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 27 10:41:07 2013 +0400 hlink: Implement IHlinkBrowseContext_SetCurrentHlink(). --- dlls/hlink/browse_ctx.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index d09d59d..d90aad9 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -295,11 +295,19 @@ static HRESULT WINAPI IHlinkBC_GetHlink(IHlinkBrowseContext* iface, ULONG hlid, return S_OK; } -static HRESULT WINAPI IHlinkBC_SetCurrentHlink( IHlinkBrowseContext* iface, - ULONG uHLID) +static HRESULT WINAPI IHlinkBC_SetCurrentHlink(IHlinkBrowseContext* iface, ULONG hlid) { - FIXME("\n"); - return E_NOTIMPL; + HlinkBCImpl *This = impl_from_IHlinkBrowseContext(iface); + struct link_entry *link; + + TRACE("(%p)->(0x%08x)\n", This, hlid); + + link = context_get_entry(This, hlid); + if (!link) + return E_FAIL; + + This->current = link; + return S_OK; } static HRESULT WINAPI IHlinkBC_Clone( IHlinkBrowseContext* iface,

1 0

Frédéric Delanoy : wined3d: Add NVIDIA GeForce 410M.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: wine Branch: master Commit: 8e9af2869cd571a2d9eea35a7503b4fbb785e962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9af2869cd571a2d9eea35a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 27 01:06:11 2013 +0100 wined3d: Add NVIDIA GeForce 410M. --- 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 60a4b2d..6b6bc8e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1099,6 +1099,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_315M, "NVIDIA GeForce 315M", DRIVER_NVIDIA_GEFORCE6, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE6, 256}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE6, 512}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", 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}, @@ -1553,6 +1554,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ + {"410M", CARD_NVIDIA_GEFORCE_410M}, /* Geforce 400 - lowend mobile */ {"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 */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9a593d..2a11286 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1398,6 +1398,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, + CARD_NVIDIA_GEFORCE_410M = 0x1055, CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, CARD_NVIDIA_GEFORCE_GT440 = 0x0de0,

1 0

Francois Gouget : testbot/web: Remove some dead code in JobDetails.pl.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: 508205dfe36c288ee6ec510e252a4585e5b8df8f URL: http://source.winehq.org/git/tools.git/?a=commit;h=508205dfe36c288ee6ec510e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:39:55 2013 +0100 testbot/web: Remove some dead code in JobDetails.pl. --- testbot/web/JobDetails.pl | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a751f11..651335c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -360,7 +360,6 @@ sub GenerateBody my $First = 1; my $CurrentDll = ""; my $PrintedDll = ""; - my $Crashed = !1; my $Line; while (defined($Line = <LOGFILE>)) { @@ -392,10 +391,6 @@ sub GenerateBody print "<pre><code>"; $First = !1; } - if ($Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /) - { - $Crashed = 1; - } if (! $FullLog && $Line =~ m/^[^:]+:([^ ]+) done $258$/) { print "$1: Timeout\n";

1 0

Francois Gouget : testbot/web: Make JobDetails. pl handle empty err logs correctly.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: 0c329e178170c6c489ca98198f2958b8d0c30c5c URL: http://source.winehq.org/git/tools.git/?a=commit;h=0c329e178170c6c489ca9819… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:39:45 2013 +0100 testbot/web: Make JobDetails.pl handle empty err logs correctly. The task scripts used to create the err log and then delete it if it was empty. However the Task module now redirects the script's stderr to the err log to help diagnose script bugs (e.g. perl errors). That means the script must only append to the err log and should certainly not delete it. So JobDetails.pl should now be able to deal with empty err logs. --- testbot/web/JobDetails.pl | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 11bb122..a751f11 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -410,22 +410,25 @@ sub GenerateBody if (open ERRFILE, "<$ErrName") { - if (! $First) - { - print "</code></pre>\n"; - $First = 1; - } + $CurrentDll = "*err*"; while (defined($Line = <ERRFILE>)) { $HasLogEntries = 1; chomp($Line); - if ($First) + if ($PrintedDll ne $CurrentDll) { - print "<br>\n"; - print "<pre><code>"; - $First = !1; + if ($First) + { + $First = !1; + } + else + { + print "</code></pre>\n"; + } + $PrintedDll = $CurrentDll; } - print $self->escapeHTML($Line), "\n"; + print "<br>\n"; + print "<pre><code>", $self->escapeHTML($Line), "\n"; } close ERRFILE; }

1 0

Francois Gouget : testbot/testagentd: Sanity check the list sizes.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: b48ed0abc3eeafe5639223576b3ab246af226c20 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b48ed0abc3eeafe563922357… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:37:51 2013 +0100 testbot/testagentd: Sanity check the list sizes. This heuristic normally lets us detect and drop connections that use the wrong protocol. --- testbot/src/testagentd/testagentd.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 75782c4..e99dcb4 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -387,10 +387,17 @@ static int skip_entries(SOCKET client, uint32_t count) static int recv_list_size(SOCKET client, uint32_t *u32) { - int success = recv_raw_uint32(client, u32); - if (success) - debug(" recv_list_size() -> %u\n", *u32); - return success; + if (!recv_raw_uint32(client, u32)) + return 0; + debug(" recv_list_size() -> %u\n", *u32); + + if (*u32 >= 1048576) + { + /* The client is in fact most likely not speaking the right protocol */ + set_status(ST_FATAL, "the list size is too big (%d)", *u32); + return 0; + } + return 1; } static int expect_list_size(SOCKET client, uint32_t expected)

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013