October 2011 - Wine-Commits

Ken Sharp : po: Update English (Neutral) resource.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 7df024529541128719ed09a7ed69bda0b11beadb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df024529541128719ed09a7e… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Fri Oct 28 15:55:10 2011 +0100 po: Update English (Neutral) resource. --- po/en.po | 72 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 40 insertions(+), 32 deletions(-) diff --git a/po/en.po b/po/en.po index aad88b7..ca783cd 100644 --- a/po/en.po +++ b/po/en.po @@ -744,11 +744,11 @@ msgstr "Country/Region" #: crypt32.rc:72 msgid "Organization" -msgstr "Organization" +msgstr "Organisation" #: crypt32.rc:73 msgid "Organizational Unit" -msgstr "Organizational Unit" +msgstr "Organisational Unit" #: crypt32.rc:74 msgid "Common Name" @@ -800,7 +800,7 @@ msgstr "Cross CA Version" #: crypt32.rc:86 msgid "Serialized Signature Serial Number" -msgstr "Serialized Signature Serial Number" +msgstr "Serialised Signature Serial Number" #: crypt32.rc:87 msgid "Principal Name" @@ -812,7 +812,7 @@ msgstr "Windows Product Update" #: crypt32.rc:89 msgid "Enrollment Name Value Pair" -msgstr "Enrollment Name Value Pair" +msgstr "Enrolment Name Value Pair" #: crypt32.rc:90 msgid "OS Version" @@ -820,7 +820,7 @@ msgstr "OS Version" #: crypt32.rc:91 msgid "Enrollment CSP" -msgstr "Enrollment CSP" +msgstr "Enrolment CSP" #: crypt32.rc:92 msgid "CRL Number" @@ -1068,11 +1068,11 @@ msgstr "Embedded Windows System Component Verification" #: crypt32.rc:153 cryptui.rc:140 msgid "Key Pack Licenses" -msgstr "Key Pack Licenses" +msgstr "Key Pack Licences" #: crypt32.rc:154 cryptui.rc:141 msgid "License Server Verification" -msgstr "License Server Verification" +msgstr "Licence Server Verification" #: crypt32.rc:155 cryptui.rc:143 msgid "Smart Card Logon" @@ -1415,7 +1415,7 @@ msgstr "Notice Reference" #: cryptdlg.rc:35 msgid "Organization=" -msgstr "Organization=" +msgstr "Organisation=" #: cryptdlg.rc:36 msgid "Notice Number=" @@ -1647,7 +1647,7 @@ msgstr "" #: cryptui.rc:82 msgid "The file format is not recognized. Please select another file." -msgstr "" +msgstr "The file format is not recognised. Please select another file." #: cryptui.rc:83 msgid "Could not open " @@ -3507,7 +3507,7 @@ msgstr "" #: winerror.mc:1546 msgid "The device needs reinitialization\n" -msgstr "" +msgstr "The device needs reinitialisation\n" #: winerror.mc:1551 msgid "The device requires cleaning\n" @@ -6622,7 +6622,7 @@ msgstr "" #: shell32.rc:266 msgid "Wine License" -msgstr "Wine License" +msgstr "Wine Licence" #: shell32.rc:155 msgid "Trash" @@ -6662,11 +6662,11 @@ msgstr "" #: user32.rc:30 user32.rc:43 msgid "Mi&nimize" -msgstr "" +msgstr "Mi&nimise" #: user32.rc:31 user32.rc:44 taskmgr.rc:83 taskmgr.rc:99 taskmgr.rc:126 msgid "Ma&ximize" -msgstr "" +msgstr "Ma&ximise" #: user32.rc:33 msgid "&Close\tAlt-F4" @@ -6852,11 +6852,11 @@ msgstr "" #: winmm.rc:57 msgid "The driver cannot recognize the specified command parameter." -msgstr "The driver cannot recognize the specified command parameter." +msgstr "The driver cannot recognise the specified command parameter." #: winmm.rc:58 msgid "The driver cannot recognize the specified command." -msgstr "The driver cannot recognize the specified command." +msgstr "The driver cannot recognise the specified command." #: winmm.rc:59 msgid "" @@ -6868,7 +6868,7 @@ msgstr "" #: winmm.rc:60 msgid "The specified device is not open or is not recognized by MCI." -msgstr "The specified device is not open or is not recognized by MCI." +msgstr "The specified device is not open or is not recognised by MCI." #: winmm.rc:61 msgid "" @@ -7217,7 +7217,7 @@ msgid "" "The device you are trying to play to cannot recognize the current file " "format." msgstr "" -"The device you are trying to play to cannot recognize the current file " +"The device you are trying to play to cannot recognise the current file " "format." #: winmm.rc:116 @@ -8015,6 +8015,8 @@ msgid "" "ENDLOCAL ends localization of environment changes in a batch file\n" "which were introduced by a preceding SETLOCAL.\n" msgstr "" +"ENDLOCAL ends localisation of environment changes in a batch file\n" +"which were introduced by a preceding SETLOCAL.\n" #: cmd.rc:217 msgid "" @@ -8025,6 +8027,12 @@ msgid "" "file, whichever comes first), at which point the previous environment\n" "settings are restored.\n" msgstr "" +"SETLOCAL starts localisation of environment changes in a batch file.\n" +"\n" +"Environment changes done after a SETLOCAL are local to the batch file, and\n" +"are preserved until the next ENDLOCAL is encountered (or at the end of the\n" +"file, whichever comes first), at which point the previous environment\n" +"settings are restored.\n" #: cmd.rc:220 msgid "" @@ -8143,7 +8151,7 @@ msgstr "" "DEL (ERASE)\tDelete a file or set of files\n" "DIR\t\tList the contents of a directory\n" "ECHO\t\tCopy text directly to the console output\n" -"ENDLOCAL\tEnd localization of environment changes in a batch file\n" +"ENDLOCAL\tEnd localisation of environment changes in a batch file\n" "FTYPE\t\tShow or modify open commands associated with file types\n" "HELP\t\tShow brief help details on a topic\n" "MD (MKDIR)\tCreate a subdirectory\n" @@ -9010,7 +9018,7 @@ msgstr "" #: progman.rc:43 msgid "&Minimize on run" -msgstr "" +msgstr "&Minimise on run" #: progman.rc:44 winefile.rc:73 msgid "&Save settings on exit" @@ -9456,14 +9464,14 @@ msgstr "" "start [options] document_filename\n" "\n" "Options:\n" -"/M[inimized] Start the program minimized.\n" -"/MAX[imized] Start the program maximized.\n" -"/R[estored] Start the program normally (neither minimized nor maximized).\n" +"/M[inimised] Start the program minimised.\n" +"/MAX[imised] Start the program maximised.\n" +"/R[estored] Start the program normally (neither minimised nor maximised).\n" "/W[ait] Wait for started program to finish, then exit with its exit " "code.\n" "/Unix Use a Unix filename and start the file like windows explorer.\n" "/ProgIDOpen Open a document using the following progID.\n" -"/L Show end-user license.\n" +"/L Show end-user licence.\n" "/? Display this help and exit.\n" "\n" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" @@ -9589,11 +9597,11 @@ msgstr "" #: taskmgr.rc:45 msgid "&Minimize On Use" -msgstr "" +msgstr "&Minimise On Use" #: taskmgr.rc:47 msgid "&Hide When Minimized" -msgstr "" +msgstr "&Hide When Minimised" #: taskmgr.rc:49 taskmgr.rc:257 msgid "&Show 16-bit tasks" @@ -9653,7 +9661,7 @@ msgstr "" #: taskmgr.rc:82 taskmgr.rc:98 taskmgr.rc:125 msgid "&Minimize" -msgstr "" +msgstr "&Minimise" #: taskmgr.rc:84 taskmgr.rc:100 taskmgr.rc:127 msgid "&Cascade" @@ -9729,15 +9737,15 @@ msgstr "" #: taskmgr.rc:188 msgid "Task Manager remains in front of all other windows unless minimized" -msgstr "" +msgstr "Task Manager remains in front of all other windows unless minimised" #: taskmgr.rc:190 msgid "Task Manager is minimized when a SwitchTo operation is performed" -msgstr "" +msgstr "Task Manager is minimised when a SwitchTo operation is performed" #: taskmgr.rc:191 msgid "Hide the Task Manager when it is minimized" -msgstr "" +msgstr "Hide the Task Manager when it is minimised" #: taskmgr.rc:192 msgid "Force Task Manager to update now, regardless of Update Speed setting" @@ -9781,11 +9789,11 @@ msgstr "" #: taskmgr.rc:207 msgid "Minimizes the windows" -msgstr "" +msgstr "Minimises the windows" #: taskmgr.rc:208 msgid "Maximizes the windows" -msgstr "" +msgstr "Maximises the windows" #: taskmgr.rc:209 msgid "Cascades the windows diagonally on the desktop" @@ -10503,7 +10511,7 @@ msgstr "" #: wineconsole.rc:43 msgid "wineconsole: Unrecognized command line option\n" -msgstr "" +msgstr "wineconsole: Unrecognised command line option\n" #: wineconsole.rc:44 msgid "Starts a program in a Wine console\n"

