wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Bruno Jesus : advapi32/tests: Fix copy & paste issue (Cppcheck).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: c7772a5d10c64c5ccf184c0ba5bb01f1609d916a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7772a5d10c64c5ccf184c0ba… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Oct 30 23:04:22 2014 -0200 advapi32/tests: Fix copy & paste issue (Cppcheck). --- dlls/advapi32/tests/registry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 82391e1..1445f6f 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1136,7 +1136,7 @@ static void test_reg_open_key(void) ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error); - bRet = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); + error = RegSetKeySecurity(hkRoot32, DACL_SECURITY_INFORMATION, sd); ok(error == ERROR_SUCCESS, "Expected RegSetKeySecurity to return success, got error %u\n", error);

1 0

Michael Stefaniuc : wininet: Simplify while loop conditions (PVS-Studio).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 06afdda61777d43f6c7d5b78157b465172b0174b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06afdda61777d43f6c7d5b781… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:38:20 2014 +0100 wininet: Simplify while loop conditions (PVS-Studio). --- dlls/wininet/http.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a98ed53..cb30b26 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -809,7 +809,7 @@ static void strip_spaces(LPWSTR start) LPWSTR str = start; LPWSTR end; - while (*str == ' ' && *str != '\0') + while (*str == ' ') str++; if (str != start) @@ -841,13 +841,13 @@ static inline BOOL is_basic_auth_value( LPCWSTR pszAuthValue, LPWSTR *pszRealm ) if (!token) return TRUE; realm = ptr; - while (*realm == ' ' && *realm != '\0') + while (*realm == ' ') realm++; if(!strncmpiW(realm, szRealm, ARRAYSIZE(szRealm)) && (realm[ARRAYSIZE(szRealm)] == ' ' || realm[ARRAYSIZE(szRealm)] == '=')) { token++; - while (*token == ' ' && *token != '\0') + while (*token == ' ') token++; if (*token == '\0') return TRUE;

1 0

Michael Stefaniuc : riched20: SUCCEEDED() is already a BOOL (PVS-Studio).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 7f295effbd20301a7a63dc4e8e95c54ceb6189eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f295effbd20301a7a63dc4e8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:28:44 2014 +0100 riched20: SUCCEEDED() is already a BOOL (PVS-Studio). --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 1e62fc1..8fdaa53 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2118,7 +2118,7 @@ static BOOL ME_Copy(ME_TextEditor *editor, const ME_Cursor *start, int nChars) hr = OleSetClipboard(dataObj); IDataObject_Release(dataObj); } - return SUCCEEDED(hr) != 0; + return SUCCEEDED(hr); } /* helper to send a msg filter notification */

1 0

