diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-21 13:43:01 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-21 13:43:01 +0000 |
| commit | 9cb64ba2151b213f5544b2e53c6668061f197b9c (patch) | |
| tree | bf4c796a96df96a9875af9d772826937f66ee33c /include | |
| parent | bc69e94ff28a1f7cd0c0b99fa7d2702b8807539f (diff) | |
MS_UTILS_GETRANDOM -> mir_core::Utils_GetRandom
git-svn-id: http://svn.miranda-ng.org/main/trunk@14299 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include')
| -rw-r--r-- | include/delphi/m_utils.inc | 4 | ||||
| -rw-r--r-- | include/m_utils.h | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/include/delphi/m_utils.inc b/include/delphi/m_utils.inc index d420a05c7b..205f22d9ff 100644 --- a/include/delphi/m_utils.inc +++ b/include/delphi/m_utils.inc @@ -311,8 +311,8 @@ function PathIsAbsoluteW(const pSrc:PWideChar):int; stdcall; Always returns 0
}
-const
- MS_UTILS_GETRANDOM:PAnsiChar = 'Utils/GetRandom';
+procedure Utils_GetRandom(pSrc:pointer; size:size_t); stdcall;
+ external CoreDLL name 'Utils_GetRandom';
//Replace variables in text
//wParam=(char*/TCHAR*/WCHAR*)string (depends on RVF_UNICODE/RVF_TCHAR flag)
diff --git a/include/m_utils.h b/include/m_utils.h index 843685e2ac..3e8545f766 100644 --- a/include/m_utils.h +++ b/include/m_utils.h @@ -333,7 +333,7 @@ EXTERN_C MIR_CORE_DLL(int) PathIsAbsoluteW(const wchar_t *pSrc); // lParam = (LPARAM)(char*)pszArray - pointer to array to fill with random number
// Always returns 0
-#define MS_UTILS_GETRANDOM "Utils/GetRandom"
+EXTERN_C MIR_CORE_DLL(void) Utils_GetRandom(void *pszDest, size_t cbLen);
/////////////////////////////////////////////////////////////////////////////////////////
// Replace variables in text
@@ -440,7 +440,7 @@ __forceinline TCHAR* Utils_ReplaceVarsT(const TCHAR *szData) { #define ESF_RICHEDIT 3
#define ESF_PASSWORD 4
-typedef struct
+struct ENTER_STRING
{
int cbSize; // structure size
int type; // one of ESF_* constants
@@ -453,8 +453,7 @@ typedef struct };
int recentCount; // number of combobox strings to store
int timeout; // timeout for the form auto-close
-}
-ENTER_STRING;
+};
/////////////////////////////////////////////////////////////////////////////////////////
// enters one string
|