Skip to content

Commit 8518e1c

Browse files
committed
Fix #243
1 parent 07407ed commit 8518e1c

File tree

7 files changed

+18
-1
lines changed

7 files changed

+18
-1
lines changed

HISTORY-ID.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,4 @@
307307
- Improved IDD_ADDCTRL and IDD_CTRLPROP dialogs.
308308
- v.5.8.2 (2024-XX-YY)
309309
- Added ES_AUTOHSCROLL style to some text boxes.
310+
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.

HISTORY-ITA.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,4 @@
307307
- Finestre di dialogo IDD_ADDCTRL e IDD_CTRLPROP migliorate.
308308
- v.5.8.2 (2024-XX-YY)
309309
- Aggiunto lo stile ES_AUTOHSCROLL ad alcune caselle di testo.
310+
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.

HISTORY-JPN.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,3 +651,4 @@
651651
- IDD_ADDCTRL と IDD_CTRLPROP ダイアログを改良。
652652
- v.5.8.2 (2024-XX-YY)
653653
- Added ES_AUTOHSCROLL style to some text boxes.
654+
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.

HISTORY-KOR.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,3 +308,4 @@
308308
- IDD_ADDCTRL 및 IDD_CTRLPROP 대화 상자가 개선되었습니다.
309309
- v.5.8.2 (2024-XX-YY)
310310
- Added ES_AUTOHSCROLL style to some text boxes.
311+
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.

HISTORY-PTB.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,4 @@
307307
- Improved IDD_ADDCTRL and IDD_CTRLPROP dialogs.
308308
- v.5.8.2 (2024-XX-YY)
309309
- Added ES_AUTOHSCROLL style to some text boxes.
310+
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.

HISTORY.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,3 +307,4 @@
307307
- Improved IDD_ADDCTRL and IDD_CTRLPROP dialogs.
308308
- v.5.8.2 (2024-XX-YY)
309309
- Added ES_AUTOHSCROLL style to some text boxes.
310+
- Fixed loading failure of Win2k3 ieframe.dll BITMAP 214.

src/PackedDIB.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,10 +192,21 @@ PackedDIB_CreateBitmap(const void *pPackedDIB, DWORD dwSize)
192192
hbm = CreateDIBSection(hDC, &bi, DIB_RGB_COLORS, &pBits, NULL, 0);
193193
DeleteDC(hDC);
194194

195-
// FIXME: BI_RLE4 and BI_RLE8
196195
if (hbm)
197196
{
197+
#ifdef _MSC_VER
198+
// Win2k3 ieframe.dll BITMAP 214 causes exception
199+
__try
200+
{
201+
CopyMemory(pBits, pb, dwSize);
202+
}
203+
__except (EXCEPTION_EXECUTE_HANDLER)
204+
{
205+
;
206+
}
207+
#else
198208
CopyMemory(pBits, pb, dwSize);
209+
#endif
199210
}
200211

201212
return hbm;

0 commit comments

Comments
 (0)