wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_WritePixels.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 20521a5bb70cfdfb25d8daf48f2e7d4d0079f4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=20521a5bb70cfdfb25d8daf48… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 16:37:56 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_WritePixels. --- dlls/windowscodecs/jpegformat.c | 109 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 107 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 2ae1fc7..ac11654 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -69,8 +69,11 @@ MAKE_FUNCPTR(jpeg_destroy_decompress); MAKE_FUNCPTR(jpeg_read_header); MAKE_FUNCPTR(jpeg_read_scanlines); MAKE_FUNCPTR(jpeg_resync_to_restart); +MAKE_FUNCPTR(jpeg_set_defaults); +MAKE_FUNCPTR(jpeg_start_compress); MAKE_FUNCPTR(jpeg_start_decompress); MAKE_FUNCPTR(jpeg_std_error); +MAKE_FUNCPTR(jpeg_write_scanlines); #undef MAKE_FUNCPTR static void *load_libjpeg(void) @@ -90,8 +93,11 @@ static void *load_libjpeg(void) LOAD_FUNCPTR(jpeg_read_header); LOAD_FUNCPTR(jpeg_read_scanlines); LOAD_FUNCPTR(jpeg_resync_to_restart); + LOAD_FUNCPTR(jpeg_set_defaults); + LOAD_FUNCPTR(jpeg_start_compress); LOAD_FUNCPTR(jpeg_start_decompress); LOAD_FUNCPTR(jpeg_std_error); + LOAD_FUNCPTR(jpeg_write_scanlines); #undef LOAD_FUNCPTR } return libjpeg_handle; @@ -727,6 +733,7 @@ typedef struct JpegEncoder { int frame_count; int frame_initialized; int started_compress; + int lines_written; UINT width, height; double xres, yres; const jpeg_compress_format *format; @@ -949,8 +956,105 @@ static HRESULT WINAPI JpegEncoder_Frame_SetThumbnail(IWICBitmapFrameEncode *ifac static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface, UINT lineCount, UINT cbStride, UINT cbBufferSize, BYTE *pbPixels) { - FIXME("(%p,%u,%u,%u,%p): stub\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + jmp_buf jmpbuf; + BYTE *swapped_data = NULL, *current_row; + int line, row_size; + TRACE("(%p,%u,%u,%u,%p)\n", iface, lineCount, cbStride, cbBufferSize, pbPixels); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || !This->width || !This->height || !This->format) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + if (lineCount == 0 || lineCount + This->lines_written > This->height) + { + LeaveCriticalSection(&This->lock); + return E_INVALIDARG; + } + + /* set up setjmp/longjmp error handling */ + if (setjmp(jmpbuf)) + { + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, swapped_data); + return E_FAIL; + } + This->cinfo.client_data = &jmpbuf; + + if (!This->started_compress) + { + This->cinfo.image_width = This->width; + This->cinfo.image_height = This->height; + This->cinfo.input_components = This->format->num_components; + This->cinfo.in_color_space = This->format->color_space; + + pjpeg_set_defaults(&This->cinfo); + + if (This->xres != 0.0 && This->yres != 0.0) + { + This->cinfo.density_unit = 1; /* dots per inch */ + This->cinfo.X_density = This->xres; + This->cinfo.Y_density = This->yres; + } + + pjpeg_start_compress(&This->cinfo, TRUE); + + This->started_compress = 1; + } + + row_size = This->format->bpp / 8 * This->width; + + if (This->format->swap_rgb) + { + swapped_data = HeapAlloc(GetProcessHeap(), 0, row_size); + if (!swapped_data) + { + LeaveCriticalSection(&This->lock); + return E_OUTOFMEMORY; + } + } + + for (line=0; line < lineCount; line++) + { + if (This->format->swap_rgb) + { + int x; + + memcpy(swapped_data, pbPixels + (cbStride * line), row_size); + + for (x=0; x < This->width; x++) + { + BYTE b; + + b = swapped_data[x*3]; + swapped_data[x*3] = swapped_data[x*3+2]; + swapped_data[x*3+2] = b; + } + + current_row = swapped_data; + } + else + current_row = pbPixels + (cbStride * line); + + if (!pjpeg_write_scanlines(&This->cinfo, &current_row, 1)) + { + ERR("failed writing scanlines\n"); + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, swapped_data); + return E_FAIL; + } + + This->lines_written++; + } + + LeaveCriticalSection(&This->lock); + HeapFree(GetProcessHeap(), 0, swapped_data); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface, @@ -1228,6 +1332,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_count = 0; This->frame_initialized = 0; This->started_compress = 0; + This->lines_written = 0; This->width = This->height = 0; This->xres = This->yres = 0.0; This->format = NULL;

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_SetResolution.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 29b0c79e24a64c179a9edf4ccb043575eca59009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b0c79e24a64c179a9edf4cc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 15:57:22 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_SetResolution. --- dlls/windowscodecs/jpegformat.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 57008fd..2ae1fc7 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -728,6 +728,7 @@ typedef struct JpegEncoder { int frame_initialized; int started_compress; UINT width, height; + double xres, yres; const jpeg_compress_format *format; IStream *stream; CRITICAL_SECTION lock; @@ -874,8 +875,23 @@ static HRESULT WINAPI JpegEncoder_Frame_SetSize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI JpegEncoder_Frame_SetResolution(IWICBitmapFrameEncode *iface, double dpiX, double dpiY) { - FIXME("(%p,%0.2f,%0.2f): stub\n", iface, dpiX, dpiY); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%0.2f,%0.2f)\n", iface, dpiX, dpiY); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->started_compress) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->xres = dpiX; + This->yres = dpiY; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_SetPixelFormat(IWICBitmapFrameEncode *iface, @@ -1213,6 +1229,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_initialized = 0; This->started_compress = 0; This->width = This->height = 0; + This->xres = This->yres = 0.0; This->format = NULL; This->stream = NULL; InitializeCriticalSection(&This->lock);

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_SetPixelFormat.
by Alexandre Julliard 17 Apr '12

17 Apr '12

Module: wine Branch: master Commit: 68d9ea4d833d1939bdf7b351845b2d0b9a713eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d9ea4d833d1939bdf7b3518… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 15:50:30 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_SetPixelFormat. --- dlls/windowscodecs/jpegformat.c | 45 +++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 0149043..57008fd 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -701,6 +701,21 @@ HRESULT JpegDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +typedef struct jpeg_compress_format { + const WICPixelFormatGUID *guid; + int bpp; + int num_components; + J_COLOR_SPACE color_space; + int swap_rgb; +} jpeg_compress_format; + +static const jpeg_compress_format compress_formats[] = { + { &GUID_WICPixelFormat24bppBGR, 24, 3, JCS_RGB, 1 }, + { &GUID_WICPixelFormat32bppCMYK, 32, 4, JCS_CMYK }, + { &GUID_WICPixelFormat8bppGray, 8, 1, JCS_GRAYSCALE }, + { 0 } +}; + typedef struct JpegEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; IWICBitmapFrameEncode IWICBitmapFrameEncode_iface; @@ -713,6 +728,7 @@ typedef struct JpegEncoder { int frame_initialized; int started_compress; UINT width, height; + const jpeg_compress_format *format; IStream *stream; CRITICAL_SECTION lock; BYTE dest_buffer[1024]; @@ -865,8 +881,32 @@ static HRESULT WINAPI JpegEncoder_Frame_SetResolution(IWICBitmapFrameEncode *ifa static HRESULT WINAPI JpegEncoder_Frame_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pPixelFormat)); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + int i; + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + + EnterCriticalSection(&This->lock); + + if (!This->frame_initialized || This->started_compress) + { + LeaveCriticalSection(&This->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + for (i=0; compress_formats[i].guid; i++) + { + if (memcmp(compress_formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + break; + } + + if (!compress_formats[i].guid) i = 0; + + This->format = &compress_formats[i]; + memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI JpegEncoder_Frame_SetColorContexts(IWICBitmapFrameEncode *iface, @@ -1173,6 +1213,7 @@ HRESULT JpegEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) This->frame_initialized = 0; This->started_compress = 0; This->width = This->height = 0; + This->format = NULL; This->stream = NULL; InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JpegEncoder.lock");

1 0

Christian Costa : d3drm: Pass the first requested interface when notifying the application.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: efba6cd03b4142333813c1f7e609c3df8d49959c URL: http://source.winehq.org/git/wine.git/?a=commit;h=efba6cd03b4142333813c1f7e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 12 08:36:31 2012 +0200 d3drm: Pass the first requested interface when notifying the application. --- dlls/d3drm/d3drm.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 3db6b9e..ba29e6e 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1353,7 +1353,6 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc { BOOL requested = FALSE; HRESULT hr; - LPDIRECT3DRMMESHBUILDER3 pMeshBuilder; TRACE("Found TID_D3DRMMesh\n"); @@ -1361,26 +1360,31 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder2) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMMeshBuilder3)) + { requested = TRUE; + break; + } if (requested) { + LPDIRECT3DRMMESHBUILDER3 meshbuilder; + FIXME("Load mesh data and notify application\n"); - hr = IDirect3DRM3_CreateMeshBuilder(iface, &pMeshBuilder); + hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); if (SUCCEEDED(hr)) { - LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; + LPDIRECT3DRMOBJECT object = NULL; - hr = IDirect3DRMMeshBuilder3_QueryInterface(pMeshBuilder, &IID_IDirect3DRMMeshBuilder3, (void**)&pMeshBuilder3); + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); if (SUCCEEDED(hr)) { - hr = load_mesh_data(pMeshBuilder3, pData); - IDirect3DRMMeshBuilder3_Release(pMeshBuilder3); + hr = load_mesh_data(meshbuilder, pData); + if (SUCCEEDED(hr)) + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); } - if (SUCCEEDED(hr)) - LoadProc((LPDIRECT3DRMOBJECT)pMeshBuilder3, &IID_IDirect3DRMMeshBuilder, ArgLP); - IDirect3DRMMeshBuilder_Release(pMeshBuilder3); + IDirect3DRMMeshBuilder3_Release(meshbuilder); } if (FAILED(hr)) @@ -1391,7 +1395,6 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc { BOOL requested = FALSE; HRESULT hr; - LPDIRECT3DRMFRAME3 frame; TRACE("Found TID_D3DRMFrame\n"); @@ -1399,21 +1402,33 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc if (IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame2) || IsEqualGUID(GUIDs[i], &IID_IDirect3DRMFrame3)) + { requested = TRUE; + break; + } if (requested) { + LPDIRECT3DRMFRAME3 frame; + FIXME("Fake frame data and notify application\n"); hr = IDirect3DRM3_CreateFrame(iface, NULL, &frame); if (SUCCEEDED(hr)) { - LoadProc((LPDIRECT3DRMOBJECT)frame, &IID_IDirect3DRMFrame, ArgLP); + LPDIRECT3DRMOBJECT object; + + hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { + LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); + } IDirect3DRMFrame3_Release(frame); } if (FAILED(hr)) - ERR("Cannot process mesh\n"); + ERR("Cannot process frame\n"); } }

1 0

Christian Costa : dmband: Display flag variables in hexadecimal and rename some parameters.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 916bfc6cf4217df459992e505799a27fd5e20477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916bfc6cf4217df459992e505… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 12 08:28:44 2012 +0200 dmband: Display flag variables in hexadecimal and rename some parameters. --- dlls/dmband/band.c | 2 +- dlls/dmband/bandtrack.c | 74 ++++++++++++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 31 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index d1b8029..e67bc8e 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -406,7 +406,7 @@ static HRESULT IDirectMusicBandImpl_IPersistStream_ParseInstrument (LPPERSISTSTR TRACE_(dmfile)(" - dwNoteRanges[2]: %u\n", inst.dwNoteRanges[2]); TRACE_(dmfile)(" - dwNoteRanges[3]: %u\n", inst.dwNoteRanges[3]); TRACE_(dmfile)(" - dwPChannel: %u\n", inst.dwPChannel); - TRACE_(dmfile)(" - dwFlags: %u\n", inst.dwFlags); + TRACE_(dmfile)(" - dwFlags: %x\n", inst.dwFlags); TRACE_(dmfile)(" - bPan: %u\n", inst.bPan); TRACE_(dmfile)(" - bVolume: %u\n", inst.bVolume); TRACE_(dmfile)(" - nTranspose: %d\n", inst.nTranspose); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 7d5ed0c..878ccc0 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -103,10 +103,13 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Init (LPDIRECTMUSI return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_InitPlay (LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* pSegmentState, IDirectMusicPerformance* pPerformance, void** ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %p, %p, %p, %d, %d): stub\n", This, pSegmentState, pPerformance, ppStateData, dwVirtualTrack8ID, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_InitPlay(LPDIRECTMUSICTRACK8 iface, IDirectMusicSegmentState* segment_state, IDirectMusicPerformance* performance, void** state_data, DWORD virtual_track8id, DWORD flags) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); + + FIXME("(%p, %p, %p, %p, %d, %x): stub\n", This, segment_state, performance, state_data, virtual_track8id, flags); + + return S_OK; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_EndPlay (LPDIRECTMUSICTRACK8 iface, void* pStateData) { @@ -115,18 +118,20 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_EndPlay (LPDIRECTM return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Play (LPDIRECTMUSICTRACK8 iface, void* pStateData, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - - FIXME("(%p, %p, %d, %d, %d, %d, %p, %p, %d): semi-stub\n", This, pStateData, mtStart, mtEnd, mtOffset, dwFlags, pPerf, pSegSt, dwVirtualID); - /* Sends following pMSG: - - DMUS_PATCH_PMSG - - DMUS_TRANSPOSE_PMSG - - DMUS_CHANNEL_PRIORITY_PMSG - - DMUS_MIDI_PMSG - */ +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Play(LPDIRECTMUSICTRACK8 iface, void* state_data, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD flags, IDirectMusicPerformance* performance, IDirectMusicSegmentState* segment_state, DWORD virtual_id) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - return S_OK; + FIXME("(%p, %p, %d, %d, %d, %x, %p, %p, %d): semi-stub\n", This, state_data, mtStart, mtEnd, mtOffset, flags, performance, segment_state, virtual_id); + + /* Sends following pMSG: + - DMUS_PATCH_PMSG + - DMUS_TRANSPOSE_PMSG + - DMUS_CHANNEL_PRIORITY_PMSG + - DMUS_MIDI_PMSG + */ + + return S_OK; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_GetParam (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, MUSIC_TIME mtTime, MUSIC_TIME* pmtNext, void* pParam) { @@ -182,25 +187,34 @@ static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Clone (LPDIRECTMUS return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_PlayEx (LPDIRECTMUSICTRACK8 iface, void* pStateData, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, IDirectMusicPerformance* pPerf, IDirectMusicSegmentState* pSegSt, DWORD dwVirtualID) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %d, %p, %p, %d): stub\n", This, pStateData, wine_dbgstr_longlong(rtStart), - wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), dwFlags, pPerf, pSegSt, dwVirtualID); - return S_OK; +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_PlayEx(LPDIRECTMUSICTRACK8 iface, void* state_data, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD flags, IDirectMusicPerformance* performance, IDirectMusicSegmentState* segment_state, DWORD virtual_id) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); + + FIXME("(%p, %p, 0x%s, 0x%s, 0x%s, %x, %p, %p, %d): stub\n", This, state_data, wine_dbgstr_longlong(rtStart), + wine_dbgstr_longlong(rtEnd), wine_dbgstr_longlong(rtOffset), flags, performance, segment_state, virtual_id); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* prtNext, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), - wine_dbgstr_longlong(rtTime), prtNext, pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_GetParamEx(LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME* rtNext, void* param, void* state_data, DWORD flags) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); + + FIXME("(%p, %s, 0x%s, %p, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), rtNext, param, state_data, flags); + + return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx (LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* pParam, void* pStateData, DWORD dwFlags) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); - FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), - wine_dbgstr_longlong(rtTime), pParam, pStateData, dwFlags); - return S_OK; +static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_SetParamEx(LPDIRECTMUSICTRACK8 iface, REFGUID rguidType, REFERENCE_TIME rtTime, void* param, void* state_data, DWORD flags) +{ + ICOM_THIS_MULTI(IDirectMusicBandTrack, TrackVtbl, iface); + + FIXME("(%p, %s, 0x%s, %p, %p, %x): stub\n", This, debugstr_dmguid(rguidType), + wine_dbgstr_longlong(rtTime), param, state_data, flags); + + return S_OK; } static HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Compose (LPDIRECTMUSICTRACK8 iface, IUnknown* pContext, DWORD dwTrackGroup, IDirectMusicTrack** ppResultTrack) {

1 0

Christian Costa : dmband: Add tests.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 54168bde5ce5cfdd4d76edec351d3729f08b6da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54168bde5ce5cfdd4d76edec3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu Apr 12 08:28:35 2012 +0200 dmband: Add tests. --- configure | 1 + configure.ac | 1 + dlls/dmband/tests/Makefile.in | 7 ++++ dlls/dmband/tests/dmband.c | 81 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 37845fb..bb49fe2 100755 --- a/configure +++ b/configure @@ -15022,6 +15022,7 @@ wine_fn_config_dll dispex enable_dispex wine_fn_config_test dlls/dispex/tests dispex_test wine_fn_config_dll display.drv16 enable_win16 wine_fn_config_dll dmband enable_dmband +wine_fn_config_test dlls/dmband/tests dmband_test wine_fn_config_dll dmcompos enable_dmcompos wine_fn_config_dll dmime enable_dmime wine_fn_config_test dlls/dmime/tests dmime_test diff --git a/configure.ac b/configure.ac index a57f133..efc03af 100644 --- a/configure.ac +++ b/configure.ac @@ -2528,6 +2528,7 @@ WINE_CONFIG_DLL(dispex) WINE_CONFIG_TEST(dlls/dispex/tests) WINE_CONFIG_DLL(display.drv16,enable_win16) WINE_CONFIG_DLL(dmband) +WINE_CONFIG_TEST(dlls/dmband/tests) WINE_CONFIG_DLL(dmcompos) WINE_CONFIG_DLL(dmime) WINE_CONFIG_TEST(dlls/dmime/tests) diff --git a/dlls/dmband/tests/Makefile.in b/dlls/dmband/tests/Makefile.in new file mode 100644 index 0000000..71660aa --- /dev/null +++ b/dlls/dmband/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = dmband.dll +IMPORTS = oleaut32 ole32 uuid + +C_SRCS = \ + dmband.c + +@MAKE_TEST_RULES@ diff --git a/dlls/dmband/tests/dmband.c b/dlls/dmband/tests/dmband.c new file mode 100644 index 0000000..ecc767a --- /dev/null +++ b/dlls/dmband/tests/dmband.c @@ -0,0 +1,81 @@ +/* + * Unit tests for dmband functions + * + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <stdio.h> + +#include "wine/test.h" +#include "uuids.h" +#include "ole2.h" +#include "initguid.h" +#include "dmusici.h" +#include "dmplugin.h" + +DEFINE_GUID(IID_IDirectMusicBandTrackPrivate, 0x53466056, 0x6dc4, 0x11d1, 0xbf, 0x7b, 0x00, 0xc0, 0x4f, 0xbf, 0x8f, 0xef); + +static void test_dmband(void) +{ + IDirectMusicBand *band; + IUnknown *unknown = NULL; + IDirectMusicTrack *track = NULL; + IPersistStream *stream = NULL; + IPersistStream *private = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_DirectMusicBand, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicBand, (LPVOID*)&band); + if (hr != S_OK) + { + skip("Cannot create DirectMusicBand object (%x)\n", hr); + return; + } + + hr = CoCreateInstance(&CLSID_DirectMusicBandTrack, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (LPVOID*)&unknown); + ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicTrack, (LPVOID*)&track); + ok(hr == S_OK, "QueryInterface returned: %x\n", hr); + todo_wine ok((LPVOID)track == (LPVOID)unknown, "Interface are not the same %p != %p\n", stream, private); + hr = IUnknown_QueryInterface(unknown, &IID_IPersistStream, (LPVOID*)&stream); + ok(hr == S_OK, "QueryInterface returned: %x\n", hr); + /* Query private interface */ + hr = IUnknown_QueryInterface(unknown, &IID_IDirectMusicBandTrackPrivate, (LPVOID*)&private); + todo_wine ok(hr == S_OK, "QueryInterface returned: %x\n", hr); + + trace("Interfaces: unknown = %p, track = %p, stream = %p, private = %p\n", unknown, track, stream, private); + + if (private) + IPersistStream_Release(private); + if (stream) + IPersistStream_Release(stream); + if (track) + IDirectMusicTrack_Release(track); + if (unknown) + IUnknown_Release(unknown); + IDirectMusicBand_Release(band); +} + +START_TEST(dmband) +{ + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + test_dmband(); + + CoUninitialize(); +}

1 0

Piotr Caban : msvcrt: Added more length modifiers in scanf function.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 7240170ceedecef6aac674e795fdc4e1a74e131a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7240170ceedecef6aac674e79… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 16 16:32:57 2012 +0200 msvcrt: Added more length modifiers in scanf function. --- dlls/msvcrt/scanf.h | 12 +++++++++--- dlls/msvcrt/tests/scanf.c | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 9f6911e..cc2b861 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -198,8 +198,14 @@ _FUNCTION_ { /* read prefix (if any) */ while (!prefix_finished) { switch(*format) { - case 'h': h_prefix = 1; break; - case 'l': l_prefix = 1; break; + case 'h': h_prefix++; break; + case 'l': + if(*(format+1) == 'l') { + I64_prefix = 1; + format++; + } + l_prefix = 1; + break; case 'w': w_prefix = 1; break; case 'L': L_prefix = 1; break; case 'I': @@ -294,7 +300,7 @@ _FUNCTION_ { #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur if (I64_prefix) _SET_NUMBER_(LONGLONG); else if (l_prefix) _SET_NUMBER_(LONG); - else if (h_prefix) _SET_NUMBER_(short int); + else if (h_prefix == 1) _SET_NUMBER_(short int); else _SET_NUMBER_(int); } } diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 8b13bdc..fb9d8e8 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -27,6 +27,7 @@ static void test_sscanf( void ) char buffer[100], buffer1[100]; char format[20]; int result, ret; + LONGLONG result64; char c; void *ptr; float res1= -82.6267f, res2= 27.76f, res11, res12; @@ -125,6 +126,25 @@ static void test_sscanf( void ) ok(ret == 0 , "problem with format arg \"%%*c%%n\"\n"); ok(number_so_far == 1,"Read wrong arg for \"%%n\" %d instead of 2\n",number_so_far); + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = sscanf(buffer, "%hd", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + + result = 0xdeadbeef; + ret = sscanf(buffer, "%hhd", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xbc614e, "Wrong number read (%x)\n", result); + + strcpy(buffer,"12345678901234"); + ret = sscanf(buffer, "%lld", &result64); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ret = sprintf(buffer1, "%lld", result64); + ok(ret==14 || broken(ret==10), "sprintf retuned %d\n", ret); + if(ret == 14) + ok(!strcmp(buffer, buffer1), "got %s, expected %s\n", buffer1, buffer); + /* Check %i according to bug 1878 */ strcpy(buffer,"123"); ret = sscanf(buffer, "%i", &result);

1 0

Piotr Caban : msvcrt: Fixed 'h' modifier handling when printing integers.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 0cc16fc8a56ef9511366dec8a904cd8da34b661c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc16fc8a56ef9511366dec8a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 16 15:21:47 2012 +0200 msvcrt: Fixed 'h' modifier handling when printing integers. --- dlls/msvcrt/printf.h | 10 ++++++---- dlls/msvcrt/tests/printf.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index a60ba74..79a03a9 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -525,11 +525,13 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, pf_args(args_ctx, pos, VT_I8, valist).get_longlong); else if(flags.Format=='d' || flags.Format=='i') - FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, pf_args(args_ctx, pos, - VT_INT, valist).get_int); + FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, flags.IntegerLength!='h' ? + pf_args(args_ctx, pos, VT_INT, valist).get_int : + (short)pf_args(args_ctx, pos, VT_INT, valist).get_int); else - FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, (unsigned)pf_args( - args_ctx, pos, VT_INT, valist).get_int); + FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, flags.IntegerLength!='h' ? + (unsigned)pf_args(args_ctx, pos, VT_INT, valist).get_int : + (unsigned short)pf_args(args_ctx, pos, VT_INT, valist).get_int); #ifdef PRINTF_WIDE i = FUNC_NAME(pf_output_format_wstr)(pf_puts, puts_ctx, tmp, -1, &flags, locinfo); diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index ff86516..1507a01 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -607,6 +607,16 @@ static void test_sprintf( void ) r = sprintf(buffer, format); ok(!strcmp(buffer,"%0"), "failed: \"%s\"\n", buffer); ok( r==2, "return count wrong\n"); + + format = "%hx"; + r = sprintf(buffer, format, 0x12345); + ok(!strcmp(buffer,"2345"), "failed \"%s\"\n", buffer); + + format = "%hhx"; + r = sprintf(buffer, format, 0x123); + ok(!strcmp(buffer,"123"), "failed: \"%s\"\n", buffer); + r = sprintf(buffer, format, 0x12345); + ok(!strcmp(buffer,"2345"), "failed \"%s\"\n", buffer); } static void test_swprintf( void )

1 0

Alexander Morozov : kernel32/tests: Add more tests for early closing mapping handle.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: 5c9ca5cb53d98c39420a7a9f46ff06b1d6e8a220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c9ca5cb53d98c39420a7a9f4… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Apr 16 15:47:07 2012 +0400 kernel32/tests: Add more tests for early closing mapping handle. --- dlls/kernel32/tests/virtual.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 2c3f22d..4ca47e0 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -809,9 +809,56 @@ static void test_MapViewOfFile(void) ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); CloseHandle(mapping); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); SetLastError(0xdeadbeef); ret = UnmapViewOfFile(ptr); ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( ret, "memory is accessible\n" ); + + SetLastError(0xdeadbeef); + file = CreateFileA(testfile, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + SetFilePointer(file, 4096, NULL, FILE_BEGIN); + SetEndOfFile(file); + + SetLastError(0xdeadbeef); + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); + ok( mapping != 0, "CreateFileMappingA failed with error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); + ptr = MapViewOfFile(mapping, FILE_MAP_WRITE, 0, 0, 0); + ok( ptr != NULL, "MapViewOfFile failed with error %d\n", GetLastError() ); + SetLastError(0xdeadbeef); + map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); + ok( map2 != 0, "OpenFileMappingA failed with error %d\n", GetLastError() ); + CloseHandle(map2); + CloseHandle(mapping); + + SetLastError(0xdeadbeef); + map2 = OpenFileMappingA(FILE_MAP_READ, FALSE, name); + todo_wine + ok( map2 == 0, "OpenFileMappingA succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_FILE_NOT_FOUND, "OpenFileMappingA set error %d\n", GetLastError() ); + CloseHandle(map2); + SetLastError(0xdeadbeef); + mapping = CreateFileMappingA(file, NULL, PAGE_READWRITE, 0, MAPPING_SIZE, name); + ok( mapping != 0, "CreateFileMappingA failed\n" ); + todo_wine + ok( GetLastError() == ERROR_SUCCESS, "CreateFileMappingA set error %d\n", GetLastError() ); + CloseHandle(mapping); + + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( !ret, "memory is not accessible\n" ); + SetLastError(0xdeadbeef); + ret = UnmapViewOfFile(ptr); + ok( ret, "UnmapViewOfFile failed with error %d\n", GetLastError() ); + ret = IsBadReadPtr(ptr, MAPPING_SIZE); + ok( ret, "memory is accessible\n" ); + + CloseHandle(file); + DeleteFileA(testfile); } static void test_NtMapViewOfSection(void)

