September 2011 - Wine-commits

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 9775124da00c8543e6a5f0b811c151b4bc3b2b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9775124da00c8543e6a5f0b81… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 27 22:34:38 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3f5ba70..f246326 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8989,9 +8989,8 @@ msgid "version 1.0" msgstr "versija 1.0" #: oleview.rc:100 -#, fuzzy msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "TypeLib failai (*.tlb;*.olb;*.dll;*.ocx;*.exe)" +msgstr "TypeLib failai (*.tlb; *.olb; *.dll; *.ocx; *.exe)" #: oleview.rc:103 msgid "Bind to file via a File Moniker" @@ -10406,12 +10405,11 @@ msgstr "Wine konfigūravimas: %s" #: winecfg.rc:87 msgid "Selected driver: %s" -msgstr "" +msgstr "Parinkta tvarkyklė: %s" #: winecfg.rc:88 -#, fuzzy msgid "(None)" -msgstr "Joks" +msgstr "(jokia)" #: winecfg.rc:51 msgid "" @@ -10450,9 +10448,8 @@ msgid "Default Settings" msgstr "Numatytosios nuostatos" #: winecfg.rc:59 -#, fuzzy msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine programos (*.exe,*.exe.so)" +msgstr "Wine programos (*.exe; *.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -11197,9 +11194,8 @@ msgid "Unicode text document" msgstr "Teksto unikodu dokumentas" #: wordpad.rc:143 -#, fuzzy msgid "Printer files (*.prn)" -msgstr "Spausdintuvo failai (*.PRN)" +msgstr "Spausdintuvo failai (*.prn)" #: wordpad.rc:148 msgid "Left"

1 0

Francois Gouget : po: Mark translations with mismatched printf format directives as fuzzy.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 8d0ba5d21b8f8b1798aabdfc2e1d757747fe55b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0ba5d21b8f8b1798aabdfc2… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 28 10:13:02 2011 +0200 po: Mark translations with mismatched printf format directives as fuzzy. --- po/es.po | 2 ++ po/hu.po | 2 ++ po/ko.po | 3 +++ po/zh_CN.po | 1 + 4 files changed, 8 insertions(+), 0 deletions(-) diff --git a/po/es.po b/po/es.po index 7403133..9b41ec6 100644 --- a/po/es.po +++ b/po/es.po @@ -8969,6 +8969,7 @@ msgid "The %s service is starting.\n" msgstr "" #: net.rc:35 +#, fuzzy msgid "The %s service was started successfully.\n" msgstr "La operación finalizó con éxito\n" @@ -8981,6 +8982,7 @@ msgid "The %s service is stopping.\n" msgstr "" #: net.rc:38 +#, fuzzy msgid "The %s service was stopped successfully.\n" msgstr "La operación finalizó con éxito\n" diff --git a/po/hu.po b/po/hu.po index 2816aa6..7e93d41 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6148,6 +6148,7 @@ msgstr "" "dokumentumra." #: oledlg.rc:38 +#, fuzzy msgid "" "Inserts a picture of the clipboard contents into your document. The picture " "is linked to the source file so that changes to the file will be reflected " @@ -6158,6 +6159,7 @@ msgstr "" "dokumentumra." #: oledlg.rc:39 +#, fuzzy msgid "" "Inserts a shortcut which points to the location of the clipboard contents. " "The shortcut is linked to the source file so that changes to the file will " diff --git a/po/ko.po b/po/ko.po index 0ca949c..a130c91 100644 --- a/po/ko.po +++ b/po/ko.po @@ -9676,6 +9676,7 @@ msgid "Close message sent to top-level windows of process with PID %u.\n" msgstr "PID %u 의 프로세스의 최상위 창에 닫는 메세지 보냈습니다.\n" #: taskkill.rc:34 +#, fuzzy msgid "" "Close message sent to top-level windows of process \"%s\" with PID %u.\n" msgstr "PID %u 의 프로세스 \"%s\"의 최상위 창에 닫는 메세지 보냈습니다.\n" @@ -9685,6 +9686,7 @@ msgid "Process with PID %u was forcibly terminated.\n" msgstr "PID %u 의 프로세스는 강제로 종료되었습니다.\n" #: taskkill.rc:36 +#, fuzzy msgid "Process \"%s\" with PID %u was forcibly terminated.\n" msgstr "PID %u 의 프로세스 \"%s\" 는 강제로 종료되엇습니다.\n" @@ -11298,6 +11300,7 @@ msgid "Overwrite %s? (Yes|No|All)\n" msgstr "%s를 덮어쓰겠습니까? (예|아니오|모두)\n" #: xcopy.rc:37 +#, fuzzy msgid "Copying of '%s' to '%s' failed with r/c %d\n" msgstr " r/c %d로 '%s'를 '%s'로 복사 실패 \n" diff --git a/po/zh_CN.po b/po/zh_CN.po index cb5c26b..f3fdb01 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7778,6 +7778,7 @@ msgid "" msgstr "" #: attrib.rc:28 cmd.rc:301 +#, fuzzy msgid "%s: File Not Found\n" msgstr "找不到文件\n"

