dwindows: os2/dw.c comparison

comparison os2/dw.c @ 326:1c961a4d0f43

Old container code cleanups, and container code now allocates memory to hold the strings so it acts like Windows and GTK.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 08 Apr 2003 09:33:21 +0000
parents	83edbd751da9
children	e00aff2b899e

comparison

equal deleted inserted replaced

-:e5f0613b65cd
+:1c961a4d0f43
 void API dw_icon_free(unsigned long handle)
 {
 	WinDestroyPointer(handle);
 }
+/* A "safe" WinSendMsg() that tries multiple times in case the
+* queue is blocked for one reason or another.
+*/
+MRESULT _dw_send_msg(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2, int failure)
+{
+	MRESULT res;
+	int z = 0;
+	while((int)(res = WinSendMsg(hwnd, msg, mp1, mp2)) == failure)
+	{
+		z++;
+		if(z > 5000000)
+			return (MRESULT)failure;
+		dw_main_sleep(1);
+	}
+	return res;
+}
 /*
 * Allocates memory used to populate a container.
 * Parameters:
 *          handle: Handle to the container window (widget).
 *          rowcount: The number of items to be populated.
 	totalsize = size + sizeof(RECORDCORE);
 	z = 0;
-	while((blah = (void *)WinSendMsg(handle, CM_ALLOCRECORD, MPFROMLONG(size), MPFROMLONG(rowcount))) == NULL)
+	if(!(blah = (void *)_dw_send_msg(handle, CM_ALLOCRECORD, MPFROMLONG(size), MPFROMLONG(rowcount), 0)))
-	{
-		z++;
-		if(z > 5000000)
-			break;
-		dw_main_sleep(1);
-	}
-	if(!blah)
 		return NULL;
 	temp = (PRECORDCORE)blah;
 	for(z=0;z<rowcount;z++)
 void *dest;
 	if(!flags)
 		return;
-	z = 0;
+	if(!_dw_send_msg(handle, CM_QUERYCNRINFO, (MPARAM)&cnr, MPFROMSHORT(sizeof(CNRINFO)), 0))
+		return;
-	while(WinSendMsg(handle, CM_QUERYCNRINFO, (MPARAM)&cnr, MPFROMSHORT(sizeof(CNRINFO))) == 0)
-	{
-		z++;
-		if(z > 5000000)
-			return;
-		dw_main_sleep(1);
-	}
 	currentcount = cnr.cRecords;
 	/* Figure out the offsets to the items in the struct */
 	for(z=0;z<column;z++)
 	{
 	dest = (void *)(((ULONG)temp)+((ULONG)totalsize));
 	if(flags[column] & DW_CFA_BITMAPORICON)
 memcpy(dest, data, sizeof(HPOINTER));
 	else if(flags[column] & DW_CFA_STRING)
-memcpy(dest, data, sizeof(char *));
+	{
+		char **newstr = (char **)data, **str = dest;
+		if(*str)
+			free(*str);
+		if(newstr && *newstr)
+			*str = strdup(*newstr);
+		else
+			*str = NULL;
+	}
 	else if(flags[column] & DW_CFA_ULONG)
 memcpy(dest, data, sizeof(ULONG));
 	else if(flags[column] & DW_CFA_DATE)
 memcpy(dest, data, sizeof(CDATE));
 	else if(flags[column] & DW_CFA_TIME)
 memcpy(dest, data, sizeof(CTIME));
 }
