Rebase against f4a8ad89d43646a8d109da5747dfb1a92a6d8cd1.

This commit is contained in:
Alistair Leslie-Hughes
2023-07-05 13:05:46 +10:00
parent b97718a0a9
commit 6882ba5e7b
12 changed files with 79 additions and 97 deletions

View File

@@ -63,7 +63,7 @@ index bbc5e2aa9c8..0410d2b3cad 100644
+
+ if (This->bIsDirty || !This->data)
+ {
+ if (!serializeIcon(This->desc.u.icon.hicon, &data, &data_size))
+ if (!serializeIcon(This->desc.icon.hicon, &data, &data_size))
+ return E_FAIL;
+ HeapFree(GetProcessHeap(), 0, This->data);
+ This->data = data;
@@ -81,7 +81,7 @@ index bbc5e2aa9c8..0410d2b3cad 100644
+ switch (This->keepOrigFormat ? This->loadtime_format : BITMAP_FORMAT_BMP)
+ {
+ case BITMAP_FORMAT_BMP:
+ if (!serializeBMP(This->desc.u.bmp.hbitmap, &data, &data_size))
+ if (!serializeBMP(This->desc.bmp.hbitmap, &data, &data_size))
+ return E_FAIL;
+ break;
+ case BITMAP_FORMAT_JPEG:

View File

@@ -24,7 +24,7 @@ index 7d13942..db90c4c 100644
+
+ if (This->bIsDirty || !This->data)
+ {
+ if (!serializeEMF(This->desc.u.emf.hemf, &data, &data_size))
+ if (!serializeEMF(This->desc.emf.hemf, &data, &data_size))
+ return E_FAIL;
+ HeapFree(GetProcessHeap(), 0, This->data);
+ This->data = data;