September 2006 - Wine-commits

H. Verbeet : wined3d: Cleanup ActiveRender some more.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: e4d5385d2c2129a108c0cf8d2f3a091938f78752 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4d5385d2c2129a108c0cf8… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Sep 26 20:31:32 2006 +0200 wined3d: Cleanup ActiveRender some more. --- dlls/wined3d/device.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 52cff80..c7ed30e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7453,7 +7453,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl #if defined(GL_VERSION_1_3) IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSurface *tmp; GLXFBConfig* cfgs = NULL; IWineD3DSwapChain *currentSwapchain; IWineD3DSwapChainImpl *currentSwapchainImpl; @@ -7615,10 +7614,11 @@ #if defined(GL_VERSION_1_3) } /* Replace the render target */ - tmp = This->renderTarget; - This->renderTarget = RenderSurface; - IWineD3DSurface_AddRef(This->renderTarget); - IWineD3DSurface_Release(tmp); + if (This->renderTarget != RenderSurface) { + IWineD3DSurface_Release(This->renderTarget); + This->renderTarget = RenderSurface; + IWineD3DSurface_AddRef(RenderSurface); + } if (cfgs != NULL) XFree(cfgs); if (implicitSwapchain != NULL) IWineD3DSwapChain_Release(implicitSwapchain);

1 0

Juan Lang : wintrust.h: Add missing defines.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 5860cc2426e8b1ab48c74f67f22808b668c8a110 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5860cc2426e8b1ab48c74f6… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Sep 26 22:08:54 2006 -0700 wintrust.h: Add missing defines. --- include/wintrust.h | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/include/wintrust.h b/include/wintrust.h index 9c4f7c9..982ea0c 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -76,6 +76,9 @@ typedef struct WINTRUST_CERT_INFO_ FILETIME* psftVerifyAsOf; } WINTRUST_CERT_INFO, *PWINTRUST_CERT_INFO; +#define WTCI_DONT_OPEN_STORES 0x00000001 +#define WTCI_OPEN_ONLY_ROOT 0x00000002 + /* dwUIChoice */ #define WTD_UI_ALL 1 #define WTD_UI_NONE 2 @@ -115,6 +118,42 @@ typedef struct _WINTRUST_DATA DWORD dwUIContext; } WINTRUST_DATA, *PWINTRUST_DATA; +#define WTD_UI_ALL 1 +#define WTD_UI_NONE 2 +#define WTD_UI_NOBAD 3 +#define WTD_UI_NOGOOD 4 + +#define WTD_REVOKE_NONE 0 +#define WTD_REVOKE_WHOLECHAIN 1 + +#define WTD_CHOICE_FILE 1 +#define WTD_CHOICE_CATALOG 2 +#define WTD_CHOICE_BLOB 3 +#define WTD_CHOICE_SIGNER 4 +#define WTD_CHOICE_CERT 5 + +#define WTD_STATEACTION_IGNORE 0 +#define WTD_STATEACTION_VERIFY 1 +#define WTD_STATEACTION_CLOSE 2 +#define WTD_STATEACTION_AUTO_CACHE 3 +#define WTD_STATEACTION_AUTO_CACHE_FLUSH 4 + +#define WTD_PROV_FLAGS_MASK 0x0000ffff +#define WTD_USE_IE4_TRUST_FLAG 0x00000001 +#define WTD_NO_IE4_CHAIN_FLAG 0x00000002 +#define WTD_NO_POLICY_USAGE_FLAG 0x00000004 +#define WTD_REVOCATION_CHECK_NONE 0x00000010 +#define WTD_REVOCATION_CHECK_END_CERT 0x00000020 +#define WTD_REVOCATION_CHECK_CHAIN 0x00000040 +#define WTD_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT 0x00000080 +#define WTD_SAFER_FLAG 0x00000100 +#define WTD_HASH_ONLY_FLAG 0x00000200 +#define WTD_USE_DEFAULT_OSVER_CHECK 0x00000400 +#define WTD_LIFETIME_SIGNING_FLAG 0x00000800 + +#define WTD_UICONTEXT_EXECUTE 0 +#define WTD_UICONTEXT_INSTALL 1 + typedef struct _CRYPT_TRUST_REG_ENTRY { DWORD cbStruct; @@ -306,6 +345,18 @@ typedef struct _CRYPT_PROVUI_FUNCS { #include <poppack.h> +#define WTPF_TRUSTTEST 0x00000020 +#define WTPF_TESTCANBEVALID 0x00000080 +#define WTPF_IGNOREEXPIRATION 0x00000100 +#define WTPF_IGNOREREVOKATION 0x00000200 +#define WTPF_OFFLINEOK_IND 0x00000400 +#define WTPF_OFFLINEOK_COM 0x00000800 +#define WTPF_OFFLINEOKNBU_IND 0x00001000 +#define WTPF_OFFLINEOKNBU_COM 0x00002000 +#define WTPF_VERIFY_V1_OFF 0x00010000 +#define WTPF_IGNOREREVOCATIONONTS 0x00020000 +#define WTPF_ALLOWONLYPERTRUST 0x00040000 + #define WT_ADD_ACTION_ID_RET_RESULT_FLAG 1 #ifdef __cplusplus

