OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-20 04:09:16 +00:00
Code Releases Activity

Merge msvc10 into cursors2

Browse Source
This commit is contained in:
Christian Walther
2012-06-24 16:01:01 +02:00
parent a7271982d5 367c3df020
commit 48ded426a9
317 changed files with 41525 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp
View File

@ -1635,7 +1635,7 @@ void plClient::ShutdownDLLs()
hsBool plClient::MainLoop()
{
#ifndef PLASMA_EXTERNAL_RELEASE
#if defined(HAVE_CYPYTHONIDE) && !defined(PLASMA_EXTERNAL_RELEASE)
if (PythonInterface::UsePythonDebugger())
{
PythonInterface::PythonDebugger()->Update();

6
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -1299,7 +1299,7 @@ BOOL CALLBACK UruLoginDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
{
static ShaDigest namePassHash;
static LoginDialogParam* loginParam;
static showAuthFailed = false;
static bool showAuthFailed = false;
switch( uMsg )
{
@ -1979,11 +1979,11 @@ bool IsExpired()
void* desc = nil;
if (VerQueryValue(data, "\\StringFileInfo\\040904B0\\FileDescription", &desc, &descLen))
{
char* buildDateStart = strstr((const char*)desc, " - Built ");
const char* buildDateStart = strstr((const char*)desc, " - Built ");
if (buildDateStart)
{
buildDateStart += strlen(" - Built ");
char* buildDateEnd = strstr(buildDateStart, " at");
const char* buildDateEnd = strstr(buildDateStart, " at");
if (buildDateEnd)
{
int len = buildDateEnd-buildDateStart;

12
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp
View File

@ -386,9 +386,9 @@ static void DownloadCallback (
) {
s_numConnectFailures = 0;
ref(result);
ref(param);
ref(filename);
REF(result);
REF(param);
REF(filename);
ManifestFile *mf = (ManifestFile *)param;
if (IS_NET_ERROR(result) && s_running && !s_patchError) {
@ -732,7 +732,7 @@ static void ThinManifestCallback (
){
s_numConnectFailures = 0;
ref(group);
REF(group);
plLauncherInfo * info = (plLauncherInfo *) param;
char text[256];
@ -831,7 +831,7 @@ static void FileSrvIpAddressCallback (
void * param,
const wchar addr[]
) {
ref(param);
REF(param);
NetCliGateKeeperDisconnect();
@ -960,7 +960,7 @@ void UruPrepProc (void * param) {
void PlayerStopProc (void * param) {
s_running = false;
plLauncherInfo *info = (plLauncherInfo *) param;
ref(param);
//TerminateProcess(s_pi.hProcess, kExitCodeTerminated);
info->stopCallback(kStatusOk, nil);
}

12
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plUruLauncher/SelfPatcher.cpp
View File

@ -87,7 +87,7 @@ static wchar s_newPatcherFile[MAX_PATH];
//============================================================================
static void NetErrorHandler (ENetProtocol protocol, ENetError error) {
ref(protocol);
REF(protocol);
LogMsg(kLogError, L"NetErr: %s", NetErrorToString(error));
if (IS_NET_SUCCESS(s_patchResult))
s_patchResult = error;
@ -109,8 +109,8 @@ static void DownloadCallback (
const wchar filename[],
hsStream * writer
) {
ref(param);
ref(filename);
REF(param);
REF(filename);
if(IS_NET_ERROR(result)) {
switch (result) {
@ -158,8 +158,8 @@ static void ManifestCallback (
const NetCliFileManifestEntry manifest[],
unsigned entryCount
) {
ref(param);
ref(group);
REF(param);
REF(group);
if(IS_NET_ERROR(result)) {
switch (result) {
@ -208,7 +208,7 @@ static void FileSrvIpAddressCallback (
void * param,
const wchar addr[]
) {
ref(param);
REF(param);
NetCliGateKeeperDisconnect();