September 2011 - Wine-Commits

Nikolay Sivov : comctl32/monthcal: Fix MCM_GETMONTHRANGE with regard to multiple calendars and parameter handling .
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

Module: wine Branch: master Commit: b11208e5f8823acc125535da0c9f91e4bef38d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11208e5f8823acc125535da0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 23 10:27:14 2011 +0400 comctl32/monthcal: Fix MCM_GETMONTHRANGE with regard to multiple calendars and parameter handling. --- dlls/comctl32/monthcal.c | 65 ++++++++++++++++++++++----------------- dlls/comctl32/tests/monthcal.c | 12 +++++-- 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5f8a36c..a6602f9 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1330,42 +1330,51 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) static LRESULT MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) { + INT range; + TRACE("flag=%d, st=%p\n", flag, st); - if(st) + switch (flag) { + case GMR_VISIBLE: { - switch (flag) { - case GMR_VISIBLE: - { - st[0] = infoPtr->calendars[0].month; - st[1] = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; + if (st) + { + st[0] = infoPtr->calendars[0].month; + st[1] = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; - if (st[0].wMonth == min_allowed_date.wMonth && - st[0].wYear == min_allowed_date.wYear) - { - st[0].wDay = min_allowed_date.wDay; - } - else - st[0].wDay = 1; - MONTHCAL_CalculateDayOfWeek(&st[0], TRUE); + if (st[0].wMonth == min_allowed_date.wMonth && + st[0].wYear == min_allowed_date.wYear) + { + st[0].wDay = min_allowed_date.wDay; + } + else + st[0].wDay = 1; + MONTHCAL_CalculateDayOfWeek(&st[0], TRUE); - st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); - MONTHCAL_CalculateDayOfWeek(&st[1], TRUE); + st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); + MONTHCAL_CalculateDayOfWeek(&st[1], TRUE); + } - return MONTHCAL_GetCalCount(infoPtr); - } - case GMR_DAYSTATE: - { - MONTHCAL_GetMinDate(infoPtr, &st[0]); - MONTHCAL_GetMaxDate(infoPtr, &st[1]); - break; - } - default: - WARN("Unknown flag value, got %d\n", flag); - } + range = MONTHCAL_GetCalCount(infoPtr); + break; + } + case GMR_DAYSTATE: + { + if (st) + { + MONTHCAL_GetMinDate(infoPtr, &st[0]); + MONTHCAL_GetMaxDate(infoPtr, &st[1]); + } + /* include two partially visible months */ + range = MONTHCAL_GetCalCount(infoPtr) + 2; + break; + } + default: + WARN("Unknown flag value, got %d\n", flag); + range = 0; } - return infoPtr->monthRange; + return range; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index ccf8881..766732b 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1317,7 +1317,6 @@ static void test_monthrange(void) res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible); expect(2, res); - expect(2000, st_visible[0].wYear); expect(11, st_visible[0].wMonth); expect(1, st_visible[0].wDay); @@ -1326,9 +1325,7 @@ static void test_monthrange(void) expect(31, st_visible[1].wDay); res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_DAYSTATE, (LPARAM)st_daystate); - todo_wine { - expect(4, res); - } + expect(4, res); expect(2000, st_daystate[0].wYear); expect(10, st_daystate[0].wMonth); expect(29, st_daystate[0].wDay); @@ -1338,6 +1335,13 @@ static void test_monthrange(void) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_monthrange_seq, "monthcal monthrange", FALSE); + /* with null date array parameter */ + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, 0); + expect(2, res); + + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_DAYSTATE, 0); + expect(4, res); + /* resize control to display single Calendar */ MoveWindow(hwnd, 0, 0, r.right, r.bottom, FALSE);

1 0

Nikolay Sivov : comctl32/monthcal: Fix some day state problems.
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

Module: wine Branch: master Commit: efbb419621f51dac269ae2a4d0b4dd6594f077e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbb419621f51dac269ae2a4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 23 12:25:35 2011 +0400 comctl32/monthcal: Fix some day state problems. --- dlls/comctl32/monthcal.c | 165 +++++++++++++++++++++------------------- dlls/comctl32/tests/monthcal.c | 52 +++++++++++++ 2 files changed, 140 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efbb419621f51dac269ae…

1 0

Bernhard Loos : server: Correct mapping of mutex access rights.
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

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

Nikolay Sivov : comctl32/monthcal: Properly adjust day of week in MCM_SETCURSEL.
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

