wine-commits May 2012

wine-commits@winehq.org

2 participants
737 discussions

Alexandre Julliard : gdi32: Don' t store the default color table in dib_info objects.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 664442ab847075c2009d29db1b00564fa15517c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=664442ab847075c2009d29db1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 11:56:38 2012 +0200 gdi32: Don't store the default color table in dib_info objects. --- dlls/gdi32/dibdrv/bitblt.c | 20 ++++++++++---------- dlls/gdi32/dibdrv/dc.c | 24 +++++++++--------------- dlls/gdi32/dibdrv/dibdrv.h | 9 ++------- dlls/gdi32/dibdrv/graphics.c | 2 +- dlls/gdi32/dibdrv/objects.c | 6 +++--- 5 files changed, 25 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=664442ab847075c2009d2…

1 0

Alexandre Julliard : gdi32: Use the default color table when mapping colors in bitmaps that don' t have one.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 9968f3083ae7baf37503f590155708aacfbbd390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9968f3083ae7baf37503f5901… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 11:34:22 2012 +0200 gdi32: Use the default color table when mapping colors in bitmaps that don't have one. --- dlls/gdi32/dibdrv/dibdrv.h | 5 ++ dlls/gdi32/dibdrv/objects.c | 13 +++-- dlls/gdi32/dibdrv/primitives.c | 118 +++++++++++++++++++++++++--------------- 3 files changed, 87 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9968f3083ae7baf37503f…

1 0

Alexandre Julliard : gdi32: Simplify creation of hatch masks and avoid endianness issues.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: b8e4cd81abac4b82aff5b648114eaefb605b8b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e4cd81abac4b82aff5b6481… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 11:24:18 2012 +0200 gdi32: Simplify creation of hatch masks and avoid endianness issues. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 22 +---- dlls/gdi32/dibdrv/primitives.c | 192 ++++++++++++++++++---------------------- 3 files changed, 90 insertions(+), 126 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8e4cd81abac4b82aff5b…

1 0

Alexandre Julliard : gdi32: Add a helper function to allocate the brush bits.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 574a07e4c96da2541b44f2f2b0a29d0ab5262b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=574a07e4c96da2541b44f2f2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 22:03:18 2012 +0200 gdi32: Add a helper function to allocate the brush bits. --- dlls/gdi32/dibdrv/objects.c | 57 ++++++++++++++++-------------------------- 1 files changed, 22 insertions(+), 35 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ce0b4a2..f5b4c05 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1732,17 +1732,28 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, return TRUE; } -static void free_pattern_brush_bits( dib_brush *brush ) +static BOOL alloc_brush_mask_bits( dib_brush *brush ) +{ + DWORD size = brush->dib.height * abs(brush->dib.stride); + + assert(brush->masks.and == NULL); + assert(brush->masks.xor == NULL); + assert(brush->dib.stride > 0); + + if (!(brush->masks.and = HeapAlloc(GetProcessHeap(), 0, 2 * size))) return FALSE; + brush->masks.xor = (char *)brush->masks.and + size; + return TRUE; +} + +static void free_brush_mask_bits( dib_brush *brush ) { HeapFree(GetProcessHeap(), 0, brush->masks.and); - HeapFree(GetProcessHeap(), 0, brush->masks.xor); - brush->masks.and = NULL; - brush->masks.xor = NULL; + brush->masks.and = brush->masks.xor = NULL; } void free_pattern_brush( dib_brush *brush ) { - free_pattern_brush_bits( brush ); + free_brush_mask_bits( brush ); free_dib_info( &brush->dib ); } @@ -1752,20 +1763,10 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) DWORD *brush_bits = brush->dib.bits.ptr; DWORD *and_bits, *xor_bits; - assert(brush->masks.and == NULL); - assert(brush->masks.xor == NULL); - - assert(brush->dib.stride > 0); - - and_bits = brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); - xor_bits = brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); + if (!alloc_brush_mask_bits( brush )) return FALSE; - if(!and_bits || !xor_bits) - { - ERR("Failed to create pattern brush bits\n"); - free_pattern_brush_bits( brush ); - return FALSE; - } + and_bits = brush->masks.and; + xor_bits = brush->masks.xor; while(size) { @@ -1790,12 +1791,8 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL { dib_info hatch; rop_mask fg_mask, bg_mask; - DWORD size; BOOL ret; - assert(brush->masks.and == NULL); - assert(brush->masks.xor == NULL); - /* Just initialise brush dib with the color / sizing info. We don't need the bits as we'll calculate the rop masks straight from the hatch patterns. */ @@ -1809,17 +1806,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL brush->dib.rect.right = 8; brush->dib.rect.bottom = 8; - size = brush->dib.height * brush->dib.stride; - - brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); - brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); - - if (!brush->masks.and || !brush->masks.xor) - { - ERR("Failed to create pattern brush bits\n"); - free_pattern_brush_bits( brush ); - return FALSE; - } + if (!alloc_brush_mask_bits( brush )) return FALSE; hatch.bit_count = 1; hatch.height = hatch.width = 8; @@ -1841,7 +1828,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL *needs_reselect = TRUE; ret = brush->dib.funcs->create_rop_masks( &brush->dib, &hatch, &fg_mask, &bg_mask, &brush->masks ); - if(!ret) free_pattern_brush_bits( brush ); + if(!ret) free_brush_mask_bits( brush ); return ret; } @@ -1961,7 +1948,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, if (rop != brush->rop) { - free_pattern_brush_bits( brush ); + free_brush_mask_bits( brush ); brush->rop = rop; }

