November 2010 - Wine-commits

Detlef Riekenberg : wer/tests: Add more tests for Wer*ExcludedApplication.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 5858af901189c8ff5674e1714c4a9096987b6f44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5858af901189c8ff5674e1714… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 1 23:08:47 2010 +0100 wer/tests: Add more tests for Wer*ExcludedApplication. --- dlls/wer/tests/main.c | 66 ++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 54 insertions(+), 12 deletions(-) diff --git a/dlls/wer/tests/main.c b/dlls/wer/tests/main.c index f63b7bd..b10a819 100644 --- a/dlls/wer/tests/main.c +++ b/dlls/wer/tests/main.c @@ -31,6 +31,7 @@ #include "wine/test.h" static const WCHAR appcrash[] = {'A','P','P','C','R','A','S','H',0}; +static const WCHAR backslash[] = {'\\',0}; static const WCHAR empty[] = {0}; static const WCHAR winetest_wer[] = {'w','i','n','e','t','e','s','t','_','w','e','r','.','e','x','e',0}; @@ -39,14 +40,12 @@ static const WCHAR winetest_wer[] = {'w','i','n','e','t','e','s','t','_','w','e' static void test_WerAddExcludedApplication(void) { HRESULT hr; + WCHAR buffer[MAX_PATH]; + UINT res; /* clean state */ hr = WerRemoveExcludedApplication(winetest_wer, FALSE); - if (hr == E_NOTIMPL) { - skip("Wer*ExcludedApplication not implemented\n"); - return; - } - ok((hr == S_OK) || (hr == E_FAIL) || __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND), + ok((hr == S_OK) || (hr == E_FAIL) || (hr == __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND)), "got 0x%x (expected S_OK, E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); hr = WerAddExcludedApplication(NULL, FALSE); @@ -65,6 +64,27 @@ static void test_WerAddExcludedApplication(void) /* cleanup */ hr = WerRemoveExcludedApplication(winetest_wer, FALSE); ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + /* appname has a path */ + res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + if (res > 0) { + /* the last part from the path is added to the inclusion list */ + hr = WerAddExcludedApplication(buffer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + hr = WerRemoveExcludedApplication(buffer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + lstrcatW(buffer, backslash); + hr = WerAddExcludedApplication(buffer, FALSE); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + lstrcatW(buffer, winetest_wer); + hr = WerAddExcludedApplication(buffer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + hr = WerRemoveExcludedApplication(buffer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + } + } /* #### */ @@ -72,15 +92,12 @@ static void test_WerAddExcludedApplication(void) static void test_WerRemoveExcludedApplication(void) { HRESULT hr; + WCHAR buffer[MAX_PATH]; + UINT res; /* clean state */ hr = WerRemoveExcludedApplication(winetest_wer, FALSE); - if (hr == E_NOTIMPL) { - skip("Wer*ExcludedApplication not implemented\n"); - return; - } - - ok((hr == S_OK) || (hr == E_FAIL) || __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND), + ok((hr == S_OK) || (hr == E_FAIL) || (hr == __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND)), "got 0x%x (expected S_OK, E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); hr = WerAddExcludedApplication(winetest_wer, FALSE); @@ -97,9 +114,34 @@ static void test_WerRemoveExcludedApplication(void) /* app not in the list */ hr = WerRemoveExcludedApplication(winetest_wer, FALSE); - ok((hr == E_FAIL) || __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND), + ok((hr == E_FAIL) || (hr == __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND)), "got 0x%x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); + /* appname has a path */ + res = GetWindowsDirectoryW(buffer, sizeof(buffer) / sizeof(buffer[0])); + if (res > 0) { + hr = WerRemoveExcludedApplication(buffer, FALSE); + ok((hr == E_FAIL) || (hr == __HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND)), + "got 0x%x (expected E_FAIL or HRESULT_FROM_WIN32(ERROR_ENVVAR_NOT_FOUND))\n", hr); + + /* the last part from the path is added to the inclusion list */ + hr = WerAddExcludedApplication(buffer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + hr = WerRemoveExcludedApplication(buffer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + + lstrcatW(buffer, backslash); + hr = WerAddExcludedApplication(buffer, FALSE); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + hr = WerRemoveExcludedApplication(buffer, FALSE); + ok(hr == E_INVALIDARG, "got 0x%x (expected E_INVALIDARG)\n", hr); + + lstrcatW(buffer, winetest_wer); + hr = WerAddExcludedApplication(buffer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + hr = WerRemoveExcludedApplication(buffer, FALSE); + ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); + } } /* #### */

1 0