1 0

Andrew Eikum : winmm: Fix clock position calculation.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 0a20ec093597a669ef178569e93bc5200b0b9c41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a20ec093597a669ef178569e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Oct 28 09:51:51 2011 -0500 winmm: Fix clock position calculation. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index e9ee007..cb0762c 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1247,7 +1247,7 @@ static WAVEHDR *WOD_MarkDoneHeaders(WINMM_Device *device) return NULL; } - clock_frames = (clock_pos / (double)clock_freq) * device->samples_per_sec; + clock_frames = (clock_pos * device->samples_per_sec) / clock_freq; nloops = device->loop_counter; while(queue &&

1 0

Michael Stefaniuc : kernel32/ntdll: Mark a variable as unused.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 68f90d9697f66f4b0d928c899a5caf70fbce2187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f90d9697f66f4b0d928c899… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Oct 28 17:04:33 2011 +0200 kernel32/ntdll: Mark a variable as unused. --- dlls/kernel32/virtual.c | 2 +- dlls/ntdll/virtual.c | 2 +- include/wine/exception.h | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/virtual.c b/dlls/kernel32/virtual.c index 6328399..c878ed8 100644 --- a/dlls/kernel32/virtual.c +++ b/dlls/kernel32/virtual.c @@ -650,7 +650,7 @@ BOOL WINAPI IsBadReadPtr( LPCVOID ptr, UINT size ) __TRY { volatile const char *p = ptr; - char dummy; + char dummy __attribute__((unused)); UINT count = size; while (count > page_size) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 054b924..7185f14 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1651,7 +1651,7 @@ BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) __TRY { volatile const char *p = ptr; - char dummy; + char dummy __attribute__((unused)); SIZE_T count = size; while (count > page_size) diff --git a/include/wine/exception.h b/include/wine/exception.h index 469083f..9115fc9 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -69,6 +69,10 @@ extern "C" { * -- AJ */ +#ifndef __GNUC__ +#define __attribute__(x) /* nothing */ +#endif + /* Define this if you want to use your compiler built-in __try/__except support. * This is only useful when compiling to a native Windows binary, as the built-in * compiler exceptions will most certainly not work under Winelib. @@ -84,10 +88,6 @@ extern "C" { #else /* USE_COMPILER_EXCEPTIONS */ -#ifndef __GNUC__ -#define __attribute__(x) /* nothing */ -#endif - #if defined(__MINGW32__) || defined(__CYGWIN__) #define sigjmp_buf jmp_buf #define sigsetjmp(buf,sigs) setjmp(buf)

1 0

Huw Davies : comctl32: Initialise the mask's colour table.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 66fe4e74cb9c07e9639f388d0135efa056f8c49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66fe4e74cb9c07e9639f388d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 28 14:55:08 2011 +0100 comctl32: Initialise the mask's colour table. --- dlls/comctl32/imagelist.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 83b8b44..bd706ac 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1226,6 +1226,14 @@ static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int des /* generate alpha channel from the mask */ info->bmiHeader.biBitCount = 1; info->bmiHeader.biSizeImage = width_bytes * cy; + info->bmiColors[0].rgbRed = 0; + info->bmiColors[0].rgbGreen = 0; + info->bmiColors[0].rgbBlue = 0; + info->bmiColors[0].rgbReserved = 0; + info->bmiColors[1].rgbRed = 0xff; + info->bmiColors[1].rgbGreen = 0xff; + info->bmiColors[1].rgbBlue = 0xff; + info->bmiColors[1].rgbReserved = 0; if (!(mask = CreateDIBSection( himl->hdcMask, info, DIB_RGB_COLORS, &mask_bits, 0, 0 ))) goto done; SelectObject( hdc, mask );

1 0

Jörg Höhle : mmdevapi: IsFormatSupported EXCLUSIVE mode never returns S_FALSE.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 00684f84a550d5f4740b00f0d53a0ba5952ddc2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=00684f84a550d5f4740b00f0d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 8 15:21:52 2011 +0200 mmdevapi: IsFormatSupported EXCLUSIVE mode never returns S_FALSE. --- dlls/winealsa.drv/mmdevdrv.c | 8 +++++++- dlls/winecoreaudio.drv/mmdevdrv.c | 8 +++----- dlls/wineoss.drv/mmdevdrv.c | 16 +++++++++------- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ac5be34..25693c0 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1204,8 +1204,11 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(fmt); - if(out) + if(out){ *out = NULL; + if(mode != AUDCLNT_SHAREMODE_SHARED) + out = NULL; + } EnterCriticalSection(&This->lock); @@ -1339,6 +1342,9 @@ exit: LeaveCriticalSection(&This->lock); HeapFree(GetProcessHeap(), 0, formats); + if(hr == S_FALSE && !out) + hr = AUDCLNT_E_UNSUPPORTED_FORMAT; + if(hr == S_FALSE && out) { closest->nBlockAlign = closest->nChannels * closest->wBitsPerSample / 8; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 79cf5e3..a35f18c 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1145,6 +1145,9 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); + if(outpwfx) + *outpwfx = NULL; + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && fmtex->dwChannelMask != 0 && fmtex->dwChannelMask != get_channel_mask(pwfx->nChannels)) @@ -1156,17 +1159,12 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, if(SUCCEEDED(hr)){ AudioQueueDispose(aqueue, 1); OSSpinLockUnlock(&This->lock); - if(outpwfx) - *outpwfx = NULL; TRACE("returning %08x\n", S_OK); return S_OK; } OSSpinLockUnlock(&This->lock); - if(outpwfx) - *outpwfx = NULL; - TRACE("returning %08x\n", AUDCLNT_E_UNSUPPORTED_FORMAT); return AUDCLNT_E_UNSUPPORTED_FORMAT; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index f8316ee..24cd147 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -714,9 +714,6 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; WAVEFORMATEX *closest = NULL; - if(out) - *out = NULL; - tmp = oss_format = get_oss_format(fmt); if(oss_format < 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -767,6 +764,9 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, ret = S_FALSE; } + if(ret == S_FALSE && !out) + ret = AUDCLNT_E_UNSUPPORTED_FORMAT; + if(ret == S_FALSE && out){ closest->nBlockAlign = closest->nChannels * closest->wBitsPerSample / 8; @@ -901,10 +901,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, } hr = setup_oss_device(This->fd, fmt, NULL, FALSE); - if(hr == S_FALSE){ - LeaveCriticalSection(&This->lock); - return AUDCLNT_E_UNSUPPORTED_FORMAT; - } if(FAILED(hr)){ LeaveCriticalSection(&This->lock); return hr; @@ -1137,6 +1133,12 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); + if(outpwfx){ + *outpwfx = NULL; + if(mode != AUDCLNT_SHAREMODE_SHARED) + outpwfx = NULL; + } + if(This->dataflow == eRender) fd = open(This->devnode, O_WRONLY, 0); else if(This->dataflow == eCapture)

1 0

Aric Stewart : usp10: All glyphs in a single indic syllable are part of the same cluster.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: ec23fe6543f6292aa81f70aa46430ad393c7082b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec23fe6543f6292aa81f70aa4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 27 13:38:42 2011 -0500 usp10: All glyphs in a single indic syllable are part of the same cluster. --- dlls/usp10/indic.c | 33 ++++++++++++++++++++++++--------- dlls/usp10/shape.c | 21 +++++++++++++++++++++ dlls/usp10/usp10_internal.h | 1 + 3 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index f8e5b5e..df2a977 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -71,7 +71,8 @@ static void debug_output_string(LPCWSTR str, int cChar, lexical_function f) static inline BOOL is_matra( int type ) { return (type == lex_Matra_above || type == lex_Matra_below || - type == lex_Matra_pre || type == lex_Matra_post); + type == lex_Matra_pre || type == lex_Matra_post || + type == lex_Composed_Vowel); } static inline BOOL is_joiner( int type ) @@ -207,7 +208,7 @@ static INT Indic_process_next_syllable( LPCWSTR input, INT cChar, INT start, INT return parse_consonant_syllable(input, cChar, start, main, next, lex); } -static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -224,7 +225,7 @@ static BOOL Consonent_is_post_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac return FALSE; } -static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -241,7 +242,7 @@ static BOOL Consonent_is_below_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCa return FALSE; } -static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) +static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical, BOOL modern) { if (is_consonant(lexical(pwChar[s->base])) && s->base > s->start && lexical(pwChar[s->base-1]) == lex_Halant) { @@ -258,14 +259,14 @@ static BOOL Consonent_is_pre_base_form(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach return FALSE; } -static BOOL Consonent_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR pwChar, IndicSyllable *s, lexical_function lexical) +static BOOL Consonent_is_ralf(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR pwChar, IndicSyllable *s, lexical_function lexical) { if ((lexical(pwChar[s->start])==lex_Ra) && s->end > s->start && lexical(pwChar[s->start+1]) == lex_Halant) return (SHAPE_does_GSUB_feature_apply_to_chars(hdc, psa, psc, &pwChar[s->start], 1, 2, "rphf") > 0); return FALSE; } -static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, IndicSyllable *s, lexical_function lex, BOOL modern) +static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, IndicSyllable *s, lexical_function lex, BOOL modern) { int i; BOOL blwf = FALSE; @@ -313,7 +314,7 @@ static int FindBaseConsonant(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LP return s->base; } -void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, reorder_function reorder_f, BOOL modern) +void Indic_ParseSyllables( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, const int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern) { int index = 0; int next = 0; @@ -321,7 +322,7 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L *syllable_count = 0; - if (!lex || ! reorder_f) + if (!lex) { ERR("Failure to have required functions\n"); return; @@ -349,7 +350,6 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L (*syllables)[*syllable_count].pref = -1; (*syllables)[*syllable_count].end = next-1; FindBaseConsonant(hdc, psa, psc, input, &(*syllables)[*syllable_count], lex, modern); - reorder_f(input, &(*syllables)[*syllable_count], lex); index = next; *syllable_count = (*syllable_count)+1; } @@ -361,3 +361,18 @@ void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, L } TRACE("Processed %i of %i characters into %i syllables\n",index,cChar,*syllable_count); } + +void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, reorder_function reorder_f, BOOL modern) +{ + int i; + + if (!reorder_f) + { + ERR("Failure to have required functions\n"); + return; + } + + Indic_ParseSyllables(hdc, psa, psc, input, cChar, syllables, syllable_count, lex, modern); + for (i = 0; i < *syllable_count; i++) + reorder_f(input, &(*syllables)[i], lex); +} diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0b1af46..779e8f6 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3213,6 +3213,9 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp, lexical_function lexical) { int i,k; + IndicSyllable *syllables = NULL; + int syllable_count = 0; + BOOL modern = get_GSUB_Indic2(psa, psc); for (i = 0; i < cGlyphs; i++) { @@ -3257,7 +3260,25 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL break; } } + + Indic_ParseSyllables( hdc, psa, psc, pwcChars, cChars, &syllables, &syllable_count, lexical, modern); + + for (i = 0; i < syllable_count; i++) + { + int j; + WORD g = pwLogClust[syllables[i].start]; + for (j = syllables[i].start+1; j <= syllables[i].end; j++) + { + if (pwLogClust[j] != g) + { + pGlyphProp[pwLogClust[j]].sva.fClusterStart = 0; + pwLogClust[j] = g; + } + } + } + UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); + HeapFree(GetProcessHeap(), 0, syllables); } static void ShapeCharGlyphProp_Devanagari( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index e85afbe..7a88ac7 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -136,5 +136,6 @@ void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) DECLSPEC_HIDDEN; void Indic_ReorderCharacters( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPWSTR input, int cChars, IndicSyllable **syllables, int *syllable_count, lexical_function lexical_f, reorder_function reorder_f, BOOL modern) DECLSPEC_HIDDEN; +void Indic_ParseSyllables( HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, LPCWSTR input, const int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern); void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Mask FPU exceptions around fontconfig calls.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 171183c77b2ac7c808d5090f7c46a71b7d033eb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=171183c77b2ac7c808d5090f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 28 12:41:14 2011 +0200 winex11: Mask FPU exceptions around fontconfig calls. --- dlls/winex11.drv/xrender.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 8ee3f59..3157d8c 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -952,11 +952,18 @@ static int GetCacheEntry( HDC hdc, LFANDSIZE *plfsz ) #ifdef SONAME_LIBFONTCONFIG if (fontconfig_installed) { - FcPattern *match, *pattern = pFcPatternCreate(); + FcPattern *match, *pattern; FcResult result; char family[LF_FACESIZE * 4]; +#if defined(__i386__) && defined(__GNUC__) + /* fontconfig generates floating point exceptions, mask them */ + WORD cw, default_cw = 0x37f; + __asm__ __volatile__("fnstcw %0; fldcw %1" : "=m" (cw) : "m" (default_cw)); +#endif + WideCharToMultiByte( CP_UTF8, 0, plfsz->lf.lfFaceName, -1, family, sizeof(family), NULL, NULL ); + pattern = pFcPatternCreate(); pFcPatternAddString( pattern, FC_FAMILY, (FcChar8 *)family ); if (plfsz->lf.lfWeight != FW_DONTCARE) { @@ -1007,6 +1014,10 @@ static int GetCacheEntry( HDC hdc, LFANDSIZE *plfsz ) pFcPatternDestroy( match ); } pFcPatternDestroy( pattern ); + +#if defined(__i386__) && defined(__GNUC__) + __asm__ __volatile__("fnclex; fldcw %0" : : "m" (cw)); +#endif } #endif /* SONAME_LIBFONTCONFIG */

