--- mstools/samples/ddeml/client/dialog.c 2018/08/09 18:20:38 1.1 +++ mstools/samples/ddeml/client/dialog.c 2018/08/09 18:21:24 1.1.1.2 @@ -28,21 +28,21 @@ CHAR szT[MAX_NAME]; // temp buf for ****************************************************************************/ INT FAR DoDialog( LPSTR lpTemplateName, -WNDPROC lpDlgProc, +DLGPROC lpDlgProc, LONG param, BOOL fRememberFocus) { - DWORD wRet; + INT iRet; HWND hwndFocus; if (fRememberFocus) hwndFocus = GetFocus(); lpDlgProc = MakeProcInstance(lpDlgProc, hInst); - wRet = DialogBoxParam(hInst, lpTemplateName, hwndFrame, (DLGPROC)lpDlgProc, param); + iRet = DialogBoxParam(hInst, lpTemplateName, hwndFrame, lpDlgProc, param); FreeProcInstance(lpDlgProc); if (fRememberFocus) SetFocus(hwndFocus); - return wRet; + return iRet; } @@ -68,7 +68,7 @@ LPARAM lParam; break; case WM_COMMAND: - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDOK: case IDCANCEL: EndDialog(hwnd, 0); @@ -130,7 +130,7 @@ LPARAM lParam) break; case WM_COMMAND: - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDOK: GetDlgItemText(hwnd, IDEF_APPLICATION, szT, MAX_NAME); if (!strcmp(szT, szWild)) @@ -322,15 +322,15 @@ LPARAM lParam) break; case WM_COMMAND: - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDCH_EXECUTE: SetDlgItemText(hwnd, IDEF_ITEM, ""); case IDCH_REQUEST: case IDCH_ADVISE: case IDCH_UNADVISE: case IDCH_POKE: - EnableWindow(GetDlgItem(hwnd, IDEF_ITEM), GET_WM_COMMAND_ID(wParam, lParam) != IDCH_EXECUTE); - EnableWindow(GetDlgItem(hwnd, IDTX_ITEM), GET_WM_COMMAND_ID(wParam, lParam) != IDCH_EXECUTE); + EnableWindow(GetDlgItem(hwnd, IDEF_ITEM), LOWORD(wParam) != IDCH_EXECUTE); + EnableWindow(GetDlgItem(hwnd, IDTX_ITEM), LOWORD(wParam) != IDCH_EXECUTE); break; case IDOK: @@ -347,9 +347,9 @@ LPARAM lParam) } } - if (GET_WM_COMMAND_ID(wParam, lParam) == IDBN_OPTIONS) { + if (LOWORD(wParam) == IDBN_OPTIONS) { DoDialog(MAKEINTRESOURCE(IDD_ADVISEOPTS), - (WNDPROC)AdvOptsDlgProc, (LONG)pxact, TRUE); + (DLGPROC)AdvOptsDlgProc, (LONG)pxact, TRUE); return 0; } @@ -378,7 +378,7 @@ LPARAM lParam) */ if (pxact->wType == XTYP_POKE || pxact->wType == XTYP_EXECUTE) { if (!DoDialog(MAKEINTRESOURCE(IDD_TEXTENTRY), - (WNDPROC)TextEntryDlgProc, (DWORD)(LPSTR)pxact, + (DLGPROC)TextEntryDlgProc, (DWORD)(LPSTR)pxact, TRUE)) return 0; } @@ -459,11 +459,11 @@ LPARAM lParam) EnableWindow(GetDlgItem(hwnd, IDCH_NODATA), FALSE); EnableWindow(GetDlgItem(hwnd, IDCH_ACKREQ), FALSE); } - SendMessage(hwnd, WM_COMMAND, GET_WM_COMMAND_MPS(IDCH_ASYNC, 0, 0)); // enable async checkboxes + SendMessage(hwnd, WM_COMMAND, (WPARAM)MAKELONG(IDCH_ASYNC, 0), (LONG)(0)); // enable async checkboxes break; case WM_COMMAND: - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDCH_ASYNC: { BOOL fEnable; @@ -484,7 +484,7 @@ LPARAM lParam) } if (!(pxact->fsOptions & XOPT_ASYNC)) pxact->ulTimeout = (DWORD)GetDlgItemInt(hwnd, IDEF_TIMEOUT, - &i, FALSE); + (BOOL *)&i, FALSE); // fall through case IDCANCEL: EndDialog(hwnd, 0); @@ -548,7 +548,7 @@ LPARAM lParam) break; case WM_COMMAND: - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDOK: case IDBN_GENHUGE: fOwned = IsDlgButtonChecked(hwnd, IDCH_MAKEOWNED); @@ -573,7 +573,7 @@ LPARAM lParam) } GetDlgItemText(hwnd, IDEF_DATA, pData, (DWORD)cb); DdeUnaccessData(pxact->hDdeData); - if (GET_WM_COMMAND_ID(wParam, lParam) == IDBN_GENHUGE) { + if (LOWORD(wParam) == IDBN_GENHUGE) { CHAR szT[40]; /* @@ -582,7 +582,7 @@ LPARAM lParam) * this string and create a randomly generated huge block * of text data and place it into pxact->hDdeData. */ - _fmemcpy(szT, pData, min((DWORD)cb, 40)); + memcpy(szT, pData, min((DWORD)cb, 40)); szT[39] = '\0'; if (sscanf(szT, "%ld", &length) == 1) { DdeFreeDataHandle(pxact->hDdeData); @@ -612,8 +612,8 @@ LPARAM lParam) * the user has chosen to use an existing owned data for sending * to the server. */ - id = DoDialog(MAKEINTRESOURCE(IDD_HDATAVIEW), (WNDPROC)ViewHandleDlgProc, - (DWORD)pxact, TRUE); + id = DoDialog(MAKEINTRESOURCE(IDD_HDATAVIEW), (DLGPROC)ViewHandleDlgProc, + (LONG)pxact, TRUE); switch (id) { case IDCANCEL: @@ -669,7 +669,7 @@ LPARAM lParam) break; case WM_COMMAND: - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDOK: // use selectted handle case IDBN_DELETE: // delete selected handle case IDBN_VIEW: // view selected handle @@ -678,9 +678,9 @@ LPARAM lParam) SendDlgItemMessage(hwnd, IDLB_HANDLES, LB_GETTEXT, itm, (LONG)(LPSTR)szT); sscanf(szT, "[%d]", &i); pxact->hDdeData = aOwned[i].hData; - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDOK: // use selectted handle - EndDialog(hwnd, GET_WM_COMMAND_ID(wParam, lParam)); + EndDialog(hwnd, LOWORD(wParam)); break; case IDBN_DELETE: // delete selected handle @@ -692,7 +692,7 @@ LPARAM lParam) break; case IDBN_VIEW: // view selected handle - EndDialog(hwnd, GET_WM_COMMAND_ID(wParam, lParam)); + EndDialog(hwnd, LOWORD(wParam)); } } break; @@ -724,7 +724,7 @@ LPARAM lParam) break; case WM_COMMAND: - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDOK: wDelay = (DWORD)GetDlgItemInt(hwnd, IDEF_VALUE, NULL, FALSE); case IDCANCEL: @@ -768,7 +768,7 @@ LPARAM lParam) break; case WM_COMMAND: - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDOK: DefTimeout = GetDlgItemInt(hwnd, IDEF_VALUE, NULL, FALSE); case IDCANCEL: @@ -807,7 +807,7 @@ LPARAM lParam) break; case WM_COMMAND: - switch (GET_WM_COMMAND_ID(wParam, lParam)) { + switch (LOWORD(wParam)) { case IDOK: CCFilter.wFlags = (WORD)GetDlgItemInt(hwnd, IDEF_FLAGS, &fSuccess, FALSE); if (!fSuccess) return(0); @@ -846,4 +846,3 @@ DWORD delay) } } } -