1 0

H. Verbeet : wined3d: Show the MESSAGE in device_find_fbconfigs() only once .
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 4bc812564888d19029438443ee52627c2c86730e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4bc812564888d1902943844… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Tue Sep 26 20:31:23 2006 +0200 wined3d: Show the MESSAGE in device_find_fbconfigs() only once. --- dlls/wined3d/device.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7aef3ac..d49653b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7374,10 +7374,14 @@ #define PUSH2(att,value) attribs[nAttri attribs, &nCfgs); if (cfgs == NULL) { /* OK we didn't find the exact config, so use any reasonable match */ - /* TODO: fill in the 'requested' and 'current' depths, also make sure that's - why we failed and only show this message once! */ - MESSAGE("Failed to find exact match, finding alternative but you may " - "suffer performance issues, try changing xfree's depth to match the requested depth\n"); + /* TODO: fill in the 'requested' and 'current' depths, and make sure that's + why we failed. */ + static BOOL show_message = TRUE; + if (show_message) { + ERR("Failed to find exact match, finding alternative but you may " + "suffer performance issues, try changing xfree's depth to match the requested depth\n"); + show_message = FALSE; + } nAttribs = 0; PUSH2(GLX_DRAWABLE_TYPE, GLX_PBUFFER_BIT | GLX_WINDOW_BIT); /* PUSH2(GLX_X_RENDERABLE, TRUE); */

1 0

