wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

Jacek Caban : d3d10core: Use proper helpers for iface calls.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 57074556d2d8512a827a788444b54f82131ed2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=57074556d2d8512a827a78844… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:10:45 2012 +0200 d3d10core: Use proper helpers for iface calls. --- dlls/d3d10core/tests/device.c | 2 +- dlls/d3d10core/texture.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b0907ba..57a61c4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -367,7 +367,7 @@ float4 main(const float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), &ps); ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x\n", hr); if (ps) - ID3D10VertexShader_Release(ps); + ID3D10PixelShader_Release(ps); } START_TEST(device) diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index 718d019..41bd80f 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -50,7 +50,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D if (This->dxgi_surface) { TRACE("Forwarding to dxgi surface\n"); - return IDXGISurface_QueryInterface(This->dxgi_surface, riid, object); + return IUnknown_QueryInterface(This->dxgi_surface, riid, object); } WARN("%s not implemented, returning E_NOINTERFACE\n", debugstr_guid(riid)); @@ -76,7 +76,7 @@ static void STDMETHODCALLTYPE d3d10_texture2d_wined3d_object_released(void *pare { struct d3d10_texture2d *This = parent; - if (This->dxgi_surface) IDXGISurface_Release(This->dxgi_surface); + if (This->dxgi_surface) IUnknown_Release(This->dxgi_surface); HeapFree(GetProcessHeap(), 0, This); } @@ -270,7 +270,7 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic { WARN("Failed to create wined3d texture, hr %#x.\n", hr); if (texture->dxgi_surface) - IDXGISurface_Release(texture->dxgi_surface); + IUnknown_Release(texture->dxgi_surface); return hr; }

1 0

Jacek Caban : windowscodecs/tests: Use proper helpers for iface calls.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: cbf155afe12a80327686c314225db772ba75ff8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbf155afe12a80327686c3142… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:10:35 2012 +0200 windowscodecs/tests: Use proper helpers for iface calls. --- dlls/windowscodecs/tests/metadata.c | 2 +- dlls/windowscodecs/tests/stream.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index d3b2869..acd9255 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -939,7 +939,7 @@ static void test_metadata_png(void) IWICBitmapDecoder_Release(decoder); - IWICStream_Release(stream); + IStream_Release(stream); } START_TEST(metadata) diff --git a/dlls/windowscodecs/tests/stream.c b/dlls/windowscodecs/tests/stream.c index a3295e6..5f311b8 100644 --- a/dlls/windowscodecs/tests/stream.c +++ b/dlls/windowscodecs/tests/stream.c @@ -379,7 +379,7 @@ static void test_StreamOnMemory(void) IWICStream_Release(pStream); - IWICStream_Release(pFactory); + IWICImagingFactory_Release(pFactory); CoUninitialize(); } @@ -641,7 +641,7 @@ static void test_StreamOnStreamRange(void) hr = IWICStream_CopyTo(pSubStream, CopyStream, uNewPos, NULL, NULL); ok(hr == E_NOTIMPL, "CopyTo returned %#x, expected %#x\n", hr, E_NOTIMPL); - IWICStream_Release(CopyStream); + IStream_Release(CopyStream); /* Commit */ @@ -733,7 +733,7 @@ static void test_StreamOnStreamRange(void) IWICStream_Release(pSubStream); IWICStream_Release(pStream); - IWICStream_Release(pFactory); + IWICImagingFactory_Release(pFactory); CoUninitialize(); }

1 0