Detlef Riekenberg : include: Add WerReportSetParameter + WerReportSubmit.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: d7ed75496806443a15b026093edfa6adde110151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ed75496806443a15b026093… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Nov 1 23:08:48 2010 +0100 include: Add WerReportSetParameter + WerReportSubmit. --- include/werapi.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/include/werapi.h b/include/werapi.h index a1db799..4b79c04 100644 --- a/include/werapi.h +++ b/include/werapi.h @@ -25,9 +25,48 @@ extern "C" { #endif +/* Only 10 parameter are allowed in WerReportSetParameter */ +#define WER_MAX_PARAM_COUNT 10 +#define WER_P0 0 +#define WER_P1 1 +#define WER_P2 2 +#define WER_P3 3 +#define WER_P4 4 +#define WER_P5 5 +#define WER_P6 6 +#define WER_P7 7 +#define WER_P8 8 +#define WER_P9 9 + +/* Flags for WerReportSubmit */ +#define WER_SUBMIT_HONOR_RECOVERY 0x0001 +#define WER_SUBMIT_HONOR_RESTART 0x0002 +#define WER_SUBMIT_QUEUE 0x0004 +#define WER_SUBMIT_SHOW_DEBUG 0x0008 +#define WER_SUBMIT_ADD_REGISTERED_DATA 0x0010 +#define WER_SUBMIT_OUTOFPROCESS 0x0020 +#define WER_SUBMIT_NO_CLOSE_UI 0x0040 +#define WER_SUBMIT_NO_QUEUE 0x0080 +#define WER_SUBMIT_NO_ARCHIVE 0x0100 +#define WER_SUBMIT_START_MINIMIZED 0x0200 +#define WER_SUBMIT_OUTOFPROCESS_ASYNC 0x0400 +#define WER_SUBMIT_BYPASS_DATA_THROTTLING 0x0800 +#define WER_SUBMIT_ARCHIVE_PARAMETERS_ONLY 0x1000 +#define WER_SUBMIT_REPORT_MACHINE_ID 0x2000 + +/* #### */ typedef HANDLE HREPORT; +typedef enum _WER_CONSENT +{ + WerConsentNotAsked = 1, + WerConsentApproved, + WerConsentDenied, + WerConsentAlwaysPrompt, + WerConsentMax +} WER_CONSENT; + typedef enum _WER_REGISTER_FILE_TYPE { WerRegFileTypeUserDocument = 1, @@ -58,11 +97,28 @@ typedef enum _WER_REPORT_TYPE WerReportInvalid } WER_REPORT_TYPE; +typedef enum _WER_SUBMIT_RESULT +{ + WerReportQueued = 1, + WerReportUploaded, + WerReportDebug, + WerReportFailed, + WerDisabled, + WerReportCancelled, + WerDisabledQueue, + WerReportAsync, + WerCustomAction +} WER_SUBMIT_RESULT, *PWER_SUBMIT_RESULT; + +/* #### */ + HRESULT WINAPI WerAddExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerRegisterFile(PCWSTR file, WER_REGISTER_FILE_TYPE regfiletype, DWORD flags); HRESULT WINAPI WerRemoveExcludedApplication(PCWSTR, BOOL); HRESULT WINAPI WerReportCloseHandle(HREPORT); HRESULT WINAPI WerReportCreate(PCWSTR, WER_REPORT_TYPE, PWER_REPORT_INFORMATION, HREPORT*); +HRESULT WINAPI WerReportSetParameter(HREPORT, DWORD, PCWSTR, PCWSTR); +HRESULT WINAPI WerReportSubmit(HREPORT, WER_CONSENT, DWORD, PWER_SUBMIT_RESULT); #ifdef __cplusplus }

1 0

Paul Vriens : msvfw32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: ea458a97d081d6731b6b82089091a3bec59a0bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea458a97d081d6731b6b82089… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 3 11:23:58 2010 +0100 msvfw32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/msvfw32/Makefile.in | 1 + dlls/msvfw32/msvfw32_Sr.rc | 90 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index 65b406b..14857ce 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ msvfw32_Ro.rc \ msvfw32_Ru.rc \ msvfw32_Si.rc \ + msvfw32_Sr.rc \ msvfw32_Sv.rc \ msvfw32_Tr.rc \ msvfw32_Uk.rc \ diff --git a/dlls/msvfw32/msvfw32_Sr.rc b/dlls/msvfw32/msvfw32_Sr.rc new file mode 100644 index 0000000..25c8ae0 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Sr.rc @@ -0,0 +1,90 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "msvideo_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Сажимање видео записа" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "У реду",IDOK,129,2,49,14 + PUSHBUTTON "Откажи",IDCANCEL,129,18,49,14 + + LTEXT "&Компресор:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&Подеси...",882,129,36,49,14 + PUSHBUTTON "&О програму...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "&Квалитет сажимања:",886,9,34,80,8 + + CONTROL "&Кључни кадар сваких",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "кадрова",889,103,62,26,10 + + CONTROL "&Проток података",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/с",896,102,78,26,10 +} + +STRINGTABLE +{ + IDS_FULLFRAMES "Цели кадрови (несажето)" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +ICM_CHOOSE_COMPRESSOR DIALOG 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Sažimanje video zapisa" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "U redu",IDOK,129,2,49,14 + PUSHBUTTON "Otkaži",IDCANCEL,129,18,49,14 + + LTEXT "&Kompresor:",-1,9,6,105,8 + COMBOBOX 880,9,16,111,67,CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + + PUSHBUTTON "&Podesi...",882,129,36,49,14 + PUSHBUTTON "&O programu...",883,129,52,49,14 + + SCROLLBAR 884,9,44,111,9,WS_TABSTOP + + LTEXT "&Kvalitet sažimanja:",886,9,34,80,8 + + CONTROL "&Ključni kadar svakih",887,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,60,66,12 + EDITTEXT 888,78,60,22,12 + LTEXT "kadrova",889,103,62,26,10 + + CONTROL "&Protok podataka",894,"Button",BS_AUTOCHECKBOX|WS_TABSTOP,9,76,66,12 + EDITTEXT 895,78,76,22,12 + LTEXT "KB/s",896,102,78,26,10 +} + +STRINGTABLE +{ + IDS_FULLFRAMES "Celi kadrovi (nesažeto)" +}

1 0

Paul Vriens : msvidc32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: c77add5e1194903dc7259aee61561b86b5ed2e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c77add5e1194903dc7259aee6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 3 11:25:08 2010 +0100 msvidc32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/msvidc32/Makefile.in | 1 + dlls/msvidc32/msvidc32_Sr.rc | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/msvidc32/Makefile.in b/dlls/msvidc32/Makefile.in index f58d107..2046289 100644 --- a/dlls/msvidc32/Makefile.in +++ b/dlls/msvidc32/Makefile.in @@ -23,6 +23,7 @@ RC_SRCS = \ msvidc32_Ro.rc \ msvidc32_Ru.rc \ msvidc32_Si.rc \ + msvidc32_Sr.rc \ msvidc32_Sv.rc \ msvidc32_Tr.rc \ msvidc32_Uk.rc diff --git a/dlls/msvidc32/msvidc32_Sr.rc b/dlls/msvidc32/msvidc32_Sr.rc new file mode 100644 index 0000000..453a73b --- /dev/null +++ b/dlls/msvidc32/msvidc32_Sr.rc @@ -0,0 +1,38 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "msvidc32_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 видео кодек" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_NAME "MS-CRAM" + IDS_DESCRIPTION "Wine Video 1 video kodek" +}

