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

- Win16/32 cleanup. 

- Fixes for building with the PSDK.
This commit is contained in:
Steven Edwards 2003-10-21 23:45:43 +00:00 committed by Alexandre Julliard
parent c33e4c4723
commit f508a78509
6 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/setupapi/Makefile.in
View File

@ -13,7 +13,6 @@ SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
C_SRCS = \ C_SRCS = \
devinst.c \ devinst.c \
dirid.c \ dirid.c \
infparse.c \
install.c \ install.c \
parser.c \ parser.c \
queue.c \ queue.c \
@ -22,6 +21,7 @@ C_SRCS = \
C_SRCS16 = \ C_SRCS16 = \
devinst16.c \ devinst16.c \
infparse.c \
setupx_main.c \ setupx_main.c \
virtcopy.c virtcopy.c

1
dlls/setupapi/infparse.c
View File

@ -36,6 +36,7 @@
#include "winuser.h" #include "winuser.h"
#include "winnls.h" #include "winnls.h"
#include "setupapi.h" #include "setupapi.h"
#include "setupx16.h"
#include "setupapi_private.h" #include "setupapi_private.h"
#include "wine/debug.h" #include "wine/debug.h"

15
dlls/setupapi/setupapi_private.h
View File

@ -19,9 +19,6 @@
#ifndef __SETUPAPI_PRIVATE_H #ifndef __SETUPAPI_PRIVATE_H
#define __SETUPAPI_PRIVATE_H #define __SETUPAPI_PRIVATE_H
#include "wine/windef16.h"
#include "setupx16.h"
#define COPYFILEDLGORD 1000 #define COPYFILEDLGORD 1000
#define SOURCESTRORD 500 #define SOURCESTRORD 500
#define DESTSTRORD 501 #define DESTSTRORD 501
@ -32,18 +29,6 @@
#define REGPART_RENAME "\\Rename" #define REGPART_RENAME "\\Rename"
#define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager" #define REG_VERSIONCONFLICT "Software\\Microsoft\\VersionConflictManager"
typedef struct tagLDD_LIST {
LPLOGDISKDESC pldd;
struct tagLDD_LIST *next;
} LDD_LIST;
#define INIT_LDD(ldd, LDID) \
do { \
memset(&(ldd), 0, sizeof(LOGDISKDESC_S)); \
(ldd).cbSize = sizeof(LOGDISKDESC_S); \
ldd.ldid = LDID; \
} while(0)
/* string substitutions */ /* string substitutions */
struct inf_file; struct inf_file;

8
dlls/setupapi/setupcab.c
View File

