On Saturday 18 October 2003 01:57 pm, Steven Edwards wrote:
With this patch all of the objects for setupapi.dll can be built on MS_VC with the PSDK. There are a few minor issues but nothing to major
doesn't this:
-typedef struct _CABINET_INFOA { +typedef struct _CABINET_INFO_A { PCSTR CabinetPath; PCSTR CabinetFile; PCSTR DiskName; USHORT SetId; USHORT CabinetNumber; -} CABINET_INFOA, *PCABINET_INFOA; +} CABINET_INFO_A, *PCABINET_INFO_A;
-typedef struct _CABINET_INFOW { +typedef struct _CABINET_INFO_W { PCWSTR CabinetPath; PCWSTR CabinetFile; PCWSTR DiskName; USHORT SetId; USHORT CabinetNumber; -} CABINET_INFOW, *PCABINET_INFOW; +} CABINET_INFO_W, *PCABINET_INFO_W;
mean we should do this:
-DECL_WINELIB_TYPE_AW(CABINET_INFO); -DECL_WINELIB_TYPE_AW(PCABINET_INFO); +DECL_WINELIB_TYPE_AW(CABINET_INFO_); +DECL_WINELIB_TYPE_AW(PCABINET_INFO_);
?
--- "Gregory M. Turner" gmturner007@ameritech.net wrote:
On Saturday 18 October 2003 01:57 pm, Steven Edwards wrote:
With this patch all of the objects for setupapi.dll can be built on MS_VC with the PSDK. There are a few minor issues but nothing to major
doesn't this:
-typedef struct _CABINET_INFOA { +typedef struct _CABINET_INFO_A {
<snip>
mean we should do this:
-DECL_WINELIB_TYPE_AW(CABINET_INFO); -DECL_WINELIB_TYPE_AW(PCABINET_INFO); +DECL_WINELIB_TYPE_AW(CABINET_INFO_); +DECL_WINELIB_TYPE_AW(PCABINET_INFO_);
I dont know. I received no warrnings/errors when compiling under MS_VC+PSDK or Mingw with WINE headers but I am not on Linux and I also cannot test this code yet.
Thanks Steven
__________________________________ Do you Yahoo!? The New Yahoo! Shopping - with improved product search http://shopping.yahoo.com
On Saturday 18 October 2003 02:15 pm, Gregory M. Turner wrote:
On Saturday 18 October 2003 01:57 pm, Steven Edwards wrote:
With this patch all of the objects for setupapi.dll can be built on MS_VC with the PSDK. There are a few minor issues but nothing to major
doesn't this:
-typedef struct _CABINET_INFOA { +typedef struct _CABINET_INFO_A { PCSTR CabinetPath; PCSTR CabinetFile; PCSTR DiskName; USHORT SetId; USHORT CabinetNumber; -} CABINET_INFOA, *PCABINET_INFOA; +} CABINET_INFO_A, *PCABINET_INFO_A;
-typedef struct _CABINET_INFOW { +typedef struct _CABINET_INFO_W { PCWSTR CabinetPath; PCWSTR CabinetFile; PCWSTR DiskName; USHORT SetId; USHORT CabinetNumber; -} CABINET_INFOW, *PCABINET_INFOW; +} CABINET_INFO_W, *PCABINET_INFO_W;
mean we should do this:
-DECL_WINELIB_TYPE_AW(CABINET_INFO); -DECL_WINELIB_TYPE_AW(PCABINET_INFO); +DECL_WINELIB_TYPE_AW(CABINET_INFO_); +DECL_WINELIB_TYPE_AW(PCABINET_INFO_);
?
Hmm, now that I think about it, for full compatibility with winelib, maybe we require something like:
typedef stuct ... { ... } CABINET_INFO_W, CABINET_INFOW; typedef struct ... { ... } CABINET_INFO_A, CABINET_INFOA; DECL_WINELIB_TYPE_AW(CABINET_INFO_); /* probably unnecessary */ DECL_WINELIB_TYPE_AW(CABINET_INFO);
and likewise for the pointer types. yucky.
The problem, I guess, is that wine is specifically naming the A/W types, whereas most other proggies would just use the automagical ones... any idea why wine isn't adding an underscore in DECL_WINELIB_TYPE_AW? Isn't that the standard MS convention?
--- "Gregory M. Turner" gmturner007@ameritech.net wrote:
Hmm, now that I think about it, for full compatibility with winelib, maybe we require something like:
typedef stuct ... { ... } CABINET_INFO_W, CABINET_INFOW; typedef struct ... { ... } CABINET_INFO_A, CABINET_INFOA; DECL_WINELIB_TYPE_AW(CABINET_INFO_); /* probably unnecessary */ DECL_WINELIB_TYPE_AW(CABINET_INFO);
and likewise for the pointer types. yucky.
The problem, I guess, is that wine is specifically naming the A/W types, whereas most other proggies would just use the automagical ones... any idea why wine isn't adding an underscore in DECL_WINELIB_TYPE_AW? Isn't that the standard MS convention?
Hey Greg, I dont know. I have already submitted a few patches like this one for setupapi and imagehlp that Alexandre has merged and nothing seems to be broken yet. I dont know if he has gone in and added the missing typedefs or if they really are not needed. Like I said, it builds fine but I am not really in a possition to test.
I thought the DECL_WINELIB_TYPE_AW stuff was fixed?
Thanks Steven
__________________________________ Do you Yahoo!? The New Yahoo! Shopping - with improved product search http://shopping.yahoo.com
-
Gregory M. Turner -
Steven Edwards