Michael Stefaniuc : comdlg32: Use the proper macro to create an int atom ( PVS-Studio).
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 50a877d69fbbd3fa1bf3ab76966fa47850868690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a877d69fbbd3fa1bf3ab769… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 23:39:44 2014 +0100 comdlg32: Use the proper macro to create an int atom (PVS-Studio). --- dlls/comdlg32/cdlg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index c437183..886804c 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -24,7 +24,7 @@ #include "dlgs.h" /* Common dialogs implementation globals */ -#define COMDLG32_Atom ((ATOM)0xa000) /* MS uses this one to identify props */ +#define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Format registry values before interpreting value type.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: 7f57d8f19a195e5283fea75c86d25d4a4bc0b838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f57d8f19a195e5283fea75c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 14:09:06 2014 +0100 msi: Format registry values before interpreting value type. --- dlls/msi/action.c | 24 ++++++++++-------------- dlls/msi/tests/action.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e310ba3..66c2858 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2438,9 +2438,9 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) return MSI_SetFeatureStates(package); } -static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD *type, DWORD *size ) +static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD len, DWORD *type, DWORD *size ) { - BYTE *data = NULL; + BYTE *data; if (!value) { @@ -2529,19 +2529,18 @@ static BYTE *parse_value( MSIPACKAGE *package, const WCHAR *value, DWORD *type, else { const WCHAR *ptr = value; - DWORD len; *type = REG_SZ; if (value[0] == '#') { - ptr++; + ptr++; len--; if (value[1] == '%') { - ptr++; + ptr++; len--; *type = REG_EXPAND_SZ; } } - len = deformat_string( package, ptr, (WCHAR **)&data ); + data = (BYTE *)msi_strdupW( ptr, len ); if (len > strlenW( (const WCHAR *)data )) *type = REG_MULTI_SZ; *size = (len + 1) * sizeof(WCHAR); } @@ -2872,14 +2871,11 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) msi_free(keypath); return ERROR_FUNCTION_FAILED; } - str = msi_record_get_string( row, 5, &len ); - if (str && len > strlenW( str )) - { - type = REG_MULTI_SZ; - new_size = (len + 1) * sizeof(WCHAR); - new_value = (BYTE *)msi_strdupW( str, len ); - } - else new_value = parse_value( package, str, &type, &new_size ); + str = msi_record_get_string( row, 5, NULL ); + len = deformat_string( package, str, &deformated ); + new_value = parse_value( package, deformated, len, &type, &new_size ); + + msi_free( deformated ); deformat_string(package, name, &deformated); if (!is_special_entry( name )) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 9f1651d..a8903d9 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -186,7 +186,8 @@ static const char property_dat[] = "SERVNAME2\tTestService2\n" "SERVDISP\tTestServiceDisp\n" "SERVDISP2\tTestServiceDisp2\n" - "MSIFASTINSTALL\t1\n"; + "MSIFASTINSTALL\t1\n" + "regdata15\t#x01\n"; static const char environment_dat[] = "Environment\tName\tValue\tComponent_\n" @@ -514,7 +515,11 @@ static const char wrv_registry_dat[] = "regdata8\t2\tSOFTWARE\\Wine\\msitest\tValue4\tone[~]two\taugustus\n" "regdata9\t2\tSOFTWARE\\Wine\\msitest\tValue5\t[~]one[~]two[~]three\taugustus\n" "regdata10\t2\tSOFTWARE\\Wine\\msitest\tValue6\t[~]\taugustus\n" - "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n"; + "regdata11\t2\tSOFTWARE\\Wine\\msitest\tValue7\t[~]two\taugustus\n" + "regdata12\t2\tSOFTWARE\\Wine\\msitest\tValue8\t#1\taugustus\n" + "regdata13\t2\tSOFTWARE\\Wine\\msitest\tValue9\t#x1\taugustus\n" + "regdata14\t2\tSOFTWARE\\Wine\\msitest\tValue10\t#x01\taugustus\n" + "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -4923,6 +4928,7 @@ static void test_write_registry_values(void) HKEY hkey; DWORD type, size; CHAR path[MAX_PATH]; + BYTE buf[8]; if (is_process_limited()) { @@ -5055,6 +5061,42 @@ static void test_write_registry_values(void) ok(size == 5, "Expected 5, got %d\n", size); ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value8", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); + ok(size == 4, "got %u\n", size); + ok(type == REG_DWORD, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value9", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value10", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value11", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(buf[0] == 1, "got %u\n", buf[0]); + ok(size == 1, "got %u\n", size); + ok(type == REG_BINARY, "got %u\n", type); + RegDeleteValueA(hkey, "Value"); RegDeleteValueA(hkey, "Value1"); RegDeleteValueA(hkey, "Value2"); @@ -5063,6 +5105,10 @@ static void test_write_registry_values(void) RegDeleteValueA(hkey, "Value5"); RegDeleteValueA(hkey, "Value6"); RegDeleteValueA(hkey, "Value7"); + RegDeleteValueA(hkey, "Value8"); + RegDeleteValueA(hkey, "Value9"); + RegDeleteValueA(hkey, "Value10"); + RegDeleteValueA(hkey, "Value11"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest");

1 0

Hans Leidekker : msvcrt: Implement _snprintf_l.
by Alexandre Julliard 31 Oct '14

31 Oct '14