Module: wine Branch: master Commit: d3758e02b84d33a058a942f2799a203e0a127ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3758e02b84d33a058a942f27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 23 14:17:14 2011 +0400 comctl32/monthcal: Properly adjust day of week in MCM_SETCURSEL. --- dlls/comctl32/monthcal.c | 11 +++++------ dlls/comctl32/tests/monthcal.c | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 652bee8..d230f34 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -247,9 +247,7 @@ static inline BOOL MONTHCAL_IsDateEqual(const SYSTEMTIME *first, const SYSTEMTIM static BOOL MONTHCAL_ValidateDate(const SYSTEMTIME *time) { if(time->wMonth < 1 || time->wMonth > 12 ) return FALSE; - if(time->wDayOfWeek > 6) return FALSE; - if(time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) - return FALSE; + if(time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) return FALSE; return TRUE; } @@ -1481,7 +1479,7 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) { - SYSTEMTIME prev = infoPtr->minSel; + SYSTEMTIME prev = infoPtr->minSel, selection; INT diff; WORD day; @@ -1511,8 +1509,9 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) MONTHCAL_GetMonth(&infoPtr->calendars[i].month, diff); } - infoPtr->minSel = *curSel; - infoPtr->maxSel = *curSel; + selection = *curSel; + MONTHCAL_CalculateDayOfWeek(&selection, TRUE); + infoPtr->minSel = infoPtr->maxSel = selection; /* if selection is still in current month, reduce rectangle */ day = prev.wDay; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 454ea89..2686fb7 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -782,15 +782,15 @@ static void test_currdate(void) st_test.wMonth = 10; st_test.wDayOfWeek = 100; res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_test); - todo_wine expect(1, res); + expect(1, res); memset(&st_test, 0, sizeof(st_test)); res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st_test); expect(1, res); expect(2009, st_test.wYear); - todo_wine expect(7, st_test.wDay); + expect(7, st_test.wDay); expect(10, st_test.wMonth); - todo_wine expect(3, st_test.wDayOfWeek); + expect(3, st_test.wDayOfWeek); DestroyWindow(hwnd); }

1 0

Bernhard Loos : server: Certain access flags are illegal for OpenMutex.
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

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

Frédéric Delanoy : cmd: Improve WCMD_volume documentation.
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

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

Michael Mc Donnell : d3dx9: Implemented D3DXWeldVertices.
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

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 Sept. 23, 2011

Sept. 23, 2011

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

Hans Leidekker : msi: Only use Windows platform-specific encoded strings from the font naming table .
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

Module: wine Branch: master Commit: ca741823ddb404d8b11131bca674e9791376a8e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca741823ddb404d8b11131bca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 23 11:13:04 2011 +0200 msi: Only use Windows platform-specific encoded strings from the font naming table. --- dlls/msi/font.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 528eab7..0b728a3 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -143,17 +143,28 @@ static WCHAR *load_ttf_name_id( const WCHAR *filename, DWORD id ) break; ttRecord.uNameID = SWAPWORD(ttRecord.uNameID); - if (ttRecord.uNameID == id) + ttRecord.uPlatformID = SWAPWORD(ttRecord.uPlatformID); + ttRecord.uEncodingID = SWAPWORD(ttRecord.uEncodingID); + if (ttRecord.uNameID == id && ttRecord.uPlatformID == 3 && + (ttRecord.uEncodingID == 0 || ttRecord.uEncodingID == 1)) { - LPSTR buf; + WCHAR *buf; + unsigned int i; ttRecord.uStringLength = SWAPWORD(ttRecord.uStringLength); ttRecord.uStringOffset = SWAPWORD(ttRecord.uStringOffset); SetFilePointer(handle, tblDir.uOffset + ttRecord.uStringOffset + ttNTHeader.uStorageOffset, NULL, FILE_BEGIN); - if (!(buf = msi_alloc_zero( ttRecord.uStringLength + 1 ))) goto end; + if (!(buf = msi_alloc_zero( ttRecord.uStringLength + sizeof(WCHAR) ))) goto end; + dwRead = 0; ReadFile(handle, buf, ttRecord.uStringLength, &dwRead, NULL); - ret = strdupAtoW(buf); + if (dwRead % sizeof(WCHAR)) + { + msi_free(buf); + goto end; + } + for (i = 0; i < dwRead / sizeof(WCHAR); i++) buf[i] = SWAPWORD(buf[i]); + ret = strdupW(buf); msi_free(buf); break; }

1 0

Frédéric Delanoy : cmd: Standardize BOOL type usage in directory.c.
by Alexandre Julliard Sept. 23, 2011

Sept. 23, 2011

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