ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gcc 4.0 -Wpointer-sign fixes.

This commit is contained in:
Mike McCormack 2005-07-05 14:11:04 +00:00 committed by Alexandre Julliard
parent d24938ad46
commit 60f8543362
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/commdlg/filedlg.c
View File

@ -850,7 +850,7 @@ void SendCustomDlgNotificationMessage(HWND hwndParentDlg, UINT uCode)
static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer) static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer)
{ {
INT_PTR sizeUsed = 0, n, total; UINT sizeUsed = 0, n, total;
LPWSTR lpstrFileList = NULL; LPWSTR lpstrFileList = NULL;
WCHAR lpstrCurrentDir[MAX_PATH]; WCHAR lpstrCurrentDir[MAX_PATH];
FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);
@ -912,7 +912,7 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer
static INT_PTR FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer) static INT_PTR FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer)
{ {
INT_PTR sizeUsed = 0; UINT sizeUsed = 0;
LPWSTR lpstrFileList = NULL; LPWSTR lpstrFileList = NULL;
FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr); FileOpenDlgInfos *fodInfos = (FileOpenDlgInfos *) GetPropA(hwnd,FileOpenDlgInfosStr);

2
dlls/commdlg/filedlgbrowser.c
View File

@ -50,7 +50,7 @@ typedef struct
const IShellBrowserVtbl *lpVtbl; const IShellBrowserVtbl *lpVtbl;
const ICommDlgBrowserVtbl *lpVtblCommDlgBrowser; const ICommDlgBrowserVtbl *lpVtblCommDlgBrowser;
const IServiceProviderVtbl *lpVtblServiceProvider; const IServiceProviderVtbl *lpVtblServiceProvider;
DWORD ref; /* Reference counter */ LONG ref; /* Reference counter */
HWND hwndOwner; /* Owner dialog of the interface */ HWND hwndOwner; /* Owner dialog of the interface */
} IShellBrowserImpl; } IShellBrowserImpl;

6
dlls/commdlg/fontdlg.c
View File

@ -722,11 +722,13 @@ LRESULT CFn_WMMeasureItem(HWND hDlg, WPARAM wParam, LPARAM lParam)
HFONT hfontprev; HFONT hfontprev;
TEXTMETRICW tm; TEXTMETRICW tm;
LPMEASUREITEMSTRUCT lpmi=(LPMEASUREITEMSTRUCT)lParam; LPMEASUREITEMSTRUCT lpmi=(LPMEASUREITEMSTRUCT)lParam;
INT height = 0;
if (!himlTT) if (!himlTT)
himlTT = ImageList_LoadImageW( COMDLG32_hInstance, MAKEINTRESOURCEW(38), himlTT = ImageList_LoadImageW( COMDLG32_hInstance, MAKEINTRESOURCEW(38),
TTBITMAP_XSIZE, 0, CLR_DEFAULT, IMAGE_BITMAP, 0); TTBITMAP_XSIZE, 0, CLR_DEFAULT, IMAGE_BITMAP, 0);
ImageList_GetIconSize( himlTT, 0, &lpmi->itemHeight); ImageList_GetIconSize( himlTT, 0, &height);
lpmi->itemHeight += 2; lpmi->itemHeight = height + 2;
/* use MAX of bitmap height and tm.tmHeight .*/ /* use MAX of bitmap height and tm.tmHeight .*/
hdc=GetDC(hDlg); hdc=GetDC(hDlg);
if(!hdc) return 0; if(!hdc) return 0;

4
dlls/commdlg/fontdlg16.c
View File

@ -74,14 +74,14 @@ static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w)
int len; int len;
if(chf16->lpTemplateName) if(chf16->lpTemplateName)
{ {
len = MultiByteToWideChar(CP_ACP, 0, (LPBYTE)chf16->lpTemplateName, -1, NULL, 0); len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)chf16->lpTemplateName, -1, NULL, 0);
chf32w->lpTemplateName = HeapAlloc(GetProcessHeap(), 0,len*sizeof(WCHAR)); chf32w->lpTemplateName = HeapAlloc(GetProcessHeap(), 0,len*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName), MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName),
-1, (LPWSTR)chf32w->lpTemplateName, len); -1, (LPWSTR)chf32w->lpTemplateName, len);
} }
if(chf16->lpszStyle) if(chf16->lpszStyle)
{ {
len = MultiByteToWideChar(CP_ACP, 0, (LPBYTE)chf16->lpszStyle, -1, NULL, 0); len = MultiByteToWideChar(CP_ACP, 0, (LPCSTR)chf16->lpszStyle, -1, NULL, 0);
chf32w->lpszStyle = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); chf32w->lpszStyle = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName), MultiByteToWideChar(CP_ACP, 0, (LPSTR)MapSL(chf16->lpTemplateName),
-1, chf32w->lpszStyle, len); -1, chf32w->lpszStyle, len);