@ -254,9 +254,9 @@ static long sc_cb_lseek(INT_PTR hf, long dist, int seektype)
static INT_PTR sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) static INT_PTR sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
{ {
FILE_IN_CABINET_INFOA fici; FILE_IN_CABINET_INFO_A fici;
PSC_HSC_A phsc; PSC_HSC_A phsc;
CABINET_INFOA ci; CABINET_INFO_A ci;
FILEPATHS_A fp; FILEPATHS_A fp;
UINT err; UINT err;
@ -375,9 +375,9 @@ static INT_PTR sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
static INT_PTR sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin) static INT_PTR sc_FNNOTIFY_W(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION pfdin)
{ {
FILE_IN_CABINET_INFOW fici; FILE_IN_CABINET_INFO_W fici;
PSC_HSC_W phsc; PSC_HSC_W phsc;
CABINET_INFOW ci; CABINET_INFO_W ci;
FILEPATHS_W fp; FILEPATHS_W fp;
UINT err; UINT err;
int len; int len;

12
dlls/setupapi/setupx16.h
View File

@ -547,4 +547,16 @@ extern RETERR16 WINAPI CtlDelLdd16(LOGDISKID16);
extern RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath); extern RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath);
extern RETERR16 WINAPI GenInstall16(HINF16,LPCSTR,WORD); extern RETERR16 WINAPI GenInstall16(HINF16,LPCSTR,WORD);
typedef struct tagLDD_LIST {
LPLOGDISKDESC pldd;
struct tagLDD_LIST *next;
} LDD_LIST;
#define INIT_LDD(ldd, LDID) \
do { \
memset(&(ldd), 0, sizeof(LOGDISKDESC_S)); \
(ldd).cbSize = sizeof(LOGDISKDESC_S); \
ldd.ldid = LDID; \
} while(0)
#endif /* __SETUPX16_H */ #endif /* __SETUPX16_H */

16
include/setupapi.h
View File

@ -155,7 +155,7 @@ typedef WINELIB_NAME_AW(SP_DEVICE_INTERFACE_DETAIL_DATA_) SP_DEVICE_INTERFACE_DE
typedef WINELIB_NAME_AW(PSP_DEVICE_INTERFACE_DETAIL_DATA_) PSP_DEVICE_INTERFACE_DETAIL_DATA; typedef WINELIB_NAME_AW(PSP_DEVICE_INTERFACE_DETAIL_DATA_) PSP_DEVICE_INTERFACE_DETAIL_DATA;
#endif #endif
typedef struct _FILE_IN_CABINET_INFOA { typedef struct _FILE_IN_CABINET_INFO_A {
LPCSTR NameInCabinet; LPCSTR NameInCabinet;
DWORD FileSize; DWORD FileSize;
DWORD Win32Error; DWORD Win32Error;
@ -163,9 +163,9 @@ typedef struct _FILE_IN_CABINET_INFOA {
WORD DosTime; WORD DosTime;
WORD DosAttribs; WORD DosAttribs;
CHAR FullTargetName[MAX_PATH]; CHAR FullTargetName[MAX_PATH];
} FILE_IN_CABINET_INFOA, *PFILE_IN_CABINET_INFOA; } FILE_IN_CABINET_INFO_A, *PFILE_IN_CABINET_INFO_A;
typedef struct _FILE_IN_CABINET_INFOW { typedef struct _FILE_IN_CABINET_INFO_W {
LPCWSTR NameInCabinet; LPCWSTR NameInCabinet;
DWORD FileSize; DWORD FileSize;
DWORD Win32Error; DWORD Win32Error;
@ -173,26 +173,26 @@ typedef struct _FILE_IN_CABINET_INFOW {
WORD DosTime; WORD DosTime;
WORD DosAttribs; WORD DosAttribs;
WCHAR FullTargetName[MAX_PATH]; WCHAR FullTargetName[MAX_PATH];
} FILE_IN_CABINET_INFOW, *PFILE_IN_CABINET_INFOW; } FILE_IN_CABINET_INFO_W, *PFILE_IN_CABINET_INFO_W;
DECL_WINELIB_TYPE_AW(FILE_IN_CABINET_INFO) DECL_WINELIB_TYPE_AW(FILE_IN_CABINET_INFO)
DECL_WINELIB_TYPE_AW(PFILE_IN_CABINET_INFO) DECL_WINELIB_TYPE_AW(PFILE_IN_CABINET_INFO)
typedef struct _CABINET_INFOA { typedef struct _CABINET_INFO_A {
PCSTR CabinetPath; PCSTR CabinetPath;
PCSTR CabinetFile; PCSTR CabinetFile;
PCSTR DiskName; PCSTR DiskName;
USHORT SetId; USHORT SetId;
USHORT CabinetNumber; USHORT CabinetNumber;
} CABINET_INFOA, *PCABINET_INFOA; } CABINET_INFO_A, *PCABINET_INFO_A;
typedef struct _CABINET_INFOW { typedef struct _CABINET_INFO_W {
PCWSTR CabinetPath; PCWSTR CabinetPath;
PCWSTR CabinetFile; PCWSTR CabinetFile;
PCWSTR DiskName; PCWSTR DiskName;
USHORT SetId; USHORT SetId;
USHORT CabinetNumber; USHORT CabinetNumber;
} CABINET_INFOW, *PCABINET_INFOW; } CABINET_INFO_W, *PCABINET_INFO_W;
DECL_WINELIB_TYPE_AW(CABINET_INFO); DECL_WINELIB_TYPE_AW(CABINET_INFO);
DECL_WINELIB_TYPE_AW(PCABINET_INFO); DECL_WINELIB_TYPE_AW(PCABINET_INFO);