wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Mark Harmstone : comctl32: Use DPI settings for checkbox size.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: bae599092a3d2ab473d2a61a38d1abf0cf84dd3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bae599092a3d2ab473d2a61a3… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat May 23 01:46:59 2015 +0100 comctl32: Use DPI settings for checkbox size. --- dlls/comctl32/theme_button.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index bdeba93..327c76b 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -155,8 +155,7 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } }; - static const int cb_size = 13; - + SIZE sz; RECT bgRect, textRect; HFONT font, hPrevFont = NULL; LRESULT checkState = SendMessageW(hwnd, BM_GETCHECK, 0, 0); @@ -186,15 +185,18 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN hPrevFont = SelectObject(hDC, font); } + if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz))) + sz.cx = sz.cy = 13; + GetClientRect(hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect); if (dtFlags & DT_SINGLELINE) /* Center the checkbox / radio button to the text. */ - bgRect.top = bgRect.top + (textRect.bottom - textRect.top - cb_size) / 2; + bgRect.top = bgRect.top + (textRect.bottom - textRect.top - sz.cy) / 2; /* adjust for the check/radio marker */ - bgRect.bottom = bgRect.top + cb_size; - bgRect.right = bgRect.left + cb_size; + bgRect.bottom = bgRect.top + sz.cy; + bgRect.right = bgRect.left + sz.cx; textRect.left = bgRect.right + 6; DrawThemeParentBackground(hwnd, hDC, NULL);

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 25 May '15

25 May '15

Module: wine Branch: master Commit: 1812df71b816ff6fa399ca98468e8118ec11aa2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1812df71b816ff6fa399ca984… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 14:04:07 2015 +0300 po: Update Russian translation. --- po/ru.po | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/po/ru.po b/po/ru.po index fc9f580..08b2479 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-18 19:06+0300\n" +"PO-Revision-Date: 2015-05-22 14:01+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -7454,10 +7454,8 @@ msgid "Add Control" msgstr "Добавить элемент управления" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Шрифт..." +msgstr "&Конвертировать..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -9206,24 +9204,20 @@ msgstr "" "места, или проверьте сетевое подключение." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Установка Wine Mono" +msgstr "Wine Sound Mapper" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "столбец" +msgstr "Громкость" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Общая громкость" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Отключить" #: winspool.rc:37 msgid "Print to File"

1 0

André Hentschel : Add WWN 391
by Jeremy Newman 22 May '15

22 May '15

Module: website Branch: master Commit: 541599da59f39fec48f00bfb95693d2b66abb50d URL: http://source.winehq.org/git/website.git/?a=commit;h=541599da59f39fec48f00b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 22 16:37:11 2015 +0200 Add WWN 391 --- news/de/2015052201.xml | 10 + news/en/2015052201.xml | 10 + wwn/en/wn20150522_391.xml | 556 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 576 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=541599da59f39fec48…

1 0