Hwang YunSong(황윤성) : cmdlgtst: Updated Korean resource.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 2f599176b01ada9ed4233430bfa43e9218c551d8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2f599176b01ada9ed423343… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Wed Sep 27 10:02:12 2006 +0900 cmdlgtst: Updated Korean resource. --- programs/cmdlgtst/Ko.rc | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/programs/cmdlgtst/Ko.rc b/programs/cmdlgtst/Ko.rc index 6bc8db7..74f4c9b 100644 --- a/programs/cmdlgtst/Ko.rc +++ b/programs/cmdlgtst/Ko.rc @@ -181,6 +181,35 @@ FONT 8, "MS Shell Dlg" CHECKBOX "PD_USEDEVMODECOPIES", I_PD_USEDEVMODECOPIES, 12, 264, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP } + +PageSetup_Flags_Dialog DIALOG 4, 17, 239, 245 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION " " +FONT 8, "MS Shell Dlg" +{ +DEFPUSHBUTTON "Ȯ��", IDOK, 180, 6, 50, 14 +PUSHBUTTON "��", IDCANCEL, 180, 24, 50, 14 +CHECKBOX "PSD_DEFAULTMINMARGINS", I_PSD_DEFAULTMINMARGINS, 12, 12, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_DISABLEMARGINS", I_PSD_DISABLEMARGINS, 12, 24, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_DISABLEORIENTATION", I_PSD_DISABLEORIENTATION, 12, 36, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_DISABLEPAGEPAINTING", I_PSD_DISABLEPAGEPAINTING, 12, 48, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_DISABLEPAPER", I_PSD_DISABLEPAPER, 12, 60, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_DISABLEPRINTER", I_PSD_DISABLEPRINTER, 12, 72, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_ENABLEPAGEPAINTHOOK", I_PSD_ENABLEPAGEPAINTHOOK, 12, 84, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_ENABLEPAGESETUPHOOK", I_PSD_ENABLEPAGESETUPHOOK, 12, 96, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATE", I_PSD_ENABLEPAGESETUPTEMPLATE, 12, 108, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_ENABLEPAGESETUPTEMPLATEHANDLE", I_PSD_ENABLEPAGESETUPTEMPLATEHANDLE, 12, 120, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_INHUNDREDTHSOFMILLIMETERS", I_PSD_INHUNDREDTHSOFMILLIMETERS, 12, 132, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_INTHOUSANDTHSOFINCHES", I_PSD_INTHOUSANDTHSOFINCHES, 12, 144, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_INWININIINTLMEASURE", I_PSD_INWININIINTLMEASURE, 12, 156, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_MARGINS", I_PSD_MARGINS, 12, 168, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_MINMARGINS", I_PSD_MINMARGINS, 12, 180, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_NONETWORKBUTTON", I_PSD_NONETWORKBUTTON, 12, 192, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_NOWARNING", I_PSD_NOWARNING, 12, 204, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_RETURNDEFAULT", I_PSD_RETURNDEFAULT, 12, 216, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CHECKBOX "PSD_SHOWHELP", I_PSD_SHOWHELP, 12, 228, 144, 12, BS_AUTOCHECKBOX | WS_TABSTOP +} + File_Flags_Dialog DIALOG 6, 15, 207, 227 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "�� /�� ÷��"

1 0

Juan Lang : crypt32: Encode/decode authority key ids.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 9153d39cdacdc9e8c6d3c478ae0edb0f4da4c969 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9153d39cdacdc9e8c6d3c47… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Sep 26 21:20:35 2006 -0700 crypt32: Encode/decode authority key ids. --- dlls/crypt32/decode.c | 118 +++++++++++++++++++++++++---------- dlls/crypt32/encode.c | 61 ++++++++++++++++++ dlls/crypt32/tests/encode.c | 143 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 286 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9153d39cdacdc9e8c6d…

1 0

Andrew Talbot : rsaenh: Cast-qual warnings fix.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: c4daa191b00055de23d2051e22d83159ddf66fe4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c4daa191b00055de23d2051… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Sep 26 22:08:07 2006 +0100 rsaenh: Cast-qual warnings fix. --- dlls/rsaenh/rsaenh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index eafc92c..650c055 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3713,7 +3713,7 @@ HRESULT WINAPI DllRegisterServer(void) static const WCHAR szSignature[] = { 'S','i','g','n','a','t','u','r','e',0 }; DWORD type = (i == 3) ? PROV_RSA_SCHANNEL : PROV_RSA_FULL; DWORD sign = 0xdeadbeef; - RegSetValueExW(key, szImagePath, 0, REG_SZ, (LPBYTE)szRSABase, + RegSetValueExW(key, szImagePath, 0, REG_SZ, (const BYTE *)szRSABase, (lstrlenW(szRSABase) + 1) * sizeof(WCHAR)); RegSetValueExW(key, szType, 0, REG_DWORD, (LPBYTE)&type, sizeof(type)); RegSetValueExW(key, szSignature, 0, REG_BINARY, (LPBYTE)&sign, sizeof(sign)); @@ -3746,9 +3746,9 @@ HRESULT WINAPI DllRegisterServer(void) { 'R','S','A',' ','S','C','h','a','n','n','e','l',0 } }; RegSetValueExW(key, szName, 0, REG_SZ, - (LPBYTE)szRSAName[i], lstrlenW(szRSAName[i])*sizeof(WCHAR)+sizeof(WCHAR)); + (const BYTE *)szRSAName[i], lstrlenW(szRSAName[i])*sizeof(WCHAR)+sizeof(WCHAR)); RegSetValueExW(key, szTypeName, 0, REG_SZ, - (LPBYTE)szRSATypeName[i], lstrlenW(szRSATypeName[i])*sizeof(WCHAR)+sizeof(WCHAR)); + (const BYTE *)szRSATypeName[i], lstrlenW(szRSATypeName[i])*sizeof(WCHAR)+sizeof(WCHAR)); } } RegCloseKey(key);