Jacek Caban : d3d9/tests: Use proper helpers for iface calls.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 9bb70e27399b3c399ee2a52a2f4e75583f70aaaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bb70e27399b3c399ee2a52a2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 28 11:10:25 2012 +0200 d3d9/tests: Use proper helpers for iface calls. --- dlls/d3d9/tests/device.c | 12 ++++++------ dlls/d3d9/tests/stateblock.c | 18 +++++++++--------- dlls/d3d9/tests/surface.c | 2 +- dlls/d3d9/tests/vertexdeclaration.c | 10 +++++----- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7994a2a..8fd72cf 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -107,7 +107,7 @@ static HRESULT reset_device(IDirect3DDevice9 *device, HWND device_window, BOOL w #define CHECK_RELEASE(obj,d,rc) \ if (obj) { \ int tmp1, rc_new = rc; \ - IUnknown_Release( obj ); \ + IUnknown_Release( (IUnknown*)obj ); \ tmp1 = get_refcount( (IUnknown *)d ); \ ok(tmp1 == rc_new, "Invalid refcount. Expected %d got %d\n", rc_new, tmp1); \ } @@ -154,7 +154,7 @@ static void check_mipmap_levels(IDirect3DDevice9 *device, UINT width, UINT heigh } else trace("CreateTexture failed: %08x\n", hr); - if (texture) IUnknown_Release( texture ); + if (texture) IDirect3DBaseTexture9_Release( texture ); } static void test_mipmap_levels(void) @@ -196,10 +196,10 @@ static void test_mipmap_levels(void) cleanup: if (pDevice) { - UINT refcount = IUnknown_Release( pDevice ); + UINT refcount = IDirect3DDevice9_Release( pDevice ); ok(!refcount, "Device has %u references left.\n", refcount); } - if (pD3d) IUnknown_Release( pD3d ); + if (pD3d) IDirect3D9_Release( pD3d ); DestroyWindow( hwnd ); } @@ -255,10 +255,10 @@ static void test_checkdevicemultisampletype(void) cleanup: if (pDevice) { - UINT refcount = IUnknown_Release( pDevice ); + UINT refcount = IDirect3DDevice9_Release( pDevice ); ok(!refcount, "Device has %u references left.\n", refcount); } - if (pD3d) IUnknown_Release( pD3d ); + if (pD3d) IDirect3D9_Release( pD3d ); DestroyWindow( hwnd ); } diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index e33c7b4..0e05f7b 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -281,13 +281,13 @@ static int switch_render_target(IDirect3DDevice9 *device, struct event_data *eve ok (hret == D3D_OK, "SetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) goto error; - IUnknown_Release(backbuffer); + IDirect3DSurface9_Release(backbuffer); event_data->new_swap_chain = swapchain; return EVENT_OK; error: - if (backbuffer) IUnknown_Release(backbuffer); - if (swapchain) IUnknown_Release(swapchain); + if (backbuffer) IDirect3DSurface9_Release(backbuffer); + if (swapchain) IDirect3DSwapChain9_Release(swapchain); return EVENT_ERROR; } @@ -299,12 +299,12 @@ static int revert_render_target(IDirect3DDevice9 *device, struct event_data *eve hret = IDirect3DDevice9_SetRenderTarget(device, 0, event_data->original_render_target); ok (hret == D3D_OK, "SetRenderTarget returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(event_data->original_render_target); + IDirect3DSurface9_Release(event_data->original_render_target); return EVENT_ERROR; } - IUnknown_Release(event_data->original_render_target); - IUnknown_Release(event_data->new_swap_chain); + IDirect3DSurface9_Release(event_data->original_render_target); + IDirect3DSwapChain9_Release(event_data->new_swap_chain); return EVENT_OK; } @@ -361,7 +361,7 @@ static int end_stateblock(IDirect3DDevice9 *device, struct event_data *event_dat static int release_stateblock(IDirect3DDevice9 *device, struct event_data *event_data) { - IUnknown_Release(event_data->stateblock); + IDirect3DStateBlock9_Release(event_data->stateblock); return EVENT_OK; } @@ -372,11 +372,11 @@ static int apply_stateblock(IDirect3DDevice9 *device, struct event_data *event_d hret = IDirect3DStateBlock9_Apply(event_data->stateblock); ok(hret == D3D_OK, "Apply returned %#x.\n", hret); if (hret != D3D_OK) { - IUnknown_Release(event_data->stateblock); + IDirect3DStateBlock9_Release(event_data->stateblock); return EVENT_ERROR; } - IUnknown_Release(event_data->stateblock); + IDirect3DStateBlock9_Release(event_data->stateblock); return EVENT_OK; } diff --git a/dlls/d3d9/tests/surface.c b/dlls/d3d9/tests/surface.c index ac1a287..36d2dac 100644 --- a/dlls/d3d9/tests/surface.c +++ b/dlls/d3d9/tests/surface.c @@ -181,7 +181,7 @@ static void test_surface_alignment(IDirect3DDevice9 *device_ptr) ok(rc.Pitch == pitch, "Wrong pitch for DXT%d lvl[%d (%dx%d)]: expected %d got %d\n", i + 1, j, descr.Width, descr.Height, pitch, rc.Pitch); } - IUnknown_Release( pTexture ); + IDirect3DTexture9_Release( pTexture ); } } diff --git a/dlls/d3d9/tests/vertexdeclaration.c b/dlls/d3d9/tests/vertexdeclaration.c index 9d507a1..04a4289 100644 --- a/dlls/d3d9/tests/vertexdeclaration.c +++ b/dlls/d3d9/tests/vertexdeclaration.c @@ -267,11 +267,11 @@ static HRESULT test_fvf_to_decl(IDirect3DDevice9 *device, IDirect3DVertexDeclara else if (compare_elements(result_decl, expected_elements) != S_OK) goto fail; - if (result_decl) IUnknown_Release( result_decl ); + if (result_decl) IDirect3DVertexDeclaration9_Release( result_decl ); return S_OK; fail: - if (result_decl) IUnknown_Release( result_decl ); + if (result_decl) IDirect3DVertexDeclaration9_Release( result_decl ); return E_FAIL; } @@ -308,12 +308,12 @@ static HRESULT test_decl_to_fvf(IDirect3DDevice9* device, DWORD default_fvf, if (test_fvf != result_fvf) goto fail; IDirect3DDevice9_SetVertexDeclaration ( device, NULL ); - if (vdecl) IUnknown_Release( vdecl ); + if (vdecl) IDirect3DVertexDeclaration9_Release( vdecl ); return S_OK; fail: IDirect3DDevice9_SetVertexDeclaration ( device, NULL ); - if (vdecl) IUnknown_Release( vdecl ); + if (vdecl) IDirect3DVertexDeclaration9_Release( vdecl ); return E_FAIL; } @@ -644,7 +644,7 @@ static void test_fvf_decl_conversion(IDirect3DDevice9 *pDevice) cleanup: IDirect3DDevice9_SetVertexDeclaration ( pDevice, NULL ); - if ( default_decl ) IUnknown_Release (default_decl); + if ( default_decl ) IDirect3DVertexDeclaration9_Release (default_decl); } /* Check whether a declaration converted from FVF is shared.

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 242f9acdf6cc9282332e9be235c1b7eae852964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=242f9acdf6cc9282332e9be23… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Aug 27 11:17:11 2012 +0900 po: Update Korean translation. --- po/ko.po | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/po/ko.po b/po/ko.po index 510ac6b..1513900 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3437,6 +3437,8 @@ msgid "" "After disabling or enabling a device, the connected joysticks won't be " "updated here until you restart this applet." msgstr "" +"장치를 사용하거나 안사용하게 한 후에, 연결된 조이스틱은 애플랫을 다시 시작하" +"기까지는 작동하지 않을 것입니다." #: joy.rc:47 msgid "Test Joystick"

1 0

Lucas Zawacki : dinput: BuildActionMap should not fail if mapping has no pre-stored settings.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: d5e9cedaf5c598cf4411ffecb4fff7678f3832ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e9cedaf5c598cf4411ffecb… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 28 02:23:03 2012 -0300 dinput: BuildActionMap should not fail if mapping has no pre-stored settings. --- dlls/dinput/device.c | 7 ++++--- dlls/dinput8/tests/device.c | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 098efb7..b3875a8 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -674,7 +674,7 @@ static BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMAT HKEY hkey; WCHAR *guid_str; DIDEVICEINSTANCEW didev; - int i; + int i, mapped = 0; didev.dwSize = sizeof(didev); IDirectInputDevice8_GetDeviceInfo(&This->IDirectInputDevice8W_iface, &didev); @@ -703,14 +703,15 @@ static BOOL load_mapping_settings(IDirectInputDeviceImpl *This, LPDIACTIONFORMAT { lpdiaf->rgoAction[i].dwObjID = id; lpdiaf->rgoAction[i].guidInstance = didev.guidInstance; - lpdiaf->rgoAction[i].dwHow = DIAH_USERCONFIG; + lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT; + mapped += 1; } } RegCloseKey(hkey); CoTaskMemFree(guid_str); - return TRUE; + return mapped > 0; } HRESULT _build_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, DWORD dwFlags, DWORD devMask, LPCDIDATAFORMAT df) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 2140388..c211594 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -447,13 +447,13 @@ static void test_save_settings(void) hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, 0); ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); - todo_wine ok (results[0] == af.rgoAction[0].dwObjID, + ok (results[0] == af.rgoAction[0].dwObjID, "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[0], af.rgoAction[0].dwObjID); - todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); + ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); - todo_wine ok (results[1] == af.rgoAction[1].dwObjID, + ok (results[1] == af.rgoAction[1].dwObjID, "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID); - todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); + ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); af.guidActionMap = mapping_guid; /* Hard case. Customized mapping, save, ask for previous map and read it back */

