December 2011 - Wine-commits

Aric Stewart : usp10: Handle the Gurmukhi addak.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: ff9ae10ba567bf72b512e545fb398d33e9a9eea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9ae10ba567bf72b512e545f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 10:13:34 2011 -0600 usp10: Handle the Gurmukhi addak. --- dlls/usp10/shape.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 7583326..36fa404 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -2597,7 +2597,10 @@ static void ContextualShape_Bengali(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS * static int gurmukhi_lex(WCHAR c) { - return unicode_lex(c); + if (c == 0x0A71) + return lex_Modifier; + else + return unicode_lex(c); } static const ConsonantComponents Gurmukhi_consonants[] = {

1 0

Nikolay Sivov : shlwapi: Partially implement SHRegCreateUSKeyW.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 191bc054a52f06b06337c5d154097f2679a39cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=191bc054a52f06b06337c5d15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 1 20:19:29 2011 +0300 shlwapi: Partially implement SHRegCreateUSKeyW. --- dlls/shlwapi/reg.c | 47 ++++++++++++++++++++++++++++--- dlls/shlwapi/tests/shreg.c | 66 ++++++++++++++++++++++++++++---------------- 2 files changed, 84 insertions(+), 29 deletions(-) diff --git a/dlls/shlwapi/reg.c b/dlls/shlwapi/reg.c index 09fce55..26f83bf 100644 --- a/dlls/shlwapi/reg.c +++ b/dlls/shlwapi/reg.c @@ -235,12 +235,49 @@ LONG WINAPI SHRegCreateUSKeyA(LPCSTR pszPath, REGSAM samDesired, HUSKEY hRelativ * * See SHRegCreateUSKeyA. */ -LONG WINAPI SHRegCreateUSKeyW(LPCWSTR pszPath, REGSAM samDesired, HUSKEY hRelativeUSKey, - PHUSKEY phNewUSKey, DWORD dwFlags) +LONG WINAPI SHRegCreateUSKeyW(LPCWSTR path, REGSAM samDesired, HUSKEY relative_key, + PHUSKEY new_uskey, DWORD flags) { - FIXME("(%s, 0x%08x, %p, %p, 0x%08x) stub\n", debugstr_w(pszPath), samDesired, - hRelativeUSKey, phNewUSKey, dwFlags); - return ERROR_SUCCESS; + LONG ret = ERROR_CALL_NOT_IMPLEMENTED; + SHUSKEY *ret_key; + + TRACE("(%s, 0x%08x, %p, %p, 0x%08x)\n", debugstr_w(path), samDesired, + relative_key, new_uskey, flags); + + if (!new_uskey) return ERROR_INVALID_PARAMETER; + + *new_uskey = NULL; + + if (flags & ~SHREGSET_FORCE_HKCU) + { + FIXME("unsupported flags 0x%08x\n", flags); + return ERROR_SUCCESS; + } + + ret_key = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ret_key)); + lstrcpynW(ret_key->lpszPath, path, sizeof(ret_key->lpszPath)/sizeof(WCHAR)); + + if (relative_key) + { + ret_key->HKCUstart = SHRegDuplicateHKey(REG_GetHKEYFromHUSKEY(relative_key, REG_HKCU)); + ret_key->HKLMstart = SHRegDuplicateHKey(REG_GetHKEYFromHUSKEY(relative_key, REG_HKLM)); + } + else + { + ret_key->HKCUstart = HKEY_CURRENT_USER; + ret_key->HKLMstart = HKEY_LOCAL_MACHINE; + } + + if (flags & SHREGSET_FORCE_HKCU) + { + ret = RegCreateKeyExW(ret_key->HKCUstart, path, 0, NULL, 0, samDesired, NULL, &ret_key->HKCUkey, NULL); + if (ret == ERROR_SUCCESS) + *new_uskey = ret_key; + else + HeapFree(GetProcessHeap(), 0, ret_key); + } + + return ret; } /************************************************************************* diff --git a/dlls/shlwapi/tests/shreg.c b/dlls/shlwapi/tests/shreg.c index 3cee765..3634041 100644 --- a/dlls/shlwapi/tests/shreg.c +++ b/dlls/shlwapi/tests/shreg.c @@ -33,12 +33,11 @@ #define REG_CURRENT_VERSION "Software\\Microsoft\\Windows\\CurrentVersion\\explorer" static HMODULE hshlwapi; -typedef DWORD (WINAPI *SHCopyKeyA_func)(HKEY,LPCSTR,HKEY,DWORD); -static SHCopyKeyA_func pSHCopyKeyA; -typedef DWORD (WINAPI *SHRegGetPathA_func)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD); -static SHRegGetPathA_func pSHRegGetPathA; -typedef LSTATUS (WINAPI *SHRegGetValueA_func)(HKEY,LPCSTR,LPCSTR,SRRF,LPDWORD,LPVOID,LPDWORD); -static SHRegGetValueA_func pSHRegGetValueA; + +static DWORD (WINAPI *pSHCopyKeyA)(HKEY,LPCSTR,HKEY,DWORD); +static DWORD (WINAPI *pSHRegGetPathA)(HKEY,LPCSTR,LPCSTR,LPSTR,DWORD); +static LSTATUS (WINAPI *pSHRegGetValueA)(HKEY,LPCSTR,LPCSTR,SRRF,LPDWORD,LPVOID,LPDWORD); +static LSTATUS (WINAPI *pSHRegCreateUSKeyW)(LPCWSTR,REGSAM,HUSKEY,PHUSKEY,DWORD); static char sTestpath1[] = "%LONGSYSTEMVAR%\\subdir1"; static char sTestpath2[] = "%FOO%\\subdir1"; @@ -444,28 +443,47 @@ static void test_SHDeleteKey(void) ok( 0, "Could not set up SHDeleteKey test\n"); } +static void test_SHRegCreateUSKeyW(void) +{ + static const WCHAR subkeyW[] = {'s','u','b','k','e','y',0}; + LONG ret; + + if (!pSHRegCreateUSKeyW) + { + win_skip("SHRegCreateUSKeyW not available\n"); + return; + } + + ret = pSHRegCreateUSKeyW(subkeyW, KEY_ALL_ACCESS, NULL, NULL, SHREGSET_FORCE_HKCU); + ok(ret == ERROR_INVALID_PARAMETER, "got %d\n", ret); +} + START_TEST(shreg) { - HKEY hkey = create_test_entries(); + HKEY hkey = create_test_entries(); - if (!hkey) return; + if (!hkey) return; - hshlwapi = GetModuleHandleA("shlwapi.dll"); + hshlwapi = GetModuleHandleA("shlwapi.dll"); - /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ - if(!GetProcAddress(hshlwapi, "SHCreateStreamOnFileEx")){ - win_skip("Too old shlwapi version\n"); - return; - } + /* SHCreateStreamOnFileEx was introduced in shlwapi v6.0 */ + if(!GetProcAddress(hshlwapi, "SHCreateStreamOnFileEx")){ + win_skip("Too old shlwapi version\n"); + return; + } + + pSHCopyKeyA = (void*)GetProcAddress(hshlwapi,"SHCopyKeyA"); + pSHRegGetPathA = (void*)GetProcAddress(hshlwapi,"SHRegGetPathA"); + pSHRegGetValueA = (void*)GetProcAddress(hshlwapi,"SHRegGetValueA"); + pSHRegCreateUSKeyW = (void*)GetProcAddress(hshlwapi, "SHRegCreateUSKeyW"); + + test_SHGetValue(); + test_SHRegGetValue(); + test_SHQueryValueEx(); + test_SHGetRegPath(); + test_SHCopyKey(); + test_SHDeleteKey(); + test_SHRegCreateUSKeyW(); - pSHCopyKeyA=(SHCopyKeyA_func)GetProcAddress(hshlwapi,"SHCopyKeyA"); - pSHRegGetPathA=(SHRegGetPathA_func)GetProcAddress(hshlwapi,"SHRegGetPathA"); - pSHRegGetValueA=(SHRegGetValueA_func)GetProcAddress(hshlwapi,"SHRegGetValueA"); - test_SHGetValue(); - test_SHRegGetValue(); - test_SHQueryValueEx(); - test_SHGetRegPath(); - test_SHCopyKey(); - test_SHDeleteKey(); - delete_key( hkey, "Software\\Wine", "Test" ); + delete_key( hkey, "Software\\Wine", "Test" ); }

