December 2012 - Wine-commits

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

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

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

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

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

Piotr Caban : msvcrt: Added _set_fmode and _get_fmode implementation.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: dfca87db71dcade741ef95dededce37c53479578 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfca87db71dcade741ef95ded… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 13:37:47 2012 +0100 msvcrt: Added _set_fmode and _get_fmode implementation. --- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/data.c | 25 +++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- 5 files changed, 33 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8f0ecdb..38ae28a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -868,7 +868,7 @@ @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno -@ stub _get_fmode +@ cdecl _get_fmode(ptr) msvcrt._get_fmode @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @@ -1266,7 +1266,7 @@ @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode -@ stub _set_fmode +@ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b4eaf7b..c9469e7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -523,7 +523,7 @@ @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno -@ stub _get_fmode +@ cdecl _get_fmode(ptr) msvcrt._get_fmode @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @@ -928,7 +928,7 @@ @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode -@ stub _set_fmode +@ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 90b4b04..bf54f0a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -518,7 +518,7 @@ @ cdecl _get_doserrno(ptr) msvcrt._get_doserrno @ stub _get_dstbias @ cdecl _get_errno(ptr) msvcrt._get_errno -@ stub _get_fmode +@ cdecl _get_fmode(ptr) msvcrt._get_fmode @ cdecl _get_heap_handle() msvcrt._get_heap_handle @ cdecl _get_invalid_parameter_handler() msvcrt._get_invalid_parameter_handler @ cdecl _get_osfhandle(long) msvcrt._get_osfhandle @@ -921,7 +921,7 @@ @ cdecl _set_doserrno(long) msvcrt._set_doserrno @ cdecl _set_errno(long) msvcrt._set_errno @ cdecl _set_error_mode(long) msvcrt._set_error_mode -@ stub _set_fmode +@ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait @ stub _set_output_format diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 94254ab..a9505ed 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -186,6 +186,31 @@ int CDECL _get_wpgmptr(WCHAR** p) unsigned int* CDECL __p__fmode(void) { return &MSVCRT__fmode; } /*********************************************************************** + * _set_fmode (MSVCRT.@) + */ +int CDECL _set_fmode(int mode) +{ + /* TODO: support _O_WTEXT */ + if(!MSVCRT_CHECK_PMT(mode==MSVCRT__O_TEXT || mode==MSVCRT__O_BINARY)) + return MSVCRT_EINVAL; + + MSVCRT__fmode = mode; + return 0; +} + +/*********************************************************************** + * _get_fmode (MSVCRT.@) + */ +int CDECL _get_fmode(int *mode) +{ + if(!MSVCRT_CHECK_PMT(mode)) + return MSVCRT_EINVAL; + + *mode = MSVCRT__fmode; + return 0; +} + +/*********************************************************************** * __p__osver (MSVCRT.@) */ unsigned int* CDECL __p__osver(void) { return &MSVCRT__osver; } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 79f6511..6802104 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -474,7 +474,7 @@ # stub _get_environ(ptr) @ cdecl _get_errno(ptr) # stub _get_fileinfo(ptr) -# stub _get_fmode(ptr) +@ cdecl _get_fmode(ptr) @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_osplatform(ptr) MSVCRT__get_osplatform @@ -867,7 +867,7 @@ @ cdecl _set_errno(long) @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) -# stub _set_fmode(long) +@ cdecl _set_fmode(long) # stub _set_output_format(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long)

1 0

