Rev 492 | Rev 495 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 492 | Rev 493 | ||
---|---|---|---|
Line 24... | Line 24... | ||
24 | void FF_GetMsg(TCHAR* ret, int MsgId) { |
24 | void FF_GetMsg(TCHAR* ret, int MsgId) { |
25 | #ifdef WIN_ENV |
25 | #ifdef WIN_ENV |
26 | TCHAR* szMsg; |
26 | TCHAR* szMsg; |
27 | int len; |
27 | int len; |
28 | len = LoadString(hDllInstance, MsgId, (LPTSTR)&szMsg, 0); |
28 | len = LoadString(hDllInstance, MsgId, (LPTSTR)&szMsg, 0); |
29 | LoadString(hDllInstance, MsgId, ret, len); |
29 | LoadString(hDllInstance, MsgId, ret, len+1); |
30 | #else |
30 | #else |
31 | Str255 msg; |
31 | Str255 msg; |
32 | GetIndString(msg, 1000, MsgId); |
32 | GetIndString(msg, 1000, MsgId); |
33 | myp2cstrcpy(ret, msg); |
33 | myp2cstrcpy(ret, msg); |
34 | #endif |
34 | #endif |
35 | } |
35 | } |
36 | 36 | ||
37 | TCHAR* FF_GetMsg_Cpy(int MsgId) { |
37 | TCHAR* FF_GetMsg_Cpy(int MsgId) { |
- | 38 | #ifdef WIN_ENV |
|
38 | TCHAR* szMsg; |
39 | TCHAR* szMsg; |
39 | int len; |
40 | int len; |
40 | TCHAR* ret; |
41 | TCHAR* ret; |
41 | len = LoadString(hDllInstance, MsgId, (LPTSTR)&szMsg, 0); |
42 | len = LoadString(hDllInstance, MsgId, (LPTSTR)&szMsg, 0); |
42 | ret = (TCHAR*)malloc((len+1) * sizeof(TCHAR)); // TODO: This leaks memory! Like _strdup() does... Not a good design! |
43 | ret = (TCHAR*)malloc((len+1) * sizeof(TCHAR)); // TODO: This leaks memory! Like _strdup() does... Not a good design! |
43 | if (ret == NULL) return NULL; |
44 | if (ret == NULL) return NULL; |
44 | LoadString(hDllInstance, MsgId, ret, len); |
45 | LoadString(hDllInstance, MsgId, ret, len+1); |
- | 46 | return ret; |
|
- | 47 | #else |
|
- | 48 | Str255 msg; |
|
- | 49 | TCHAR* ret; |
|
- | 50 | GetIndString(msg, 1000, MsgId); |
|
- | 51 | myp2cstrcpy(ret, msg); |
|
45 | return ret; |
52 | return ret; |
- | 53 | #endif |
|
46 | } |
54 | } |
47 | 55 |