1 0

Hans Leidekker : iphlpapi: Reimplement GetTcpTable on top of GetExtendedTcpTable.
by Alexandre Julliard 16 Apr '12

16 Apr '12

Module: wine Branch: master Commit: d4ebc5298f17aa749c675b494d0b09b510e45f01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4ebc5298f17aa749c675b494… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 16 12:36:00 2012 +0200 iphlpapi: Reimplement GetTcpTable on top of GetExtendedTcpTable. --- dlls/iphlpapi/iphlpapi_main.c | 22 +--------------------- 1 files changed, 1 insertions(+), 21 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2654571..961736f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1853,28 +1853,8 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo */ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) { - DWORD ret; - PMIB_TCPTABLE table; - TRACE("pTcpTable %p, pdwSize %p, bOrder %d\n", pTcpTable, pdwSize, bOrder); - - if (!pdwSize) return ERROR_INVALID_PARAMETER; - - ret = AllocateAndGetTcpTableFromStack(&table, bOrder, GetProcessHeap(), 0); - if (!ret) { - DWORD size = FIELD_OFFSET( MIB_TCPTABLE, table[table->dwNumEntries] ); - if (!pTcpTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - *pdwSize = size; - memcpy(pTcpTable, table, size); - } - HeapFree(GetProcessHeap(), 0, table); - } - TRACE("returning %d\n", ret); - return ret; + return GetExtendedTcpTable(pTcpTable, pdwSize, bOrder, AF_INET, TCP_TABLE_BASIC_ALL, 0); } /******************************************************************

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
72
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 April 2012