wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Alexandre Julliard : winspool.drv: Remove a todo that succeeds now.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: 4289bd44dee6e805400ca0da4513089a71da6947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4289bd44dee6e805400ca0da4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 21 13:43:09 2012 +0100 winspool.drv: Remove a todo that succeeds now. --- dlls/winspool.drv/tests/info.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 6d051d6..4da39c8 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2853,7 +2853,6 @@ static void test_DeviceCapabilities(void) fields = DeviceCapabilities(device, port, DC_FIELDS, NULL, NULL); ok(fields != (DWORD)-1, "DeviceCapabilities DC_FIELDS failed\n"); - todo_wine ok(fields == (dm->dmFields | DM_FORMNAME) || fields == ((dm->dmFields | DM_FORMNAME | DM_PAPERSIZE) & ~(DM_PAPERLENGTH|DM_PAPERWIDTH)) || broken(fields == dm->dmFields), /* Win9x/WinMe */

1 0

Christian Costa : dmusic: Use static variables for instrument header and id instead of using pointer .
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: 898c2954e012d1e70b692ddb07f551c4128b6e0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=898c2954e012d1e70b692ddb0… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Dec 21 10:27:46 2012 +0100 dmusic: Use static variables for instrument header and id instead of using pointer. --- dlls/dmusic/collection.c | 20 +++++++++----------- dlls/dmusic/dmusic_private.h | 4 ++-- dlls/dmusic/instrument.c | 6 +++--- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 5002c9e..e30f89d 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -662,7 +662,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST LPDMUS_PRIVATE_INSTRUMENTENTRY new_instrument = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_INSTRUMENTENTRY)); TRACE_(dmfile)(": instrument list\n"); /* Only way to create this one... even M$ does it discretely */ - DMUSIC_CreateDirectMusicInstrumentImpl(&IID_IDirectMusicInstrument, (LPVOID*)&new_instrument->pInstrument, NULL); + DMUSIC_CreateDirectMusicInstrumentImpl(&IID_IDirectMusicInstrument, (void**)&new_instrument->pInstrument, NULL); { IDirectMusicInstrumentImpl *instrument = impl_from_IDirectMusicInstrument(new_instrument->pInstrument); /* Store offset and length, they will be needed when loading the instrument */ @@ -677,14 +677,12 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST switch (chunk.fccID) { case FOURCC_INSH: { TRACE_(dmfile)(": instrument header chunk\n"); - instrument->pHeader = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, chunk.dwSize); - IStream_Read(stream, instrument->pHeader, chunk.dwSize, NULL); + IStream_Read(stream, &instrument->header, chunk.dwSize, NULL); break; } case FOURCC_DLID: { TRACE_(dmfile)(": DLID (GUID) chunk\n"); - instrument->pInstrumentID = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, chunk.dwSize); - IStream_Read(stream, instrument->pInstrumentID, chunk.dwSize, NULL); + IStream_Read(stream, &instrument->id, chunk.dwSize, NULL); break; } case FOURCC_LIST: { @@ -712,14 +710,14 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST /* DEBUG: dumps whole instrument object tree: */ if (TRACE_ON(dmusic)) { TRACE("*** IDirectMusicInstrument (%p) ***\n", instrument); - if (instrument->pInstrumentID) - TRACE(" - GUID = %s\n", debugstr_dmguid(instrument->pInstrumentID)); + if (!IsEqualGUID(&instrument->id, &GUID_NULL)) + TRACE(" - GUID = %s\n", debugstr_dmguid(&instrument->id)); TRACE(" - Instrument header:\n"); - TRACE(" - cRegions: %d\n", instrument->pHeader->cRegions); + TRACE(" - cRegions: %d\n", instrument->header.cRegions); TRACE(" - Locale:\n"); - TRACE(" - ulBank: %d\n", instrument->pHeader->Locale.ulBank); - TRACE(" - ulInstrument: %d\n", instrument->pHeader->Locale.ulInstrument); - TRACE(" => dwPatch: %d\n", MIDILOCALE2Patch(&instrument->pHeader->Locale)); + TRACE(" - ulBank: %d\n", instrument->header.Locale.ulBank); + TRACE(" - ulInstrument: %d\n", instrument->header.Locale.ulInstrument); + TRACE(" => dwPatch: %d\n", MIDILOCALE2Patch(&instrument->header.Locale)); } list_add_tail(&This->Instruments, &new_instrument->entry); } diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index a37a1c3..3e5c6c2 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -238,8 +238,8 @@ struct IDirectMusicInstrumentImpl { /* IDirectMusicInstrumentImpl fields */ LARGE_INTEGER liInstrumentPosition; /* offset in a stream where instrument chunk can be found */ ULONG length; /* Length of the instrument in the stream */ - LPGUID pInstrumentID; - LPINSTHEADER pHeader; + GUID id; + INSTHEADER header; WCHAR wszName[DMUS_MAX_NAME]; /* instrument data */ BOOL loaded; diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 13d0c2f..d6de0db 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -92,7 +92,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_GetPatch(LPDIRECTMUSICINSTRUMEN TRACE("(%p)->(%p)\n", This, pdwPatch); - *pdwPatch = MIDILOCALE2Patch(&This->pHeader->Locale); + *pdwPatch = MIDILOCALE2Patch(&This->header.Locale); return S_OK; } @@ -103,7 +103,7 @@ static HRESULT WINAPI IDirectMusicInstrumentImpl_SetPatch(LPDIRECTMUSICINSTRUMEN TRACE("(%p)->(%d): stub\n", This, dwPatch); - Patch2MIDILOCALE(dwPatch, &This->pHeader->Locale); + Patch2MIDILOCALE(dwPatch, &This->header.Locale); return S_OK; } @@ -264,7 +264,7 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt return DMUS_E_UNSUPPORTED_STREAM; } - This->regions = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->regions) * This->pHeader->cRegions); + This->regions = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->regions) * This->header.cRegions); if (!This->regions) return E_OUTOFMEMORY;

