May 2012 - Wine-Commits - list.winehq.org

Piotr Caban : wininet/tests: Added INTERNET_OPTION_CONNECT_TIMEOUT setting tests.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: d5913b5c45f0bc404756ea6cf45c8f8c2d339dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5913b5c45f0bc404756ea6cf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 14 13:49:49 2012 +0200 wininet/tests: Added INTERNET_OPTION_CONNECT_TIMEOUT setting tests. --- dlls/wininet/tests/internet.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 7b0ee47..8d91661 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -228,6 +228,16 @@ static void test_InternetQueryOptionA(void) InternetCloseHandle(hinet); + val = 12345; + res = InternetSetOptionA(NULL, INTERNET_OPTION_CONNECT_TIMEOUT, &val, sizeof(val)); + ok(res, "InternetSetOptionA(INTERNET_OPTION_CONNECT_TIMEOUT) failed (%u)\n", GetLastError()); + + len = sizeof(val); + res = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECT_TIMEOUT, &val, &len); + ok(res, "InternetQueryOptionA failed %d)\n", GetLastError()); + ok(val == 12345, "val = %d\n", val); + ok(len == sizeof(val), "len = %d\n", len); + hinet = InternetOpenA(NULL,INTERNET_OPEN_TYPE_DIRECT,NULL,NULL, 0); ok((hinet != 0x0),"InternetOpen Failed\n"); SetLastError(0xdeadbeef); @@ -249,6 +259,28 @@ static void test_InternetQueryOptionA(void) ok(!res, "InternetSetOptionA(INTERNET_OPTION_MAX_CONNS_PER_SERVER) succeeded\n"); ok(GetLastError() == ERROR_INTERNET_INVALID_OPERATION, "GetLastError() = %u\n", GetLastError()); + len = sizeof(val); + res = InternetQueryOptionA(hinet, INTERNET_OPTION_CONNECT_TIMEOUT, &val, &len); + ok(res, "InternetQueryOptionA failed %d)\n", GetLastError()); + ok(val == 12345, "val = %d\n", val); + ok(len == sizeof(val), "len = %d\n", len); + + val = 1; + res = InternetSetOptionA(hinet, INTERNET_OPTION_CONNECT_TIMEOUT, &val, sizeof(val)); + ok(res, "InternetSetOptionA(INTERNET_OPTION_CONNECT_TIMEOUT) failed (%u)\n", GetLastError()); + + len = sizeof(val); + res = InternetQueryOptionA(hinet, INTERNET_OPTION_CONNECT_TIMEOUT, &val, &len); + ok(res, "InternetQueryOptionA failed %d)\n", GetLastError()); + ok(val == 1, "val = %d\n", val); + ok(len == sizeof(val), "len = %d\n", len); + + len = sizeof(val); + res = InternetQueryOptionA(NULL, INTERNET_OPTION_CONNECT_TIMEOUT, &val, &len); + ok(res, "InternetQueryOptionA failed %d)\n", GetLastError()); + ok(val == 12345, "val = %d\n", val); + ok(len == sizeof(val), "len = %d\n", len); + InternetCloseHandle(hinet); }

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICMetadataQueryReader methods.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 536b208cb1bb985a1f96ea3c957cd335fd5f99f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=536b208cb1bb985a1f96ea3c9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 11:01:10 2012 -0500 windowscodecs: Add wrapper functions for IWICMetadataQueryReader methods. --- dlls/windowscodecs/proxy.c | 24 ++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 8 ++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index c1c99ca..aa1f08b 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -277,6 +277,30 @@ HRESULT WINAPI IWICImagingFactory_CreateStream_Proxy_W(IWICImagingFactory *pFact return IWICImagingFactory_CreateStream(pFactory, ppIWICStream); } +HRESULT WINAPI IWICMetadataQueryReader_GetContainerFormat_Proxy_W(IWICMetadataQueryReader *iface, + GUID *pguidContainerFormat) +{ + return IWICMetadataQueryReader_GetContainerFormat(iface, pguidContainerFormat); +} + +HRESULT WINAPI IWICMetadataQueryReader_GetLocation_Proxy_W(IWICMetadataQueryReader *iface, + UINT cchMaxLength, WCHAR *wzNamespace, UINT *pcchActualLength) +{ + return IWICMetadataQueryReader_GetLocation(iface, cchMaxLength, wzNamespace, pcchActualLength); +} + +HRESULT WINAPI IWICMetadataQueryReader_GetMetadataByName_Proxy_W(IWICMetadataQueryReader *iface, + LPCWSTR wzName, PROPVARIANT *pvarValue) +{ + return IWICMetadataQueryReader_GetMetadataByName(iface, wzName, pvarValue); +} + +HRESULT WINAPI IWICMetadataQueryReader_GetEnumerator_Proxy_W(IWICMetadataQueryReader *iface, + IEnumString **ppIEnumString) +{ + return IWICMetadataQueryReader_GetEnumerator(iface, ppIEnumString); +} + HRESULT WINAPI IWICPalette_InitializePredefined_Proxy_W(IWICPalette *iface, WICBitmapPaletteType ePaletteType, BOOL fAddTransparentColor) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 930f2c4..3629bad 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -85,10 +85,10 @@ @ stdcall IWICImagingFactory_CreateStream_Proxy(ptr ptr) IWICImagingFactory_CreateStream_Proxy_W @ stub IWICMetadataBlockReader_GetCount_Proxy @ stub IWICMetadataBlockReader_GetReaderByIndex_Proxy -@ stub IWICMetadataQueryReader_GetContainerFormat_Proxy -@ stub IWICMetadataQueryReader_GetEnumerator_Proxy -@ stub IWICMetadataQueryReader_GetLocation_Proxy -@ stub IWICMetadataQueryReader_GetMetadataByName_Proxy +@ stdcall IWICMetadataQueryReader_GetContainerFormat_Proxy(ptr ptr) IWICMetadataQueryReader_GetContainerFormat_Proxy_W +@ stdcall IWICMetadataQueryReader_GetEnumerator_Proxy(ptr ptr) IWICMetadataQueryReader_GetEnumerator_Proxy_W +@ stdcall IWICMetadataQueryReader_GetLocation_Proxy(ptr long ptr ptr) IWICMetadataQueryReader_GetLocation_Proxy_W +@ stdcall IWICMetadataQueryReader_GetMetadataByName_Proxy(ptr wstr ptr) IWICMetadataQueryReader_GetMetadataByName_Proxy_W @ stub IWICMetadataQueryWriter_RemoveMetadataByName_Proxy @ stub IWICMetadataQueryWriter_SetMetadataByName_Proxy @ stdcall IWICPalette_GetColorCount_Proxy(ptr ptr) IWICPalette_GetColorCount_Proxy_W

