January 2010 - Wine-Commits

Henri Verbeet : wined3d: Add a debug function for state names.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 9bbccb7f8070d0bf3c725e3074d4d00b8bb450bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bbccb7f8070d0bf3c725e307… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 23:40:23 2010 +0100 wined3d: Add a debug function for state names. --- dlls/wined3d/utils.c | 45 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++ 2 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4038833..b92b884 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1786,6 +1786,51 @@ const char* debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) { } } +const char *debug_d3dstate(DWORD state) +{ + if (STATE_IS_RENDER(state)) + return wine_dbg_sprintf("STATE_RENDER(%s)", debug_d3drenderstate(state - STATE_RENDER(0))); + if (STATE_IS_TEXTURESTAGE(state)) + { + DWORD texture_stage = (state - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); + DWORD texture_state = state - STATE_TEXTURESTAGE(texture_stage, 0); + return wine_dbg_sprintf("STATE_TEXTURESTAGE(%#x, %s)", + texture_stage, debug_d3dtexturestate(texture_state)); + } + if (STATE_IS_SAMPLER(state)) + return wine_dbg_sprintf("STATE_SAMPLER(%#x)", state - STATE_SAMPLER(0)); + if (STATE_IS_PIXELSHADER(state)) + return "STATE_PIXELSHADER"; + if (STATE_IS_TRANSFORM(state)) + return wine_dbg_sprintf("STATE_TRANSFORM(%s)", debug_d3dtstype(state - STATE_TRANSFORM(0))); + if (STATE_IS_STREAMSRC(state)) + return "STATE_STREAMSRC"; + if (STATE_IS_INDEXBUFFER(state)) + return "STATE_INDEXBUFFER"; + if (STATE_IS_VDECL(state)) + return "STATE_VDECL"; + if (STATE_IS_VSHADER(state)) + return "STATE_VSHADER"; + if (STATE_IS_VIEWPORT(state)) + return "STATE_VIEWPORT"; + if (STATE_IS_VERTEXSHADERCONSTANT(state)) + return "STATE_VERTEXSHADERCONSTANT"; + if (STATE_IS_PIXELSHADERCONSTANT(state)) + return "STATE_PIXELSHADERCONSTANT"; + if (STATE_IS_ACTIVELIGHT(state)) + return wine_dbg_sprintf("STATE_ACTIVELIGHT(%#x)", state - STATE_ACTIVELIGHT(0)); + if (STATE_IS_SCISSORRECT(state)) + return "STATE_SCISSORRECT"; + if (STATE_IS_CLIPPLANE(state)) + return wine_dbg_sprintf("STATE_CLIPPLANE(%#x)", state - STATE_CLIPPLANE(0)); + if (STATE_IS_MATERIAL(state)) + return "STATE_MATERIAL"; + if (STATE_IS_FRONTFACE(state)) + return "STATE_FRONTFACE"; + + return wine_dbg_sprintf("UNKNOWN_STATE(%#x)", state); +} + const char* debug_d3dpool(WINED3DPOOL Pool) { switch (Pool) { #define POOL_TO_STR(p) case p: return #p diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 164cc6b..c5713c0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -994,8 +994,10 @@ extern glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT] DECLSPEC #define STATE_IS_CLIPPLANE(a) ((a) >= STATE_CLIPPLANE(0) && (a) <= STATE_CLIPPLANE(MAX_CLIPPLANES - 1)) #define STATE_MATERIAL (STATE_CLIPPLANE(MAX_CLIPPLANES)) +#define STATE_IS_MATERIAL(a) ((a) == STATE_MATERIAL) #define STATE_FRONTFACE (STATE_MATERIAL + 1) +#define STATE_IS_FRONTFACE(a) ((a) == STATE_FRONTFACE) #define STATE_HIGHEST (STATE_FRONTFACE) @@ -2506,6 +2508,7 @@ const char *debug_d3ddeclusage(BYTE usage) DECLSPEC_HIDDEN; const char *debug_d3dprimitivetype(WINED3DPRIMITIVETYPE PrimitiveType) DECLSPEC_HIDDEN; const char *debug_d3drenderstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dsamplerstate(DWORD state) DECLSPEC_HIDDEN; +const char *debug_d3dstate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dtexturefiltertype(WINED3DTEXTUREFILTERTYPE filter_type) DECLSPEC_HIDDEN; const char *debug_d3dtexturestate(DWORD state) DECLSPEC_HIDDEN; const char *debug_d3dtstype(WINED3DTRANSFORMSTATETYPE tstype) DECLSPEC_HIDDEN;

1 0

Igor Paliychuk : wordpad: Add Ukrainian translations.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 05450498d01b8280ae2cbf5ab759591dfbb7c6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=05450498d01b8280ae2cbf5ab… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:09:32 2010 +0200 wordpad: Add Ukrainian translations. --- programs/wordpad/Makefile.in | 1 + programs/wordpad/Uk.rc | 250 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 251 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05450498d01b8280ae2cb…

1 0

Igor Paliychuk : reg.exe: Add Ukrainian translations.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 4423b0c7b4c55660bf5557e0a491402da88ece46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4423b0c7b4c55660bf5557e0a… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:08:06 2010 +0200 reg.exe: Add Ukrainian translations. --- programs/reg/Makefile.in | 3 ++- programs/reg/Uk.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index de4d2c8..82066db 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -23,7 +23,8 @@ RC_SRCS = \ Pl.rc \ Pt.rc \ Ru.rc \ - Si.rc + Si.rc \ + Uk.rc @MAKE_PROG_RULES@ diff --git a/programs/reg/Uk.rc b/programs/reg/Uk.rc new file mode 100644 index 0000000..70c86f7 --- /dev/null +++ b/programs/reg/Uk.rc @@ -0,0 +1,43 @@ +/* + * REG.EXE - Wine-compatible reg program. + * + * Copyright 2008 Andrew Riedi + * + * Ukrainian language support + * + * Copyright 2010 Igor Paliychuk + * + * 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 "reg.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Синтаксис цієї команди наступний:\n\nREG [ ADD | DELETE | QUERY ]\nREG command /?\n" + STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE key_name [/v value_name | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY key_name [/v value_name | /ve] [/s]\n" + STRING_SUCCESS, "Операція успішно завершена\n" + STRING_INVALID_KEY, "Помилка: неправильне ім'я ключа\n" + STRING_INVALID_CMDLINE, "Помилка: неправильні параметри командного рядка\n" + STRING_NO_REMOTE, "Помилка: неможливо додати ключі на віддаленій машині\n" + STRING_CANNOT_FIND, "Помилка: не вдалось знайти вказаний ключ реєстру чи значення\n" +}

1 0

Igor Paliychuk : msvfw32: Add Ukrainian translations.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: b88a56de7fc9f77b1e397f1fde07d49ab279ebce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88a56de7fc9f77b1e397f1fd… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:03:59 2010 +0200 msvfw32: Add Ukrainian translations. --- dlls/msvfw32/Makefile.in | 1 + dlls/msvfw32/msvfw32_Uk.rc | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/msvfw32/Makefile.in b/dlls/msvfw32/Makefile.in index cb92c00..a773c8d 100644 --- a/dlls/msvfw32/Makefile.in +++ b/dlls/msvfw32/Makefile.in @@ -28,6 +28,7 @@ RC_SRCS = \ msvfw32_Si.rc \ msvfw32_Sv.rc \ msvfw32_Tr.rc \ + msvfw32_Uk.rc \ msvfw32_Zh.rc @MAKE_DLL_RULES@ diff --git a/dlls/msvfw32/msvfw32_Uk.rc b/dlls/msvfw32/msvfw32_Uk.rc new file mode 100644 index 0000000..c9b1b67 --- /dev/null +++ b/dlls/msvfw32/msvfw32_Uk.rc @@ -0,0 +1,57 @@ +/* + * Copyright 2005 Dmitry Timoshkov + * Copyright 2010 Igor Paliychuk + * + * 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" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +ICM_CHOOSE_COMPRESSOR DIALOG DISCARDABLE 36, 24, 187, 95 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Стиснення Відео" +FONT 8, "MS Shell Dlg" +{ + DEFPUSHBUTTON "OK",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/sec",896,102,78,26,10 +} + +STRINGTABLE DISCARDABLE +{ + IDS_FULLFRAMES "Кадри повністю (Без стиснення)" +}

1 0

Igor Paliychuk : mshtml: Add Ukrainian translations.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: d165f1890525623c1649c0b7ed04e6c9f11572bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d165f1890525623c1649c0b7e… Author: Igor Paliychuk <igor-hkr(a)mail.ru> Date: Sun Jan 24 22:02:30 2010 +0200 mshtml: Add Ukrainian translations. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/Uk.rc | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index b9c9245..c0b7b2a 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -92,6 +92,7 @@ RC_SRCS = \ Si.rc \ Sv.rc \ Tr.rc \ + Uk.rc \ Zh.rc \ rsrc.rc diff --git a/dlls/mshtml/Uk.rc b/dlls/mshtml/Uk.rc new file mode 100644 index 0000000..5e11b4d --- /dev/null +++ b/dlls/mshtml/Uk.rc @@ -0,0 +1,72 @@ +/* + * Copyright 2005-2006 Jacek Caban + * Copyright 2010 Igor Paliychuk + * + * 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" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_HTMLDISABLED "HTML rendering is currently disabled." + IDS_HTMLDOCUMENT "Документ HTML" + IDS_DOWNLOADING "Завантаження..." + IDS_INSTALLING "Встановлення..." +} + +ID_DWL_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Wine Gecko Installer" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Wine не може знайти пакунок Gecko, який потрібний для додатків embedding HTML " \ + "для коректної роботи. Wine може автоматично завантажити та встановити його для Вас.\n\n" \ + "Зауважте: Рекомендується використати пакет з вашого дистрибутиву. Детальніше читайте http://wiki.winehq.org/Gecko.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Прогрес", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Встановити", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Скасувати", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} + +IDD_HYPERLINK DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 250, 65 +STYLE DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Гіперпосилання" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Дані про Гіперпосилання", -1, 5, 5, 190, 55 + LTEXT "&Тип:", -1, 10, 22, 20, 10 + COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "&URL:", -1, 10, 42, 20, 10 + EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Скасувати", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP +} + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Скасувати", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Juan Lang : wintrust: Return error directly from WINTRUST_CopyChain.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 59dcf9c9eee14a4772ec0f38975a3416aa15386d URL: http://source.winehq.org/git/wine.git/?a=commit;h=59dcf9c9eee14a4772ec0f389… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:13:06 2010 -0800 wintrust: Return error directly from WINTRUST_CopyChain. --- dlls/wintrust/softpub.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index c7d5f6a..29d8523 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -694,24 +694,22 @@ static DWORD WINTRUST_TrustStatusToError(DWORD errorStatus) return error; } -static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +static DWORD WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { - BOOL ret; + DWORD err, i; PCERT_SIMPLE_CHAIN simpleChain = data->pasSigners[signerIdx].pChainContext->rgpChain[0]; - DWORD i; data->pasSigners[signerIdx].pasCertChain[0].dwConfidence = WINTRUST_TrustStatusToConfidence( simpleChain->rgpElement[0]->TrustStatus.dwErrorStatus); data->pasSigners[signerIdx].pasCertChain[0].pChainElement = simpleChain->rgpElement[0]; - ret = TRUE; - for (i = 1; ret && i < simpleChain->cElement; i++) + err = ERROR_SUCCESS; + for (i = 1; !err && i < simpleChain->cElement; i++) { - ret = data->psPfns->pfnAddCert2Chain(data, signerIdx, FALSE, 0, - simpleChain->rgpElement[i]->pCertContext); - if (ret) + if (data->psPfns->pfnAddCert2Chain(data, signerIdx, FALSE, 0, + simpleChain->rgpElement[i]->pCertContext)) { data->pasSigners[signerIdx].pasCertChain[i].pChainElement = simpleChain->rgpElement[i]; @@ -719,12 +717,14 @@ static BOOL WINTRUST_CopyChain(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) WINTRUST_TrustStatusToConfidence( simpleChain->rgpElement[i]->TrustStatus.dwErrorStatus); } + else + err = GetLastError(); } data->pasSigners[signerIdx].pasCertChain[simpleChain->cElement - 1].dwError = WINTRUST_TrustStatusToError( simpleChain->rgpElement[simpleChain->cElement - 1]-> TrustStatus.dwErrorStatus); - return ret; + return err; } static void WINTRUST_CreateChainPolicyCreateInfo( @@ -792,7 +792,9 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, } else { - if ((ret = WINTRUST_CopyChain(data, signer))) + DWORD err; + + if (!(err = WINTRUST_CopyChain(data, signer))) { if (data->psPfns->pfnCertCheckPolicy) ret = data->psPfns->pfnCertCheckPolicy(data, signer, @@ -800,6 +802,11 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, else TRACE("no cert check policy, skipping policy check\n"); } + else + { + SetLastError(err); + ret = FALSE; + } } } }

1 0

Juan Lang : wintrust: Return error directly from WINTRUST_SaveSigner.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 47e75329e352eaffb727c37206e85261cdeca2a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47e75329e352eaffb727c3720… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 27 14:07:58 2010 -0800 wintrust: Return error directly from WINTRUST_SaveSigner. --- dlls/wintrust/softpub.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 4a702c1..3fc14c2 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -474,9 +474,9 @@ static CMSG_SIGNER_INFO *WINTRUST_GetSigner(CRYPT_PROVIDER_DATA *data, return signerInfo; } -static BOOL WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) +static DWORD WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) { - BOOL ret; + DWORD err; CMSG_SIGNER_INFO *signerInfo = WINTRUST_GetSigner(data, signerIdx); if (signerInfo) @@ -485,11 +485,14 @@ static BOOL WINTRUST_SaveSigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) sgnr.psSigner = signerInfo; sgnr.sftVerifyAsOf = data->sftSystemTime; - ret = data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr); + if (!data->psPfns->pfnAddSgnr2Chain(data, FALSE, signerIdx, &sgnr)) + err = GetLastError(); + else + err = ERROR_SUCCESS; } else - ret = FALSE; - return ret; + err = GetLastError(); + return err; } static CERT_INFO *WINTRUST_GetSignerCertInfo(CRYPT_PROVIDER_DATA *data, @@ -574,21 +577,15 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) if (ret) { DWORD i; + DWORD err = ERROR_SUCCESS; - for (i = 0; ret && i < signerCount; i++) + for (i = 0; !err && i < signerCount; i++) { - if ((ret = WINTRUST_SaveSigner(data, i))) - { - DWORD err; - + if (!(err = WINTRUST_SaveSigner(data, i))) err = WINTRUST_VerifySigner(data, i); - if (err) - { - SetLastError(err); - ret = FALSE; - } - } } + if (err) + ret = FALSE; } else SetLastError(TRUST_E_NOSIGNATURE);

1 0

Alexandre Julliard : comctl32: Actually grow the array in DPA_Grow.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 9e47c59427d5c16cad90d187efd9765f8ee0d90e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e47c59427d5c16cad90d187e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 13:18:56 2010 +0100 comctl32: Actually grow the array in DPA_Grow. --- dlls/comctl32/dpa.c | 17 ++++++++++++++++- dlls/comctl32/tests/dpa.c | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index e3c03c8..9682344 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -426,12 +426,27 @@ BOOL WINAPI DPA_Destroy (const HDPA hdpa) */ BOOL WINAPI DPA_Grow (HDPA hdpa, INT nGrow) { + INT items; TRACE("(%p %d)\n", hdpa, nGrow); if (!hdpa) return FALSE; - hdpa->nGrow = max(8, nGrow); + nGrow = max( 8, nGrow ); + items = nGrow * (((hdpa->nMaxCount - 1) / nGrow) + 1); + if (items > hdpa->nMaxCount) + { + void *ptr; + + if (hdpa->ptrs) + ptr = HeapReAlloc( hdpa->hHeap, HEAP_ZERO_MEMORY, hdpa->ptrs, items * sizeof(LPVOID) ); + else + ptr = HeapAlloc( hdpa->hHeap, HEAP_ZERO_MEMORY, items * sizeof(LPVOID) ); + if (!ptr) return FALSE; + hdpa->nMaxCount = items; + hdpa->ptrs = ptr; + } + hdpa->nGrow = nGrow; return TRUE; } diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 5fb11e3..419c1b1 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -213,9 +213,9 @@ static void test_dpa(void) dpa3 = pDPA_CreateEx(0, hHeap); ok(dpa3 != NULL, "\n"); ret = pDPA_Grow(dpa3, si.dwPageSize + 1); - todo_wine ok(!ret && GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + ok(!ret && GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "ret=%d error=%d\n", ret, GetLastError()); - + dpa = pDPA_Create(0); ok(dpa != NULL, "\n");

1 0

Alexandre Julliard : ntdll: Don't require heap sizes to be 64K aligned.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 0692bfda5f10e0c2dc6eed2a66e1a9f9c1092bad URL: http://source.winehq.org/git/wine.git/?a=commit;h=0692bfda5f10e0c2dc6eed2a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 28 19:47:01 2010 +0100 ntdll: Don't require heap sizes to be 64K aligned. --- dlls/kernel32/tests/alloc.c | 12 +++--------- dlls/ntdll/heap.c | 7 ++----- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/alloc.c b/dlls/kernel32/tests/alloc.c index 8cb0915..c1b2afc 100644 --- a/dlls/kernel32/tests/alloc.c +++ b/dlls/kernel32/tests/alloc.c @@ -70,15 +70,9 @@ static void test_Heap(void) heap=HeapCreate(0,2*memchunk,5*memchunk); /* Check that HeapCreate allocated the right amount of ram */ - todo_wine { - /* Today HeapCreate seems to return a memory block larger than specified. - MSDN says the maximum heap size should be dwMaximumSize rounded up to the - nearest page boundary - */ - mem1=HeapAlloc(heap,0,5*memchunk+1); - ok(mem1==NULL,"HeapCreate allocated more Ram than it should have\n"); - HeapFree(heap,0,mem1); - } + mem1=HeapAlloc(heap,0,5*memchunk+1); + ok(mem1==NULL,"HeapCreate allocated more Ram than it should have\n"); + HeapFree(heap,0,mem1); /* Check that a normal alloc works */ mem1=HeapAlloc(heap,0,memchunk); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 622b174..9a41d68 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -856,16 +856,13 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, if (!address) { - /* round-up sizes on a 64K boundary */ - totalSize = (totalSize + 0xffff) & 0xffff0000; - commitSize = (commitSize + 0xffff) & 0xffff0000; - if (!commitSize) commitSize = 0x10000; + if (!commitSize) commitSize = COMMIT_MASK + 1; totalSize = min( totalSize, 0xffff0000 ); /* don't allow a heap larger than 4Gb */ if (totalSize < commitSize) totalSize = commitSize; if (flags & HEAP_SHARED) commitSize = totalSize; /* always commit everything in a shared heap */ /* allocate the memory block */ - if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, + if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 5, &totalSize, MEM_RESERVE, get_protection_type( flags ) )) { WARN("Could not allocate %08lx bytes\n", totalSize );

1 0

Alexandre Julliard : kernel32/tests: Fix some of the heap tests for 64-bit.
by Alexandre Julliard Jan. 29, 2010

Jan. 29, 2010

Module: wine Branch: master Commit: 221c115e98aac2d351301107c7641f71be823f3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=221c115e98aac2d351301107c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 12:10:26 2010 +0100 kernel32/tests: Fix some of the heap tests for 64-bit. --- dlls/kernel32/tests/heap.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 0c0de11..c6d7b65 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -42,7 +42,8 @@ static ULONG (WINAPI *pRtlGetNtGlobalFlags)(void); struct heap_layout { - DWORD unknown[3]; + DWORD_PTR unknown[2]; + DWORD pattern; DWORD flags; DWORD force_flags; }; @@ -488,7 +489,7 @@ static void test_heap_checks( DWORD flags ) { BYTE old, *p, *p2; BOOL ret; - SIZE_T i, size, large_size = 800 * 1024 + 37; + SIZE_T i, size, large_size = 3000 * 1024 + 37; if (flags & HEAP_PAGE_ALLOCS) return; /* no tests for that case yet */ trace( "testing heap flags %08x\n", flags ); @@ -751,7 +752,7 @@ static void test_child_heap( const char *arg ) expect_heap = heap_flags_from_global_flag( expected ); - if (!(heap->flags & HEAP_GROWABLE) || heap->flags == 0xeeeeeeee) /* vista layout */ + if (!(heap->flags & HEAP_GROWABLE) || heap->pattern == 0xffeeffee || heap->pattern == 0xeeeeeeee) /* vista layout */ { if (expected & FLG_HEAP_PAGE_ALLOCS) ok( heap->flags == 0xeeeeeeee, "%s: got heap flags %08x expected 0xeeeeeeee\n", @@ -765,6 +766,7 @@ static void test_child_heap( const char *arg ) "%s: got heap flags %08x expected %08x\n", arg, heap->flags, expect_heap ); ok( heap->force_flags == (expect_heap & ~0x18000080), "%s: got heap force flags %08x expected %08x\n", arg, heap->force_flags, expect_heap ); + expect_heap = heap->flags; } test_heap_checks( expect_heap );

1 0