December 2012 - Wine-commits

Jacek Caban : jscript: Ensure correct stack state for non-returning expression evaluation in compile_expression .
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: 1000a6bf340a6d921951ae7a893adab3bcb12618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1000a6bf340a6d921951ae7a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 13 12:08:59 2012 +0100 jscript: Ensure correct stack state for non-returning expression evaluation in compile_expression. --- dlls/jscript/compile.c | 322 ++++++++++++++++++++++++++---------------------- 1 files changed, 176 insertions(+), 146 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1000a6bf340a6d921951a…

1 0

Piotr Caban : msvcrt: Don't flush stream in fputs function.
by Alexandre Julliard 13 Dec '12

13 Dec '12

Module: wine Branch: master Commit: bc33d39e23d7c87b4ab520a771b17a091c217ced URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc33d39e23d7c87b4ab520a77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 13 13:45:00 2012 +0100 msvcrt: Don't flush stream in fputs function. --- dlls/msvcrt/file.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e157ede..9d75bc6 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3434,23 +3434,13 @@ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) */ int CDECL MSVCRT_fputs(const char *s, MSVCRT_FILE* file) { - MSVCRT_size_t i, len = strlen(s); + MSVCRT_size_t len = strlen(s); int ret; MSVCRT__lock_file(file); - if (!(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT)) { - ret = MSVCRT_fwrite(s,sizeof(*s),len,file) == len ? 0 : MSVCRT_EOF; - MSVCRT__unlock_file(file); - return ret; - } - for (i=0; i<len; i++) - if (MSVCRT_fputc(s[i], file) == MSVCRT_EOF) { - MSVCRT__unlock_file(file); - return MSVCRT_EOF; - } - + ret = MSVCRT_fwrite(s, sizeof(*s), len, file) == len ? 0 : MSVCRT_EOF; MSVCRT__unlock_file(file); - return 0; + return ret; } /*********************************************************************

1 0

Jacek Caban : atl80: Fixed some spec file entries.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 9abb9ffe91f034eb53f5788d915d5551a1b38eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9abb9ffe91f034eb53f5788d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 14:56:26 2012 +0100 atl80: Fixed some spec file entries. --- dlls/atl80/atl80.spec | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 6756776..67f001e 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -3,15 +3,13 @@ 12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr -15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) atl.AtlModuleGetClassObject -16 stdcall AtlModuleInit(ptr long long) atl.AtlModuleInit -17 stdcall AtlModuleRegisterClassObjects(ptr long long) atl.AtlModuleRegisterClassObjects -18 stdcall AtlModuleRegisterServer(ptr long ptr) atl.AtlModuleRegisterServer -19 stdcall AtlModuleRegisterTypeLib(ptr wstr) atl.AtlModuleRegisterTypeLib -20 stdcall AtlModuleRevokeClassObjects(ptr) atl.AtlModuleRevokeClassObjects -21 stdcall AtlModuleTerm(ptr) atl.AtlModuleTerm -22 stdcall AtlModuleUnregisterServer(ptr ptr) atl.AtlModuleUnregisterServer -23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) atl.AtlModuleUpdateRegistryFromResourceD +15 stub AtlComModuleGetClassObject +17 stub AtlComModuleRegisterClassObjects +18 stub AtlComModuleRegisterServer(ptr long ptr) +19 stub AtlRegisterTypeLib(ptr wstr) +20 stub AtlComModuleRevokeClassObjects +22 stub AtlComModuleUnregisterServer +23 stdcall AtlUpdateRegistryFromResourceD(long wstr long ptr ptr) atl100.AtlUpdateRegistryFromResourceD 24 stub AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo 26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC @@ -30,10 +28,10 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl 42 stdcall AtlAxWinInit() atl100.AtlAxWinInit -43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData # don't forward to atl100.dll -44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData # don't forward to atl100.dll -45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW # don't forward to atl100.dll -46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA # don't forward to atl100.dll +43 stdcall AtlWinModuleAddCreateWndData(ptr ptr ptr) atl100.AtlWinModuleAddCreateWndData +44 stub AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost 49 stub AtlRegisterClassCategoriesHelper @@ -42,9 +40,8 @@ 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stub AtlGetObjectSourceInterface -55 stub AtlModuleUnRegisterTypeLib -56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib -57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx +55 stub AtlUnRegisterTypeLib +56 stdcall AtlLoadTypeLib(long wstr ptr ptr) atl100.AtlLoadTypeLib 58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl100.AtlModuleAddTermFunc 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx

1 0

André Hentschel : mmdevapi/test: Fix tests on win8.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 20128a923a7385475208c76ad9e65239d97e19b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20128a923a7385475208c76ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 12 16:51:13 2012 +0100 mmdevapi/test: Fix tests on win8. --- dlls/mmdevapi/tests/capture.c | 2 +- include/audioclient.idl | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index d64b6a3..feedfde 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -559,7 +559,7 @@ static void test_audioclient(void) ok(hr == AUDCLNT_E_NOT_INITIALIZED, "Initialize with invalid sharemode returns %08x\n", hr); hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0xffffffff, 5000000, 0, pwfx, NULL); - ok(hr == E_INVALIDARG, "Initialize with invalid flags returns %08x\n", hr); + ok(hr == E_INVALIDARG || hr == AUDCLNT_E_INVALID_STREAM_FLAG, "Initialize with invalid flags returns %08x\n", hr); /* A period != 0 is ignored and the call succeeds. * Since we can only initialize successfully once, skip those tests. diff --git a/include/audioclient.idl b/include/audioclient.idl index 8050ea6..a755604 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -315,6 +315,12 @@ cpp_quote("#define AUDCLNT_E_BUFFER_ERROR AUDCLNT_ERR(0x18)") cpp_quote("#define AUDCLNT_E_BUFFER_SIZE_NOT_ALIGNED AUDCLNT_ERR(0x19)") /* Hex fail */ cpp_quote("#define AUDCLNT_E_INVALID_DEVICE_PERIOD AUDCLNT_ERR(0x20)") +cpp_quote("#define AUDCLNT_E_INVALID_STREAM_FLAG AUDCLNT_ERR(0x021)") +cpp_quote("#define AUDCLNT_E_ENDPOINT_OFFLOAD_NOT_CAPABLE AUDCLNT_ERR(0x022)") +cpp_quote("#define AUDCLNT_E_OUT_OF_OFFLOAD_RESOURCES AUDCLNT_ERR(0x023)") +cpp_quote("#define AUDCLNT_E_OFFLOAD_MODE_ONLY AUDCLNT_ERR(0x024)") +cpp_quote("#define AUDCLNT_E_NONOFFLOAD_MODE_ONLY AUDCLNT_ERR(0x025)") +cpp_quote("#define AUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x026)") cpp_quote("#define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)") cpp_quote("#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)")

1 0

André Hentschel : winemapi: List ignored attachments.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: d2cf09083de20e1521b6877496d2782f83fe2206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2cf09083de20e1521b687749… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 12 20:14:36 2012 +0100 winemapi: List ignored attachments. --- dlls/winemapi/sendmail.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c index e017e2c..03a29ba 100644 --- a/dlls/winemapi/sendmail.c +++ b/dlls/winemapi/sendmail.c @@ -155,7 +155,12 @@ ULONG WINAPI MAPISendMail(LHANDLE session, ULONG_PTR uiparam, } if (message->nFileCount) - FIXME("Ignoring attachments\n"); + { + FIXME("Ignoring %u attachments:\n", message->nFileCount); + for (i = 0; i < message->nFileCount; i++) + FIXME("\t%s (%s)\n", debugstr_a(message->lpFiles[i].lpszPathName), + debugstr_a(message->lpFiles[i].lpszFileName)); + } /* Escape subject and body */ subject = escape_string(message->lpszSubject, empty_string);

1 0

