wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Louis Lenders : dpnet: Return a TCP/ IP provider in IDirectPlay8PeerImpl_EnumServiceProviders.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 4a4678ca70321b74b9f0538138b73e882f552e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4678ca70321b74b9f053813… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Sep 18 22:26:49 2011 +0200 dpnet: Return a TCP/IP provider in IDirectPlay8PeerImpl_EnumServiceProviders. --- dlls/dpnet/peer.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- dlls/dpnet/tests/peer.c | 17 ++++++++------- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index f4d238a..307b306 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -95,8 +95,53 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, DWORD * const pcReturned, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); - return DPNERR_GENERIC; + static const WCHAR dp_providerW[] = {'D','i','r','e','c','t','P','l','a','y','8',' ','T','C','P','/','I','P',' ', + 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','\0'}; + static const WCHAR dp_adapterW[] = {'L','o','c','a','l',' ','A','r','e','a',' ','C','o','n','n','e','c','t','i','o','n', + ' ','-',' ','I','P','v','4','\0'}; + + static const GUID adapter_guid = {0x4ce725f6, 0xd3c0, 0xdade, {0xba, 0x6f, 0x11, 0xf9, 0x65, 0xbc, 0x42, 0x99}}; + DWORD req_size; + + TRACE("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, + pcbEnumData, pcReturned, dwFlags); + + if(!pguidServiceProvider) + { + req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_providerW); + } + else if(IsEqualGUID(pguidServiceProvider, &CLSID_DP8SP_TCPIP)) + { + req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_adapterW); + } + else + { + FIXME("Application requested a provider we don't handle (yet)\n"); + *pcReturned = 0; + return DPNERR_DOESNOTEXIST; + } + + if(*pcbEnumData < req_size) + { + *pcbEnumData = req_size; + return DPNERR_BUFFERTOOSMALL; + } + + pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + sizeof(DPN_SERVICE_PROVIDER_INFO)); + + if(!pguidServiceProvider) + { + lstrcpyW(pSPInfoBuffer->pwszName, dp_providerW); + pSPInfoBuffer->guid = CLSID_DP8SP_TCPIP; + } + else + { + lstrcpyW(pSPInfoBuffer->pwszName, dp_adapterW); + pSPInfoBuffer->guid = adapter_guid; + } + + *pcReturned = 1; + return DPN_OK; } static HRESULT WINAPI IDirectPlay8PeerImpl_CancelAsyncOperation(IDirectPlay8Peer *iface, diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 1d6dfc9..67e0ace 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -67,14 +67,14 @@ static void test_enum_service_providers(void) items = 0; hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, NULL, &size, &items, 0); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(size != 0, "size is unexpectedly 0\n"); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, serv_prov_info, &size, &items, 0); - todo_wine ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(items != 0, "Found unexpectedly no service providers\n"); + ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no service providers\n"); trace("number of items found: %d\n", items); @@ -93,14 +93,15 @@ static void test_enum_service_providers(void) items = 0; hr = IDirectPlay8Peer_EnumServiceProviders(peer, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(size != 0, "size is unexpectedly 0\n"); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Peer_EnumServiceProviders(peer, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); - todo_wine ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(items != 0, "Found unexpectedly no adapter\n"); + ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no adapter\n"); + for (i=0;i<items;i++) {

1 0

Alexandre Julliard : gdi32: Avoid rounding errors with visible rectangles in mirroring blits.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 7029559ed6f4f4282a5204082120df482cea3fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7029559ed6f4f4282a5204082… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 14:17:05 2011 +0200 gdi32: Avoid rounding errors with visible rectangles in mirroring blits. --- dlls/gdi32/bitblt.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 294901d..d58cd64 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -120,10 +120,13 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, else /* stretching */ { /* map source rectangle into destination coordinates */ - rect.left = dst->x + (src->visrect.left - src->x)*dst->width/src->width; - rect.top = dst->y + (src->visrect.top - src->y)*dst->height/src->height; - rect.right = dst->x + (src->visrect.right - src->x)*dst->width/src->width; - rect.bottom = dst->y + (src->visrect.bottom - src->y)*dst->height/src->height; + rect = src->visrect; + offset_rect( &rect, -min( src->x, src->x + src->width + 1), + -min( src->y, src->y + src->height + 1) ); + rect.left = dst->x + rect.left * dst->width / abs(src->width); + rect.top = dst->y + rect.top * dst->height / abs(src->height); + rect.right = dst->x + rect.right * dst->width / abs(src->width); + rect.bottom = dst->y + rect.bottom * dst->height / abs(src->height); if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); @@ -135,10 +138,13 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, if (!intersect_rect( &dst->visrect, &rect, &dst->visrect )) return FALSE; /* map destination rectangle back to source coordinates */ - rect.left = src->x + (dst->visrect.left - dst->x)*src->width/dst->width; - rect.top = src->y + (dst->visrect.top - dst->y)*src->height/dst->height; - rect.right = src->x + (dst->visrect.right - dst->x)*src->width/dst->width; - rect.bottom = src->y + (dst->visrect.bottom - dst->y)*src->height/dst->height; + rect = dst->visrect; + offset_rect( &rect, -min( dst->x, dst->x + dst->width + 1), + -min( dst->y, dst->y + dst->height + 1) ); + rect.left = src->x + rect.left * src->width / abs(dst->width); + rect.top = src->y + rect.top * src->height / abs(dst->height); + rect.right = src->x + rect.right * src->width / abs(dst->width); + rect.bottom = src->y + rect.bottom * src->height / abs(dst->height); if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom );

