August 2011 - Wine-Commits - list.winehq.org

Alexandre Julliard : gdi32: Only use the hdc parameter in SetDIBits when needed.
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: 5f35075c8be21f46d5c73d782d2aa7435f5d576f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f35075c8be21f46d5c73d782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 30 21:13:55 2011 +0200 gdi32: Only use the hdc parameter in SetDIBits when needed. --- dlls/gdi32/dib.c | 33 +++++++-------------------------- 1 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 978119a..a2e9b5e 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -207,15 +207,17 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * return TRUE; } -static int fill_color_table_from_palette( BITMAPINFO *info, DC *dc ) +static int fill_color_table_from_palette( BITMAPINFO *info, HDC hdc ) { PALETTEENTRY palEntry[256]; + HPALETTE palette = GetCurrentObject( hdc, OBJ_PAL ); int i, colors = get_dib_num_of_colors( info ); + if (!palette) return 0; if (!colors) return 0; memset( palEntry, 0, sizeof(palEntry) ); - if (!GetPaletteEntries( dc->hPalette, 0, colors, palEntry )) + if (!GetPaletteEntries( palette, 0, colors, palEntry )) return 0; for (i = 0; i < colors; i++) @@ -498,8 +500,6 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) { - DC *dc = get_dc_ptr( hdc ); - BOOL delete_hdc = FALSE; BITMAPOBJ *bitmap; char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; @@ -524,26 +524,9 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, src_bits.free = NULL; src_bits.param = NULL; - if (coloruse == DIB_RGB_COLORS && !dc) - { - hdc = CreateCompatibleDC(0); - dc = get_dc_ptr( hdc ); - delete_hdc = TRUE; - } + if (coloruse == DIB_PAL_COLORS && !fill_color_table_from_palette( src_info, hdc )) return 0; - if (!dc) return 0; - - update_dc( dc ); - - if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) - { - release_dc_ptr( dc ); - if (delete_hdc) DeleteDC(hdc); - return 0; - } - - if (coloruse == DIB_PAL_COLORS) - if (!fill_color_table_from_palette( src_info, dc )) goto done; + if (!(bitmap = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return 0; if (src_info->bmiHeader.biCompression == BI_RLE4 || src_info->bmiHeader.biCompression == BI_RLE8) { @@ -623,8 +606,6 @@ done: if (src_bits.free) src_bits.free( &src_bits ); if (clip) DeleteObject( clip ); GDI_ReleaseObj( hbitmap ); - release_dc_ptr( dc ); - if (delete_hdc) DeleteDC(hdc); return result; } @@ -1104,7 +1085,7 @@ INT WINAPI GetDIBits( { if( coloruse == DIB_PAL_COLORS ) { - if (!fill_color_table_from_palette( dst_info, dc )) goto done; + if (!fill_color_table_from_palette( dst_info, hdc )) goto done; } else {

1 0

Alexandre Julliard : gdi32: Forward the null driver GetImage to the DIB driver since the bits are in DIB format .
by Alexandre Julliard Aug. 31, 2011

Aug. 31, 2011

Module: wine Branch: master Commit: bff79eb2b94789ac1e8b424b2db3c87e26c0799a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bff79eb2b94789ac1e8b424b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 29 15:55:35 2011 +0200 gdi32: Forward the null driver GetImage to the DIB driver since the bits are in DIB format. --- dlls/gdi32/bitmap.c | 46 +++++++++++----------------------------------- dlls/gdi32/dib.c | 16 ++++++++++++++++ dlls/gdi32/dibdrv/dc.c | 9 ++++++++- dlls/gdi32/gdi_private.h | 1 + 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 226f358..9e2cd32 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -54,55 +54,31 @@ DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) { BITMAPOBJ *bmp; - int height, width_bytes; + DWORD ret; if (!hbitmap) return ERROR_NOT_SUPPORTED; if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; - info->bmiHeader.biSize = sizeof(info->bmiHeader); - info->bmiHeader.biPlanes = 1; - info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; - info->bmiHeader.biCompression = BI_RGB; - info->bmiHeader.biXPelsPerMeter = 0; - info->bmiHeader.biYPelsPerMeter = 0; - info->bmiHeader.biClrUsed = 0; - info->bmiHeader.biClrImportant = 0; - if (bmp->bitmap.bmBitsPixel == 16) + if (bmp->bitmap.bmBits || !bits) { - DWORD *masks = (DWORD *)info->bmiColors; - masks[0] = 0x7c00; - masks[1] = 0x03e0; - masks[2] = 0x001f; - info->bmiHeader.biCompression = BI_BITFIELDS; + ret = dib_driver.pGetImage( 0, hbitmap, info, bits, src ); } - if (!bits) goto done; - - height = src->visrect.bottom - src->visrect.top; - width_bytes = get_dib_stride( bmp->bitmap.bmWidth, bmp->bitmap.bmBitsPixel ); - info->bmiHeader.biWidth = bmp->bitmap.bmWidth; - info->bmiHeader.biHeight = -height; - info->bmiHeader.biSizeImage = height * width_bytes; + else if (!(ret = dib_driver.pGetImage( 0, hbitmap, info, NULL, src ))) + { + info->bmiHeader.biHeight = -(src->visrect.bottom - src->visrect.top); + info->bmiHeader.biSizeImage = get_dib_image_size( info ); - /* make the source rectangle relative to the returned bits */ - src->y -= src->visrect.top; - offset_rect( &src->visrect, 0, -src->visrect.top ); + /* make the source rectangle relative to the returned bits */ + src->y -= src->visrect.top; + offset_rect( &src->visrect, 0, -src->visrect.top ); - if (bmp->bitmap.bmBits) - { - bits->ptr = (char *)bmp->bitmap.bmBits + src->visrect.top * width_bytes; - bits->is_copy = FALSE; - bits->free = NULL; - } - else - { /* return all-zero bits */ bits->ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, info->bmiHeader.biSizeImage ); bits->is_copy = TRUE; bits->free = free_heap_bits; } -done: GDI_ReleaseObj( hbitmap ); - return ERROR_SUCCESS; + return ret; } DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 7ab2982..78dbd14 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -895,6 +895,22 @@ static void fill_default_color_table( BITMAPINFO *info ) } } +void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) +{ + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biWidth = bmp->bitmap.bmWidth; + info->bmiHeader.biHeight = -bmp->bitmap.bmHeight; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (info->bmiHeader.biBitCount <= 8) fill_default_color_table( info ); +} + + /****************************************************************************** * GetDIBits [GDI32.@] * diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 245e7c7..7caea01 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -213,7 +213,14 @@ BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void * BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) { - assert(bmp->dib); + if (!bmp->dib) + { + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + + get_ddb_bitmapinfo( bmp, info ); + return init_dib_info_from_bitmapinfo( dib, info, bmp->bitmap.bmBits, flags ); + } return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, flags ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2189040..1b855ca 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -308,6 +308,7 @@ extern BOOL BIDI_Reorder( HDC hDC, LPCWSTR lpString, INT uCount, DWORD dwFlags, LPWSTR lpOutString, INT uCountOut, UINT *lpOrder, WORD **lpGlyphs, INT* cGlyphs ) DECLSPEC_HIDDEN; /* bitmap.c */ +extern void get_ddb_bitmapinfo( BITMAPOBJ *bmp, BITMAPINFO *info ) DECLSPEC_HIDDEN; extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN;

1 0

Jörg Höhle : mmdevapi: Do not mix frames and bytes.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: abf5b64f4c1a5adfeb20ef3ffe6cd4c6e89ec3b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abf5b64f4c1a5adfeb20ef3ff… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 9 21:29:00 2011 +0200 mmdevapi: Do not mix frames and bytes. --- dlls/winealsa.drv/mmdevdrv.c | 8 ++++---- dlls/wineoss.drv/mmdevdrv.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ec75fec..24dbeef 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1994,15 +1994,16 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return S_OK; } -static void alsa_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_bytes) +static void alsa_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_frames) { snd_pcm_uframes_t write_offs_frames = (This->lcl_offs_frames + This->held_frames) % This->bufsize_frames; UINT32 write_offs_bytes = write_offs_frames * This->fmt->nBlockAlign; snd_pcm_uframes_t chunk_frames = This->bufsize_frames - write_offs_frames; UINT32 chunk_bytes = chunk_frames * This->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * This->fmt->nBlockAlign; - if(written_bytes < chunk_bytes){ + if(written_bytes <= chunk_bytes){ memcpy(This->local_buffer + write_offs_bytes, buffer, written_bytes); }else{ memcpy(This->local_buffer + write_offs_bytes, buffer, chunk_bytes); @@ -2015,7 +2016,6 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( IAudioRenderClient *iface, UINT32 written_frames, DWORD flags) { ACImpl *This = impl_from_IAudioRenderClient(iface); - UINT32 written_bytes = written_frames * This->fmt->nBlockAlign; BYTE *buffer; HRESULT hr; @@ -2048,7 +2048,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( if(This->held_frames){ if(This->buf_state == LOCKED_WRAPPED) - alsa_wrap_buffer(This, buffer, written_bytes); + alsa_wrap_buffer(This, buffer, written_frames); This->held_frames += written_frames; }else{ diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 0e44842..64d60fe 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1625,15 +1625,16 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, return S_OK; } -static void oss_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_bytes) +static void oss_wrap_buffer(ACImpl *This, BYTE *buffer, UINT32 written_frames) { UINT32 write_offs_frames = (This->lcl_offs_frames + This->held_frames) % This->bufsize_frames; UINT32 write_offs_bytes = write_offs_frames * This->fmt->nBlockAlign; UINT32 chunk_frames = This->bufsize_frames - write_offs_frames; UINT32 chunk_bytes = chunk_frames * This->fmt->nBlockAlign; + UINT32 written_bytes = written_frames * This->fmt->nBlockAlign; - if(written_bytes < chunk_bytes){ + if(written_bytes <= chunk_bytes){ memcpy(This->local_buffer + write_offs_bytes, buffer, written_bytes); }else{ memcpy(This->local_buffer + write_offs_bytes, buffer, chunk_bytes); @@ -1647,7 +1648,6 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( { ACImpl *This = impl_from_IAudioRenderClient(iface); BYTE *buffer; - UINT32 written_bytes = written_frames * This->fmt->nBlockAlign; TRACE("(%p)->(%u, %x)\n", This, written_frames, flags); @@ -1670,7 +1670,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( if(This->held_frames){ if(This->buf_state == LOCKED_WRAPPED) - oss_wrap_buffer(This, buffer, written_bytes); + oss_wrap_buffer(This, buffer, written_frames); This->held_frames += written_frames; }else{

1 0

Marcus Meissner : wined3d: Remove a useless NULL check (Coverity).
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 7023964865aa5a09a749f2e58c4583197b7519a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7023964865aa5a09a749f2e58… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Aug 30 15:51:27 2011 +0200 wined3d: Remove a useless NULL check (Coverity). --- dlls/wined3d/context.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index de0933c..e44ee81 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2076,7 +2076,7 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de ENTER_GL(); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, rt, NULL, rt->draw_binding); LEAVE_GL(); - if (rt && rt->resource.format->id != WINED3DFMT_NULL) + if (rt->resource.format->id != WINED3DFMT_NULL) rt_mask = 1; else rt_mask = 0;

1 0

Marcus Meissner : gameux: Initialize a variable (Coverity).
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 4f704760e1ba960c1d7b2f159da5d100bed92a5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f704760e1ba960c1d7b2f159… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Aug 30 15:43:15 2011 +0200 gameux: Initialize a variable (Coverity). --- dlls/gameux/gamestatistics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 5465b39..b40975f 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -1083,7 +1083,7 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( { HRESULT hr; WCHAR lpApplicationId[49]; - GameStatisticsImpl *statisticsImpl; + GameStatisticsImpl *statisticsImpl = NULL; IGameStatistics *output_iface; TRACE("(%p, %s, 0x%x, %p, %p)\n", iface, debugstr_w(GDFBinaryPath), openType, pOpenResult, ppiStats);

1 0

Jay Yang : explorer: Try ShellExecute if the parameter isn't a directory.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: c268c40fdf0ecf904769ad2e7fba23884f967c1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c268c40fdf0ecf904769ad2e7… Author: Jay Yang <jkelleyy(a)gmail.com> Date: Mon Aug 29 04:15:00 2011 -0400 explorer: Try ShellExecute if the parameter isn't a directory. --- programs/explorer/Makefile.in | 2 +- programs/explorer/explorer.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index 6fe3fae..d317570 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = explorer.exe APPMODE = -mwindows -municode IMPORTS = rpcrt4 user32 gdi32 advapi32 -DELAYIMPORTS = comctl32 shell32 ole32 +DELAYIMPORTS = comctl32 shell32 ole32 shlwapi C_SRCS = \ appbar.c \ diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 9ada5d2..35080a3 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -32,6 +32,7 @@ #include <windows.h> #include <shobjidl.h> #include <shlobj.h> +#include <shlwapi.h> #include <commoncontrols.h> #include <commctrl.h> @@ -755,6 +756,9 @@ int WINAPI wWinMain(HINSTANCE hinstance, WINE_ERR("Could not initialize COM\n"); ExitProcess(EXIT_FAILURE); } + if(parameters.root[0] && !PathIsDirectoryW(parameters.root)) + if(ShellExecuteW(NULL,NULL,parameters.root,NULL,NULL,SW_SHOWDEFAULT) > (HINSTANCE)32) + ExitProcess(EXIT_SUCCESS); init_info.dwSize = sizeof(INITCOMMONCONTROLSEX); init_info.dwICC = ICC_USEREX_CLASSES | ICC_BAR_CLASSES | ICC_COOL_CLASSES; if(!InitCommonControlsEx(&init_info))

1 0

Octavian Voicu : cmd/tests: Test del / s recursion in subdirectories with colons.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 0b10003d4a34ef9d2325fd6fac72aecff3af553d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b10003d4a34ef9d2325fd6fa… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Tue Aug 30 15:19:28 2011 +0300 cmd/tests: Test del /s recursion in subdirectories with colons. --- programs/cmd/tests/test_builtins.cmd | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b975d38..f473b91 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -854,6 +854,7 @@ rmdir del_q_dir echo ------------ Testing del /s -------------- mkdir "foo bar" cd "foo bar" +mkdir "foo:" echo hi > file1.dat echo there > file2.dat echo bub > file3.dat @@ -868,6 +869,7 @@ for %%f in (1 2 3) do if exist file%%f.dat echo Del /s failed on file%%f for %%f in (1 2 3) do if exist file%%f.dat del file%%f.dat if exist "file with spaces.dat" echo Del /s failed on "file with spaces.dat" if exist "file with spaces.dat" del "file with spaces.dat" +rmdir "foo:" cd .. rmdir "foo bar"

1 0

Frédéric Delanoy : cmd: Add help for FTYPE command.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: caa8fc041db2d3a7cc539436793ba74bfa143c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caa8fc041db2d3a7cc5394367… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 29 21:45:18 2011 +0200 cmd: Add help for FTYPE command. --- po/ar.po | 93 ++++++++++++++++++++++++++------------------- po/bg.po | 93 ++++++++++++++++++++++++++------------------- po/ca.po | 93 ++++++++++++++++++++++++++------------------- po/cs.po | 93 ++++++++++++++++++++++++++------------------- po/da.po | 93 ++++++++++++++++++++++++++------------------- po/de.po | 93 ++++++++++++++++++++++++++------------------- po/el.po | 93 ++++++++++++++++++++++++++------------------- po/en.po | 94 ++++++++++++++++++++++++++------------------- po/en_US.po | 104 +++++++++++++++++++++++++++++++------------------- po/eo.po | 93 ++++++++++++++++++++++++++------------------- po/es.po | 93 ++++++++++++++++++++++++++------------------- po/fa.po | 93 ++++++++++++++++++++++++++------------------- po/fi.po | 93 ++++++++++++++++++++++++++------------------- po/fr.po | 93 ++++++++++++++++++++++++++------------------- po/he.po | 93 ++++++++++++++++++++++++++------------------- po/hi.po | 93 ++++++++++++++++++++++++++------------------- po/hu.po | 93 ++++++++++++++++++++++++++------------------- po/it.po | 93 ++++++++++++++++++++++++++------------------- po/ja.po | 93 ++++++++++++++++++++++++++------------------- po/ko.po | 93 ++++++++++++++++++++++++++------------------- po/lt.po | 93 ++++++++++++++++++++++++++------------------- po/ml.po | 93 ++++++++++++++++++++++++++------------------- po/nb_NO.po | 93 ++++++++++++++++++++++++++------------------- po/nl.po | 93 ++++++++++++++++++++++++++------------------- po/or.po | 93 ++++++++++++++++++++++++++------------------- po/pa.po | 93 ++++++++++++++++++++++++++------------------- po/pl.po | 93 ++++++++++++++++++++++++++------------------- po/pt_BR.po | 93 ++++++++++++++++++++++++++------------------- po/pt_PT.po | 93 ++++++++++++++++++++++++++------------------- po/rm.po | 93 ++++++++++++++++++++++++++------------------- po/ro.po | 93 ++++++++++++++++++++++++++------------------- po/ru.po | 93 ++++++++++++++++++++++++++------------------- po/sk.po | 93 ++++++++++++++++++++++++++------------------- po/sl.po | 93 ++++++++++++++++++++++++++------------------- po/sr_RS(a)cyrillic.po | 93 ++++++++++++++++++++++++++------------------- po/sr_RS(a)latin.po | 93 ++++++++++++++++++++++++++------------------- po/sv.po | 93 ++++++++++++++++++++++++++------------------- po/te.po | 93 ++++++++++++++++++++++++++------------------- po/th.po | 93 ++++++++++++++++++++++++++------------------- po/tr.po | 93 ++++++++++++++++++++++++++------------------- po/uk.po | 93 ++++++++++++++++++++++++++------------------- po/wa.po | 93 ++++++++++++++++++++++++++------------------- po/wine.pot | 93 ++++++++++++++++++++++++++------------------- po/zh_CN.po | 93 ++++++++++++++++++++++++++------------------- po/zh_TW.po | 93 ++++++++++++++++++++++++++------------------- programs/cmd/cmd.rc | 12 ++++++ 46 files changed, 2454 insertions(+), 1755 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=caa8fc041db2d3a7cc539…

1 0

Frédéric Delanoy : cmd/tests: Add ftype tests.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: 74566422c732d4f0631658629a0048482586400d URL: http://source.winehq.org/git/wine.git/?a=commit;h=74566422c732d4f0631658629… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 29 21:45:19 2011 +0200 cmd/tests: Add ftype tests. --- programs/cmd/tests/test_builtins.cmd | 42 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 10 +++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 9dd2b60..b975d38 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1113,6 +1113,48 @@ type baz echo *** cd .. & rd /s/q foobar +echo ------------ Testing ftype -------------- +rem FIXME Can't test error messages in the current test system, so we have to use some kludges +rem FIXME Revise once || conditional execution is fixed +mkdir foobar & cd foobar +echo ...setting association +ftype footype> baz +type baz +echo *** + +ftype footype=foo_opencmd +assoc .foo=footype +ftype footype + +rem association set system-wide +echo @echo off> tmp.cmd +echo echo +++>> tmp.cmd +echo ftype footype>> tmp.cmd +cmd /c tmp.cmd + +echo ...resetting association +assoc .foo= + +rem Removing a file type association doesn't work on XP due to a bug, so a workaround is needed +setlocal EnableDelayedExpansion +set FOO=original value +ftype footype= +ftype footype > baz +for /F %%i in ('type baz') do (set FOO=buggyXP) +rem Resetting actually works on wine/NT4, but is reported as failing due to the peculiar test (and non-support for EnabledDelayedExpansion) +rem FIXME Revisit once a grep-like program like ftype is implemented +rem (e.g. to check baz's size using dir /b instead) +echo !FOO! + +rem cleanup registry +echo REGEDIT4> regCleanup.reg +echo.>> regCleanup.reg +echo [-HKEY_CLASSES_ROOT\footype]>> regCleanup.reg +regedit /s regCleanup.reg +set FOO= +endlocal +cd .. & rd /s/q foobar + echo ------------ Testing CALL -------------- mkdir foobar & cd foobar rem External script diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 296f9b8..5419476 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -665,6 +665,16 @@ file created in read-only dir *** +++ *** +------------ Testing ftype -------------- +...setting association +*** +footype=foo_opencmd +.foo=footype +footype=foo_opencmd ++++ +footype=foo_opencmd +...resetting association +(a)todo_wine@original value(a)or_broken@buggyXP(a)or_broken@!FOO! ------------ Testing CALL -------------- foo(a)space@ foo 8

1 0

Frédéric Delanoy : cmd/tests: Add assoc tests.
by Alexandre Julliard Aug. 30, 2011

Aug. 30, 2011

Module: wine Branch: master Commit: c08459d0be88b1663c9823b2fd57e6d0e891b242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08459d0be88b1663c9823b2f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Aug 29 21:45:16 2011 +0200 cmd/tests: Add assoc tests. --- programs/cmd/tests/test_builtins.cmd | 30 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 11 +++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 1250e89..9dd2b60 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1083,6 +1083,36 @@ rem Oddly windows allows file creation in a read-only directory... if exist baz\lala (echo file created in read-only dir) else echo file not created cd .. & rd /s/q foobar +echo ------------ Testing assoc -------------- +rem FIXME Can't test error messages in the current test system, so we have to use some kludges +rem FIXME Revise once || conditional execution is fixed +mkdir foobar & cd foobar +echo ...setting association +assoc .foo > baz +type baz +echo *** + +assoc .foo=bar +assoc .foo + +rem association set system-wide +echo @echo off> tmp.cmd +echo echo +++>> tmp.cmd +echo assoc .foo>> tmp.cmd +cmd /c tmp.cmd + +echo ...resetting association +assoc .foo= +assoc .foo > baz +type baz +echo *** + +rem association removal set system-wide +cmd /c tmp.cmd > baz +type baz +echo *** +cd .. & rd /s/q foobar + echo ------------ Testing CALL -------------- mkdir foobar & cd foobar rem External script diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5c545ed..1e393f3 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -654,6 +654,17 @@ Read-only file forcibly deleted toto lulu file created in read-only dir +------------ Testing assoc -------------- +...setting association +*** +.foo=bar +(a)todo_wine@.foo=bar ++++ +(a)todo_wine@.foo=bar +...resetting association +*** ++++ +*** ------------ Testing CALL -------------- foo(a)space@ foo 8

1 0