mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Windows: Avoid deprecated functions.
This commit is contained in:
parent
9c49fba595
commit
ba520120ab
2 changed files with 8 additions and 13 deletions
|
@ -18,6 +18,7 @@
|
|||
#include <fcntl.h>
|
||||
|
||||
#include "Common/Common.h"
|
||||
#include "Common/Data/Encoding/Utf8.h"
|
||||
#include "Common/File/FileDescriptor.h"
|
||||
#include "Common/Log.h"
|
||||
|
||||
|
@ -159,10 +160,11 @@ std::string GetLocalIP(int sock) {
|
|||
addr = &server_addr.ipv4.sin_addr;
|
||||
}
|
||||
#ifdef _WIN32
|
||||
wchar_t wtemp[sizeof(temp)];
|
||||
DWORD len = (DWORD)sizeof(temp);
|
||||
// Windows XP doesn't support inet_ntop.
|
||||
if (WSAAddressToStringA((struct sockaddr *)&server_addr, sizeof(server_addr), nullptr, temp, &len) == 0) {
|
||||
return temp;
|
||||
if (WSAAddressToStringW((struct sockaddr *)&server_addr, sizeof(server_addr), nullptr, wtemp, &len) == 0) {
|
||||
return ConvertWStringToUTF8(wtemp);
|
||||
}
|
||||
#else
|
||||
const char *result = inet_ntop(server_addr.sa.sa_family, addr, temp, sizeof(temp));
|
||||
|
|
|
@ -8,8 +8,9 @@
|
|||
#include "Common/System/Display.h"
|
||||
#include "Common/Data/Encoding/Utf8.h"
|
||||
#include "Common/Data/Text/I18n.h"
|
||||
|
||||
#include "Common/Log.h"
|
||||
#include "Common/OSVersion.h"
|
||||
|
||||
#include "Core/Config.h"
|
||||
#include "Core/ConfigValues.h"
|
||||
#include "Core/Reporting.h"
|
||||
|
@ -35,14 +36,6 @@ void D3D9Context::SwapBuffers() {
|
|||
|
||||
typedef HRESULT (__stdcall *DIRECT3DCREATE9EX)(UINT, IDirect3D9Ex**);
|
||||
|
||||
bool IsWin7OrLater() {
|
||||
DWORD version = GetVersion();
|
||||
DWORD major = (DWORD)(LOBYTE(LOWORD(version)));
|
||||
DWORD minor = (DWORD)(HIBYTE(LOWORD(version)));
|
||||
|
||||
return (major > 6) || ((major == 6) && (minor >= 1));
|
||||
}
|
||||
|
||||
static void GetRes(HWND hWnd, int &xres, int &yres) {
|
||||
RECT rc;
|
||||
GetClientRect(hWnd, &rc);
|
||||
|
@ -149,7 +142,7 @@ bool D3D9Context::Init(HINSTANCE hInst, HWND wnd, std::string *error_message) {
|
|||
presentParams_.PresentationInterval = swapInterval_ == 1 ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
|
||||
|
||||
if (has9Ex_) {
|
||||
if (windowed && IsWin7OrLater()) {
|
||||
if (windowed && IsWin7OrHigher()) {
|
||||
// This "new" flip mode should give higher performance but doesn't.
|
||||
//pp.BackBufferCount = 2;
|
||||
//pp.SwapEffect = D3DSWAPEFFECT_FLIPEX;
|
||||
|
@ -170,7 +163,7 @@ bool D3D9Context::Init(HINSTANCE hInst, HWND wnd, std::string *error_message) {
|
|||
DX9::pD3Ddevice = device_;
|
||||
DX9::pD3DdeviceEx = deviceEx_;
|
||||
|
||||
if (deviceEx_ && IsWin7OrLater()) {
|
||||
if (deviceEx_ && IsWin7OrHigher()) {
|
||||
// TODO: This makes it slower?
|
||||
//deviceEx->SetMaximumFrameLatency(1);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue