diff options
| author | Alexey Kulakov <panda75@bk.ru> | 2012-06-29 20:46:12 +0000 |
|---|---|---|
| committer | Alexey Kulakov <panda75@bk.ru> | 2012-06-29 20:46:12 +0000 |
| commit | 187798bdd5c9d1c917b6c22ea6c083e73ac36276 (patch) | |
| tree | e458e2bd5a0cca5822aa0c72b163b8711335e4ba /plugins/ShlExt/shlicons.pas | |
| parent | d8f1c974528897e63f0a0b3c873e6e30a319f88f (diff) | |
pascal headers updated, testdll added
ShlExt: types fixes, compiling to 64 bit now (not sure what will work btw)
TopToolBar: some load-save things changes
git-svn-id: http://svn.miranda-ng.org/main/trunk@689 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/ShlExt/shlicons.pas')
| -rw-r--r-- | plugins/ShlExt/shlicons.pas | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/plugins/ShlExt/shlicons.pas b/plugins/ShlExt/shlicons.pas index ec6a1f4922..195033ae8d 100644 --- a/plugins/ShlExt/shlicons.pas +++ b/plugins/ShlExt/shlicons.pas @@ -74,8 +74,7 @@ type function ARGB_GetWorker: PImageFactory_Interface;
-function ARGB_BitmapFromIcon(Factory: PImageFactory_Interface; hdc: Windows.hdc; hIcon: hIcon)
- : HBitmap;
+function ARGB_BitmapFromIcon(Factory: PImageFactory_Interface; hdc: Windows.hdc; hIcon: hIcon): HBitmap;
implementation
@@ -111,8 +110,7 @@ begin IID_WICImagingFactory, Result);
end;
-function ARGB_BitmapFromIcon(Factory: PImageFactory_Interface; hdc: Windows.hdc;
- hIcon: hIcon): HBitmap;
+function ARGB_BitmapFromIcon(Factory: PImageFactory_Interface; hdc: Windows.hdc; hIcon: hIcon): HBitmap;
var
bmi: BITMAPINFO;
hr: HResult;
@@ -132,7 +130,7 @@ begin bmi.bmiHeader.biBitCount := 32;
- hr := Factory^.ptrVTable^.CreateBitmapFromHICON(Factory, hIcon, bitmap);
+ hr := Factory^.ptrVTable^.CreateBitmapFromHICON(Factory, hIcon, pointer(bitmap));
if hr = S_OK then
begin
hr := bitmap^.ptrVTable^.GetSize(bitmap, cx, cy);
@@ -142,7 +140,7 @@ begin bmi.bmiHeader.biWidth := cx;
bmi.bmiHeader.biHeight := -cy;
- hBmp := CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, pbBuffer, 0, 0);
+ hBmp := CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, pointer(pbBuffer), 0, 0);
if hBmp <> 0 then
begin
cbStride := cx * sizeof(DWORD); // ARGB = DWORD
|