1 0

Mikołaj Zalewski : comctl32: Update Polish translation .
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 100e394b51a982ad273ab86f520bc5824d7179d1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=100e394b51a982ad273ab86… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Sep 26 20:53:51 2006 +0200 comctl32: Update Polish translation. --- dlls/comctl32/comctl_Pl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/comctl_Pl.rc b/dlls/comctl32/comctl_Pl.rc index 252c43e..9144134 100644 --- a/dlls/comctl32/comctl_Pl.rc +++ b/dlls/comctl32/comctl_Pl.rc @@ -81,3 +81,8 @@ STRINGTABLE DISCARDABLE { IDS_SEPARATOR "Odst�p" } + +STRINGTABLE DISCARDABLE +{ + HKY_NONE "Brak" +}

1 0

Mikołaj Zalewski : winmm: Use English (US) instead of English (Neutral) for resources.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 636f2ac0f38863ee285f419f8097b6106951fce8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=636f2ac0f38863ee285f419… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Sep 26 20:58:50 2006 +0200 winmm: Use English (US) instead of English (Neutral) for resources. --- dlls/winmm/winmm_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/winmm_En.rc b/dlls/winmm/winmm_En.rc index ffde2e7..10168e0 100644 --- a/dlls/winmm/winmm_En.rc +++ b/dlls/winmm/winmm_En.rc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT BEGIN /* MMSYS errors */

1 0