Austin English : d3d11: Add a stub dll.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 1d1cb5236e6aa5ee215b1f6e653f2e92830c0427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1cb5236e6aa5ee215b1f6e6… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 11 14:11:49 2012 -0800 d3d11: Add a stub dll. --- configure | 1 + configure.ac | 1 + dlls/d3d11/Makefile.in | 3 +++ dlls/d3d11/d3d11.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 6ddb15f..e96750d 100755 --- a/configure +++ b/configure @@ -15401,6 +15401,7 @@ wine_fn_config_dll d3d10 enable_d3d10 implib wine_fn_config_test dlls/d3d10/tests d3d10_test wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test +wine_fn_config_dll d3d11 enable_d3d11 wine_fn_config_dll d3d8 enable_d3d8 implib wine_fn_config_test dlls/d3d8/tests d3d8_test wine_fn_config_dll d3d9 enable_d3d9 implib diff --git a/configure.ac b/configure.ac index 01d84cd..2a4ea4e 100644 --- a/configure.ac +++ b/configure.ac @@ -2580,6 +2580,7 @@ WINE_CONFIG_DLL(d3d10,,[implib]) WINE_CONFIG_TEST(dlls/d3d10/tests) WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) +WINE_CONFIG_DLL(d3d11) WINE_CONFIG_DLL(d3d8,,[implib]) WINE_CONFIG_TEST(dlls/d3d8/tests) WINE_CONFIG_DLL(d3d9,,[implib]) diff --git a/dlls/d3d11/Makefile.in b/dlls/d3d11/Makefile.in new file mode 100644 index 0000000..ef3c5a0 --- /dev/null +++ b/dlls/d3d11/Makefile.in @@ -0,0 +1,3 @@ +MODULE = d3d11.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec new file mode 100644 index 0000000..0ff00d2 --- /dev/null +++ b/dlls/d3d11/d3d11.spec @@ -0,0 +1,42 @@ +@ stub D3D11CoreCreateDevice +@ stub D3D11CoreCreateLayeredDevice +@ stub D3D11CoreGetLayeredDeviceSize +@ stub D3D11CoreRegisterLayers +@ stub D3D11CreateDevice +@ stub D3D11CreateDeviceAndSwapChain +@ stub D3DKMTCloseAdapter +@ stub D3DKMTCreateAllocation +@ stub D3DKMTCreateContext +@ stub D3DKMTCreateDevice +@ stub D3DKMTCreateSynchronizationObject +@ stub D3DKMTDestroyAllocation +@ stub D3DKMTDestroyContext +@ stub D3DKMTDestroyDevice +@ stub D3DKMTDestroySynchronizationObject +@ stub D3DKMTEscape +@ stub D3DKMTGetContextSchedulingPriority +@ stub D3DKMTGetDeviceState +@ stub D3DKMTGetDisplayModeList +@ stub D3DKMTGetMultisampleMethodList +@ stub D3DKMTGetRuntimeData +@ stub D3DKMTGetSharedPrimaryHandle +@ stub D3DKMTLock +@ stub D3DKMTOpenAdapterFromHdc +@ stub D3DKMTOpenResource +@ stub D3DKMTPresent +@ stub D3DKMTQueryAdapterInfo +@ stub D3DKMTQueryAllocationResidency +@ stub D3DKMTQueryResourceInfo +@ stub D3DKMTRender +@ stub D3DKMTSetAllocationPriority +@ stub D3DKMTSetContextSchedulingPriority +@ stub D3DKMTSetDisplayMode +@ stub D3DKMTSetDisplayPrivateDriverFormat +@ stub D3DKMTSetGammaRamp +@ stub D3DKMTSetVidPnSourceOwner +@ stub D3DKMTSignalSynchronizationObject +@ stub D3DKMTUnlock +@ stub D3DKMTWaitForSynchronizationObject +@ stub D3DKMTWaitForVerticalBlankEvent +@ stub OpenAdapter10 +@ stub OpenAdapter10_2

1 0

