October 2016 - Wine-commits

Nikolay Sivov : gdi32: Append "TrueType" suffix to registry key names.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: f1f6185e909a2c6fb76b359f2d7489df1474f07f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f6185e909a2c6fb76b359f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 14 23:52:16 2016 +0300 gdi32: Append "TrueType" suffix to registry key names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fcd0f6b0749b6827ee466a620e0198abe8a387f5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b9d6768..47d44fe 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3096,20 +3096,21 @@ static void update_reg_entries(void) LIST_FOR_EACH_ENTRY( family, &font_list, Family, entry ) { LIST_FOR_EACH_ENTRY( face, &family->faces, Face, entry ) { char *buffer; + WCHAR *name; + if (!(face->flags & ADDFONT_EXTERNAL_FONT)) continue; - if(face->FullName) - { - len = strlenW(face->FullName) + sizeof(TrueType) / sizeof(WCHAR) + 1; - valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - strcpyW(valueW, face->FullName); - } - else - { - len = strlenW(family->FamilyName) + sizeof(TrueType) / sizeof(WCHAR) + 1; - valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - strcpyW(valueW, family->FamilyName); - } + name = face->FullName ? face->FullName : family->FamilyName; + + len = strlenW(name) + 1; + if (face->scalable) + len += sizeof(TrueType) / sizeof(WCHAR); + + valueW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + strcpyW(valueW, name); + + if (face->scalable) + strcatW(valueW, TrueType); buffer = strWtoA( CP_UNIXCP, face->file ); path = wine_get_dos_file_name( buffer );

1 0

Bruno Jesus : dinput: Use the correct index to remap the axis.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 35dcc70ae746f4454057f50d0d90d3f7767aac7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35dcc70ae746f4454057f50d0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Aug 18 03:34:37 2016 -0300 dinput: Use the correct index to remap the axis. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 299a6ce5bb1f607a6065eabd749ab68abf00da65) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 9425c0b..807199d 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -291,6 +291,11 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF case (DWORD_PTR)DIPROP_RANGE: { LPCDIPROPRANGE pr = (LPCDIPROPRANGE)ph; if (ph->dwHow == DIPH_DEVICE) { + + /* Many games poll the joystick immediately after setting the range + * for calibration purposes, so the old values need to be remapped + * to the new range before it does so */ + TRACE("proprange(%d,%d) all\n", pr->lMin, pr->lMax); for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) { @@ -324,8 +329,6 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF TRACE("proprange(%d,%d) obj=%d\n", pr->lMin, pr->lMax, obj); if (obj >= 0) { - /*ePSXe polls the joystick immediately after setting the range for calibration purposes, so the old values need to be remapped to the new range before it does so*/ - remap_props.lDevMin = This->props[obj].lMin; remap_props.lDevMax = This->props[obj].lMax; @@ -335,7 +338,7 @@ HRESULT WINAPI JoystickWGenericImpl_SetProperty(LPDIRECTINPUTDEVICE8W iface, REF remap_props.lMin = pr->lMin; remap_props.lMax = pr->lMax; - switch (ph->dwObj) { + switch (This->base.data_format.wine_df->rgodf[obj].dwOfs) { case DIJOFS_X : This->js.lX = joystick_map_axis(&remap_props, This->js.lX); break; case DIJOFS_Y : This->js.lY = joystick_map_axis(&remap_props, This->js.lY); break; case DIJOFS_Z : This->js.lZ = joystick_map_axis(&remap_props, This->js.lZ); break;

1 0

Andrew Church : dinput: Report DIDOI_ASPECTPOSITION flag for axes objects.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: c3502c8fbdcb87367b105c327c0cc11ed3eaa97d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3502c8fbdcb87367b105c327… Author: Andrew Church <achurch(a)achurch.org> Date: Tue Aug 16 17:28:34 2016 -0300 dinput: Report DIDOI_ASPECTPOSITION flag for axes objects. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5ce8a1a91b5462bc90629385d618ceb6b75cd2c9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/joystick.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 807199d..c02a559 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -498,9 +498,10 @@ HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - if (pdidoi->dwType & DIDFT_AXIS) + if (pdidoi->dwType & DIDFT_AXIS) { sprintfW(pdidoi->tszName, axisW, DIDFT_GETINSTANCE(pdidoi->dwType)); - else if (pdidoi->dwType & DIDFT_POV) + pdidoi->dwFlags |= DIDOI_ASPECTPOSITION; + } else if (pdidoi->dwType & DIDFT_POV) sprintfW(pdidoi->tszName, povW, DIDFT_GETINSTANCE(pdidoi->dwType)); else if (pdidoi->dwType & DIDFT_BUTTON) sprintfW(pdidoi->tszName, buttonW, DIDFT_GETINSTANCE(pdidoi->dwType));

1 0

Piotr Caban : msvcp100: Add numeric_limits<*>::lowest implementation.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 3a5960ce6b34e2ff106f8d2b78ab54d95018bf6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5960ce6b34e2ff106f8d2b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 14 15:55:16 2016 +0100 msvcp100: Add numeric_limits<*>::lowest implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2633496a7473baf4f0ae2f6a812f8a5e39e094ec) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 32 +++++++++++++++--------------- dlls/msvcp90/math.c | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index d2b75f4..357ca83 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2113,22 +2113,22 @@ @ cdecl -arch=win64 ?length@?$codecvt(a)GDH@std@@QEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length @ thiscall -arch=win32 ?length@?$codecvt(a)_WDH@std@@QBEHABHPBD1I(a)Z(ptr ptr str str long) codecvt_wchar_length @ cdecl -arch=win64 ?length@?$codecvt(a)_WDH@std@@QEBAHAEBHPEBD1_K(a)Z(ptr ptr str str long) codecvt_wchar_length -@ stub ?lowest@?$numeric_limits(a)C@std@@SACXZ -@ stub ?lowest@?$numeric_limits(a)D@std@@SADXZ -@ stub ?lowest@?$numeric_limits(a)E@std@@SAEXZ -@ stub ?lowest@?$numeric_limits(a)F@std@@SAFXZ -@ stub ?lowest@?$numeric_limits(a)G@std@@SAGXZ -@ stub ?lowest@?$numeric_limits(a)H@std@@SAHXZ -@ stub ?lowest@?$numeric_limits(a)I@std@@SAIXZ -@ stub ?lowest@?$numeric_limits(a)J@std@@SAJXZ -@ stub ?lowest@?$numeric_limits(a)K@std@@SAKXZ -@ stub ?lowest@?$numeric_limits(a)M@std@@SAMXZ -@ stub ?lowest@?$numeric_limits(a)N@std@@SANXZ -@ stub ?lowest@?$numeric_limits(a)O@std@@SAOXZ -@ stub ?lowest@?$numeric_limits(a)_J@std@@SA_JXZ -@ stub ?lowest@?$numeric_limits(a)_K@std@@SA_KXZ -@ stub ?lowest@?$numeric_limits(a)_N@std@@SA_NXZ -@ stub ?lowest@?$numeric_limits(a)_W@std@@SA_WXZ +@ cdecl ?lowest@?$numeric_limits(a)C@std@@SACXZ() std_numeric_limits_signed_char_lowest +@ cdecl ?lowest@?$numeric_limits(a)D@std@@SADXZ() std_numeric_limits_char_lowest +@ cdecl ?lowest@?$numeric_limits(a)E@std@@SAEXZ() std_numeric_limits_unsigned_char_lowest +@ cdecl ?lowest@?$numeric_limits(a)F@std@@SAFXZ() std_numeric_limits_short_lowest +@ cdecl ?lowest@?$numeric_limits(a)G@std@@SAGXZ() std_numeric_limits_unsigned_short_lowest +@ cdecl ?lowest@?$numeric_limits(a)H@std@@SAHXZ() std_numeric_limits_int_lowest +@ cdecl ?lowest@?$numeric_limits(a)I@std@@SAIXZ() std_numeric_limits_unsigned_int_lowest +@ cdecl ?lowest@?$numeric_limits(a)J@std@@SAJXZ() std_numeric_limits_long_lowest +@ cdecl ?lowest@?$numeric_limits(a)K@std@@SAKXZ() std_numeric_limits_unsigned_long_lowest +@ cdecl ?lowest@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_lowest +@ cdecl ?lowest@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_lowest +@ cdecl ?lowest@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_lowest +@ cdecl -ret64 ?lowest@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_lowest +@ cdecl -ret64 ?lowest@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_lowest +@ cdecl ?lowest@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_lowest +@ cdecl ?lowest@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_lowest @ cdecl ?max@?$numeric_limits(a)C@std@@SACXZ() std_numeric_limits_signed_char_max @ cdecl ?max@?$numeric_limits(a)D@std@@SADXZ() std_numeric_limits_char_max @ cdecl ?max@?$numeric_limits(a)E@std@@SAEXZ() std_numeric_limits_unsigned_char_max diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 6c3a33a..99f6727 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -659,6 +659,54 @@ BOOLEAN __cdecl std_numeric_limits_bool_min(void) { return FALSE; } /* ?min@?$numeric_limits(a)_W@std@@SA_WXZ -> public: static wchar_t __cdecl std::numeric_limits<wchar_t>::min(void) */ WCHAR __cdecl std_numeric_limits_wchar_t_min(void) { return 0; } +/* ?lowest@?$numeric_limits(a)C@std@@SACXZ */ +signed char __cdecl std_numeric_limits_signed_char_lowest(void) { return SCHAR_MIN; } + +/* ?lowest@?$numeric_limits(a)D@std@@SADXZ */ +char __cdecl std_numeric_limits_char_lowest(void) { return CHAR_MIN; } + +/* ?lowest@?$numeric_limits(a)E@std@@SAEXZ */ +unsigned char __cdecl std_numeric_limits_unsigned_char_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)F@std@@SAFXZ */ +short __cdecl std_numeric_limits_short_lowest(void) { return SHRT_MIN; } + +/* ?lowest@?$numeric_limits(a)G@std@@SAGXZ */ +unsigned short __cdecl std_numeric_limits_unsigned_short_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)H@std@@SAHXZ */ +int __cdecl std_numeric_limits_int_lowest(void) { return INT_MIN; } + +/* ?lowest@?$numeric_limits(a)I@std@@SAIXZ */ +unsigned int __cdecl std_numeric_limits_unsigned_int_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)J@std@@SAJXZ */ +LONG __cdecl std_numeric_limits_long_lowest(void) { return LONG_MIN; } + +/* ?lowest@?$numeric_limits(a)K@std@@SAKXZ */ +ULONG __cdecl std_numeric_limits_unsigned_long_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)M@std@@SAMXZ */ +float __cdecl std_numeric_limits_float_lowest(void) { return -FLT_MAX; } + +/* ?lowest@?$numeric_limits(a)N@std@@SANXZ */ +double __cdecl std_numeric_limits_double_lowest(void) { return -DBL_MAX; } + +/* ?lowest@?$numeric_limits(a)O@std@@SAOXZ */ +LDOUBLE __cdecl std_numeric_limits_long_double_lowest(void) { return -LDBL_MAX; } + +/* ?lowest@?$numeric_limits(a)_J@std@@SA_JXZ */ +__int64 __cdecl std_numeric_limits_int64_lowest(void) { return I64_MIN; } + +/* ?lowest@?$numeric_limits(a)_K@std@@SA_KXZ */ +unsigned __int64 __cdecl std_numeric_limits_unsigned_int64_lowest(void) { return 0; } + +/* ?lowest@?$numeric_limits(a)_N@std@@SA_NXZ */ +BOOLEAN __cdecl std_numeric_limits_bool_lowest(void) { return FALSE; } + +/* ?lowest@?$numeric_limits(a)_W@std@@SA_WXZ */ +WCHAR __cdecl std_numeric_limits_wchar_t_lowest(void) { return 0; } + /* ?quiet_NaN@?$numeric_limits(a)C@std@@SACXZ -> public: static signed char __cdecl std::numeric_limits<signed char>::quiet_NaN(void) */ signed char __cdecl std_numeric_limits_signed_char_quiet_NaN(void) { return 0; }

1 0

Stefan Dösinger : d3d8: Don' t validate 2D texture lock coordinates.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: a302e5872ed28242bd70588dcf00fc49164f3fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=a302e5872ed28242bd70588dc… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Mon Jan 18 22:20:05 2016 +0000 d3d8: Don't validate 2D texture lock coordinates. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a2d3b3a5a58cdacb8bf09cb927a3421d9e3cc32a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/surface.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 679f094..ec263b1 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -204,26 +204,36 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, struct wined3d_box box; struct wined3d_map_desc map_desc; HRESULT hr; + D3DRESOURCETYPE type; TRACE("iface %p, locked_rect %p, rect %s, flags %#x.\n", iface, locked_rect, wine_dbgstr_rect(rect), flags); wined3d_mutex_lock(); + + if (surface->texture) + type = IDirect3DBaseTexture8_GetType(&surface->texture->IDirect3DBaseTexture8_iface); + else + type = D3DRTYPE_SURFACE; + if (rect) { D3DSURFACE_DESC desc; IDirect3DSurface8_GetDesc(iface, &desc); - if ((rect->left < 0) + if (type != D3DRTYPE_TEXTURE + && ((rect->left < 0) || (rect->top < 0) || (rect->left >= rect->right) || (rect->top >= rect->bottom) || (rect->right > desc.Width) - || (rect->bottom > desc.Height)) + || (rect->bottom > desc.Height))) { WARN("Trying to lock an invalid rectangle, returning D3DERR_INVALIDCALL\n"); wined3d_mutex_unlock(); + locked_rect->Pitch = 0; + locked_rect->pBits = NULL; return D3DERR_INVALIDCALL; } box.left = rect->left; @@ -243,7 +253,7 @@ static HRESULT WINAPI d3d8_surface_LockRect(IDirect3DSurface8 *iface, locked_rect->Pitch = map_desc.row_pitch; locked_rect->pBits = map_desc.data; } - else + else if (type != D3DRTYPE_TEXTURE) { locked_rect->Pitch = 0; locked_rect->pBits = NULL;

1 0

Akihiro Sagawa : comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: ba1cf6c3a4da2a55518a4178e8063128b5d03671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba1cf6c3a4da2a55518a4178e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jan 20 22:34:42 2016 +0900 comctl32: Prevent invalid focus change notifications from LVS_OWNERDATA lists. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit af4a757ad2cacbd238486632d0f7bd6f0a94483f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 68a5515..419a823 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8808,6 +8808,7 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl if (infoPtr->dwStyle & LVS_OWNERDATA) { INT nOldCount = infoPtr->nItemCount; + infoPtr->nItemCount = nItems; if (nItems < nOldCount) { @@ -8820,7 +8821,6 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl } } - infoPtr->nItemCount = nItems; LISTVIEW_UpdateScroll(infoPtr); /* the flags are valid only in ownerdata report and list modes */ diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index acfcd20..1e992cf 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3418,6 +3418,28 @@ static void test_ownerdata(void) style = GetWindowLongPtrA(hwnd, GWL_STYLE); ok(style & LVS_SORTDESCENDING, "Expected LVS_SORTDESCENDING to be set\n"); DestroyWindow(hwnd); + + /* The focused item is updated after the invalidation */ + hwnd = create_listview_control(LVS_OWNERDATA | LVS_REPORT); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 3, 0); + expect(TRUE, res); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0); + expect(TRUE, res); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "ownerdata setitemcount", FALSE); + + res = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + expect(-1, res); + DestroyWindow(hwnd); } static void test_norecompute(void)

