Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge back commits from WineHQ

Browse source 
svn path=/trunk/; revision=7904
This commit is contained in:
Gé van Geldorp 2004-01-28 21:40:09 +00:00
parent c5eedd47f6
commit f336758ba4
20 changed files with 61 additions and 254 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/comctl32/Makefile.in
View file

@ -41,8 +41,8 @@ RC_BINSRC = rsrc.rc
RC_BINARIES = \
idb_hist_large.bmp \
idb_hist_small.bmp \
idb_std_small.bmp \
idb_std_large.bmp \
idb_std_small.bmp \
idb_view_large.bmp \
idb_view_small.bmp \
idc_divider.cur \

75
reactos/lib/comctl32/comctl32undoc.c
View file

@ -57,10 +57,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
extern HANDLE COMCTL32_hHeap; /* handle to the private heap */
struct _DSA
{
INT nItemCount;
@ -370,15 +366,7 @@ DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags,
LPVOID WINAPI Alloc (DWORD dwSize)
{
LPVOID lpPtr;
TRACE("(0x%lx)\n", dwSize);
lpPtr = HeapAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, dwSize);
TRACE("-- ret=%p\n", lpPtr);
return lpPtr;
return LocalAlloc( LMEM_ZEROINIT, dwSize );
}
@ -403,18 +391,10 @@ LPVOID WINAPI Alloc (DWORD dwSize)
LPVOID WINAPI ReAlloc (LPVOID lpSrc, DWORD dwSize)
{
LPVOID lpDest;
TRACE("(%p 0x%08lx)\n", lpSrc, dwSize);
if (lpSrc)
lpDest = HeapReAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, lpSrc, dwSize);
return LocalReAlloc( lpSrc, dwSize, LMEM_ZEROINIT );
else
lpDest = HeapAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, dwSize);
TRACE("-- ret=%p\n", lpDest);
return lpDest;
return LocalAlloc( LMEM_ZEROINIT, dwSize);
}
@ -433,9 +413,7 @@ LPVOID WINAPI ReAlloc (LPVOID lpSrc, DWORD dwSize)
BOOL WINAPI Free (LPVOID lpMem)
{
TRACE("(%p)\n", lpMem);
return HeapFree (COMCTL32_hHeap, 0, lpMem);
return !LocalFree( lpMem );
}
@ -455,9 +433,7 @@ BOOL WINAPI Free (LPVOID lpMem)
DWORD WINAPI GetSize (LPVOID lpMem)
{
TRACE("(%p)\n", lpMem);
return HeapSize (COMCTL32_hHeap, 0, lpMem);
return LocalSize( lpMem );
}
@ -1655,24 +1631,6 @@ DSA_DeleteAllItems (const HDSA hdsa)
* pointers.
*/
/**************************************************************************
* DPA_Create [COMCTL32.328] Creates a dynamic pointer array
*
* PARAMS
* nGrow [I] number of items by which the array grows when it is filled
*
* RETURNS
* Success: handle (pointer) to the pointer array.
* Failure: NULL
*/
HDPA WINAPI
DPA_Create (INT nGrow)
{
return DPA_CreateEx (nGrow, GetProcessHeap());
}
/**************************************************************************
* DPA_Destroy [COMCTL32.329] Destroys a dynamic pointer array
*
@ -2238,10 +2196,9 @@ DPA_CreateEx (INT nGrow, HANDLE hHeap)
if (hdpa) {
hdpa->nGrow = min(8, nGrow);
hdpa->hHeap = hHeap ? hHeap : COMCTL32_hHeap;
hdpa->hHeap = hHeap ? hHeap : GetProcessHeap();
hdpa->nMaxCount = hdpa->nGrow * 2;
hdpa->ptrs =
(LPVOID*)HeapAlloc (hHeap, HEAP_ZERO_MEMORY,
hdpa->ptrs = HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
hdpa->nMaxCount * sizeof(LPVOID));
}
@ -2251,6 +2208,24 @@ DPA_CreateEx (INT nGrow, HANDLE hHeap)
}
/**************************************************************************
* DPA_Create [COMCTL32.328] Creates a dynamic pointer array
*
* PARAMS
* nGrow [I] number of items by which the array grows when it is filled
*
* RETURNS
* Success: handle (pointer) to the pointer array.
* Failure: NULL
*/
HDPA WINAPI
DPA_Create (INT nGrow)
{
return DPA_CreateEx( nGrow, 0 );
}
/**************************************************************************
* Notification functions
*/

2
reactos/lib/comctl32/comctl_Cn.rc
View file

@ -28,7 +28,7 @@ BEGIN
PUSHBUTTON "取消", IDCANCEL,58,122,50,14
PUSHBUTTON "应用(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "帮助", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_De.rc
View file