1 0

Andrew Eikum : wineoss.drv: Remove volume setting support.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 65381d1c376585277d30bdfdde9cc2aa17c15392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65381d1c376585277d30bdfdd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 1 10:57:11 2011 -0600 wineoss.drv: Remove volume setting support. --- dlls/wineoss.drv/mmdevdrv.c | 105 ++++-------------------------------------- 1 files changed, 10 insertions(+), 95 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 51ae720..b46b60e 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -165,7 +165,6 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT oss_setvol(ACImpl *This, UINT32 index); static const IAudioClientVtbl AudioClient_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; @@ -993,8 +992,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->initted = TRUE; - oss_setvol(This, -1); - LeaveCriticalSection(&This->lock); return S_OK; @@ -2405,83 +2402,6 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = AudioSessionControl_SetDuckingPreference }; -/* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT oss_setvol(ACImpl *This, UINT32 index) -{ - int setreq, getreq; - unsigned int vol; - unsigned short l; - float level; - - if(index == (UINT32)-1){ - HRESULT ret = S_OK; - UINT32 i; - for(i = 0; i < This->fmt->nChannels; ++i){ - HRESULT hr; - hr = oss_setvol(This, i); - if(FAILED(hr)) - ret = hr; - } - return ret; - } - - if(index > 1) - /* OSS doesn't support volume control past the first two channels */ - return S_OK; - - if(This->dataflow == eRender){ - setreq = SNDCTL_DSP_SETPLAYVOL; - getreq = SNDCTL_DSP_GETPLAYVOL; - }else if(This->dataflow == eCapture){ - setreq = SNDCTL_DSP_SETRECVOL; - getreq = SNDCTL_DSP_GETRECVOL; - }else - return E_UNEXPECTED; - - if(ioctl(This->fd, getreq, &vol) < 0){ - if(errno == EINVAL) - /* device doesn't support this call */ - return S_OK; - - WARN("GET[REC|PLAY]VOL failed: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - - level = This->session->master_vol * This->session->channel_vols[index] * - This->vols[index]; - l = level * 100; - if(index == 0) - vol = l | (vol & 0xFF00); - else - vol = (vol & 0xFF) | (l << 8); - - if(ioctl(This->fd, setreq, &vol) < 0){ - if(errno == EINVAL) - /* device doesn't support this call */ - return S_OK; - - WARN("SET[REC|PLAY]VOL failed: %d (%s)\n", errno, strerror(errno)); - return E_FAIL; - } - - return S_OK; -} - -static HRESULT oss_session_setvol(AudioSession *session, UINT32 index) -{ - HRESULT ret = S_OK; - ACImpl *client; - - LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ - HRESULT hr; - hr = oss_setvol(client, index); - if(FAILED(hr)) - ret = hr; - } - - return ret; -} - static HRESULT WINAPI SimpleAudioVolume_QueryInterface( ISimpleAudioVolume *iface, REFIID riid, void **ppv) { @@ -2520,7 +2440,6 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); @@ -2534,11 +2453,11 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( session->master_vol = level; - ret = oss_session_setvol(session, -1); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&session->lock); - return ret; + return S_OK; } static HRESULT WINAPI SimpleAudioVolume_GetMasterVolume( @@ -2667,7 +2586,6 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( IAudioStreamVolume *iface, UINT32 index, float level) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - HRESULT ret; TRACE("(%p)->(%d, %f)\n", This, index, level); @@ -2681,11 +2599,11 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; - ret = oss_setvol(This, index); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&This->lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( @@ -2711,7 +2629,6 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( { ACImpl *This = impl_from_IAudioStreamVolume(iface); int i; - HRESULT ret; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -2726,11 +2643,11 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = oss_setvol(This, -1); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&This->lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( @@ -2824,7 +2741,6 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; TRACE("(%p)->(%d, %f, %s)\n", session, index, level, wine_dbgstr_guid(context)); @@ -2842,11 +2758,11 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; - ret = oss_session_setvol(session, index); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&session->lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetChannelVolume( @@ -2875,7 +2791,6 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; int i; - HRESULT ret; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -2894,11 +2809,11 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; - ret = oss_session_setvol(session, -1); + TRACE("OSS doesn't support setting volume\n"); LeaveCriticalSection(&session->lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes(

1 0

Andrew Eikum : wineoss.drv: Add period to latency calculation.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 3cc871b0b08094319f4a9eb6a8c07a6ae456fe05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc871b0b08094319f4a9eb6a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 1 10:57:18 2011 -0600 wineoss.drv: Add period to latency calculation. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b46b60e..bb3297b 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1055,6 +1055,10 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, }else *latency = 10000; /* OSS doesn't provide input latency */ + /* pretend we process audio in Period chunks, so max latency includes + * the period time */ + *latency += DefaultPeriod; + LeaveCriticalSection(&This->lock); return S_OK;

1 0

Ken Thomases : winemenubuilder: Use _P_DETACH instead of _P_NOWAIT with spawnvp() to avoid zombies.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 31141a3beae2c2fe10ae177a8c22ae7ac6dd59d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31141a3beae2c2fe10ae177a8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 30 16:49:45 2011 -0600 winemenubuilder: Use _P_DETACH instead of _P_NOWAIT with spawnvp() to avoid zombies. --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 755e0b2..c07507d 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -3321,11 +3321,11 @@ static void RefreshFileTypeAssociations(void) argv[0] = "update-mime-database"; argv[1] = mime_dir; argv[2] = NULL; - spawnvp( _P_NOWAIT, argv[0], argv ); + spawnvp( _P_DETACH, argv[0], argv ); argv[0] = "update-desktop-database"; argv[1] = applications_dir; - spawnvp( _P_NOWAIT, argv[0], argv ); + spawnvp( _P_DETACH, argv[0], argv ); } end:

