October 2011 - Wine-Commits

Michael Stefaniuc : wordpad: Don't compare with TRUE.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 3e59606a3c7dffda0bb39d3c54b89851061c40ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e59606a3c7dffda0bb39d3c5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 1 21:44:54 2011 +0200 wordpad: Don't compare with TRUE. --- programs/wordpad/wordpad.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index feb618c..c5317ab 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -601,9 +601,9 @@ static void dialog_choose_font(void) fmt.dwEffects |= CFE_BOLD; if(cf.nFontType & ITALIC_FONTTYPE) fmt.dwEffects |= CFE_ITALIC; - if(cf.lpLogFont->lfUnderline == TRUE) + if(cf.lpLogFont->lfUnderline) fmt.dwEffects |= CFE_UNDERLINE; - if(cf.lpLogFont->lfStrikeOut == TRUE) + if(cf.lpLogFont->lfStrikeOut) fmt.dwEffects |= CFE_STRIKEOUT; fmt.crTextColor = cf.rgbColors;

1 0

Dmitry Timoshkov : kernel32: Fix a typo in the LoadLibrary return value testing.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 25ae02b4ed9dc0c46b2a16ce2c5e286482f5b42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=25ae02b4ed9dc0c46b2a16ce2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Sep 30 20:06:02 2011 +0900 kernel32: Fix a typo in the LoadLibrary return value testing. --- dlls/kernel32/tests/loader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index ce59843..c740d77 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -662,7 +662,7 @@ static void test_section_access(void) SetLastError(0xdeadbeef); hlib = LoadLibrary(dll_name); - ok(ret, "LoadLibrary error %d\n", GetLastError()); + ok(hlib != 0, "LoadLibrary error %d\n", GetLastError()); size = VirtualQuery((char *)hlib + section.VirtualAddress, &info, sizeof(info)); ok(size == sizeof(info),

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 7702ccbfc9fcbca436068eff00b50fe41f070f7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7702ccbfc9fcbca436068eff0… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Sep 28 19:51:00 2011 +0900 po: Updated Korean translation. --- po/ko.po | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/po/ko.po b/po/ko.po index a130c91..72b6485 100644 --- a/po/ko.po +++ b/po/ko.po @@ -10337,12 +10337,11 @@ msgstr "%s를 위한 Wine 설정" #: winecfg.rc:87 msgid "Selected driver: %s" -msgstr "" +msgstr "선택된 드라이버: %s" #: winecfg.rc:88 -#, fuzzy msgid "(None)" -msgstr "없음" +msgstr "(없음)" #: winecfg.rc:51 msgid ""

1 0

Andrew Eikum : winealsa.drv: Fix default device creation logic.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: d41f6a6f028d198e44863929512e37eb685fc4ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d41f6a6f028d198e448639295… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 30 08:34:26 2011 -0500 winealsa.drv: Fix default device creation logic. --- dlls/winealsa.drv/mmdevdrv.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e1f1a49..262942f 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -294,8 +294,7 @@ static BOOL alsa_try_open(const char *devnode, snd_pcm_stream_t stream) } static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char **keys, - UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW, - BOOL count_failed) + UINT *num, snd_ctl_t *ctl, int card, const WCHAR *cardnameW) { static const WCHAR dashW[] = {' ','-',' ',0}; int err, device; @@ -327,11 +326,8 @@ static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char } sprintf(devnode, "plughw:%d,%d", card, device); - if(!alsa_try_open(devnode, stream)){ - if(count_failed) - ++(*num); + if(!alsa_try_open(devnode, stream)) continue; - } if(ids && keys){ DWORD len, cardlen; @@ -380,7 +376,7 @@ static HRESULT alsa_get_card_devices(snd_pcm_stream_t stream, WCHAR **ids, char } static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, - UINT *num, BOOL count_failed) + UINT *num) { snd_pcm_stream_t stream = (flow == eRender ? SND_PCM_STREAM_PLAYBACK : SND_PCM_STREAM_CAPTURE); @@ -397,8 +393,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, memcpy(*keys, defname, sizeof(defname)); } ++*num; - }else if(count_failed) - ++*num; + } for(err = snd_card_next(&card); card != -1 && err >= 0; err = snd_card_next(&card)){ @@ -431,8 +426,7 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR **ids, char **keys, } MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, cardnameW, len); - alsa_get_card_devices(stream, ids, keys, num, ctl, card, cardnameW, - count_failed); + alsa_get_card_devices(stream, ids, keys, num, ctl, card, cardnameW); HeapFree(GetProcessHeap(), 0, cardnameW); @@ -453,7 +447,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, TRACE("%d %p %p %p %p\n", flow, ids, keys, num, def_index); - hr = alsa_enum_devices(flow, NULL, NULL, num, TRUE); + hr = alsa_enum_devices(flow, NULL, NULL, num); if(FAILED(hr)) return hr; @@ -474,7 +468,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, char ***keys, *def_index = 0; - hr = alsa_enum_devices(flow, *ids, *keys, num, FALSE); + hr = alsa_enum_devices(flow, *ids, *keys, num); if(FAILED(hr)){ int i; for(i = 0; i < *num; ++i){

1 0

Nikolay Sivov : comctl32/monthcal: Fix week numbers background color.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: c28a1d019dfdbb73dc83208e91622a7b2e1451f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c28a1d019dfdbb73dc83208e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 28 16:33:37 2011 +0400 comctl32/monthcal: Fix week numbers background color. --- dlls/comctl32/monthcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index e73b40a..cdc63ed 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -962,7 +962,7 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con r = infoPtr->calendars[calIdx].weeknums; /* erase whole week numbers area */ - FillRect(hdc, &r, infoPtr->brushes[BrushTitle]); + FillRect(hdc, &r, infoPtr->brushes[BrushMonth]); SetTextColor(hdc, infoPtr->colors[MCSC_TITLEBK]); /* reduce rectangle to one week number */

1 0

Andrew Eikum : mmdevapi: Don't use invalid This pointer on static object.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 6adf21173c21dfeffe85e9021978ac07885ff7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6adf21173c21dfeffe85e9021… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 30 08:35:20 2011 -0500 mmdevapi: Don't use invalid This pointer on static object. --- dlls/mmdevapi/devenum.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index bedd2e4..6b6cfb6 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -1236,14 +1236,10 @@ static ULONG WINAPI info_device_ps_Release(IPropertyStore *iface) static HRESULT WINAPI info_device_ps_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { - MMDevPropStore *This = impl_from_IPropertyStore(iface); - TRACE("(%p)->(\"%s,%u\", %p)\n", This, debugstr_guid(&key->fmtid), key ? key->pid : 0, pv); + TRACE("(static)->(\"%s,%u\", %p)\n", debugstr_guid(&key->fmtid), key ? key->pid : 0, pv); if (!key || !pv) return E_POINTER; - if (This->access != STGM_READ - && This->access != STGM_READWRITE) - return STG_E_ACCESSDENIED; if (IsEqualPropertyKey(*key, DEVPKEY_Device_Driver)) {

1 0

Michael Stefaniuc : gameux: Don't compare with TRUE.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: f93252aa9a3218ec8eabe5522d6621c3ba0987ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93252aa9a3218ec8eabe5522… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Oct 1 21:40:11 2011 +0200 gameux: Don't compare with TRUE. --- dlls/gameux/gamestatistics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index b40975f..96b35d5 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -946,7 +946,7 @@ static HRESULT WINAPI GameStatisticsImpl_Save( TRACE("(%p, %d)\n", This, trackChanges); - if(trackChanges == TRUE) + if(trackChanges) FIXME("tracking changes not yet implemented\n"); hr = GAMEUX_updateStatisticsFile(&This->stats);

1 0

Jörg Höhle : winmm: Mark headers WHDR_DONE at the last possible time.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 3ba00cf538cc07d8e36ae82d43a29247cb37a299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba00cf538cc07d8e36ae82d4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Sep 22 21:43:42 2011 +0200 winmm: Mark headers WHDR_DONE at the last possible time. --- dlls/winmm/waveform.c | 45 +++++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 18 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index cf6f52e..0aa6320 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1231,32 +1231,30 @@ static UINT32 WINMM_HeaderLenFrames(WINMM_Device *device, WAVEHDR *header) static WAVEHDR *WOD_MarkDoneHeaders(WINMM_Device *device) { HRESULT hr; - WAVEHDR *queue, *first = device->first; + WAVEHDR *first = device->first, *queue = first, *last = NULL; UINT64 clock_freq, clock_pos, clock_frames; UINT32 nloops, queue_frames = 0; hr = IAudioClock_GetFrequency(device->clock, &clock_freq); if(FAILED(hr)){ ERR("GetFrequency failed: %08x\n", hr); - return first; + return NULL; } hr = IAudioClock_GetPosition(device->clock, &clock_pos, NULL); if(FAILED(hr)){ ERR("GetPosition failed: %08x\n", hr); - return first; + return NULL; } clock_frames = (clock_pos / (double)clock_freq) * device->samples_per_sec; - first = queue = device->first; nloops = device->loop_counter; while(queue && (queue_frames += WINMM_HeaderLenFrames(device, queue)) <= clock_frames - device->last_clock_pos){ if(!nloops){ - device->first->dwFlags &= ~WHDR_INQUEUE; - device->first->dwFlags |= WHDR_DONE; + last = queue; device->last_clock_pos += queue_frames; queue_frames = 0; queue = device->first = queue->lpNext; @@ -1273,7 +1271,11 @@ static WAVEHDR *WOD_MarkDoneHeaders(WINMM_Device *device) } } - return first; + if(last){ + last->lpNext = NULL; + return first; + }else + return NULL; } static void WOD_PushData(WINMM_Device *device) @@ -1426,8 +1428,10 @@ exit: LeaveCriticalSection(&device->lock); - while(first && (first->dwFlags & WHDR_DONE)){ + while(first){ WAVEHDR *next = first->lpNext; + first->dwFlags &= ~WHDR_INQUEUE; + first->dwFlags |= WHDR_DONE; WINMM_NotifyClient(&cb_info, WOM_DONE, (DWORD_PTR)first, 0); first = next; } @@ -1535,7 +1539,7 @@ static void WID_PullACMData(WINMM_Device *device) static void WID_PullData(WINMM_Device *device) { WINMM_CBInfo cb_info; - WAVEHDR *queue, *first = NULL; + WAVEHDR *queue, *first = NULL, *last = NULL; HRESULT hr; TRACE("(%p)\n", device->handle); @@ -1588,8 +1592,7 @@ static void WID_PullData(WINMM_Device *device) if(queue->dwBufferLength - queue->dwBytesRecorded < device->bytes_per_frame){ - queue->dwFlags &= ~WHDR_INQUEUE; - queue->dwFlags |= WHDR_DONE; + last = queue; device->first = queue = queue->lpNext; } @@ -1606,10 +1609,15 @@ exit: LeaveCriticalSection(&device->lock); - while(first && (first->dwFlags & WHDR_DONE)){ - WAVEHDR *next = first->lpNext; - WINMM_NotifyClient(&cb_info, WIM_DATA, (DWORD_PTR)first, 0); - first = next; + if(last){ + last->lpNext = NULL; + while(first){ + WAVEHDR *next = first->lpNext; + first->dwFlags &= ~WHDR_INQUEUE; + first->dwFlags |= WHDR_DONE; + WINMM_NotifyClient(&cb_info, WIM_DATA, (DWORD_PTR)first, 0); + first = next; + } } } @@ -3075,8 +3083,6 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn) buf = device->first; if(buf && buf->dwBytesRecorded > 0){ device->first = buf->lpNext; - buf->dwFlags &= ~WHDR_INQUEUE; - buf->dwFlags |= WHDR_DONE; }else buf = NULL; @@ -3084,8 +3090,11 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn) LeaveCriticalSection(&device->lock); - if(buf) + if(buf){ + buf->dwFlags &= ~WHDR_INQUEUE; + buf->dwFlags |= WHDR_DONE; WINMM_NotifyClient(&cb_info, WIM_DATA, (DWORD_PTR)buf, 0); + } return MMSYSERR_NOERROR; }

1 0

Nikolay Sivov : comctl32/monthcal: Also invalidate today label while setting new today date.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 5e2ede6c4d638862697207826b11484f65650e6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e2ede6c4d638862697207826… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 28 16:39:17 2011 +0400 comctl32/monthcal: Also invalidate today label while setting new today date. --- dlls/comctl32/monthcal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index cdc63ed..a2d8a19 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1675,6 +1675,8 @@ MONTHCAL_UpdateToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) /* only two days need redrawing */ InvalidateRect(infoPtr->hwndSelf, &old_r, FALSE); InvalidateRect(infoPtr->hwndSelf, &new_r, FALSE); + /* and today label */ + InvalidateRect(infoPtr->hwndSelf, &infoPtr->todayrect, FALSE); return TRUE; }

1 0

Alistair Leslie-Hughes : mscoree: Define ICorDebugManagedCallback2 and ICorDebugMDA interfaces.
by Alexandre Julliard Oct. 3, 2011

Oct. 3, 2011

Module: wine Branch: master Commit: 2b9381db1c16dcc7483bf787a7393b2ea0ed9f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b9381db1c16dcc7483bf787a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 29 21:27:03 2011 +1000 mscoree: Define ICorDebugManagedCallback2 and ICorDebugMDA interfaces. --- include/cordebug.idl | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/include/cordebug.idl b/include/cordebug.idl index 9b46276..0488fd9 100644 --- a/include/cordebug.idl +++ b/include/cordebug.idl @@ -43,6 +43,9 @@ interface ICorDebugFrame; interface ICorDebugFrameEnum; interface ICorDebugFunction; interface ICorDebugFunctionBreakpoint; +interface ICorDebugManagedCallback; +interface ICorDebugManagedCallback2; +interface ICorDebugMDA; interface ICorDebugModule; interface ICorDebugModuleBreakpoint; interface ICorDebugModuleEnum; @@ -87,6 +90,9 @@ cpp_quote("#endif") typedef ULONG64 CORDB_ADDRESS; typedef ULONG64 CORDB_REGISTER; +typedef UINT64 TASKID; +typedef DWORD CONNID; + cpp_quote("#ifndef _COR_IL_MAP") cpp_quote("#define _COR_IL_MAP") @@ -353,6 +359,61 @@ interface ICorDebugManagedCallback : IUnknown [ object, local, + uuid(250E5EEA-DB5C-4C76-B6F3-8C46F12E3203), + pointer_default(unique) +] +interface ICorDebugManagedCallback2 : IUnknown +{ + HRESULT FunctionRemapOpportunity([in] ICorDebugAppDomain *pAppDomain, + [in] ICorDebugThread *pThread, [in] ICorDebugFunction *pOldFunction, + [in] ICorDebugFunction *pNewFunction, [in] ULONG32 oldILOffset); + + HRESULT CreateConnection([in] ICorDebugProcess *pProcess, [in] CONNID dwConnectionId, + [in] WCHAR *pConnName); + + HRESULT ChangeConnection([in] ICorDebugProcess *pProcess, [in] CONNID dwConnectionId ); + + HRESULT DestroyConnection([in] ICorDebugProcess *pProcess, [in] CONNID dwConnectionId ); + + + typedef enum CorDebugExceptionCallbackType + { + DEBUG_EXCEPTION_FIRST_CHANCE = 1, + DEBUG_EXCEPTION_USER_FIRST_CHANCE = 2, + DEBUG_EXCEPTION_CATCH_HANDLER_FOUND = 3, + DEBUG_EXCEPTION_UNHANDLED = 4 + } CorDebugExceptionCallbackType; + + typedef enum CorDebugExceptionFlags + { + DEBUG_EXCEPTION_CAN_BE_INTERCEPTED = 0x0001 + } CorDebugExceptionFlags; + + HRESULT Exception( [in] ICorDebugAppDomain *pAppDomain, [in] ICorDebugThread *pThread, + [in] ICorDebugFrame *pFrame, [in] ULONG32 nOffset, + [in] CorDebugExceptionCallbackType dwEventType, [in] DWORD dwFlags ); + + typedef enum CorDebugExceptionUnwindCallbackType + { + DEBUG_EXCEPTION_UNWIND_BEGIN = 1, + DEBUG_EXCEPTION_INTERCEPTED = 2 + } CorDebugExceptionUnwindCallbackType; + + HRESULT ExceptionUnwind( [in] ICorDebugAppDomain *pAppDomain, [in] ICorDebugThread *pThread, + [in] CorDebugExceptionUnwindCallbackType dwEventType, + [in] DWORD dwFlags ); + + HRESULT FunctionRemapComplete([in] ICorDebugAppDomain *pAppDomain, + [in] ICorDebugThread *pThread, [in] ICorDebugFunction *pFunction); + + HRESULT MDANotification([in] ICorDebugController * pController, + [in] ICorDebugThread *pThread, [in] ICorDebugMDA * pMDA + ); + +}; +[ + object, + local, uuid(3d6f5f61-7538-11d3-8d5b-00104b35e7ef), pointer_default(unique) ] @@ -954,3 +1015,27 @@ interface ICorDebugCode : IUnknown HRESULT GetEnCRemapSequencePoints([in] ULONG32 cMap,[out] ULONG32 *pcMap, [out] ULONG32 offsets[]); }; + +[ + object, + local, + uuid(CC726F2F-1DB7-459b-B0EC-05F01D841B42), + pointer_default(unique) +] +interface ICorDebugMDA : IUnknown +{ + HRESULT GetName([in] ULONG32 cchName, [out] ULONG32 * pcchName, [out] WCHAR szName[]); + + HRESULT GetDescription([in] ULONG32 cchName, [out] ULONG32 * pcchName, [out] WCHAR szName[]); + + HRESULT GetXML([in] ULONG32 cchName, [out] ULONG32 * pcchName, [out] WCHAR szName[]); + + typedef enum CorDebugMDAFlags + { + MDA_FLAG_SLIP = 0x2 + } CorDebugMDAFlags; + + HRESULT GetFlags([in] CorDebugMDAFlags * pFlags); + + HRESULT GetOSThreadId([out] DWORD * pOsTid); +};

1 0