@ -43,7 +43,7 @@ BEGIN
PUSHBUTTON "A&bbrechen", IDCANCEL,58,122,50,14
PUSHBUTTON "&Anwenden", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "&Hilfe", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_En.rc
View file

@ -27,7 +27,7 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL,58,122,50,14
PUSHBUTTON "&Apply", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Es.rc
View file

@ -27,7 +27,7 @@ BEGIN
PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14
PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "Ayuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Fr.rc
View file

@ -31,7 +31,7 @@ BEGIN
PUSHBUTTON "Annuler", IDCANCEL,58,122,50,14
PUSHBUTTON "&Appliquer", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "Aide", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_It.rc
View file

@ -28,7 +28,7 @@ BEGIN
PUSHBUTTON "Annulla", IDCANCEL,58,122,50,14
PUSHBUTTON "&Applica", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "Aiuto", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Ja.rc
View file

@ -27,7 +27,7 @@ BEGIN
PUSHBUTTON "キャンセル", IDCANCEL,58,122,50,14
PUSHBUTTON "適用(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "ヘルプ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Ko.rc
View file

@ -27,7 +27,7 @@ BEGIN
PUSHBUTTON "취소", IDCANCEL,58,122,50,14
PUSHBUTTON "적용(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "도움말", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Nl.rc
View file

@ -29,7 +29,7 @@ BEGIN
PUSHBUTTON "Annuleren", IDCANCEL,58,122,50,14
PUSHBUTTON "&Toepassen", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Pl.rc
View file

@ -28,7 +28,7 @@ BEGIN
PUSHBUTTON "Anuluj", IDCANCEL,58,122,50,14
PUSHBUTTON "&Zastosuj", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "Pomoc", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Pt.rc
View file

@ -27,7 +27,7 @@ BEGIN
PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14
PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Ru.rc
View file

@ -29,7 +29,7 @@ BEGIN
PUSHBUTTON "Îòìåíà", IDCANCEL,58,122,50,14
PUSHBUTTON "Ïðè&ìåíèòü", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "&Ñïðàâêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Si.rc
View file

@ -27,7 +27,7 @@ BEGIN
PUSHBUTTON "Preklièi", IDCANCEL,58,122,50,14
PUSHBUTTON "&Uporabi", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "Pomoè", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

2
reactos/lib/comctl32/comctl_Th.rc
View file

@ -27,7 +27,7 @@ BEGIN
PUSHBUTTON "¡àÅÔ¡", IDCANCEL,58,122,50,14
PUSHBUTTON "Áռŷѹ·Õ", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END

14
reactos/lib/comctl32/commctrl.c
View file

@ -115,7 +115,6 @@ extern void UPDOWN_Register(void);
extern void UPDOWN_Unregister(void);
HANDLE COMCTL32_hHeap = NULL;
LPSTR COMCTL32_aSubclass = NULL;
HMODULE COMCTL32_hModule = 0;
LANGID COMCTL32_uiLang = MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL);
@ -154,10 +153,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
COMCTL32_hModule = (HMODULE)hinstDLL;
/* create private heap */
COMCTL32_hHeap = HeapCreate (0, 0x10000, 0);
TRACE("Heap created: %p\n", COMCTL32_hHeap);
/* add global subclassing atom (used by 'tooltip' and 'updown') */
COMCTL32_aSubclass = (LPSTR)(DWORD)GlobalAddAtomA ("CC32SubclassInfo");
TRACE("Subclassing atom added: %p\n", COMCTL32_aSubclass);
@ -218,11 +213,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
GlobalDeleteAtom (LOWORD(COMCTL32_aSubclass));
TRACE("Subclassing atom deleted: %p\n", COMCTL32_aSubclass);
COMCTL32_aSubclass = NULL;
/* destroy private heap */
HeapDestroy (COMCTL32_hHeap);
TRACE("Heap destroyed: %p\n", COMCTL32_hHeap);
COMCTL32_hHeap = NULL;
break;
}
@ -1086,7 +1076,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
stack = (LPSUBCLASS_INFO)HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(SUBCLASS_INFO));
if (!stack) {
ERR ("Failed to allocate our Subclassing stack");
ERR ("Failed to allocate our Subclassing stack\n");
return FALSE;
}
SetPropA (hWnd, COMCTL32_aSubclass, (HANDLE)stack);
@ -1121,7 +1111,7 @@ BOOL WINAPI SetWindowSubclass (HWND hWnd, SUBCLASSPROC pfnSubclass,
}
if ((stack->stacknum + stack->stacknew) >= 32) {
ERR ("We have a Subclass stack overflow, please increment size");
ERR ("We have a Subclass stack overflow, please increment size\n");
return FALSE;
}

