80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Split win_about, win_stbar, merged ddraw stuff, initial cleanup of win_cdrom.

Browse Source
This commit is contained in:
waltje
2017-10-07 04:34:04 -04:00
parent 2b37b7fbfb
commit 97ab6234d4
13 changed files with 1842 additions and 1768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile.mingw
View File

@@ -8,7 +8,7 @@
# #
# Modified Makefile for Win32 (MinGW32) environment. # Modified Makefile for Win32 (MinGW32) environment.
# #
# Version: @(#)Makefile.mingw 1.0.52 2017/10/05 # Version: @(#)Makefile.mingw 1.0.53 2017/10/06
# #
# Authors: Miran Grca, <mgrca8@gmail.com> # Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com> # Fred N. van Kempen, <decwiz@yahoo.com>
@@ -347,12 +347,12 @@ VIDOBJ := video.o \
vid_tandy.o vid_tandysl.o vid_tandy.o vid_tandysl.o
WINOBJ := win.o \ WINOBJ := win.o \
win_ddraw.o win_ddraw_fs.o win_ddraw_screenshot.o \ win_ddraw.o win_ddraw_fs.o win_d3d.o win_d3d_fs.o \
win_d3d.o win_d3d_fs.o \
win_language.o win_status.o $(OPENDIR) win_dynld.o \ win_language.o win_status.o $(OPENDIR) win_dynld.o \
win_video.o $(WSERIAL) win_keyboard.o win_mouse.o \ win_video.o $(WSERIAL) win_keyboard.o win_mouse.o \
win_joystick.o win_midi.o win_thread.o \ win_joystick.o win_midi.o win_cdrom.o win_thread.o \
win_settings.o win_deviceconfig.o win_joystickconfig.o win_about.o win_stbar.o win_settings.o \
win_deviceconfig.o win_joystickconfig.o
OBJ := $(MAINOBJ) $(CPUOBJ) $(MCHOBJ) $(DEVOBJ) \ OBJ := $(MAINOBJ) $(CPUOBJ) $(MCHOBJ) $(DEVOBJ) \
$(FDDOBJ) $(CDROMOBJ) $(HDDOBJ) \ $(FDDOBJ) $(CDROMOBJ) $(HDDOBJ) \

2
src/scsi/scsi.h
View File

@@ -281,7 +281,9 @@ extern int scsi_card_current;
extern int scsi_card_available(int card); extern int scsi_card_available(int card);
extern char *scsi_card_getname(int card); extern char *scsi_card_getname(int card);
#ifdef EMU_DEVICE_H
extern device_t *scsi_card_getdevice(int card); extern device_t *scsi_card_getdevice(int card);
#endif
extern int scsi_card_has_config(int card); extern int scsi_card_has_config(int card);
extern char *scsi_card_get_internal_name(int card); extern char *scsi_card_get_internal_name(int card);
extern int scsi_card_get_from_internal_name(char *s); extern int scsi_card_get_from_internal_name(char *s);

6
src/win/plat_iodev.h
View File

@@ -1,3 +1,9 @@
extern uint8_t host_cdrom_drive_available[26];
extern uint8_t host_cdrom_drive_available_num;
extern void cdrom_init_host_drives(void);
extern void cdrom_close(uint8_t id);
extern void cdrom_eject(uint8_t id); extern void cdrom_eject(uint8_t id);
extern void cdrom_reload(uint8_t id); extern void cdrom_reload(uint8_t id);
extern void removable_disk_unload(uint8_t id); extern void removable_disk_unload(uint8_t id);

1362
src/win/win.c
View File

File diff suppressed because it is too large Load Diff

14
src/win/win.h
View File