Piotr Caban : msvcr100: Added _aligned_msize implementation.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: 6e38d5beef8fe9787004c014baec6a2f78102a58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e38d5beef8fe9787004c014b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 21 13:38:34 2012 +0100 msvcr100: Added _aligned_msize implementation. --- dlls/msvcr100/msvcr100.c | 20 ++++++++++++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 33 +++++++++++++++++++++++++++++++++ dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 5 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index f571aee..aeab2ad 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -483,6 +483,26 @@ int CDECL _get_timezone(LONG *timezone) return 0; } +/* copied from dlls/msvcrt/heap.c */ +#define SAVED_PTR(x) ((void *)((DWORD_PTR)((char *)x - sizeof(void *)) & \ + ~(sizeof(void *) - 1))) + +/********************************************************************* + * _aligned_msize (MSVCR100.@) + */ +size_t CDECL _aligned_msize(void *p, size_t alignment, size_t offset) +{ + void **alloc_ptr; + + if(!CHECK_PMT(p)) return -1; + + if(alignment < sizeof(void*)) + alignment = sizeof(void*); + + alloc_ptr = SAVED_PTR(p); + return _msize(*alloc_ptr)-alignment-sizeof(void*); +} + /********************************************************************* * DllMain (MSVCR100.@) */ diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 38ae28a..a09b142 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -678,7 +678,7 @@ @ extern _acmdln msvcrt._acmdln @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc -@ stub _aligned_msize +@ cdecl _aligned_msize(ptr long long) @ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc @ cdecl _aligned_offset_realloc(ptr long long long) msvcrt._aligned_offset_realloc @ stub _aligned_offset_recalloc diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 143979d..99834dd 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -72,6 +72,9 @@ static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const static FILE* (__cdecl *p_fopen)(const char*,const char*); static int (__cdecl *p_fclose)(FILE*); static size_t (__cdecl *p_fread_s)(void*,size_t,size_t,size_t,FILE*); +static void* (__cdecl *p__aligned_offset_malloc)(size_t, size_t, size_t); +static void (__cdecl *p__aligned_free)(void*); +static size_t (__cdecl *p__aligned_msize)(void*, size_t, size_t); /* make sure we use the correct errno */ #undef errno @@ -98,6 +101,9 @@ static BOOL init(void) SET(p_fopen, "fopen"); SET(p_fclose, "fclose"); SET(p_fread_s, "fread_s"); + SET(p__aligned_offset_malloc, "_aligned_offset_malloc"); + SET(p__aligned_free, "_aligned_free"); + SET(p__aligned_msize, "_aligned_msize"); return TRUE; } @@ -326,6 +332,32 @@ static void test_fread_s(void) unlink(test_file); } +static void test__aligned_msize(void) +{ + void *mem; + int ret; + + mem = p__aligned_offset_malloc(23, 16, 7); + ret = p__aligned_msize(mem, 16, 7); + ok(ret == 23, "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 15, 7); + ok(ret == 24, "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 11, 7); + ok(ret == 28, "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 1, 7); + ok(ret == 39-sizeof(void*), "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 8, 0); + todo_wine ok(ret == 32, "_aligned_msize returned %d\n", ret); + p__aligned_free(mem); + + mem = p__aligned_offset_malloc(3, 16, 0); + ret = p__aligned_msize(mem, 16, 0); + ok(ret == 3, "_aligned_msize returned %d\n", ret); + ret = p__aligned_msize(mem, 11, 0); + ok(ret == 8, "_aligned_msize returned %d\n", ret); + p__aligned_free(mem); +} + START_TEST(msvcr100) { if (!init()) @@ -334,4 +366,5 @@ START_TEST(msvcr100) test_wmemcpy_s(); test_wmemmove_s(); test_fread_s(); + test__aligned_msize(); } diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index c9469e7..4457c2c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -334,7 +334,7 @@ @ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc -@ stub _aligned_msize +@ cdecl _aligned_msize(ptr long long) msvcr100._aligned_msize @ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc @ cdecl _aligned_offset_realloc(ptr long long long) msvcrt._aligned_offset_realloc @ stub _aligned_offset_recalloc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index bf54f0a..c20c5fd 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -326,7 +326,7 @@ @ extern _aexit_rtn msvcrt._aexit_rtn @ cdecl _aligned_free(ptr) msvcrt._aligned_free @ cdecl _aligned_malloc(long long) msvcrt._aligned_malloc -@ stub _aligned_msize +@ cdecl _aligned_msize(ptr long long) msvcr100._aligned_msize @ cdecl _aligned_offset_malloc(long long long) msvcrt._aligned_offset_malloc @ cdecl _aligned_offset_realloc(ptr long long long) msvcrt._aligned_offset_realloc @ stub _aligned_offset_recalloc

