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

Removed inclusion of wine/winestring.h from winbase.h and added it to 

the C files that need it.
This commit is contained in:
Alexandre Julliard 2000-09-25 23:30:56 +00:00
parent 770eb51ed5
commit 072dfb57e3
68 changed files with 112 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controls/listbox.c
View File

@ -843,20 +843,20 @@ static INT LISTBOX_FindString( WND *wnd, LB_DESCR *descr, INT start,
#define CHECK_DRIVE(item) \ #define CHECK_DRIVE(item) \
if ((item)->str[0] == '[') \ if ((item)->str[0] == '[') \
{ \ { \
if (!lstrncmpiA( str, (item)->str+1, len )) return i; \ if (!strncasecmp( str, (item)->str+1, len )) return i; \
if (((item)->str[1] == '-') && !lstrncmpiA(str,(item)->str+2,len)) \ if (((item)->str[1] == '-') && !strncasecmp(str,(item)->str+2,len)) \
return i; \ return i; \
} }
INT len = strlen(str); INT len = strlen(str);
for (i = start + 1; i < descr->nb_items; i++, item++) for (i = start + 1; i < descr->nb_items; i++, item++)
{ {
if (!lstrncmpiA( str, item->str, len )) return i; if (!strncasecmp( str, item->str, len )) return i;
CHECK_DRIVE(item); CHECK_DRIVE(item);
} }
for (i = 0, item = descr->items; i <= start; i++, item++) for (i = 0, item = descr->items; i <= start; i++, item++)
{ {
if (!lstrncmpiA( str, item->str, len )) return i; if (!strncasecmp( str, item->str, len )) return i;
CHECK_DRIVE(item); CHECK_DRIVE(item);
} }
#undef CHECK_DRIVE #undef CHECK_DRIVE

1
controls/menu.c
View File

@ -21,6 +21,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winestring.h"
#include "win.h" #include "win.h"
#include "task.h" #include "task.h"
#include "heap.h" #include "heap.h"

1
dlls/advapi32/registry.c
View File

@ -21,6 +21,7 @@
#include "winerror.h" #include "winerror.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "server.h" #include "server.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/advapi32/security.c
View File

@ -6,6 +6,7 @@
#include "windef.h" #include "windef.h"
#include "winerror.h" #include "winerror.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "ntddk.h" #include "ntddk.h"
#include "ntsecapi.h" #include "ntsecapi.h"

1
dlls/advapi32/service.c
View File

@ -11,6 +11,7 @@
#include "winerror.h" #include "winerror.h"
#include "winreg.h" #include "winreg.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/comctl32/datetime.c
View File

@ -18,6 +18,7 @@
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winestring.h"
#include "commctrl.h" #include "commctrl.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/comctl32/header.c
View File

@ -23,6 +23,7 @@
#include "winbase.h" #include "winbase.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "commctrl.h" #include "commctrl.h"
#include "debugtools.h" #include "debugtools.h"

7
dlls/comctl32/rebar.c
View File

@ -23,6 +23,7 @@
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "commctrl.h" #include "commctrl.h"
#include "debugtools.h" #include "debugtools.h"
@ -1512,8 +1513,10 @@ REBAR_SetBarInfo (HWND hwnd, WPARAM wParam, LPARAM lParam)
if (lpInfo->fMask & RBIM_IMAGELIST) { if (lpInfo->fMask & RBIM_IMAGELIST) {
infoPtr->himl = lpInfo->himl; infoPtr->himl = lpInfo->himl;
if (infoPtr->himl) { if (infoPtr->himl) {
ImageList_GetIconSize (infoPtr->himl, &infoPtr->imageSize.cx, INT cx, cy;
&infoPtr->imageSize.cy); ImageList_GetIconSize (infoPtr->himl, &cx, &cy);
infoPtr->imageSize.cx = cx;
infoPtr->imageSize.cy = cy;
} }
else { else {
infoPtr->imageSize.cx = 0; infoPtr->imageSize.cx = 0;

1
dlls/comctl32/status.c
View File

@ -12,6 +12,7 @@
#include "winbase.h" #include "winbase.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "commctrl.h" #include "commctrl.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/comctl32/toolbar.c
View File

@ -34,6 +34,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "commctrl.h" #include "commctrl.h"
#include "imagelist.h" #include "imagelist.h"
#include "cache.h" #include "cache.h"

1
dlls/comctl32/treeview.c
View File

@ -29,6 +29,7 @@
#include <limits.h> #include <limits.h>
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winestring.h"
#include "commctrl.h" #include "commctrl.h"
#include "comctl32.h" #include "comctl32.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/commdlg/filedlg.c
View File

@ -14,6 +14,7 @@
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "ldt.h" #include "ldt.h"
#include "heap.h" #include "heap.h"
#include "commdlg.h" #include "commdlg.h"

1
dlls/commdlg/filedlg95.c
View File

@ -26,6 +26,7 @@
#include "winbase.h" #include "winbase.h"
#include "ntddk.h" #include "ntddk.h"
#include "wine/winestring.h"
#include "ldt.h" #include "ldt.h"
#include "heap.h" #include "heap.h"
#include "commdlg.h" #include "commdlg.h"

4
dlls/commdlg/filedlgbrowser.c
View File

@ -10,14 +10,14 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "shlguid.h" #include "shlguid.h"
#include "wine/obj_dataobject.h" #include "wine/obj_dataobject.h"
#include "debugtools.h" #include "debugtools.h"
#include "cdlg.h" #include "cdlg.h"
#include "wine/undocshell.h"
DEFAULT_DEBUG_CHANNEL(commdlg) DEFAULT_DEBUG_CHANNEL(commdlg);
/************************************************************************** /**************************************************************************
* Structure * Structure

1
dlls/commdlg/finddlg32.c
View File

@ -9,6 +9,7 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/winestring.h"
#include "commdlg.h" #include "commdlg.h"
#include "cderr.h" #include "cderr.h"
#include "dlgs.h" #include "dlgs.h"

1
dlls/commdlg/fontdlg.c
View File

@ -14,6 +14,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winestring.h"
#include "ldt.h" #include "ldt.h"
#include "heap.h" #include "heap.h"
#include "commdlg.h" #include "commdlg.h"

1
dlls/crtdll/mbstring.c
View File

@ -6,6 +6,7 @@
#include "windef.h" #include "windef.h"
#include "winbase.h" #include "winbase.h"
#include "winnls.h"
#include "crtdll.h" #include "crtdll.h"

1
dlls/kernel/format_msg.c
View File

@ -14,6 +14,7 @@
#include "winerror.h" #include "winerror.h"
#include "winnls.h" #include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/mpr/wnet.c
View File

@ -9,6 +9,7 @@
#include <unistd.h> #include <unistd.h>
#include "winbase.h" #include "winbase.h"
#include "wine/winestring.h"
#include "winnetwk.h" #include "winnetwk.h"
#include "drive.h" #include "drive.h"
#include "heap.h" #include "heap.h"

1
dlls/msacm/driver.c
View File

@ -14,6 +14,7 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/winestring.h"
#include "debugtools.h" #include "debugtools.h"
#include "heap.h" #include "heap.h"
#include "mmsystem.h" #include "mmsystem.h"

1
dlls/msacm/filter.c
View File

@ -8,6 +8,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "wine/winestring.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "msacm.h" #include "msacm.h"
#include "msacmdrv.h" #include "msacmdrv.h"

1
dlls/msacm/format.c
View File

@ -12,6 +12,7 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/winestring.h"
#include "debugtools.h" #include "debugtools.h"
#include "mmsystem.h" #include "mmsystem.h"
#include "msacm.h" #include "msacm.h"

2
dlls/msacm/internal.c
View File

@ -81,7 +81,7 @@ void MSACM_RegisterAllDrivers(void)
if (GetPrivateProfileSectionA("drivers32", pszBuffer, dwBufferLength, "system.ini")) { if (GetPrivateProfileSectionA("drivers32", pszBuffer, dwBufferLength, "system.ini")) {
char* s = pszBuffer; char* s = pszBuffer;
while (*s) { while (*s) {
if (!lstrncmpiA("MSACM.", s, 6)) { if (!strncasecmp("MSACM.", s, 6)) {
char *s2 = s; char *s2 = s;
while (*s2 != '\0' && *s2 != '=') s2++; while (*s2 != '\0' && *s2 != '=') s2++;
if (*s2) { if (*s2) {

4
dlls/msvideo/msvideo_main.c
View File

@ -71,7 +71,7 @@ BOOL VFWAPI ICInfo(
if (GetPrivateProfileStringA("drivers32",NULL,NULL,buf,2000,"system.ini")) { if (GetPrivateProfileStringA("drivers32",NULL,NULL,buf,2000,"system.ini")) {
char *s = buf; char *s = buf;
while (*s) { while (*s) {
if (!lstrncmpiA(type,s,4)) { if (!strncasecmp(type,s,4)) {
if(!fccHandler--) { if(!fccHandler--) {
lpicinfo->fccHandler = mmioStringToFOURCCA(s+5,0); lpicinfo->fccHandler = mmioStringToFOURCCA(s+5,0);
return TRUE; return TRUE;
@ -280,7 +280,7 @@ HIC VFWAPI ICLocate(
if (GetPrivateProfileSectionA("drivers32",pszBuffer,1024,"system.ini")) { if (GetPrivateProfileSectionA("drivers32",pszBuffer,1024,"system.ini")) {
char* s = pszBuffer; char* s = pszBuffer;
while (*s) { while (*s) {
if (!lstrncmpiA(type,s,5)) { if (!strncasecmp(type,s,5)) {
char *s2 = s; char *s2 = s;
while (*s2 != '\0' && *s2 != '.') s2++; while (*s2 != '\0' && *s2 != '.') s2++;
if (*s2) { if (*s2) {

1
dlls/ole32/clipboard.c
View File

@ -51,6 +51,7 @@
#include "winuser.h" #include "winuser.h"
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "wine/winestring.h"
#include "ole2.h" #include "ole2.h"
#include "debugtools.h" #include "debugtools.h"
#include "olestd.h" #include "olestd.h"

1
dlls/ole32/compobj.c
View File

@ -18,6 +18,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "winerror.h" #include "winerror.h"
#include "wine/winestring.h"
#include "wownt32.h" #include "wownt32.h"
#include "ole2ver.h" #include "ole2ver.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/ole32/filemoniker.c
View File

@ -8,6 +8,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "debugtools.h" #include "debugtools.h"
#include "objbase.h" #include "objbase.h"
#include "wine/obj_storage.h" #include "wine/obj_storage.h"

2
dlls/ole32/ole2.c
View File

@ -12,6 +12,7 @@
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "winerror.h" #include "winerror.h"
@ -20,6 +21,7 @@
#include "wine/obj_clientserver.h" #include "wine/obj_clientserver.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/wingdi16.h" #include "wine/wingdi16.h"
#include "wine/winestring.h"
#include "debugtools.h" #include "debugtools.h"
#include "ole2ver.h" #include "ole2ver.h"
#include "winreg.h" #include "winreg.h"

1
dlls/ole32/storage32.c
View File

@ -18,6 +18,7 @@
#include "winbase.h" /* for lstrlenW() and the likes */ #include "winbase.h" /* for lstrlenW() and the likes */
#include "winnls.h" #include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "debugtools.h" #include "debugtools.h"
#include "storage32.h" #include "storage32.h"

1
dlls/oleaut32/typelib.c
View File

@ -31,6 +31,7 @@
#include "winerror.h" #include "winerror.h"
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */ #include "winreg.h" /* for HKEY_LOCAL_MACHINE */
#include "winnls.h" /* for PRIMARYLANGID */ #include "winnls.h" /* for PRIMARYLANGID */
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/shell32/shellpath.c
View File

@ -14,6 +14,7 @@
#include "shell32_main.h" #include "shell32_main.h"
#include "windef.h" #include "windef.h"
#include "options.h" #include "options.h"
#include "wine/winestring.h"
#include "wine/undocshell.h" #include "wine/undocshell.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "shlwapi.h" #include "shlwapi.h"

4
dlls/shell32/shv_item_cmenu.c
View File

@ -10,6 +10,7 @@
#include "pidl.h" #include "pidl.h"
#include "shlguid.h" #include "shlguid.h"
#include "wine/winestring.h"
#include "wine/obj_base.h" #include "wine/obj_base.h"
#include "wine/obj_contextmenu.h" #include "wine/obj_contextmenu.h"
#include "wine/obj_shellbrowser.h" #include "wine/obj_shellbrowser.h"
@ -18,9 +19,8 @@
#include "shell32_main.h" #include "shell32_main.h"
#include "shellfolder.h" #include "shellfolder.h"
#include "shell.h" /* DROPFILESTRUCT */
DEFAULT_DEBUG_CHANNEL(shell) DEFAULT_DEBUG_CHANNEL(shell);
/************************************************************************** /**************************************************************************
* IContextMenu Implementation * IContextMenu Implementation

1
dlls/shlwapi/path.c
View File

@ -8,6 +8,7 @@
#include "winerror.h" #include "winerror.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/undocshell.h" #include "wine/undocshell.h"
#include "wine/winestring.h"
#include "shlwapi.h" #include "shlwapi.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/ttydrv/graphics.c
View File

@ -6,6 +6,7 @@
#include "config.h" #include "config.h"
#include "wine/winestring.h"
#include "dc.h" #include "dc.h"
#include "heap.h" #include "heap.h"
#include "debugtools.h" #include "debugtools.h"

2
dlls/version/info.c
View File

@ -384,7 +384,7 @@ static VS_VERSION_INFO_STRUCT16 *VersionInfo16_FindChild( VS_VERSION_INFO_STRUCT
while ( (DWORD)child < (DWORD)info + info->wLength ) while ( (DWORD)child < (DWORD)info + info->wLength )
{ {
if ( !lstrncmpiA( child->szKey, szKey, cbKey ) ) if ( !strncasecmp( child->szKey, szKey, cbKey ) )
return child; return child;
if (!(child->wLength)) return NULL; if (!(child->wLength)) return NULL;

1
dlls/winmm/joystick.c
View File

@ -18,6 +18,7 @@
#include "winbase.h" #include "winbase.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/winestring.h"
#include "winemm.h" #include "winemm.h"
#include "debugtools.h" #include "debugtools.h"

1
dlls/winmm/mmsystem.c
View File

@ -24,6 +24,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "winemm.h" #include "winemm.h"
#include "syslevel.h" #include "syslevel.h"

21
files/dos_fs.c
View File

@ -25,6 +25,7 @@
#include "ntddk.h" #include "ntddk.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "winerror.h" #include "winerror.h"
#include "drive.h" #include "drive.h"
#include "file.h" #include "file.h"
@ -609,7 +610,7 @@ BOOL DOSFS_FindUnixName( LPCSTR path, LPCSTR name, LPSTR long_buf,
} }
else else
{ {
if (!lstrncmpiA( long_name, name, len )) break; if (!strncasecmp( long_name, name, len )) break;
} }
} }
if (dos_name[0]) if (dos_name[0])
@ -660,7 +661,7 @@ const DOS_DEVICE *DOSFS_GetDevice( const char *name )
for (i = 0; i < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0]); i++) for (i = 0; i < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0]); i++)
{ {
const char *dev = DOSFS_Devices[i].name; const char *dev = DOSFS_Devices[i].name;
if (!lstrncmpiA( dev, name, strlen(dev) )) if (!strncasecmp( dev, name, strlen(dev) ))
{ {
p = name + strlen( dev ); p = name + strlen( dev );
if (!*p || (*p == '.')) return &DOSFS_Devices[i]; if (!*p || (*p == '.')) return &DOSFS_Devices[i];
@ -711,7 +712,7 @@ HFILE DOSFS_OpenDevice( const char *name, DWORD access )
for (i = 0; i < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0]); i++) for (i = 0; i < sizeof(DOSFS_Devices)/sizeof(DOSFS_Devices[0]); i++)
{ {
const char *dev = DOSFS_Devices[i].name; const char *dev = DOSFS_Devices[i].name;
if (!lstrncmpiA( dev, name, strlen(dev) )) if (!strncasecmp( dev, name, strlen(dev) ))
{ {
p = name + strlen( dev ); p = name + strlen( dev );
if (!*p || (*p == '.')) { if (!*p || (*p == '.')) {
@ -1606,8 +1607,11 @@ HANDLE WINAPI FindFirstFileExW(
dataW->ftLastWriteTime = dataA.ftLastWriteTime; dataW->ftLastWriteTime = dataA.ftLastWriteTime;
dataW->nFileSizeHigh = dataA.nFileSizeHigh; dataW->nFileSizeHigh = dataA.nFileSizeHigh;
dataW->nFileSizeLow = dataA.nFileSizeLow; dataW->nFileSizeLow = dataA.nFileSizeLow;
lstrcpyAtoW( dataW->cFileName, dataA.cFileName ); MultiByteToWideChar( CP_ACP, 0, dataA.cFileName, -1,
lstrcpyAtoW( dataW->cAlternateFileName, dataA.cAlternateFileName ); dataW->cFileName, sizeof(dataW->cFileName)/sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, dataA.cAlternateFileName, -1,
dataW->cAlternateFileName,
sizeof(dataW->cAlternateFileName)/sizeof(WCHAR) );
} }
break; break;
default: default:
@ -1670,8 +1674,11 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data )
data->ftLastWriteTime = dataA.ftLastWriteTime; data->ftLastWriteTime = dataA.ftLastWriteTime;
data->nFileSizeHigh = dataA.nFileSizeHigh; data->nFileSizeHigh = dataA.nFileSizeHigh;
data->nFileSizeLow = dataA.nFileSizeLow; data->nFileSizeLow = dataA.nFileSizeLow;
lstrcpyAtoW( data->cFileName, dataA.cFileName ); MultiByteToWideChar( CP_ACP, 0, dataA.cFileName, -1,
lstrcpyAtoW( data->cAlternateFileName, dataA.cAlternateFileName ); data->cFileName, sizeof(data->cFileName)/sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, dataA.cAlternateFileName, -1,
data->cAlternateFileName,
sizeof(data->cAlternateFileName)/sizeof(WCHAR) );
return TRUE; return TRUE;
} }

1
files/profile.c
View File

@ -17,6 +17,7 @@
#include "winbase.h" #include "winbase.h"
#include "winerror.h" #include "winerror.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winestring.h"
#include "windef.h" #include "windef.h"
#include "winnls.h" #include "winnls.h"
#include "winreg.h" #include "winreg.h"

3
graphics/metafiledrv/text.c
View File

@ -8,11 +8,12 @@
#include <string.h> #include <string.h>
#include "windef.h" #include "windef.h"
#include "wine/winestring.h"
#include "metafiledrv.h" #include "metafiledrv.h"
#include "debugtools.h" #include "debugtools.h"
#include "heap.h" #include "heap.h"
DEFAULT_DEBUG_CHANNEL(metafile) DEFAULT_DEBUG_CHANNEL(metafile);
/****************************************************************** /******************************************************************

3
graphics/win16drv/font.c
View File

@ -7,6 +7,7 @@
#include <string.h> #include <string.h>
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winestring.h"
#include "win16drv.h" #include "win16drv.h"
#include "module.h" #include "module.h"
#include "font.h" #include "font.h"
@ -14,7 +15,7 @@
#include "dc.h" #include "dc.h"
#include "debugtools.h" #include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(win16drv) DEFAULT_DEBUG_CHANNEL(win16drv);
/*********************************************************************** /***********************************************************************

3
graphics/win16drv/text.c
View File

@ -11,8 +11,9 @@
#include "gdi.h" #include "gdi.h"
#include "debugtools.h" #include "debugtools.h"
#include "winbase.h" #include "winbase.h"
#include "wine/winestring.h"
DEFAULT_DEBUG_CHANNEL(win16drv) DEFAULT_DEBUG_CHANNEL(win16drv);
/*********************************************************************** /***********************************************************************
* WIN16DRV_ExtTextOut * WIN16DRV_ExtTextOut

1
include/winbase.h
View File

@ -3,7 +3,6 @@
#include "basetsd.h" #include "basetsd.h"
#include "winnt.h" #include "winnt.h"
#include "wine/winestring.h"
#include "pshpack1.h" #include "pshpack1.h"

1
loader/module.c
View File

@ -12,6 +12,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winestring.h"
#include "winerror.h" #include "winerror.h"
#include "heap.h" #include "heap.h"
#include "neexe.h" #include "neexe.h"

1
loader/ne/convert.c
View File

@ -9,6 +9,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "module.h" #include "module.h"
#include "debugtools.h" #include "debugtools.h"

4
loader/ne/resource.c
View File

@ -117,7 +117,7 @@ NE_TYPEINFO *NE_FindTypeSection( LPBYTE pResTab,
if (!(pTypeInfo->type_id & 0x8000)) if (!(pTypeInfo->type_id & 0x8000))
{ {
BYTE *p = pResTab + pTypeInfo->type_id; BYTE *p = pResTab + pTypeInfo->type_id;
if ((*p == len) && !lstrncmpiA( p+1, str, len )) if ((*p == len) && !strncasecmp( p+1, str, len ))
{ {
TRACE(" Found type '%s'\n", str ); TRACE(" Found type '%s'\n", str );
return pTypeInfo; return pTypeInfo;
@ -164,7 +164,7 @@ NE_NAMEINFO *NE_FindResourceFromType( LPBYTE pResTab,
{ {
if (pNameInfo->id & 0x8000) continue; if (pNameInfo->id & 0x8000) continue;
p = pResTab + pNameInfo->id; p = pResTab + pNameInfo->id;
if ((*p == len) && !lstrncmpiA( p+1, str, len )) if ((*p == len) && !strncasecmp( p+1, str, len ))
return pNameInfo; return pNameInfo;
} }
} }

5
memory/atom.c
View File

@ -17,6 +17,7 @@
#include <ctype.h> #include <ctype.h>
#include "windef.h" #include "windef.h"
#include "winnls.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "winerror.h" #include "winerror.h"
@ -258,7 +259,7 @@ ATOM WINAPI AddAtom16( LPCSTR str )
{ {
entryPtr = ATOM_MakePtr( entry ); entryPtr = ATOM_MakePtr( entry );
if ((entryPtr->length == len) && if ((entryPtr->length == len) &&
(!lstrncmpiA( entryPtr->str, buffer, len ))) (!strncasecmp( entryPtr->str, buffer, len )))
{ {
entryPtr->refCount++; entryPtr->refCount++;
TRACE("-- existing 0x%x\n", entry); TRACE("-- existing 0x%x\n", entry);
@ -347,7 +348,7 @@ ATOM WINAPI FindAtom16( LPCSTR str )
{ {
ATOMENTRY * entryPtr = ATOM_MakePtr( entry ); ATOMENTRY * entryPtr = ATOM_MakePtr( entry );
if ((entryPtr->length == len) && if ((entryPtr->length == len) &&
(!lstrncmpiA( entryPtr->str, str, len ))) (!strncasecmp( entryPtr->str, str, len )))
{ {
TRACE("-- found %x\n", entry); TRACE("-- found %x\n", entry);
return HANDLETOATOM( entry ); return HANDLETOATOM( entry );

4
memory/environ.c
View File

@ -95,7 +95,7 @@ static LPCSTR ENV_FindVariable( LPCSTR env, LPCSTR name, INT len )
{ {
while (*env) while (*env)
{ {
if (!lstrncmpiA( name, env, len ) && (env[len] == '=')) if (!strncasecmp( name, env, len ) && (env[len] == '='))
return env + len + 1; return env + len + 1;
env += strlen(env) + 1; env += strlen(env) + 1;
} }
@ -284,7 +284,7 @@ BOOL WINAPI SetEnvironmentVariableA( LPCSTR name, LPCSTR value )
len = strlen(name); len = strlen(name);
while (*p) while (*p)
{ {
if (!lstrncmpiA( name, p, len ) && (p[len] == '=')) break; if (!strncasecmp( name, p, len ) && (p[len] == '=')) break;
p += strlen(p) + 1; p += strlen(p) + 1;
} }
if (!value && !*p) goto done; /* Value to remove doesn't exist */ if (!value && !*p) goto done; /* Value to remove doesn't exist */

1
memory/registry.c
View File

@ -21,6 +21,7 @@
#include "winerror.h" #include "winerror.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "server.h" #include "server.h"
#include "debugtools.h" #include "debugtools.h"

1
memory/virtual.c
View File

@ -20,6 +20,7 @@
#ifdef HAVE_SYS_MMAN_H #ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "wine/exception.h" #include "wine/exception.h"
#include "wine/unicode.h" #include "wine/unicode.h"

1
misc/cdrom.c
View File

@ -17,6 +17,7 @@
#include "drive.h" #include "drive.h"
#include "debugtools.h" #include "debugtools.h"
#include "winbase.h" #include "winbase.h"
#include "wine/winestring.h"
DEFAULT_DEBUG_CHANNEL(cdrom); DEFAULT_DEBUG_CHANNEL(cdrom);

8
misc/comm.c
View File

@ -359,7 +359,7 @@ BOOL16 WINAPI BuildCommDCB16(LPCSTR device, LPDCB16 lpdcb)
TRACE("(%s), ptr %p\n", device, lpdcb); TRACE("(%s), ptr %p\n", device, lpdcb);
if (!lstrncmpiA(device,"COM",3)) { if (!strncasecmp(device,"COM",3)) {
port = device[3] - '0'; port = device[3] - '0';
@ -456,7 +456,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
if (port-- == 0) if (port-- == 0)
ERR("BUG ! COM0 or LPT0 don't exist !\n"); ERR("BUG ! COM0 or LPT0 don't exist !\n");
if (!lstrncmpiA(device,"COM",3)) { if (!strncasecmp(device,"COM",3)) {
TRACE("%s = %s\n", device, COM[port].devicename); TRACE("%s = %s\n", device, COM[port].devicename);
@ -519,7 +519,7 @@ INT16 WINAPI OpenComm16(LPCSTR device,UINT16 cbInQueue,UINT16 cbOutQueue)
} }
} }
else else
if (!lstrncmpiA(device,"LPT",3)) { if (!strncasecmp(device,"LPT",3)) {
if (!ValidLPTPort(port)) if (!ValidLPTPort(port))
return IE_BADID; return IE_BADID;
@ -1478,7 +1478,7 @@ BOOL WINAPI BuildCommDCBAndTimeoutsA(LPCSTR device, LPDCB lpdcb,
TRACE("(%s,%p,%p)\n",device,lpdcb,lptimeouts); TRACE("(%s,%p,%p)\n",device,lpdcb,lptimeouts);
if (!lstrncmpiA(device,"COM",3)) { if (!strncasecmp(device,"COM",3)) {
port=device[3]-'0'; port=device[3]-'0';
if (port--==0) { if (port--==0) {
ERR("BUG! COM0 can't exists!.\n"); ERR("BUG! COM0 can't exists!.\n");

18
misc/cpu.c
View File

@ -102,7 +102,7 @@ VOID WINAPI GetSystemInfo(
*s='\0'; *s='\0';
/* 2.1 method */ /* 2.1 method */
if (!lstrncmpiA(line, "cpu family",strlen("cpu family"))) { if (!strncasecmp(line, "cpu family",strlen("cpu family"))) {
if (isdigit (value[0])) { if (isdigit (value[0])) {
switch (value[0] - '0') { switch (value[0] - '0') {
case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386; case 3: cachedsi.dwProcessorType = PROCESSOR_INTEL_386;
@ -128,7 +128,7 @@ VOID WINAPI GetSystemInfo(
continue; continue;
} }
/* old 2.0 method */ /* old 2.0 method */
if (!lstrncmpiA(line, "cpu",strlen("cpu"))) { if (!strncasecmp(line, "cpu",strlen("cpu"))) {
if ( isdigit (value[0]) && value[1] == '8' && if ( isdigit (value[0]) && value[1] == '8' &&
value[2] == '6' && value[3] == 0 value[2] == '6' && value[3] == 0
) { ) {
@ -155,19 +155,19 @@ VOID WINAPI GetSystemInfo(
RegSetValueExA(xhkey,"Identifier",0,REG_SZ,buf,strlen(buf)); RegSetValueExA(xhkey,"Identifier",0,REG_SZ,buf,strlen(buf));
continue; continue;
} }
if (!lstrncmpiA(line,"fdiv_bug",strlen("fdiv_bug"))) { if (!strncasecmp(line,"fdiv_bug",strlen("fdiv_bug"))) {
if (!lstrncmpiA(value,"yes",3)) if (!strncasecmp(value,"yes",3))
PF[PF_FLOATING_POINT_PRECISION_ERRATA] = TRUE; PF[PF_FLOATING_POINT_PRECISION_ERRATA] = TRUE;
continue; continue;
} }
if (!lstrncmpiA(line,"fpu",strlen("fpu"))) { if (!strncasecmp(line,"fpu",strlen("fpu"))) {
if (!lstrncmpiA(value,"no",2)) if (!strncasecmp(value,"no",2))
PF[PF_FLOATING_POINT_EMULATED] = TRUE; PF[PF_FLOATING_POINT_EMULATED] = TRUE;
continue; continue;
} }
if (!lstrncmpiA(line,"processor",strlen("processor"))) { if (!strncasecmp(line,"processor",strlen("processor"))) {
/* processor number counts up...*/ /* processor number counts up...*/
int x; int x;
@ -183,13 +183,13 @@ VOID WINAPI GetSystemInfo(
RegCloseKey(xhkey); RegCloseKey(xhkey);
RegCreateKey16(hkey,buf,&xhkey); RegCreateKey16(hkey,buf,&xhkey);
} }
if (!lstrncmpiA(line,"stepping",strlen("stepping"))) { if (!strncasecmp(line,"stepping",strlen("stepping"))) {
int x; int x;
if (sscanf(value,"%d",&x)) if (sscanf(value,"%d",&x))
cachedsi.wProcessorRevision = x; cachedsi.wProcessorRevision = x;
} }
if (!lstrncmpiA(line,"flags",strlen("flags"))) { if (!strncasecmp(line,"flags",strlen("flags"))) {
if (strstr(value,"cx8")) if (strstr(value,"cx8"))
PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; PF[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE;
if (strstr(value,"mmx")) if (strstr(value,"mmx"))

8
misc/main.c
View File

@ -61,7 +61,7 @@ void MAIN_ParseDebugOptions( const char *arg )
int j; int j;
for(j=0; j<DEBUG_CLASS_COUNT; j++) for(j=0; j<DEBUG_CLASS_COUNT; j++)
if(!lstrncmpiA(options, debug_cl_name[j], strlen(debug_cl_name[j]))) if(!strncasecmp(options, debug_cl_name[j], strlen(debug_cl_name[j])))
break; break;
if(j==DEBUG_CLASS_COUNT) if(j==DEBUG_CLASS_COUNT)
goto error; goto error;
@ -78,7 +78,7 @@ void MAIN_ParseDebugOptions( const char *arg )
else else
l=strlen(options); l=strlen(options);
if (!lstrncmpiA(options+1,"all",l-1)) if (!strncasecmp(options+1,"all",l-1))
{ {
int i, j; int i, j;
for (i=0; i<DEBUG_CHANNEL_COUNT; i++) for (i=0; i<DEBUG_CHANNEL_COUNT; i++)
@ -86,8 +86,8 @@ void MAIN_ParseDebugOptions( const char *arg )
if(cls == -1 || cls == j) if(cls == -1 || cls == j)
__SET_DEBUGGING( j, debug_channels[i], (*options=='+') ); __SET_DEBUGGING( j, debug_channels[i], (*options=='+') );
} }
else if (!lstrncmpiA(options+1, "relay=", 6) || else if (!strncasecmp(options+1, "relay=", 6) ||
!lstrncmpiA(options+1, "snoop=", 6)) !strncasecmp(options+1, "snoop=", 6))
{ {
int i, j; int i, j;
char *s, *s2, ***output, c; char *s, *s2, ***output, c;

1
misc/version.c
View File

@ -15,6 +15,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winestring.h"
#include "process.h" #include "process.h"
#include "options.h" #include "options.h"
#include "debugtools.h" #include "debugtools.h"

1
ole/ole2nls.c
View File

@ -15,6 +15,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "options.h" #include "options.h"
#include "winver.h" #include "winver.h"

1
scheduler/event.c
View File

@ -7,6 +7,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "winerror.h" #include "winerror.h"
#include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "syslevel.h" #include "syslevel.h"
#include "server.h" #include "server.h"

1
scheduler/mutex.c
View File

@ -7,6 +7,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "winerror.h" #include "winerror.h"
#include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "server.h" #include "server.h"

1
scheduler/semaphore.c
View File

@ -7,6 +7,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "winerror.h" #include "winerror.h"
#include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "server.h" #include "server.h"

1
scheduler/timer.c
View File

@ -7,6 +7,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include "winerror.h" #include "winerror.h"
#include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "file.h" /* for FILETIME routines */ #include "file.h" /* for FILETIME routines */
#include "server.h" #include "server.h"

1
win32/console.c
View File

@ -39,6 +39,7 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winestring.h"
#include "wine/keyboard16.h" #include "wine/keyboard16.h"
#include "thread.h" #include "thread.h"
#include "file.h" #include "file.h"

1
windows/clipboard.c
View File

@ -28,6 +28,7 @@
#include "winuser.h" #include "winuser.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "message.h" #include "message.h"
#include "task.h" #include "task.h"

1
windows/defwnd.c
View File

@ -23,6 +23,7 @@
#include "winnls.h" #include "winnls.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winestring.h"
DEFAULT_DEBUG_CHANNEL(win); DEFAULT_DEBUG_CHANNEL(win);

1
windows/dialog.c
View File

@ -17,6 +17,7 @@
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/winestring.h"
#include "dialog.h" #include "dialog.h"
#include "drive.h" #include "drive.h"
#include "heap.h" #include "heap.h"

1
windows/input.c
View File

@ -20,6 +20,7 @@
#include "winuser.h" #include "winuser.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winestring.h"
#include "wine/keyboard16.h" #include "wine/keyboard16.h"
#include "win.h" #include "win.h"
#include "heap.h" #include "heap.h"

1
windows/msgbox.c
View File

@ -10,6 +10,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "wine/winbase16.h" #include "wine/winbase16.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winestring.h"
#include "dlgs.h" #include "dlgs.h"
#include "heap.h" #include "heap.h"
#include "ldt.h" #include "ldt.h"

1
windows/sysparams.c
View File

@ -12,6 +12,7 @@
#include "wingdi.h" #include "wingdi.h"
#include "winreg.h" #include "winreg.h"
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "wine/winestring.h"
#include "winerror.h" #include "winerror.h"
#include "keyboard.h" #include "keyboard.h"

2
windows/user.c
View File

@ -10,6 +10,7 @@
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "winuser.h" #include "winuser.h"
#include "wine/winestring.h"
#include "heap.h" #include "heap.h"
#include "user.h" #include "user.h"
#include "task.h" #include "task.h"
@ -24,7 +25,6 @@
#include "message.h" #include "message.h"
#include "module.h" #include "module.h"
#include "miscemu.h" #include "miscemu.h"
#include "shell.h"
#include "sysmetrics.h" #include "sysmetrics.h"
#include "callback.h" #include "callback.h"
#include "local.h" #include "local.h"