1 0

Jörg Höhle : winecoreaudio: Release buffer memory .
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 41c6ffea440f0814b16b3499f4d7dbdfdd7699e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c6ffea440f0814b16b3499f… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Aug 21 06:53:56 2011 +0200 winecoreaudio: Release buffer memory. --- dlls/winecoreaudio.drv/mmdevdrv.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c45a8c6..79cf5e3 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -509,16 +509,27 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ - IAudioClient_Stop(iface); - if(This->aqueue) + if(This->aqueue){ + AQBuffer *buf, *next; + if(This->public_buffer){ + buf = This->public_buffer->mUserData; + list_add_tail(&This->avail_buffers, &buf->entry); + } + IAudioClient_Stop(iface); + AudioQueueStop(This->aqueue, 1); + /* Stopped synchronously, all buffers returned. */ + LIST_FOR_EACH_ENTRY_SAFE(buf, next, &This->avail_buffers, AQBuffer, entry){ + AudioQueueFreeBuffer(This->aqueue, buf->buf); + HeapFree(GetProcessHeap(), 0, buf); + } AudioQueueDispose(This->aqueue, 1); + } if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, This->public_buffer); CoTaskMemFree(This->fmt); IMMDevice_Release(This->parent); HeapFree(GetProcessHeap(), 0, This);

