|
From: <ama...@us...> - 2008-05-30 11:44:58
|
Revision: 18816
http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18816&view=rev
Author: amatthies
Date: 2008-05-30 04:45:04 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Fixed compiler warnings.
Modified Paths:
--------------
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c
branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/archdep.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -185,7 +185,7 @@
BYTE *version_info_buffer = lib_malloc(version_info_size);
if (GetFileVersionInfo(file_name, (DWORD)NULL, version_info_size, (VOID*)version_info_buffer)) {
- if (VerQueryValue(version_info_buffer, "\\StringFileInfo\\04090000\\CompanyName", &company_name, &company_name_length)) {
+ if (VerQueryValue(version_info_buffer, "\\StringFileInfo\\04090000\\CompanyName", (void*)&company_name, &company_name_length)) {
if (company_name) {
if (strncmp("Vice Team", company_name, company_name_length) == 0) {
bResult = TRUE;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/fullscrn.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -586,7 +586,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
fullscreen_dialog_end();
SetWindowLong(hwnd, DWL_MSGRESULT, FALSE);
return TRUE;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/statusbar.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -560,10 +560,10 @@
slider_pos = SendMessage(slider_hwnd[window_index], TBM_GETPOS, 0, 0);
resources_set_int("SoundVolume", 100 - slider_pos);
- if (nmhdr->code == NM_RELEASEDCAPTURE)
+ if (nmhdr->code == (UINT)NM_RELEASEDCAPTURE)
SetFocus(window);
- if (nmhdr->code == NM_CUSTOMDRAW) {
+ if (nmhdr->code == (UINT)NM_CUSTOMDRAW) {
NMCUSTOMDRAW *lpNMCustomDraw = (NMCUSTOMDRAW*)lparam;
#ifndef CDIS_FOCUS
#define CDIS_FOCUS 16
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/ui.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -218,7 +218,6 @@
/* ------------------------------------------------------------------------ */
static HWND main_hwnd;
-static HWND slider_hwnd;
static int emu_menu;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uimon.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -669,7 +669,7 @@
{
ret = GetByte(&(pwd->pMonitorDimensions),&pwd->MonitorLen);
- if (pwd->MonitorLen < sizeof(WINDOWPLACEMENT))
+ if (pwd->MonitorLen < (int)sizeof(WINDOWPLACEMENT))
{
ret = WT_END;
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/uivideo.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -274,7 +274,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
GetDlgItemText(hwnd, IDC_VIDEO_COLORS_SAT, s, 100);
_stscanf(s, TEXT("%f"), &tf);
ival = (int)(tf * 1000.0 + 0.5);
@@ -318,7 +318,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
GetDlgItemText(hwnd, IDC_VIDEO_COLORS_GAM, s, 100);
_stscanf(s, TEXT("%f"), &tf);
ival = (int)(tf * 1000.0 + 0.5);
@@ -423,7 +423,7 @@
switch (msg) {
case WM_NOTIFY:
- if (((NMHDR FAR *)lparam)->code == PSN_APPLY) {
+ if (((NMHDR FAR *)lparam)->code == (UINT)PSN_APPLY) {
querynewpalette = 1;
if (resources_set_string(current_chip2->res_PaletteFile_name,
palette_file2) < 0) {
Modified: branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c
===================================================================
--- branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c 2008-05-30 10:13:59 UTC (rev 18815)
+++ branches/amatthies/v1.22.16-sprites/vice/src/arch/win32/utils/genwinres.c 2008-05-30 11:45:04 UTC (rev 18816)
@@ -40,8 +40,8 @@
{
FILE *infile;
int state;
-int res_value;
-int is_idm;
+int res_value = 0;
+int is_idm = 0;
infile = fopen(filename, "rb");
if (infile) {
@@ -159,7 +159,7 @@
}
-void main(int argc, char **argv)
+int main(int argc, char **argv)
{
FILE *houtput, *moutput;
int i;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|