Windows: Fix some remaining ASLR issues

This commit is contained in:
Henrik Rydgard committed 2015-07-15 22:25:24 +02:00
1 parent a1faef4e8f
commit aaa8350591
3 files changed
+8 -2

No files matched your search

+6
View File
@@ -290,7 +290,13 @@ void Jit::UpdateRoundingMode(XEmitter *emitter)
// This is the most common situation.
emitter->TEST(32, M(&mips_->fcr31), Imm32(0x01000003));
FixupBranch skip = emitter->J_CC(CC_Z);
#ifdef _M_X64
// TODO: Move the hasSetRounding flag somewhere we can reach it through the context pointer, or something.
emitter->MOV(64, R(RAX), Imm64((uintptr_t)&js.hasSetRounding));
emitter->MOV(8, MatR(RAX), Imm8(1));
#else
emitter->MOV(8, M(&js.hasSetRounding), Imm8(1));
#endif
emitter->SetJumpTarget(skip);
}
}
+1 -1
View File
@@ -69,7 +69,7 @@ static const char basic_vs[] =
SimpleGLWindow::SimpleGLWindow(HWND wnd)
: hWnd_(wnd), valid_(false), drawProgram_(nullptr), tex_(0), flags_(0), zoom_(false),
dragging_(false), offsetX_(0), offsetY_(0), reformatBuf_(nullptr) {
SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG) this);
SetWindowLongPtr(wnd, GWLP_USERDATA, (LONG_PTR) this);
}
SimpleGLWindow::~SimpleGLWindow() {
+1 -1
View File
@@ -150,7 +150,7 @@ namespace W32Util
}
LPARAM l = ((LPPROPSHEETPAGE)lParam)->lParam;
tab = (Tab *)l;
SetWindowLongPtr(hDlg, GWLP_USERDATA, (DWORD_PTR)l);
SetWindowLongPtr(hDlg, GWLP_USERDATA, (LONG_PTR)l);
tab->Init(hDlg);
}
break;