1 0

Hans Leidekker : winhttp/tests: Make sure proxy settings are restored.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: ec1ae3b6e64642e03fde382bd83e07aa1856c2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1ae3b6e64642e03fde382bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 21 13:55:41 2012 +0100 winhttp/tests: Make sure proxy settings are restored. --- dlls/winhttp/tests/winhttp.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5fcdef6..05e7804 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1070,23 +1070,23 @@ static void test_set_default_proxy_config(void) info.lpszProxy = wideString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - ok((!ret && GetLastError() == ERROR_INVALID_PARAMETER) || - broken(ret), /* Earlier winhttp versions on W2K/XP */ - "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + skip("couldn't set default proxy configuration: access denied\n"); + else + ok((!ret && GetLastError() == ERROR_INVALID_PARAMETER) || + broken(ret), /* Earlier winhttp versions on W2K/XP */ + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); info.lpszProxy = normalString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - if (ret) - { - ok(ret, "always true\n"); - set_default_proxy_reg_value( saved_proxy_settings, len, type ); - } - else if (GetLastError() == ERROR_ACCESS_DENIED) + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) skip("couldn't set default proxy configuration: access denied\n"); else ok(ret, "WinHttpSetDefaultProxyConfiguration failed: %d\n", GetLastError()); + + set_default_proxy_reg_value( saved_proxy_settings, len, type ); } static void test_Timeouts (void)

1 0

Hans Leidekker : pdh: Accept the local machine name in counter paths.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: 4933dc78c6aeef024c6f240945968d05a51d4670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4933dc78c6aeef024c6f24094… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 21 13:56:23 2012 +0100 pdh: Accept the local machine name in counter paths. --- dlls/pdh/pdh_main.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 69f0d71..f1a34e7 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -220,14 +220,27 @@ static const struct source counter_sources[] = { 674, path_uptime, collect_uptime, TYPE_UPTIME, -3, 1000 } }; +static BOOL is_local_machine( const WCHAR *name, DWORD len ) +{ + WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD buflen = sizeof(buf) / sizeof(buf[0]); + + if (!GetComputerNameW( buf, &buflen )) return FALSE; + return len == buflen && !memicmpW( name, buf, buflen ); +} + static BOOL pdh_match_path( LPCWSTR fullpath, LPCWSTR path ) { const WCHAR *p; - if (strchrW( path, '\\')) p = fullpath; + if (path[0] == '\\' && path[1] == '\\' && (p = strchrW( path + 2, '\\' )) && + is_local_machine( path + 2, p - path - 2 )) + { + path += p - path; + } + if (strchrW( path, '\\' )) p = fullpath; else p = strrchrW( fullpath, '\\' ) + 1; - if (strcmpW( p, path )) return FALSE; - return TRUE; + return !strcmpW( p, path ); } /***********************************************************************

1 0

Hans Leidekker : wmiutils: Rename wmiutils.idl to wmiutils_classes.idl.
by Alexandre Julliard 21 Dec '12

21 Dec '12

Module: wine Branch: master Commit: d010497474f2419671faa93ef4b413b2a057b7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d010497474f2419671faa93ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 21 13:57:07 2012 +0100 wmiutils: Rename wmiutils.idl to wmiutils_classes.idl. --- dlls/wmiutils/Makefile.in | 2 +- .../{wmiutils.idl => wmiutils_classes.idl} | 0 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wmiutils/Makefile.in b/dlls/wmiutils/Makefile.in index f12461f..c6ef892 100644 --- a/dlls/wmiutils/Makefile.in +++ b/dlls/wmiutils/Makefile.in @@ -5,6 +5,6 @@ C_SRCS = \ main.c \ statuscode.c -IDL_R_SRCS = wmiutils.idl +IDL_R_SRCS = wmiutils_classes.idl @MAKE_DLL_RULES@ diff --git a/dlls/wmiutils/wmiutils.idl b/dlls/wmiutils/wmiutils_classes.idl similarity index 100% rename from dlls/wmiutils/wmiutils.idl rename to dlls/wmiutils/wmiutils_classes.idl

1 0