1 0

Frédéric Delanoy : winedev: Signal that 'set +/ - foo' only works for debug channels in WINEDEBUG.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: docs Branch: master Commit: 9052c1a1d9226a18a0bf83fd13f363a8c5ebcf1e URL: http://source.winehq.org/git/docs.git/?a=commit;h=9052c1a1d9226a18a0bf83fd1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 12:11:06 2011 +0200 winedev: Signal that 'set +/- foo' only works for debug channels in WINEDEBUG. --- en/winedev-debugger.sgml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index 587a470..b877063 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -2111,7 +2111,8 @@ set $BreakAllThreadsStartup = 1 <title>Debug channels</title> <para> It is possible to turn on and off debug messages as you - are debugging using the set command. + are debugging using the set command (only for debug channels + specified in WINEDEBUG environment variable). See <xref linkend="debugging"> for more details on debug channels. </para>

1 0

Huw Davies : gdi32: Implement stretch_bitmapinfo.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 268b8382cd17bddb9db305b9bd22f042072b6fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=268b8382cd17bddb9db305b9b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 27 16:13:38 2011 +0100 gdi32: Implement stretch_bitmapinfo. --- dlls/gdi32/dibdrv/bitblt.c | 218 ++++++++++++++++++++- dlls/gdi32/dibdrv/dibdrv.h | 13 ++ dlls/gdi32/dibdrv/primitives.c | 441 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 662 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=268b8382cd17bddb9db30…

1 0

Huw Davies : gdi32: Forward StretchBlt calls from the dib driver to the null driver.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 9b7ea6f417a68517745203123d9df0516ebc60b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b7ea6f417a68517745203123… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 27 16:13:39 2011 +0100 gdi32: Forward StretchBlt calls from the dib driver to the null driver. --- dlls/gdi32/dibdrv/bitblt.c | 20 ++++++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 2 ++ dlls/gdi32/tests/bitmap.c | 5 ----- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 7014fcf..48afa8e 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1113,3 +1113,23 @@ DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit offset_rect( &src->visrect, -src->visrect.left, -src->visrect.top ); return ERROR_SUCCESS; } + +/*********************************************************************** + * dibdrv_StretchBlt + */ +BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) +{ + BOOL ret; + DC *dc_dst = get_dc_ptr( dst_dev->hdc ); + + if (!dc_dst) return FALSE; + + if (dst->width == 1 && src->width > 1) src->width--; + if (dst->height == 1 && src->height > 1) src->height--; + + ret = dc_dst->nulldrv.funcs->pStretchBlt( &dc_dst->nulldrv, dst, + src_dev, src, rop ); + release_dc_ptr( dc_dst ); + return ret; +} diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b02ae8a..9d8391a 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -611,7 +611,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetWorldTransform */ NULL, /* pStartDoc */ NULL, /* pStartPage */ - NULL, /* pStretchBlt */ + dibdrv_StretchBlt, /* pStretchBlt */ NULL, /* pStretchDIBits */ NULL, /* pStrokeAndFillPath */ NULL, /* pStrokePath */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 155f1e9..21549f8 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -116,6 +116,8 @@ extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, + PHYSDEV src_dev, struct bitblt_coords *src, DWORD rop ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index ccca315..bb4d43f 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2866,24 +2866,20 @@ static void test_StretchBlt(void) 0, 0, 1, 1, 0, 0, 2, 1, expected, __LINE__); expected[0] = srcBuffer[0] & srcBuffer[1]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 3, 1, expected, __LINE__); expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 0, 0, 4, 1, expected, __LINE__); /* this doesn't happen if the src width is -ve */ expected[0] = srcBuffer[1] & srcBuffer[2]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 1, 1, 2, 0, -2, 1, expected, __LINE__); /* when dst width > 1 behaviour reverts to what one would expect */ expected[0] = srcBuffer[0] & srcBuffer[1], expected[1] = srcBuffer[2] & srcBuffer[3]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 1, 0, 0, 4, 1, expected, __LINE__); @@ -2899,7 +2895,6 @@ todo_wine SetViewportExtEx( hdcDst, 100, 100, NULL ); expected[0] = srcBuffer[0] & srcBuffer[1] & srcBuffer[2]; -todo_wine check_StretchBlt_stretch(hdcDst, hdcSrc, &biDst, dstBuffer, srcBuffer, 0, 0, 2, 2, 0, 0, 4, 1, expected, __LINE__); SetMapMode( hdcDst, MM_TEXT );

