May 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : riched20: Added ITextFont stub.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: aba1e680f2326bbfc3a6000bd0eecb139a7e4ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba1e680f2326bbfc3a6000bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:26:33 2015 +0300 riched20: Added ITextFont stub. --- dlls/riched20/richole.c | 607 ++++++++++++++++++++++++++++++++++++++++-- dlls/riched20/tests/richole.c | 60 +++++ 2 files changed, 648 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aba1e680f2326bbfc3a60…

1 0

Nikolay Sivov : riched20: Added stub ITextPara.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 6d19ac5cb361e2d1b1f839fb06a6be754bde1e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d19ac5cb361e2d1b1f839fb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:27:42 2015 +0300 riched20: Added stub ITextPara. --- dlls/riched20/richole.c | 519 +++++++++++++++++++++++++++++++++++++++++- dlls/riched20/tests/richole.c | 51 +++++ 2 files changed, 566 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d19ac5cb361e2d1b1f83…

1 0

Nikolay Sivov : riched20: Implement SetStart().
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 3a0670ed7e87d4e247060cdd822c4371c5b734ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0670ed7e87d4e247060cdd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:28:41 2015 +0300 riched20: Implement SetStart(). --- dlls/riched20/richole.c | 26 ++++++++++++++++++++--- dlls/riched20/tests/richole.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 39c4bb4f..1cb47c2 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -905,14 +905,34 @@ static HRESULT WINAPI ITextRange_fnGetStart(ITextRange *me, LONG *pcpFirst) return S_OK; } -static HRESULT WINAPI ITextRange_fnSetStart(ITextRange *me, LONG cpFirst) +static HRESULT WINAPI ITextRange_fnSetStart(ITextRange *me, LONG start) { ITextRangeImpl *This = impl_from_ITextRange(me); + int len; + + TRACE("(%p)->(%d)\n", This, start); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (start == This->start) + return S_FALSE; + + if (start < 0) { + This->start = 0; + return S_OK; + } + + len = ME_GetTextLength(This->reOle->editor); + if (start > This->end) + This->end = len; + + if (start > len) + This->start = len; + else + This->start = start; + + return S_OK; } static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 6960c7a..2d46729 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -711,6 +711,54 @@ static void test_ITextRange_GetStart_GetEnd(void) hres = ITextRange_GetEnd(txtRge, &end); ok(hres == S_OK, "ITextRange_GetEnd\n"); ok(end == 12, "got wrong end value: %d\n", end); + + /* SetStart */ + hres = ITextRange_SetStart(txtRge, 0); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* same value */ + hres = ITextRange_SetStart(txtRge, 0); + ok(hres == S_FALSE, "got 0x%08x\n", hres); + + hres = ITextRange_SetStart(txtRge, 1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* negative resets to 0 */ + hres = ITextRange_SetStart(txtRge, -1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = -1; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 0, "got %d\n", start); + + /* greater than initial end, but less than total char count */ + hres = ITextRange_SetStart(txtRge, 10); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 10, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 12, "got %d\n", end); + + hres = ITextRange_SetStart(txtRge, 50); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 12, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 12, "got %d\n", end); + ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL);

1 0

Nikolay Sivov : riched20: Implement SetEnd().
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: f0959dc1759a8434ccab66eecd0b671693a1a96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0959dc1759a8434ccab66eec… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:30:06 2015 +0300 riched20: Implement SetEnd(). --- dlls/riched20/richole.c | 23 ++++++++++++-- dlls/riched20/tests/richole.c | 70 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1cb47c2..4f85325 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -948,14 +948,31 @@ static HRESULT WINAPI ITextRange_fnGetEnd(ITextRange *me, LONG *pcpLim) return S_OK; } -static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG cpLim) +static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG end) { ITextRangeImpl *This = impl_from_ITextRange(me); + int len; + + TRACE("(%p)->(%d)\n", This, end); + if (!This->reOle) return CO_E_RELEASED; - FIXME("not implemented %p\n", This); - return E_NOTIMPL; + if (end == This->end) + return S_FALSE; + + if (end < This->start) { + This->start = This->end = max(0, end); + return S_OK; + } + + len = ME_GetTextLength(This->reOle->editor); + if (end > len) + This->end = len + 1; + else + This->end = end; + + return S_OK; } static HRESULT WINAPI ITextRange_fnGetFont(ITextRange *me, ITextFont **font) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 2d46729..0af617b 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -759,6 +759,76 @@ static void test_ITextRange_GetStart_GetEnd(void) ok(hres == S_OK, "got 0x%08x\n", hres); ok(end == 12, "got %d\n", end); + /* SetEnd */ + hres = ITextRange_SetStart(txtRge, 0); + ok(hres == S_OK, "got 0x%08x\n", hres); + + /* same value */ + hres = ITextRange_SetEnd(txtRge, 5); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = ITextRange_SetEnd(txtRge, 5); + ok(hres == S_FALSE, "got 0x%08x\n", hres); + + /* negative resets to 0 */ + hres = ITextRange_SetEnd(txtRge, -1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + end = -1; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 0, "got %d\n", end); + + start = -1; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 0, "got %d\n", start); + + /* greater than initial end, but less than total char count */ + hres = ITextRange_SetStart(txtRge, 3); + ok(hres == S_OK, "got 0x%08x\n", hres); + + hres = ITextRange_SetEnd(txtRge, 1); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 1, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 1, "got %d\n", end); + + /* more than total count */ + hres = ITextRange_SetEnd(txtRge, 50); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 1, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 13, "got %d\n", end); + + /* zero */ + hres = ITextRange_SetEnd(txtRge, 0); + ok(hres == S_OK, "got 0x%08x\n", hres); + + start = 0; + hres = ITextRange_GetStart(txtRge, &start); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(start == 0, "got %d\n", start); + + end = 0; + hres = ITextRange_GetEnd(txtRge, &end); + ok(hres == S_OK, "got 0x%08x\n", hres); + ok(end == 0, "got %d\n", end); + ITextRange_Release(txtRge); release_interfaces(&w, &reOle, &txtDoc, NULL);

