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

Small dll interfaces cleanups.

This commit is contained in:
Alexandre Julliard 2000-08-08 20:49:16 +00:00
parent 22a969ba7e
commit 691171b8e6
21 changed files with 56 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/Makefile.in
View File

@ -394,12 +394,14 @@ oleaut32/liboleaut32.so: libole32.so libgdi32.so libkernel32.so
olecli/libolecli32.so: libole32.so libolesvr32.so libgdi32.so
olepro32/libolepro32.so: liboleaut32.so
opengl32/libopengl32.so: libx11drv.so
psapi/libpsapi.so: libkernel32.so
richedit/libriched32.so: libuser32.so libkernel32.so
serialui/libserialui.so: libuser32.so libadvapi32.so libkernel32.so
setupapi/libsetupapi.so: libkernel32.so
shell32/libshell32.so: libole32.so libshlwapi.so libcomctl32.so libadvapi32.so libuser32.so libgdi32.so libkernel32.so
shfolder/libshfolder.so: libshell32.so
shlwapi/libshlwapi.so: libadvapi32.so libuser32.so libkernel32.so
tapi32/libtapi32.so: libkernel32.so
ttydrv/libttydrv.so: libuser32.so libgdi32.so libkernel32.so
urlmon/liburlmon.so: libole32.so
user/libuser32.so: libgdi32.so libkernel32.so

10
dlls/commdlg/fontdlg.c
View File

