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

Stefan Dösinger : d3d9/tests: d3d9ex video memory accounting tests.
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: 30e9a37bbbde8290a79b19f2b60fb8ffbf561fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e9a37bbbde8290a79b19f2b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 21 13:18:21 2013 +0200 d3d9/tests: d3d9ex video memory accounting tests. --- dlls/d3d9/tests/d3d9ex.c | 49 ++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/device.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5e5524e..2deef76 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -908,6 +908,54 @@ done: DestroyWindow(window); } +static void test_vidmem_accounting(void) +{ + IDirect3DDevice9Ex *device; + unsigned int i; + HWND window; + HRESULT hr = D3D_OK; + ULONG ref; + UINT vidmem_start, vidmem_end; + INT diff; + IDirect3DTexture9 *textures[20]; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + vidmem_start = IDirect3DDevice9_GetAvailableTextureMem(device); + memset(textures, 0, sizeof(textures)); + for (i = 0; i < 20 && SUCCEEDED(hr); i++) + { + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &textures[i], NULL); + /* No D3DERR_OUTOFVIDEOMEMORY in d3d9ex */ + ok(SUCCEEDED(hr) || hr == E_OUTOFMEMORY, "Failed to create texture, hr %#x.\n", hr); + } + vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device); + + diff = vidmem_start - vidmem_end; + diff = abs(diff); + ok(diff < 1024 * 1024, "Expected a video memory difference of less than 1 MB, got %u MB.\n", + diff / 1024 / 1024); + + for (i = 0; i < 20; i++) + { + if (textures[i]) + IDirect3DTexture9_Release(textures[i]); + } + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + DestroyWindow(window); +} + START_TEST(d3d9ex) { d3d9_handle = LoadLibraryA("d3d9.dll"); @@ -935,4 +983,5 @@ START_TEST(d3d9ex) test_texture_sysmem_create(); test_reset(); test_reset_resources(); + test_vidmem_accounting(); } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3283a6e..abf565a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6396,6 +6396,63 @@ done: } +static void test_vidmem_accounting(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + HWND window; + HRESULT hr = D3D_OK; + IDirect3DTexture9 *textures[20]; + unsigned int i; + UINT vidmem_start, vidmem_end, diff; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + vidmem_start = IDirect3DDevice9_GetAvailableTextureMem(device); + memset(textures, 0, sizeof(textures)); + for (i = 0; i < sizeof(textures) / sizeof(*textures) && SUCCEEDED(hr); i++) + { + hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &textures[i], NULL); + /* D3DERR_OUTOFVIDEOMEMORY is returned when the card runs out of video memory + * E_FAIL is returned on address space or system memory exhaustion */ + ok(SUCCEEDED(hr) || hr == D3DERR_OUTOFVIDEOMEMORY || hr == E_OUTOFMEMORY, + "Failed to create texture, hr %#x.\n", hr); + } + vidmem_end = IDirect3DDevice9_GetAvailableTextureMem(device); + + ok(vidmem_start > vidmem_end, "Expected available texture memory to decrease during texture creation.\n"); + diff = vidmem_start - vidmem_end; + ok(diff > 1024 * 1024 * 2 * i, "Expected a video memory difference of at least %u MB, got %u MB.\n", + 2 * i, diff / 1024 / 1024); + + for (i = 0; i < sizeof(textures) / sizeof(*textures); i++) + { + if (textures[i]) + IDirect3DTexture9_Release(textures[i]); + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6485,6 +6542,7 @@ START_TEST(device) test_swvp_buffer(); test_rtpatch(); test_npot_textures(); + test_vidmem_accounting(); } out:

1 0