1 0

Vincent Povirk : windowscodecs: Add wrapper functions for IWICBitmapCodecInfo methods.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 1d9106bafc66fc9c909365d0e42980f962853390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d9106bafc66fc9c909365d0e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 8 11:16:12 2012 -0500 windowscodecs: Add wrapper functions for IWICBitmapCodecInfo methods. --- dlls/windowscodecs/proxy.c | 48 +++++++++++++++++++++++++++++++++ dlls/windowscodecs/windowscodecs.spec | 16 +++++----- 2 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/proxy.c b/dlls/windowscodecs/proxy.c index 68f0eff..150983f 100644 --- a/dlls/windowscodecs/proxy.c +++ b/dlls/windowscodecs/proxy.c @@ -36,6 +36,54 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +HRESULT WINAPI IWICBitmapCodecInfo_GetContainerFormat_Proxy_W(IWICBitmapCodecInfo *iface, + GUID *pguidContainerFormat) +{ + return IWICBitmapCodecInfo_GetContainerFormat(iface, pguidContainerFormat); +} + +HRESULT WINAPI IWICBitmapCodecInfo_GetDeviceManufacturer_Proxy_W(IWICBitmapCodecInfo *iface, + UINT cchDeviceManufacturer, WCHAR *wzDeviceManufacturer, UINT *pcchActual) +{ + return IWICBitmapCodecInfo_GetDeviceManufacturer(iface, cchDeviceManufacturer, wzDeviceManufacturer, pcchActual); +} + +HRESULT WINAPI IWICBitmapCodecInfo_GetDeviceModels_Proxy_W(IWICBitmapCodecInfo *iface, + UINT cchDeviceModels, WCHAR *wzDeviceModels, UINT *pcchActual) +{ + return IWICBitmapCodecInfo_GetDeviceModels(iface, cchDeviceModels, wzDeviceModels, pcchActual); +} + +HRESULT WINAPI IWICBitmapCodecInfo_GetMimeTypes_Proxy_W(IWICBitmapCodecInfo *iface, + UINT cchMimeTypes, WCHAR *wzMimeTypes, UINT *pcchActual) +{ + return IWICBitmapCodecInfo_GetMimeTypes(iface, cchMimeTypes, wzMimeTypes, pcchActual); +} + +HRESULT WINAPI IWICBitmapCodecInfo_GetFileExtensions_Proxy_W(IWICBitmapCodecInfo *iface, + UINT cchFileExtensions, WCHAR *wzFileExtensions, UINT *pcchActual) +{ + return IWICBitmapCodecInfo_GetFileExtensions(iface, cchFileExtensions, wzFileExtensions, pcchActual); +} + +HRESULT WINAPI IWICBitmapCodecInfo_DoesSupportAnimation_Proxy_W(IWICBitmapCodecInfo *iface, + BOOL *pfSupportAnimation) +{ + return IWICBitmapCodecInfo_DoesSupportAnimation(iface, pfSupportAnimation); +} + +HRESULT WINAPI IWICBitmapCodecInfo_DoesSupportLossless_Proxy_W(IWICBitmapCodecInfo *iface, + BOOL *pfSupportLossless) +{ + return IWICBitmapCodecInfo_DoesSupportLossless(iface, pfSupportLossless); +} + +HRESULT WINAPI IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy_W(IWICBitmapCodecInfo *iface, + BOOL *pfSupportMultiframe) +{ + return IWICBitmapCodecInfo_DoesSupportMultiframe(iface, pfSupportMultiframe); +} + HRESULT WINAPI IWICBitmapFlipRotator_Initialize_Proxy_W(IWICBitmapFlipRotator *iface, IWICBitmapSource *pISource, WICBitmapTransformOptions options) { diff --git a/dlls/windowscodecs/windowscodecs.spec b/dlls/windowscodecs/windowscodecs.spec index 37c365c..aecd87f 100644 --- a/dlls/windowscodecs/windowscodecs.spec +++ b/dlls/windowscodecs/windowscodecs.spec @@ -6,14 +6,14 @@ @ stub IEnumString_Reset_WIC_Proxy @ stub IPropertyBag2_Write_Proxy @ stub IWICBitmapClipper_Initialize_Proxy -@ stub IWICBitmapCodecInfo_DoesSupportAnimation_Proxy -@ stub IWICBitmapCodecInfo_DoesSupportLossless_Proxy -@ stub IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy -@ stub IWICBitmapCodecInfo_GetContainerFormat_Proxy -@ stub IWICBitmapCodecInfo_GetDeviceManufacturer_Proxy -@ stub IWICBitmapCodecInfo_GetDeviceModels_Proxy -@ stub IWICBitmapCodecInfo_GetFileExtensions_Proxy -@ stub IWICBitmapCodecInfo_GetMimeTypes_Proxy +@ stdcall IWICBitmapCodecInfo_DoesSupportAnimation_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportAnimation_Proxy_W +@ stdcall IWICBitmapCodecInfo_DoesSupportLossless_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportLossless_Proxy_W +@ stdcall IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy(ptr ptr) IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy_W +@ stdcall IWICBitmapCodecInfo_GetContainerFormat_Proxy(ptr ptr) IWICBitmapCodecInfo_GetContainerFormat_Proxy_W +@ stdcall IWICBitmapCodecInfo_GetDeviceManufacturer_Proxy(ptr long ptr ptr) IWICBitmapCodecInfo_GetDeviceManufacturer_Proxy_W +@ stdcall IWICBitmapCodecInfo_GetDeviceModels_Proxy(ptr long ptr ptr) IWICBitmapCodecInfo_GetDeviceModels_Proxy_W +@ stdcall IWICBitmapCodecInfo_GetFileExtensions_Proxy(ptr long ptr ptr) IWICBitmapCodecInfo_GetFileExtensions_Proxy_W +@ stdcall IWICBitmapCodecInfo_GetMimeTypes_Proxy(ptr long ptr ptr) IWICBitmapCodecInfo_GetMimeTypes_Proxy_W @ stub IWICBitmapDecoder_CopyPalette_Proxy @ stub IWICBitmapDecoder_GetColorContexts_Proxy @ stub IWICBitmapDecoder_GetDecoderInfo_Proxy

1 0

Józef Kucia : d3dx9: Check the size of a DDS file in D3DXGetImageInfoFromFileInMemory.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: e91300a31859dd6bff624d16844d82b1e64553e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e91300a31859dd6bff624d168… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun May 13 23:00:04 2012 +0200 d3dx9: Check the size of a DDS file in D3DXGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/surface.c | 53 ++++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/surface.c | 15 ++++++++--- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 7556ead..337b513 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -269,6 +269,29 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi return D3DFMT_UNKNOWN; } +static HRESULT calculate_dds_surface_size(const D3DXIMAGE_INFO *img_info, + UINT width, UINT height, UINT *pitch, UINT *size) +{ + const PixelFormatDesc *format_desc = get_format_info(img_info->Format); + if (format_desc->format == D3DFMT_UNKNOWN) + return E_NOTIMPL; + + if (format_desc->block_width != 1 || format_desc->block_height != 1) + { + *pitch = format_desc->block_byte_count + * max(1, (width + format_desc->block_width - 1) / format_desc->block_width); + *size = *pitch + * max(1, (height + format_desc->block_height - 1) / format_desc->block_height); + } + else + { + *pitch = width * format_desc->bytes_per_pixel; + *size = *pitch * height; + } + + return D3D_OK; +} + /************************************************************ * get_image_info_from_dds * @@ -285,9 +308,13 @@ static D3DFORMAT dds_pixel_format_to_d3dformat(const struct dds_pixel_format *pi * Failure: D3DXERR_INVALIDDATA * */ -static HRESULT get_image_info_from_dds(const void *buffer, DWORD length, D3DXIMAGE_INFO *info) +static HRESULT get_image_info_from_dds(const void *buffer, UINT length, D3DXIMAGE_INFO *info) { + UINT i; + UINT faces = 0; + UINT width, height; const struct dds_header *header = buffer; + UINT expected_length = 0; if (length < sizeof(*header) || !info) return D3DXERR_INVALIDDATA; @@ -311,13 +338,37 @@ static HRESULT get_image_info_from_dds(const void *buffer, DWORD length, D3DXIMA } else if (header->caps2 & DDS_CAPS2_CUBEMAP) { + DWORD face; + for (face = DDS_CAPS2_CUBEMAP_POSITIVEX; face <= DDS_CAPS2_CUBEMAP_NEGATIVEZ; face <<= 1) + { + if (header->caps2 & face) + faces++; + } info->ResourceType = D3DRTYPE_CUBETEXTURE; } else { + faces = 1; info->ResourceType = D3DRTYPE_TEXTURE; } + /* calculate the expected length */ + width = info->Width; + height = info->Height; + for (i = 0; i < info->MipLevels; i++) + { + UINT pitch, size = 0; + calculate_dds_surface_size(info, width, height, &pitch, &size); + expected_length += size; + width = max(1, width / 2); + height = max(1, width / 2); + } + + expected_length *= faces; + expected_length += sizeof(*header); + if (length < expected_length) + return D3DXERR_INVALIDDATA; + info->ImageFileFormat = D3DXIFF_DDS; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 3d8ad24..48b1c57 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -404,10 +404,17 @@ static void test_D3DXGetImageInfo(void) check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 16, 0x00ff, 0xff00, 0, 0, D3DFMT_V8U8); check_dds_pixel_format(DDS_PF_BUMPDUDV, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_V16U16); - todo_wine { - hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info); - ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); - } + hr = D3DXGetImageInfoFromFileInMemory(dds_16bit, sizeof(dds_16bit) - 1, &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXGetImageInfoFromFileInMemory(dds_24bit, sizeof(dds_24bit) - 1, &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXGetImageInfoFromFileInMemory(dds_cube_map, sizeof(dds_cube_map) - 1, &info); + ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); + + hr = D3DXGetImageInfoFromFileInMemory(dds_volume_map, sizeof(dds_volume_map) - 1, &info); + todo_wine ok(hr == D3DXERR_INVALIDDATA, "D3DXGetImageInfoFromFileInMemory returned %#x, expected %#x\n", hr, D3DXERR_INVALIDDATA); /* cleanup */

1 0

Jacek Caban : wininet: Fixed typo in tests and accompanying implementation.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 07e5b87feb9f6160eed536a20d17fc81b9f8d284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07e5b87feb9f6160eed536a20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 14 10:41:31 2012 +0200 wininet: Fixed typo in tests and accompanying implementation. --- dlls/wininet/http.c | 5 ++++- dlls/wininet/tests/http.c | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 90cb286..a0b4a62 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3424,7 +3424,10 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, case HTTP_QUERY_STATUS_CODE: { DWORD res = ERROR_SUCCESS; - if(request_only || requested_index) + if(request_only) + return ERROR_HTTP_INVALID_QUERY_REQUEST; + + if(requested_index) break; if(dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) { diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6be48a3..a5c7afe 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -209,15 +209,15 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode) code = 0xdeadbeef; index = 1; size = sizeof(code); - res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, - "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); + "[invalid 1] HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); code = 0xdeadbeef; size = sizeof(code); - res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_REQUEST_HEADERS, &code, &size, NULL); - ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, - "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_REQUEST_HEADERS, &code, &size, NULL); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_INVALID_QUERY_REQUEST, + "[invalid 2] HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); } static int close_handle_cnt;