1 0

Akihiro Sagawa : msvcrt: Use given locale info in _mbtowcs_l.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: f9403bfb902bcb4a9bb258bcb22540af81368d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9403bfb902bcb4a9bb258bcb… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 30 22:34:05 2011 +0900 msvcrt: Use given locale info in _mbtowcs_l. --- dlls/msvcrt/mbcs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e9adbd8..ac45881 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1937,7 +1937,7 @@ MSVCRT_size_t CDECL MSVCRT__mbstowcs_l(MSVCRT_wchar_t *wcstr, const char *mbstr, if(mbstr[size] == '\0') break; - size += (MSVCRT_isleadbyte(mbstr[size]) ? 2 : 1); + size += (MSVCRT__isleadbyte_l(mbstr[size], locale) ? 2 : 1); } size = MultiByteToWideChar(locinfo->lc_codepage, 0,

1 0

Akihiro Sagawa : msvcrt: Fix wctob in C locale.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 13aff6dc56278cd5323af0d7bee53b0ebc5a643e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13aff6dc56278cd5323af0d7b… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 30 22:34:13 2011 +0900 msvcrt: Fix wctob in C locale. --- dlls/msvcrt/tests/string.c | 3 +++ dlls/msvcrt/wcs.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 5fe69cf..c923684 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2002,6 +2002,9 @@ static void test_wctob(void) ret = p_wctob(0x81); ok(ret == (int)(char)0x81, "ret = %x\n", ret); + ret = p_wctob(0x9f); + ok(ret == (int)(char)0x9f, "ret = %x\n", ret); + ret = p_wctob(0xe0); ok(ret == (int)(char)0xe0, "ret = %x\n", ret); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1a685de..17ff532 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1056,8 +1056,14 @@ INT CDECL MSVCRT_wctob( MSVCRT_wint_t wchar ) { char out; BOOL error; + UINT codepage = get_locinfo()->lc_codepage; - if(WideCharToMultiByte( get_locinfo()->lc_codepage, 0, &wchar, 1, &out, 1, NULL, &error ) && !error) + if(!codepage) { + if (wchar < 0xff) + return (signed char)wchar; + else + return MSVCRT_EOF; + } else if(WideCharToMultiByte( codepage, 0, &wchar, 1, &out, 1, NULL, &error ) && !error) return (INT)out; return MSVCRT_EOF; }

1 0

Akihiro Sagawa : msvcrt: Add validity checks for _mbstrlen_l.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 28184600e74972c0cc5268c79e2b22da3643ac6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=28184600e74972c0cc5268c79… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Nov 30 22:34:09 2011 +0900 msvcrt: Add validity checks for _mbstrlen_l. --- dlls/msvcrt/mbcs.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index ac45881..a8cd237 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -1858,15 +1858,14 @@ MSVCRT_size_t CDECL _mbstrlen_l(const char* str, MSVCRT__locale_t locale) locinfo = locale->locinfo; if(locinfo->mb_cur_max > 1) { - MSVCRT_size_t len = 0; - while(*str) { - /* FIXME: According to the documentation we are supposed to test for - * multi-byte character validity. Whatever that means - */ - str += MSVCRT_isleadbyte(*str) ? 2 : 1; - len++; + MSVCRT_size_t len; + len = MultiByteToWideChar(locinfo->lc_codepage, MB_ERR_INVALID_CHARS, + str, -1, NULL, 0); + if (!len) { + *MSVCRT__errno() = MSVCRT_EILSEQ; + return -1; } - return len; + return len - 1; } return strlen(str);

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 56886ab7b102b19638bfd500ab0893166c05d5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56886ab7b102b19638bfd500a… Author: Luca Bennati <lucak3(a)gmail.com> Date: Wed Nov 30 16:01:13 2011 +0100 po: Update Italian translation. --- po/it.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/it.po b/po/it.po index fd29289..92a9811 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-28 08:30+0100\n" +"PO-Revision-Date: 2011-11-29 22:07+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -12477,7 +12477,6 @@ msgstr "" "spiacenti per l'inconveniente." #: winedbg.rc:53 -#, fuzzy msgid "" "This can be caused by a problem in the program or a deficiency in Wine. You " "may want to check the <a href=\"http://appdb.winehq.org\">Application " @@ -12487,11 +12486,12 @@ msgid "" "you can <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a>." msgstr "" "Ciò può essere causato da un problema nel programma o da una mancanza di " -"Wine. Potresti voler consultare http://appdb.winehq.org per consigli su " +"Wine. Potresti voler consultare il <a href=\"http://appdb.winehq.org\">" +"Database delle applicazioni</a> per consigli su " "questa applicazione.\n" "\n" "Se questo problema non è presente sotto Windows e non è stato ancora " -"segnalato, puoi segnalarlo su http://bugs.winehq.org." +"segnalato, puoi <a href=\"http://wiki.winehq.org/Bugs\">segnalarlo</a>." #: winedbg.rc:35 msgid "Wine program crash"

1 0

Hans Leidekker : winhttp: Consistently use the allocation macros.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 9a2f3cb98a53ff8550e770e8837f90506cf27502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a2f3cb98a53ff8550e770e88… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 1 13:01:51 2011 +0100 winhttp: Consistently use the allocation macros. --- dlls/winhttp/net.c | 4 ++-- dlls/winhttp/url.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 60cb652..c5d3e94 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -532,7 +532,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) pCRYPTO_set_id_callback(ssl_thread_id); num_ssl_locks = pCRYPTO_num_locks(); - ssl_locks = HeapAlloc(GetProcessHeap(), 0, num_ssl_locks * sizeof(CRITICAL_SECTION)); + ssl_locks = heap_alloc(num_ssl_locks * sizeof(CRITICAL_SECTION)); if (!ssl_locks) { set_last_error( ERROR_OUTOFMEMORY ); @@ -577,7 +577,7 @@ void netconn_unload( void ) ssl_locks[i].DebugInfo->Spare[0] = 0; DeleteCriticalSection( &ssl_locks[i] ); } - HeapFree( GetProcessHeap(), 0, ssl_locks ); + heap_free( ssl_locks ); } DeleteCriticalSection(&init_ssl_cs); #endif diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 3938801..798b549 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -210,7 +210,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN debugstr_wn( uc->lpszExtraInfo, uc->dwExtraInfoLength )); exit: - HeapFree( GetProcessHeap(), 0, url_decoded ); + heap_free( url_decoded ); return ret; }

1 0