Removed the A/W constants for builtin cursors, icons and resource types since they don't exist on Windows, and added typecasts everywhere instead.
diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c index 94c1ca4..ba9738c 100644 --- a/dlls/comctl32/animate.c +++ b/dlls/comctl32/animate.c
@@ -947,7 +947,7 @@ wndClass.lpfnWndProc = (WNDPROC)ANIMATE_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(ANIMATE_INFO *); - wndClass.hCursor = LoadCursorA(0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wndClass.lpszClassName = ANIMATE_CLASSA;
diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index c0099e8..6010127 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c
@@ -2280,7 +2280,7 @@ wndClass.lpfnWndProc = (WNDPROC)COMBOEX_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(COMBOEX_INFO *); - wndClass.hCursor = LoadCursorW (0, IDC_ARROWW); + wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = WC_COMBOBOXEXW;
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 5f1beadf..cf1f961 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c
@@ -847,7 +847,7 @@ sysColorMap = (LPCOLORMAP)internalColorMap; } - hRsrc = FindResourceA (hInstance, (LPSTR)idBitmap, RT_BITMAPA); + hRsrc = FindResourceA (hInstance, (LPSTR)idBitmap, (LPSTR)RT_BITMAP); if (hRsrc == 0) return 0; hglb = LoadResource (hInstance, hRsrc);
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 9f32f59..d923674 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c
@@ -1356,7 +1356,7 @@ wndClass.lpfnWndProc = (WNDPROC)DATETIME_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(DATETIME_INFO *); - wndClass.hCursor = LoadCursorA (0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = DATETIMEPICK_CLASSA;
diff --git a/dlls/comctl32/flatsb.c b/dlls/comctl32/flatsb.c index 0a1ecb5..c588153 100644 --- a/dlls/comctl32/flatsb.c +++ b/dlls/comctl32/flatsb.c
@@ -245,7 +245,7 @@ wndClass.lpfnWndProc = (WNDPROC)FlatSB_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(FLATSB_INFO *); - wndClass.hCursor = LoadCursorA (0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = FLATSB_CLASSA;
diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 0d47f13..d94f742 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c
@@ -1252,7 +1252,7 @@ infoPtr->hFont = 0; infoPtr->items = 0; infoPtr->bRectsValid = FALSE; - infoPtr->hcurArrow = LoadCursorA (0, IDC_ARROWA); + infoPtr->hcurArrow = LoadCursorA (0, (LPSTR)IDC_ARROW); infoPtr->hcurDivider = LoadCursorA (COMCTL32_hModule, MAKEINTRESOURCEA(IDC_DIVIDER)); infoPtr->hcurDivopen = LoadCursorA (COMCTL32_hModule, MAKEINTRESOURCEA(IDC_DIVIDEROPEN)); infoPtr->bPressed = FALSE; @@ -1799,7 +1799,7 @@ wndClass.lpfnWndProc = (WNDPROC)HEADER_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(HEADER_INFO *); - wndClass.hCursor = LoadCursorA (0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); wndClass.lpszClassName = WC_HEADERA; RegisterClassA (&wndClass);
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 289ab47..03067d0 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c
@@ -564,7 +564,7 @@ wndClass.lpfnWndProc = (WNDPROC)IPADDRESS_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(IPADDRESS_INFO *); - wndClass.hCursor = LoadCursorW (0, IDC_IBEAMW); + wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_IBEAM); wndClass.hbrBackground = GetStockObject(WHITE_BRUSH); wndClass.lpszClassName = WC_IPADDRESSW;
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index df975fd..67d2624 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c
@@ -8949,7 +8949,7 @@ wndClass.lpfnWndProc = (WNDPROC)LISTVIEW_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(LISTVIEW_INFO *); - wndClass.hCursor = LoadCursorW(0, IDC_ARROWW); + wndClass.hCursor = LoadCursorW(0, (LPWSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = WC_LISTVIEWW; RegisterClassW(&wndClass);
diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9d05f02..d30988f 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c
@@ -2054,7 +2054,7 @@ wndClass.lpfnWndProc = (WNDPROC)MONTHCAL_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(MONTHCAL_INFO *); - wndClass.hCursor = LoadCursorA(0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = MONTHCAL_CLASSA;
diff --git a/dlls/comctl32/nativefont.c b/dlls/comctl32/nativefont.c index aba0527..762233f 100644 --- a/dlls/comctl32/nativefont.c +++ b/dlls/comctl32/nativefont.c
@@ -125,7 +125,7 @@ wndClass.lpfnWndProc = (WNDPROC)NATIVEFONT_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(NATIVEFONT_INFO *); - wndClass.hCursor = LoadCursorA (0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = WC_NATIVEFONTCTLA;
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 7417349..04a76d1 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c
@@ -1594,7 +1594,7 @@ wndClass.lpfnWndProc = (WNDPROC)PAGER_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(PAGER_INFO *); - wndClass.hCursor = LoadCursorA (0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = 0; wndClass.lpszClassName = WC_PAGESCROLLERA;
diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index 0a10b92..526999c 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c
@@ -422,7 +422,7 @@ wndClass.lpfnWndProc = (WNDPROC)ProgressWindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof (PROGRESS_INFO *); - wndClass.hCursor = LoadCursorW (0, IDC_ARROWW); + wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); wndClass.lpszClassName = PROGRESS_CLASSW; RegisterClassW (&wndClass);
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4da54f9..870a40f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c
@@ -423,7 +423,7 @@ { HRSRC hResource = FindResourceW(lppsp->hInstance, lppsp->u.pszTemplate, - RT_DIALOGW); + (LPWSTR)RT_DIALOG); HGLOBAL hTemplate = LoadResource(lppsp->hInstance, hResource); pTemplate = (LPDLGTEMPLATEW)LockResource(hTemplate); @@ -432,7 +432,7 @@ { HRSRC hResource = FindResourceA(lppsp->hInstance, (LPSTR)lppsp->u.pszTemplate, - RT_DIALOGA); + (LPSTR)RT_DIALOG); HGLOBAL hTemplate = LoadResource(lppsp->hInstance, hResource); pTemplate = (LPDLGTEMPLATEA)LockResource(hTemplate); @@ -585,14 +585,14 @@ { if(!(hRes = FindResourceW(COMCTL32_hModule, MAKEINTRESOURCEW(resID), - RT_DIALOGW))) + (LPWSTR)RT_DIALOG))) return -1; } else { if(!(hRes = FindResourceA(COMCTL32_hModule, MAKEINTRESOURCEA(resID), - RT_DIALOGA))) + (LPSTR)RT_DIALOG))) return -1; } @@ -1396,7 +1396,7 @@ hResource = FindResourceW(ppshpage->hInstance, ppshpage->u.pszTemplate, - RT_DIALOGW); + (LPWSTR)RT_DIALOG); if(!hResource) return FALSE; @@ -1418,7 +1418,7 @@ hResource = FindResourceA(ppshpage->hInstance, (LPSTR)ppshpage->u.pszTemplate, - RT_DIALOGA); + (LPSTR)RT_DIALOG); if(!hResource) return FALSE;
diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index eedd289..8ba0593 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c
@@ -3871,10 +3871,10 @@ infoPtr->ihitBand = -1; infoPtr->hwndSelf = hwnd; infoPtr->DoRedraw = TRUE; - infoPtr->hcurArrow = LoadCursorA (0, IDC_ARROWA); - infoPtr->hcurHorz = LoadCursorA (0, IDC_SIZEWEA); - infoPtr->hcurVert = LoadCursorA (0, IDC_SIZENSA); - infoPtr->hcurDrag = LoadCursorA (0, IDC_SIZEA); + infoPtr->hcurArrow = LoadCursorA (0, (LPSTR)IDC_ARROW); + infoPtr->hcurHorz = LoadCursorA (0, (LPSTR)IDC_SIZEWE); + infoPtr->hcurVert = LoadCursorA (0, (LPSTR)IDC_SIZENS); + infoPtr->hcurDrag = LoadCursorA (0, (LPSTR)IDC_SIZE); infoPtr->bUnicode = IsWindowUnicode (hwnd); infoPtr->fStatus = CREATE_RUNNING; infoPtr->hFont = GetStockObject (SYSTEM_FONT);
diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index ad376ce..fac07ac 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c
@@ -1270,7 +1270,7 @@ wndClass.lpfnWndProc = (WNDPROC)StatusWindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(STATUSWINDOWINFO *); - wndClass.hCursor = LoadCursorW (0, IDC_ARROWW); + wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); wndClass.lpszClassName = STATUSCLASSNAMEW;
diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 3f493c6..b62368f 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c
@@ -2957,7 +2957,7 @@ infoPtr->uVItemPadding = 3; infoPtr->hFont = 0; infoPtr->items = 0; - infoPtr->hcurArrow = LoadCursorA (0, IDC_ARROWA); + infoPtr->hcurArrow = LoadCursorA (0, (LPSTR)IDC_ARROW); infoPtr->iSelected = -1; infoPtr->iHotTracked = -1; infoPtr->uFocus = -1; @@ -3256,7 +3256,7 @@ wndClass.lpfnWndProc = (WNDPROC)TAB_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(TAB_INFO *); - wndClass.hCursor = LoadCursorA (0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = NULL; wndClass.lpszClassName = WC_TABCONTROLA;
diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 4ce4075..ce365d5 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c
@@ -2867,7 +2867,7 @@ if (!(hRes = FindResourceA (COMCTL32_hModule, MAKEINTRESOURCEA(IDD_TBCUSTOMIZE), - RT_DIALOGA))) + (LPSTR)RT_DIALOG))) return FALSE; if(!(template = (LPVOID)LoadResource (COMCTL32_hModule, hRes))) @@ -6006,7 +6006,7 @@ wndClass.lpfnWndProc = (WNDPROC)ToolbarWindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(TOOLBAR_INFO *); - wndClass.hCursor = LoadCursorA (0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); wndClass.lpszClassName = TOOLBARCLASSNAMEA;
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 0f112d1..dfefe15 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c
@@ -2438,7 +2438,7 @@ wndClass.lpfnWndProc = (WNDPROC)TOOLTIPS_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(TOOLTIPS_INFO *); - wndClass.hCursor = LoadCursorA (0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA (0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = 0; wndClass.lpszClassName = TOOLTIPS_CLASSA;
diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c7db527..009b981 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c
@@ -1784,7 +1784,7 @@ wndClass.lpfnWndProc = (WNDPROC)TRACKBAR_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(TRACKBAR_INFO *); - wndClass.hCursor = LoadCursorW (0, IDC_ARROWW); + wndClass.hCursor = LoadCursorW (0, (LPWSTR)IDC_ARROW); wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); wndClass.lpszClassName = TRACKBAR_CLASSW;
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index c43f45c..0bff279 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c
@@ -5454,7 +5454,7 @@ wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(TREEVIEW_INFO *); - wndClass.hCursor = LoadCursorA(0, IDC_ARROWA); + wndClass.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); wndClass.hbrBackground = 0; wndClass.lpszClassName = WC_TREEVIEWA;
diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index 6bb622d..f626184 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c
@@ -952,7 +952,7 @@ wndClass.lpfnWndProc = (WNDPROC)UpDownWindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(UPDOWN_INFO*); - wndClass.hCursor = LoadCursorW( 0, IDC_ARROWW ); + wndClass.hCursor = LoadCursorW( 0, (LPWSTR)IDC_ARROW ); wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1); wndClass.lpszClassName = UPDOWN_CLASSW;