@@ -12,7 +12,7 @@
* Windows-specific header files needed, to keep them * Windows-specific header files needed, to keep them
* out of the main code. * out of the main code.
* *
* Version: @(#)win.h 1.0.2 2017/10/05 * Version: @(#)win.h 1.0.3 2017/10/06
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -54,6 +54,7 @@
extern HINSTANCE hinstance; extern HINSTANCE hinstance;
extern HWND hwndMain; extern HWND hwndMain;
extern HICON hIcon[512];
extern int status_is_open; extern int status_is_open;
extern int mousecapture; extern int mousecapture;
@@ -84,7 +85,6 @@ extern void startblit(void);
extern void endblit(void); extern void endblit(void);
extern void win_settings_open(HWND hwnd); extern void win_settings_open(HWND hwnd);
extern void win_menu_update();
extern void hard_disk_add_open(HWND hwnd, int is_existing); extern void hard_disk_add_open(HWND hwnd, int is_existing);
extern int hard_disk_was_added(void); extern int hard_disk_was_added(void);
@@ -95,13 +95,17 @@ extern void process_raw_input(LPARAM lParam, int infocus);
extern void cdrom_init_host_drives(void); extern void cdrom_init_host_drives(void);
extern void cdrom_close(uint8_t id); extern void cdrom_close(uint8_t id);
extern HICON LoadIconEx(PCTSTR pszIconName);
extern BOOL DirectoryExists(LPCTSTR szPath); extern BOOL DirectoryExists(LPCTSTR szPath);
/* About dialog definitions. */
extern void AboutDialogCreate(HWND hwnd);
/* Status Window definitions. */ /* Status Window definitions. */
extern HWND hwndStatus; extern HWND hwndStatus;
extern void StatusWindowCreate(HWND hwnd); extern void StatusWindowCreate(HWND hwnd);
/* Status Bar definitions. */ /* Status Bar definitions. */
#define SB_ICON_WIDTH 24 #define SB_ICON_WIDTH 24
#define SB_FLOPPY 0x00 #define SB_FLOPPY 0x00
@@ -111,12 +115,16 @@ extern void StatusWindowCreate(HWND hwnd);
#define SB_NETWORK 0x50 #define SB_NETWORK 0x50
#define SB_TEXT 0x60 #define SB_TEXT 0x60
extern HWND hwndSBAR;
extern void StatusBarCreate(HWND hwndParent, int idStatus, HINSTANCE hInst);
extern int fdd_type_to_icon(int type); extern int fdd_type_to_icon(int type);
extern int StatusBarFindPart(int tag); extern int StatusBarFindPart(int tag);
extern void StatusBarUpdatePanes(void); extern void StatusBarUpdatePanes(void);
extern void StatusBarUpdateTip(int meaning); extern void StatusBarUpdateTip(int meaning);
extern void StatusBarUpdateIcon(int tag, int val); extern void StatusBarUpdateIcon(int tag, int val);
extern void StatusBarUpdateIconState(int tag, int active); extern void StatusBarUpdateIconState(int tag, int active);
extern void StatusBarCheckMenuItem(int tag, int id, int chk);
extern void StatusBarEnableMenuItem(int tag, int id, int val);
extern void StatusBarSetTextW(wchar_t *wstr); extern void StatusBarSetTextW(wchar_t *wstr);
extern void StatusBarSetText(char *str); extern void StatusBarSetText(char *str);

76
src/win/win_about.c Normal file
View File

@@ -0,0 +1,76 @@
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* Handle the About dialog.
*
* Version: @(#)win_about.c 1.0.1 2017/10/06
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2008-2017 Sarah Walker.
* Copyright 2016,2017 Miran Grca.
* Copyright 2017 Fred N. van Kempen.
*/
#define UNICODE
#define BITMAP WINDOWS_BITMAP
#include <windows.h>
#include <windowsx.h>
#undef BITMAP
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../86box.h"
#include "../ibm.h"
#include "win.h"
#include "win_language.h"
#ifndef MAPVK_VK_TO_VSC
#define MAPVK_VK_TO_VSC 0
#endif
static BOOL CALLBACK
AboutDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
{
HWND h;
switch (message) {
case WM_INITDIALOG:
pause = 1;
h = GetDlgItem(hdlg, IDC_ABOUT_ICON);
SendMessage(h, STM_SETIMAGE, (WPARAM)IMAGE_ICON,
(LPARAM)LoadImage(hinstance,(PCTSTR)100,IMAGE_ICON,64,64,0));
break;
case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDOK:
EndDialog(hdlg, 0);
pause = 0;
return TRUE;
default:
break;
}
break;
}
return(FALSE);
}
void
AboutDialogCreate(HWND hwnd)
{
DialogBox(hinstance, (LPCTSTR)DLG_ABOUT, hwnd, AboutDialogProcedure);
}

224
src/win/win_cdrom.c Normal file
View File

@@ -0,0 +1,224 @@
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* Handle the platform-side of CDROM drives.
*
* Version: @(#)win_cdrom.c 1.0.1 2017/10/06
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
*
* Copyright 2016,2017 Miran Grca.
* Copyright 2017 Fred N. van Kempen.
*/
#define UNICODE
#define BITMAP WINDOWS_BITMAP
#include <windows.h>
#include <windowsx.h>
#undef BITMAP
#include <stdio.h>
#include <stdint.h>
#include <string.h>
#include <stdlib.h>
#include <wchar.h>
#include "../config.h"
#include "../cdrom/cdrom.h"
#include "../cdrom/cdrom_ioctl.h"
#include "../cdrom/cdrom_image.h"
#include "../cdrom/cdrom_null.h"
#include "../disk/hdd.h"
#include "../scsi/scsi.h"
#include "../scsi/scsi_disk.h"
#include "plat_ui.h"
#include "win.h"
#include "win_language.h"
uint8_t host_cdrom_drive_available[26];
uint8_t host_cdrom_drive_available_num = 0;
void
cdrom_init_host_drives(void)
{
WCHAR s[64];
int i = 0;
host_cdrom_drive_available_num = 0;
for (i='A'; i<='Z'; i++) {
_swprintf(s, L"%c:\\", i);
if (GetDriveType(s)==DRIVE_CDROM) {
host_cdrom_drive_available[i - 'A'] = 1;
host_cdrom_drive_available_num++;
} else {
host_cdrom_drive_available[i - 'A'] = 0;
}
}
}
void
cdrom_close(uint8_t id)
{
switch (cdrom_drives[id].host_drive) {
case 0:
null_close(id);
break;
case 200:
image_close(id);
break;
default:
ioctl_close(id);
break;
}
}
void
cdrom_eject(uint8_t id)
{
if (cdrom_drives[id].host_drive == 0) {
/* Switch from empty to empty. Do nothing. */
return;
}
if ((cdrom_drives[id].host_drive >= 'A') &&
(cdrom_drives[id].host_drive <= 'Z')) {
StatusBarCheckMenuItem(SB_CDROM|id,
IDM_CDROM_HOST_DRIVE | id | ((cdrom_drives[id].host_drive - 'A') << 3), MF_UNCHECKED);
}
if (cdrom_drives[id].host_drive == 200) {
wcscpy(cdrom_image[id].prev_image_path, cdrom_image[id].image_path);
}
cdrom_drives[id].prev_host_drive = cdrom_drives[id].host_drive;
cdrom_drives[id].handler->exit(id);
cdrom_close(id);
cdrom_null_open(id, 0);
if (cdrom_drives[id].bus_type) {
/* Signal disc change to the emulated machine. */
cdrom_insert(id);
}
StatusBarCheckMenuItem(SB_CDROM|id, IDM_CDROM_IMAGE | id, MF_UNCHECKED);
cdrom_drives[id].host_drive=0;
StatusBarCheckMenuItem(SB_CDROM|id, IDM_CDROM_EMPTY | id, MF_CHECKED);
StatusBarUpdateIconState(SB_CDROM|id, 1);
StatusBarEnableMenuItem(SB_CDROM|id, IDM_CDROM_RELOAD | id, MF_BYCOMMAND | MF_ENABLED);
StatusBarUpdateTip(SB_CDROM|id);
config_save();
}
void
cdrom_reload(uint8_t id)
{
int new_cdrom_drive;
if ((cdrom_drives[id].host_drive == cdrom_drives[id].prev_host_drive) || (cdrom_drives[id].prev_host_drive == 0) || (cdrom_drives[id].host_drive != 0)) {
/* Switch from empty to empty. Do nothing. */
return;
}
cdrom_close(id);
if (cdrom_drives[id].prev_host_drive == 200) {
wcscpy(cdrom_image[id].image_path, cdrom_image[id].prev_image_path);
image_open(id, cdrom_image[id].image_path);
if (cdrom_drives[id].bus_type) {
/* Signal disc change to the emulated machine. */
cdrom_insert(id);
}
if (wcslen(cdrom_image[id].image_path) == 0) {
StatusBarCheckMenuItem(SB_CDROM|id, IDM_CDROM_EMPTY | id, MF_CHECKED);
cdrom_drives[id].host_drive = 0;
StatusBarCheckMenuItem(SB_CDROM|id, IDM_CDROM_IMAGE | id, MF_UNCHECKED);
StatusBarUpdateIconState(SB_CDROM|id, 1);
} else {
StatusBarCheckMenuItem(SB_CDROM|id, IDM_CDROM_EMPTY | id, MF_UNCHECKED);
cdrom_drives[id].host_drive = 200;
StatusBarCheckMenuItem(SB_CDROM|id, IDM_CDROM_IMAGE | id, MF_CHECKED);
StatusBarUpdateIconState(SB_CDROM|id, 0);
}
} else {
new_cdrom_drive = cdrom_drives[id].prev_host_drive;
ioctl_open(id, new_cdrom_drive);
if (cdrom_drives[id].bus_type) {
/* Signal disc change to the emulated machine. */
cdrom_insert(id);
}
StatusBarCheckMenuItem(SB_CDROM|id, IDM_CDROM_EMPTY | id, MF_UNCHECKED);
cdrom_drives[id].host_drive = new_cdrom_drive;
StatusBarCheckMenuItem(SB_CDROM|id, IDM_CDROM_HOST_DRIVE | id | ((cdrom_drives[id].host_drive - 'A') << 3), MF_CHECKED);
StatusBarUpdateIconState(SB_CDROM|id, 0);
}
StatusBarEnableMenuItem(SB_CDROM|id, IDM_CDROM_RELOAD | id, MF_BYCOMMAND | MF_GRAYED);
StatusBarUpdateTip(SB_CDROM|id);
config_save();
}
void
removable_disk_unload(uint8_t id)
{
if (wcslen(hdd[id].fn) == 0) {
/* Switch from empty to empty. Do nothing. */
return;
}
scsi_unloadhd(hdd[id].scsi_id, hdd[id].scsi_lun, id);
scsi_disk_insert(id);
}
void
removable_disk_eject(uint8_t id)
{
removable_disk_unload(id);
StatusBarUpdateIconState(SB_RDISK|id, 1);
StatusBarEnableMenuItem(SB_RDISK|id, IDM_RDISK_EJECT | id, MF_BYCOMMAND | MF_GRAYED);
StatusBarEnableMenuItem(SB_RDISK|id, IDM_RDISK_RELOAD | id, MF_BYCOMMAND | MF_ENABLED);
StatusBarEnableMenuItem(SB_RDISK|id, IDM_RDISK_SEND_CHANGE | id, MF_BYCOMMAND | MF_GRAYED);
StatusBarUpdateTip(SB_RDISK|id);
config_save();
}
void
removable_disk_reload(uint8_t id)
{
if (wcslen(hdd[id].fn) != 0) {
/* Attempting to reload while an image is already loaded. Do nothing. */
return;
}
scsi_reloadhd(id);
#if 0
scsi_disk_insert(id);
#endif
StatusBarUpdateIconState(SB_RDISK|id, wcslen(hdd[id].fn) ? 0 : 1);
StatusBarEnableMenuItem(SB_RDISK|id, IDM_RDISK_EJECT | id, MF_BYCOMMAND | (wcslen(hdd[id].fn) ? MF_ENABLED : MF_GRAYED));
StatusBarEnableMenuItem(SB_RDISK|id, IDM_RDISK_RELOAD | id, MF_BYCOMMAND | MF_GRAYED);
StatusBarEnableMenuItem(SB_RDISK|id, IDM_RDISK_SEND_CHANGE | id, MF_BYCOMMAND | (wcslen(hdd[id].fn) ? MF_ENABLED : MF_GRAYED));
StatusBarUpdateTip(SB_RDISK|id);
config_save();
}

1
src/win/win_d3d.h
View File

@@ -33,6 +33,7 @@ extern int d3d_init(HWND h);
extern void d3d_close(void); extern void d3d_close(void);
extern void d3d_reset(void); extern void d3d_reset(void);
extern void d3d_resize(int x, int y); extern void d3d_resize(int x, int y);
extern void d3d_take_screenshot(wchar_t *fn);
extern int d3d_fs_init(HWND h); extern int d3d_fs_init(HWND h);
extern void d3d_fs_close(void); extern void d3d_fs_close(void);

388
src/win/win_ddraw.cc
View File

@@ -3,9 +3,15 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#define UNICODE
#define BITMAP WINDOWS_BITMAP
#include <windows.h>
#undef BITMAP
#include "../video/video.h" #include "../video/video.h"
#include "win_ddraw.h" #include "win_ddraw.h"
#include "win_cgapal.h" #include "win_cgapal.h"
#include "win.h"
#include "win_language.h"
extern "C" void fatal(const char *format, ...); extern "C" void fatal(const char *format, ...);
@@ -18,8 +24,6 @@ extern "C" void ddraw_close(void);
extern "C" void video_blit_complete(void); extern "C" void video_blit_complete(void);
static void ddraw_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h);
static void ddraw_blit_memtoscreen_8(int x, int y, int w, int h);
static LPDIRECTDRAW lpdd = NULL; static LPDIRECTDRAW lpdd = NULL;
static LPDIRECTDRAW7 lpdd7 = NULL; static LPDIRECTDRAW7 lpdd7 = NULL;
@@ -28,132 +32,157 @@ static LPDIRECTDRAWSURFACE7 lpdds_back = NULL;
static LPDIRECTDRAWSURFACE7 lpdds_back2 = NULL; static LPDIRECTDRAWSURFACE7 lpdds_back2 = NULL;
static LPDIRECTDRAWCLIPPER lpdd_clipper = NULL; static LPDIRECTDRAWCLIPPER lpdd_clipper = NULL;
static DDSURFACEDESC2 ddsd; static DDSURFACEDESC2 ddsd;
static HWND ddraw_hwnd; static HWND ddraw_hwnd;
static HBITMAP hbitmap;
static int xs, ys, ys2;
int ddraw_init(HWND h)
static void
CopySurface(IDirectDrawSurface7 *pDDSurface)
{ {
#if NO_THIS_CRASHES_NOW HDC hdc, hmemdc;
cgapal_rebuild(); HBITMAP hprevbitmap;
#endif DDSURFACEDESC2 ddsd2;
if (FAILED(DirectDrawCreate(NULL, &lpdd, NULL))) pDDSurface->GetDC(&hdc);
return 0; hmemdc = CreateCompatibleDC(hdc);
ZeroMemory(&ddsd2 ,sizeof( ddsd2 )); // better to clear before using
if (FAILED(lpdd->QueryInterface(IID_IDirectDraw7, (LPVOID *)&lpdd7))) ddsd2.dwSize = sizeof( ddsd2 ); //initialize with size
return 0; pDDSurface->GetSurfaceDesc(&ddsd2);
hbitmap = CreateCompatibleBitmap( hdc ,xs ,ys);
lpdd->Release(); hprevbitmap = (HBITMAP) SelectObject( hmemdc, hbitmap );
lpdd = NULL; BitBlt(hmemdc,0 ,0 ,xs ,ys ,hdc ,0 ,0,SRCCOPY);
SelectObject(hmemdc,hprevbitmap); // restore the old bitmap
atexit(ddraw_close); DeleteDC(hmemdc);
pDDSurface->ReleaseDC(hdc);
if (FAILED(lpdd7->SetCooperativeLevel(h, DDSCL_NORMAL)))
return 0;
memset(&ddsd, 0, sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd);
ddsd.dwFlags = DDSD_CAPS;
ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_pri, NULL)))
return 0;
// memset(&ddsd, 0, sizeof(ddsd));
// ddsd.dwSize = sizeof(ddsd);
ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
ddsd.dwWidth = 2048;
ddsd.dwHeight = 2048;
ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back, NULL)))
{
ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
ddsd.dwWidth = 2048;
ddsd.dwHeight = 2048;
ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back, NULL)))
fatal("CreateSurface back failed\n");
}
memset(&ddsd, 0, sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd);
ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
ddsd.dwWidth = 2048;
ddsd.dwHeight = 2048;
ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back2, NULL)))
{
ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
ddsd.dwWidth = 2048;
ddsd.dwHeight = 2048;
ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back2, NULL)))
fatal("CreateSurface back failed\n");
}
if (FAILED(lpdd7->CreateClipper(0, &lpdd_clipper, NULL)))
return 0;
if (FAILED(lpdd_clipper->SetHWnd(0, h)))
return 0;
if (FAILED(lpdds_pri->SetClipper(lpdd_clipper)))
return 0;
pclog("DDRAW_INIT complete\n");
ddraw_hwnd = h;
video_blit_memtoscreen_func = ddraw_blit_memtoscreen;
video_blit_memtoscreen_8_func = ddraw_blit_memtoscreen_8;
return 1;
} }
void ddraw_close(void)
static void
DoubleLines(uint8_t *dst, uint8_t *src)
{ {
if (lpdds_back2) int i = 0;
{
lpdds_back2->Release(); for (i = 0; i < ys; i++) {
lpdds_back2 = NULL; memcpy(dst + (i * xs * 8), src + (i * xs * 4), xs * 4);
} memcpy(dst + ((i * xs * 8) + (xs * 4)), src + (i * xs * 4), xs * 4);
if (lpdds_back)
{
lpdds_back->Release();
lpdds_back = NULL;
}
if (lpdds_pri)
{
lpdds_pri->Release();
lpdds_pri = NULL;
}
if (lpdd_clipper)
{
lpdd_clipper->Release();
lpdd_clipper = NULL;
}
if (lpdd7)
{
lpdd7->Release();
lpdd7 = NULL;
} }
} }
static void ddraw_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
static void
SaveBitmap(wchar_t *szFilename, HBITMAP hBitmap)
{
static WCHAR szMessage[512];
BITMAPFILEHEADER bmpFileHeader;
BITMAPINFO bmpInfo;
HDC hdc;
FILE *fp = NULL;
LPVOID pBuf = NULL;
LPVOID pBuf2 = NULL;
do {
hdc = GetDC(NULL);
ZeroMemory(&bmpInfo, sizeof(BITMAPINFO));
bmpInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
GetDIBits(hdc, hBitmap, 0, 0, NULL, &bmpInfo, DIB_RGB_COLORS);
if (bmpInfo.bmiHeader.biSizeImage <= 0)
bmpInfo.bmiHeader.biSizeImage =
bmpInfo.bmiHeader.biWidth*abs(bmpInfo.bmiHeader.biHeight)*(bmpInfo.bmiHeader.biBitCount+7)/8;
if ((pBuf = malloc(bmpInfo.bmiHeader.biSizeImage)) == NULL) {
// pclog("ERROR: Unable to Allocate Bitmap Memory");
break;
}
if (ys2 <= 250)
pBuf2 = malloc(bmpInfo.bmiHeader.biSizeImage * 2);
bmpInfo.bmiHeader.biCompression = BI_RGB;
GetDIBits(hdc, hBitmap, 0, bmpInfo.bmiHeader.biHeight, pBuf, &bmpInfo, DIB_RGB_COLORS);
if ((fp = _wfopen(szFilename, L"wb")) == NULL) {
_swprintf(szMessage,
win_language_get_string_from_id(IDS_2088), szFilename);
msgbox_error_wstr(hwndMain, szMessage);
break;
}
bmpFileHeader.bfReserved1 = 0;
bmpFileHeader.bfReserved2 = 0;
if (pBuf2) {
bmpInfo.bmiHeader.biSizeImage <<= 1;
bmpInfo.bmiHeader.biHeight <<= 1;
}
bmpFileHeader.bfSize=sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER)+bmpInfo.bmiHeader.biSizeImage;
bmpFileHeader.bfType=0x4D42;
bmpFileHeader.bfOffBits=sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER);
(void)fwrite(&bmpFileHeader,sizeof(BITMAPFILEHEADER),1,fp);
(void)fwrite(&bmpInfo.bmiHeader,sizeof(BITMAPINFOHEADER),1,fp);
if (pBuf2) {
DoubleLines((uint8_t *) pBuf2, (uint8_t *) pBuf);
(void)fwrite(pBuf2,bmpInfo.bmiHeader.biSizeImage,1,fp);
} else {
(void)fwrite(pBuf,bmpInfo.bmiHeader.biSizeImage,1,fp);
}
} while(false);
if (hdc) ReleaseDC(NULL,hdc);
if (pBuf2) free(pBuf2);
if (pBuf) free(pBuf);
if (fp) fclose(fp);
}
void
ddraw_common_take_screenshot(wchar_t *fn, IDirectDrawSurface7 *pDDSurface)
{
xs = xsize;
ys = ys2 = ysize;
/* For EGA/(S)VGA, the size is NOT adjusted for overscan. */
if ((overscan_y > 16) && enable_overscan)
{
xs += overscan_x;
ys += overscan_y;
}
/* For CGA, the width is adjusted for overscan, but the height is not. */
if (overscan_y == 16)
{
if (ys2 <= 250)
ys += (overscan_y >> 1);
else
ys += overscan_y;
}
CopySurface(pDDSurface);
SaveBitmap(fn, hbitmap);
}
static void
ddraw_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
{ {
RECT r_src; RECT r_src;
RECT r_dest; RECT r_dest;
int yy; int yy;
POINT po; POINT po;
HRESULT hr; HRESULT hr;
// pclog("Blit memtoscreen %i,%i %i %i %i,%i\n", x, y, y1, y2, w, h); // pclog("Blit memtoscreen %i,%i %i %i %i,%i\n", x, y, y1, y2, w, h);
if (lpdds_back == NULL) if (lpdds_back == NULL) {
{
video_blit_complete(); video_blit_complete();
return; /*Nothing to do*/ return; /*Nothing to do*/
} }
if (h <= 0) if (h <= 0) {
{
video_blit_complete(); video_blit_complete();
return; return;
} }
@@ -162,19 +191,17 @@ static void ddraw_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
ddsd.dwSize = sizeof(ddsd); ddsd.dwSize = sizeof(ddsd);
hr = lpdds_back->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT, NULL); hr = lpdds_back->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT, NULL);
if (hr == DDERR_SURFACELOST) if (hr == DDERR_SURFACELOST) {
{
lpdds_back->Restore(); lpdds_back->Restore();
lpdds_back->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT, NULL); lpdds_back->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT, NULL);
device_force_redraw(); device_force_redraw();
} }
if (!ddsd.lpSurface) if (!ddsd.lpSurface) {
{
video_blit_complete(); video_blit_complete();
return; return;
} }
for (yy = y1; yy < y2; yy++)
{ for (yy = y1; yy < y2; yy++) {
if ((y + yy) >= 0 && (y + yy) < buffer->h) if ((y + yy) >= 0 && (y + yy) < buffer->h)
memcpy((uint32_t *) &(((uint8_t *) ddsd.lpSurface)[yy * ddsd.lPitch]), &(((uint32_t *)buffer32->line[y + yy])[x]), w * 4); memcpy((uint32_t *) &(((uint8_t *) ddsd.lpSurface)[yy * ddsd.lPitch]), &(((uint32_t *)buffer32->line[y + yy])[x]), w * 4);
} }
@@ -193,8 +220,7 @@ static void ddraw_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
r_src.bottom = h; r_src.bottom = h;
hr = lpdds_back2->Blt(&r_src, lpdds_back, &r_src, DDBLT_WAIT, NULL); hr = lpdds_back2->Blt(&r_src, lpdds_back, &r_src, DDBLT_WAIT, NULL);
if (hr == DDERR_SURFACELOST) if (hr == DDERR_SURFACELOST) {
{
lpdds_back2->Restore(); lpdds_back2->Restore();
lpdds_back2->Blt(&r_src, lpdds_back, &r_src, DDBLT_WAIT, NULL); lpdds_back2->Blt(&r_src, lpdds_back, &r_src, DDBLT_WAIT, NULL);
} }
@@ -203,14 +229,15 @@ static void ddraw_blit_memtoscreen(int x, int y, int y1, int y2, int w, int h)
// pclog("Blit from %i,%i %i,%i to %i,%i %i,%i\n", r_src.left, r_src.top, r_src.right, r_src.bottom, r_dest.left, r_dest.top, r_dest.right, r_dest.bottom); // pclog("Blit from %i,%i %i,%i to %i,%i %i,%i\n", r_src.left, r_src.top, r_src.right, r_src.bottom, r_dest.left, r_dest.top, r_dest.right, r_dest.bottom);
hr = lpdds_pri->Blt(&r_dest, lpdds_back2, &r_src, DDBLT_WAIT, NULL); hr = lpdds_pri->Blt(&r_dest, lpdds_back2, &r_src, DDBLT_WAIT, NULL);
if (hr == DDERR_SURFACELOST) if (hr == DDERR_SURFACELOST) {
{
lpdds_pri->Restore(); lpdds_pri->Restore();
lpdds_pri->Blt(&r_dest, lpdds_back2, &r_src, DDBLT_WAIT, NULL); lpdds_pri->Blt(&r_dest, lpdds_back2, &r_src, DDBLT_WAIT, NULL);
} }
} }
static void ddraw_blit_memtoscreen_8(int x, int y, int w, int h)
static void
ddraw_blit_memtoscreen_8(int x, int y, int w, int h)
{ {
RECT r_src; RECT r_src;
RECT r_dest; RECT r_dest;
@@ -219,8 +246,7 @@ static void ddraw_blit_memtoscreen_8(int x, int y, int w, int h)
uint32_t *p; uint32_t *p;
HRESULT hr; HRESULT hr;
if (lpdds_back == NULL) if (lpdds_back == NULL) {
{
video_blit_complete(); video_blit_complete();
return; /*Nothing to do*/ return; /*Nothing to do*/
} }
@@ -229,35 +255,28 @@ static void ddraw_blit_memtoscreen_8(int x, int y, int w, int h)
ddsd.dwSize = sizeof(ddsd); ddsd.dwSize = sizeof(ddsd);
hr = lpdds_back->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT, NULL); hr = lpdds_back->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT, NULL);
if (hr == DDERR_SURFACELOST) {
if (hr == DDERR_SURFACELOST)
{
lpdds_back->Restore(); lpdds_back->Restore();
lpdds_back->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT, NULL); lpdds_back->Lock(NULL, &ddsd, DDLOCK_SURFACEMEMORYPTR | DDLOCK_WAIT, NULL);
device_force_redraw(); device_force_redraw();
} }
if (!ddsd.lpSurface) if (!ddsd.lpSurface) {
{
video_blit_complete(); video_blit_complete();
return; return;
} }
for (yy = 0; yy < h; yy++)
{ for (yy = 0; yy < h; yy++) {
if ((y + yy) >= 0 && (y + yy) < buffer->h) if ((y + yy) >= 0 && (y + yy) < buffer->h) {
{
p = (uint32_t *) &(((uint8_t *) ddsd.lpSurface)[yy * ddsd.lPitch]); p = (uint32_t *) &(((uint8_t *) ddsd.lpSurface)[yy * ddsd.lPitch]);
for (xx = 0; xx < w; xx++) for (xx = 0; xx < w; xx++)
{
p[xx] = pal_lookup[buffer->line[y + yy][x + xx]]; p[xx] = pal_lookup[buffer->line[y + yy][x + xx]];
} }
} }
}
p = &(((uint32_t *) ddsd.lpSurface)[4 * ddsd.lPitch]); p = &(((uint32_t *) ddsd.lpSurface)[4 * ddsd.lPitch]);
lpdds_back->Unlock(NULL); lpdds_back->Unlock(NULL);
video_blit_complete(); video_blit_complete();
po.x = po.y = 0; po.x = po.y = 0;
ClientToScreen(ddraw_hwnd, &po); ClientToScreen(ddraw_hwnd, &po);
GetClientRect(ddraw_hwnd, &r_dest); GetClientRect(ddraw_hwnd, &r_dest);
OffsetRect(&r_dest, po.x, po.y); OffsetRect(&r_dest, po.x, po.y);
@@ -268,21 +287,118 @@ static void ddraw_blit_memtoscreen_8(int x, int y, int w, int h)
r_src.bottom = h; r_src.bottom = h;
hr = lpdds_back2->Blt(&r_src, lpdds_back, &r_src, DDBLT_WAIT, NULL); hr = lpdds_back2->Blt(&r_src, lpdds_back, &r_src, DDBLT_WAIT, NULL);
if (hr == DDERR_SURFACELOST) if (hr == DDERR_SURFACELOST) {
{
lpdds_back2->Restore(); lpdds_back2->Restore();
lpdds_back2->Blt(&r_src, lpdds_back, &r_src, DDBLT_WAIT, NULL); lpdds_back2->Blt(&r_src, lpdds_back, &r_src, DDBLT_WAIT, NULL);
} }
hr = lpdds_pri->Blt(&r_dest, lpdds_back2, &r_src, DDBLT_WAIT, NULL); hr = lpdds_pri->Blt(&r_dest, lpdds_back2, &r_src, DDBLT_WAIT, NULL);
if (hr == DDERR_SURFACELOST) if (hr == DDERR_SURFACELOST) {
{
lpdds_pri->Restore(); lpdds_pri->Restore();
hr = lpdds_pri->Blt(&r_dest, lpdds_back2, &r_src, DDBLT_WAIT, NULL); hr = lpdds_pri->Blt(&r_dest, lpdds_back2, &r_src, DDBLT_WAIT, NULL);
} }
} }
void ddraw_take_screenshot(wchar_t *fn)
int
ddraw_init(HWND h)
{
#if NO_THIS_CRASHES_NOW
cgapal_rebuild();
#endif
if (FAILED(DirectDrawCreate(NULL, &lpdd, NULL))) return(0);
if (FAILED(lpdd->QueryInterface(IID_IDirectDraw7, (LPVOID *)&lpdd7)))
return(0);
lpdd->Release();
lpdd = NULL;
atexit(ddraw_close);
if (FAILED(lpdd7->SetCooperativeLevel(h, DDSCL_NORMAL))) return(0);
memset(&ddsd, 0, sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd);
ddsd.dwFlags = DDSD_CAPS;
ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_pri, NULL))) return(0);
// memset(&ddsd, 0, sizeof(ddsd));
// ddsd.dwSize = sizeof(ddsd);
ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
ddsd.dwWidth = 2048;
ddsd.dwHeight = 2048;
ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back, NULL))) {
ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
ddsd.dwWidth = 2048;
ddsd.dwHeight = 2048;
ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back, NULL)))
fatal("CreateSurface back failed\n");
}
memset(&ddsd, 0, sizeof(ddsd));
ddsd.dwSize = sizeof(ddsd);
ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
ddsd.dwWidth = 2048;
ddsd.dwHeight = 2048;
ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_VIDEOMEMORY;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back2, NULL))) {
ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT;
ddsd.dwWidth = 2048;
ddsd.dwHeight = 2048;
ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
if (FAILED(lpdd7->CreateSurface(&ddsd, &lpdds_back2, NULL)))
fatal("CreateSurface back failed\n");
}
if (FAILED(lpdd7->CreateClipper(0, &lpdd_clipper, NULL))) return(0);
if (FAILED(lpdd_clipper->SetHWnd(0, h))) return(0);
if (FAILED(lpdds_pri->SetClipper(lpdd_clipper))) return(0);
ddraw_hwnd = h;
video_blit_memtoscreen_func = ddraw_blit_memtoscreen;
video_blit_memtoscreen_8_func = ddraw_blit_memtoscreen_8;
return(1);
}
void
ddraw_close(void)
{
if (lpdds_back2) {
lpdds_back2->Release();
lpdds_back2 = NULL;
}
if (lpdds_back) {
lpdds_back->Release();
lpdds_back = NULL;
}
if (lpdds_pri) {
lpdds_pri->Release();
lpdds_pri = NULL;
}
if (lpdd_clipper) {
lpdd_clipper->Release();
lpdd_clipper = NULL;
}
if (lpdd7) {
lpdd7->Release();
lpdd7 = NULL;
}
}
void
ddraw_take_screenshot(wchar_t *fn)
{ {
ddraw_common_take_screenshot(fn, lpdds_back2); ddraw_common_take_screenshot(fn, lpdds_back2);
} }