1 0

Piotr Caban : msvcp60: Export more complex numbers operators.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: bda2bd289a0f0cb372f0a597f4e4501eedcf6197 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda2bd289a0f0cb372f0a597f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 14 15:55:27 2016 +0100 msvcp60: Export more complex numbers operators. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 14529012da91580119c1712cd24fcf67c780789b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp60/msvcp60.spec | 240 +++++++++++++++++++++++----------------------- 1 file changed, 120 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bda2bd289a0f0cb372f0a…

1 0

Alex Henrie : ole32: Implement StgCreatePropStg.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: 956c242e81fa9af7791f3cbb6968adfe455eaa87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=956c242e81fa9af7791f3cbb6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 10 16:22:25 2016 -0600 ole32: Implement StgCreatePropStg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 004e9f94e15020be35763324a8a311dfc3361cce) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 04c9f1e..b56e5d5 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -262,6 +262,7 @@ @ stdcall StgCreateDocfile(wstr long long ptr) @ stdcall StgCreateDocfileOnILockBytes(ptr long long ptr) @ stdcall StgCreatePropSetStg(ptr long ptr) +@ stdcall StgCreatePropStg(ptr ptr ptr long long ptr) @ stdcall StgCreateStorageEx(wstr long long long ptr ptr ptr ptr) @ stub StgGetIFillLockBytesOnFile @ stub StgGetIFillLockBytesOnILockBytes diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index da361ce..c3db945 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2767,3 +2767,46 @@ SERIALIZEDPROPERTYVALUE* WINAPI StgConvertVariantToProperty(const PROPVARIANT *p return NULL; } + +HRESULT WINAPI StgCreatePropStg(IUnknown *unk, REFFMTID fmt, const CLSID *clsid, + DWORD flags, DWORD reserved, IPropertyStorage **prop_stg) +{ + IStorage *stg; + IStream *stm; + HRESULT r; + + TRACE("%p %s %s %08x %d %p\n", unk, debugstr_guid(fmt), debugstr_guid(clsid), flags, reserved, prop_stg); + + if (!fmt || reserved) + { + r = E_INVALIDARG; + goto end; + } + + if (flags & PROPSETFLAG_NONSIMPLE) + { + r = IUnknown_QueryInterface(unk, &IID_IStorage, (void **)&stg); + if (FAILED(r)) + goto end; + + /* FIXME: if (flags & PROPSETFLAG_NONSIMPLE), we need to create a + * storage, not a stream. For now, disallow it. + */ + FIXME("PROPSETFLAG_NONSIMPLE not supported\n"); + IStorage_Release(stg); + r = STG_E_INVALIDFLAG; + } + else + { + r = IUnknown_QueryInterface(unk, &IID_IStream, (void **)&stm); + if (FAILED(r)) + goto end; + + r = PropertyStorage_ConstructEmpty(stm, fmt, flags, + STGM_CREATE|STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + } + +end: + TRACE("returning 0x%08x\n", r); + return r; +}

1 0

Alex Henrie : ole32: Implement StgOpenPropStg.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: b68941e307d6ec9db0e4ff0ccf8b8e31dd4bc432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b68941e307d6ec9db0e4ff0cc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 10 16:22:26 2016 -0600 ole32: Implement StgOpenPropStg. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b045d726314aff340384798463db36044cbaa897) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ole32/ole32.spec | 1 + dlls/ole32/stg_prop.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b56e5d5..7851c75 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -269,6 +269,7 @@ @ stdcall StgIsStorageFile(wstr) @ stdcall StgIsStorageILockBytes(ptr) @ stub StgOpenAsyncDocfileOnIFillLockBytes +@ stdcall StgOpenPropStg(ptr ptr long long ptr) @ stdcall StgOpenStorage(wstr ptr long ptr long ptr) @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) @ stdcall StgOpenStorageOnILockBytes(ptr ptr long long long ptr) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index c3db945..04e0244 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -2810,3 +2810,46 @@ end: TRACE("returning 0x%08x\n", r); return r; } + +HRESULT WINAPI StgOpenPropStg(IUnknown *unk, REFFMTID fmt, DWORD flags, + DWORD reserved, IPropertyStorage **prop_stg) +{ + IStorage *stg; + IStream *stm; + HRESULT r; + + TRACE("%p %s %08x %d %p\n", unk, debugstr_guid(fmt), flags, reserved, prop_stg); + + if (!fmt || reserved) + { + r = E_INVALIDARG; + goto end; + } + + if (flags & PROPSETFLAG_NONSIMPLE) + { + r = IUnknown_QueryInterface(unk, &IID_IStorage, (void **)&stg); + if (FAILED(r)) + goto end; + + /* FIXME: if (flags & PROPSETFLAG_NONSIMPLE), we need to open a + * storage, not a stream. For now, disallow it. + */ + FIXME("PROPSETFLAG_NONSIMPLE not supported\n"); + IStorage_Release(stg); + r = STG_E_INVALIDFLAG; + } + else + { + r = IUnknown_QueryInterface(unk, &IID_IStream, (void **)&stm); + if (FAILED(r)) + goto end; + + r = PropertyStorage_ConstructFromStream(stm, fmt, + STGM_READWRITE|STGM_SHARE_EXCLUSIVE, prop_stg); + } + +end: + TRACE("returning 0x%08x\n", r); + return r; +}