+/* Internal function that does the work for set_item and change_item */
+void _dw_container_free_strings(HWND handle, PRECORDCORE temp)
+{
+	WindowData *blah = (WindowData *)WinQueryWindowPtr(handle, QWP_USER);
+	ULONG totalsize, size = 0, *flags = blah ? blah->data : 0;
+	int z, count = 0;
+	if(!flags)
+		return;
+	while(flags[count])
+		count++;
+	/* Figure out the offsets to the items in the struct */
+	for(z=0;z<count;z++)
+	{
+		if(flags[z] & DW_CFA_BITMAPORICON)
+			size += sizeof(HPOINTER);
+		else if(flags[z] & DW_CFA_STRING)
+		{
+			char **str;
+			totalsize = size + sizeof(RECORDCORE);
+			str = (char **)(((ULONG)temp)+((ULONG)totalsize));
+			if(*str)
+			{
+				free(*str);
+				*str = NULL;
+			}
+			size += sizeof(char *);
+		}
+		else if(flags[z] & DW_CFA_ULONG)
+			size += sizeof(ULONG);
+		else if(flags[z] & DW_CFA_DATE)
+			size += sizeof(CDATE);
+		else if(flags[z] & DW_CFA_TIME)
+			size += sizeof(CTIME);
+	}
+}
 /*
 * Sets an item in specified row and column to the given data.
 * Parameters:
 *          handle: Handle to the container window (widget).
 *          pointer: Pointer to the allocated memory in dw_container_alloc().
 	while(pCore)
 	{
 		if(count == row)
 		{
-			_dw_container_set_item(handle, pCore, column, row, data);
+			_dw_container_set_item(handle, pCore, column, 0, data);
 			WinSendMsg(handle, CM_INVALIDATERECORD, (MPARAM)&pCore, MPFROM2SHORT(1, CMA_NOREPOSITION | CMA_TEXTCHANGED));
 			return;
 		}
 		pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)pCore, MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
 		count++;
 	temp = (PRECORDCORE)ci->data;
 	z = 0;
-	while(WinSendMsg(ci->handle, CM_QUERYCNRINFO, (MPARAM)&cnr, MPFROMSHORT(sizeof(CNRINFO))) == 0)
+	if(!_dw_send_msg(ci->handle, CM_QUERYCNRINFO, (MPARAM)&cnr, MPFROMSHORT(sizeof(CNRINFO)), 0))
-	{
+		return;
-		z++;
-		if(z > 5000000)
-			return;
-		dw_main_sleep(1);
-	}
 	currentcount = cnr.cRecords;
 	for(z=0;z<(row-currentcount);z++)
 		temp = temp->preccNextRecord;
 */
 void API dw_container_insert(HWND handle, void *pointer, int rowcount)
 {
 	RECORDINSERT recin;
 	ContainerInfo *ci = (ContainerInfo *)pointer;
-	int z;
 	if(!ci)
 		return;
 	recin.cb = sizeof(RECORDINSERT);
 	recin.pRecordParent = NULL;
 	recin.zOrder = CMA_TOP;
 	recin.fInvalidateRecord = TRUE;
 	recin.cRecordsInsert = rowcount;
-	z = 0;
+	_dw_send_msg(handle, CM_INSERTRECORD, MPFROMP(ci->data), MPFROMP(&recin), 0);
-	while(WinSendMsg(handle, CM_INSERTRECORD, MPFROMP(ci->data), MPFROMP(&recin)) == 0)
-	{
-		z++;
-		if(z > 5000000)
-			break;
-		dw_main_sleep(1);
-	}
 	free(ci);
 }
 /*
 *       handle: Handle to the window (widget) to be cleared.
 *       redraw: TRUE to cause the container to redraw immediately.
 */
 void API dw_container_clear(HWND handle, int redraw)
 {
-	int z = 0;
+	PCNRITEM pCore;
+	int container = (int)dw_window_get_data(handle, "_dw_container");
 	if(hwndEmph == handle)
 		_clear_emphasis();
-	if(!dw_window_get_data(handle, "_dw_container"))
-	{
+	pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)0L, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
-		PCNRITEM pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)0L, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
+	while(pCore)
-		while(pCore)
+	{
+		if(container)
+			_dw_container_free_strings(handle, (PRECORDCORE)pCore);
+		else
 		{
 			/* Free icon text */
 			if(pCore->rc.pszIcon)
 			{
 				free(pCore->rc.pszIcon);
 				pCore->rc.pszIcon = 0;
 			}
-			pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)pCore, MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
+		}
-		}
+		pCore = WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)pCore, MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
 	}
-	while((int)WinSendMsg(handle, CM_REMOVERECORD, (MPARAM)0L, MPFROM2SHORT(0, (redraw ? CMA_INVALIDATE : 0) | CMA_FREE)) == -1)
+	_dw_send_msg(handle, CM_REMOVERECORD, (MPARAM)0L, MPFROM2SHORT(0, (redraw ? CMA_INVALIDATE : 0) | CMA_FREE), -1);
-	{
-		z++;
-		if(z > 5000000)
-			break;
-		dw_main_sleep(1);
-	}
 }
 /*
 * Removes the first x rows from a container.
 * Parameters:
 *       rowcount: The number of rows to be deleted.
 */
 void API dw_container_delete(HWND handle, int rowcount)
 {
 	RECORDCORE *last, **prc = malloc(sizeof(RECORDCORE *) * rowcount);
-	int current = 1, z;
+	int current = 1;
 	prc[0] = last = (RECORDCORE *)WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)0L, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
 	while(last && current < rowcount)
 	{
+		_dw_container_free_strings(handle, last);
 		prc[current] = last = (RECORDCORE *)WinSendMsg(handle, CM_QUERYRECORD, (MPARAM)last, MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
 		current++;
 	}
-	z = 0;
+	_dw_send_msg(handle, CM_REMOVERECORD, (MPARAM)prc, MPFROM2SHORT(current, CMA_INVALIDATE | CMA_FREE), -1);
-	while((int)WinSendMsg(handle, CM_REMOVERECORD, (MPARAM)prc, MPFROM2SHORT(current, CMA_INVALIDATE | CMA_FREE)) == -1)
-	{
-		z++;
-		if(z > 5000000)
-			break;
-		dw_main_sleep(1);
-	}
 	free(prc);
 }
 /*

Mercurial > dwindows

comparison os2/dw.c @ 326:1c961a4d0f43