Daniel Jelinski : kernel32: Improved stub for GetCalendarInfo' s CAL_SCALNAME.
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: debd62cf9fbd63c04599c77696c8fa603de8238b URL: http://source.winehq.org/git/wine.git/?a=commit;h=debd62cf9fbd63c04599c7769… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Mon May 20 22:37:56 2013 +0200 kernel32: Improved stub for GetCalendarInfo's CAL_SCALNAME. Based on patch by Mike Blumenkrantz. --- dlls/kernel32/time.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 63dfc93..a1875f4 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -674,7 +674,8 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, return GetLocaleInfoW(Locale, LOCALE_ICALENDARTYPE, lpCalData, cchData); case CAL_SCALNAME: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return 0; + if (lpCalData) *lpCalData = 0; + return 1; case CAL_IYEAROFFSETRANGE: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); return 0;

1 0

Andrew Eikum : dinput: Implement force feedback functions for OSX joysticks .
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: 3de75b1e95187c6d1d68fe35f064cbea7edef3c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de75b1e95187c6d1d68fe35f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 20 14:10:33 2013 -0500 dinput: Implement force feedback functions for OSX joysticks. --- dlls/dinput/joystick_osx.c | 230 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 228 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 66a4acb..0d3927a 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -111,6 +111,7 @@ struct JoystickImpl CFMutableArrayRef elementCFArrayRef; ObjProps **propmap; FFDeviceObjectReference ff; + struct list effects; }; static inline JoystickImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) @@ -124,6 +125,24 @@ static inline JoystickImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W JoystickGenericImpl, base), JoystickImpl, generic); } +typedef struct _EffectImpl { + IDirectInputEffect IDirectInputEffect_iface; + LONG ref; + + JoystickImpl *device; + FFEffectObjectReference effect; + GUID guid; + + struct list entry; +} EffectImpl; + +static EffectImpl *impl_from_IDirectInputEffect(IDirectInputEffect *iface) +{ + return CONTAINING_RECORD(iface, EffectImpl, IDirectInputEffect_iface); +} + +static const IDirectInputEffectVtbl EffectVtbl; + static const GUID DInput_Wine_OsX_Joystick_GUID = { /* 59CAD8F6-E617-41E2-8EB7-47B23EEEDC5A */ 0x59CAD8F6, 0xE617, 0x41E2, {0x8E, 0xB7, 0x47, 0xB2, 0x3E, 0xEE, 0xDC, 0x5A} }; @@ -831,6 +850,7 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, newDevice->generic.name = HeapAlloc(GetProcessHeap(),0,strlen(name) + 1); strcpy(newDevice->generic.name, name); + list_init(&newDevice->effects); device = get_device_ref(index); if(get_ff(device, &newDevice->ff) == S_OK){ newDevice->generic.devcaps.dwFlags |= DIDC_FORCEFEEDBACK; @@ -1038,6 +1058,82 @@ static HRESULT joydev_create_device(IDirectInputImpl *dinput, REFGUID rguid, REF return DIERR_DEVICENOTREG; } +static CFUUIDRef effect_win_to_mac(const GUID *effect) +{ +#define DO_MAP(X) \ + if(IsEqualGUID(&GUID_##X, effect)) \ + return kFFEffectType_##X##_ID; + DO_MAP(ConstantForce) + DO_MAP(RampForce) + DO_MAP(Square) + DO_MAP(Sine) + DO_MAP(Triangle) + DO_MAP(SawtoothUp) + DO_MAP(SawtoothDown) + DO_MAP(Spring) + DO_MAP(Damper) + DO_MAP(Inertia) + DO_MAP(Friction) + DO_MAP(CustomForce) +#undef DO_MAP + WARN("Unknown effect GUID! %s\n", debugstr_guid(effect)); + return 0; +} + +static HRESULT WINAPI JoystickWImpl_CreateEffect(IDirectInputDevice8W *iface, + const GUID *type, const DIEFFECT *params, IDirectInputEffect **out, + IUnknown *outer) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8W(iface); + EffectImpl *effect; + HRESULT hr; + + TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + + if(!This->ff){ + TRACE("No force feedback support\n"); + *out = NULL; + return S_OK; + } + + if(outer) + WARN("aggregation not implemented\n"); + + effect = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); + effect->IDirectInputEffect_iface.lpVtbl = &EffectVtbl; + effect->ref = 1; + effect->guid = *type; + effect->device = This; + + /* Mac's FFEFFECT and Win's DIEFFECT are binary identical. */ + hr = FFDeviceCreateEffect(This->ff, effect_win_to_mac(type), + (FFEFFECT*)params, &effect->effect); + if(FAILED(hr)){ + WARN("FFDeviceCreateEffect failed: %08x\n", hr); + HeapFree(GetProcessHeap(), 0, effect); + return hr; + } + + list_add_tail(&This->effects, &effect->entry); + *out = &effect->IDirectInputEffect_iface; + + TRACE("allocated effect: %p\n", effect); + + return S_OK; +} + +static HRESULT WINAPI JoystickAImpl_CreateEffect(IDirectInputDevice8A *iface, + const GUID *type, const DIEFFECT *params, IDirectInputEffect **out, + IUnknown *outer) +{ + JoystickImpl *This = impl_from_IDirectInputDevice8A(iface); + + TRACE("%p %s %p %p %p\n", iface, debugstr_guid(type), params, out, outer); + + return JoystickWImpl_CreateEffect(&This->generic.base.IDirectInputDevice8W_iface, + type, params, out, outer); +} + const struct dinput_device joystick_osx_device = { "Wine OS X joystick driver", joydev_enum_deviceA, @@ -1065,7 +1161,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = JoystickAGenericImpl_GetDeviceInfo, IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, - IDirectInputDevice2AImpl_CreateEffect, + JoystickAImpl_CreateEffect, IDirectInputDevice2AImpl_EnumEffects, IDirectInputDevice2AImpl_GetEffectInfo, IDirectInputDevice2AImpl_GetForceFeedbackState, @@ -1101,7 +1197,7 @@ static const IDirectInputDevice8WVtbl JoystickWvt = JoystickWGenericImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, - IDirectInputDevice2WImpl_CreateEffect, + JoystickWImpl_CreateEffect, IDirectInputDevice2WImpl_EnumEffects, IDirectInputDevice2WImpl_GetEffectInfo, IDirectInputDevice2WImpl_GetForceFeedbackState, @@ -1117,6 +1213,136 @@ static const IDirectInputDevice8WVtbl JoystickWvt = IDirectInputDevice8WImpl_GetImageInfo }; +static HRESULT WINAPI effect_QueryInterface(IDirectInputEffect *iface, + const GUID *guid, void **out) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + + TRACE("%p %s %p\n", This, debugstr_guid(guid), out); + + if(IsEqualIID(guid, &IID_IDirectInputEffect)){ + *out = iface; + IDirectInputEffect_AddRef(iface); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI effect_AddRef(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("%p, ref is now: %u\n", This, ref); + return ref; +} + +static ULONG WINAPI effect_Release(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("%p, ref is now: %u\n", This, ref); + + if(!ref){ + list_remove(&This->entry); + FFDeviceReleaseEffect(This->device->ff, This->effect); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI effect_Initialize(IDirectInputEffect *iface, HINSTANCE hinst, + DWORD version, const GUID *guid) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p 0x%x, %s\n", This, hinst, version, debugstr_guid(guid)); + return S_OK; +} + +static HRESULT WINAPI effect_GetEffectGuid(IDirectInputEffect *iface, GUID *out) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p\n", This, out); + *out = This->guid; + return S_OK; +} + +static HRESULT WINAPI effect_GetParameters(IDirectInputEffect *iface, + DIEFFECT *effect, DWORD flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p 0x%x\n", This, effect, flags); + return FFEffectGetParameters(This->effect, (FFEFFECT*)effect, flags); +} + +static HRESULT WINAPI effect_SetParameters(IDirectInputEffect *iface, + const DIEFFECT *effect, DWORD flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p 0x%x\n", This, effect, flags); + return FFEffectSetParameters(This->effect, (FFEFFECT*)effect, flags); +} + +static HRESULT WINAPI effect_Start(IDirectInputEffect *iface, DWORD iterations, + DWORD flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p 0x%x 0x%x\n", This, iterations, flags); + return FFEffectStart(This->effect, iterations, flags); +} + +static HRESULT WINAPI effect_Stop(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p\n", This); + return FFEffectStop(This->effect); +} + +static HRESULT WINAPI effect_GetEffectStatus(IDirectInputEffect *iface, DWORD *flags) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p\n", This, flags); + return FFEffectGetEffectStatus(This->effect, (UInt32*)flags); +} + +static HRESULT WINAPI effect_Download(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p\n", This); + return FFEffectDownload(This->effect); +} + +static HRESULT WINAPI effect_Unload(IDirectInputEffect *iface) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p\n", This); + return FFEffectUnload(This->effect); +} + +static HRESULT WINAPI effect_Escape(IDirectInputEffect *iface, DIEFFESCAPE *escape) +{ + EffectImpl *This = impl_from_IDirectInputEffect(iface); + TRACE("%p %p\n", This, escape); + return FFEffectEscape(This->effect, (FFEFFESCAPE*)escape); +} + +static const IDirectInputEffectVtbl EffectVtbl = { + effect_QueryInterface, + effect_AddRef, + effect_Release, + effect_Initialize, + effect_GetEffectGuid, + effect_GetParameters, + effect_SetParameters, + effect_Start, + effect_Stop, + effect_GetEffectStatus, + effect_Download, + effect_Unload, + effect_Escape +}; + #else /* HAVE_IOHIDMANAGERCREATE */ const struct dinput_device joystick_osx_device = {

1 0

Dmitry Timoshkov : msi: Fix memory leak.
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: 30fc34b881594fd73ae60c85379302e13e797404 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30fc34b881594fd73ae60c853… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 21 16:08:17 2013 +0900 msi: Fix memory leak. --- dlls/msi/custom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a6b858..5b58976 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -878,6 +878,7 @@ static UINT HANDLE_CustomType50( MSIPACKAGE *package, const WCHAR *source, const TRACE("exe %s arg %s\n", debugstr_w(exe), debugstr_w(arg)); handle = execute_command( exe, arg, szCRoot ); + msi_free( exe ); msi_free( arg ); if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; return wait_process_handle( package, type, handle, action );

1 0

Alexandre Julliard : ole32/tests: Fix array indices in a trace.
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: aaa680bfda4c665733ed2d24508bef43f37852d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa680bfda4c665733ed2d245… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 21 14:57:53 2013 +0200 ole32/tests: Fix array indices in a trace. --- dlls/ole32/tests/clipboard.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 5a16032..db090bd 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -742,8 +742,8 @@ static void test_cf_dataobject(IDataObject *data) cfs_seen[count] = fmt.cfFormat; ok(fmt_ptr->first_use_of_cf != seen_cf, "got %08x expected %08x\n", fmt_ptr->first_use_of_cf, !seen_cf); - ok(fmt_ptr->res[0] == 0, "got %08x\n", fmt_ptr->res[1]); - ok(fmt_ptr->res[1] == 0, "got %08x\n", fmt_ptr->res[2]); + ok(fmt_ptr->res[0] == 0, "got %08x\n", fmt_ptr->res[0]); + ok(fmt_ptr->res[1] == 0, "got %08x\n", fmt_ptr->res[1]); if(fmt.ptd) { DVTARGETDEVICE *target;

1 0

Huw Davies : user32: Move back to using WC<-> MB in order to specify an alternative codepage.
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: bf85df3f0e543adb86130480eabc227e8b33a645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf85df3f0e543adb86130480e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 21 12:51:21 2013 +0100 user32: Move back to using WC<->MB in order to specify an alternative codepage. --- dlls/user32/message.c | 26 ++++++++++++++++---------- dlls/user32/user_private.h | 1 + dlls/user32/winproc.c | 8 ++++---- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e819983..24588ac 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -584,6 +584,10 @@ static BOOL CALLBACK broadcast_message_callback( HWND hwnd, LPARAM lparam ) return TRUE; } +DWORD get_input_codepage( void ) +{ + return CP_ACP; +} /*********************************************************************** * map_wparam_AtoW @@ -594,6 +598,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { char ch[2]; WCHAR wch[2]; + DWORD cp = get_input_codepage(); wch[0] = wch[1] = 0; switch(message) @@ -612,7 +617,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { ch[0] = low; ch[1] = HIBYTE(*wparam); - RtlMultiByteToUnicodeN( wch, sizeof(wch), NULL, ch, 2 ); + MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); TRACE( "map %02x,%02x -> %04x mapping %u\n", (BYTE)ch[0], (BYTE)ch[1], wch[0], mapping ); if (data) data->lead_byte[mapping] = 0; } @@ -620,14 +625,14 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { ch[0] = data->lead_byte[mapping]; ch[1] = low; - RtlMultiByteToUnicodeN( wch, sizeof(wch), NULL, ch, 2 ); + MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); TRACE( "map stored %02x,%02x -> %04x mapping %u\n", (BYTE)ch[0], (BYTE)ch[1], wch[0], mapping ); data->lead_byte[mapping] = 0; } else if (!IsDBCSLeadByte( low )) { ch[0] = low; - RtlMultiByteToUnicodeN( wch, sizeof(wch), NULL, ch, 1 ); + MultiByteToWideChar( cp, 0, ch, 1, wch, 2 ); TRACE( "map %02x -> %04x\n", (BYTE)ch[0], wch[0] ); if (data) data->lead_byte[mapping] = 0; } @@ -655,14 +660,14 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping case WM_MENUCHAR: ch[0] = LOBYTE(*wparam); ch[1] = HIBYTE(*wparam); - RtlMultiByteToUnicodeN( wch, sizeof(wch), NULL, ch, 2 ); + MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); *wparam = MAKEWPARAM(wch[0], wch[1]); break; case WM_IME_CHAR: ch[0] = HIBYTE(*wparam); ch[1] = LOBYTE(*wparam); - if (ch[0]) RtlMultiByteToUnicodeN( wch, sizeof(wch[0]), NULL, ch, 2 ); - else RtlMultiByteToUnicodeN( wch, sizeof(wch[0]), NULL, ch + 1, 1 ); + if (ch[0]) MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); + else MultiByteToWideChar( cp, 0, ch + 1, 1, wch, 1 ); *wparam = MAKEWPARAM(wch[0], HIWORD(*wparam)); break; } @@ -677,9 +682,10 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping */ static void map_wparam_WtoA( MSG *msg, BOOL remove ) { - BYTE ch[2]; + BYTE ch[4]; WCHAR wch[2]; DWORD len; + DWORD cp = get_input_codepage(); switch(msg->message) { @@ -688,7 +694,7 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) { wch[0] = LOWORD(msg->wParam); ch[0] = ch[1] = 0; - RtlUnicodeToMultiByteN( (LPSTR)ch, 2, &len, wch, sizeof(wch[0]) ); + len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); if (len == 2) /* DBCS char */ { struct wm_char_mapping_data *data = get_user_thread_info()->wmchar_data; @@ -716,13 +722,13 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) wch[0] = LOWORD(msg->wParam); wch[1] = HIWORD(msg->wParam); ch[0] = ch[1] = 0; - RtlUnicodeToMultiByteN( (LPSTR)ch, 2, NULL, wch, sizeof(wch) ); + WideCharToMultiByte( cp, 0, wch, 2, (LPSTR)ch, 4, NULL, NULL ); msg->wParam = MAKEWPARAM( ch[0] | (ch[1] << 8), 0 ); break; case WM_IME_CHAR: wch[0] = LOWORD(msg->wParam); ch[0] = ch[1] = 0; - RtlUnicodeToMultiByteN( (LPSTR)ch, 2, &len, wch, sizeof(wch[0]) ); + len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); if (len == 2) msg->wParam = MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(msg->wParam) ); else diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index dc50157..5666412 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -227,6 +227,7 @@ extern void move_window_bits( HWND hwnd, struct window_surface *old_surface, extern void *get_hook_proc( void *proc, const WCHAR *module ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; +extern DWORD get_input_codepage( void ) DECLSPEC_HIDDEN; extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, UINT flags ) DECLSPEC_HIDDEN; extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index e6b5194..ebccbe4 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -220,8 +220,9 @@ static WPARAM map_wparam_char_WtoA( WPARAM wParam, DWORD len ) { WCHAR wch = wParam; BYTE ch[2]; + DWORD cp = get_input_codepage(); - RtlUnicodeToMultiByteN( (LPSTR)ch, len, &len, &wch, sizeof(wch) ); + len = WideCharToMultiByte( cp, 0, &wch, 1, (LPSTR)ch, len, NULL, NULL ); if (len == 2) return MAKEWPARAM( (ch[0] << 8) | ch[1], HIWORD(wParam) ); else @@ -827,9 +828,8 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN { WCHAR wch = wParam; char ch[2]; - DWORD len; - - RtlUnicodeToMultiByteN( ch, 2, &len, &wch, sizeof(wch) ); + DWORD cp = get_input_codepage(); + DWORD len = WideCharToMultiByte( cp, 0, &wch, 1, ch, 2, NULL, NULL ); ret = callback( hwnd, msg, (BYTE)ch[0], lParam, result, arg ); if (len == 2) ret = callback( hwnd, msg, (BYTE)ch[1], lParam, result, arg ); }

1 0

Huw Davies : user32: Use the codepage associated with the input locale for WM_CHAR-type conversions .
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: 5d5d0935ea5469e32b33c8b9c968f7b2d66f3d70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5d0935ea5469e32b33c8b9c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 21 12:51:22 2013 +0100 user32: Use the codepage associated with the input locale for WM_CHAR-type conversions. --- dlls/user32/message.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 24588ac..a6a839c 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -586,7 +586,14 @@ static BOOL CALLBACK broadcast_message_callback( HWND hwnd, LPARAM lparam ) DWORD get_input_codepage( void ) { - return CP_ACP; + DWORD cp; + int ret; + HKL hkl = GetKeyboardLayout( 0 ); + + ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (!ret) cp = CP_ACP; + return cp; } /***********************************************************************

1 0

Zhan Jianyu : vbscript: Implemented builtin function CInt.
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: c6ce31ce831402a5ac0f7eac2e798b92132bb78a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6ce31ce831402a5ac0f7eac2… Author: Zhan Jianyu <nasa4836(a)gmail.com> Date: Tue May 21 21:29:03 2013 +0800 vbscript: Implemented builtin function CInt. --- dlls/vbscript/global.c | 14 ++++++++++++-- dlls/vbscript/tests/api.vbs | 23 +++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 392b88f..49dcb50 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -378,8 +378,18 @@ static HRESULT Global_CCur(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_CInt(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int val; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = to_int(arg, &val); + if(FAILED(hres)) + return hres; + + return return_int(res, val); } static HRESULT Global_CLng(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index b6d8cd5..1151071 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -433,4 +433,27 @@ Call ok(getVT(vbYes) = "VT_I2", "getVT(vbYes) = " & getVT(vbYes)) Call ok(vbNo = 7, "vbNo = " & vbNo) Call ok(getVT(vbNo) = "VT_I2", "getVT(vbNo) = " & getVT(vbNo)) +Call ok(CInt(-36.75) = -37, "CInt(-36.75) = " & CInt(-36.75)) +Call ok(getVT(CInt(-36.75)) = "VT_I2", "getVT(CInt(-36.75)) = " & getVT(CInt(-36.75))) +Call ok(CInt(-36.50) = -36, "CInt(-36.50) = " & CInt(-36.50)) +Call ok(getVT(CInt(-36.50)) = "VT_I2", "getVT(CInt(-36.50)) = " & getVT(CInt(-36.50))) +Call ok(CInt(-36.25) = -36, "CInt(-36.25) = " & CInt(-36.25)) +Call ok(getVT(CInt(-36.25)) = "VT_I2", "getVT(CInt(-36.25)) = " & getVT(CInt(-36.25))) +Call ok(CInt(-36) = -36, "CInt(-36) = " & CInt(-36)) +Call ok(getVT(CInt(-36)) = "VT_I2", "getVT(CInt(-36)) = " & getVT(CInt(-36))) +Call ok(CInt(0) = 0, "CInt(0) = " & CInt(0)) +Call ok(getVT(CInt(0)) = "VT_I2", "getVT(CInt(0)) = " & getVT(CInt(0))) +Call ok(CInt(0.0) = 0, "CInt(0.0) = " & CInt(0)) +Call ok(getVT(CInt(0.0)) = "VT_I2", "getVT(CInt(0.0)) = " & getVT(CInt(0.0))) +Call ok(CInt(0.5) = 0, "CInt(0.5) = " & CInt(0)) +Call ok(getVT(CInt(0.5)) = "VT_I2", "getVT(CInt(0.5)) = " & getVT(CInt(0.5))) +Call ok(CInt(36) = 36, "CInt(36) = " & CInt(36)) +Call ok(getVT(CInt(36)) = "VT_I2", "getVT(CInt(36)) = " & getVT(CInt(36))) +Call ok(CInt(36.25) = 36, "CInt(36.25) = " & CInt(36.25)) +Call ok(getVT(CInt(36.25)) = "VT_I2", "getVT(CInt(36.25)) = " & getVT(CInt(36.25))) +Call ok(CInt(36.50) = 36, "CInt(36.50) = " & CInt(36.50)) +Call ok(getVT(CInt(36.50)) = "VT_I2", "getVT(CInt(36.50)) = " & getVT(CInt(36.50))) +Call ok(CInt(36.75) = 37, "CInt(36.75) = " & CInt(36.75)) +Call ok(getVT(CInt(36.75)) = "VT_I2", "getVT(CInt(36.75)) = " & getVT(CInt(36.75))) + Call reportSuccess()

1 0

Stefan Dösinger : wined3d: Correct an ERR/FIXME.
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: 10929cbe43d8feb6fbd3c9ea20c8551d90938c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10929cbe43d8feb6fbd3c9ea2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 21 13:18:20 2013 +0200 wined3d: Correct an ERR/FIXME. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cdd744c..bd7fbd7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4563,7 +4563,7 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 if (!pal) { - ERR("This code should never get entered for DirectDraw!, expect problems\n"); + FIXME("No palette set.\n"); if (index_in_alpha) { /* Guarantees that memory representation remains correct after sysmem<->texture transfers even if

1 0

Aric Stewart : gdi32: Vertical glyph replacements are not applied in GetGlyphOutline if glyph is specified by index .
by Alexandre Julliard May 21, 2013

May 21, 2013

Module: wine Branch: master Commit: 70cdd2ff9a09ad32123311f5c7bde21144d7a708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70cdd2ff9a09ad32123311f5c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon May 20 11:24:03 2013 -0500 gdi32: Vertical glyph replacements are not applied in GetGlyphOutline if glyph is specified by index. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ae48914..ea13c37 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5905,7 +5905,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, font->font_desc.matrix.eM21, font->font_desc.matrix.eM22); if(format & GGO_GLYPH_INDEX) { - glyph_index = get_GSUB_vert_glyph(incoming_font,glyph); + glyph_index = glyph; original_index = glyph; format &= ~GGO_GLYPH_INDEX; } else {

1 0