Nikolay Sivov : dwrite: Fix splitting by bidi levels.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 90ed96a766b4b627a5dd18d601b41257c4f8e390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90ed96a766b4b627a5dd18d60… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 11:27:51 2015 +0300 dwrite: Fix splitting by bidi levels. --- dlls/dwrite/layout.c | 38 ++++++++++++++------------------------ dlls/dwrite/tests/analyzer.c | 7 +++++++ 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 11d69d8..0a95c4e 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2750,15 +2750,17 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink struct dwrite_textlayout *layout = impl_from_IDWriteTextAnalysisSink(iface); struct layout_run *cur_run; + TRACE("%u %u %u %u\n", position, length, explicitLevel, resolvedLevel); + LIST_FOR_EACH_ENTRY(cur_run, &layout->runs, struct layout_run, entry) { struct regular_layout_run *cur = &cur_run->u.regular; - struct layout_run *run, *run2; + struct layout_run *run; if (cur_run->kind == LAYOUT_RUN_INLINE) continue; /* FIXME: levels are reported in a natural forward direction, so start loop from a run we ended on */ - if (position < cur->descr.textPosition || position > cur->descr.textPosition + cur->descr.stringLength) + if (position < cur->descr.textPosition || position >= cur->descr.textPosition + cur->descr.stringLength) continue; /* full hit - just set run level */ @@ -2775,35 +2777,23 @@ static HRESULT WINAPI dwritetextlayout_sink_SetBidiLevel(IDWriteTextAnalysisSink continue; } - /* now starting point is in a run, so it splits it */ + /* all fully covered runs are processed at this point, reuse existing run for remaining + reported bidi range and add another run for the rest of original one */ + run = alloc_layout_run(LAYOUT_RUN_REGULAR); if (!run) return E_OUTOFMEMORY; *run = *cur_run; - run->u.regular.descr.textPosition = position; - run->u.regular.descr.stringLength = cur->descr.stringLength - position + cur->descr.textPosition; - run->u.regular.descr.string = &layout->str[position]; - run->u.regular.run.bidiLevel = resolvedLevel; - cur->descr.stringLength -= position - cur->descr.textPosition; + run->u.regular.descr.textPosition = position + length; + run->u.regular.descr.stringLength = cur->descr.stringLength - length; + run->u.regular.descr.string = &layout->str[position + length]; - list_add_after(&cur_run->entry, &run->entry); - - if (position + length == run->u.regular.descr.textPosition + run->u.regular.descr.stringLength) - break; + /* reduce existing run */ + cur->run.bidiLevel = resolvedLevel; + cur->descr.stringLength -= length; - /* split second time */ - run2 = alloc_layout_run(LAYOUT_RUN_REGULAR); - if (!run2) - return E_OUTOFMEMORY; - - *run2 = *cur_run; - run2->u.regular.descr.textPosition = run->u.regular.descr.textPosition + run->u.regular.descr.stringLength; - run2->u.regular.descr.stringLength = cur->descr.textPosition + cur->descr.stringLength - position - length; - run2->u.regular.descr.string = &layout->str[run2->u.regular.descr.textPosition]; - run->u.regular.descr.stringLength -= run2->u.regular.descr.stringLength; - - list_add_after(&run->entry, &run2->entry); + list_add_after(&cur_run->entry, &run->entry); break; } diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 0043526..43c2a66 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -878,6 +878,13 @@ static struct sa_test sa_tests[] = { {0x2d30,0x2d4a,0}, 1, { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT }} }, + { + /* LRE/PDF */ + {0x202a,0x202c,'a','b','c','\r',0}, 3, + { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL }, + { 2, 3, DWRITE_SCRIPT_SHAPES_DEFAULT }, + { 5, 1, DWRITE_SCRIPT_SHAPES_NO_VISUAL } } + }, /* keep this as end marker */ { {0} } };

1 0