1 0

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

27 Sep '11

Module: wine Branch: master Commit: 3960ea844b0e6f3aeadf304ad79507d5172b21bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3960ea844b0e6f3aeadf304ad… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Sep 27 22:02:03 2011 +0900 po: Updated Korean translation. --- po/ko.po | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/po/ko.po b/po/ko.po index 41b3eb1..0ca949c 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8938,9 +8938,8 @@ msgid "version 1.0" msgstr "버젼 1.0" #: oleview.rc:100 -#, fuzzy msgid "TypeLib files (*.tlb; *.olb; *.dll; *.ocx; *.exe)" -msgstr "TypeLib 파일 (*.tlb;*.olb;*.dll;*.ocx;*.exe)" +msgstr "TypeLib 파일들 (*.tlb;*.olb;*.dll;*.ocx;*.exe)" #: oleview.rc:103 msgid "Bind to file via a File Moniker" @@ -10380,9 +10379,8 @@ msgid "Default Settings" msgstr "기본 설정" #: winecfg.rc:59 -#, fuzzy msgid "Wine Programs (*.exe; *.exe.so)" -msgstr "Wine 프로그램 (*.exe,*.exe.so)" +msgstr "Wine 프로그램들 (*.exe,*.exe.so)" #: winecfg.rc:60 msgid "Use global settings" @@ -11127,9 +11125,8 @@ msgid "Unicode text document" msgstr "유니코드 텍스트 문서" #: wordpad.rc:143 -#, fuzzy msgid "Printer files (*.prn)" -msgstr "프린터 파일 (*.PRN)" +msgstr "프린터 파일들 (*.prn)" #: wordpad.rc:148 msgid "Left"

1 0

