wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Alexandre Julliard : comdlg32/tests: Fix a couple of test failures on NT4.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 117efddd7974aa14fba2c3f3c40d5298ea1b88a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=117efddd7974aa14fba2c3f3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 4 08:51:48 2011 +0200 comdlg32/tests: Fix a couple of test failures on NT4. --- dlls/comdlg32/tests/filedlg.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index 2a91dc5..8539d3d 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -226,7 +226,8 @@ static UINT_PTR CALLBACK create_view_window2_hook(HWND dlg, UINT msg, WPARAM wPa hr = IShellView2_GetCurrentInfo(shell_view2, &folder_settings); ok(SUCCEEDED(hr), "GetCurrentInfo returned %#x\n", hr); - ok(folder_settings.ViewMode == FVM_DETAILS, "view mode is %d, expected FVM_DETAILS\n", + ok(folder_settings.ViewMode == FVM_DETAILS || broken(folder_settings.ViewMode == FVM_LIST), /* nt4 */ + "view mode is %d, expected FVM_DETAILS\n", folder_settings.ViewMode); cleanup: @@ -1032,7 +1033,7 @@ static UINT_PTR WINAPI test_extension_wndproc(HWND dlg, UINT msg, WPARAM wParam, { HWND parent = GetParent( dlg); if( msg == WM_NOTIFY) { - SetTimer( dlg, 0, 100, 0); + SetTimer( dlg, 0, 1000, 0); PostMessage( parent, WM_COMMAND, IDOK, 0); } if( msg == WM_TIMER) {

1 0

Alexandre Julliard : gdi32: Update the coordinates in convert_bitmapinfo to reflect the position in the destination bitmap .
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: c309883a702bcb48db818e889cf122172a240fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c309883a702bcb48db818e889… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 20:26:44 2011 +0200 gdi32: Update the coordinates in convert_bitmapinfo to reflect the position in the destination bitmap. --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dib.c | 4 ++-- dlls/gdi32/dibdrv/dc.c | 10 +++++++--- dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index c32302b..e8e2c88 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -212,7 +212,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, dst_info->bmiHeader.biWidth = src->visrect.right - src->visrect.left; if ((ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )))) { - err = convert_bitmapinfo( src_info, bits.ptr, &src->visrect, dst_info, ptr ); + err = convert_bitmapinfo( src_info, bits.ptr, src, dst_info, ptr ); if (bits.free) bits.free( &bits ); bits.ptr = ptr; bits.is_copy = TRUE; diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 4fc3f3a..d09d351 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -615,7 +615,7 @@ INT WINAPI SetDIBits( HDC hdc, HBITMAP hbitmap, UINT startscan, ptr = HeapAlloc( GetProcessHeap(), 0, get_dib_image_size( dst_info )); if (ptr) { - err = convert_bitmapinfo( src_info, src_bits.ptr, &src.visrect, dst_info, ptr ); + err = convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, ptr ); { if (src_bits.free) src_bits.free( &src_bits ); src_bits.ptr = ptr; @@ -1134,7 +1134,7 @@ INT WINAPI GetDIBits( else dst_info->bmiHeader.biHeight = -src.height; - convert_bitmapinfo( src_info, src_bits.ptr, &src.visrect, dst_info, bits ); + convert_bitmapinfo( src_info, src_bits.ptr, &src, dst_info, bits ); if (src_bits.free) src_bits.free( &src_bits ); } else lines = abs(height); diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 7e45772..17b2966 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -260,7 +260,7 @@ void copy_dib_color_info(dib_info *dst, const dib_info *src) } } -DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, const RECT *src_rect, +DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits ) { dib_info src_dib, dst_dib; @@ -271,11 +271,15 @@ DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, const RECT if ( !init_dib_info_from_bitmapinfo( &dst_dib, dst_info, dst_bits, 0 ) ) return ERROR_BAD_FORMAT; - ret = dst_dib.funcs->convert_to( &dst_dib, &src_dib, src_rect ); + ret = dst_dib.funcs->convert_to( &dst_dib, &src_dib, &src->visrect ); /* We shared the color tables, so there's no need to free the dib_infos here */ - if(!ret) return ERROR_BAD_FORMAT; + + /* update coordinates, the destination rectangle is always stored at 0,0 */ + src->x -= src->visrect.left; + src->y -= src->visrect.top; + offset_rect( &src->visrect, -src->visrect.left, -src->visrect.top ); return ERROR_SUCCESS; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f0fb825..0111951 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -340,7 +340,7 @@ extern void DC_UpdateXforms( DC * dc ) DECLSPEC_HIDDEN; extern int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) DECLSPEC_HIDDEN; extern int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *planes, WORD *bpp, DWORD *compr, DWORD *size ) DECLSPEC_HIDDEN; -extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, const RECT *src_rect, +extern DWORD convert_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bitblt_coords *src, const BITMAPINFO *dst_info, void *dst_bits ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Use the visrect coordinates in dibdrv_PutImage.
by Alexandre Julliard 04 Aug '11

04 Aug '11

Module: wine Branch: master Commit: 2ba1a437038f8f92c24cb3a2fcd2433b24874a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba1a437038f8f92c24cb3a2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 19:59:46 2011 +0200 gdi32: Use the visrect coordinates in dibdrv_PutImage. --- dlls/gdi32/dibdrv/dc.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index a8d197b..7e45772 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -513,7 +513,6 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF { dib_info *dib, stand_alone; DWORD ret; - RECT rect; POINT origin; dib_info src_dib; HRGN total_clip, saved_clip = NULL; @@ -564,12 +563,8 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr, 0 ); - rect.left = dst->x; - rect.top = dst->y; - rect.right = dst->x + dst->width; - rect.bottom = dst->y + dst->height; - origin.x = src->x; - origin.y = src->y; + origin.x = src->visrect.left; + origin.y = src->visrect.top; if (hbitmap) { @@ -583,7 +578,7 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF rop2 = ((rop >> 16) & 0xf) + 1; } - if (total_clip == NULL) dib->funcs->copy_rect( dib, &rect, &src_dib, &origin, rop2 ); + if (total_clip == NULL) dib->funcs->copy_rect( dib, &dst->visrect, &src_dib, &origin, rop2 ); else { clip_data = get_wine_region( total_clip ); @@ -591,10 +586,10 @@ static DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINF { RECT clipped_rect; - if (intersect_rect( &clipped_rect, &rect, clip_data->rects + i )) + if (intersect_rect( &clipped_rect, &dst->visrect, clip_data->rects + i )) { - origin.x = src->x + clipped_rect.left - dst->x; - origin.y = src->y + clipped_rect.top - dst->y; + origin.x = src->visrect.left + clipped_rect.left - dst->visrect.left; + origin.y = src->visrect.top + clipped_rect.top - dst->visrect.top; dib->funcs->copy_rect( dib, &clipped_rect, &src_dib, &origin, rop2 ); } }

1 0

Francois Gouget : net: Remove a debug trace.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 89dcf229d05d20ee17aff5712d59ba30efe0d1a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dcf229d05d20ee17aff5712… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 17:37:12 2011 +0200 net: Remove a debug trace. --- programs/net/net.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/net/net.c b/programs/net/net.c index 815eadf..92f6ea7 100644 --- a/programs/net/net.c +++ b/programs/net/net.c @@ -68,7 +68,6 @@ static BOOL net_use(int argc, char *argv[]) { status[i] = HeapAlloc(GetProcessHeap(), 0, 1024); LoadStringA(hmod, STRING_OK+i, status[i], 1024); - printf("i=%d desc=%s\n", i, status[i]); } do {

1 0

Mariusz Pluciński : shell32/tests: Add verification of known folders parsing names.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: fe0eab4bd1b0c3d78a9adbe4a1f275b6a65616ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0eab4bd1b0c3d78a9adbe4a… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Wed Aug 3 18:11:58 2011 +0200 shell32/tests: Add verification of known folders parsing names. --- dlls/shell32/tests/shellpath.c | 884 +++++++++++++++++++++++++++++++++++----- 1 files changed, 777 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe0eab4bd1b0c3d78a9ad…

1 0

Austin English : msvcrt/tests: Make sure to use return values.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 1197b5e3e31a53734a179faed56046685489713c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1197b5e3e31a53734a179faed… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Aug 2 12:22:11 2011 -0500 msvcrt/tests: Make sure to use return values. --- dlls/msvcrt/tests/file.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0231f72..e2bf578 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -358,17 +358,21 @@ static void test_asciimode(void) fp = fopen("ascii.tst", "r"); c= fgetc(fp); + ok(c == '0', "fgetc failed, expected '0', got '%c'\n", c); c= fgetc(fp); + ok(c == '\n', "fgetc failed, expected '\\n', got '%c'\n", c); fseek(fp,0,SEEK_CUR); for(i=1; i<10; i++) { ok((j = ftell(fp)) == i*3, "ftell fails in TEXT mode\n"); fseek(fp,0,SEEK_CUR); ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek failed in line %d\n", i); c= fgetc(fp); + ok(c == '\n', "fgetc failed, expected '\\n', got '%c'\n", c); } /* Show that fseek doesn't skip \\r !*/ rewind(fp); c= fgetc(fp); + ok(c == '0', "fgetc failed, expected '0', got '%c'\n", c); fseek(fp, 2 ,SEEK_CUR); for(i=1; i<10; i++) { ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek with pos Offset failed in line %d\n", i); @@ -376,6 +380,7 @@ static void test_asciimode(void) } fseek(fp, 9*3 ,SEEK_SET); c = fgetc(fp); + ok(c == '9', "fgetc failed, expected '9', got '%c'\n", c); fseek(fp, -4 ,SEEK_CUR); for(i= 8; i>=0; i--) { ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek with neg Offset failed in line %d\n", i);

1 0

Jörg Höhle : winmm: Functions that take an open HWAVE don't need StartDevicesThread.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: c7d0c093e5bc29da6163d2ef66542562ae7bafc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d0c093e5bc29da6163d2ef6… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jul 27 19:32:02 2011 +0200 winmm: Functions that take an open HWAVE don't need StartDevicesThread. --- dlls/winmm/waveform.c | 60 ------------------------------------------------- 1 files changed, 0 insertions(+), 60 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 8801900..918364b 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2370,9 +2370,6 @@ UINT WINAPI waveOutClose(HWAVEOUT hWaveOut) TRACE("(%p)\n", hWaveOut); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut); if(!WINMM_ValidateAndLock(device)) @@ -2398,9 +2395,6 @@ UINT WINAPI waveOutPrepareHeader(HWAVEOUT hWaveOut, { TRACE("(%p, %p, %u)\n", hWaveOut, lpWaveOutHdr, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpWaveOutHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; @@ -2418,9 +2412,6 @@ UINT WINAPI waveOutUnprepareHeader(HWAVEOUT hWaveOut, { TRACE("(%p, %p, %u)\n", hWaveOut, lpWaveOutHdr, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpWaveOutHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; @@ -2443,9 +2434,6 @@ UINT WINAPI waveOutWrite(HWAVEOUT hWaveOut, WAVEHDR *header, UINT uSize) TRACE("(%p, %p, %u)\n", hWaveOut, header, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut); if(!WINMM_ValidateAndLock(device)) @@ -2510,9 +2498,6 @@ UINT WINAPI waveOutBreakLoop(HWAVEOUT hWaveOut) TRACE("(%p)\n", hWaveOut); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut); if(!WINMM_ValidateAndLock(device)) @@ -2532,9 +2517,6 @@ UINT WINAPI waveOutPause(HWAVEOUT hWaveOut) { TRACE("(%p)\n", hWaveOut); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - return WINMM_Pause((HWAVE)hWaveOut); } @@ -2545,9 +2527,6 @@ UINT WINAPI waveOutReset(HWAVEOUT hWaveOut) { TRACE("(%p)\n", hWaveOut); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - return WINMM_Reset((HWAVE)hWaveOut); } @@ -2561,9 +2540,6 @@ UINT WINAPI waveOutRestart(HWAVEOUT hWaveOut) TRACE("(%p)\n", hWaveOut); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut); if(!WINMM_ValidateAndLock(device)) @@ -2590,9 +2566,6 @@ UINT WINAPI waveOutGetPosition(HWAVEOUT hWaveOut, LPMMTIME lpTime, { TRACE("(%p, %p, %u)\n", hWaveOut, lpTime, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!uSize || !lpTime || uSize != sizeof(MMTIME)) return MMSYSERR_INVALPARAM; @@ -2650,9 +2623,6 @@ UINT WINAPI waveOutGetVolume(HWAVEOUT hWaveOut, DWORD *out) TRACE("(%p, %p)\n", hWaveOut, out); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!out) return MMSYSERR_INVALPARAM; @@ -2705,9 +2675,6 @@ UINT WINAPI waveOutSetVolume(HWAVEOUT hWaveOut, DWORD in) TRACE("(%p, %08x)\n", hWaveOut, in); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveOut); if(!WINMM_ValidateAndLock(device)) @@ -2764,9 +2731,6 @@ UINT WINAPI waveOutGetID(HWAVEOUT hWaveOut, UINT* lpuDeviceID) TRACE("(%p, %p)\n", hWaveOut, lpuDeviceID); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpuDeviceID) return MMSYSERR_INVALPARAM; @@ -3054,9 +3018,6 @@ UINT WINAPI waveInClose(HWAVEIN hWaveIn) TRACE("(%p)\n", hWaveIn); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveIn); if(!WINMM_ValidateAndLock(device)) @@ -3082,9 +3043,6 @@ UINT WINAPI waveInPrepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr, { TRACE("(%p, %p, %u)\n", hWaveIn, lpWaveInHdr, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpWaveInHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; @@ -3102,9 +3060,6 @@ UINT WINAPI waveInUnprepareHeader(HWAVEIN hWaveIn, WAVEHDR* lpWaveInHdr, { TRACE("(%p, %p, %u)\n", hWaveIn, lpWaveInHdr, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpWaveInHdr || uSize < sizeof(WAVEHDR)) return MMSYSERR_INVALPARAM; @@ -3161,9 +3116,6 @@ UINT WINAPI waveInReset(HWAVEIN hWaveIn) { TRACE("(%p)\n", hWaveIn); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - return WINMM_Reset((HWAVE)hWaveIn); } @@ -3177,9 +3129,6 @@ UINT WINAPI waveInStart(HWAVEIN hWaveIn) TRACE("(%p)\n", hWaveIn); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveIn); if(!WINMM_ValidateAndLock(device)) @@ -3208,9 +3157,6 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn) TRACE("(%p)\n", hWaveIn); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - device = WINMM_GetDeviceFromHWAVE((HWAVE)hWaveIn); if(!WINMM_ValidateAndLock(device)) @@ -3249,9 +3195,6 @@ UINT WINAPI waveInGetPosition(HWAVEIN hWaveIn, LPMMTIME lpTime, { TRACE("(%p, %p, %u)\n", hWaveIn, lpTime, uSize); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!uSize || !lpTime || uSize != sizeof(MMTIME)) return MMSYSERR_INVALPARAM; @@ -3269,9 +3212,6 @@ UINT WINAPI waveInGetID(HWAVEIN hWaveIn, UINT* lpuDeviceID) TRACE("(%p, %p)\n", hWaveIn, lpuDeviceID); - if(!WINMM_StartDevicesThread()) - return MMSYSERR_ERROR; - if(!lpuDeviceID) return MMSYSERR_INVALPARAM;

1 0

Frédéric Delanoy : cmd/tests: Fix "broken" handling when expected line is empty.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: bde872e7826b4e70e6bc5b2f73653641ef27cf99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde872e7826b4e70e6bc5b2f7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Aug 2 22:55:37 2011 +0200 cmd/tests: Fix "broken" handling when expected line is empty. --- programs/cmd/tests/batch.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 84d7f39..c4ccaab 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -152,6 +152,16 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; + /* Corner case where exp_line directly starts with @or_broken@, on Windowses */ + if(broken(1) + && exp_line+sizeof(or_broken_cmd) <= exp_end + && !memcmp(exp_line, or_broken_cmd, sizeof(or_broken_cmd))) { + if(out_line == out_end) + return NULL; + else + exp_ptr = exp_line + sizeof(or_broken_cmd); + } + while(exp_ptr < exp_end) { if(*exp_ptr == '@') { if(exp_ptr+sizeof(pwd_cmd) <= exp_end

1 0

Dan Kegel : cmd: mkdir: Set errorlevel and output error message if final directory already exists.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 6990cdfe96cb2f0d62017ba323009e83629d284a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6990cdfe96cb2f0d62017ba32… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Aug 2 12:35:36 2011 -0700 cmd: mkdir: Set errorlevel and output error message if final directory already exists. --- programs/cmd/builtins.c | 73 +++++++++++++----------------- programs/cmd/tests/test_builtins.cmd | 5 ++ programs/cmd/tests/test_builtins.cmd.exp | 12 +++-- 3 files changed, 44 insertions(+), 46 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7e5ceaf..09c166f 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -473,54 +473,45 @@ void WCMD_copy (void) { /**************************************************************************** * WCMD_create_dir * - * Create a directory. + * Create a directory (and, if needed, any intermediate directories). * - * this works recursively. so mkdir dir1\dir2\dir3 will create dir1 and dir2 if - * they do not already exist. + * Modifies its argument by replacing slashes temporarily with nulls. */ static BOOL create_full_path(WCHAR* path) { - int len; - WCHAR *new_path; - BOOL ret = TRUE; - - new_path = HeapAlloc(GetProcessHeap(),0,(strlenW(path)+1) * sizeof(WCHAR)); - strcpyW(new_path,path); - - while ((len = strlenW(new_path)) && new_path[len - 1] == '\\') - new_path[len - 1] = 0; - - while (!CreateDirectoryW(new_path,NULL)) - { - WCHAR *slash; - DWORD last_error = GetLastError(); - if (last_error == ERROR_ALREADY_EXISTS) - break; - - if (last_error != ERROR_PATH_NOT_FOUND) - { - ret = FALSE; - break; + WCHAR *p, *start; + + /* don't mess with drive letter portion of path, if any */ + start = path; + if (path[1] == ':') + start = path+2; + + /* Strip trailing slashes. */ + for (p = path + strlenW(path) - 1; p != start && *p == '\\'; p--) + *p = 0; + + /* Step through path, creating intermediate directories as needed. */ + /* First component includes drive letter, if any. */ + p = start; + for (;;) { + DWORD rv; + /* Skip to end of component */ + while (*p == '\\') p++; + while (*p && *p != '\\') p++; + if (!*p) { + /* path is now the original full path */ + return CreateDirectoryW(path, NULL); } - - if (!(slash = strrchrW(new_path,'\\')) && ! (slash = strrchrW(new_path,'/'))) - { - ret = FALSE; - break; - } - - len = slash - new_path; - new_path[len] = 0; - if (!create_full_path(new_path)) - { - ret = FALSE; - break; - } - new_path[len] = '\\'; - } - HeapFree(GetProcessHeap(),0,new_path); - return ret; + /* Truncate path, create intermediate directory, and restore path */ + *p = 0; + rv = CreateDirectoryW(path, NULL); + *p = '\\'; + if (!rv && GetLastError() != ERROR_ALREADY_EXISTS) + return FALSE; + } + /* notreached */ + return FALSE; } void WCMD_create_dir (WCHAR *command) { diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 2cbff33..2321e12 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -518,6 +518,11 @@ if exist foobar (echo foobar created) else echo foobar not created! if exist bar\baz (echo bar\baz created) else echo bar\baz not created! cd .. rd /s/q foobaz +call :setError 0 +mkdir foo\* +echo mkdir foo\* errorlevel %ErrorLevel% +if exist foo (rmdir foo & echo ok, foo created +) else ( echo bad, foo not created ) echo ----------- Testing rmdir ----------- call :setError 0 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index f64150d..c430883 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -264,14 +264,14 @@ del /q * succeeded on file2.dat ----------- Testing mkdir ----------- 0 0 -@todo_wine@1 -@todo_wine@1 +1 +1 0 0 0 0 0 -@todo_wine@1 +1 0 0 0 @@ -280,13 +280,15 @@ dir created mkdir ? gives errorlevel 1 mkdir ?\foo gives errorlevel 1 mkdir foo\? gives errorlevel 1 -@todo_wine@ok, foo created +ok, foo created mkdir foo\bar\? gives errorlevel 1 -@todo_wine@ok, foo\bar created +ok, foo\bar created foo created bar created foobar created bar\baz created +mkdir foo\* errorlevel 1 +ok, foo created ----------- Testing rmdir ----------- 0 dir removed

1 0

Dan Kegel : cmd: mkdir: Set errorlevel on invalid argument.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 3cd864bdf8a4565442a57a05a91b372ae0a4ca70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd864bdf8a4565442a57a05a… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Aug 2 12:21:31 2011 -0700 cmd: mkdir: Set errorlevel on invalid argument. --- programs/cmd/builtins.c | 1 + programs/cmd/tests/test_builtins.cmd | 8 ++++---- programs/cmd/tests/test_builtins.cmd.exp | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 58050cf..7e5ceaf 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -537,6 +537,7 @@ void WCMD_create_dir (WCHAR *command) { if (!argN) break; if (!create_full_path(thisArg)) { WCMD_print_error (); + errorlevel = 1; } } } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index be1eead..2cbff33 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -485,18 +485,18 @@ if exist foo (rmdir foo & echo dir created echo %ErrorLevel% rem Invalid chars mkdir ? -echo %ErrorLevel% +echo mkdir ? gives errorlevel %ErrorLevel% call :setError 0 mkdir ?\foo -echo %ErrorLevel% +echo mkdir ?\foo gives errorlevel %ErrorLevel% call :setError 0 mkdir foo\? -echo %ErrorLevel% +echo mkdir foo\? gives errorlevel %ErrorLevel% if exist foo (rmdir foo & echo ok, foo created ) else ( echo foo not created ) call :setError 0 mkdir foo\bar\? -echo %ErrorLevel% +echo mkdir foo\bar\? gives errorlevel %ErrorLevel% call :setError 0 if not exist foo ( echo bad, foo not created diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 8db75a7..f64150d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -277,11 +277,11 @@ del /q * succeeded on file2.dat 0 dir created 0 -@todo_wine@1 -@todo_wine@1 -@todo_wine@1 +mkdir ? gives errorlevel 1 +mkdir ?\foo gives errorlevel 1 +mkdir foo\? gives errorlevel 1 @todo_wine@ok, foo created -@todo_wine@1 +mkdir foo\bar\? gives errorlevel 1 @todo_wine@ok, foo\bar created foo created bar created

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
77
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 August 2011