1 0

Lucas Zawacki : dinput8/tests: Test load actions when there' s no pre-stored ones.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 851d38c4eff4f1e3499835db2fbc438675bb2eca URL: http://source.winehq.org/git/wine.git/?a=commit;h=851d38c4eff4f1e3499835db2… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Aug 28 02:23:02 2012 -0300 dinput8/tests: Test load actions when there's no pre-stored ones. --- dlls/dinput8/tests/device.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 76f9120..2140388 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -351,6 +351,8 @@ static void test_save_settings(void) IDirectInputDevice8A *pKey; static const GUID mapping_guid = { 0xcafecafe, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; + static const GUID other_guid = { 0xcafe, 0xcafe, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } }; + static DIACTION actions[] = { { 0, DIKEYBOARD_A , 0, { "Blam" } }, { 1, DIKEYBOARD_B , 0, { "Kapow"} } @@ -433,6 +435,27 @@ static void test_save_settings(void) "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID); ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); + /* Test that a different action map with no pre-stored settings, in spite of the flags, + does not try to load mappings and instead applies the default mapping */ + af.guidActionMap = other_guid; + + af.rgoAction[0].dwObjID = 0; + af.rgoAction[1].dwObjID = 0; + memset(&af.rgoAction[0].guidInstance, 0, sizeof(GUID)); + memset(&af.rgoAction[1].guidInstance, 0, sizeof(GUID)); + + hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, 0); + ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr); + + todo_wine ok (results[0] == af.rgoAction[0].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[0], af.rgoAction[0].dwObjID); + todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[0].guidInstance), "Action should be mapped to keyboard\n"); + + todo_wine ok (results[1] == af.rgoAction[1].dwObjID, + "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", results[1], af.rgoAction[1].dwObjID); + todo_wine ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n"); + + af.guidActionMap = mapping_guid; /* Hard case. Customized mapping, save, ask for previous map and read it back */ af.rgoAction[0].dwObjID = other_results[0]; af.rgoAction[0].dwHow = DIAH_USERCONFIG;

1 0

Francois Gouget : msvcp100: Remove some unused functions.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: c19855bc967f8f05be38b1f7820c62444a5816ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19855bc967f8f05be38b1f78… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 28 00:41:40 2012 +0200 msvcp100: Remove some unused functions. --- dlls/msvcp100/ios.c | 588 ------------------------------------- dlls/msvcp100/locale.c | 139 --------- dlls/msvcp100/math.c | 81 ----- dlls/msvcp100/msvcp.h | 1 - dlls/msvcp100/string.c | 762 ------------------------------------------------ 5 files changed, 0 insertions(+), 1571 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c19855bc967f8f05be38b…

1 0

Francois Gouget : msvcp100: Make some locale and string functions static.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: d2fc8007d2356af4c8ee32b4ed24adadcf8fb1be URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fc8007d2356af4c8ee32b4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 28 00:40:39 2012 +0200 msvcp100: Make some locale and string functions static. --- dlls/msvcp100/locale.c | 14 +++++++------- dlls/msvcp100/string.c | 38 +++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2fc8007d2356af4c8ee3…

1 0

Vincent Povirk : ole32: Fix typo.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 284f3cc04746997727bee6e9c2aa7de76f1efecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=284f3cc04746997727bee6e9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 27 17:28:56 2012 -0500 ole32: Fix typo. --- dlls/ole32/stg_prop.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index d7d340f..98f562d 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1093,7 +1093,7 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, DWORD count; StorageUtl_ReadDWord(data, 0, &count); - if (codepage == CP_UNICODE && count / 2) + if (codepage == CP_UNICODE && count % 2) { WARN("Unicode string has odd number of bytes\n"); hr = STG_E_INVALIDHEADER;

1 0

Vincent Povirk : ole32: Add support for reading BSTR properties.
by Alexandre Julliard 28 Aug '12

28 Aug '12

Module: wine Branch: master Commit: 0a5086ab64f2c35e2f462cf4e77118733a80f2a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5086ab64f2c35e2f462cf4e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 27 17:28:23 2012 -0500 ole32: Add support for reading BSTR properties. --- dlls/ole32/stg_prop.c | 35 +++++++++++++++++++++++++++++++++++ dlls/ole32/tests/propvariant.c | 10 ++++------ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 103f145..d7d340f 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -58,6 +58,7 @@ #include "dictionary.h" #include "storage32.h" #include "enumx.h" +#include "oleauto.h" WINE_DEFAULT_DEBUG_CHANNEL(storage); @@ -1125,6 +1126,40 @@ static HRESULT PropertyStorage_ReadProperty(PROPVARIANT *prop, const BYTE *data, } break; } + case VT_BSTR: + { + DWORD count, wcount; + + StorageUtl_ReadDWord(data, 0, &count); + if (codepage == CP_UNICODE && count % 2) + { + WARN("Unicode string has odd number of bytes\n"); + hr = STG_E_INVALIDHEADER; + } + else + { + if (codepage == CP_UNICODE) + wcount = count / 2; + else + wcount = MultiByteToWideChar(codepage, 0, (LPCSTR)(data + sizeof(DWORD)), count, NULL, 0); + + prop->u.bstrVal = SysAllocStringLen(NULL, wcount); /* FIXME: use allocator? */ + + if (prop->u.bstrVal) + { + if (codepage == CP_UNICODE) + memcpy(prop->u.bstrVal, data + sizeof(DWORD), count); + else + MultiByteToWideChar(codepage, 0, (LPCSTR)(data + sizeof(DWORD)), count, prop->u.bstrVal, wcount); + + prop->u.bstrVal[wcount - 1] = '\0'; + TRACE("Read string value %s\n", debugstr_w(prop->u.bstrVal)); + } + else + hr = STG_E_INSUFFICIENTMEMORY; + } + break; + } case VT_BLOB: { DWORD count; diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index ec1dfd7..5f7adba 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -395,18 +395,16 @@ static void test_propertytovariant(void) CP_WINUNICODE, &propvar, &allocator); ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); - todo_wine ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); - if (propvar.vt == VT_BSTR) - ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); + ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); + ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); PropVariantClear(&propvar); ret = pStgConvertPropertyToVariant((SERIALIZEDPROPERTYVALUE*)serialized_bstr_mb, CP_UTF8, &propvar, &allocator); ok(ret == 0, "StgConvertPropertyToVariant returned %i\n", ret); - todo_wine ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); - if (propvar.vt == VT_BSTR) - ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); + ok(propvar.vt == VT_BSTR, "unexpected vt %x\n", propvar.vt); + ok(!lstrcmpW(U(propvar).bstrVal, test_string), "unexpected string value\n"); PropVariantClear(&propvar); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2012