1 0

Alexandre Julliard : gdi32: Pass a rop_mask_bits object to the pattern_rects primitive.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: b708b40105807461cf1d51469979733812792569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b708b40105807461cf1d51469… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 21:52:44 2012 +0200 gdi32: Pass a rop_mask_bits object to the pattern_rects primitive. --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/objects.c | 2 +- dlls/gdi32/dibdrv/primitives.c | 62 ++++++++++++++++++++-------------------- 3 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b708b40105807461cf1d5…

1 0

Alexandre Julliard : gdi32: Use a rop_mask_bits object to store the brush bits.
by Alexandre Julliard 23 May '12

23 May '12

Module: wine Branch: master Commit: 524aef660e3e2edf60fb5c30d5865644948c896a URL: http://source.winehq.org/git/wine.git/?a=commit;h=524aef660e3e2edf60fb5c30d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 22 21:47:30 2012 +0200 gdi32: Use a rop_mask_bits object to store the brush bits. --- dlls/gdi32/dibdrv/dibdrv.h | 3 +-- dlls/gdi32/dibdrv/objects.c | 33 ++++++++++++++++----------------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index f72cbdb..209b237 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -76,8 +76,7 @@ typedef struct dib_brush INT rop; /* rop2 last used to create the brush bits */ COLORREF colorref; dib_info dib; - void *and_bits; - void *xor_bits; + rop_mask_bits masks; struct brush_pattern pattern; BOOL (*rects)(struct dibdrv_physdev *pdev, struct dib_brush *brush, dib_info *dib, int num, const RECT *rects, INT rop); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 3351875..5fe2f45 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1734,10 +1734,10 @@ static BOOL solid_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, static void free_pattern_brush_bits( dib_brush *brush ) { - HeapFree(GetProcessHeap(), 0, brush->and_bits); - HeapFree(GetProcessHeap(), 0, brush->xor_bits); - brush->and_bits = NULL; - brush->xor_bits = NULL; + HeapFree(GetProcessHeap(), 0, brush->masks.and); + HeapFree(GetProcessHeap(), 0, brush->masks.xor); + brush->masks.and = NULL; + brush->masks.xor = NULL; } void free_pattern_brush( dib_brush *brush ) @@ -1752,13 +1752,13 @@ static BOOL create_pattern_brush_bits( dib_brush *brush ) DWORD *brush_bits = brush->dib.bits.ptr; DWORD *and_bits, *xor_bits; - assert(brush->and_bits == NULL); - assert(brush->xor_bits == NULL); + assert(brush->masks.and == NULL); + assert(brush->masks.xor == NULL); assert(brush->dib.stride > 0); - and_bits = brush->and_bits = HeapAlloc(GetProcessHeap(), 0, size); - xor_bits = brush->xor_bits = HeapAlloc(GetProcessHeap(), 0, size); + and_bits = brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); + xor_bits = brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); if(!and_bits || !xor_bits) { @@ -1790,12 +1790,11 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL { dib_info hatch; rop_mask fg_mask, bg_mask; - rop_mask_bits mask_bits; DWORD size; BOOL ret; - assert(brush->and_bits == NULL); - assert(brush->xor_bits == NULL); + assert(brush->masks.and == NULL); + assert(brush->masks.xor == NULL); /* Just initialise brush dib with the color / sizing info. We don't need the bits as we'll calculate the rop masks straight from @@ -1812,10 +1811,10 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL size = brush->dib.height * brush->dib.stride; - mask_bits.and = brush->and_bits = HeapAlloc(GetProcessHeap(), 0, size); - mask_bits.xor = brush->xor_bits = HeapAlloc(GetProcessHeap(), 0, size); + brush->masks.and = HeapAlloc(GetProcessHeap(), 0, size); + brush->masks.xor = HeapAlloc(GetProcessHeap(), 0, size); - if(!mask_bits.and || !mask_bits.xor) + if (!brush->masks.and || !brush->masks.xor) { ERR("Failed to create pattern brush bits\n"); free_pattern_brush_bits( brush ); @@ -1841,7 +1840,7 @@ static BOOL create_hatch_brush_bits(dibdrv_physdev *pdev, dib_brush *brush, BOOL if (GetBkMode(pdev->dev.hdc) != TRANSPARENT && (GetBkColor(pdev->dev.hdc) & (1 << 24))) *needs_reselect = TRUE; - ret = brush->dib.funcs->create_rop_masks( &brush->dib, &hatch, &fg_mask, &bg_mask, &mask_bits ); + ret = brush->dib.funcs->create_rop_masks( &brush->dib, &hatch, &fg_mask, &bg_mask, &brush->masks ); if(!ret) free_pattern_brush_bits( brush ); return ret; @@ -1966,7 +1965,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, brush->rop = rop; } - if(brush->and_bits == NULL) + if(brush->masks.and == NULL) { switch(brush->style) { @@ -1990,7 +1989,7 @@ static BOOL pattern_brush(dibdrv_physdev *pdev, dib_brush *brush, dib_info *dib, GetBrushOrgEx(pdev->dev.hdc, &origin); - dib->funcs->pattern_rects( dib, num, rects, &origin, &brush->dib, brush->and_bits, brush->xor_bits ); + dib->funcs->pattern_rects( dib, num, rects, &origin, &brush->dib, brush->masks.and, brush->masks.xor ); if (needs_reselect) free_pattern_brush( brush ); return TRUE;