4
src/win/win_ddraw.h
View File

@@ -15,13 +15,11 @@ extern "C" {
extern int ddraw_init(HWND h); extern int ddraw_init(HWND h);
extern void ddraw_close(void); extern void ddraw_close(void);
extern void ddraw_take_screenshot(wchar_t *fn);
extern int ddraw_fs_init(HWND h); extern int ddraw_fs_init(HWND h);
extern void ddraw_fs_close(void); extern void ddraw_fs_close(void);
extern void ddraw_common_take_screenshot(wchar_t *fn,
IDirectDrawSurface7 *pDDSurface);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

3
src/win/win_ddraw_fs.cc
View File

@@ -26,8 +26,11 @@ extern "C" void device_force_redraw(void);
extern "C" int ddraw_fs_init(HWND h); extern "C" int ddraw_fs_init(HWND h);
extern "C" void ddraw_fs_close(void); extern "C" void ddraw_fs_close(void);
extern void ddraw_common_take_screenshot(wchar_t *fn, IDirectDrawSurface7 *pDDSurface);
extern "C" void video_blit_complete(void); extern "C" void video_blit_complete(void);
static void ddraw_fs_blit_memtoscreen(int, int, int, int, int, int); static void ddraw_fs_blit_memtoscreen(int, int, int, int, int, int);
static void ddraw_fs_blit_memtoscreen_8(int, int, int, int); static void ddraw_fs_blit_memtoscreen_8(int, int, int, int);

187
src/win/win_ddraw_screenshot.cc
View File

@@ -1,187 +0,0 @@
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* DirectDraw screenshot taking code.
*
* Version: @(#)win_ddraw_screenshot.cc 1.0.1 2017/08/23
*
* Author: Miran Grca, <mgrca8@gmail.com>
* Copyright 2016,2017 Miran Grca.
*/
#include <stdio.h>
#include <stdint.h>
#define UNICODE
#define BITMAP WINDOWS_BITMAP
#include <windows.h>
#undef BITMAP
#include "../video/video.h"
#include "win.h"
#include "win_ddraw.h"
#include "win_language.h"
HBITMAP hbitmap;
int xs, ys, ys2;
extern "C" void pclog(const char *format, ...);
void CopySurface(IDirectDrawSurface7 *pDDSurface)
{
HDC hdc, hmemdc;
HBITMAP hprevbitmap;
DDSURFACEDESC2 ddsd2;
pDDSurface->GetDC(&hdc);
hmemdc = CreateCompatibleDC(hdc);
ZeroMemory(&ddsd2 ,sizeof( ddsd2 )); // better to clear before using
ddsd2.dwSize = sizeof( ddsd2 ); //initialize with size
pDDSurface->GetSurfaceDesc(&ddsd2);
hbitmap = CreateCompatibleBitmap( hdc ,xs ,ys);
hprevbitmap = (HBITMAP) SelectObject( hmemdc, hbitmap );
BitBlt(hmemdc,0 ,0 ,xs ,ys ,hdc ,0 ,0,SRCCOPY);
SelectObject(hmemdc,hprevbitmap); // restore the old bitmap
DeleteDC(hmemdc);
pDDSurface->ReleaseDC(hdc);
return ;
}
void DoubleLines(uint8_t *dst, uint8_t *src)
{
int i = 0;
for (i = 0; i < ys; i++)
{
memcpy(dst + (i * xs * 8), src + (i * xs * 4), xs * 4);
memcpy(dst + ((i * xs * 8) + (xs * 4)), src + (i * xs * 4), xs * 4);
}
}
static WCHAR szMessage[2048];
void SaveBitmap(wchar_t *szFilename,HBITMAP hBitmap)
{
HDC hdc=NULL;
FILE* fp=NULL;
LPVOID pBuf=NULL;
LPVOID pBuf2=NULL;
BITMAPINFO bmpInfo;
BITMAPFILEHEADER bmpFileHeader;
do{
hdc=GetDC(NULL);
ZeroMemory(&bmpInfo,sizeof(BITMAPINFO));
bmpInfo.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
GetDIBits(hdc,hBitmap,0,0,NULL,&bmpInfo,DIB_RGB_COLORS);
if(bmpInfo.bmiHeader.biSizeImage<=0)
bmpInfo.bmiHeader.biSizeImage=bmpInfo.bmiHeader.biWidth*abs(bmpInfo.bmiHeader.biHeight)*(bmpInfo.bmiHeader.biBitCount+7)/8;
if((pBuf = malloc(bmpInfo.bmiHeader.biSizeImage))==NULL)
{
// pclog("ERROR: Unable to Allocate Bitmap Memory");
break;
}
if (ys2 <= 250)
{
pBuf2 = malloc(bmpInfo.bmiHeader.biSizeImage * 2);
}
bmpInfo.bmiHeader.biCompression=BI_RGB;
GetDIBits(hdc,hBitmap,0,bmpInfo.bmiHeader.biHeight,pBuf, &bmpInfo, DIB_RGB_COLORS);
if((fp = _wfopen(szFilename,L"wb"))==NULL)
{
_swprintf(szMessage, win_language_get_string_from_id(IDS_2088), szFilename);
msgbox_error_wstr(hwndMain, szMessage);
break;
}
bmpFileHeader.bfReserved1=0;
bmpFileHeader.bfReserved2=0;
if (pBuf2)
{
bmpInfo.bmiHeader.biSizeImage <<= 1;
bmpInfo.bmiHeader.biHeight <<= 1;
}
bmpFileHeader.bfSize=sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER)+bmpInfo.bmiHeader.biSizeImage;
bmpFileHeader.bfType=0x4D42;
bmpFileHeader.bfOffBits=sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER);
fwrite(&bmpFileHeader,sizeof(BITMAPFILEHEADER),1,fp);
fwrite(&bmpInfo.bmiHeader,sizeof(BITMAPINFOHEADER),1,fp);
if (pBuf2)
{
DoubleLines((uint8_t *) pBuf2, (uint8_t *) pBuf);
fwrite(pBuf2,bmpInfo.bmiHeader.biSizeImage,1,fp);
}
else
{
fwrite(pBuf,bmpInfo.bmiHeader.biSizeImage,1,fp);
}
}while(false);
if(hdc) ReleaseDC(NULL,hdc);
if(pBuf2) free(pBuf2);
if(pBuf) free(pBuf);
if(fp) fclose(fp);
}
void ddraw_common_take_screenshot(wchar_t *fn, IDirectDrawSurface7 *pDDSurface)
{
xs = xsize;
ys = ys2 = ysize;
/* For EGA/(S)VGA, the size is NOT adjusted for overscan. */
if ((overscan_y > 16) && enable_overscan)
{
xs += overscan_x;
ys += overscan_y;
}
/* For CGA, the width is adjusted for overscan, but the height is not. */
if (overscan_y == 16)
{
if (ys2 <= 250)
ys += (overscan_y >> 1);
else
ys += overscan_y;
}
CopySurface(pDDSurface);
SaveBitmap(fn, hbitmap);
}

1137
src/win/win_stbar.c Normal file
View File

File diff suppressed because it is too large Load Diff