1 0

Paul Vriens : oleaut32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 04adc0598d591871694839e637e1074456484886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04adc0598d591871694839e63… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 3 11:32:25 2010 +0100 oleaut32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/oleaut32/Makefile.in | 1 + dlls/oleaut32/oleaut32_Sr.rc | 48 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index bf84c80..687d42a 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -47,6 +47,7 @@ RC_SRCS = \ oleaut32_Ro.rc \ oleaut32_Ru.rc \ oleaut32_Si.rc \ + oleaut32_Sr.rc \ oleaut32_Sv.rc \ oleaut32_Th.rc \ oleaut32_Tr.rc \ diff --git a/dlls/oleaut32/oleaut32_Sr.rc b/dlls/oleaut32/oleaut32_Sr.rc new file mode 100644 index 0000000..4dc6456 --- /dev/null +++ b/dlls/oleaut32/oleaut32_Sr.rc @@ -0,0 +1,48 @@ +/* + * Serbian resources for oleaut32 + * + * Copyright 2003 Jon Griffiths + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_TRUE "Тачно" + IDS_FALSE "Нетачно" + IDS_YES "Да" + IDS_NO "Не" + IDS_ON "Укључено" + IDS_OFF "Искључено" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_TRUE "Tačno" + IDS_FALSE "Netačno" + IDS_YES "Da" + IDS_NO "Ne" + IDS_ON "Uključeno" + IDS_OFF "Isključeno" +}

1 0

Paul Vriens : shlwapi: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 70e6a2f7aeb0509467c542ab56270092e0aa5adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=70e6a2f7aeb0509467c542ab5… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Nov 3 11:58:35 2010 +0100 shlwapi: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/shlwapi/Makefile.in | 1 + dlls/shlwapi/shlwapi_Sr.rc | 72 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index b416375..9f2e59a 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -41,6 +41,7 @@ RC_SRCS = \ shlwapi_Ru.rc \ shlwapi_Si.rc \ shlwapi_Sk.rc \ + shlwapi_Sr.rc \ shlwapi_Sv.rc \ shlwapi_Tr.rc \ shlwapi_Uk.rc \ diff --git a/dlls/shlwapi/shlwapi_Sr.rc b/dlls/shlwapi/shlwapi_Sr.rc new file mode 100644 index 0000000..066f67f --- /dev/null +++ b/dlls/shlwapi/shlwapi_Sr.rc @@ -0,0 +1,72 @@ +/* + * Serbian resources for shlwapi + * + * Copyright 2004 Jon Griffiths + * Copyright 2010 Đorđe Vasiljević + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Грешка!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Не приказуј ми &ову поруку поново", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&У реду", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Откажи", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Да", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Не", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld бајтова" + IDS_TIME_INTERVAL_HOURS " ч." + IDS_TIME_INTERVAL_MINUTES " мин." + IDS_TIME_INTERVAL_SECONDS " сек." +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Greška!" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 + LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 + CHECKBOX "Ne prikazuj mi &ovu poruku ponovo", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&U redu", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Otkaži", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Da", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Ne", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +{ + IDS_BYTES_FORMAT "%ld bajtova" + IDS_TIME_INTERVAL_HOURS " č." + IDS_TIME_INTERVAL_MINUTES " min." + IDS_TIME_INTERVAL_SECONDS " sek." +}

1 0

Eryk Wieliczko : msvcrt: Implement _ftelli64.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: a3927b5e09b616f6c9f67b7443cc7a8d158c654c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3927b5e09b616f6c9f67b744… Author: Eryk Wieliczko <ewdevel(a)gmail.com> Date: Wed Nov 3 13:33:12 2010 +0100 msvcrt: Implement _ftelli64. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 18 +++++++++++++----- dlls/msvcrt/msvcrt.spec | 1 + include/msvcrt/stdio.h | 2 ++ 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 800fc31..e451db9 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -656,7 +656,7 @@ @ cdecl _fstat64(long ptr) msvcrt._fstat64 @ cdecl _fstat64i32(long ptr) msvcr90._fstat64i32 @ stub _ftell_nolock -@ stub _ftelli64 +@ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock @ cdecl _ftime32(ptr) msvcrt._ftime32 @ stub _ftime32_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5dfce03..1734c72 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -497,7 +497,7 @@ @ cdecl _fstat64(long ptr) msvcrt._fstat64 @ cdecl _fstat64i32(long ptr) msvcr90._fstat64i32 @ stub _ftell_nolock -@ stub _ftelli64 +@ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock @ cdecl _ftime32(ptr) msvcrt._ftime32 @ stub _ftime32_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2e63ad7..f188329 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -489,7 +489,7 @@ @ cdecl _fstat64(long ptr) msvcrt._fstat64 @ cdecl _fstat64i32(long ptr) @ stub _ftell_nolock -@ stub _ftelli64 +@ cdecl -ret64 _ftelli64(ptr) msvcrt._ftelli64 @ stub _ftelli64_nolock @ cdecl _ftime32(ptr) msvcrt._ftime32 @ stub _ftime32_s diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ab18c1f..f99a22d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2997,14 +2997,14 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) } /********************************************************************* - * ftell (MSVCRT.@) + * _ftelli64 (MSVCRT.@) */ -LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) +__int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) { /* TODO: just call fgetpos and return lower half of result */ int off=0; - MSVCRT_long pos; - pos = MSVCRT__tell(file->_file); + __int64 pos; + pos = _telli64(file->_file); if(pos == -1) return -1; if(file->_bufsiz) { if( file->_flag & MSVCRT__IOWRT ) { @@ -3018,7 +3018,7 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) if (file->_ptr[i] == '\n') off--; } - /* Black magic when reading CR at buffer boundary*/ + /* Black magic when reading CR at buffer boundary*/ if(MSVCRT_fdesc[file->_file].wxflag & WX_READCR) off--; @@ -3029,6 +3029,14 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) } /********************************************************************* + * ftell (MSVCRT.@) + */ +LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) +{ + return MSVCRT__ftelli64(file); +} + +/********************************************************************* * fgetpos (MSVCRT.@) */ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 70d28ce..a667ada 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -442,6 +442,7 @@ @ cdecl _fstat(long ptr) MSVCRT__fstat @ cdecl _fstat64(long ptr) MSVCRT__fstat64 @ cdecl _fstati64(long ptr) MSVCRT__fstati64 +@ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64 @ cdecl _ftime(ptr) MSVCRT__ftime @ cdecl _ftime32(ptr) MSVCRT__ftime32 # stub _ftime32_s diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index dd4b26c..a190f5d 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -138,8 +138,10 @@ FILE* __cdecl freopen(const char*,const char*,FILE*); int __cdecl fscanf(FILE*,const char*,...); int __cdecl fscanf_s(FILE*,const char*,...); int __cdecl fseek(FILE*,__msvcrt_long,int); +int __cdecl _fseeki64(FILE*,__int64,int); int __cdecl fsetpos(FILE*,fpos_t*); __msvcrt_long __cdecl ftell(FILE*); +__int64 __cdecl _ftelli64(FILE*); size_t __cdecl fwrite(const void*,size_t,size_t,FILE*); int __cdecl getc(FILE*); int __cdecl getchar(void);

