wine-commits March 2013

wine-commits@winehq.org

2 participants
531 discussions

Nikolay Sivov : msxml3: Filter unsupported child nodes in insertBefore() for elements.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 2d5c9f4f462f50cd82536dee3c5c9e7dfd6ad336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5c9f4f462f50cd82536dee3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 3 21:20:13 2013 +0400 msxml3: Filter unsupported child nodes in insertBefore() for elements. --- dlls/msxml3/element.c | 22 +++++++++++++++++++--- dlls/msxml3/tests/domdoc.c | 8 +++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 929830b..70360e5 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -301,13 +301,29 @@ static HRESULT WINAPI domelem_get_attributes( static HRESULT WINAPI domelem_insertBefore( IXMLDOMElement *iface, IXMLDOMNode* newNode, VARIANT refChild, - IXMLDOMNode** outOldNode) + IXMLDOMNode** old_node) { domelem *This = impl_from_IXMLDOMElement( iface ); + DOMNodeType type; + HRESULT hr; - TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), outOldNode); + TRACE("(%p)->(%p %s %p)\n", This, newNode, debugstr_variant(&refChild), old_node); + + hr = IXMLDOMNode_get_nodeType(newNode, &type); + if (hr != S_OK) return hr; - return node_insert_before(&This->node, newNode, &refChild, outOldNode); + TRACE("new node type %d\n", type); + switch (type) + { + case NODE_DOCUMENT: + case NODE_DOCUMENT_TYPE: + case NODE_ENTITY: + case NODE_NOTATION: + if (old_node) *old_node = NULL; + return E_FAIL; + default: + return node_insert_before(&This->node, newNode, &refChild, old_node); + } } static HRESULT WINAPI domelem_replaceChild( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c1bfc1a..794df03 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4,7 +4,7 @@ * Copyright 2005 Mike McCormack for CodeWeavers * Copyright 2007-2008 Alistair Leslie-Hughes * Copyright 2010-2011 Adam Martinson for CodeWeavers - * Copyright 2010-2012 Nikolay Sivov for CodeWeavers + * Copyright 2010-2013 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -8484,6 +8484,12 @@ static void test_insertBefore(void) todo_wine EXPECT_REF(elem2, 2); + /* document to element */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + hr = IXMLDOMElement_insertBefore(elem1, (IXMLDOMNode*)doc, v, NULL); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = NULL; node = NULL;

1 0

Petr Kočandrle : po: Completed WineMine Czech translation.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: ce4291c513ad7bbc010ee9d31614014495a5dd28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce4291c513ad7bbc010ee9d31… Author: Petr Kočandrle <petr.kocandrle(a)gmail.com> Date: Fri Mar 1 14:39:18 2013 +0100 po: Completed WineMine Czech translation. --- po/cs.po | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/po/cs.po b/po/cs.po index cc63ae6..4e84598 100644 --- a/po/cs.po +++ b/po/cs.po @@ -13825,7 +13825,7 @@ msgstr "" #: winemine.rc:34 msgid "&Game" -msgstr "" +msgstr "&Hra" #: winemine.rc:35 msgid "&New\tF2" @@ -13833,7 +13833,7 @@ msgstr "&Nová\tF2" #: winemine.rc:37 msgid "Question &Marks" -msgstr "" +msgstr "&Otazníky" #: winemine.rc:39 msgid "&Beginner" @@ -13845,28 +13845,25 @@ msgstr "&Pokročilý" #: winemine.rc:41 msgid "&Expert" -msgstr "" +msgstr "E&xpert" #: winemine.rc:42 msgid "&Custom..." -msgstr "&Dle libosti..." +msgstr "&Vlastní..." #: winemine.rc:44 -#, fuzzy msgid "&Fastest Times" -msgstr "Ne&jlepší časy" +msgstr "N&ejlepší časy" #: winemine.rc:49 -#, fuzzy msgid "&About WineMine" -msgstr "&O Wine" +msgstr "&O WineMinách" #: winemine.rc:56 msgid "Fastest Times" msgstr "Nejlepší časy" #: winemine.rc:58 -#, fuzzy msgid "Fastest times" msgstr "Nejlepší časy" @@ -13884,11 +13881,11 @@ msgstr "Expert" #: winemine.rc:74 msgid "Congratulations!" -msgstr "Gratulujeme !" +msgstr "Gratulace!" #: winemine.rc:76 msgid "Please enter your name" -msgstr "Prosím, zadejte své jméno" +msgstr "Zadej prosím své jméno" #: winemine.rc:84 msgid "Custom Game" @@ -13900,7 +13897,7 @@ msgstr "Řádky" #: winemine.rc:87 msgid "Columns" -msgstr "" +msgstr "Sloupce" #: winemine.rc:88 msgid "Mines" @@ -13908,7 +13905,7 @@ msgstr "Miny" #: winemine.rc:27 msgid "WineMine" -msgstr "WineMine" +msgstr "WineMiny" #: winemine.rc:28 msgid "Nobody"

1 0

Jeff Muizelaar : dbghelp: Store the vendor id in the correct order.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 03cae026114b175dfe15a68c5a9ae16b575c9c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cae026114b175dfe15a68c5… Author: Jeff Muizelaar <jmuizelaar(a)mozilla.com> Date: Fri Mar 1 10:12:10 2013 -0500 dbghelp: Store the vendor id in the correct order. --- dlls/dbghelp/minidump.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 7a21e8b..b00f9e2 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -635,8 +635,8 @@ static unsigned dump_system_info(struct dump_context* dc) do_x86cpuid(0, regs0); mdSysInfo.Cpu.X86CpuInfo.VendorId[0] = regs0[1]; - mdSysInfo.Cpu.X86CpuInfo.VendorId[1] = regs0[2]; - mdSysInfo.Cpu.X86CpuInfo.VendorId[2] = regs0[3]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[1] = regs0[3]; + mdSysInfo.Cpu.X86CpuInfo.VendorId[2] = regs0[2]; do_x86cpuid(1, regs1); mdSysInfo.Cpu.X86CpuInfo.VersionInformation = regs1[0]; mdSysInfo.Cpu.X86CpuInfo.FeatureInformation = regs1[3];

1 0

Vincent Povirk : gdiplus: Store the image type on a Graphics object in case the image is freed.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 7b004c17149af7b9bedc72ff1ee30ea6f6f755c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b004c17149af7b9bedc72ff1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Mar 2 14:28:01 2013 -0600 gdiplus: Store the image type on a Graphics object in case the image is freed. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index cb7330e..87f3b8b 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -154,6 +154,7 @@ struct GpGraphics{ BOOL owndc; BOOL alpha_hdc; GpImage *image; + ImageType image_type; SmoothingMode smoothing; CompositingQuality compqual; InterpolationMode interpolation; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 853027c..1150675 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2195,6 +2195,9 @@ GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) (*graphics)->hwnd = NULL; (*graphics)->owndc = FALSE; (*graphics)->image = image; + /* We have to store the image type here because the image may be freed + * before GdipDeleteGraphics is called, and metafiles need special treatment. */ + (*graphics)->image_type = image->type; (*graphics)->smoothing = SmoothingModeDefault; (*graphics)->compqual = CompositingQualityDefault; (*graphics)->interpolation = InterpolationModeBilinear; @@ -2389,7 +2392,7 @@ GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics) if(!graphics) return InvalidParameter; if(graphics->busy) return ObjectBusy; - if (graphics->image && graphics->image->type == ImageTypeMetafile) + if (graphics->image && graphics->image_type == ImageTypeMetafile) { stat = METAFILE_GraphicsDeleted((GpMetafile*)graphics->image); if (stat != Ok)

1 0

Andrew Talbot : windowscodecs: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 81afb28818338a1511f5eaf3db80d1365c17f7da URL: http://source.winehq.org/git/wine.git/?a=commit;h=81afb28818338a1511f5eaf3d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:47 2013 +0000 windowscodecs: Avoid signed-unsigned integer comparisons. --- dlls/windowscodecs/icoformat.c | 2 +- dlls/windowscodecs/info.c | 7 ++++--- dlls/windowscodecs/jpegformat.c | 5 +++-- dlls/windowscodecs/main.c | 2 +- dlls/windowscodecs/metadatahandler.c | 4 ++-- dlls/windowscodecs/palette.c | 2 +- dlls/windowscodecs/scaler.c | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index ec09aa6..d245031 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -293,7 +293,7 @@ static HRESULT ReadIcoDib(IStream *stream, IcoFrameDecode *result) { /* If the alpha channel is fully transparent, we should ignore it. */ int nonzero_alpha = 0; - int i; + UINT i; for (i=0; i<(result->height*result->width); i++) { diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 3da5b20..7c87c5d 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -539,7 +539,8 @@ static HRESULT WINAPI BitmapDecoderInfo_MatchesPattern(IWICBitmapDecoderInfo *if WICBitmapPattern *patterns; UINT pattern_count=0, patterns_size=0; HRESULT hr; - int i, pos; + UINT i; + ULONG pos; BYTE *data=NULL; ULONG datasize=0; ULONG bytesread; @@ -1900,7 +1901,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int num_fetched=0; + ULONG num_fetched=0; ComponentEnumItem *item; HRESULT hr=S_OK; @@ -1929,7 +1930,7 @@ static HRESULT WINAPI ComponentEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI ComponentEnum_Skip(IEnumUnknown *iface, ULONG celt) { ComponentEnum *This = impl_from_IEnumUnknown(iface); - int i; + ULONG i; HRESULT hr=S_OK; TRACE("(%p,%u)\n", iface, celt); diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 1aca6d1..6f2653d 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -998,7 +998,8 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); jmp_buf jmpbuf; BYTE *swapped_data = NULL, *current_row; - int line, row_size; + UINT line; + int row_size; TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); EnterCriticalSection(&This->lock); @@ -1061,7 +1062,7 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface { if (This->format->swap_rgb) { - int x; + UINT x; memcpy(swapped_data, pbPixels + (cbStride * line), row_size); diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index b63edf5..967f80b 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -98,7 +98,7 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if (row_offset % 8 == 0) { /* everything lines up on a byte boundary */ - UINT row; + INT row; const BYTE *src; BYTE *dst; diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c index 6b19f84..7615a6d 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c @@ -60,7 +60,7 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if static void MetadataHandler_FreeItems(MetadataHandler *This) { - int i; + DWORD i; for (i=0; i<This->item_count; i++) { @@ -555,7 +555,7 @@ static HRESULT WINAPI MetadataHandlerEnum_Next(IWICEnumMetadataItem *iface, MetadataHandlerEnum *This = impl_from_IWICEnumMetadataItem(iface); ULONG new_index; HRESULT hr=S_FALSE; - int i; + ULONG i; TRACE("(%p,%i)\n", iface, celt); diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 045f795..e21a073 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -592,7 +592,7 @@ static HRESULT WINAPI PaletteImpl_IsGrayscale(IWICPalette *iface, BOOL *pfIsGray static HRESULT WINAPI PaletteImpl_HasAlpha(IWICPalette *iface, BOOL *pfHasAlpha) { PaletteImpl *This = impl_from_IWICPalette(iface); - int i; + UINT i; TRACE("(%p,%p)\n", iface, pfHasAlpha); diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c index 5470d2b..03410e8 100644 --- a/dlls/windowscodecs/scaler.c +++ b/dlls/windowscodecs/scaler.c @@ -178,7 +178,7 @@ static void NearestNeighbor_CopyScanline(BitmapScaler *This, UINT dst_x, UINT dst_y, UINT dst_width, BYTE **src_data, UINT src_data_x, UINT src_data_y, BYTE *pbBuffer) { - int i; + UINT i; UINT bytesperpixel = This->bpp/8; UINT src_x, src_y;

1 0

Andrew Talbot : mscoree: Remove unneeded address-of operator from function name.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: edea85dea684a8440dd758dabc24fe9722ac7cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edea85dea684a8440dd758dab… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:44 2013 +0000 mscoree: Remove unneeded address-of operator from function name. --- dlls/mscoree/metahost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 6906075..fe529fd 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -318,7 +318,7 @@ void unload_all_runtimes(void) /* If the only references to mscoree are through dll's that were loaded by * Mono, shutting down the Mono runtime will free mscoree, so take a * reference to prevent that from happening. */ - GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)&unload_all_runtimes, &handle); + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)unload_all_runtimes, &handle); for (i=0; i<NUM_ABI_VERSIONS; i++) {

1 0

Andrew Talbot : winealsa.drv: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: 23bf25b0c0c08427e2f65af2c16020afcfc788d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23bf25b0c0c08427e2f65af2c… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Mar 2 15:37:50 2013 +0000 winealsa.drv: Avoid signed-unsigned integer comparisons. --- dlls/winealsa.drv/mmdevdrv.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8c905e9..2948366 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -3396,7 +3396,7 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( IAudioStreamVolume *iface, UINT32 count, const float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3422,7 +3422,7 @@ static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( IAudioStreamVolume *iface, UINT32 count, float *levels) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -3558,7 +3558,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; + unsigned int i; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -3589,7 +3589,7 @@ static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; + unsigned int i; TRACE("(%p)->(%d, %p)\n", session, count, levels);

1 0

Piotr Caban : msvcrt: Added stdin close/open tests.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: cd7b71d3f416fcf34814af7b69bdb869375fca25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd7b71d3f416fcf34814af7b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:31 2013 +0100 msvcrt: Added stdin close/open tests. --- dlls/msvcrt/tests/file.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 392b1a0..938161c 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1964,6 +1964,42 @@ static void test_dup2(void) ok(-1 == _dup2(0, -1), "expected _dup2 to fail when second arg is negative\n" ); } +static void test_stdin(void) +{ + HANDLE stdinh = GetStdHandle(STD_INPUT_HANDLE); + int stdin_dup, fd; + HANDLE h; + DWORD r; + + stdin_dup = _dup(STDIN_FILENO); + ok(stdin_dup != -1, "_dup(STDIN_FILENO) failed\n"); + + ok(stdinh == (HANDLE)_get_osfhandle(STDIN_FILENO), + "GetStdHandle(STD_INPUT_HANDLE) != _get_osfhandle(STDIN_FILENO)\n"); + + r = SetStdHandle(STD_INPUT_HANDLE, INVALID_HANDLE_VALUE); + ok(r == TRUE, "SetStdHandle returned %x, expected TRUE\n", r); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == INVALID_HANDLE_VALUE, "h = %p\n", h); + + close(STDIN_FILENO); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h == NULL, "h != NULL\n"); + + fd = open("stdin.tst", O_WRONLY | O_CREAT, _S_IREAD |_S_IWRITE); + ok(fd != -1, "open failed\n"); + ok(fd == STDIN_FILENO, "fd = %d, expected STDIN_FILENO\n", fd); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); + close(fd); + unlink("stdin.tst"); + + r = _dup2(stdin_dup, STDIN_FILENO); + ok(r != -1, "_dup2 failed\n"); + h = GetStdHandle(STD_INPUT_HANDLE); + ok(h != NULL, "h == NULL\n"); +} + START_TEST(file) { int arg_c; @@ -2019,6 +2055,7 @@ START_TEST(file) test_get_osfhandle(); test_setmaxstdio(); test_pipes(arg_v[0]); + test_stdin(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order

1 0

Piotr Caban : msvcrt: Reuse standard file descriptors after closing them.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: db92137f83671204f4a9f188a6a432f98ef6648b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db92137f83671204f4a9f188a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:21 2013 +0100 msvcrt: Reuse standard file descriptors after closing them. --- dlls/msvcrt/file.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c730bd7..5b3bf5e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -251,40 +251,37 @@ static HANDLE msvcrt_fdtoh(int fd) /* INTERNAL: free a file entry fd */ static void msvcrt_free_fd(int fd) { - HANDLE old_handle; ioinfo *fdinfo; LOCK_FILES(); fdinfo = msvcrt_get_ioinfo(fd); - old_handle = fdinfo->handle; if(fdinfo != &MSVCRT___badioinfo) { fdinfo->handle = INVALID_HANDLE_VALUE; fdinfo->wxflag = 0; } TRACE(":fd (%d) freed\n",fd); - if (fd < 3) /* don't use 0,1,2 for user files */ + + if (fd < 3) { switch (fd) { case 0: - if (GetStdHandle(STD_INPUT_HANDLE) == old_handle) SetStdHandle(STD_INPUT_HANDLE, 0); + SetStdHandle(STD_INPUT_HANDLE, 0); break; case 1: - if (GetStdHandle(STD_OUTPUT_HANDLE) == old_handle) SetStdHandle(STD_OUTPUT_HANDLE, 0); + SetStdHandle(STD_OUTPUT_HANDLE, 0); break; case 2: - if (GetStdHandle(STD_ERROR_HANDLE) == old_handle) SetStdHandle(STD_ERROR_HANDLE, 0); + SetStdHandle(STD_ERROR_HANDLE, 0); break; } } - else - { - if (fd == MSVCRT_fdend - 1) - MSVCRT_fdend--; - if (fd < MSVCRT_fdstart) - MSVCRT_fdstart = fd; - } + + if (fd == MSVCRT_fdend - 1) + MSVCRT_fdend--; + if (fd < MSVCRT_fdstart) + MSVCRT_fdstart = fd; UNLOCK_FILES(); }

1 0

Piotr Caban : msvcrt: Don' t duplicate standard handles during initialization.
by Alexandre Julliard 04 Mar '13

04 Mar '13

Module: wine Branch: master Commit: f565e4a3157d38b50a25fc3b90014474b59fceba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f565e4a3157d38b50a25fc3b9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 1 15:04:07 2013 +0100 msvcrt: Don't duplicate standard handles during initialization. --- dlls/msvcrt/file.c | 50 +++++++++----------------------------------------- 1 files changed, 9 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 612f470..c730bd7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -486,53 +486,21 @@ void msvcrt_init_io(void) if (msvcrt_get_ioinfo(MSVCRT_fdstart)->handle == INVALID_HANDLE_VALUE) break; } - if(!MSVCRT___pioinfo[0]) - msvcrt_alloc_fd_from(INVALID_HANDLE_VALUE, 0, 3); - - fdinfo = msvcrt_get_ioinfo(0); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_INPUT_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_INPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDIN_FILENO); - fdinfo = msvcrt_get_ioinfo(1); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_OUTPUT_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_OUTPUT_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDOUT_FILENO); - fdinfo = msvcrt_get_ioinfo(2); + fdinfo = msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO); if (!(fdinfo->wxflag & WX_OPEN) || fdinfo->handle == INVALID_HANDLE_VALUE) - { - HANDLE std = GetStdHandle(STD_ERROR_HANDLE); - if (std != INVALID_HANDLE_VALUE && DuplicateHandle(GetCurrentProcess(), std, - GetCurrentProcess(), &fdinfo->handle, - 0, TRUE, DUPLICATE_SAME_ACCESS)) - fdinfo->wxflag = WX_OPEN | WX_TEXT; - fdinfo->lookahead[0] = '\n'; - fdinfo->lookahead[1] = '\n'; - fdinfo->lookahead[2] = '\n'; - fdinfo->exflag = 0; - } + msvcrt_alloc_fd_from(GetStdHandle(STD_ERROR_HANDLE), WX_OPEN|WX_TEXT, MSVCRT_STDERR_FILENO); - TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(0)->handle, - msvcrt_get_ioinfo(1)->handle, msvcrt_get_ioinfo(2)->handle); + TRACE(":handles (%p)(%p)(%p)\n", msvcrt_get_ioinfo(MSVCRT_STDIN_FILENO)->handle, + msvcrt_get_ioinfo(MSVCRT_STDOUT_FILENO)->handle, + msvcrt_get_ioinfo(MSVCRT_STDERR_FILENO)->handle); memset(MSVCRT__iob,0,3*sizeof(MSVCRT_FILE)); for (i = 0; i < 3; i++)

1 0

← Newer
1
...
47
48
49
50
51
52
53
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2013