December 2012 - Wine-Commits

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateSamplerState().
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 4ec1c78ec46b5ffcb24c858c93a6ec231f9e03a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ec1c78ec46b5ffcb24c858c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:32 2012 +0100 d3d10core/tests: Add a small test for ID3D10Device_CreateSamplerState(). --- dlls/d3d10core/tests/device.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a0df22a..f509b27 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -570,6 +570,52 @@ float4 main(const float4 color : COLOR) : SV_TARGET ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_sampler_state(void) +{ + ID3D10SamplerState *sampler_state1, *sampler_state2; + D3D10_SAMPLER_DESC sampler_desc; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CreateSamplerState(device, NULL, &sampler_state1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_WRAP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_WRAP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 16; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_ALWAYS; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 1.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 1.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 16.0f; + + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state1); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state2); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + ok(sampler_state1 == sampler_state2, "Got different sampler state objects.\n"); + + refcount = ID3D10SamplerState_Release(sampler_state2); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D10SamplerState_Release(sampler_state1); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_device_interfaces(); @@ -579,4 +625,5 @@ START_TEST(device) test_create_rendertarget_view(); test_create_shader_resource_view(); test_create_shader(); + test_create_sampler_state(); }

1 0

Henri Verbeet : ddraw: Avoid LPD3DDEVICEDESC.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 725ec0323e691e7baca9427aa4bc00524440d1a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=725ec0323e691e7baca9427aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:28 2012 +0100 ddraw: Avoid LPD3DDEVICEDESC. --- include/d3d.h | 6 +++--- include/d3dcaps.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 46fb2d6..811474c 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -937,7 +937,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d, GUID *guid, D3DDEVICEDESC *desc) PURE; - STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; + STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture *tex1, IDirect3DTexture *tex2) PURE; STDMETHOD(CreateExecuteBuffer)(THIS_ D3DEXECUTEBUFFERDESC *desc, IDirect3DExecuteBuffer **buffer, IUnknown *outer) PURE; @@ -1026,7 +1026,7 @@ DECLARE_INTERFACE_(IDirect3DDevice2,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice2 methods ***/ - STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; + STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; STDMETHOD(SwapTextureHandles)(THIS_ IDirect3DTexture2 *tex1, IDirect3DTexture2 *tex2) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport2 *viewport) PURE; @@ -1146,7 +1146,7 @@ DECLARE_INTERFACE_(IDirect3DDevice3,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice3 methods ***/ - STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC lpD3DHWDevDesc, LPD3DDEVICEDESC lpD3DHELDevDesc) PURE; + STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc) PURE; STDMETHOD(GetStats)(THIS_ LPD3DSTATS lpD3DStats) PURE; STDMETHOD(AddViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; STDMETHOD(DeleteViewport)(THIS_ IDirect3DViewport3 *viewport) PURE; diff --git a/include/d3dcaps.h b/include/d3dcaps.h index 6474518..d8d4b88 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -347,7 +347,8 @@ typedef struct _D3DDeviceDesc7 { #define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010 #define D3DVTXPCAPS_LOCALVIEWER 0x00000020 -typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK)(LPGUID lpGuid,LPSTR lpDeviceDescription,LPSTR lpDeviceName,LPD3DDEVICEDESC,LPD3DDEVICEDESC,LPVOID); +typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK)(GUID *guid, char *description, char *name, + D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc, void *ctx); typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK7)(LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC7, LPVOID); #define D3DFDS_COLORMODEL 0x00000001

1 0

Frédéric Delanoy : include: Assorted spelling fixes.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 1d004dda19424d8c4a77b7b0b3a5ce8bd4d40fff URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d004dda19424d8c4a77b7b0b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Dec 11 22:16:38 2012 +0100 include: Assorted spelling fixes. --- include/atlbase.h | 2 +- include/imm.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/atlbase.h b/include/atlbase.h index 4aeabe9..ce62474 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -23,7 +23,7 @@ #include <atliface.h> -/* Wine extention: we (ab)use _ATL_VER to handle truct layout differences between ATL versions. */ +/* Wine extension: we (ab)use _ATL_VER to handle struct layout differences between ATL versions. */ #define _ATL_VER_30 0x0300 #define _ATL_VER_70 0x0700 #define _ATL_VER_80 0x0800 diff --git a/include/imm.h b/include/imm.h index eff9887..d035072 100644 --- a/include/imm.h +++ b/include/imm.h @@ -194,7 +194,7 @@ typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); #define IME_KHOTKEY_SHAPE_TOGGLE 0x50 #define IME_KHOTKEY_HANJACONVERT 0x51 #define IME_KHOTKEY_ENGLISH 0x52 -/* Windows for Tranditional Chinese Edition hot key ID from 0x70 - 0x8F */ +/* Windows for Traditional Chinese Edition hot key ID from 0x70 - 0x8F */ #define IME_THOTKEY_IME_NONIME_TOGGLE 0x70 #define IME_THOTKEY_SHAPE_TOGGLE 0x71 #define IME_THOTKEY_SYMBOL_TOGGLE 0x72 @@ -469,7 +469,7 @@ typedef BOOL (CALLBACK* IMCENUMPROC)(HIMC, LPARAM); /* * type of soft keyboard - * for Windows Tranditional Chinese Edition + * for Windows Traditional Chinese Edition */ #define SOFTKEYBOARD_TYPE_T1 0x0001 /* for Windows Simplified Chinese Edition */

1 0

Henri Verbeet : ddraw: Avoid LPD3DDEVICEDESC7.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 99dcfdf0cea1af0a9c605c8b9ea8126189c3a182 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99dcfdf0cea1af0a9c605c8b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:29 2012 +0100 ddraw: Avoid LPD3DDEVICEDESC7. --- dlls/ddraw/tests/d3d.c | 9 ++++++--- include/d3d.h | 2 +- include/d3dcaps.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 6f4416c..b170b29 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -624,7 +624,8 @@ static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPS return DDENUMRET_OK; } -static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +static HRESULT WINAPI enumDevicesCallbackTest7(char *DeviceDescription, char *DeviceName, + D3DDEVICEDESC7 *lpdd7, void *Context) { D3D7ETest *d3d7et = Context; if(IsEqualGUID(&lpdd7->deviceGUID, &IID_IDirect3DRGBDevice)) @@ -641,7 +642,8 @@ static HRESULT WINAPI enumDevicesCallbackTest7(LPSTR DeviceDescription, LPSTR De return DDENUMRET_OK; } -static HRESULT WINAPI enumDevicesCancelTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +static HRESULT WINAPI enumDevicesCancelTest7(char *DeviceDescription, char *DeviceName, + D3DDEVICEDESC7 *lpdd7, void *Context) { D3D7ECancelTest *d3d7et = Context; @@ -650,7 +652,8 @@ static HRESULT WINAPI enumDevicesCancelTest7(LPSTR DeviceDescription, LPSTR Devi return d3d7et->desired_ret; } -static HRESULT WINAPI enumDevicesLifetimeTest7(LPSTR DeviceDescription, LPSTR DeviceName, LPD3DDEVICEDESC7 lpdd7, LPVOID Context) +static HRESULT WINAPI enumDevicesLifetimeTest7(char *DeviceDescription, char *DeviceName, + D3DDEVICEDESC7 *lpdd7, void *Context) { D3D7ELifetimeTest *ctx = Context; diff --git a/include/d3d.h b/include/d3d.h index 811474c..f74cd19 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1295,7 +1295,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD_(ULONG,AddRef)(THIS) PURE; STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DDevice7 methods ***/ - STDMETHOD(GetCaps)(THIS_ LPD3DDEVICEDESC7 lpD3DHELDevDesc) PURE; + STDMETHOD(GetCaps)(THIS_ D3DDEVICEDESC7 *desc) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMPIXELFORMATSCALLBACK lpD3DEnumPixelProc, LPVOID lpArg) PURE; STDMETHOD(BeginScene)(THIS) PURE; STDMETHOD(EndScene)(THIS) PURE; diff --git a/include/d3dcaps.h b/include/d3dcaps.h index d8d4b88..bde09e8 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -349,7 +349,7 @@ typedef struct _D3DDeviceDesc7 { typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK)(GUID *guid, char *description, char *name, D3DDEVICEDESC *hal_desc, D3DDEVICEDESC *hel_desc, void *ctx); -typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK7)(LPSTR lpDeviceDescription, LPSTR lpDeviceName, LPD3DDEVICEDESC7, LPVOID); +typedef HRESULT (CALLBACK *LPD3DENUMDEVICESCALLBACK7)(char *description, char *name, D3DDEVICEDESC7 *desc, void *ctx); #define D3DFDS_COLORMODEL 0x00000001 #define D3DFDS_GUID 0x00000002

1 0

Henri Verbeet : d3d10core: Implement d3d10_sampler_state_GetDesc().
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 14eadb71bc08968d95a1a00a337eabaebc5cd895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14eadb71bc08968d95a1a00a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 11 22:27:30 2012 +0100 d3d10core: Implement d3d10_sampler_state_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 3 ++- dlls/d3d10core/device.c | 6 ++++-- dlls/d3d10core/state.c | 9 +++++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ffc4e34..4d643a0 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -248,9 +248,10 @@ struct d3d10_sampler_state LONG refcount; struct wined3d_sampler *wined3d_sampler; + D3D10_SAMPLER_DESC desc; }; -HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) DECLSPEC_HIDDEN; +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; /* ID3D10Query */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 8074380..9070d85 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1476,6 +1476,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i TRACE("iface %p, desc %p, sampler_state %p.\n", iface, desc, sampler_state); + if (!desc) + return E_INVALIDARG; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1483,8 +1486,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device *i return E_OUTOFMEMORY; } - hr = d3d10_sampler_state_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_sampler_state_init(object, desc))) { WARN("Failed to initialize sampler state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index c1018f8..c086066 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -490,7 +490,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_SetPrivateDataInterface(ID3 static void STDMETHODCALLTYPE d3d10_sampler_state_GetDesc(ID3D10SamplerState *iface, D3D10_SAMPLER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = @@ -508,12 +512,13 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = d3d10_sampler_state_GetDesc, }; -HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) +HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state, const D3D10_SAMPLER_DESC *desc) { HRESULT hr; state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; + state->desc = *desc; if (FAILED(hr = wined3d_sampler_create(state, &state->wined3d_sampler))) {

1 0

Ken Thomases : winspool: Close read end of pipe in parent so we can detect child termination.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 436edbdfc76cd17eae5ef6b020440b6dd116774e URL: http://source.winehq.org/git/wine.git/?a=commit;h=436edbdfc76cd17eae5ef6b02… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Dec 11 22:54:05 2012 -0600 winspool: Close read end of pipe in parent so we can detect child termination. --- dlls/winspool.drv/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index f23d8cc..45b49f3 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8096,6 +8096,8 @@ static BOOL schedule_pipe(LPCWSTR cmd, LPCWSTR filename) goto end; } + close(fds[0]); + fds[0] = -1; while((no_read = read(file_fd, buf, sizeof(buf))) > 0) write(fds[1], buf, no_read);

1 0

Piotr Caban : msvcr100: Added _sprintf_p implementation.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 77306693d4a9721034968772769b88374688ae40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77306693d4a97210349687727… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:15:33 2012 +0100 msvcr100: Added _sprintf_p implementation. --- dlls/msvcr100/msvcr100.c | 15 +++++++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- include/msvcrt/stdio.h | 1 + 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index f529b10..1a54c43 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -458,6 +458,21 @@ size_t CDECL fread_s(void *buf, size_t buf_size, size_t elem_size, size_t count, } /********************************************************************* + * _sprintf_p (MSVCR100.@) + */ +int CDECL _sprintf_p(char *buffer, size_t length, const char *format, ...) +{ + __ms_va_list valist; + int r; + + __ms_va_start(valist, format); + r = _vsprintf_p_l(buffer, length, format, NULL, valist); + __ms_va_end(valist); + + return r; +} + +/********************************************************************* * DllMain (MSVCR100.@) */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 70fca053..510c974 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1312,7 +1312,7 @@ @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s @ stub _sprintf_l -@ stub _sprintf_p +@ varargs _sprintf_p(ptr long str) @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2eecb7a..27a8f6d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -974,7 +974,7 @@ @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s @ stub _sprintf_l -@ stub _sprintf_p +@ varargs _sprintf_p(ptr long str) msvcr100._sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8644692..ccdb7e0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -967,7 +967,7 @@ @ cdecl _splitpath(str ptr ptr ptr ptr) msvcrt._splitpath @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) msvcrt._splitpath_s @ stub _sprintf_l -@ stub _sprintf_p +@ varargs _sprintf_p(ptr long str) msvcr100._sprintf_p @ varargs _sprintf_p_l(ptr long str ptr) msvcrt._sprintf_p_l @ stub _sprintf_s_l @ varargs _sscanf_l(str str ptr) msvcrt._sscanf_l diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index f277516..f6bf3b5 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -125,6 +125,7 @@ int __cdecl _scprintf(const char*,...); int __cdecl _vscprintf(const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); +int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); void __cdecl clearerr(FILE*); int __cdecl fclose(FILE*);