1 0

Alexander Morozov : crypt32/tests: Add tests for CMSG_RECIPIENT_COUNT_PARAM and CMSG_RECIPIENT_INFO_PARAM.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 6462283fbe650e46230b426e795be04d701c8fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6462283fbe650e46230b426e7… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Mon Aug 30 21:16:23 2010 +0400 crypt32/tests: Add tests for CMSG_RECIPIENT_COUNT_PARAM and CMSG_RECIPIENT_INFO_PARAM. --- dlls/crypt32/tests/msg.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 49d564f..63149e7 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -2807,6 +2807,54 @@ static const BYTE envelopedBareMessage[] = { 0x30,0x1f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x01,0x30,0x0c, 0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x03,0x04,0x05,0x00,0x80,0x04,0x2c, 0x2d,0xa3,0x6e }; +static const BYTE envelopedMessageWith3Recps[] = { +0x30,0x82,0x02,0x69,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07,0x03, +0xa0,0x82,0x02,0x5a,0x30,0x82,0x02,0x56,0x02,0x01,0x00,0x31,0x82,0x02,0x2e, +0x30,0x81,0xb7,0x02,0x01,0x00,0x30,0x20,0x30,0x0c,0x31,0x0a,0x30,0x08,0x06, +0x03,0x55,0x04,0x03,0x13,0x01,0x4e,0x02,0x10,0x63,0x75,0x75,0x7a,0x53,0x36, +0xa9,0xba,0x41,0xa5,0xcc,0x01,0x7f,0x76,0x4c,0xd9,0x30,0x0d,0x06,0x09,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x04,0x81,0x80,0xa4,0x2e, +0xe5,0x56,0x60,0xc5,0x64,0x07,0x29,0xaf,0x5c,0x38,0x3d,0x4b,0xec,0xbd,0xba, +0x97,0x60,0x17,0xed,0xd7,0x21,0x7b,0x19,0x94,0x95,0xf1,0xb2,0x84,0x06,0x1f, +0xc5,0x83,0xb3,0x5d,0xc8,0x2c,0x1c,0x0f,0xf7,0xfd,0x58,0x8b,0x0f,0x25,0xb5, +0x9f,0x7f,0x43,0x8f,0x5f,0x81,0x16,0x4a,0x62,0xfb,0x47,0xb5,0x36,0x72,0x21, +0x29,0xd4,0x9e,0x27,0x35,0xf4,0xd0,0xd4,0xc0,0xa3,0x7a,0x47,0xbe,0xc9,0xae, +0x08,0x17,0x6a,0xb5,0x63,0x38,0xa1,0xdc,0xf5,0xc1,0x8d,0x97,0x56,0xb4,0xc0, +0x2d,0x2b,0xec,0x3d,0xbd,0xce,0xd1,0x52,0x3e,0x29,0x34,0xe2,0x9a,0x00,0x96, +0x4c,0x85,0xaf,0x0f,0xfb,0x10,0x1d,0xf8,0x08,0x27,0x10,0x04,0x04,0xbf,0xae, +0x36,0xd0,0x6a,0x49,0xe7,0x43,0x30,0x81,0xb7,0x02,0x01,0x00,0x30,0x20,0x30, +0x0c,0x31,0x0a,0x30,0x08,0x06,0x03,0x55,0x04,0x03,0x13,0x01,0x4e,0x02,0x10, +0xc2,0x8f,0xc4,0x5e,0x8d,0x3b,0x01,0x8c,0x4b,0x23,0xcb,0x93,0x77,0xab,0xb6, +0xe1,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x05, +0x00,0x04,0x81,0x80,0x4b,0x22,0x8a,0xfa,0xa6,0xb6,0x01,0xe9,0xb5,0x54,0xcf, +0xa7,0x81,0x54,0xf9,0x08,0x42,0x8a,0x75,0x19,0x9c,0xc9,0x27,0x68,0x08,0xf9, +0x53,0xa7,0x60,0xf8,0xdd,0xba,0xfb,0x4f,0x63,0x8a,0x15,0x6a,0x5b,0xf6,0xe3, +0x4e,0x29,0xa9,0xc8,0x1d,0x63,0x92,0x8f,0x95,0x91,0x95,0x71,0xb5,0x5d,0x02, +0xe5,0xa0,0x07,0x67,0x36,0xe5,0x2d,0x7b,0xcd,0xe1,0xf2,0xa4,0xc6,0x24,0x70, +0xac,0xd7,0xaf,0x63,0xb2,0x04,0x02,0x8d,0xae,0x2f,0xdc,0x7e,0x6c,0x84,0xd3, +0xe3,0x66,0x54,0x3b,0x05,0xd8,0x77,0x40,0xe4,0x6b,0xbd,0xa9,0x8d,0x4d,0x74, +0x15,0xfd,0x74,0xf7,0xd3,0xc0,0xc9,0xf1,0x20,0x0e,0x08,0x13,0xcc,0xb0,0x94, +0x53,0x01,0xd4,0x5f,0x95,0x32,0xeb,0xe8,0x73,0x9f,0x6a,0xd1,0x30,0x81,0xb7, +0x02,0x01,0x00,0x30,0x20,0x30,0x0c,0x31,0x0a,0x30,0x08,0x06,0x03,0x55,0x04, +0x03,0x13,0x01,0x58,0x02,0x10,0x1c,0xf2,0x1f,0xec,0x6b,0xdc,0x36,0xbf,0x4a, +0xd7,0xe1,0x6c,0x84,0x85,0xcd,0x2e,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x04,0x81,0x80,0x47,0x21,0xf9,0xe7,0x98, +0x7f,0xe7,0x49,0x3f,0x16,0xb8,0x4c,0x8b,0x7d,0x5d,0x56,0xa7,0x31,0xfd,0xa5, +0xcd,0x43,0x70,0x58,0xf1,0x33,0xfb,0xe6,0xc8,0xbb,0x6f,0x0a,0x89,0xa4,0xb9, +0x3e,0x3a,0xc5,0x85,0x46,0x54,0x73,0x37,0xa3,0xbd,0x36,0xc3,0xce,0x40,0xf3, +0xd7,0x92,0x54,0x8e,0x60,0x1f,0xa2,0xa7,0x03,0xc2,0x49,0xa9,0x02,0x28,0xc8, +0xa5,0xa7,0x42,0xcd,0x29,0x85,0x34,0xa7,0xa9,0xe8,0x8c,0x3d,0xb3,0xd0,0xac, +0x7d,0x31,0x5d,0xb4,0xcb,0x7e,0xad,0x62,0xfd,0x04,0x7b,0xa1,0x93,0xb5,0xbc, +0x08,0x4f,0x36,0xd7,0x5a,0x95,0xbc,0xff,0x47,0x0f,0x84,0x21,0x24,0xdf,0xc5, +0xfe,0xc8,0xe5,0x0b,0xc4,0xc4,0x5c,0x1a,0x50,0x31,0x91,0xce,0xf6,0x11,0xf1, +0x0e,0x28,0xce,0x30,0x1f,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x07, +0x01,0x30,0x0c,0x06,0x08,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x03,0x04,0x05,0x00, +0x80,0x04,0x4e,0x99,0x9d,0x4c }; +static const BYTE serialNumber[] = { +0x2e,0xcd,0x85,0x84,0x6c,0xe1,0xd7,0x4a,0xbf,0x36,0xdc,0x6b,0xec,0x1f,0xf2, +0x1c }; +static const BYTE issuer[] = { +0x30,0x0c,0x31,0x0a,0x30,0x08,0x06,0x03,0x55,0x04,0x03,0x13,0x01,0x58 }; static void test_decode_msg_get_param(void) { @@ -3091,6 +3139,54 @@ static void test_decode_msg_get_param(void) CryptDestroyKey(key); CryptReleaseContext(hCryptProv, 0); + + msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL); + CryptMsgUpdate(msg, envelopedMessageWith3Recps, + sizeof(envelopedMessageWith3Recps), TRUE); + value = 3; + todo_wine + check_param("recipient count", msg, CMSG_RECIPIENT_COUNT_PARAM, + (const BYTE *)&value, sizeof(value)); + size = 0; + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_RECIPIENT_INFO_PARAM, 3, NULL, &size); + todo_wine + ok(!ret && GetLastError() == CRYPT_E_INVALID_INDEX, + "expected CRYPT_E_INVALID_INDEX, got %08x\n", GetLastError()); + size = 0; + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_RECIPIENT_INFO_PARAM, 2, NULL, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + todo_wine + ok(size >= 142, "unexpected size: %u\n", size); + if (ret) + buf = CryptMemAlloc(size); + else + buf = NULL; + if (buf) + { + CERT_INFO *certInfo = (CERT_INFO *)buf; + + SetLastError(0xdeadbeef); + ret = CryptMsgGetParam(msg, CMSG_RECIPIENT_INFO_PARAM, 2, buf, &size); + todo_wine + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + todo_wine + ok(certInfo->SerialNumber.cbData == sizeof(serialNumber), + "unexpected serial number size: %u\n", certInfo->SerialNumber.cbData); + todo_wine + ok(!memcmp(certInfo->SerialNumber.pbData, serialNumber, + sizeof(serialNumber)), "unexpected serial number\n"); + todo_wine + ok(certInfo->Issuer.cbData == sizeof(issuer), + "unexpected issuer size: %u\n", certInfo->Issuer.cbData); + todo_wine + ok(!memcmp(certInfo->Issuer.pbData, issuer, sizeof(issuer)), + "unexpected issuer\n"); + CryptMemFree(buf); + } + CryptMsgClose(msg); } static void test_decode_msg(void)