1 0

Frédéric Delanoy : cmd: Fix a comment.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: ecc4d8725374ed0e1c80f650888e2a4ec182ddbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc4d8725374ed0e1c80f6508… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 28 09:52:18 2011 +0200 cmd: Fix a comment. --- programs/cmd/tests/test_builtins.cmd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a56d0a3..13c9393 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1436,7 +1436,7 @@ if exist foo.cmd ( echo ------------ Testing setlocal/endlocal ------------ call :setError 0 -rem Note: setlocal EnableDelayedExtension already tested in the variable delayed expansion test section +rem Note: setlocal EnableDelayedExpansion already tested in the variable delayed expansion test section mkdir foobar & cd foobar echo ...enable/disable extensions setlocal DisableEXTensions

1 0

Austin English : winex11: Only declare X11DRV_DIB_QueryXShm if XShm is supported.
by Alexandre Julliard Oct. 28, 2011

Oct. 28, 2011

Module: wine Branch: master Commit: 31f8a525c8ce42b815d0824ffd213e15f4776c6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f8a525c8ce42b815d0824ff… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 27 13:25:26 2011 -0500 winex11: Only declare X11DRV_DIB_QueryXShm if XShm is supported. --- dlls/winex11.drv/dib.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index b70dcfa..7e30530 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3849,7 +3849,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp, } return image; } -#endif /* HAVE_LIBXXSHM */ static Bool X11DRV_DIB_QueryXShm( Bool *pixmaps ) { @@ -3858,17 +3857,16 @@ static Bool X11DRV_DIB_QueryXShm( Bool *pixmaps ) if (!initialized) { -#ifdef HAVE_LIBXXSHM int major, minor; have_xshm = XShmQueryVersion( gdi_display, &major, &minor, &have_xshm_pixmaps ); -#endif initialized = TRUE; } *pixmaps = have_xshm_pixmaps; return have_xshm; } +#endif /* HAVE_LIBXXSHM */ /*********************************************************************** * X11DRV_CreateDIBSection (X11DRV.@)

1 0