Piotr Caban : msvcrt: Added _mbsnbicoll_l implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: a2b71b732a61c0b6fbe50acbe7eb7c91f3adf2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b71b732a61c0b6fbe50acbe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:57 2012 +0100 msvcrt: Added _mbsnbicoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/mbcs.c | 52 ++++++++++++++++++++++++++++--------------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 6 ++-- 6 files changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b4c702c..8202518 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1105,7 +1105,7 @@ @ cdecl _mbsicmp(str str) msvcrt._mbsicmp @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) msvcrt._mbsicoll -@ stub _mbsicoll_l +@ cdecl _mbsicoll_l(str str ptr) msvcrt._mbsicoll_l @ cdecl _mbsinc(str) msvcrt._mbsinc @ stub _mbsinc_l @ cdecl _mbslen(str) msvcrt._mbslen @@ -1131,7 +1131,7 @@ @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll -@ stub _mbsnbicoll_l +@ cdecl _mbsnbicoll_l(str str long ptr) msvcrt._mbsnbicoll_l @ cdecl _mbsnbset(ptr long long) msvcrt._mbsnbset @ stub _mbsnbset_l @ stub _mbsnbset_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b08208a..39152c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -762,7 +762,7 @@ @ cdecl _mbsicmp(str str) msvcrt._mbsicmp @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) msvcrt._mbsicoll -@ stub _mbsicoll_l +@ cdecl _mbsicoll_l(str str ptr) msvcrt._mbsicoll_l @ cdecl _mbsinc(str) msvcrt._mbsinc @ stub _mbsinc_l @ cdecl _mbslen(str) msvcrt._mbslen @@ -788,7 +788,7 @@ @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll -@ stub _mbsnbicoll_l +@ cdecl _mbsnbicoll_l(str str long ptr) msvcrt._mbsnbicoll_l @ cdecl _mbsnbset(ptr long long) msvcrt._mbsnbset @ stub _mbsnbset_l @ stub _mbsnbset_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4729b76..efe67ac 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -755,7 +755,7 @@ @ cdecl _mbsicmp(str str) msvcrt._mbsicmp @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) msvcrt._mbsicoll -@ stub _mbsicoll_l +@ cdecl _mbsicoll_l(str str ptr) msvcrt._mbsicoll_l @ cdecl _mbsinc(str) msvcrt._mbsinc @ stub _mbsinc_l @ cdecl _mbslen(str) msvcrt._mbslen @@ -781,7 +781,7 @@ @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll -@ stub _mbsnbicoll_l +@ cdecl _mbsnbicoll_l(str str long ptr) msvcrt._mbsnbicoll_l @ cdecl _mbsnbset(ptr long long) msvcrt._mbsnbset @ stub _mbsnbset_l @ stub _mbsnbset_s diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e06511d..a2c9daa 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -766,28 +766,44 @@ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) } /********************************************************************* + * _mbsnbicoll_l(MSVCRT.@) + */ +int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(!mbcinfo->ismbcodepage) + return MSVCRT__strnicoll_l((const char*)str1, (const char*)str2, len, locale); + return CompareStringA(mbcinfo->mblcid, NORM_IGNORECASE, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; +} + +/********************************************************************* + * _mbsicoll_l(MSVCRT.@) + */ +int CDECL _mbsicoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT__locale_t locale) +{ + return _mbsnbicoll_l(str1, str2, -1, locale); +} + +/********************************************************************* + * _mbsnbicoll(MSVCRT.@) + */ +int CDECL _mbsnbicoll(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len) +{ + return _mbsnbicoll_l(str1, str2, len, NULL); +} + +/********************************************************************* * _mbsicoll(MSVCRT.@) - * FIXME: handle locales. */ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) { - if(get_mbcinfo()->ismbcodepage) - { - unsigned int strc, cmpc; - do { - if(!*str) - return *cmp ? -1 : 0; - if(!*cmp) - return 1; - strc = _mbctolower(_mbsnextc(str)); - cmpc = _mbctolower(_mbsnextc(cmp)); - if(strc != cmpc) - return strc < cmpc ? -1 : 1; - str +=(strc > 255) ? 2 : 1; - cmp +=(strc > 255) ? 2 : 1; /* equal, use same increment */ - } while(1); - } - return u_strcasecmp(str, cmp); /* ASCII CP */ + return _mbsnbicoll_l(str, cmp, -1, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index da8e0a8..7921545 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -952,6 +952,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); 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); /* 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 db9e22f..6324c86 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -703,7 +703,7 @@ @ cdecl _mbsicmp(str str) # stub _mbsicmp_l(str str ptr) @ cdecl _mbsicoll(str str) -# stub _mbsicoll_l(str str ptr) +@ cdecl _mbsicoll_l(str str ptr) @ cdecl _mbsinc(str) # stub _mbsinc_l(str ptr) @ cdecl _mbslen(str) @@ -728,8 +728,8 @@ # stub _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) # stub _mbsnbicmp_l(str str long ptr) -@ stub _mbsnbicoll(str str long) -# stub _mbsnbicoll_l(str str long ptr) +@ cdecl _mbsnbicoll(str str long) +@ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) # stub _mbsnbset_l(str long long ptr) # stub _mbsnbset_s(ptr long long long)

1 0

Piotr Caban : msvcrt: Added _mbsnbcoll_l implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: f5c86479193ac81238e961fb2dc7c48444afec52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c86479193ac81238e961fb2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:17:10 2012 +0100 msvcrt: Added _mbsnbcoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/mbcs.c | 56 ++++++++++++++++++++++++++----------------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 6 ++-- 6 files changed, 44 insertions(+), 31 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8202518..24d3080 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1095,7 +1095,7 @@ @ cdecl _mbscmp(str str) msvcrt._mbscmp @ stub _mbscmp_l @ cdecl _mbscoll(str str) msvcrt._mbscoll -@ stub _mbscoll_l +@ cdecl _mbscoll_l(str str ptr) msvcrt._mbscoll_l @ stub _mbscpy_s @ stub _mbscpy_s_l @ cdecl _mbscspn(str str) msvcrt._mbscspn @@ -1123,7 +1123,7 @@ @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt @ stub _mbsnbcnt_l @ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll -@ stub _mbsnbcoll_l +@ cdecl _mbsnbcoll_l(str str long ptr) msvcrt._mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) msvcrt._mbsnbcpy_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 39152c4..bdb442d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -752,7 +752,7 @@ @ cdecl _mbscmp(str str) msvcrt._mbscmp @ stub _mbscmp_l @ cdecl _mbscoll(str str) msvcrt._mbscoll -@ stub _mbscoll_l +@ cdecl _mbscoll_l(str str ptr) msvcrt._mbscoll_l @ stub _mbscpy_s @ stub _mbscpy_s_l @ cdecl _mbscspn(str str) msvcrt._mbscspn @@ -780,7 +780,7 @@ @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt @ stub _mbsnbcnt_l @ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll -@ stub _mbsnbcoll_l +@ cdecl _mbsnbcoll_l(str str long ptr) msvcrt._mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) msvcrt._mbsnbcpy_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index efe67ac..bc122e6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -745,7 +745,7 @@ @ cdecl _mbscmp(str str) msvcrt._mbscmp @ stub _mbscmp_l @ cdecl _mbscoll(str str) msvcrt._mbscoll -@ stub _mbscoll_l +@ cdecl _mbscoll_l(str str ptr) msvcrt._mbscoll_l @ stub _mbscpy_s @ stub _mbscpy_s_l @ cdecl _mbscspn(str str) msvcrt._mbscspn @@ -773,7 +773,7 @@ @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt @ stub _mbsnbcnt_l @ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll -@ stub _mbsnbcoll_l +@ cdecl _mbsnbcoll_l(str str long ptr) msvcrt._mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) msvcrt._mbsnbcpy_s diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a2c9daa..fc0fc2e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -807,34 +807,46 @@ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) } /********************************************************************* + * _mbsnbcoll_l(MSVCRT.@) + */ +int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(!mbcinfo->ismbcodepage) + return MSVCRT_strncoll_l((const char*)str1, (const char*)str2, len, locale); + return CompareStringA(mbcinfo->mblcid, 0, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; +} + +/********************************************************************* + * _mbscoll_l(MSVCRT.@) + */ +int CDECL _mbscoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT__locale_t locale) +{ + return _mbsnbcoll_l(str1, str2, -1, locale); +} + +/********************************************************************* + * _mbsnbcoll(MSVCRT.@) + */ +int CDECL _mbsnbcoll(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len) +{ + return _mbsnbcoll_l(str1, str2, len, NULL); +} + +/********************************************************************* * _mbscoll(MSVCRT.@) - * Performs a case-sensitive comparison according to the current code page - * RETURN - * _NLSCMPERROR if error - * FIXME: handle locales. */ int CDECL _mbscoll(const unsigned char* str, const unsigned char* cmp) { - if(get_mbcinfo()->ismbcodepage) - { - unsigned int strc, cmpc; - do { - if(!*str) - return *cmp ? -1 : 0; - if(!*cmp) - return 1; - strc = _mbsnextc(str); - cmpc = _mbsnextc(cmp); - if(strc != cmpc) - return strc < cmpc ? -1 : 1; - str +=(strc > 255) ? 2 : 1; - cmp +=(strc > 255) ? 2 : 1; /* equal, use same increment */ - } while(1); - } - return u_strcmp(str, cmp); /* ASCII CP */ + return _mbsnbcoll_l(str, cmp, -1, NULL); } - /********************************************************************* * _mbsicmp(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7921545..ea31b3c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -953,6 +953,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ 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); /* 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 6324c86..06d26b4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -690,7 +690,7 @@ @ cdecl _mbscmp(str str) # stub _mbscmp_l(str str ptr) @ cdecl _mbscoll(str str) -# stub _mbscoll_l(str str ptr) +@ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy(ptr str) # stub _mbscpy_s(ptr long str) # stub _mbscpy_s_l(ptr long str ptr) @@ -720,8 +720,8 @@ # stub _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) # stub _mbsnbcnt_l(ptr long ptr) -@ stub _mbsnbcoll(str str long) -# stub _mbsnbcoll_l(str str long ptr) +@ cdecl _mbsnbcoll(str str long) +@ cdecl _mbsnbcoll_l(str str long ptr) @ cdecl _mbsnbcpy(ptr str long) # stub _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long)

1 0

Alexandre Julliard : ole32: Limit the number of messages processed at once in CoWaitForMultipleObjects .
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: a283b986c768d386b4e0937632059f61e0a256be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a283b986c768d386b4e093763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 14:06:46 2012 +0100 ole32: Limit the number of messages processed at once in CoWaitForMultipleObjects. --- dlls/ole32/compobj.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index af5b0fe..460ed4e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3871,6 +3871,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { MSG msg; + int count = 0; /* call message filter */ @@ -3900,7 +3901,9 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } - while (COM_PeekMessage(apt, &msg)) + /* some apps (e.g. Visio 2010) don't handle WM_PAINT properly and loop forever, + * so after processing 100 messages we go back to checking the wait handles */ + while (count++ < 100 && COM_PeekMessage(apt, &msg)) { TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg);