1 0

Adam Martinson : msxml3: Use libxml2 macros for XSLPattern method return values.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 8401caae4c71c889143d7c95bc572892358098ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8401caae4c71c889143d7c95b… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Tue Nov 2 16:11:27 2010 -0500 msxml3: Use libxml2 macros for XSLPattern method return values. --- dlls/msxml3/queryresult.c | 32 +++++++++----------------------- 1 files changed, 9 insertions(+), 23 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 36652a0..96f9e6f 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -377,24 +377,10 @@ static dispex_static_data_t queryresult_dispex = { queryresult_iface_tids }; -void XSLPattern_invalid(xmlXPathParserContextPtr pctx, int nargs) -{ - xmlXPathObjectPtr obj; - for (; nargs > 0; --nargs) - { - obj = valuePop(pctx); - xmlXPathFreeObject(obj); - } - - obj = xmlMalloc(sizeof(xmlXPathObject)); - obj->type = XPATH_UNDEFINED; - valuePush(pctx,obj); -} - #define XSLPATTERN_CHECK_ARGS(n) \ if (nargs != n) { \ FIXME("XSLPattern syntax error: Expected %i arguments, got %i\n", n, nargs); \ - XSLPattern_invalid(pctx, nargs); \ + xmlXPathSetArityError(pctx); \ return; \ } @@ -404,7 +390,7 @@ void XSLPattern_index(xmlXPathParserContextPtr pctx, int nargs) XSLPATTERN_CHECK_ARGS(0); xmlXPathPositionFunction(pctx, 0); - valuePush(pctx, xmlXPathNewFloat(xmlXPathPopNumber(pctx) - 1.0)); + xmlXPathReturnNumber(pctx, xmlXPathPopNumber(pctx) - 1.0); } void XSLPattern_end(xmlXPathParserContextPtr pctx, int nargs) @@ -416,7 +402,7 @@ void XSLPattern_end(xmlXPathParserContextPtr pctx, int nargs) pos = xmlXPathPopNumber(pctx); xmlXPathLastFunction(pctx, 0); last = xmlXPathPopNumber(pctx); - valuePush(pctx, xmlXPathNewBoolean(pos == last)); + xmlXPathReturnBoolean(pctx, pos == last); } void XSLPattern_OP_IEq(xmlXPathParserContextPtr pctx, int nargs) @@ -426,7 +412,7 @@ void XSLPattern_OP_IEq(xmlXPathParserContextPtr pctx, int nargs) arg2 = xmlXPathPopString(pctx); arg1 = xmlXPathPopString(pctx); - valuePush(pctx, xmlXPathNewBoolean(xmlStrcasecmp(arg1, arg2) == 0)); + xmlXPathReturnBoolean(pctx, xmlStrcasecmp(arg1, arg2) == 0); xmlFree(arg1); xmlFree(arg2); } @@ -438,7 +424,7 @@ void XSLPattern_OP_INEq(xmlXPathParserContextPtr pctx, int nargs) arg2 = xmlXPathPopString(pctx); arg1 = xmlXPathPopString(pctx); - valuePush(pctx, xmlXPathNewBoolean(xmlStrcasecmp(arg1, arg2) != 0)); + xmlXPathReturnBoolean(pctx, xmlStrcasecmp(arg1, arg2) != 0); xmlFree(arg1); xmlFree(arg2); } @@ -450,7 +436,7 @@ void XSLPattern_OP_ILt(xmlXPathParserContextPtr pctx, int nargs) arg2 = xmlXPathPopString(pctx); arg1 = xmlXPathPopString(pctx); - valuePush(pctx, xmlXPathNewBoolean(xmlStrcasecmp(arg1, arg2) < 0)); + xmlXPathReturnBoolean(pctx, xmlStrcasecmp(arg1, arg2) < 0); xmlFree(arg1); xmlFree(arg2); } @@ -462,7 +448,7 @@ void XSLPattern_OP_ILEq(xmlXPathParserContextPtr pctx, int nargs) arg2 = xmlXPathPopString(pctx); arg1 = xmlXPathPopString(pctx); - valuePush(pctx, xmlXPathNewBoolean(xmlStrcasecmp(arg1, arg2) <= 0)); + xmlXPathReturnBoolean(pctx, xmlStrcasecmp(arg1, arg2) <= 0); xmlFree(arg1); xmlFree(arg2); } @@ -474,7 +460,7 @@ void XSLPattern_OP_IGt(xmlXPathParserContextPtr pctx, int nargs) arg2 = xmlXPathPopString(pctx); arg1 = xmlXPathPopString(pctx); - valuePush(pctx, xmlXPathNewBoolean(xmlStrcasecmp(arg1, arg2) > 0)); + xmlXPathReturnBoolean(pctx, xmlStrcasecmp(arg1, arg2) > 0); xmlFree(arg1); xmlFree(arg2); } @@ -486,7 +472,7 @@ void XSLPattern_OP_IGEq(xmlXPathParserContextPtr pctx, int nargs) arg2 = xmlXPathPopString(pctx); arg1 = xmlXPathPopString(pctx); - valuePush(pctx, xmlXPathNewBoolean(xmlStrcasecmp(arg1, arg2) >= 0)); + xmlXPathReturnBoolean(pctx, xmlStrcasecmp(arg1, arg2) >= 0); xmlFree(arg1); xmlFree(arg2); }