1 0

Christian Costa : dmusic: Implement instrument regions loading.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: bf0605c08abd990ebb584cdc18e32bccdf9b94ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0605c08abd990ebb584cdc1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Fri Dec 21 10:27:38 2012 +0100 dmusic: Implement instrument regions loading. --- dlls/dmusic/dmusic_private.h | 29 +++++--- dlls/dmusic/instrument.c | 157 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 173 insertions(+), 13 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 3c05ceb..a37a1c3 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -77,6 +77,13 @@ typedef struct port_info { ULONG device; } port_info; +typedef struct instrument_region { + RGNHEADER header; + WAVELINK wave_link; + WSMPL wave_sample; + WLOOP wave_loop; + BOOL loop_present; +} instrument_region; /***************************************************************************** * ClassFactory @@ -224,17 +231,19 @@ struct IDirectMusicCollectionImpl { * IDirectMusicInstrumentImpl implementation structure */ struct IDirectMusicInstrumentImpl { - /* IUnknown fields */ - IDirectMusicInstrument IDirectMusicInstrument_iface; - LONG ref; + /* IUnknown fields */ + IDirectMusicInstrument IDirectMusicInstrument_iface; + LONG ref; - /* IDirectMusicInstrumentImpl fields */ - LARGE_INTEGER liInstrumentPosition; /* offset in a stream where instrument chunk can be found */ - ULONG length; /* Length of the instrument in the stream */ - LPGUID pInstrumentID; - LPINSTHEADER pHeader; - WCHAR wszName[DMUS_MAX_NAME]; - /* instrument data */ + /* IDirectMusicInstrumentImpl fields */ + LARGE_INTEGER liInstrumentPosition; /* offset in a stream where instrument chunk can be found */ + ULONG length; /* Length of the instrument in the stream */ + LPGUID pInstrumentID; + LPINSTHEADER pHeader; + WCHAR wszName[DMUS_MAX_NAME]; + /* instrument data */ + BOOL loaded; + instrument_region *regions; }; static inline IDirectMusicInstrumentImpl *impl_from_IDirectMusicInstrument(IDirectMusicInstrument *iface) diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index cc57313..13d0c2f 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -75,7 +75,10 @@ static ULONG WINAPI IDirectMusicInstrumentImpl_Release(LPDIRECTMUSICINSTRUMENT i TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) + { + HeapFree(GetProcessHeap(), 0, This->regions); HeapFree(GetProcessHeap(), 0, This); + } DMUSIC_UnlockModule(); @@ -170,16 +173,90 @@ static inline HRESULT advance_stream(IStream *stream, ULONG bytes) return ret; } +static HRESULT load_region(IDirectMusicInstrumentImpl *This, IStream *stream, instrument_region *region, ULONG length) +{ + HRESULT ret; + DMUS_PRIVATE_CHUNK chunk; + + TRACE("(%p, %p, %p, %u)\n", This, stream, region, length); + + while (length) + { + ret = read_from_stream(stream, &chunk, sizeof(chunk)); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, sizeof(chunk)); + + switch (chunk.fccID) + { + case FOURCC_RGNH: + TRACE("RGNH chunk (region header): %u bytes\n", chunk.dwSize); + + ret = read_from_stream(stream, &region->header, sizeof(region->header)); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, sizeof(region->header)); + break; + + case FOURCC_WSMP: + TRACE("WSMP chunk (wave sample): %u bytes\n", chunk.dwSize); + + ret = read_from_stream(stream, &region->wave_sample, sizeof(region->wave_sample)); + if (FAILED(ret)) + return ret; + length = subtract_bytes(length, sizeof(region->wave_sample)); + + if (!(region->loop_present = (chunk.dwSize != sizeof(region->wave_sample)))) + break; + + ret = read_from_stream(stream, &region->wave_loop, sizeof(region->wave_loop)); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, sizeof(region->wave_loop)); + break; + + case FOURCC_WLNK: + TRACE("WLNK chunk (wave link): %u bytes\n", chunk.dwSize); + + ret = read_from_stream(stream, &region->wave_link, sizeof(region->wave_link)); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, sizeof(region->wave_link)); + break; + + default: + TRACE("Unknown chunk %s (skipping): %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + + ret = advance_stream(stream, chunk.dwSize); + if (FAILED(ret)) + return ret; + + length = subtract_bytes(length, chunk.dwSize); + break; + } + } + + return S_OK; +} + /* Function that loads all instrument data and which is called from IDirectMusicCollection_GetInstrument as in native */ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, IStream *stream) { IDirectMusicInstrumentImpl *This = impl_from_IDirectMusicInstrument(iface); HRESULT hr; DMUS_PRIVATE_CHUNK chunk; + ULONG i = 0; ULONG length = This->length; TRACE("(%p, %p): offset = 0x%s, length = %u)\n", This, stream, wine_dbgstr_longlong(This->liInstrumentPosition.QuadPart), This->length); + if (This->loaded) + return S_OK; + hr = IStream_Seek(stream, This->liInstrumentPosition, STREAM_SEEK_SET, NULL); if (FAILED(hr)) { @@ -187,11 +264,15 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt return DMUS_E_UNSUPPORTED_STREAM; } + This->regions = HeapAlloc(GetProcessHeap(), 0, sizeof(*This->regions) * This->pHeader->cRegions); + if (!This->regions) + return E_OUTOFMEMORY; + while (length) { hr = read_from_stream(stream, &chunk, sizeof(chunk)); if (FAILED(hr)) - return DMUS_E_UNSUPPORTED_STREAM; + goto error; length = subtract_bytes(length, sizeof(chunk) + chunk.dwSize); @@ -204,20 +285,90 @@ HRESULT IDirectMusicInstrumentImpl_CustomLoad(IDirectMusicInstrument *iface, ISt /* Instrument header and id are already set so just skip */ hr = advance_stream(stream, chunk.dwSize); if (FAILED(hr)) - return DMUS_E_UNSUPPORTED_STREAM; + goto error; + + break; + case FOURCC_LIST: { + DWORD size = chunk.dwSize; + + TRACE("LIST chunk: %u bytes\n", chunk.dwSize); + + hr = read_from_stream(stream, &chunk.fccID, sizeof(chunk.fccID)); + if (FAILED(hr)) + goto error; + + size = subtract_bytes(size, sizeof(chunk.fccID)); + + switch (chunk.fccID) + { + case FOURCC_LRGN: + TRACE("LRGN chunk (regions list): %u bytes\n", size); + + while (size) + { + hr = read_from_stream(stream, &chunk, sizeof(chunk)); + if (FAILED(hr)) + goto error; + + if (chunk.fccID != FOURCC_LIST) + { + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + goto error; + } + + hr = read_from_stream(stream, &chunk.fccID, sizeof(chunk.fccID)); + if (FAILED(hr)) + goto error; + + if (chunk.fccID == FOURCC_RGN) + { + TRACE("RGN chunk (region list): %u bytes\n", chunk.dwSize); + hr = load_region(This, stream, &This->regions[i++], chunk.dwSize - sizeof(chunk.fccID)); + } + else + { + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + hr = advance_stream(stream, chunk.dwSize - sizeof(chunk.fccID)); + } + if (FAILED(hr)) + goto error; + + size = subtract_bytes(size, chunk.dwSize + sizeof(chunk)); + } + break; + + default: + TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); + + hr = advance_stream(stream, chunk.dwSize - sizeof(chunk.fccID)); + if (FAILED(hr)) + goto error; + + size = subtract_bytes(size, chunk.dwSize - sizeof(chunk.fccID)); + break; + } break; + } default: TRACE("Unknown chunk %s: %u bytes\n", debugstr_fourcc(chunk.fccID), chunk.dwSize); hr = advance_stream(stream, chunk.dwSize); if (FAILED(hr)) - return DMUS_E_UNSUPPORTED_STREAM; + goto error; break; } } + This->loaded = TRUE; + return S_OK; + +error: + HeapFree(GetProcessHeap(), 0, This->regions); + This->regions = NULL; + + return DMUS_E_UNSUPPORTED_STREAM; }