Nikolay Sivov : riched20: Added some tom* constants used with ITextFont:: Reset().
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 1f55764dfcf67cd09f0dd233f99698961c93d692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f55764dfcf67cd09f0dd233f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 22 11:46:43 2015 +0300 riched20: Added some tom* constants used with ITextFont::Reset(). --- dlls/riched20/riched_tom.idl | 16 ++++++++++++---- dlls/riched20/richole.c | 4 ++-- include/tom.idl | 16 ++++++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/riched_tom.idl b/dlls/riched20/riched_tom.idl index c5e1fe6..4cacbe0 100644 --- a/dlls/riched20/riched_tom.idl +++ b/dlls/riched20/riched_tom.idl @@ -46,10 +46,18 @@ typedef enum tagTomConstants tomDefault = -9999996, tomSuspend = -9999995, tomResume = -9999994, - tomApplyNow = 0, - tomApplyLater = 1, - tomTrackParms = 2, - tomCacheParms = 3, + + /* ITextFont::Reset() modes */ + tomApplyNow = 0, + tomApplyLater = 1, + tomTrackParms = 2, + tomCacheParms = 3, + tomApplyTmp = 4, + tomDisableSmartFont = 8, + tomEnableSmartFont = 9, + tomUsePoints = 10, + tomUseTwips = 11, + tomBackward = 0xc0000001, tomForward = 0x3fffffff, tomMove = 0, diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 3a4eb3b..5c6acb4 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1821,14 +1821,14 @@ static HRESULT WINAPI TextFont_CanChange(ITextFont *iface, LONG *ret) static HRESULT WINAPI TextFont_IsEqual(ITextFont *iface, ITextFont *font, LONG *ret) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%p): stub\n", This, ret); + FIXME("(%p)->(%p %p): stub\n", This, font, ret); return E_NOTIMPL; } static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p): stub\n", This); + FIXME("(%p)->(%d): stub\n", This, value); return E_NOTIMPL; } diff --git a/include/tom.idl b/include/tom.idl index 769e31b..343906d 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -33,10 +33,18 @@ typedef enum tagTomConstants tomDefault = -9999996, tomSuspend = -9999995, tomResume = -9999994, - tomApplyNow = 0, - tomApplyLater = 1, - tomTrackParms = 2, - tomCacheParms = 3, + + /* ITextFont::Reset() modes */ + tomApplyNow = 0, + tomApplyLater = 1, + tomTrackParms = 2, + tomCacheParms = 3, + tomApplyTmp = 4, + tomDisableSmartFont = 8, + tomEnableSmartFont = 9, + tomUsePoints = 10, + tomUseTwips = 11, + tomBackward = 0xc0000001, tomForward = 0x3fffffff, tomMove = 0,

1 0

Huw Davies : dinput/tests: Send a matching key-up event.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 4b110f7554460bd0743dae966c88e7715339594a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b110f7554460bd0743dae966… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 09:45:02 2015 +0100 dinput/tests: Send a matching key-up event. The user32 msg tests are failing (more than normal) as they still see 'Q' in the down state. --- dlls/dinput/tests/keyboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index a0e7d24..520740d 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -110,6 +110,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); } + keybd_event('Q', 0, KEYEVENTF_KEYUP, 0); if (pKeyboard) IUnknown_Release(pKeyboard); }

1 0

Huw Davies : riched20/tests: Fix test on 64-bit.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 008ceb662dd617feeea80273c5310fb09b9e046b URL: http://source.winehq.org/git/wine.git/?a=commit;h=008ceb662dd617feeea80273c… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 22 09:17:21 2015 +0100 riched20/tests: Fix test on 64-bit. --- dlls/riched20/tests/richole.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 5472ce1..51e5631 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -525,8 +525,11 @@ static void test_ITextSelection_GetText(void) hres = ITextSelection_GetText(txtSel, &bstr); ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); - hres = ITextSelection_GetText(txtSel, NULL); - ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + if (!is64bit) + { + hres = ITextSelection_GetText(txtSel, NULL); + ok(hres == CO_E_RELEASED, "got 0x%08x\n", hres); + } ITextSelection_Release(txtSel); }

1 0