1 0

Adam Martinson : msxml3: Add XSLPattern nodeType() method.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 42ccbc51322409aa20272651759c5434b6d0c1db URL: http://source.winehq.org/git/wine.git/?a=commit;h=42ccbc51322409aa202726517… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Tue Nov 2 16:11:49 2010 -0500 msxml3: Add XSLPattern nodeType() method. --- dlls/msxml3/queryresult.c | 7 +++++++ dlls/msxml3/tests/domdoc.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 96f9e6f..88fe39f 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -405,6 +405,12 @@ void XSLPattern_end(xmlXPathParserContextPtr pctx, int nargs) xmlXPathReturnBoolean(pctx, pos == last); } +void XSLPattern_nodeType(xmlXPathParserContextPtr pctx, int nargs) +{ + XSLPATTERN_CHECK_ARGS(0); + xmlXPathReturnNumber(pctx, pctx->context->node->type); +} + void XSLPattern_OP_IEq(xmlXPathParserContextPtr pctx, int nargs) { xmlChar *arg1, *arg2; @@ -528,6 +534,7 @@ HRESULT queryresult_create(xmlNodePtr node, LPCWSTR szQuery, IXMLDOMNodeList **o xmlXPathRegisterFunc(ctxt, (xmlChar const*)"index", XSLPattern_index); xmlXPathRegisterFunc(ctxt, (xmlChar const*)"end", XSLPattern_end); + xmlXPathRegisterFunc(ctxt, (xmlChar const*)"nodeType", XSLPattern_nodeType); xmlXPathRegisterFunc(ctxt, (xmlChar const*)"OP_IEq", XSLPattern_OP_IEq); xmlXPathRegisterFunc(ctxt, (xmlChar const*)"OP_INEq", XSLPattern_OP_INEq); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3ab6be3..e8f77cf 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6702,6 +6702,36 @@ static void test_XSLPattern(void) expect_list_and_release(list, "P1.E3.E3.D1 C2.E3.E3.D1 T3.E3.E3.D1 E4.E3.E3.D1 E5.E3.E3.D1 E6.E3.E3.D1"); } + /* nodeType() */ + /* XML_ELEMENT_NODE */ + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x/node()[nodeType()=1]"), &list)); + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len != 0, "expected filled list\n"); + if (len) + expect_list_and_release(list, "E4.E3.E3.D1 E5.E3.E3.D1 E6.E3.E3.D1"); + /* XML_TEXT_NODE */ + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x/node()[nodeType()=3]"), &list)); + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len != 0, "expected filled list\n"); + if (len) + expect_list_and_release(list, "T3.E3.E3.D1"); + /* XML_PI_NODE */ + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x/node()[nodeType()=7]"), &list)); + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len != 0, "expected filled list\n"); + if (len) + expect_list_and_release(list, "P1.E3.E3.D1"); + /* XML_COMMENT_NODE */ + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//x/node()[nodeType()=8]"), &list)); + len = 0; + ole_check(IXMLDOMNodeList_get_length(list, &len)); + ok(len != 0, "expected filled list\n"); + if (len) + expect_list_and_release(list, "C2.E3.E3.D1"); + /* pi() */ todo_wine ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("pi()"), &list)); if (list)

1 0