1 0

Christian Costa : dmusic: COM cleanup of DirectMusicCollection and get rid of separated IUnknown interface .
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: f0324c96651976a290d73d8b2f410d918aaf547f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0324c96651976a290d73d8b2… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:06:30 2012 +0200 dmusic: COM cleanup of DirectMusicCollection and get rid of separated IUnknown interface. --- dlls/dmusic/collection.c | 222 ++++++++++++++++++++++-------------------- dlls/dmusic/dmusic_private.h | 38 ++++---- 2 files changed, 137 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0324c96651976a290d73…

1 0

Christian Costa : dmsynth: Display more info in IDirectMusicSynth8Impl_Download stub.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: e5b9d0dffc1db131951abf85de9ad9676a0e3b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5b9d0dffc1db131951abf85d… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:11:55 2012 +0200 dmsynth: Display more info in IDirectMusicSynth8Impl_Download stub. --- dlls/dmsynth/synth.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index d5288b4..29761d7 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -123,9 +123,52 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetNumChannelGroups(LPDIRECTMUSICSY static HRESULT WINAPI IDirectMusicSynth8Impl_Download(LPDIRECTMUSICSYNTH8 iface, LPHANDLE hDownload, LPVOID data, LPBOOL free) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + DMUS_DOWNLOADINFO* info = (DMUS_DOWNLOADINFO*)data; FIXME("(%p)->(%p, %p, %p): stub\n", This, hDownload, data, free); + if (!hDownload || !data || !free) + return E_POINTER; + + if (TRACE_ON(dmsynth)) + { + TRACE("Dump DMUS_DOWNLOADINFO struct:\n"); + TRACE(" - dwDLType = %u\n", info->dwDLType); + TRACE(" - dwDLId = %u\n", info->dwDLId); + TRACE(" - dwNumOffsetTableEntries = %u\n", info->dwNumOffsetTableEntries); + TRACE(" - cbSize = %u\n", info->cbSize); + } + + if (info->dwDLType == DMUS_DOWNLOADINFO_INSTRUMENT) + { + FIXME("Download type DMUS_DOWNLOADINFO_INSTRUMENT not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_WAVE) + { + FIXME("Download type DMUS_DOWNLOADINFO_WAVE not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_INSTRUMENT2) + { + FIXME("Download type DMUS_DOWNLOADINFO_INSTRUMENT2 not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_WAVEARTICULATION) + { + FIXME("Download type DMUS_DOWNLOADINFO_WAVEARTICULATION not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_STREAMINGWAVE) + { + FIXME("Download type DMUS_DOWNLOADINFO_STREAMINGWAVE not yet supported\n"); + } + else if (info->dwDLType == DMUS_DOWNLOADINFO_ONESHOTWAVE) + { + FIXME("Download type DMUS_DOWNLOADINFO_ONESHOTWAVE not yet supported\n"); + } + else + { + WARN("Unknown download type %u\n", info->dwDLType); + return DMUS_E_UNKNOWNDOWNLOAD; + } + return S_OK; }

1 0

Francois Gouget : po: English (neutral / Great Britain) spelling fixes.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 953beaee864b06e6cb1517c12210eb07fa61d59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=953beaee864b06e6cb1517c12… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 14 00:46:38 2012 +0200 po: English (neutral / Great Britain) spelling fixes. --- po/en.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/en.po b/po/en.po index 76edbc7..0c41a12 100644 --- a/po/en.po +++ b/po/en.po @@ -6868,7 +6868,7 @@ msgstr "status bar" #: oleacc.rc:51 msgid "table" -msgstr "Table" +msgstr "table" #: oleacc.rc:52 msgid "column header" @@ -8127,16 +8127,16 @@ msgid "" "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" "Wine 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) " +"terms of the GNU Lesser General Public Licence as published by the Free " +"Software Foundation; either version 2.1 of the Licence, or (at your option) " "any later version.\n" "\n" "Wine 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 " +"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public Licence for more " "details.\n" "\n" -"You should have received a copy of the GNU Lesser General Public License " +"You should have received a copy of the GNU Lesser General Public Licence " "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." @@ -10626,7 +10626,7 @@ msgstr "Bind to file via a File Moniker" #: oleview.rc:104 msgid "Open a TypeLib file and view the contents" -msgstr "Open a TypeLib file and view the " +msgstr "Open a TypeLib file and view the contents" #: oleview.rc:105 msgid "Change machine wide Distributed COM settings" @@ -12325,8 +12325,8 @@ msgid "" "option) any later version." msgstr "" "This program 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 " +"under the terms of the GNU Lesser General Public Licence as published by the " +"Free Software Foundation; either version 2.1 of the Licence, or (at your " "option) any later version." #: winecfg.rc:134

1 0

Alexandre Julliard : kernel32/tests: Avoid a non-portable printf format.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 5d770503b9b9fc6e61147fd84d23e18390e22064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d770503b9b9fc6e61147fd84… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 14 14:15:53 2012 +0200 kernel32/tests: Avoid a non-portable printf format. --- dlls/kernel32/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 9cfb664..8768b99 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -796,7 +796,7 @@ static void dumpmem(unsigned char *mem, int len) p = hex; c = txt; do { - p += sprintf(p, "%02hhx ", mem[x]); + p += sprintf(p, "%02x ", mem[x]); *c++ = (mem[x] >= 32 && mem[x] <= 127) ? mem[x] : '.'; } while (++x % 16 && x < len); *c = '\0';

1 0

Christian Costa : dmusic: Implement IDirectMusicBuffer_SetUsedBytes.
by Alexandre Julliard May 14, 2012

May 14, 2012

Module: wine Branch: master Commit: 19cb2d2171ceeb5a5cb71501e4172d64fb67c8fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=19cb2d2171ceeb5a5cb71501e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon May 14 08:06:39 2012 +0200 dmusic: Implement IDirectMusicBuffer_SetUsedBytes. --- dlls/dmusic/buffer.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 2fd76b5..35cbd88 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -1,6 +1,8 @@ -/* IDirectMusicBuffer Implementation +/* + * IDirectMusicBuffer Implementation * * Copyright (C) 2003-2004 Rok Mandeljc + * Copyright (C) 2012 Christian Costa * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -241,11 +243,16 @@ static HRESULT WINAPI IDirectMusicBufferImpl_SetStartTime(LPDIRECTMUSICBUFFER if return S_OK; } -static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, DWORD cb) +static HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes(LPDIRECTMUSICBUFFER iface, DWORD used_bytes) { IDirectMusicBufferImpl *This = impl_from_IDirectMusicBuffer(iface); - FIXME("(%p, %d): stub\n", This, cb); + TRACE("(%p)->(%u)\n", iface, used_bytes); + + if (used_bytes > This->size) + return DMUS_E_BUFFER_FULL; + + This->write_pos = used_bytes; return S_OK; }

1 0