1 0

Bernhard Loos : server: Correct mapping of mutex access rights.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 527a985a3d7154dac549ce5170f5d0a099163362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=527a985a3d7154dac549ce517… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Sep 14 14:49:09 2011 +0200 server: Correct mapping of mutex access rights. --- dlls/kernel32/tests/sync.c | 4 ++-- server/mutex.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 1695713..98d996f 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -140,7 +140,7 @@ static void test_mutex(void) hOpened = OpenMutex(GENERIC_EXECUTE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); - todo_wine ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error %d\n", GetLastError()); + ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error %d\n", GetLastError()); CloseHandle(hOpened); for(i=0; i < 31; i++) @@ -152,7 +152,7 @@ static void test_mutex(void) hOpened = OpenMutex(GENERIC_READ | GENERIC_WRITE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); - todo_wine ok(wait_ret == WAIT_FAILED, "WaitForSingleObject succeeded\n"); + ok(wait_ret == WAIT_FAILED, "WaitForSingleObject succeeded\n"); CloseHandle(hOpened); for (i = 0; i < 32; i++) diff --git a/server/mutex.c b/server/mutex.c index d21f341..7c9700d 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -163,9 +163,9 @@ static int mutex_satisfied( struct object *obj, struct thread *thread ) static unsigned int mutex_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; - if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE; if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Bernhard Loos : server: ReleaseMutex doesn't need any access rights.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 0d36c27e3ba2019b6c660cae49bc8e207c033984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d36c27e3ba2019b6c660cae4… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Sep 14 14:49:03 2011 +0200 server: ReleaseMutex doesn't need any access rights. --- dlls/kernel32/tests/sync.c | 4 +++- server/mutex.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index dd87f3e..1695713 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -158,13 +158,15 @@ static void test_mutex(void) for (i = 0; i < 32; i++) { hOpened = OpenMutex(0x1 << i, FALSE, "WineTestMutex"); - ReleaseMutex(hCreated); if(hOpened != NULL) { + ret = ReleaseMutex(hOpened); + ok(ret, "ReleaseMutex failed with error %d, access %x\n", GetLastError(), 1 << i); CloseHandle(hOpened); } else { + ReleaseMutex(hCreated); failed |=0x1 << i; } } diff --git a/server/mutex.c b/server/mutex.c index faedcf3..d21f341 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -175,7 +175,7 @@ static int mutex_signal( struct object *obj, unsigned int access ) struct mutex *mutex = (struct mutex *)obj; assert( obj->ops == &mutex_ops ); - if (!(access & SYNCHRONIZE)) /* FIXME: MUTEX_MODIFY_STATE? */ + if (!(access & SYNCHRONIZE)) { set_error( STATUS_ACCESS_DENIED ); return 0; @@ -265,7 +265,7 @@ DECL_HANDLER(release_mutex) struct mutex *mutex; if ((mutex = (struct mutex *)get_handle_obj( current->process, req->handle, - MUTEX_MODIFY_STATE, &mutex_ops ))) + 0, &mutex_ops ))) { if (!mutex->count || (mutex->owner != current)) set_error( STATUS_MUTANT_NOT_OWNED ); else

1 0

Bernhard Loos : server: Certain access flags are illegal for OpenMutex.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 7b63fa658ac28e715f98876f790cb0de2bc9ac17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b63fa658ac28e715f98876f7… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Sep 14 14:48:56 2011 +0200 server: Certain access flags are illegal for OpenMutex. --- dlls/kernel32/tests/sync.c | 47 ++++++++++++++++++++++++++++++++++++------- server/mutex.c | 8 +++++++ 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index e2a6c7e..dd87f3e 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -128,20 +128,51 @@ static void test_mutex(void) BOOL ret; HANDLE hCreated; HANDLE hOpened; + int i; + DWORD failed = 0; hCreated = CreateMutex(NULL, FALSE, "WineTestMutex"); ok(hCreated != NULL, "CreateMutex failed with error %d\n", GetLastError()); - wait_ret = WaitForSingleObject(hCreated, INFINITE); - ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error 0x%08x\n", wait_ret); - /* yes, opening with just READ_CONTROL access allows us to successfully - * call ReleaseMutex */ - hOpened = OpenMutex(READ_CONTROL, FALSE, "WineTestMutex"); + hOpened = OpenMutex(0, FALSE, "WineTestMutex"); + ok(hOpened == NULL, "OpenMutex succeded\n"); + + hOpened = OpenMutex(GENERIC_EXECUTE, FALSE, "WineTestMutex"); + ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); + wait_ret = WaitForSingleObject(hOpened, INFINITE); + todo_wine ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error %d\n", GetLastError()); + CloseHandle(hOpened); + + for(i=0; i < 31; i++) + { + wait_ret = WaitForSingleObject(hCreated, INFINITE); + ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error 0x%08x\n", wait_ret); + } + + hOpened = OpenMutex(GENERIC_READ | GENERIC_WRITE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); - ret = ReleaseMutex(hOpened); - todo_wine ok(ret, "ReleaseMutex failed with error %d\n", GetLastError()); + wait_ret = WaitForSingleObject(hOpened, INFINITE); + todo_wine ok(wait_ret == WAIT_FAILED, "WaitForSingleObject succeeded\n"); + CloseHandle(hOpened); + + for (i = 0; i < 32; i++) + { + hOpened = OpenMutex(0x1 << i, FALSE, "WineTestMutex"); + ReleaseMutex(hCreated); + if(hOpened != NULL) + { + CloseHandle(hOpened); + } + else + { + failed |=0x1 << i; + } + } + + ok( failed == 0x0de0fffe, "open succeded when it shouldn't: %x\n", failed); + ret = ReleaseMutex(hCreated); - todo_wine ok(!ret && (GetLastError() == ERROR_NOT_OWNER), + ok(!ret && (GetLastError() == ERROR_NOT_OWNER), "ReleaseMutex should have failed with ERROR_NOT_OWNER instead of %d\n", GetLastError()); /* test case sensitivity */ diff --git a/server/mutex.c b/server/mutex.c index 31a529a..faedcf3 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -238,6 +238,14 @@ DECL_HANDLER(open_mutex) struct directory *root = NULL; struct mutex *mutex; + if ((req->access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL | + MUTEX_ALL_ACCESS | STANDARD_RIGHTS_ALL | MAXIMUM_ALLOWED)) || + !req->access) + { + set_error(STATUS_INVALID_PARAMETER); + return; + } + get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) return;

1 0

Michael Mc Donnell : d3dx9/test: Test for D3DXWeldVertices.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 97e621bd5302521a432bbdafd166eecba1c9b325 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e621bd5302521a432bbdafd… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Aug 17 11:08:12 2011 +0200 d3dx9/test: Test for D3DXWeldVertices. --- dlls/d3dx9_36/tests/mesh.c | 2200 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 2200 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97e621bd5302521a432bb…

1 0

Michael Mc Donnell : d3dx9: Implemented D3DXWeldVertices.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 012986c79d0e8e5c8e192cfb8f4495a0ccc92fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=012986c79d0e8e5c8e192cfb8… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Wed Aug 17 11:08:02 2011 +0200 d3dx9: Implemented D3DXWeldVertices. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 753 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 754 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=012986c79d0e8e5c8e192…

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 4b94cea684df52ac07b60ce81415c85b5d503af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b94cea684df52ac07b60ce81… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Sep 22 16:59:23 2011 +0900 po: Updated Korean translation. --- po/ko.po | 94 ++++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 58 insertions(+), 36 deletions(-) diff --git a/po/ko.po b/po/ko.po index 781a291..e127cb7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2930,7 +2930,7 @@ msgstr "%1 의 올바르지 않은 EXE 서명 \n" #: winerror.mc:751 msgid "EXE %1 is marked invalid\n" -msgstr "EXE %1 는 올바르지 않다고 표시되어 있습니다\n" +msgstr "EXE %1 는 올바르지 않다고 표시되어 있습니다\n" #: winerror.mc:756 msgid "Bad EXE format for %1\n" @@ -2938,7 +2938,7 @@ msgstr "%1의 나쁜 EXE 형식\n" #: winerror.mc:761 msgid "Iterated data exceeds 64k in %1\n" -msgstr "" +msgstr "%1의 반복 데이타가 64k를 넘음\n" #: winerror.mc:766 msgid "Invalid MinAllocSize in %1\n" @@ -6689,6 +6689,18 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" +"Wine은 자유 소프트웨어입니다; 당신은 이것을 자유 소프트웨어 재단에 위해 발표" +"된GNU 약소 일반 공중 사용 허가서의 조건에 따라 수정이나 배포를 할 수 있습니" +"다;버젼 2.1의 라이센스나,(당신의 선택에 따라)무엇이든 최신 버젼을 사용합니" +"다.\n" +"\n" +"Wine은 '어떠한 보증도 없이' 유용하고 사용될 것이라는 희망으로 배포됩니다; 심" +"지어 '특정 목적에 대한 적합성'및 '상품성'의 묵시적 보증도 없습니다. 자세한 내" +"용은 GNU 약소 일반 공중 사용 허가서를 참고하십시오.\n" +"\n" +"당신은 Wine에 포함되어 있는 GNU 약소 공중 사용 허가서의 사본을 받으셨을 것입" +"니다; 그렇지 않으면 자유 소프트웨어 재단 주식회사 , 51 Franklin St, Fifth " +"Floor, Boston, MA 02110-1301, USA에 편지를 보내십시오." #: shell32.rc:266 msgid "Wine License" @@ -7632,7 +7644,6 @@ msgid "%s: File Not Found\n" msgstr "%s :파일을 찾을 수 없습니다\n" #: attrib.rc:47 -#, fuzzy msgid "" "ATTRIB - Displays or changes file attributes.\n" "\n" @@ -7653,25 +7664,24 @@ msgid "" " /S Processes matching files in the current folder and all subfolders.\n" " /D Processes folders as well.\n" msgstr "" -"ATTRIB - 파일 속성을 보여주거나 바꿉니다.\n" +"ATTRIB - 파일 속성을 바꾸거나 보여줍니다.\n" "\n" "문법:\n" "ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [드라이브:][경로][파일이름]\n" -"\t [/S [/D]]\n" -"\n" -"어디에:\n" -"\n" -"+ 속성을 설정합니다.\n" -"- 속성을 지웁니다.\n" -"R 읽기-전용 파일 속성을 설정합니다\n" -"A 압축 파일 속성을 설정합니다.\n" -"S 시스템 파일 속성을 설정합니다.\n" -"H 숨은 파일 속성을 설정합니다.\n" -"[드라이브:][경로][파일이름]\n" -"속성 작업을 할 파일이나 파일들을 지정합니다.\n" -"/S 현재 폴더와 모든 하위 폴더에서 일치하는 파일들을 \n" -"처리합니.\n" -"/D 폴더를 함께 처리합니다.\n" +" [/S [/D]]\n" +"\n" +"Where:\n" +"\n" +" + 속성을 설정합니다.\n" +" - 속성을 지웁니다.\n" +" R 읽기-전용 속성를 설정합니다.\n" +" A 압축 파일 속성을 설정합니다.\n" +" S 시스템 파일 속성을 설정합니다.\n" +" H 숨은 파일 속성을 설정합니다.\n" +" [드라이브:][경로][파일이름]\n" +" 속성 작업을 할 파일이나 파일들을 지정합니다.\n" +" /S 현재 폴더와 모든 하위 폴더에서 일치하는 파일들을 처리합니다.\n" +" /D 폴더를 함께 처리합니다.\n" #: clock.rc:29 msgid "Ana&log" @@ -8188,7 +8198,6 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:288 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8255,10 +8264,11 @@ msgstr "" "SET\t\t환경 변수 보여주거나 바꾸기\n" "SETLOCAL\t배치 파일에서 환경변수의 지역화 시작을 알려줌\n" "TIME\t\t시스템 날짜 바꾸거나 보여주기\n" -"TITLE\t\tCMD 세션의 창 제목 설정\n" +"TITLE\t\tCMD 세션의 창 제목 설정\n" "TYPE\t\t텍스트 파일의 내용 보여주기\n" "VER\t\tCMD 현재 버젼 보여주기\n" "VOL\t\t디스크 장치의 불륨 라벨 보여주기\n" +"XCOPY\t\t원본 파일이나 디렉토리 구조를 대상으로 복사함\n" "EXIT\t\tCMD 닫기\n" "\n" "HELP <명령>을 치면 그 명령의 상세한 정보를 보여줌\n" @@ -9034,7 +9044,7 @@ msgstr "모든 객체" #: oleview.rc:133 msgid "Application IDs" -msgstr "프로그램 IDs" +msgstr "응용프로그램 IDs" #: oleview.rc:134 msgid "Type Libraries" @@ -9042,7 +9052,7 @@ msgstr "타입 라이브러리" #: oleview.rc:135 msgid "ver." -msgstr "" +msgstr "버젼." #: oleview.rc:136 msgid "Interfaces" @@ -9546,7 +9556,6 @@ msgid "Exports selected branch of the registry to a text file" msgstr "레지스트리의 선택된 부분을 텍스트 파일로 내보내기" #: start.rc:46 -#, fuzzy msgid "" "Start a program, or open a document in the program normally used for files " "with that suffix.\n" @@ -9570,25 +9579,27 @@ msgid "" "This is free software, and you are welcome to redistribute it\n" "under certain conditions; run 'start /L' for details.\n" msgstr "" -"풀그림을 실행시키거나 보통 파일에서 사용되는 풀그림으로 문서 열기\n" -"Usage:\n" +"풀그림을 실행시키거나, 보통 파일 확장자에서 사용되는 풀그림으로 문서 열기\n" +"사용법:\n" "start [옵션] 풀그림이나 파일 이름 [...]\n" "start [옵션] 문서 파일 이름\n" "\n" -"Options:\n" +"옵션:\n" "/M[inimized] 풀그림 최소화 상태로 실행.\n" "/MAX[imized] 풀그림 최대화 상태로 실행.\n" "/R[estored] 풀그림을 보통상태로 시작시키기 (최소화도 아니고 최대화도 아" "님).\n" -"/W[ait] 시작된 풀그림이 끝날 때까지 기다림, 끝날 때 종료코드를 남김.\n" -"/Unix 윈도우 익스플로어같이 유닉스 파일이름을 사용해서 시작.\n" +"/W[ait] 시작된 풀그림이 끝날 때까지 기다림, 끝날 때 종료코드를 '남김.\n" +"/Unix 윈도우 탐색기같이 유닉스 파일이름을 사용해서 시작.\n" "/ProgIDOpen 지정한 progID를 사용해서 문서 열기.\n" "/L 사용자 라이센스 보여줌\n" +"/? \t\t 도움말을 보여주고 끝내기.\n" "\n" "start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" -"Start comes with ABSOLUTELY NO WARRANTY; for details run with /L option.\n" -"This is free software, and you are welcome to redistribute it\n" -"under certain conditions; run 'start /L' for details.\n" +"Start는 보증이 없이 제공됩니다; /L 옵션과 함께 실행시키면 자세한 내용을 볼 " +"수 있습니다.\n" +"이것은 자유 소프트웨어이고, 당신은 특정 조건하에서 재배포를 환영\n" +"합니다; 'start /L'을 실행시키면 자세한 것을 볼 수 있습니다\n" #: start.rc:64 msgid "" @@ -9609,6 +9620,19 @@ msgid "" "\n" "See the COPYING.LIB file for license information.\n" msgstr "" +"start.exe version 0.2 Copyright (C) 2003, Dan Kegel\n" +"당신은 이것을 자유 소프트웨어 재단에 위해 발표된GNU 약소 일반 공중 사용 허가" +"서의 조건에 따라 수정이나 배포를 할 수 있습니다;버젼 2.1의 라이센스나,(당신" +"의 선택에 따라)무엇이든 최신 버젼을 사용합니다.\n" +"\n" +"이 프로그램은 '어떠한 보증도 없이' 유용하고 사용될 것이라는 희망으로 배포됩니" +"다; 심지어 '특정 목적에 대한 적합성'및 '상품성'의 묵시적 보증도 없습니다. 자" +"세한 내용은 GNU 약소 일반 공중 사용 허가서를 참고하십시오.\n" +"\n" +"당신은 이 프로그램에 포함되어 있는 GNU 약소 공중 사용 허가서의 사본을 받으셨" +"을 것입니다; 그렇지 않으면 자유 소프트웨어 재단 주식회사 , 51 Franklin St, " +"Fifth Floor, Boston, MA 02110-1301, USA에 편지를 보내십시오.\n" +"COPYING.LIB 파일에서 라이센스 정보를 볼 수 있습니다.\n" #: start.rc:66 msgid "" @@ -10780,9 +10804,8 @@ msgid "Tile &Vertically\tCtrl+F4" msgstr "세로 바둑판식 정렬(&V)\tCtrl+F4" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File Manager" -msgstr "Winefile" +msgstr "Wine 파일 관리자 정보(&A)" #: winefile.rc:93 msgid "Applying font settings" @@ -10793,9 +10816,8 @@ msgid "Error while selecting new font." msgstr "새 글꼴 선택 오류." #: winefile.rc:99 -#, fuzzy msgid "Wine File Manager" -msgstr "Winefile" +msgstr "Wine 파일 관리자" #: winefile.rc:101 msgid "root fs"

1 0

Frédéric Delanoy : cmd: Improve WCMD_volume documentation.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: a536004f34cdb4ce7b1b6afbdc4b635f3289f4b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a536004f34cdb4ce7b1b6afbd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 21 21:17:18 2011 +0200 cmd: Improve WCMD_volume documentation. --- programs/cmd/builtins.c | 10 ++++++---- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 99a2314..d8c69ba 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2644,11 +2644,13 @@ void WCMD_version (void) { /**************************************************************************** * WCMD_volume * - * Display volume info and/or set volume label. Returns 0 if error. + * Display volume information (set_label = FALSE) + * Additionally set volume label (set_label = TRUE) + * Returns 1 on success, 0 otherwise */ -int WCMD_volume (int mode, const WCHAR *path) { - +int WCMD_volume(BOOL set_label, const WCHAR *path) +{ DWORD count, serial; WCHAR string[MAX_PATH], label[MAX_PATH], curdir[MAX_PATH]; BOOL status; @@ -2679,7 +2681,7 @@ int WCMD_volume (int mode, const WCHAR *path) { } WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEDETAIL), curdir[0], label, HIWORD(serial), LOWORD(serial)); - if (mode) { + if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count, NULL); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index b7bc175..940cb6e 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -94,7 +94,7 @@ void WCMD_title (const WCHAR *); void WCMD_type (WCHAR *); void WCMD_verify (const WCHAR *command); void WCMD_version (void); -int WCMD_volume (int mode, const WCHAR *command); +int WCMD_volume (BOOL set_label, const WCHAR *command); WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 92b76fc..26f377a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1502,7 +1502,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCMD_if (p, cmdList); break; case WCMD_LABEL: - WCMD_volume (1, p); + WCMD_volume (TRUE, p); break; case WCMD_MD: case WCMD_MKDIR: @@ -1560,7 +1560,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCMD_verify (p); break; case WCMD_VOL: - WCMD_volume (0, p); + WCMD_volume (FALSE, p); break; case WCMD_PUSHD: WCMD_pushd(p);

1 0

Frédéric Delanoy : cmd: Standardize BOOL type usage in directory.c.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: e9a8b751b5df1ec09238c02c0aefd1396e2c5fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9a8b751b5df1ec09238c02c0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 21 20:59:41 2011 +0200 cmd: Standardize BOOL type usage in directory.c. --- programs/cmd/directory.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 0b5df04..3c6bd06 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -51,13 +51,12 @@ typedef enum _DISPLAYORDER Date } DISPLAYORDER; -static int file_total, dir_total, recurse, wide, bare, max_width, lower; -static int shortname, usernames; +static int file_total, dir_total, max_width; static ULONGLONG byte_total; static DISPLAYTIME dirTime; static DISPLAYORDER dirOrder; static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; -static BOOL separator; +static BOOL paged_mode, recurse, wide, bare, lower, shortname, usernames, separator; static ULONG showattrs, attrsbits; static const WCHAR dotW[] = {'.','\0'}; @@ -631,7 +630,7 @@ static void WCMD_dir_trailer(WCHAR drive) { void WCMD_directory (WCHAR *cmd) { WCHAR path[MAX_PATH], cwd[MAX_PATH]; - int status, paged_mode; + int status; CONSOLE_SCREEN_BUFFER_INFO consoleInfo; WCHAR *p; WCHAR string[MAXSTRING];

1 0

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 September 2011