Module: wine Branch: master Commit: ed79b3f9a52bcab2b748ceb417c06dd4c5cdc345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed79b3f9a52bcab2b748ceb41… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 30 14:08:26 2014 +0100 msvcrt: Implement _snprintf_l. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 14 ++++++++++++++ 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d6c38f4..91805ee 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1289,7 +1289,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 02b6497..5de6965 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1647,7 +1647,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ce09f00..b7f0a86 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -969,7 +969,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index e4302cf..a8ad25f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -944,7 +944,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf @ stub _snprintf_c @ stub _snprintf_c_l -@ stub _snprintf_l +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s @ stub _snprintf_s_l @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f376db3..37046c3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -912,7 +912,7 @@ @ varargs _snprintf(ptr long str) MSVCRT__snprintf # stub _snprintf_c(ptr long str) # stub _snprintf_c_l(ptr long str ptr) -# stub _snprintf_l(ptr long str ptr) +@ varargs _snprintf_l(ptr long str ptr) MSVCRT__snprintf_l @ varargs _snprintf_s(ptr long long str) MSVCRT__snprintf_s # stub _snprintf_s_l(ptr long long str ptr) @ varargs _snscanf(str long str) MSVCRT__snscanf diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4123d06..a6a4fe7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -818,6 +818,20 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* + * _snprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__snprintf_l(char *str, unsigned int count, MSVCRT__locale_t locale, + const char *format, ...) +{ + int retval; + __ms_va_list valist; + __ms_va_start(valist, format); + retval = MSVCRT_vsnprintf_l(str, count, format, locale, valist); + __ms_va_end(valist); + return retval; +} + +/********************************************************************* * _snprintf_s (MSVCRT.@) */ int CDECL MSVCRT__snprintf_s(char *str, unsigned int len, unsigned int count,

1 0

Huw Davies : comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 433df0d5d8763e24772e60168bb8f1a664bd9ed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=433df0d5d8763e24772e60168… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 28 15:01:18 2014 +0000 comctl32: Enable the appropriate wizard buttons before sending DM_SETDEFID. --- dlls/comctl32/propsheet.c | 21 +++++---------------- dlls/comctl32/tests/propsheet.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 0dd1ca7..5de0deb 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2430,15 +2430,16 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON); HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); + BOOL enable_finish = ((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH); TRACE("%d\n", dwFlags); - EnableWindow(hwndBack, FALSE); - EnableWindow(hwndNext, FALSE); - EnableWindow(hwndFinish, FALSE); + EnableWindow(hwndBack, dwFlags & PSWIZB_BACK); + EnableWindow(hwndNext, dwFlags & PSWIZB_NEXT); + EnableWindow(hwndFinish, enable_finish); /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + if (enable_finish) SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); else if (dwFlags & PSWIZB_NEXT) SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); @@ -2447,13 +2448,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) else SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - - if (dwFlags & PSWIZB_BACK) - EnableWindow(hwndBack, TRUE); - - if (dwFlags & PSWIZB_NEXT) - EnableWindow(hwndNext, TRUE); - if (!psInfo->hasFinish) { if ((dwFlags & PSWIZB_FINISH) || (dwFlags & PSWIZB_DISABLEDFINISH)) @@ -2463,9 +2457,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) /* Show the Finish button */ ShowWindow(hwndFinish, SW_SHOW); - - if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); } else { @@ -2475,8 +2466,6 @@ static void PROPSHEET_SetWizButtons(HWND hwndDlg, DWORD dwFlags) ShowWindow(hwndNext, SW_SHOW); } } - else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) - EnableWindow(hwndFinish, TRUE); } /****************************************************************************** diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index d3112d5..2797e94 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -279,6 +279,37 @@ static INT_PTR CALLBACK nav_page_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM return FALSE; } +static WNDPROC old_nav_dialog_proc; + +static LRESULT CALLBACK new_nav_dialog_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case DM_SETDEFID: + ok( IsWindowEnabled( GetDlgItem(hwnd, wp) ), "button is not enabled\n" ); + break; + } + return CallWindowProcW( old_nav_dialog_proc, hwnd, msg, wp, lp ); +} + +static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) +{ + static BOOL done; + if (code == HCBT_CREATEWND) + { + CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; + + /* The first dialog created will be the parent dialog */ + if (!done && c->lpcs->lpszClass == MAKEINTRESOURCEW(WC_DIALOG)) + { + old_nav_dialog_proc = (WNDPROC)SetWindowLongPtrW( (HWND)wp, GWLP_WNDPROC, (LONG_PTR)new_nav_dialog_proc ); + done = TRUE; + } + } + + return CallNextHookEx( NULL, code, wp, lp ); +} + static void test_wiznavigation(void) { HPROPSHEETPAGE hpsp[4]; @@ -291,6 +322,10 @@ static void test_wiznavigation(void) BOOL hwndtoindex_supported = TRUE; const INT nextID = 12324; const INT backID = 12323; + HHOOK hook; + + /* set up a hook proc in order to subclass the main dialog early on */ + hook = SetWindowsHookExW( WH_CBT, hook_proc, NULL, GetCurrentThreadId() ); /* create the property sheet pages */ memset(psp, 0, sizeof(PROPSHEETPAGEA) * 4); @@ -400,6 +435,7 @@ static void test_wiznavigation(void) ok(defidres == MAKELRESULT(nextID, DC_HASDEFID), "Expected default button ID to be %d, is %d\n", nextID, LOWORD(defidres)); DestroyWindow(hdlg); + UnhookWindowsHookEx( hook ); } static void test_buttons(void)