Bernhard Loos : server: Store sharing state for named pipes.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 039bacb0c9edcba8dab5f3243105b1b1dd2d897e URL: http://source.winehq.org/git/wine.git/?a=commit;h=039bacb0c9edcba8dab5f3243… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Mon Sep 26 13:57:15 2011 +0200 server: Store sharing state for named pipes. --- dlls/kernel32/sync.c | 15 ++++++++------- dlls/ntdll/file.c | 1 + include/wine/server_protocol.h | 6 ++++-- server/named_pipe.c | 2 ++ server/protocol.def | 1 + server/request.h | 13 +++++++------ server/trace.c | 1 + 7 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 3f627a4..9630258 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1346,7 +1346,7 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, HANDLE handle; UNICODE_STRING nt_name; OBJECT_ATTRIBUTES attr; - DWORD access, options; + DWORD access, options, sharing; BOOLEAN pipe_type, read_mode, non_block; NTSTATUS status; IO_STATUS_BLOCK iosb; @@ -1379,15 +1379,15 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, switch(dwOpenMode & 3) { case PIPE_ACCESS_INBOUND: - options = FILE_PIPE_INBOUND; + sharing = FILE_SHARE_WRITE; access = GENERIC_READ; break; case PIPE_ACCESS_OUTBOUND: - options = FILE_PIPE_OUTBOUND; + sharing = FILE_SHARE_READ; access = GENERIC_WRITE; break; case PIPE_ACCESS_DUPLEX: - options = FILE_PIPE_FULL_DUPLEX; + sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; access = GENERIC_READ | GENERIC_WRITE; break; default: @@ -1395,6 +1395,7 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, return INVALID_HANDLE_VALUE; } access |= SYNCHRONIZE; + options = 0; if (dwOpenMode & FILE_FLAG_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; if (!(dwOpenMode & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_NONALERT; pipe_type = (dwPipeMode & PIPE_TYPE_MESSAGE) ? TRUE : FALSE; @@ -1406,7 +1407,7 @@ HANDLE WINAPI CreateNamedPipeW( LPCWSTR name, DWORD dwOpenMode, SetLastError(0); - status = NtCreateNamedPipeFile(&handle, access, &attr, &iosb, 0, + status = NtCreateNamedPipeFile(&handle, access, &attr, &iosb, sharing, FILE_OVERWRITE_IF, options, pipe_type, read_mode, non_block, nMaxInstances, nInBufferSize, nOutBufferSize, &timeout); @@ -1847,8 +1848,8 @@ BOOL WINAPI CreatePipe( PHANDLE hReadPipe, PHANDLE hWritePipe, GetCurrentProcessId(), ++index); RtlInitUnicodeString(&nt_name, name); status = NtCreateNamedPipeFile(&hr, GENERIC_READ | SYNCHRONIZE, &attr, &iosb, - 0, FILE_OVERWRITE_IF, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_PIPE_INBOUND, + FILE_SHARE_WRITE, FILE_OVERWRITE_IF, + FILE_SYNCHRONOUS_IO_NONALERT, FALSE, FALSE, FALSE, 1, size, size, &timeout); if (status) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4d49956..278da5d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2781,6 +2781,7 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access, req->attributes = attr->Attributes; req->rootdir = wine_server_obj_handle( attr->RootDirectory ); req->options = options; + req->sharing = sharing; req->flags = (pipe_type) ? NAMED_PIPE_MESSAGE_STREAM_WRITE : 0 | (read_mode) ? NAMED_PIPE_MESSAGE_STREAM_READ : 0 | diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ee438b4..9db7f78 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3030,13 +3030,15 @@ struct create_named_pipe_request unsigned int attributes; obj_handle_t rootdir; unsigned int options; + unsigned int sharing; unsigned int maxinstances; unsigned int outsize; unsigned int insize; + char __pad_44[4]; timeout_t timeout; unsigned int flags; /* VARARG(name,unicode_str); */ - char __pad_52[4]; + char __pad_60[4]; }; struct create_named_pipe_reply { @@ -5635,6 +5637,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 425 +#define SERVER_PROTOCOL_VERSION 426 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/named_pipe.c b/server/named_pipe.c index 29d5c5e..9a37acb 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -91,6 +91,7 @@ struct named_pipe { struct object obj; /* object header */ unsigned int flags; + unsigned int sharing; unsigned int maxinstances; unsigned int outsize; unsigned int insize; @@ -960,6 +961,7 @@ DECL_HANDLER(create_named_pipe) pipe->maxinstances = req->maxinstances; pipe->timeout = req->timeout; pipe->flags = req->flags; + pipe->sharing = req->sharing; } else { diff --git a/server/protocol.def b/server/protocol.def index 123f16a..71524a4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2186,6 +2186,7 @@ enum message_type unsigned int attributes; /* object attributes */ obj_handle_t rootdir; /* root directory */ unsigned int options; + unsigned int sharing; unsigned int maxinstances; unsigned int outsize; unsigned int insize; diff --git a/server/request.h b/server/request.h index d2ca2f6..2d4528a 100644 --- a/server/request.h +++ b/server/request.h @@ -1477,12 +1477,13 @@ C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, attributes) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, rootdir) == 20 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, options) == 24 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, maxinstances) == 28 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, outsize) == 32 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, insize) == 36 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, timeout) == 40 ); -C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, flags) == 48 ); -C_ASSERT( sizeof(struct create_named_pipe_request) == 56 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, sharing) == 28 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, maxinstances) == 32 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, outsize) == 36 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, insize) == 40 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, timeout) == 48 ); +C_ASSERT( FIELD_OFFSET(struct create_named_pipe_request, flags) == 56 ); +C_ASSERT( sizeof(struct create_named_pipe_request) == 64 ); C_ASSERT( FIELD_OFFSET(struct create_named_pipe_reply, handle) == 8 ); C_ASSERT( sizeof(struct create_named_pipe_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_named_pipe_info_request, handle) == 12 ); diff --git a/server/trace.c b/server/trace.c index 37ea216..670958a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2607,6 +2607,7 @@ static void dump_create_named_pipe_request( const struct create_named_pipe_reque fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", rootdir=%04x", req->rootdir ); fprintf( stderr, ", options=%08x", req->options ); + fprintf( stderr, ", sharing=%08x", req->sharing ); fprintf( stderr, ", maxinstances=%08x", req->maxinstances ); fprintf( stderr, ", outsize=%08x", req->outsize ); fprintf( stderr, ", insize=%08x", req->insize );

1 0

