April 2016 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : d3dx10: Add D3DX10UnsetAllDeviceObjects stub.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: e2da1a4ee1b6d6a1ae01dc8c8b98f44d5d87722a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2da1a4ee1b6d6a1ae01dc8c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 1 17:44:54 2016 +1100 d3dx10: Add D3DX10UnsetAllDeviceObjects stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/d3dx10_43.spec | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 7 +++++++ include/d3dx10core.idl | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 9edcf54..0673f6a 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -64,7 +64,7 @@ @ stub D3DX10SaveTextureToFileA(ptr ptr str) @ stub D3DX10SaveTextureToFileW(ptr ptr wstr) @ stub D3DX10SaveTextureToMemory(ptr ptr ptr long) -@ stub D3DX10UnsetAllDeviceObjects(ptr) +@ stdcall D3DX10UnsetAllDeviceObjects(ptr) @ stdcall D3DXBoxBoundProbe(ptr ptr ptr ptr) d3dx9_36.D3DXBoxBoundProbe @ stdcall D3DXColorAdjustContrast(ptr ptr float) d3dx9_36.D3DXColorAdjustContrast @ stdcall D3DXColorAdjustSaturation(ptr ptr float) d3dx9_36.D3DXColorAdjustSaturation diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 6637af3..fa4fa79 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -116,3 +116,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz return E_NOTIMPL; } + +HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device) +{ + FIXME("device %p stub.\n", device); + + return E_NOTIMPL; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index f0d8ff6..0e2bf31 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -64,3 +64,5 @@ interface ID3DX10ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); }; + +cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);")

1 0