1 0

Nikolay Sivov : riched20: Added tom typelib.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: c8362ec3b8d873ecc8df4e6ea39b350c8051900d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8362ec3b8d873ecc8df4e6ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 17 17:30:56 2015 +0300 riched20: Added tom typelib. I had to duplicate idl unfortunately, because typelib in riched20 is not compatible with interfaces from tom.idl - method names are different, while vtables are identical. --- configure | 2 +- configure.ac | 2 +- dlls/riched20/Makefile.in | 3 + dlls/riched20/riched_tom.idl | 710 ++++++++++++++++++++++++++++++++++++++++++ dlls/riched20/tests/richole.c | 40 +++ 5 files changed, 755 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8362ec3b8d873ecc8df4…

1 0

Sebastian Lackner : ntdll/tests: Add tests for accessing \\Device\\Null.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: b3913c4f77f224accbe549066f456ac2bb661d19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3913c4f77f224accbe549066… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 15 19:57:42 2015 +0200 ntdll/tests: Add tests for accessing \\Device\\Null. --- dlls/ntdll/tests/om.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 96e1e6e..8939758 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1032,6 +1032,105 @@ static void test_keyed_events(void) NtClose( event ); } +static void test_null_device(void) +{ + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK iosb; + UNICODE_STRING str; + NTSTATUS status; + DWORD num_bytes; + OVERLAPPED ov; + char buf[64]; + HANDLE null; + BOOL ret; + + memset(buf, 0xAA, sizeof(buf)); + memset(&ov, 0, sizeof(ov)); + ov.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); + + pRtlCreateUnicodeStringFromAsciiz(&str, "\\Device\\Null"); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenSymbolicLinkObject(&null, SYMBOLIC_LINK_QUERY, &attr); + todo_wine + ok(status == STATUS_OBJECT_TYPE_MISMATCH, + "expected STATUS_OBJECT_TYPE_MISMATCH, got %08x\n", status); + + status = pNtOpenFile(&null, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + todo_wine + ok(status == STATUS_SUCCESS, + "expected STATUS_SUCCESS, got %08x\n", status); + if (status != STATUS_SUCCESS) + { + skip("opening \\Device\\Null failed, skipping read/write tests\n"); + goto out; + } + + SetLastError(0xdeadbeef); + ret = WriteFile(null, buf, sizeof(buf), &num_bytes, NULL); + ok(!ret, "WriteFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = ReadFile(null, buf, sizeof(buf), &num_bytes, NULL); + ok(!ret, "ReadFile unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WriteFile(null, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) + { + ok(ret, "WriteFile failed with error %u\n", GetLastError()); + } + else + { + num_bytes = 0xdeadbeef; + ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); + ok(ret, "GetOverlappedResult failed with error %u\n", GetLastError()); + } + ok(num_bytes == sizeof(buf), "expected num_bytes = %u, got %u\n", + (DWORD)sizeof(buf), num_bytes); + + num_bytes = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = ReadFile(null, buf, sizeof(buf), &num_bytes, &ov); + if (ret || GetLastError() != ERROR_IO_PENDING) + { + ok(!ret, "ReadFile unexpectedly succeeded\n"); + } + else + { + num_bytes = 0xdeadbeef; + ret = GetOverlappedResult(null, &ov, &num_bytes, TRUE); + ok(!ret, "GetOverlappedResult unexpectedly succeeded\n"); + } + ok(GetLastError() == ERROR_HANDLE_EOF, + "expected ERROR_HANDLE_EOF, got %u\n", GetLastError()); + + pNtClose(null); + +out: + null = CreateFileA("\\\\.\\Null", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, + "expected ERROR_FILE_NOT_FOUND, got %u\n", GetLastError()); + + null = CreateFileA("\\\\.\\Device\\Null", GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(null == INVALID_HANDLE_VALUE, "CreateFileA unexpectedly succeeded\n"); + ok(GetLastError() == ERROR_PATH_NOT_FOUND, + "expected ERROR_PATH_NOT_FOUND, got %u\n", GetLastError()); + + pRtlFreeUnicodeString(&str); + CloseHandle(ov.hEvent); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -1081,4 +1180,5 @@ START_TEST(om) test_type_mismatch(); test_event(); test_keyed_events(); + test_null_device(); }

1 0

Alexandre Julliard : ntdll/tests: Use the correct flags for NtOpenFile.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 871ab5123325e9427c4bd0eff77159390b9dbabd URL: http://source.winehq.org/git/wine.git/?a=commit;h=871ab5123325e9427c4bd0eff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 18 17:41:29 2015 +0900 ntdll/tests: Use the correct flags for NtOpenFile. --- dlls/ntdll/tests/directory.c | 2 +- dlls/ntdll/tests/om.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index f190ff4..ec8cd5a 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -180,7 +180,7 @@ static void test_flags_NtQueryDirectoryFile(OBJECT_ATTRIBUTES *attr, const char data_size = mask ? offsetof( FILE_BOTH_DIRECTORY_INFORMATION, FileName[256] ) : sizeof(data); /* Read the directory and note which files are found */ - status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_OPEN, + status = pNtOpenFile( &dirh, SYNCHRONIZE | FILE_LIST_DIRECTORY, attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT|FILE_OPEN_FOR_BACKUP_INTENT|FILE_DIRECTORY_FILE); ok (status == STATUS_SUCCESS, "failed to open dir '%s', ret 0x%x, error %d\n", testdirA, status, GetLastError()); if (status != STATUS_SUCCESS) { diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 8939758..71380a7 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -150,7 +150,7 @@ static void test_namespace_pipe(void) pRtlInitUnicodeString(&str, buffer3); InitializeObjectAttributes(&attr, &str, 0, 0, NULL); - status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); ok(status == STATUS_OBJECT_PATH_NOT_FOUND || status == STATUS_PIPE_NOT_AVAILABLE || status == STATUS_OBJECT_NAME_INVALID || /* vista */ @@ -159,7 +159,7 @@ static void test_namespace_pipe(void) pRtlInitUnicodeString(&str, buffer4); InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); - status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); ok(status == STATUS_OBJECT_NAME_NOT_FOUND || status == STATUS_OBJECT_NAME_INVALID, /* vista */ "NtOpenFile should have failed with STATUS_OBJECT_NAME_NOT_FOUND got(%08x)\n", status); @@ -657,7 +657,9 @@ static void test_symboliclink(void) pRtlFreeUnicodeString(&target); pRtlCreateUnicodeStringFromAsciiz(&str, "test-link\\NUL"); - status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, 0); + todo_wine ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08x)\n", status); + status = pNtOpenFile(&h, GENERIC_READ, &attr, &iosb, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE); todo_wine ok(status == STATUS_SUCCESS, "Failed to open NUL device(%08x)\n", status); pRtlFreeUnicodeString(&str);

1 0

Alexandre Julliard : server: Ignore FILE_DIRECTORY_FILE on special files.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 47eec1364a2628efc48cac0c083667645ac8a7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47eec1364a2628efc48cac0c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 18 17:49:56 2015 +0900 server: Ignore FILE_DIRECTORY_FILE on special files. --- server/fd.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/server/fd.c b/server/fd.c index 1253b3d..f0a52ad 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1865,11 +1865,6 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, } else /* special file */ { - if (options & FILE_DIRECTORY_FILE) - { - set_error( STATUS_NOT_A_DIRECTORY ); - goto error; - } if (unlink_name[0]) /* we can't unlink special files */ { set_error( STATUS_INVALID_PARAMETER );

1 0

Alexandre Julliard : server: Add an intermediate file object for file handles opened on devices.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 6260aa6cd2af689ba8f550862ffc2cf56ac3d7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6260aa6cd2af689ba8f550862… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 18 16:42:03 2015 +0900 server: Add an intermediate file object for file handles opened on devices. --- server/device.c | 252 +++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 165 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6260aa6cd2af689ba8f55…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: eebd24dd8fa7ad6c24f0d14b0bf192b549ffc96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eebd24dd8fa7ad6c24f0d14b0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon May 18 10:49:32 2015 +0200 po: Update French translation. --- po/fr.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index c12e024..cafeab1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8617,10 +8617,8 @@ msgid "Duplex:" msgstr "Recto verso :" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "&Configurer" +msgstr "Configurer" #: wininet.rc:42 wininet.rc:62 msgid "Realm"

1 0