diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-21 20:23:22 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2013-09-21 20:23:22 +0000 |
| commit | 52824c91bac6d6cc0f04e242b07d9031477b6362 (patch) | |
| tree | 3cafc4ce886f9066b50d4d32bfdda4c5c9f954f4 /protocols/JabberG/src/jabber_iq_handlers.cpp | |
| parent | b4caa062df453412e7cafa5b96afab0b0c3a2940 (diff) | |
protocols cleanup
git-svn-id: http://svn.miranda-ng.org/main/trunk@6170 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_iq_handlers.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_iq_handlers.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp index aa00846287..d0acf58696 100644 --- a/protocols/JabberG/src/jabber_iq_handlers.cpp +++ b/protocols/JabberG/src/jabber_iq_handlers.cpp @@ -113,7 +113,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define PRODUCT_UNLICENSED 0xABCDABCD
#endif
-typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
#define StringCchCopy(x,y,z) lstrcpyn((x),(z),(y))
@@ -124,7 +123,6 @@ BOOL GetOSDisplayString(LPTSTR pszOS, int BUFSIZE) {
OSVERSIONINFOEX osvi;
SYSTEM_INFO si;
- PGNSI pGNSI;
PGPI pGPI;
DWORD dwType;
@@ -142,13 +140,7 @@ BOOL GetOSDisplayString(LPTSTR pszOS, int BUFSIZE) return FALSE;
}
- // Call GetNativeSystemInfo if supported or GetSystemInfo otherwise.
- HMODULE hKernel = GetModuleHandle(TEXT("kernel32.dll"));
- pGNSI = (PGNSI) GetProcAddress(hKernel, "GetNativeSystemInfo");
- if (pGNSI != NULL)
- pGNSI(&si);
- else
- GetSystemInfo(&si);
+ GetNativeSystemInfo(&si);
// Some code from Crash Dumper Plugin :-)
if (VER_PLATFORM_WIN32_NT == osvi.dwPlatformId && osvi.dwMajorVersion > 4)
@@ -182,6 +174,7 @@ BOOL GetOSDisplayString(LPTSTR pszOS, int BUFSIZE) break;
}
+ HMODULE hKernel = GetModuleHandle(TEXT("kernel32.dll"));
pGPI = (PGPI) GetProcAddress(hKernel, "GetProductInfo");
if (pGPI != NULL)
pGPI(osvi.dwMajorVersion, osvi.dwMinorVersion, 0, 0, &dwType);
|