6
dlls/commdlg/printdlg.c
View File

@ -473,7 +473,7 @@ static BOOL PRINTDLG_PaperSizeA(
goto out; goto out;
} }
points = HeapAlloc(GetProcessHeap(),0,sizeof(points[0])*NrOfEntries); points = HeapAlloc(GetProcessHeap(),0,sizeof(points[0])*NrOfEntries);
if (NrOfEntries!=(ret=DeviceCapabilitiesA(devname,portname,DC_PAPERSIZE,(LPBYTE)points,dm))) { if (NrOfEntries!=(ret=DeviceCapabilitiesA(devname,portname,DC_PAPERSIZE,(LPSTR)points,dm))) {
FIXME("Number of returned sizes %d is not %d?\n",NrOfEntries,ret); FIXME("Number of returned sizes %d is not %d?\n",NrOfEntries,ret);
goto out; goto out;
} }
@ -898,7 +898,7 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name,
dmSize = DocumentPropertiesA(0, 0, name, PrintStructures->lpDevMode, NULL, dmSize = DocumentPropertiesA(0, 0, name, PrintStructures->lpDevMode, NULL,
DM_OUT_BUFFER); DM_OUT_BUFFER);
if(lppd->hDevMode && (lpdm = GlobalLock(lppd->hDevMode)) && if(lppd->hDevMode && (lpdm = GlobalLock(lppd->hDevMode)) &&
!strcmp(lpdm->dmDeviceName, !lstrcmpA(lpdm->dmDeviceName,
PrintStructures->lpDevMode->dmDeviceName)) { PrintStructures->lpDevMode->dmDeviceName)) {
/* Supplied devicemode matches current printer so try to use it */ /* Supplied devicemode matches current printer so try to use it */
DocumentPropertiesA(0, 0, name, PrintStructures->lpDevMode, lpdm, DocumentPropertiesA(0, 0, name, PrintStructures->lpDevMode, lpdm,
@ -1241,7 +1241,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam,
if(pdn) if(pdn)
name = (char*)pdn + pdn->wDeviceOffset; name = (char*)pdn + pdn->wDeviceOffset;
else if(pdm) else if(pdm)
name = pdm->dmDeviceName; name = (char*)pdm->dmDeviceName;
PRINTDLG_SetUpPrinterListComboA(hDlg, comboID, name); PRINTDLG_SetUpPrinterListComboA(hDlg, comboID, name);
if(pdm) GlobalUnlock(lppd->hDevMode); if(pdm) GlobalUnlock(lppd->hDevMode);
if(pdn) GlobalUnlock(lppd->hDevNames); if(pdn) GlobalUnlock(lppd->hDevNames);

2
dlls/commdlg/printdlg16.c
View File

@ -192,7 +192,7 @@ static LRESULT PRINTDLG_WMInitDialog16(HWND hDlg, WPARAM wParam, PRINT_PTRA16* p
if(pdn) if(pdn)
name = (char*)pdn + pdn->wDeviceOffset; name = (char*)pdn + pdn->wDeviceOffset;
else if(pdm) else if(pdm)
name = pdm->dmDeviceName; name = (char*)pdm->dmDeviceName;
PRINTDLG_SetUpPrinterListComboA(hDlg, comboID, name); PRINTDLG_SetUpPrinterListComboA(hDlg, comboID, name);
if(pdm) GlobalUnlock16(lppd->hDevMode); if(pdm) GlobalUnlock16(lppd->hDevMode);
if(pdn) GlobalUnlock16(lppd->hDevNames); if(pdn) GlobalUnlock16(lppd->hDevNames);