1 0

Alexandre Julliard : user32: Start checking for driver events more often when the app doesn' t consume messages properly.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: bd5d5e97767eaa9827a464195be50fdd036d72d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5d5e97767eaa9827a464195… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 20:17:21 2012 +0100 user32: Start checking for driver events more often when the app doesn't consume messages properly. --- dlls/user32/message.c | 12 ++++++++++++ dlls/user32/user_private.h | 3 ++- dlls/user32/winproc.c | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3f0312a..79066a8 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3671,6 +3671,16 @@ void WINAPI PostQuitMessage( INT exit_code ) SERVER_END_REQ; } +/* check for driver events if we detect that the app is not properly consuming messages */ +static inline void check_for_driver_events(void) +{ + if (get_user_thread_info()->message_count > 200) + { + flush_window_surfaces( FALSE ); + USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); + } + else get_user_thread_info()->message_count++; +} /*********************************************************************** * PeekMessageW (USER32.@) @@ -3680,6 +3690,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, MSG msg; USER_CheckNotLock(); + check_for_driver_events(); if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { @@ -3726,6 +3737,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ USER_CheckNotLock(); + check_for_driver_events(); if (first || last) { diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3dc68c3..d743062 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -172,7 +172,8 @@ struct wm_char_mapping_data struct user_thread_info { HANDLE server_queue; /* Handle to server-side queue */ - DWORD recursion_count; /* SendMessage recursion counter */ + WORD recursion_count; /* SendMessage recursion counter */ + WORD message_count; /* Get/PeekMessage loop counter */ BOOL hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */ struct received_message_info *receive_info; /* Message being currently received */ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 3b13b82..e6b5194 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1126,6 +1126,7 @@ static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DW { DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); + if ((mask & QS_INPUT) == QS_INPUT) get_user_thread_info()->message_count = 0; return ret; }

1 0