1 0

Nikolay Sivov : msxml3: Return S_FALSE in getNamedItem() of PI node.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 04305134486cadfb78643a8796ab6a13fec6c202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04305134486cadfb78643a879… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 30 11:06:27 2014 +0300 msxml3: Return S_FALSE in getNamedItem() of PI node. --- dlls/msxml3/pi.c | 4 +++- dlls/msxml3/tests/domdoc.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 6b8fc12..96fb118 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -685,7 +685,9 @@ static HRESULT dom_pi_get_qualified_item(const xmlNodePtr node, BSTR name, BSTR static HRESULT dom_pi_get_named_item(const xmlNodePtr node, BSTR name, IXMLDOMNode **item) { FIXME("(%p)->(%s %p): stub\n", node, debugstr_w(name), item ); - return E_NOTIMPL; + if (item) + *item = NULL; + return S_FALSE; } static HRESULT dom_pi_set_named_item(xmlNodePtr node, IXMLDOMNode *newItem, IXMLDOMNode **namedItem) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 038df04..b768260 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9152,6 +9152,11 @@ static void test_get_attributes(void) hr = IXMLDOMNode_get_attributes(node, &map); ok(hr == S_OK, "got %08x\n", hr); + node2 = (void*)0xdeadbeef; + hr = IXMLDOMNamedNodeMap_getNamedItem(map, _bstr_("attr"), &node2); + ok(hr == S_FALSE, "got %08x\n", hr); + ok(node2 == NULL, "got %p\n", node2); + length = -1; hr = IXMLDOMNamedNodeMap_get_length(map, &length); EXPECT_HR(hr, S_OK);

1 0

Michael Stefaniuc : d3drm: Pass the correct pointer to IDirectXFileData_GetData (PVS-Studio).
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: 0726542dedf481d3eb8c01825da038a71c5363c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0726542dedf481d3eb8c01825… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 30 11:24:20 2014 +0100 d3drm: Pass the correct pointer to IDirectXFileData_GetData (PVS-Studio). Also remove an uneeded initialization of "size" as that is purely an [OUT] parameter. --- dlls/d3drm/d3drm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 06850bc..92ac272 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1240,17 +1240,16 @@ static HRESULT load_data(IDirect3DRM3 *iface, IDirectXFileData *data_object, IID /* Cannot be requested */ if (parent_frame) { - D3DRMMATRIX4D matrix; + D3DRMMATRIX4D *matrix; DWORD size; TRACE("Load Frame Transform Matrix data\n"); - size = sizeof(matrix); - hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)matrix); + hr = IDirectXFileData_GetData(data_object, NULL, &size, (void**)&matrix); if ((hr != DXFILE_OK) || (size != sizeof(matrix))) goto end; - hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, matrix); + hr = IDirect3DRMFrame3_AddTransform(parent_frame, D3DRMCOMBINE_REPLACE, *matrix); if (FAILED(hr)) goto end; }

1 0

Matteo Bruni : wined3d: Check ARB_TEXTURE_COMPRESSION_RGTC for applying the correct fixup.
by Alexandre Julliard 30 Oct '14

30 Oct '14

Module: wine Branch: master Commit: dd923c3029fa4de25b5135c24edc6899c308b563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd923c3029fa4de25b5135c24… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 29 18:01:50 2014 +0100 wined3d: Check ARB_TEXTURE_COMPRESSION_RGTC for applying the correct fixup. --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e969fa7..b9d60de 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2018,7 +2018,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ */ } - if (gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) + if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) { idx = getFmtIdx(WINED3DFMT_ATI2N); gl_info->formats[idx].color_fixup = create_color_fixup_desc(

1 0

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 October 2014