1 0

Andrew Eikum : wineoss.drv: Resolve some diff between winealsa and wineoss.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: e5551393bd086dbdba1c15ad7e95e4154d1726df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5551393bd086dbdba1c15ad7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 22 13:11:09 2012 -0500 wineoss.drv: Resolve some diff between winealsa and wineoss. --- dlls/wineoss.drv/mmdevdrv.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c8b12a3..62ae7ca 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1571,12 +1571,12 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(This->dataflow == eRender){ This->written_frames = 0; + This->last_pos_frames = 0; }else{ This->written_frames += This->held_frames; } - This->lcl_offs_frames = 0; This->held_frames = 0; - This->last_pos_frames = 0; + This->lcl_offs_frames = 0; LeaveCriticalSection(&This->lock); @@ -1752,8 +1752,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, UINT32 frames, BYTE **data) { ACImpl *This = impl_from_IAudioRenderClient(iface); - UINT32 pad, write_pos; - HRESULT hr; + UINT32 write_pos; TRACE("(%p)->(%u, %p)\n", This, frames, data); @@ -1774,13 +1773,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return S_OK; } - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; - } - - if(pad + frames > This->bufsize_frames){ + if(This->held_frames + frames > This->bufsize_frames){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_TOO_LARGE; } @@ -2029,7 +2022,16 @@ static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( TRACE("(%p)->(%p)\n", This, frames); - return AudioClient_GetCurrentPadding(&This->IAudioClient_iface, frames); + if(!frames) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + *frames = This->held_frames < This->period_frames ? 0 : This->period_frames; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl =

1 0

Andrew Eikum : wineoss.drv: Track number of frames reserved by client in capture direction.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 1c37857a1828758b5e8c0dcb5f5fb3ec812c1834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c37857a1828758b5e8c0dcb5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 22 13:11:06 2012 -0500 wineoss.drv: Track number of frames reserved by client in capture direction. --- dlls/wineoss.drv/mmdevdrv.c | 49 ++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9b0f5f8..c8b12a3 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -120,7 +120,6 @@ struct ACImpl { UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ BYTE *local_buffer, *tmp_buffer; - int buf_state; LONG32 getbuf_last; /* <0 when using tmp_buffer */ HANDLE timer; @@ -132,12 +131,6 @@ struct ACImpl { struct list entry; }; -enum BufferStates { - NOT_LOCKED = 0, - LOCKED_NORMAL, /* public buffer piece is from local_buffer */ - LOCKED_WRAPPED /* public buffer piece is in tmp_buffer */ -}; - typedef struct _SessionMgr { IAudioSessionManager2 IAudioSessionManager2_iface; @@ -1571,7 +1564,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } - if(This->buf_state != NOT_LOCKED || This->getbuf_last){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -1928,7 +1921,6 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, UINT64 *qpcpos) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - HRESULT hr; TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, devpos, qpcpos); @@ -1938,19 +1930,21 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, EnterCriticalSection(&This->lock); - if(This->buf_state != NOT_LOCKED){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - hr = IAudioCaptureClient_GetNextPacketSize(iface, frames); - if(FAILED(hr)){ + if(This->held_frames < This->period_frames){ + *frames = 0; LeaveCriticalSection(&This->lock); - return hr; + return AUDCLNT_S_BUFFER_EMPTY; } *flags = 0; + *frames = This->period_frames; + if(This->lcl_offs_frames + *frames > This->bufsize_frames){ UINT32 chunk_bytes, offs_bytes, frames_bytes; if(This->tmp_buffer_frames < *frames){ @@ -1976,10 +1970,16 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, *data = This->local_buffer + This->lcl_offs_frames * This->fmt->nBlockAlign; - This->buf_state = LOCKED_NORMAL; + This->getbuf_last = *frames; - if(devpos || qpcpos) - IAudioClock_GetPosition(&This->IAudioClock_iface, devpos, qpcpos); + if(devpos) + *devpos = This->written_frames; + if(qpcpos){ + LARGE_INTEGER stamp, freq; + QueryPerformanceCounter(&stamp); + QueryPerformanceFrequency(&freq); + *qpcpos = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } LeaveCriticalSection(&This->lock); @@ -1995,16 +1995,27 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( EnterCriticalSection(&This->lock); - if(This->buf_state == NOT_LOCKED){ + if(!done){ + This->getbuf_last = 0; + LeaveCriticalSection(&This->lock); + return S_OK; + } + + if(!This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } + if(This->getbuf_last != done){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_INVALID_SIZE; + } + + This->written_frames += done; This->held_frames -= done; This->lcl_offs_frames += done; This->lcl_offs_frames %= This->bufsize_frames; - - This->buf_state = NOT_LOCKED; + This->getbuf_last = 0; LeaveCriticalSection(&This->lock);

1 0

Andrew Eikum : msgsm32: Downgrade ERR to WARN.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 99661c7ddf594cbce6740b527f3b201c7101f0da URL: http://source.winehq.org/git/wine.git/?a=commit;h=99661c7ddf594cbce6740b527… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 22 13:01:23 2012 -0500 msgsm32: Downgrade ERR to WARN. --- dlls/msgsm32.acm/msgsm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msgsm32.acm/msgsm32.c b/dlls/msgsm32.acm/msgsm32.c index 2543e0b..8b0885f 100644 --- a/dlls/msgsm32.acm/msgsm32.c +++ b/dlls/msgsm32.acm/msgsm32.c @@ -618,7 +618,7 @@ LRESULT CALLBACK GSM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case ACMDM_STREAM_CONVERT: return GSM_StreamConvert((PACMDRVSTREAMINSTANCE)dwParam1, (PACMDRVSTREAMHEADER)dwParam2); #else - case ACMDM_STREAM_OPEN: ERR("libgsm support not compiled in!\n"); + case ACMDM_STREAM_OPEN: WARN("libgsm support not compiled in!\n"); case ACMDM_STREAM_CLOSE: case ACMDM_STREAM_SIZE: case ACMDM_STREAM_CONVERT:

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 22 May '12

22 May '12

Module: wine Branch: master Commit: 25bb38347407de4532c4fcd421b9d075fc2a678e URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bb38347407de4532c4fcd42… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue May 22 22:12:41 2012 +0900 po: Update Korean translation. --- po/ko.po | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/po/ko.po b/po/ko.po index e5404ac..017a1d8 100644 --- a/po/ko.po +++ b/po/ko.po @@ -156,21 +156,10 @@ msgid "Cancel" msgstr "취소" #: appwiz.rc:112 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Wine Gecko 설치관리자" +msgstr "Wine Mono 설치관리자" #: appwiz.rc:115 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -179,13 +168,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"Wine은 HTML 임베딩 프로그램이 정상적으로 작동하기 위해서 필요로 하는 Gecko 키" -"지를 찾을 수 없습니다. Wine은 당신을 위해 자동으로 다운로드하고 설치할 것입니" -"다.\n" +"Wine은 닷넷 응용프로그램을 제대로 실행시키기 위해 필요한 Mono 패키지를 찾을 " +"수없습니다. Wine은 당신을 위해서 자동으로 다운로드하고 설치할 것입니다.\n" "\n" -"주위:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다. 자세한 것은 <a " -"href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> 보십시" -"오." +"Note: it is recommended to use your distribution's packages instead. See <a " +"주의:당신의 배포판의 패키지를 대신 사용하는 것을 추천합니다.자세한 것은<a " +"href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> 을 보십" +"시오." #: appwiz.rc:28 msgid "Add/Remove Programs"

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2012