20
reactos/lib/comctl32/propsheet.c
View file

@ -321,7 +321,7 @@ static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh,
if (dwFlags & PSH_USEPSTARTPAGE)
{
TRACE("PSH_USEPSTARTPAGE is on");
TRACE("PSH_USEPSTARTPAGE is on\n");
psInfo->active_page = 0;
}
else
@ -375,7 +375,7 @@ static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
if (dwFlags & PSH_USEPSTARTPAGE)
{
TRACE("PSH_USEPSTARTPAGE is on");
TRACE("PSH_USEPSTARTPAGE is on\n");
psInfo->active_page = 0;
}
else
@ -2773,6 +2773,9 @@ static BOOL PROPSHEET_DoCommand(HWND hwnd, WORD wID)
case IDHELP:
PROPSHEET_Help(hwnd);
break;
default:
return FALSE;
}
return TRUE;
@ -2901,7 +2904,18 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return TRUE;
case WM_COMMAND:
return PROPSHEET_DoCommand(hwnd, LOWORD(wParam));
if (!PROPSHEET_DoCommand(hwnd, LOWORD(wParam)))
{
PropSheetInfo* psInfo = (PropSheetInfo*) GetPropW(hwnd, PropSheetInfoStr);
/* No default handler, forward notification to active page */
if (psInfo->activeValid && psInfo->active_page != -1)
{
HWND hwndPage = psInfo->proppage[psInfo->active_page].hwndPage;
SendMessageW(hwndPage, WM_COMMAND, wParam, lParam);
}
}
return TRUE;
case WM_NOTIFY:
{

4
reactos/lib/comctl32/rebar.c
View file

@ -310,6 +310,7 @@ typedef struct
/* ---- End of REBAR layout constants. ---- */
#define RB_GETBANDINFO_OLD (WM_USER+5) /* obsoleted after IE3, but we have to support it anyway */
/* The following 6 defines return the proper rcBand element */
/* depending on whether CCS_VERT was set. */
@ -4541,8 +4542,7 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
case RB_GETBANDCOUNT:
return REBAR_GetBandCount (infoPtr);
case RB_GETBANDINFO: /* obsoleted after IE3, but we have to
support it anyway. */
case RB_GETBANDINFO_OLD:
case RB_GETBANDINFOA:
return REBAR_GetBandInfoA (infoPtr, wParam, lParam);

172
reactos/lib/comctl32/winehq2ros.patch
View file

@ -1,172 +0,0 @@
Index: Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/Makefile.in,v
retrieving revision 1.32
diff -u -r1.32 Makefile.in
--- Makefile.in 11 Oct 2003 01:09:20 -0000 1.32
+++ Makefile.in 22 Jan 2004 18:56:34 -0000
@@ -41,9 +41,14 @@
RC_BINARIES = \
idb_hist_large.bmp \
idb_hist_small.bmp \
+ idb_std_small.bmp \
idb_std_large.bmp \
idb_view_large.bmp \
- idb_view_small.bmp
+ idb_view_small.bmp \
+ idc_divider.cur \
+ idc_divideropen.cur \
+ idi_dragarrow.ico \
+ idt_check.bmp
SUBDIRS = tests
Index: comctl32undoc.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/comctl32undoc.c,v
retrieving revision 1.86
diff -u -r1.86 comctl32undoc.c
--- comctl32undoc.c 20 Nov 2003 04:19:41 -0000 1.86
+++ comctl32undoc.c 22 Jan 2004 18:56:35 -0000
@@ -1669,21 +1669,7 @@
HDPA WINAPI
DPA_Create (INT nGrow)
{
- HDPA hdpa;
-
- TRACE("(%d)\n", nGrow);
-
- hdpa = Alloc (sizeof(*hdpa));
- if (hdpa) {
- hdpa->nGrow = max(8, nGrow);
- hdpa->hHeap = COMCTL32_hHeap;
- hdpa->nMaxCount = hdpa->nGrow * 2;
- hdpa->ptrs = Alloc (hdpa->nMaxCount * sizeof(LPVOID));
- }
-
- TRACE("-- %p\n", hdpa);
-
- return hdpa;
+ return DPA_CreateEx (nGrow, GetProcessHeap());
}
Index: rsrc.rc
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/rsrc.rc,v
retrieving revision 1.36
diff -u -r1.36 rsrc.rc
--- rsrc.rc 12 Dec 2003 05:57:22 -0000 1.36
+++ rsrc.rc 22 Jan 2004 18:56:36 -0000
@@ -29,8 +29,9 @@
#include "wine/wine_common_ver.rc"
-IDT_CHECK BITMAP LOADONCALL DISCARDABLE
-{
+/* BINRES idt_check.bmp */
+IDT_CHECK BITMAP LOADONCALL DISCARDABLE idt_check.bmp
+/* {
'42 4D 8E 01 00 00 00 00 00 00 5E 00 00 00 28 00'
'00 00 1F 00 00 00 10 00 00 00 01 00 04 00 02 00'
'00 00 30 01 00 00 01 00 00 00 01 00 00 00 0A 00'
@@ -56,10 +57,11 @@
'08 99 01 00 01 99 01 00 01 11 01 99 00 00 01 99'
'0D 11 02 99 0A 11 02 00 02 11 01 99 00 00 01 99'
'0D 11 02 99 0E 11 01 99 00 00 1F 99 00 01'
-}
+} */
-IDB_STD_SMALL BITMAP LOADONCALL DISCARDABLE
-{
+/* BINRES idb_std_small.bmp */
+IDB_STD_SMALL BITMAP LOADONCALL DISCARDABLE idb_std_small.bmp
+/* {
'42 4D 20 07 00 00 00 00 00 00 76 00 00 00 28 00'
'00 00 F0 00 00 00 10 00 00 00 01 00 04 00 02 00'
'00 00 AA 06 00 00 00 00 00 00 00 00 00 00 00 00'
@@ -174,7 +176,7 @@
'06 88 02 84 04 44 04 88 02 66 04 88 02 66 12 88'
'02 11 06 88 02 86 08 66 02 88 00 00 90 88 08 66'
'02 68 2A 88 04 66 14 88 02 18 12 88 00 00 00 01'
-}
+} */
/* BINRES idb_std_large.bmp */
IDB_STD_LARGE BITMAP LOADONCALL DISCARDABLE idb_std_large.bmp
@@ -969,8 +971,9 @@
} */
-IDC_DIVIDER CURSOR LOADONCALL DISCARDABLE
-{
+/* BINRES idc_divider.cur */
+IDC_DIVIDER CURSOR LOADONCALL DISCARDABLE idc_divider.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 09 00 09 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 80 00 00 00 00 00'
@@ -992,11 +995,12 @@
'3F FF 00 00 3F FF 80 00 7F FF C6 18 FF FF E6 19'
'FF FF FE 1F FF FF FE 1F FF FF FE 1F FF FF FE 1F'
'FF FF FE 1F FF FF'
-}
+} */
-IDC_DIVIDEROPEN CURSOR LOADONCALL DISCARDABLE
-{
+/* BINRES idc_divideropen.cur */
+IDC_DIVIDEROPEN CURSOR LOADONCALL DISCARDABLE idc_divideropen.cur
+/* {
'00 00 02 00 01 00 20 20 00 00 09 00 09 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 80 00 00 00 00 00'
@@ -1018,11 +1022,12 @@
'3F FF 00 00 3F FF 80 00 7F FF C4 08 FF FF E4 09'
'FF FF FC 0F FF FF FC 0F FF FF FC 0F FF FF FC 0F'
'FF FF FC 0F FF FF'
-}
+} */
-IDI_DRAGARROW ICON LOADONCALL DISCARDABLE
-{
+/* BINRES idi_dragarrow.ico */
+IDI_DRAGARROW ICON LOADONCALL DISCARDABLE idi_dragarrow.ico
+/* {
'00 00 01 00 01 00 20 20 02 00 00 00 00 00 30 01'
'00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
'00 00 01 00 01 00 00 00 00 00 00 01 00 00 00 00'
@@ -1044,7 +1049,7 @@
'FF FF F0 03 FF FF F0 01 FF FF F0 03 FF FF F0 07'
'FF FF F0 8F FF FF F0 9F FF FF FF FF FF FF FF FF'
'FF FF FF FF FF FF'
-}
+} */
/*
Index: toolbar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v
retrieving revision 1.147
diff -u -r1.147 toolbar.c
--- toolbar.c 26 Nov 2003 22:05:02 -0000 1.147
+++ toolbar.c 22 Jan 2004 18:56:39 -0000
@@ -5042,6 +5042,7 @@
if((infoPtr->nHotItem >= 0) && (nHit != -1))
infoPtr->buttons[infoPtr->nHotItem].bHot = TRUE;
+ if (0 <= infoPtr->nButtonDown) {
btnPtr = &infoPtr->buttons[infoPtr->nButtonDown];
btnPtr->fsState &= ~TBSTATE_PRESSED;
@@ -5111,6 +5112,7 @@
nmmouse.dwItemData = btnPtr->dwData;
TOOLBAR_SendNotify ((NMHDR *) &nmmouse, infoPtr, NM_CLICK);
}
+ }
return 0;
}