@ -323,7 +323,7 @@ INT16 WINAPI FontFamilyEnumProc16( SEGPTR logfont, SEGPTR metrics,
UINT16 nFontType, LPARAM lParam )
{
HWND16 hwnd=LOWORD(lParam);
HWND16 hDlg=GetParent16(hwnd);
HWND hDlg=GetParent(hwnd);
LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);
LOGFONT16 *lplf = (LOGFONT16 *)PTR_SEG_TO_LIN( logfont );
LOGFONTA lf32a;
@ -347,8 +347,8 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, LPLOGFONTA lplf)
static struct FONTSTYLE fontstyles[FSTYLES]={
{ 0,FW_NORMAL,"Regular"},{0,FW_BOLD,"Bold"},
{ 1,FW_NORMAL,"Italic"}, {1,FW_BOLD,"Bold Italic"}};
HFONT16 hf;
TEXTMETRIC16 tm;
HFONT hf;
TEXTMETRICA tm;
int i,j;
for (i=0;i<FSTYLES;i++)
@ -357,7 +357,7 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, LPLOGFONTA lplf)
lplf->lfWeight=fontstyles[i].weight;
hf=CreateFontIndirectA(lplf);
hf=SelectObject(hdc,hf);
GetTextMetrics16(hdc,&tm);
GetTextMetricsA(hdc,&tm);
hf=SelectObject(hdc,hf);
DeleteObject(hf);
@ -454,7 +454,7 @@ INT16 WINAPI FontStyleEnumProc16( SEGPTR logfont, SEGPTR metrics,
{
HWND16 hcmb2=LOWORD(lParam);
HWND16 hcmb3=HIWORD(lParam);
HWND16 hDlg=GetParent16(hcmb3);
HWND hDlg=GetParent(hcmb3);
LPCHOOSEFONT16 lpcf=(LPCHOOSEFONT16)GetWindowLongA(hDlg, DWL_USER);
LOGFONT16 *lplf = (LOGFONT16 *)PTR_SEG_TO_LIN(logfont);
LOGFONTA lf32a;

4
dlls/commdlg/printdlg.c
View File

@ -1055,7 +1055,7 @@ LRESULT WINAPI PrintDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
{
case WM_INITDIALOG:
TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
ShowWindow16(hWnd, SW_SHOWNORMAL);
ShowWindow(hWnd, SW_SHOWNORMAL);
return (TRUE);
case WM_COMMAND:
switch (wParam)
@ -1083,7 +1083,7 @@ LRESULT WINAPI PrintSetupDlgProc16(HWND16 hWnd, UINT16 wMsg, WPARAM16 wParam,
{
case WM_INITDIALOG:
TRACE("WM_INITDIALOG lParam=%08lX\n", lParam);
ShowWindow16(hWnd, SW_SHOWNORMAL);
ShowWindow(hWnd, SW_SHOWNORMAL);
return (TRUE);
case WM_COMMAND:
switch (wParam) {

3
dlls/kernel/Makefile.in
View File

@ -23,6 +23,9 @@ RC_SRCS = \
MC_SRCS = \
messages/winerr_enu.mc
EXTRASUBDIRS = \
messages
@MAKE_DLL_RULES@
depend $(RC_SRCS:.rc=.s): $(MC_SRCS:.mc=.rc)

2
dlls/kernel/kernel.spec
View File

@ -121,7 +121,7 @@ owner kernel32
112 pascal16 GlobalUnWire(word) GlobalUnWire16
113 equate __AHSHIFT 3
114 equate __AHINCR 8
115 pascal16 OutputDebugString(str) OutputDebugString16
115 pascal16 OutputDebugString(str) OutputDebugStringA
116 stub InitLib
117 pascal16 OldYield() OldYield16
118 pascal16 GetTaskQueueDS() GetTaskQueueDS16

4
dlls/lzexpand/lzexpand_main.c
View File

@ -323,7 +323,7 @@ INT WINAPI GetExpandedNameW( LPCWSTR in, LPWSTR out )
INT16 WINAPI LZRead16( HFILE16 fd, LPVOID buf, UINT16 toread )
{
if (IS_LZ_HANDLE(fd)) return LZRead( fd, buf, toread );
return _lread16( fd, buf, toread );
return _lread( FILE_GetHandle(fd), buf, toread );
}
@ -424,7 +424,7 @@ INT WINAPI LZRead( HFILE fd, LPVOID vbuf, UINT toread )
LONG WINAPI LZSeek16( HFILE16 fd, LONG off, INT16 type )
{
if (IS_LZ_HANDLE(fd)) return LZSeek( fd, off, type );
return _llseek16( fd, off, type );
return _llseek( FILE_GetHandle(fd), off, type );
}

6
dlls/msacm/driver.c
View File

@ -7,6 +7,8 @@
* 1999 Eric Pouech
*/
#include <stdio.h>
#include "winbase.h"
#include "winerror.h"
#include "windef.h"
@ -20,7 +22,7 @@
#include "wineacm.h"
#include "winreg.h"
DEFAULT_DEBUG_CHANNEL(msacm)
DEFAULT_DEBUG_CHANNEL(msacm);
/***********************************************************************
* acmDriverAddA (MSACM32.2)
@ -311,7 +313,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd
return MMSYSERR_ERROR;
for (dwPriorityCounter = 1; ; dwPriorityCounter++) {
wsnprintfA(szSubKey, 17, "Priorty%ld", dwPriorityCounter);
snprintf(szSubKey, 17, "Priorty%ld", dwPriorityCounter);
lError = RegQueryValueA(hPriorityKey, szSubKey, szBuffer, &lBufferLength);
if (lError != ERROR_SUCCESS)
break;

2
dlls/ole32/ole2.c
View File

@ -2108,7 +2108,7 @@ HGLOBAL16 WINAPI OleMetaFilePictFromIconAndLabel16(
hdc = CreateMetaFile16(NULL);
DrawIcon(hdc, 0, 0, hIcon); /* FIXME */
TextOut16(hdc, 0, 0, lpszLabel, 1); /* FIXME */
TextOutA(hdc, 0, 0, lpszLabel, 1); /* FIXME */
hmf = GlobalAlloc16(0, sizeof(METAFILEPICT16));
mf = (METAFILEPICT16 *)GlobalLock16(hmf);
mf->mm = MM_ANISOTROPIC;

5
dlls/oleaut32/typelib.c
View File

@ -31,7 +31,6 @@
#include "winerror.h"
#include "winreg.h" /* for HKEY_LOCAL_MACHINE */
#include "winnls.h" /* for PRIMARYLANGID */
#include "wine/winbase16.h" /* for RegQueryValue16(HKEY,LPSTR,LPSTR,LPDWORD) */
#include "heap.h"
#include "wine/obj_base.h"
#include "debugtools.h"
@ -74,7 +73,7 @@ QueryPathOfRegTypeLib16(
return E_FAIL;
}
plen = sizeof(pathname);
if (RegQueryValue16(HKEY_LOCAL_MACHINE,typelibkey,pathname,&plen)) {
if (RegQueryValueA(HKEY_LOCAL_MACHINE,typelibkey,pathname,&plen)) {
/* try again without lang specific id */
if (SUBLANGID(lcid))
return QueryPathOfRegTypeLib16(guid,wMaj,wMin,PRIMARYLANGID(lcid),path);
@ -116,7 +115,7 @@ QueryPathOfRegTypeLib(
return E_FAIL;
}
plen = sizeof(pathname);
if (RegQueryValue16(HKEY_LOCAL_MACHINE,typelibkey,pathname,&plen)) {
if (RegQueryValueA(HKEY_LOCAL_MACHINE,typelibkey,pathname,&plen)) {
/* try again without lang specific id */
if (SUBLANGID(lcid))
return QueryPathOfRegTypeLib(guid,wMaj,wMin,PRIMARYLANGID(lcid),path);

1
dlls/psapi/Makefile.in
View File

@ -4,6 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = psapi
SOVERSION = 1.0
IMPORTS = kernel32
C_SRCS = \
psapi_main.c

2
dlls/psapi/psapi.spec
View File

@ -1,6 +1,8 @@
name psapi
type win32
import kernel32.dll
@ stdcall EmptyWorkingSet(long) EmptyWorkingSet
@ stdcall EnumDeviceDrivers(ptr long ptr) EnumDeviceDrivers
@ stdcall EnumProcessModules(long ptr long ptr) EnumProcessModules

5
dlls/richedit/reader.c
View File

@ -74,6 +74,7 @@
#include <stdlib.h>
#include "charlist.h"
#include "windows.h"
#include "debugtools.h"
extern HANDLE RICHED32_hHeap;
@ -2807,7 +2808,7 @@ static void
DefaultMsgProc (s)
char *s;
{
fprintf (stderr, "%s", s);
MESSAGE( "%s", s);
}
@ -2899,7 +2900,7 @@ static void
DefaultPanicProc (s)
char *s;
{
fprintf (stderr, "%s", s);
MESSAGE( "%s", s);
/*exit (1);*/
}

9
dlls/serialui/confdlg.c
View File

@ -15,6 +15,7 @@
*/
#include <string.h>
#include <stdio.h>
#include "winbase.h"
#include "winreg.h"
@ -27,7 +28,7 @@
#include "queue.h"
#include "message.h"
DEFAULT_DEBUG_CHANNEL(comm)
DEFAULT_DEBUG_CHANNEL(comm);
HMODULE SERIALUI_hModule = 0;
DWORD SERIALUI_dwProcessesAttached = 0;
@ -347,7 +348,7 @@ BOOL WINAPI SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
if(!info)
return FALSE;
SetWindowLongA(hWnd, DWL_USER, lParam);
wsnprintfA(szTitle, sizeof szTitle, "Settings for %s", info->lpszDevice);
snprintf(szTitle, sizeof szTitle, "Settings for %s", info->lpszDevice);
SetWindowTextA(hWnd, szTitle);
SERIALUI_DCBToDialogInfo(hWnd, info);
return TRUE;
@ -455,7 +456,7 @@ BOOL WINAPI SERIALUI_SetDefaultCommConfig(
if(r != ERROR_SUCCESS)
return FALSE;
wsnprintfA(szKeyName, sizeof szKeyName, "%s\\%s", lpszCommKey ,lpszDevice);
snprintf(szKeyName, sizeof szKeyName, "%s\\%s", lpszCommKey ,lpszDevice);
r = RegCreateKeyA(hKeyReg, szKeyName, &hKeyPort);
if(r == ERROR_SUCCESS)
{
@ -507,7 +508,7 @@ BOOL WINAPI SERIALUI_GetDefaultCommConfig(
if(r != ERROR_SUCCESS)
return FALSE;
wsnprintfA(szKeyName, sizeof szKeyName, "%s\\%s", lpszCommKey ,lpszDevice);
snprintf(szKeyName, sizeof szKeyName, "%s\\%s", lpszCommKey ,lpszDevice);
r = RegOpenKeyA(hKeyReg, szKeyName, &hKeyPort);
if(r == ERROR_SUCCESS)
{

12
dlls/shell32/shell32.spec
View File

@ -249,14 +249,14 @@ import kernel32.dll
298 stdcall Shell_NotifyIconW(long ptr) Shell_NotifyIconW
299 stub Shl1632_ThunkData32
300 stub Shl3216_ThunkData32
301 stdcall StrChrA (str long) StrChrA
301 forward StrChrA shlwapi.StrChrA
302 stub StrChrIA
303 stub StrChrIW
304 stdcall StrChrW (wstr long) StrChrW
305 stdcall StrCmpNA(str str long) StrCmpNA
306 stdcall StrCmpNIA (str str long) StrCmpNIA
307 stdcall StrCmpNIW (wstr wstr long) StrCmpNIW
308 stdcall StrCmpNW (wstr wstr long) StrCmpNW
304 forward StrChrW shlwapi.StrChrW
305 forward StrCmpNA shlwapi.StrCmpNA
306 forward StrCmpNIA shlwapi.StrCmpNIA
307 forward StrCmpNIW shlwapi.StrCmpNIW
308 forward StrCmpNW shlwapi.StrCmpNW
309 stdcall StrCpyNA (ptr str long) lstrcpynA
310 stdcall StrCpyNW (ptr wstr long)lstrcpynW
311 stub StrNCmpA

57
dlls/shell32/shellstring.c
View File

@ -42,63 +42,6 @@ HRESULT WINAPI StrRetToStrNAW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIS
return StrRetToStrNA (dest, len, src, pidl);
}
/************************* string functions ****************************/
/*************************************************************************
* StrChrA [SHLWAPI]
*/
LPSTR WINAPI StrChrA (LPCSTR str, INT c)
{
TRACE("%s %i\n", str,c);
return strchr(str, c);
}
/*************************************************************************
* StrChrW [NT 4.0:SHELL32.651]
*
*/
LPWSTR WINAPI StrChrW (LPWSTR str, WCHAR x )
{
TRACE("%s 0x%04x\n",debugstr_w(str),x);
return strchrW(str, x);
}
/*************************************************************************
* StrCmpNA [NT 4.0:SHELL32.*]
*/
INT WINAPI StrCmpNA ( LPCSTR str1, LPCSTR str2, INT len)
{
TRACE("%s %s %i stub\n", str1,str2,len);
return strncmp(str1, str2, len);
}
/*************************************************************************
* StrCmpNW [NT 4.0:SHELL32.*]
*/
INT WINAPI StrCmpNW ( LPCWSTR wstr1, LPCWSTR wstr2, INT len)
{
TRACE("%s %s %i stub\n", debugstr_w(wstr1),debugstr_w(wstr2),len);
return strncmpW(wstr1, wstr2, len);
}
/*************************************************************************
* StrCmpNIA [NT 4.0:SHELL32.*]
*/
int WINAPI StrCmpNIA ( LPCSTR str1, LPCSTR str2, int len)
{
TRACE("%s %s %i stub\n", str1,str2,len);
return strncasecmp(str1, str2, len);
}
/*************************************************************************
* StrCmpNIW [NT 4.0:SHELL32.*]
*/
int WINAPI StrCmpNIW ( LPCWSTR wstr1, LPCWSTR wstr2, int len)
{
TRACE("%s %s %i stub\n", debugstr_w(wstr1),debugstr_w(wstr2),len);
return strncmpiW(wstr1, wstr2, len);
}
/************************* OLESTR functions ****************************/
/************************************************************************

1
dlls/tapi32/Makefile.in
View File

@ -4,6 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = tapi32
SOVERSION = 1.0
IMPORTS = kernel32
C_SRCS = \
assisted.c \

24
dlls/tapi32/line.c
View File

@ -315,10 +315,10 @@ DWORD WINAPI lineGetCountry(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTRY
if(dwCountryID && (TAPI_LCList[i].dwCountryID != dwCountryID))
continue;
len = lstrlenA (TAPI_LCList[i].lpCountryName)+1;
len += lstrlenA (TAPI_LCList[i].lpSameAreaRule)+1;
len += lstrlenA (TAPI_LCList[i].lpLongDistanceRule)+1;
len += lstrlenA (TAPI_LCList[i].lpInternationalRule)+1;
len = strlen (TAPI_LCList[i].lpCountryName)+1;
len += strlen (TAPI_LCList[i].lpSameAreaRule)+1;
len += strlen (TAPI_LCList[i].lpLongDistanceRule)+1;
len += strlen (TAPI_LCList[i].lpInternationalRule)+1;
if(dwAvailSize<(dwOffset+len))
{
@ -342,35 +342,35 @@ DWORD WINAPI lineGetCountry(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTRY
lpLCE[i].dwNextCountryID = TAPI_LCList[i+1].dwCountryID;
/* add country name */
len = lstrlenA(TAPI_LCList[i].lpCountryName)+1;
len = strlen(TAPI_LCList[i].lpCountryName)+1;
lpLCE[i].dwCountryNameSize = len;
lpLCE[i].dwCountryNameOffset = dwOffset;
lpstr = ((LPSTR)lpLineCountryList)+dwOffset;
lstrcpyA(lpstr, TAPI_LCList[i].lpCountryName);
strcpy(lpstr, TAPI_LCList[i].lpCountryName);
dwOffset+=len;
/* add Same Area Rule */
len = lstrlenA (TAPI_LCList[i].lpSameAreaRule)+1;
len = strlen (TAPI_LCList[i].lpSameAreaRule)+1;
lpLCE[i].dwSameAreaRuleSize = len;
lpLCE[i].dwSameAreaRuleOffset = dwOffset;
lpstr = ((LPSTR)lpLineCountryList)+dwOffset;
lstrcpyA(lpstr, TAPI_LCList[i].lpSameAreaRule);
strcpy(lpstr, TAPI_LCList[i].lpSameAreaRule);
dwOffset+=len;
/* add Long Distance Rule */
len = lstrlenA (TAPI_LCList[i].lpLongDistanceRule)+1;
len = strlen (TAPI_LCList[i].lpLongDistanceRule)+1;
lpLCE[i].dwLongDistanceRuleSize = len;
lpLCE[i].dwLongDistanceRuleOffset = dwOffset;
lpstr = ((LPSTR)lpLineCountryList)+dwOffset;
lstrcpyA(lpstr, TAPI_LCList[i].lpLongDistanceRule);
strcpy(lpstr, TAPI_LCList[i].lpLongDistanceRule);
dwOffset+=len;
/* add Long Distance Rule */
len = lstrlenA (TAPI_LCList[i].lpInternationalRule)+1;
len = strlen (TAPI_LCList[i].lpInternationalRule)+1;
lpLCE[i].dwInternationalRuleSize = len;
lpLCE[i].dwInternationalRuleOffset = dwOffset;
lpstr = ((LPSTR)lpLineCountryList)+dwOffset;
lstrcpyA(lpstr, TAPI_LCList[i].lpInternationalRule);
strcpy(lpstr, TAPI_LCList[i].lpInternationalRule);
dwOffset+=len;
}

2
dlls/tapi32/tapi32.spec
View File

@ -1,6 +1,8 @@
name tapi32
type win32
import kernel32.dll
@ stdcall lineAccept(long str long) lineAccept
@ stdcall lineAddProvider(str long ptr) lineAddProvider
@ stdcall lineAddToConference(long long) lineAddToConference

2
dlls/winmm/mmsystem.c
View File

@ -1737,7 +1737,7 @@ UINT16 WINAPI MCI_DefYieldProc(UINT16 wDevID, DWORD data)
TRACE("(0x%04x, 0x%08lx)\n", wDevID, data);
if ((HIWORD(data) != 0 && GetActiveWindow16() != HIWORD(data)) ||
if ((HIWORD(data) != 0 && GetActiveWindow() != HIWORD(data)) ||
(GetAsyncKeyState(LOWORD(data)) & 1) == 0) {
UserYield16();
ret = 0;

2
dlls/winmm/mmsystem.spec
View File

@ -8,7 +8,7 @@ owner winmm
5 pascal mmsystemGetVersion() mmsystemGetVersion16
6 pascal DriverProc(long word word long long) DriverProc16
8 pascal WMMMIDIRUNONCE() WMMMidiRunOnce16
30 pascal16 OutputDebugStr(str) OutputDebugString16
30 pascal16 OutputDebugStr(str) OutputDebugStringA
31 pascal DriverCallback(long word word word long long long) DriverCallback16
32 pascal StackEnter() StackEnter16
33 pascal StackLeave() StackLeave16

1
include/wine/winbase16.h
View File

@ -167,7 +167,6 @@ BOOL16 WINAPI LocalUnlock16(HLOCAL16);
LPVOID WINAPI LockResource16(HGLOBAL16);
HGLOBAL16 WINAPI LockSegment16(HGLOBAL16);
FARPROC16 WINAPI MakeProcInstance16(FARPROC16,HANDLE16);
VOID WINAPI OutputDebugString16(LPCSTR);
DWORD WINAPI RegCloseKey16(HKEY);
DWORD WINAPI RegCreateKey16(HKEY,LPCSTR,LPHKEY);
DWORD WINAPI RegDeleteKey16(HKEY,LPCSTR);