Bernhard Loos : server: Only the sharing parameter of two instances of the same pipe have to match .
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 5098b131772c6bbe4e513ac4409e34debb882042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5098b131772c6bbe4e513ac44… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Mon Sep 26 13:57:29 2011 +0200 server: Only the sharing parameter of two instances of the same pipe have to match. --- dlls/kernel32/tests/pipe.c | 22 ++++++++++++++++++++-- server/named_pipe.c | 4 +--- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index a86baed..890a50e 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -374,7 +374,7 @@ static void test_CreateNamedPipe_instances_must_match(void) ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); hnp2 = CreateNamedPipe(PIPENAME, PIPE_ACCESS_INBOUND, PIPE_TYPE_BYTE | PIPE_WAIT, - /* nMaxInstances */ 1, + /* nMaxInstances */ 2, /* nOutBufSize */ 1024, /* nInBufSize */ 1024, /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, @@ -384,7 +384,25 @@ static void test_CreateNamedPipe_instances_must_match(void) ok(CloseHandle(hnp), "CloseHandle\n"); - /* etc, etc */ + /* check everything else */ + hnp = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_BYTE | PIPE_WAIT, + /* nMaxInstances */ 4, + /* nOutBufSize */ 1024, + /* nInBufSize */ 1024, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(hnp != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + hnp2 = CreateNamedPipe(PIPENAME, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE, + /* nMaxInstances */ 3, + /* nOutBufSize */ 102, + /* nInBufSize */ 24, + /* nDefaultWait */ 1234, + /* lpSecurityAttrib */ NULL); + ok(hnp2 != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + + ok(CloseHandle(hnp), "CloseHandle\n"); + ok(CloseHandle(hnp2), "CloseHandle\n"); } /** implementation of alarm() */ diff --git a/server/named_pipe.c b/server/named_pipe.c index 9a37acb..0f89f5b 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -971,9 +971,7 @@ DECL_HANDLER(create_named_pipe) release_object( pipe ); return; } - if ((pipe->maxinstances != req->maxinstances) || - (pipe->timeout != req->timeout) || - (pipe->flags != req->flags)) + if (pipe->sharing != req->sharing) { set_error( STATUS_ACCESS_DENIED ); release_object( pipe );

1 0

Bernhard Loos : server: Sharing 0 is not allowed for named pipes.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: bded698462a05e3acb976cfb115fe5059422684a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bded698462a05e3acb976cfb1… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Mon Sep 26 13:57:38 2011 +0200 server: Sharing 0 is not allowed for named pipes. --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 6909882..358e702 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -150,7 +150,7 @@ static void test_create_invalid(void) /* create a pipe with sharing = 0 */ res = pNtCreateNamedPipeFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &iosb, 0, 2 /*FILE_CREATE*/, 0, 1, 0, 0, 0xFFFFFFFF, 500, 500, &timeout); - todo_wine ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res); + ok(res == STATUS_INVALID_PARAMETER, "NtCreateNamedPipeFile returned %x\n", res); if (!res) CloseHandle(handle); diff --git a/server/named_pipe.c b/server/named_pipe.c index 0f89f5b..66664bb 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -940,6 +940,12 @@ DECL_HANDLER(create_named_pipe) struct unicode_str name; struct directory *root = NULL; + if (!req->sharing || (req->sharing & ~(FILE_SHARE_READ | FILE_SHARE_WRITE))) + { + set_error( STATUS_INVALID_PARAMETER ); + return; + } + reply->handle = 0; get_req_unicode_str( &name ); if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 )))

1 0

Erich Hoover : hhctrl.ocx: Use the STD_PROPERTIES icon for the 'Options' toolbar button.
by Alexandre Julliard 27 Sep '11

27 Sep '11

Module: wine Branch: master Commit: 1cabe3018395147f634e02f7a801956e10aec30c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cabe3018395147f634e02f7a… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Sep 27 08:10:13 2011 -0600 hhctrl.ocx: Use the STD_PROPERTIES icon for the 'Options' toolbar button. --- dlls/hhctrl.ocx/help.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 7bde256..267f24e 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -839,7 +839,7 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_SYNC, nStdBitmaps + STD_PRINT); if (dwButtonFlags & HHWIN_BUTTON_OPTIONS) - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS, nStdBitmaps + STD_PRINT); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_OPTIONS, nStdBitmaps + STD_PROPERTIES); if (dwButtonFlags & HHWIN_BUTTON_PRINT) TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_PRINT, nStdBitmaps + STD_PRINT);

1 0