np2/win9x/dialog/dialogs.cpp - diff

Return to dialogs.cpp CVS log

Up to [RetroPC.NET] / np2 / win9x / dialog

Diff for /np2/win9x/dialog/dialogs.cpp between versions 1.1.1.1 and 1.2

version 1.1.1.1, 2003/10/16 17:59:04	version 1.2, 2003/10/29 21:35:58
Line 2	Line 2
#include "strres.h"	#include "strres.h"
#include "dosio.h"	#include "dosio.h"
#include "commng.h"	#include "commng.h"
#include "sysmng.h"
#include "dialogs.h"	#include "dialogs.h"


static const char str_nc[] = "N/C";	static const char str_nc[] = "N/C";

static char pathname[MAX_PATH];	// static char pathname[MAX_PATH];
static char filename[MAX_PATH];	// static char filename[MAX_PATH];

const char str_int0[] = "INT0";	const char str_int0[] = "INT0";
const char str_int1[] = "INT1";	const char str_int1[] = "INT1";
Line 21 const char str_int6[] = "INT6";	Line 20 const char str_int6[] = "INT6";

// ---- file select	// ---- file select

const char dlgs_selectfile(HWND hWnd, const FILESEL item,	BOOL dlgs_selectfile(HWND hWnd, const FILESEL *item,
const char defname, char folder, UINT size, int *ro) {	char path, UINT size, int ro) {

OPENFILENAME ofn;	OPENFILENAME ofn;

if ((defname) && (defname[0])) {	if ((item == NULL) \|\| (path == NULL) \|\| (size == 0)) {
milstr_ncpy(pathname, defname, sizeof(pathname));	return(FALSE);
}	}
else if (folder) {
milstr_ncpy(pathname, folder, sizeof(pathname));
}
else {
pathname[0] = '\0';
}
filename[0] = '\0';

ZeroMemory(&ofn, sizeof(OPENFILENAME));	ZeroMemory(&ofn, sizeof(OPENFILENAME));
ofn.lStructSize = sizeof(OPENFILENAME);	ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = hWnd;	ofn.hwndOwner = hWnd;
ofn.lpstrFilter = item->filter;	ofn.lpstrFilter = item->filter;
ofn.nFilterIndex = item->defindex;	ofn.nFilterIndex = item->defindex;
ofn.lpstrFile = pathname;	ofn.lpstrFile = path;
ofn.lpstrFileTitle = filename;	ofn.nMaxFile = size;
ofn.nMaxFile = MAX_PATH;
ofn.Flags = OFN_FILEMUSTEXIST;	ofn.Flags = OFN_FILEMUSTEXIST;
ofn.lpstrDefExt = item->ext;	ofn.lpstrDefExt = item->ext;
ofn.lpstrTitle = item->title;	ofn.lpstrTitle = item->title;
if (!GetOpenFileName(&ofn)) {	if (!GetOpenFileName(&ofn)) {
return(NULL);	return(FALSE);
}
if (folder) {
milstr_ncpy(folder, pathname, size);
sysmng_update(SYS_UPDATEOSCFG);
}	}
if (ro) {	if (ro) {
*ro = ofn.Flags & OFN_READONLY;	*ro = ofn.Flags & OFN_READONLY;
}	}
return(pathname);	return(TRUE);
}	}

const char dlgs_selectwritefile(HWND hWnd, const FILESEL item,	BOOL dlgs_selectwritefile(HWND hWnd, const FILESEL *item,
const char defname, char folder, UINT size) {	char *path, UINT size) {

OPENFILENAME ofn;	OPENFILENAME ofn;

if (defname) {	if ((item == NULL) \|\| (path == NULL) \|\| (size == 0)) {
milstr_ncpy(pathname, defname, sizeof(pathname));	return(FALSE);
}	}
else {
pathname[0] = '\0';
}
filename[0] = '\0';

ZeroMemory(&ofn, sizeof(OPENFILENAME));	ZeroMemory(&ofn, sizeof(OPENFILENAME));
ofn.lStructSize = sizeof(OPENFILENAME);	ofn.lStructSize = sizeof(OPENFILENAME);
ofn.hwndOwner = hWnd;	ofn.hwndOwner = hWnd;
ofn.lpstrFilter = item->filter;	ofn.lpstrFilter = item->filter;
ofn.lpstrFile = pathname;
ofn.lpstrFileTitle = filename;
ofn.nFilterIndex = item->defindex;	ofn.nFilterIndex = item->defindex;
ofn.nMaxFile = MAX_PATH;	ofn.lpstrFile = path;
ofn.nMaxFileTitle = sizeof(filename);	ofn.nMaxFile = size;
ofn.Flags = OFN_OVERWRITEPROMPT \| OFN_HIDEREADONLY;	ofn.Flags = OFN_OVERWRITEPROMPT \| OFN_HIDEREADONLY;
ofn.lpstrDefExt = item->ext;	ofn.lpstrDefExt = item->ext;
ofn.lpstrTitle = item->title;	ofn.lpstrTitle = item->title;
if (!GetSaveFileName(&ofn)) {	if (!GetSaveFileName(&ofn)) {
return(NULL);	return(FALSE);
}
if (folder) {
milstr_ncpy(folder, pathname, size);
sysmng_update(SYS_UPDATEOSCFG);
}	}
return(pathname);	return(TRUE);
}	}

const char dlgs_selectwritenum(HWND hWnd, const FILESEL item,	BOOL dlgs_selectwritenum(HWND hWnd, const FILESEL *item,
const char defname, char folder, UINT size) {	char *path, UINT size) {

char numfile[MAX_PATH];	char *file;
char *p;	char *p;
int i;	char *q;
	UINT i;
	BOOL r;

if (folder) {	if ((item == NULL) \|\| (path == NULL) \|\| (size == 0)) {
milstr_ncpy(numfile, folder, sizeof(numfile));	return(FALSE);
}
else {
numfile[0] = '\0';
}	}
file_cutname(numfile);	file = (char *)_MALLOC(size + 16, path);
p = numfile + strlen(numfile);	if (file == NULL) {
	return(FALSE);
	}
	p = file_getname(path);
	milstr_ncpy(file, path, size);
	file_cutname(file);
	q = file + strlen(file);

for (i=0; i<10000; i++) {	for (i=0; i<10000; i++) {
wsprintf(p, defname, i);	SPRINTF(q, p, i);
if (file_attr(numfile) == -1) {	if (file_attr(file) == (short)-1) {
break;	break;
}	}
}	}
return(dlgs_selectwritefile(hWnd, item, numfile, folder, size));	r = dlgs_selectwritefile(hWnd, item, file, size);
	if (r) {
	milstr_ncpy(path, file, size);
	}
	_MFREE(file);
	return(r);
}	}


Line 136 const char *p;	Line 122 const char *p;

subwnd = GetDlgItem(hWnd, res);	subwnd = GetDlgItem(hWnd, res);
GetWindowText(subwnd, path, sizeof(path));	GetWindowText(subwnd, path, sizeof(path));
p = dlgs_selectfile(hWnd, &mimpi, path, NULL, 0, NULL);	if (dlgs_selectfile(hWnd, &mimpi, path, sizeof(path), NULL)) {
if (p == NULL) {	p = path;
	}
	else {
p = str_null;	p = str_null;
}	}
SetWindowText(subwnd, p);	SetWindowText(subwnd, p);

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.1.1.1
changed lines
	Added in v.1.2