Bruno Jesus : ws2_32: Simplify select() to make its code more reusable.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 2a1ae98b5545b6e3c1b29b8a2c9a8fd10f7b16cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1ae98b5545b6e3c1b29b8a2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu May 21 23:55:03 2015 -0300 ws2_32: Simplify select() to make its code more reusable. --- dlls/ws2_32/socket.c | 61 ++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index de391c9..fdf68a3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4789,6 +4789,34 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd } } +static int do_poll(struct pollfd *pollfds, int count, int timeout) +{ + struct timeval tv1, tv2; + int ret, torig = timeout; + + if (timeout > 0) gettimeofday( &tv1, 0 ); + + while ((ret = poll( pollfds, count, timeout )) < 0) + { + if (errno != EINTR) break; + if (timeout < 0) continue; + + gettimeofday( &tv2, 0 ); + + tv2.tv_sec -= tv1.tv_sec; + tv2.tv_usec -= tv1.tv_usec; + if (tv2.tv_usec < 0) + { + tv2.tv_usec += 1000000; + tv2.tv_sec -= 1; + } + + timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000; + if (timeout <= 0) return 0; + } + return ret; +} + /* map the poll results back into the Windows fd sets */ static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set *exceptfds, const struct pollfd *fds ) @@ -4830,7 +4858,6 @@ static int get_poll_results( WS_fd_set *readfds, WS_fd_set *writefds, WS_fd_set return total; } - /*********************************************************************** * select (WS2_32.18) */ @@ -4839,8 +4866,6 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, const struct WS_timeval* ws_timeout) { struct pollfd *pollfds; - struct timeval tv1, tv2; - int torig = 0; int count, ret, timeout = -1; TRACE("read %p, write %p, excp %p timeout %p\n", @@ -4850,35 +4875,9 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, return SOCKET_ERROR; if (ws_timeout) - { - torig = (ws_timeout->tv_sec * 1000) + (ws_timeout->tv_usec + 999) / 1000; - timeout = torig; - gettimeofday( &tv1, 0 ); - } - - while ((ret = poll( pollfds, count, timeout )) < 0) - { - if (errno == EINTR) - { - if (!ws_timeout) continue; - gettimeofday( &tv2, 0 ); + timeout = (ws_timeout->tv_sec * 1000) + (ws_timeout->tv_usec + 999) / 1000; - tv2.tv_sec -= tv1.tv_sec; - tv2.tv_usec -= tv1.tv_usec; - if (tv2.tv_usec < 0) - { - tv2.tv_usec += 1000000; - tv2.tv_sec -= 1; - } - - timeout = torig - (tv2.tv_sec * 1000) - (tv2.tv_usec + 999) / 1000; - if (timeout <= 0) - { - ret = 0; - break; - } - } else break; - } + ret = do_poll(pollfds, count, timeout); release_poll_fds( ws_readfds, ws_writefds, ws_exceptfds, pollfds ); if (ret == -1) SetLastError(wsaErrno());

1 0

Michael Müller : wbemprox: Add support for Win32_SystemEnclosure.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 96b5d9aa973dade6d93b504ee19c536cb10e5e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b5d9aa973dade6d93b504ee… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 16 21:46:13 2015 +0200 wbemprox: Add support for Win32_SystemEnclosure. From: Michael Müller <michael(a)fds-team.de> --- dlls/wbemprox/builtin.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 12 +++++----- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1f51c5..b55e9ad 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -98,6 +98,8 @@ static const WCHAR class_sidW[] = {'W','i','n','3','2','_','S','I','D',0}; static const WCHAR class_sounddeviceW[] = {'W','i','n','3','2','_','S','o','u','n','d','D','e','v','i','c','e',0}; +static const WCHAR class_systemenclosureW[] = + {'W','i','n','3','2','_','S','y','s','t','e','m','E','n','c','l','o','s','u','r','e',0}; static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; @@ -133,6 +135,8 @@ static const WCHAR prop_capacityW[] = {'C','a','p','a','c','i','t','y',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; +static const WCHAR prop_chassistypesW[] = + {'C','h','a','s','s','i','s','T','y','p','e','s',0}; static const WCHAR prop_classW[] = {'C','l','a','s','s',0}; static const WCHAR prop_codesetW[] = @@ -225,6 +229,8 @@ static const WCHAR prop_localdatetimeW[] = {'L','o','c','a','l','D','a','t','e','T','i','m','e',0}; static const WCHAR prop_localeW[] = {'L','o','c','a','l','e',0}; +static const WCHAR prop_lockpresentW[] = + {'L','o','c','k','P','r','e','s','e','n','t',0}; static const WCHAR prop_macaddressW[] = {'M','A','C','A','d','d','r','e','s','s',0}; static const WCHAR prop_manufacturerW[] = @@ -590,6 +596,16 @@ static const struct column col_stdregprov[] = { method_enumvaluesW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, { method_getstringvalueW, CIM_FLAG_ARRAY|COL_FLAG_METHOD } }; +static const struct column col_systemenclosure[] = +{ + { prop_captionW, CIM_STRING }, + { prop_chassistypesW, CIM_UINT16|CIM_FLAG_ARRAY }, + { prop_descriptionW, CIM_STRING }, + { prop_lockpresentW, CIM_BOOLEAN }, + { prop_manufacturerW, CIM_STRING }, + { prop_nameW, CIM_STRING }, + { prop_tagW, CIM_STRING }, +}; static const struct column col_systemsecurity[] = { { method_getsdW, CIM_FLAG_ARRAY|COL_FLAG_METHOD }, @@ -702,6 +718,12 @@ static const WCHAR physicalmedia_tagW[] = {'\\','\\','.','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','0',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; +static const WCHAR systemenclosure_systemenclosureW[] = + {'S','y','s','t','e','m',' ','E','n','c','l','o','s','u','r','e',0}; +static const WCHAR systemenclosure_tagW[] = + {'S','y','s','t','e','m',' ','E','n','c','l','o','s','u','r','e',' ','0',0}; +static const WCHAR systemenclosure_manufacturerW[] = + {'W','i','n','e',0}; static const WCHAR videocontroller_dactypeW[] = {'I','n','t','e','g','r','a','t','e','d',' ','R','A','M','D','A','C',0}; static const WCHAR videocontroller_deviceidW[] = @@ -960,6 +982,16 @@ struct record_systemsecurity class_method *getsd; class_method *setsd; }; +struct record_systemenclosure +{ + const WCHAR *caption; + const struct array *chassistypes; + const WCHAR *description; + int lockpresent; + const WCHAR *manufacturer; + const WCHAR *name; + const WCHAR *tag; +}; struct record_videocontroller { const WCHAR *adapter_dactype; @@ -1044,6 +1076,27 @@ static const struct record_stdregprov data_stdregprov[] = { { reg_enum_key, reg_enum_values, reg_get_stringvalue } }; +static UINT16 systemenclosure_chassistypes[] = +{ + 1, +}; +static const struct array systemenclosure_chassistypes_array = +{ + SIZEOF(systemenclosure_chassistypes), + &systemenclosure_chassistypes +}; +static const struct record_systemenclosure data_systemenclosure[] = +{ + { + systemenclosure_systemenclosureW, + &systemenclosure_chassistypes_array, + systemenclosure_systemenclosureW, + FALSE, + systemenclosure_manufacturerW, + systemenclosure_systemenclosureW, + systemenclosure_tagW, + } +}; static const struct record_systemsecurity data_systemsecurity[] = { { security_get_sd, security_set_sd } @@ -2817,6 +2870,7 @@ static struct table builtin_classes[] = { class_sounddeviceW, SIZEOF(col_sounddevice), col_sounddevice, SIZEOF(data_sounddevice), 0, (BYTE *)data_sounddevice }, { class_stdregprovW, SIZEOF(col_stdregprov), col_stdregprov, SIZEOF(data_stdregprov), 0, (BYTE *)data_stdregprov }, { class_systemsecurityW, SIZEOF(col_systemsecurity), col_systemsecurity, SIZEOF(data_systemsecurity), 0, (BYTE *)data_systemsecurity }, + { class_systemenclosureW, SIZEOF(col_systemenclosure), col_systemenclosure, SIZEOF(data_systemenclosure), 0, (BYTE *)data_systemenclosure }, { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, 0, NULL, fill_videocontroller } }; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index bc85e62..a7bf201 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -437,10 +437,7 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) ok( hr == S_OK, "IWbemServices_ExecQuery failed %08x\n", hr ); hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); - todo_wine ok( hr == S_OK, "IEnumWbemClassObject_Next failed %08x\n", hr ); - if (hr != S_OK) - goto done; type = 0xdeadbeef; VariantInit( &val ); @@ -455,6 +452,7 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) VariantInit( &val ); hr = IWbemClassObject_Get( obj, chassistypesW, 0, &val, &type, NULL ); ok( hr == S_OK, "failed to get chassis types %08x\n", hr ); + todo_wine ok( V_VT( &val ) == (VT_I4|VT_ARRAY), "unexpected variant type 0x%x\n", V_VT( &val ) ); ok( type == (CIM_UINT16|CIM_FLAG_ARRAY), "unexpected type 0x%x\n", type ); hr = SafeArrayAccessData( V_ARRAY( &val ), (void **)&data ); @@ -467,8 +465,11 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) ok( hr == S_OK, "SafeArrayGetLBound failed %x\n", hr ); hr = SafeArrayGetUBound( V_ARRAY( &val ), 1, &upper ); ok( hr == S_OK, "SafeArrayGetUBound failed %x\n", hr ); - for (i = 0; i < upper - lower + 1; i++) - trace( "chassis type: %u\n", data[i] ); + if (V_VT( &val ) == (VT_I4|VT_ARRAY)) + { + for (i = 0; i < upper - lower + 1; i++) + trace( "chassis type: %u\n", data[i] ); + } hr = SafeArrayUnaccessData( V_ARRAY( &val ) ); ok( hr == S_OK, "SafeArrayUnaccessData failed %x\n", hr ); } @@ -520,7 +521,6 @@ static void test_Win32_SystemEnclosure( IWbemServices *services ) VariantClear( &val ); IWbemClassObject_Release( obj ); -done: IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql );

1 0

Sebastian Lackner : wbemprox: Fix handling of arrays as query results.
by Alexandre Julliard 22 May '15

22 May '15

Module: wine Branch: master Commit: 37b1048bd21204c222feef1f61767feecb2fc4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b1048bd21204c222feef1f6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 09:38:15 2015 +0200 wbemprox: Fix handling of arrays as query results. --- dlls/wbemprox/builtin.c | 22 ++++++++++++++++------ dlls/wbemprox/table.c | 7 ++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8ba2642..f1f51c5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -938,7 +938,7 @@ struct record_service struct record_sid { const WCHAR *accountname; - const UINT8 *binaryrepresentation; + const struct array *binaryrepresentation; const WCHAR *referenceddomainname; const WCHAR *sid; UINT32 sidlength; @@ -2614,12 +2614,22 @@ static WCHAR *get_accountname( LSA_TRANSLATED_NAME *name ) if (!name || !name->Name.Buffer) return NULL; return heap_strdupW( name->Name.Buffer ); } -static UINT8 *get_binaryrepresentation( PSID sid, UINT len ) +static struct array *get_binaryrepresentation( PSID sid, UINT len ) { - UINT8 *ret = heap_alloc( len ); - if (!ret) return NULL; - memcpy( ret, sid, len ); - return ret; + struct array *array = heap_alloc( sizeof(struct array) ); + if (array) + { + UINT8 *ret = heap_alloc( len ); + if (ret) + { + memcpy( ret, sid, len ); + array->count = len; + array->ptr = ret; + return array; + } + heap_free( array ); + } + return NULL; } static WCHAR *get_referenceddomainname( LSA_REFERENCED_DOMAIN_LIST *domain ) { diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 0c57f26..273b8cb 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -288,10 +288,15 @@ void free_row_values( const struct table *table, UINT row ) if (!(table->columns[i].type & COL_FLAG_DYNAMIC)) continue; type = table->columns[i].type & COL_TYPE_MASK; - if (type == CIM_STRING || type == CIM_DATETIME || (type & CIM_FLAG_ARRAY)) + if (type == CIM_STRING || type == CIM_DATETIME) { if (get_value( table, row, i, &val ) == S_OK) heap_free( (void *)(INT_PTR)val ); } + else if (type & CIM_FLAG_ARRAY) + { + if (get_value( table, row, i, &val ) == S_OK) + destroy_array( (void *)(INT_PTR)val, type & CIM_TYPE_MASK ); + } } }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015