1 0

Ken Thomases : winemac: Implement GetDeviceCaps().
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: fd269e4dcad17a0537a7973c6fe691ce6567e7fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd269e4dcad17a0537a7973c6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:07 2012 -0600 winemac: Implement GetDeviceCaps(). --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/gdi.c | 321 ++++++++++++++++++++++++++++++++++++++++- dlls/winemac.drv/macdrv.h | 101 +++++++++++++ 3 files changed, 415 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fd269e4dcad17a0537a79…

1 0

Ken Thomases : configure: Only enable the Mac driver on Mac OS X 10. 6 or later.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: 10c6f8436c28f75c03bc57c2e7c3ee9246e2bb62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c6f8436c28f75c03bc57c2e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 20 19:02:00 2012 -0600 configure: Only enable the Mac driver on Mac OS X 10.6 or later. --- configure | 16 ++++++++++++++-- configure.ac | 12 ++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 976bd9b..063c25d 100755 --- a/configure +++ b/configure @@ -6669,12 +6669,24 @@ done else as_fn_append wine_notices "|QuickTime ${notice_platform}development files not found, video decoding won't be supported." fi - if test "$ac_cv_header_Carbon_Carbon_h" = "yes" + if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then CARBONLIB="-framework Carbon" - enable_winemac_drv=${enable_winemac_drv:-yes} fi + + if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes" + then + ac_save_LIBS="$LIBS" + LIBS="$LIBS $APPLICATIONSERVICESLIB" + ac_fn_c_check_func "$LINENO" "CGDisplayModeGetWidth" "ac_cv_func_CGDisplayModeGetWidth" +if test "x$ac_cv_func_CGDisplayModeGetWidth" = xyes; then : + enable_winemac_drv=${enable_winemac_drv:-yes} +fi + + LIBS="$ac_save_LIBS" + fi + if test "x$enable_win16" = "xyes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 16-bit code can be built correctly" >&5 diff --git a/configure.ac b/configure.ac index 5e59e90..2a0a1b6 100644 --- a/configure.ac +++ b/configure.ac @@ -796,12 +796,20 @@ case $host_os in else WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) fi - dnl Enable Mac driver on Mac OS X if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then AC_SUBST(CARBONLIB,"-framework Carbon") - enable_winemac_drv=${enable_winemac_drv:-yes} fi + + dnl Enable Mac driver on Mac OS X 10.6 or later + if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes" + then + ac_save_LIBS="$LIBS" + LIBS="$LIBS $APPLICATIONSERVICESLIB" + AC_CHECK_FUNC(CGDisplayModeGetWidth,enable_winemac_drv=${enable_winemac_drv:-yes}) + LIBS="$ac_save_LIBS" + fi + dnl Check for Xcode 3.x broken 16-bit support if test "x$enable_win16" = "xyes" then