1 0

Piotr Caban : msvcrt: Added _wtoi_l implementation.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 3acb238f1584256468bf592843bb55206d656a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acb238f1584256468bf59284… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:05 2012 +0100 msvcrt: Added _wtoi_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 17 +++++++++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0729f30..c57b43d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1604,7 +1604,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l -@ stub _wtoi_l +@ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ stub _wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index bd1e86a..8c53751 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1268,7 +1268,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l -@ stub _wtoi_l +@ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ stub _wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2453e6f..500ed27 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1259,7 +1259,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l -@ stub _wtoi_l +@ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ stub _wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ecf44fd..239e820 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1199,7 +1199,7 @@ @ cdecl _wtoi(wstr) ntdll._wtoi @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) -# stub _wtoi_l(wstr ptr) +@ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l @ cdecl _wtol(wstr) ntdll._wtol # stub _wtol_l(wstr ptr) @ cdecl _wunlink(wstr) MSVCRT__wunlink diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 555e63a..cc48968 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1438,6 +1438,23 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, } /********************************************************************* + * _wtoi_l (MSVCRT.@) + */ +int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoi64_l(str, NULL, 10, locale); + + if(ret > INT_MAX) { + ret = INT_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < INT_MIN) { + ret = INT_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : msvcrt: Added _vfwprintf_l implementation.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 48335be04eeea96f7f6b970694f5482a0b89523d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48335be04eeea96f7f6b97069… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:32 2012 +0100 msvcrt: Added _vfwprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 44123a3..877f76e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1426,7 +1426,7 @@ @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l -@ stub _vfwprintf_l +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcrt._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l @ stub _vfwprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 91fe34a..d62590d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1087,7 +1087,7 @@ @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l -@ stub _vfwprintf_l +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcrt._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l @ stub _vfwprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ae3dfa2..61b0340 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1081,7 +1081,7 @@ @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l -@ stub _vfwprintf_l +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcrt._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l @ stub _vfwprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index bca17d2..4b9abc9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3858,6 +3858,23 @@ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ } /********************************************************************* + * _vfwprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vfwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + int ret; + + if (!MSVCRT_CHECK_PMT( file != NULL )) return -1; + + MSVCRT__lock_file(file); + ret = pf_printf_w(puts_clbk_file_w, file, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* * vprintf (MSVCRT.@) */ int CDECL MSVCRT_vprintf(const char *format, __ms_va_list valist) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6d46f82..f95219f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1018,7 +1018,7 @@ # stub _vfprintf_p(ptr str ptr) # stub _vfprintf_p_l(ptr str ptr ptr) # stub _vfprintf_s_l(ptr str ptr ptr) -# stub _vfwprintf_l(ptr wstr ptr ptr) +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l # stub _vfwprintf_p(ptr wstr ptr) # stub _vfwprintf_p_l(ptr wstr ptr ptr) # stub _vfwprintf_s_l(ptr wstr ptr ptr)