1 0

Nikolay Sivov : gdi32: Keep font tables tags defined in one place.
by Alexandre Julliard 07 Oct '16

07 Oct '16

Module: wine Branch: stable Commit: dd7aa6626e3b99274d635b886c3ab6631f0786df URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd7aa6626e3b99274d635b886… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 13:14:49 2016 +0300 gdi32: Keep font tables tags defined in one place. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cd688217808ca347b68f6929b47b7cee03b5782c) Conflicts: dlls/gdi32/freetype.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 693a54d..4eee506 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -213,6 +213,21 @@ MAKE_FUNCPTR(FcPatternGetString); #define GET_BE_WORD(x) RtlUshortByteSwap(x) #endif +#define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ + ( ( (FT_ULong)_x4 << 24 ) | \ + ( (FT_ULong)_x3 << 16 ) | \ + ( (FT_ULong)_x2 << 8 ) | \ + (FT_ULong)_x1 ) + +#define MS_GASP_TAG MS_MAKE_TAG('g', 'a', 's', 'p') +#define MS_GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') +#define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') +#define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') + +/* 'gasp' flags */ +#define GASP_GRIDFIT 0x01 +#define GASP_DOGRAY 0x02 + /* This is basically a copy of FT_Bitmap_Size with an extra element added */ typedef struct { FT_Short height; @@ -632,7 +647,6 @@ static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i' /* These are all structures needed for the GSUB table */ -#define GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') typedef struct { DWORD version; @@ -4646,13 +4660,7 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf * load the vdmx entry for the specified height */ -#define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ - ( ( (FT_ULong)_x4 << 24 ) | \ - ( (FT_ULong)_x3 << 16 ) | \ - ( (FT_ULong)_x2 << 8 ) | \ - (FT_ULong)_x1 ) -#define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') typedef struct { WORD version; @@ -5070,10 +5078,6 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) return *encs; } -#define GASP_GRIDFIT 0x01 -#define GASP_DOGRAY 0x02 -#define GASP_TAG MS_MAKE_TAG('g','a','s','p') - static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) { DWORD size; @@ -5083,7 +5087,7 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) BOOL ret = FALSE; *flags = 0; - size = get_font_data( font, GASP_TAG, 0, NULL, 0 ); + size = get_font_data( font, MS_GASP_TAG, 0, NULL, 0 ); if (size == GDI_ERROR) return FALSE; if (size < 4 * sizeof(WORD)) return FALSE; if (size > sizeof(buf)) @@ -5092,7 +5096,7 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) if (!ptr) return FALSE; } - get_font_data( font, GASP_TAG, 0, ptr, size ); + get_font_data( font, MS_GASP_TAG, 0, ptr, size ); version = GET_BE_WORD( *ptr++ ); num_recs = GET_BE_WORD( *ptr++ ); @@ -5678,11 +5682,11 @@ found_face: if (face->flags & ADDFONT_VERTICAL_FONT) /* We need to try to load the GSUB table */ { - int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); + int length = get_font_data(ret, MS_GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR) { ret->GSUB_Table = HeapAlloc(GetProcessHeap(),0,length); - get_font_data(ret, GSUB_TAG , 0, ret->GSUB_Table, length); + get_font_data(ret, MS_GSUB_TAG , 0, ret->GSUB_Table, length); TRACE("Loaded GSUB table of %i bytes\n",length); ret->vert_feature = get_GSUB_vert_feature(ret); if (!ret->vert_feature) @@ -8401,7 +8405,6 @@ BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_filei /************************************************************************* * Kerning support for TrueType fonts */ -#define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') struct TT_kern_table {

1 0