Hans Leidekker : webservices: Use addition in read_skip.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: ad2fe7e9a2fda51a242884239d76f3a2c46ee954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2fe7e9a2fda51a242884239… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:52 2016 +0200 webservices: Use addition in read_skip. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index d79c310..f12c118 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -915,11 +915,8 @@ static inline unsigned int read_utf8_char( struct reader *reader, unsigned int * static inline void read_skip( struct reader *reader, unsigned int count ) { - while (reader->read_pos < reader->read_size && count) - { - reader->read_pos++; - count--; - } + if (reader->read_pos + count > reader->read_size) return; + reader->read_pos += count; } static inline BOOL read_isnamechar( unsigned int ch )

1 0

Huw Davies : oleaut32: Fix VarDateFromStr for the case of a trailing meridiem indicator.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: b4a73f74af5bc4f7b56cbf239dda60eda11bbffc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a73f74af5bc4f7b56cbf239… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 6 11:15:08 2016 +0100 oleaut32: Fix VarDateFromStr for the case of a trailing meridiem indicator. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartype.c | 3 +++ dlls/oleaut32/vartype.c | 19 +++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 03f43ec..7d50545 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3528,6 +3528,9 @@ static void test_VarDateFromStr(void) DFS("1-2-1970"); EXPECT_DBL(25570.0); DFS("13-1-1970"); EXPECT_DBL(25581.0); DFS("1970-1-13"); EXPECT_DBL(25581.0); + DFS("6/30/2011 01:20:34"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 AM"); EXPECT_DBL(40724.05594907407); + DFS("6/30/2011 01:20:34 PM"); EXPECT_DBL(40724.55594907407); /* Native fails "1999 January 3, 9AM". I consider that a bug in native */ /* test a non-english data string */ diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index bf7ebc6..fc5a025 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -7668,11 +7668,13 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd /* Parse the string into our structure */ while (*strIn) { - if (dp.dwCount >= 6) - break; - if (isdigitW(*strIn)) { + if (dp.dwCount >= 6) + { + hRet = DISP_E_TYPEMISMATCH; + break; + } dp.dwValues[dp.dwCount] = strtoulW(strIn, &strIn, 10); dp.dwCount++; strIn--; @@ -7688,9 +7690,14 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd { if (i <= 25) { - dp.dwValues[dp.dwCount] = ParseDateMonths[i]; - dp.dwFlags[dp.dwCount] |= (DP_MONTH|DP_DATESEP); - dp.dwCount++; + if (dp.dwCount >= 6) + hRet = DISP_E_TYPEMISMATCH; + else + { + dp.dwValues[dp.dwCount] = ParseDateMonths[i]; + dp.dwFlags[dp.dwCount] |= (DP_MONTH|DP_DATESEP); + dp.dwCount++; + } } else if (i > 39 && i < 42) {

1 0

Aric Stewart : hidclass.sys: Use the instance id for the device link.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: 056425734912ec657bd2595360c82d6dc1c77691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=056425734912ec657bd259536… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 5 08:45:48 2016 -0500 hidclass.sys: Use the instance id for the device link. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 21 +++++++-------------- dlls/hidclass.sys/hid.h | 2 +- dlls/hidclass.sys/pnp.c | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index aae4e5f..b137c9b 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -40,12 +40,7 @@ WINE_DECLARE_DEBUG_CHANNEL(hid_report); static const WCHAR device_name_fmtW[] = {'\\','D','e','v','i','c','e', '\\','H','I','D','#','%','p','&','%','p',0}; -static const WCHAR device_regname_fmtW[] = {'H','I','D','\\', - 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', - '0','4','x','&','%','s','\\','%','i','&','%','s',0}; -static const WCHAR device_link_fmtW[] = {'\\','?','?','\\','h','i','d','#', - 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', - '0','4','x','&','%','s','#','%','i','&','%','s','#','%','s',0}; +static const WCHAR device_link_fmtW[] = {'\\','?','?','\\','%','s','#','%','s',0}; /* GUID_DEVINTERFACE_HID */ static const WCHAR class_guid[] = {'{','4','D','1','E','5','5','B','2', '-','F','1','6','F','-','1','1','C','F','-','8','8','C','B','-','0','0', @@ -83,10 +78,10 @@ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRAT return S_OK; } -NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) +NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) { - WCHAR regname[255]; WCHAR dev_link[255]; + WCHAR *ptr; SP_DEVINFO_DATA Data; UNICODE_STRING nameW, linkW; NTSTATUS status; @@ -97,9 +92,9 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) HidD_GetHidGuid(&hidGuid); ext = device->DeviceExtension; - sprintfW(dev_link, device_link_fmtW, ext->information.VendorID, - ext->information.ProductID, index, ext->information.VersionNumber, serial, - class_guid); + sprintfW(dev_link, device_link_fmtW, ext->instance_id, class_guid); + ptr = dev_link + 4; + do { if (*ptr == '\\') *ptr = '#'; } while (*ptr++); struprW(dev_link); RtlInitUnicodeString( &nameW, ext->device_name); @@ -117,8 +112,6 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) return status; } - sprintfW(regname, device_regname_fmtW, ext->information.VendorID, ext->information.ProductID, index, ext->information.VersionNumber, serial); - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_HIDCLASS, NULL, NULL, DIGCF_DEVICEINTERFACE); if (!devinfo) { @@ -126,7 +119,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) return GetLastError(); } Data.cbSize = sizeof(Data); - if (!SetupDiCreateDeviceInfoW(devinfo, regname, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) + if (!SetupDiCreateDeviceInfoW(devinfo, ext->instance_id, &GUID_DEVCLASS_HIDCLASS, NULL, NULL, DICD_INHERIT_CLASSDRVS, &Data)) { if (GetLastError() == ERROR_DEVINST_ALREADY_EXISTS) { diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 8d384c6..2820c9d 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -86,7 +86,7 @@ minidriver* find_minidriver(DRIVER_OBJECT* driver) DECLSPEC_HIDDEN; /* Internal device functions */ NTSTATUS HID_CreateDevice(DEVICE_OBJECT *native_device, HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT **device) DECLSPEC_HIDDEN; -NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device, LPCWSTR serial, LPCWSTR index) DECLSPEC_HIDDEN; +NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void HID_DeleteDevice(HID_MINIDRIVER_REGISTRATION *driver, DEVICE_OBJECT *device) DECLSPEC_HIDDEN; void HID_StartDeviceThread(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index fe3371f..d97184f 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -250,7 +250,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) sprintfW(ext->instance_id, device_instanceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID, interface, ext->information.VersionNumber, serial); sprintfW(ext->device_id, device_deviceid_fmtW, device_enumeratorW, ext->information.VendorID, ext->information.ProductID); - HID_LinkDevice(device, serial, interface); + HID_LinkDevice(device); ext->poll_interval = DEFAULT_POLL_INTERVAL;

1 0

Hans Leidekker : webservices: Reset the read position if an opening bracket is not followed by a valid name character.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: a73701aec2ef222afc04e9e7f573dd744694f951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73701aec2ef222afc04e9e7f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 6 15:55:53 2016 +0200 webservices: Reset the read position if an opening bracket is not followed by a valid name character. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f12c118..eb16427 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -919,6 +919,11 @@ static inline void read_skip( struct reader *reader, unsigned int count ) reader->read_pos += count; } +static inline void read_rewind( struct reader *reader, unsigned int count ) +{ + reader->read_pos -= count; +} + static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1179,6 +1184,11 @@ static HRESULT read_element( struct reader *reader ) if (read_cmp( reader, "<", 1 )) goto error; read_skip( reader, 1 ); + if (!read_isnamechar( read_utf8_char( reader, &skip ))) + { + read_rewind( reader, 1 ); + goto error; + } start = read_current_ptr( reader ); for (;;)

1 0

Vincent Povirk : mscoree: Update Wine Mono to 4.6.2.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: 115ad2da7a545434c81222d291d147fa63324dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=115ad2da7a545434c81222d29… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 10:58:39 2016 -0500 mscoree: Update Wine Mono to 4.6.2. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a39d0fb..8cbc221 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.6.0" -#define MONO_SHA "3a494b5b74fd17adf675a620d46b2dc1d2482424" +#define MONO_VERSION "4.6.2" +#define MONO_SHA "0a5090a3b81b6250a5d7104fc585bd871a9e467d" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7181b4b..033a121 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.6.0"; + static const char* mono_version = "4.6.2"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0};

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_download_data().
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: 7d3f493d55dabb32a692f26b7893710b1cd1da15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3f493d55dabb32a692f26b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:20 2016 +0200 wined3d: Use the texture dimension helpers in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 16d03e8..0055e62 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1054,8 +1054,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; + unsigned int h, y; BYTE *dst_data; - UINT y; /* * Some games (e.g. warhammer 40k) don't work properly with the odd pitches, preventing * the surface pitch from being used to box non-power2 textures. Instead we have to use a hack to @@ -1104,7 +1104,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct src_data = mem; dst_data = data.addr; TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); - for (y = 0; y < surface->resource.height; ++y) + h = wined3d_texture_get_level_height(texture, surface->texture_level); + for (y = 0; y < h; ++y) { memcpy(dst_data, src_data, dst_row_pitch); src_data += src_row_pitch;

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in surface_load_fb_texture().
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: f05febcb14e6e34bd25094fb4690bb5b9e9dfeb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05febcb14e6e34bd25094fb4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 5 18:24:23 2016 +0200 wined3d: Use the texture dimension helpers in surface_load_fb_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 681caa9..67ec03f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1999,7 +1999,8 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct checkGLcall("glReadBuffer"); gl_info->gl_ops.gl.p_glCopyTexSubImage2D(surface->texture_target, surface->texture_level, - 0, 0, 0, 0, surface->resource.width, surface->resource.height); + 0, 0, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level)); checkGLcall("glCopyTexSubImage2D"); if (restore_rt)

1 0

Nikolay Sivov : usp10: Some spelling fixes.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: 9da5adce66d5f6ee895eab96bd861fdd4050cef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da5adce66d5f6ee895eab96b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 5 12:39:23 2016 +0300 usp10: Some spelling fixes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 8 ++++---- dlls/usp10/usp10.c | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 5b39663..613fb05 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1188,7 +1188,7 @@ static void GPOS_convert_design_units_to_device(LPOUTLINETEXTMETRICW lpotm, LPLO *devX = (desX * emHeight) / (double)lpotm->otmEMSquare; *devY = (desY * emHeight) / (double)lpotm->otmEMSquare; if (lplogfont->lfWidth) - FIXME("Font with lfWidth set no handled properly\n"); + FIXME("Font with lfWidth set not handled properly\n"); } static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record) @@ -1491,7 +1491,7 @@ static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, c ma = (const GPOS_MarkArray*)((const BYTE*)mbpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return -1; } mr = &ma->MarkRecord[mark_index]; @@ -1561,7 +1561,7 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A ma = (const GPOS_MarkArray*)((const BYTE*)mlpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return; } mr = &ma->MarkRecord[mark_index]; @@ -1571,7 +1571,7 @@ static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A la = (const GPOS_LigatureArray*)((const BYTE*)mlpf1 + offset); if (ligature_index > GET_BE_WORD(la->LigatureCount)) { - ERR("Ligature index exeeded ligature count\n"); + ERR("Ligature index exceeded ligature count\n"); return; } offset = GET_BE_WORD(la->LigatureAttach[ligature_index]); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index baccc2a..622a061 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -300,7 +300,7 @@ static const scriptRange scriptRanges[] = { { SCRIPT_UNDEFINED, 0, 0, 0} }; -/* the must be in order so that the index matches the Script value */ +/* this must be in order so that the index matches the Script value */ const scriptData scriptInformation[] = { {{SCRIPT_UNDEFINED, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -741,7 +741,7 @@ static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) static const WCHAR chars[4] = {0x0020, 0x200B, 0xF71B, 0x0640}; /* U+0020: numeric space U+200B: zero width space - U+F71B: unknow char found by black box testing + U+F71B: unknown char found by black box testing U+0640: kashida */ WORD gi[4]; @@ -908,7 +908,7 @@ static WORD get_char_script( LPCWSTR str, INT index, INT end, INT *consumed) if (str[index] == 0x2212 || str[index] == 0x2044) return Script_Punctuation; - /* Currency Symboles by Unicode point */ + /* Currency Symbols by Unicode point */ switch (str[index]) { case 0x09f2: @@ -2765,8 +2765,8 @@ static inline int get_cluster_advance(const int* piAdvance, * use piAdvance to find the cluster we are looking at * Find the character that is the first character of the cluster * That is our base piCP - * If the script snaps to cluster boundries (Hebrew, Indic, Thai) then we - * are good Otherwise if the cluster is larger than 1 glyph we need to + * If the script snaps to cluster boundaries (Hebrew, Indic, Thai) then we + * are good. Otherwise if the cluster is larger than 1 glyph we need to * determine how far through the cluster to advance the cursor. */ HRESULT WINAPI ScriptXtoCP(int iX, @@ -2955,7 +2955,7 @@ HRESULT WINAPI ScriptXtoCP(int iX, * * PARAMS * chars [I] Array of characters. - * sa [I] String analysis. + * sa [I] Script analysis. * la [I] Array of logical attribute structures. * * RETURNS @@ -3259,7 +3259,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, * PARAMS * hdc [I] Device context. * psc [I/O] Opaque pointer to a script cache. - * psa [I/O] String analysis. + * psa [I/O] Script analysis. * tagScript [I] The OpenType tag for the Script * tagLangSys [I] The OpenType tag for the Language * rcRangeChars[I] Array of Character counts in each range

1 0

Nikolay Sivov : usp10: Trace RECT arguments in text output functions.
by Alexandre Julliard April 6, 2016

April 6, 2016

Module: wine Branch: master Commit: 9aa8b1847f129f3d3bd6773420be7ca1cb7aad09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa8b1847f129f3d3bd677342… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 5 12:39:22 2016 +0300 usp10: Trace RECT arguments in text output functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c746c57..baccc2a 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2292,8 +2292,8 @@ HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, int item; HRESULT hr; - TRACE("(%p,%d,%d,0x%1x,%p,%d,%d,%d)\n", - ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); + TRACE("(%p,%d,%d,0x%08x,%s,%d,%d,%d)\n", + ssa, iX, iY, uOptions, wine_dbgstr_rect(prc), iMinSel, iMaxSel, fDisabled); if (!(analysis = ssa)) return E_INVALIDARG; if (!(analysis->dwFlags & SSA_GLYPHS)) return E_INVALIDARG; @@ -3483,8 +3483,8 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN INT *lpDx; WORD *reordered_glyphs = (WORD *)pwGlyphs; - TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", - hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, + TRACE("(%p, %p, %d, %d, %08x, %s, %p, %p, %d, %p, %d, %p, %p, %p)\n", + hdc, psc, x, y, fuOptions, wine_dbgstr_rect(lprc), psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); if (!hdc || !psc) return E_INVALIDARG;

1 0