1 0

Ann and Jason Edmeades : cmd: Add set /a support.
by Alexandre Julliard 21 Dec '12

21 Dec '12

1 0

Jason Edmeades : cmd: Add more tests for set /a.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: 51c4411a158d44cfee56487a37fc066503f2c431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c4411a158d44cfee56487a3… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Thu Dec 13 20:47:16 2012 +0000 cmd: Add more tests for set /a. --- programs/cmd/tests/test_builtins.cmd | 135 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 83 ++++++++++++++++++ 2 files changed, 218 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 6cf2ecb..508691e 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1131,6 +1131,141 @@ set /a WINE_foo=WINE_bar=5, WINE_bar ^|= 2 & call :checkenvvars WINE_foo 5 WINE_ set /a WINE_foo=WINE_bar=5, WINE_bar ^^= 2 & call :checkenvvars WINE_foo 5 WINE_bar 7 set WINE_baz=4 set /a WINE_foo=WINE_bar=19, WINE_bar %%= 4 + (WINE_baz %%= 7) & call :checkenvvars WINE_foo 19 WINE_bar 3 WINE_baz 4 +echo --- quotes +set /a WINE_foo=1 +call :checkenvvars WINE_foo 1 +set /a "WINE_foo=1" +call :checkenvvars WINE_foo 1 +set /a WINE_foo=1,WINE_bar=2 +call :checkenvvars WINE_foo 1 WINE_bar 2 +set /a "WINE_foo=1,WINE_bar=2" +call :checkenvvars WINE_foo 1 WINE_bar 2 +set /a "WINE_foo=1","WINE_bar=2" +call :checkenvvars WINE_foo 1 WINE_bar 2 +set /a ""WINE_foo=1","WINE_bar=2"" +call :checkenvvars WINE_foo 1 WINE_bar 2 +set /a WINE_foo=1,WINE_bar=2,WINE_baz=3 +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a "WINE_foo=1,WINE_bar=2,WINE_baz=3" +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a "WINE_foo=1","WINE_bar=2","WINE_baz=3" +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a ""WINE_foo=1","WINE_bar=2","WINE_baz=3"" +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a ""WINE_foo=1","WINE_bar=2"","WINE_baz=3" +call :checkenvvars WINE_foo 1 WINE_bar 2 WINE_baz 3 +set /a """"""WINE_foo=1"""""" +call :checkenvvars WINE_foo 1 +set /a """"""WINE_foo=1","WINE_bar=5""","WINE_baz=2"" +call :checkenvvars WINE_foo 1 WINE_bar 5 WINE_baz 2 +set /a WINE_foo="3"+"4"+"5+6" +call :checkenvvars WINE_foo 18 +set WINE_foo=3 +set /a WINE_bar="WINE_""foo"+4 +call :checkenvvars WINE_foo 3 WINE_bar 7 +echo --- whitespace are ignored between double char operators +set WINE_foo=4 +set WINE_bar=5 +set /a WINE_foo + = 6 +set /a WINE_bar * = WINE_foo +call :checkenvvars WINE_foo 10 WINE_bar 50 +set WINE_foo=4 +set WINE_bar=5 +set /a WINE_foo + = "6 < < 7" +set /a WINE_bar * = WINE_foo + WINE_foo +call :checkenvvars WINE_foo 772 WINE_bar 7720 +set /a WINE_foo=6 7 +set /a WINE_ var1=8 +set WINE_foo= +echo --- invalid operator sequence +set WINE_foo=4 +set /a =4 +set /a *=4 +set /a ^>=4" +set /a ^<=4" +set /a WINE_foo^>^<=4 +echo %WINE_foo% +set /a WINE_foo^>^>^>=4 +echo %WINE_foo% +echo ----- negative prefix +set /a WINE_foo=-1 +call :checkenvvars WINE_foo -1 +set /a WINE_foo=--1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=3--3 +call :checkenvvars WINE_foo 6 +set /a WINE_foo=3---3 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=3----3 +call :checkenvvars WINE_foo 6 +set /a WINE_foo=-~1 +call :checkenvvars WINE_foo 2 +set /a WINE_foo=~-1 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=3+-~1 +call :checkenvvars WINE_foo 5 +set /a WINE_foo=3+~-1 +call :checkenvvars WINE_foo 3 +echo ----- assignment tests involving the end destination +set WINE_foo=3 +set /a WINE_foo+=3+(WINE_foo=4) +call :checkenvvars WINE_foo 11 +set WINE_foo=2 +set /a WINE_bar=3+(WINE_foo=6) +call :checkenvvars WINE_foo 6 WINE_bar 9 +set WINE_foo=2 +set /a WINE_bar=3+(WINE_foo=6,WINE_baz=7) +call :checkenvvars WINE_foo 6 WINE_bar 10 WINE_baz 7 +set WINE_foo=2 +set /a WINE_bar=WINE_foo=7 +call :checkenvvars WINE_foo 7 WINE_bar 7 +echo ----- equal precedence on stack +rem Unary - dont reduce if precedence is equal +set /a WINE_foo=!!1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=!!0 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=~~1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=~~0 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=--1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=+-1 +call :checkenvvars WINE_foo -1 +set /a WINE_foo=-+1 +call :checkenvvars WINE_foo -1 +set /a WINE_foo=++1 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=!~1 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=~!1 +call :checkenvvars WINE_foo -1 +set /a WINE_foo=!-1 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=-!1 +call :checkenvvars WINE_foo 0 +set /a WINE_foo=!-0 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=-!0 +call :checkenvvars WINE_foo -1 +rem Aritmatic - Reduce if precedence is equal +set /a WINE_foo=10*5/2 +call :checkenvvars WINE_foo 25 +set /a WINE_foo=5/2*10 +call :checkenvvars WINE_foo 20 +set /a WINE_foo=10/5/2 +call :checkenvvars WINE_foo 1 +set /a WINE_foo=5%%2*4 +call :checkenvvars WINE_foo 4 +set /a WINE_foo=10-5+2 +call :checkenvvars WINE_foo 7 +set /a WINE_foo=1^<^<4^>^>1 +call :checkenvvars WINE_foo 8 +rem Assignment - dont reduce if precedence is equal +set /a WINE_foo=5 +set /a WINE_bar=WINE_foo=6 +call :checkenvvars WINE_foo 6 WINE_bar 6 echo --- for /F mkdir foobar & cd foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index fd59c31..9e7f30b 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -800,6 +800,89 @@ WINE_bar correctly 4 @todo_wine@WINE_foo correctly 19@or_broken@ERROR: WINE_foo incorrectly 0 [19] @todo_wine@WINE_bar correctly 3@or_broken@ERROR: WINE_bar incorrectly [3] WINE_baz correctly 4 +--- quotes +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 2 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 2 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 2 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 2 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 2 +@todo_wine@WINE_baz correctly 3 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 2 +@todo_wine@WINE_baz correctly 3 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 2 +@todo_wine@WINE_baz correctly 3 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 2 +@todo_wine@WINE_baz correctly 3 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 2 +@todo_wine@WINE_baz correctly 3 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_bar correctly 5 +@todo_wine@WINE_baz correctly 2 +@todo_wine@WINE_foo correctly 18 +WINE_foo correctly 3 +@todo_wine@WINE_bar correctly 7@or_broken@ERROR: WINE_bar incorrectly 4 [7] +--- whitespace are ignored between double char operators +@todo_wine@WINE_foo correctly 10@or_broken@ERROR: WINE_foo incorrectly 4 [10] +@todo_wine@WINE_bar correctly 50@or_broken@ERROR: WINE_bar incorrectly 5 [50] +@todo_wine@WINE_foo correctly 772@or_broken@ERROR: WINE_foo incorrectly 4 [772] +@todo_wine@WINE_bar correctly 7720@or_broken@ERROR: WINE_bar incorrectly 5 [7720] +--- invalid operator sequence +4 +4 +----- negative prefix +@todo_wine@WINE_foo correctly -1 +@todo_wine@WINE_foo correctly 1@or_broken@ERROR: WINE_foo incorrectly [1] +@todo_wine@WINE_foo correctly 6 +@todo_wine@WINE_foo correctly 0 +@todo_wine@WINE_foo correctly 6 +@todo_wine@WINE_foo correctly 2 +@todo_wine@WINE_foo correctly 0@or_broken@ERROR: WINE_foo incorrectly [0] +@todo_wine@WINE_foo correctly 5 +@todo_wine@WINE_foo correctly 3@or_broken@ERROR: WINE_foo incorrectly -5 [3] +----- assignment tests involving the end destination +@todo_wine@WINE_foo correctly 11@or_broken@ERROR: WINE_foo incorrectly 3 [11] +@todo_wine@WINE_foo correctly 6@or_broken@ERROR: WINE_foo incorrectly 2 [6] +@todo_wine@WINE_bar correctly 9@or_broken@ERROR: WINE_bar incorrectly [9] +@todo_wine@WINE_foo correctly 6@or_broken@ERROR: WINE_foo incorrectly 2 [6] +@todo_wine@WINE_bar correctly 10@or_broken@ERROR: WINE_bar incorrectly [10] +@todo_wine@WINE_baz correctly 7@or_broken@ERROR: WINE_baz incorrectly [7] +@todo_wine@WINE_foo correctly 7@or_broken@ERROR: WINE_foo incorrectly 2 [7] +@todo_wine@WINE_bar correctly 7@or_broken@ERROR: WINE_bar incorrectly 2 [7] +----- equal precedence on stack +@todo_wine@WINE_foo correctly 1@or_broken@ERROR: WINE_foo incorrectly 0 [1] +@todo_wine@WINE_foo correctly 0 +@todo_wine@WINE_foo correctly 1@or_broken@ERROR: WINE_foo incorrectly [1] +@todo_wine@WINE_foo correctly 0@or_broken@ERROR: WINE_foo incorrectly [0] +@todo_wine@WINE_foo correctly 1@or_broken@ERROR: WINE_foo incorrectly [1] +@todo_wine@WINE_foo correctly -1@or_broken@ERROR: WINE_foo incorrectly [-1] +@todo_wine@WINE_foo correctly -1@or_broken@ERROR: WINE_foo incorrectly [-1] +@todo_wine@WINE_foo correctly 1@or_broken@ERROR: WINE_foo incorrectly [1] +@todo_wine@WINE_foo correctly 0@or_broken@ERROR: WINE_foo incorrectly [0] +@todo_wine@WINE_foo correctly -1 +@todo_wine@WINE_foo correctly 0@or_broken@ERROR: WINE_foo incorrectly -1 [0] +@todo_wine@WINE_foo correctly 0 +@todo_wine@WINE_foo correctly 1@or_broken@ERROR: WINE_foo incorrectly 0 [1] +@todo_wine@WINE_foo correctly -1@or_broken@ERROR: WINE_foo incorrectly 0 [-1] +@todo_wine@WINE_foo correctly 25@or_broken@ERROR: WINE_foo incorrectly 20 [25] +@todo_wine@WINE_foo correctly 20 +@todo_wine@WINE_foo correctly 1 +@todo_wine@WINE_foo correctly 4 +@todo_wine@WINE_foo correctly 7 +@todo_wine@WINE_foo correctly 8@or_broken@ERROR: WINE_foo incorrectly 4 [8] +@todo_wine@WINE_foo correctly 6@or_broken@ERROR: WINE_foo incorrectly 5 [6] +@todo_wine@WINE_bar correctly 6@or_broken@ERROR: WINE_bar incorrectly 5 [6] --- for /F ------ string argument a

1 0

Jason Edmeades : cmd: Convert the set /a tests to validate better.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: 836f3e4c2945c318ed93bfbe0ef3e0e8309c6416 URL: http://source.winehq.org/git/wine.git/?a=commit;h=836f3e4c2945c318ed93bfbe0… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Wed Dec 12 00:30:45 2012 +0000 cmd: Convert the set /a tests to validate better. --- programs/cmd/tests/test_builtins.cmd | 167 +++++++++++++++++------------- programs/cmd/tests/test_builtins.cmd.exp | 147 ++++++++++++++------------ 2 files changed, 176 insertions(+), 138 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=836f3e4c2945c318ed93b…

1 0

Detlef Riekenberg : api-ms-win-core-winrt-error-l1-1-0: Add dll.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: 828882745a1db3c67422f33a14195685f24eb8fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=828882745a1db3c67422f33a1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 21 00:27:21 2012 +0100 api-ms-win-core-winrt-error-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../api-ms-win-core-winrt-error-l1-1-0/Makefile.in | 3 +++ .../api-ms-win-core-winrt-error-l1-1-0.spec | 11 +++++++++++ 4 files changed, 16 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 60a0185..976bd9b 100755 --- a/configure +++ b/configure @@ -15350,6 +15350,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 diff --git a/configure.ac b/configure.ac index a295a7b..5e59e90 100644 --- a/configure.ac +++ b/configure.ac @@ -2529,6 +2529,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-error-l1-1-0/Makefile.in new file mode 100644 index 0000000..5b02097 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-winrt-error-l1-1-0.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec new file mode 100644 index 0000000..de0a6d8 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-error-l1-1-0/api-ms-win-core-winrt-error-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stub GetRestrictedErrorInfo +@ stub RoCaptureErrorContext +@ stub RoFailFastWithErrorContext +@ stub RoGetErrorReportingFlags +@ stub RoOriginateError +@ stub RoOriginateErrorW +@ stub RoResolveRestrictedErrorInfoReference +@ stub RoSetErrorReportingFlags +@ stub RoTransformError +@ stub RoTransformErrorW +@ stub SetRestrictedErrorInfo

1 0

Detlef Riekenberg : api-ms-win-core-winrt-string-l1-1-0: Add dll.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: 98d0d621e7235a1b2ec1a4ae9f5e7975395818ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d0d621e7235a1b2ec1a4ae9… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Dec 21 00:27:20 2012 +0100 api-ms-win-core-winrt-string-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 ++ .../api-ms-win-core-winrt-string-l1-1-0.spec | 27 ++++++++++++++++++++ 4 files changed, 32 insertions(+), 0 deletions(-) diff --git a/configure b/configure index aeffaf0..60a0185 100755 --- a/configure +++ b/configure @@ -15350,6 +15350,7 @@ wine_fn_config_dll advpack enable_advpack implib wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test +wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l2-1-0 enable_api_ms_win_downlevel_advapi32_l2_1_0 wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 diff --git a/configure.ac b/configure.ac index 48bb522..a295a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -2529,6 +2529,7 @@ WINE_CONFIG_DLL(advpack,,[implib]) WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) +WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l2-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-string-l1-1-0/Makefile.in new file mode 100644 index 0000000..028378c --- /dev/null +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-core-winrt-string-l1-1-0.dll + +@MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec new file mode 100644 index 0000000..9fb5c10 --- /dev/null +++ b/dlls/api-ms-win-core-winrt-string-l1-1-0/api-ms-win-core-winrt-string-l1-1-0.spec @@ -0,0 +1,27 @@ +@ stub HSTRING_UserFree +@ stub HSTRING_UserFree64 +@ stub HSTRING_UserMarshal +@ stub HSTRING_UserMarshal64 +@ stub HSTRING_UserSize +@ stub HSTRING_UserSize64 +@ stub HSTRING_UserUnmarshal +@ stub HSTRING_UserUnmarshal64 +@ stub WindowsCompareStringOrdinal +@ stub WindowsConcatString +@ stub WindowsCreateString +@ stub WindowsCreateStringReference +@ stub WindowsDeleteString +@ stub WindowsDeleteStringBuffer +@ stub WindowsDuplicateString +@ stub WindowsGetStringLen +@ stub WindowsGetStringRawBuffer +@ stub WindowsInspectString +@ stub WindowsIsStringEmpty +@ stub WindowsPreallocateStringBuffer +@ stub WindowsPromoteStringBuffer +@ stub WindowsReplaceString +@ stub WindowsStringHasEmbeddedNull +@ stub WindowsSubstring +@ stub WindowsSubstringwithSpecifiedLength +@ stub WindowsTrimStringEnd +@ stub WindowsTrimStringStart

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
55
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 December 2012