1 0

Michael Stefaniuc : comctl32/tests: Get rid of a temp buffer.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: ab55448069d34804572823381315fe47a098e765 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab55448069d34804572823381… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 11 22:18:15 2012 +0100 comctl32/tests: Get rid of a temp buffer. --- dlls/comctl32/tests/imagelist.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 98b84a6..f2da3c2 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -782,22 +782,21 @@ static void check_ilhead_data(const char *ilh_data, INT cx, INT cy, INT cur, INT static HBITMAP create_bitmap(INT cx, INT cy, COLORREF color, const char *comment) { HDC hdc; - char bmibuf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; - BITMAPINFO *bmi = (BITMAPINFO *)bmibuf; + BITMAPINFO bmi; HBITMAP hbmp, hbmp_old; HBRUSH hbrush; RECT rc = { 0, 0, cx, cy }; hdc = CreateCompatibleDC(0); - memset(bmi, 0, sizeof(*bmi)); - bmi->bmiHeader.biSize = sizeof(bmi->bmiHeader); - bmi->bmiHeader.biHeight = cx; - bmi->bmiHeader.biWidth = cy; - bmi->bmiHeader.biBitCount = 24; - bmi->bmiHeader.biPlanes = 1; - bmi->bmiHeader.biCompression = BI_RGB; - hbmp = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, NULL, 0); + memset(&bmi, 0, sizeof(bmi)); + bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); + bmi.bmiHeader.biHeight = cx; + bmi.bmiHeader.biWidth = cy; + bmi.bmiHeader.biBitCount = 24; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biCompression = BI_RGB; + hbmp = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, NULL, NULL, 0); hbmp_old = SelectObject(hdc, hbmp);

1 0