Mikołaj Zalewski : uninstaller: Add Polish translation .
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: 1e1d10739791e65e0b7671776fc9050f6781bf98 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1e1d10739791e65e0b76717… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Tue Sep 26 22:13:42 2006 +0200 uninstaller: Add Polish translation. --- programs/uninstaller/Pl.rc | 45 ++++++++++++++++++++++++++++++++++++++++++ programs/uninstaller/rsrc.rc | 1 + 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/programs/uninstaller/Pl.rc b/programs/uninstaller/Pl.rc new file mode 100644 index 0000000..bbc43ac --- /dev/null +++ b/programs/uninstaller/Pl.rc @@ -0,0 +1,45 @@ +/* + * Uninstaller (English Resources) + * + * Copyright 2005 Jonathan Ernst + * Copyright 2006 Mikolaj Zalewski + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_UNINSTALLER DIALOG DISCARDABLE 0, 0, 330, 160 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Wine - usuwanie program�w" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "Prosz� wybra� program, kt�rych chcesz usun��:",IDC_PLEASESELECT,10,10,250,14 + EDITTEXT IDC_FILTER,10,25,250,14,ES_AUTOHSCROLL + LISTBOX IDC_LIST,10,43,250,106,LBS_NOINTEGRALHEIGHT | + LBS_EXTENDEDSEL | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Usu�",IDC_UNINSTALL,270,48,50,14 + PUSHBUTTON "&O progamie",IDC_ABOUT,270,65,50,14 + PUSHBUTTON "&Zako�cz",IDC_EXIT,270,81,50,14 +END + + +STRINGTABLE DISCARDABLE { + IDS_APPNAME, "Wine - usuwanie program�w" + IDS_ABOUT, "Wine - usuwanie program�w (C) 2005 by Andreas Mohr, Hannu Valtonen and Jonathan Ernst." + IDS_ABOUTTITLE, "O narz�dziu do usuwania program�w" + IDS_REGISTRYKEYNOTAVAILABLE, "Nie ma informacji o usuwaniu tego programu w rejestrze (jeszcze), nie ma nic do zrobienia!" + IDS_UNINSTALLFAILED, "Nie uda�o si� wykona� polecenia '%s', kt�re powinno usun�� progam. By� mo�e ju� by� usuni�ty.\r\nCzy chcesz usun�� jego wpis z tej listy?" +} diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc index 2b4948d..4bc2394 100644 --- a/programs/uninstaller/rsrc.rc +++ b/programs/uninstaller/rsrc.rc @@ -37,6 +37,7 @@ #include "Hu.rc" #include "Ko.rc" #include "Nl.rc" #include "No.rc" +#include "Pl.rc" #include "Pt.rc" #include "Tr.rc"

1 0

Andrew Talbot : rsaenh: Cast-qual warnings fix.
by Alexandre Julliard 27 Sep '06

27 Sep '06

Module: wine Branch: master Commit: b3be5bcd1c8942190fad29cdd4462a561f1b669d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b3be5bcd1c8942190fad29c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Sep 26 22:06:33 2006 +0100 rsaenh: Cast-qual warnings fix. --- dlls/rsaenh/mpi.c | 2 +- dlls/rsaenh/rsa.c | 4 ++-- dlls/rsaenh/tomcrypt.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rsaenh/mpi.c b/dlls/rsaenh/mpi.c index 8ff2619..b20f0dc 100644 --- a/dlls/rsaenh/mpi.c +++ b/dlls/rsaenh/mpi.c @@ -3331,7 +3331,7 @@ error: /* reads an unsigned char array, assumes the msb is stored first [big endian] */ int -mp_read_unsigned_bin (mp_int * a, unsigned char *b, int c) +mp_read_unsigned_bin (mp_int * a, const unsigned char *b, int c) { int res; diff --git a/dlls/rsaenh/rsa.c b/dlls/rsaenh/rsa.c index 2013c83..4d6cd03 100644 --- a/dlls/rsaenh/rsa.c +++ b/dlls/rsaenh/rsa.c @@ -196,8 +196,8 @@ int rsa_exptmod(const unsigned char *in, } /* init and copy into tmp */ - if ((err = mp_init_multi(&tmp, &tmpa, &tmpb, NULL)) != MP_OKAY) { return mpi_to_ltc_error(err); } - if ((err = mp_read_unsigned_bin(&tmp, (unsigned char *)in, (int)inlen)) != MP_OKAY) { goto error; } + if ((err = mp_init_multi(&tmp, &tmpa, &tmpb, NULL)) != MP_OKAY) { return mpi_to_ltc_error(err); } + if ((err = mp_read_unsigned_bin(&tmp, in, (int)inlen)) != MP_OKAY) { goto error; } /* sanity check on the input */ if (mp_cmp(&key->N, &tmp) == MP_LT) { diff --git a/dlls/rsaenh/tomcrypt.h b/dlls/rsaenh/tomcrypt.h index 8241ae2..efddd90 100644 --- a/dlls/rsaenh/tomcrypt.h +++ b/dlls/rsaenh/tomcrypt.h @@ -545,7 +545,7 @@ int mp_prime_random_ex(mp_int *a, int t, int mp_count_bits(mp_int *a); int mp_unsigned_bin_size(mp_int *a); -int mp_read_unsigned_bin(mp_int *a, unsigned char *b, int c); +int mp_read_unsigned_bin(mp_int *a, const unsigned char *b, int c); int mp_to_unsigned_bin(mp_int *a, unsigned char *b); int mp_signed_bin_size(mp_int *a);

1 0