From: Keith Marshall Date: Thu, 9 Nov 2017 00:56:00 +0000 (+0000) Subject: Avoid an implication that the API is exclusively 32-bit. X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=db5fa447c066abf882a772a03d3b3be681e34712;p=mingw%2Fmingw-org-wsl.git Avoid an implication that the API is exclusively 32-bit. --HG-- rename : w32api/CONTRIBUTIONS => wslapi/CONTRIBUTIONS rename : w32api/ChangeLog => wslapi/ChangeLog rename : w32api/Makefile.in => wslapi/Makefile.in rename : w32api/README.w32api => wslapi/README.w32api rename : w32api/TODO => wslapi/TODO rename : w32api/configure.ac => wslapi/configure.ac rename : w32api/include/GL/gl.h => wslapi/include/GL/gl.h rename : w32api/include/GL/glext.h => wslapi/include/GL/glext.h rename : w32api/include/GL/glu.h => wslapi/include/GL/glu.h rename : w32api/include/accctrl.h => wslapi/include/accctrl.h rename : w32api/include/aclapi.h => wslapi/include/aclapi.h rename : w32api/include/aclui.h => wslapi/include/aclui.h rename : w32api/include/adsprop.h => wslapi/include/adsprop.h rename : w32api/include/afxres.h => wslapi/include/afxres.h rename : w32api/include/amaudio.h => wslapi/include/amaudio.h rename : w32api/include/amvideo.h => wslapi/include/amvideo.h rename : w32api/include/audevcod.h => wslapi/include/audevcod.h rename : w32api/include/aviriff.h => wslapi/include/aviriff.h rename : w32api/include/aygshell.h => wslapi/include/aygshell.h rename : w32api/include/basetsd.h => wslapi/include/basetsd.h rename : w32api/include/basetyps.h => wslapi/include/basetyps.h rename : w32api/include/bdatypes.h => wslapi/include/bdatypes.h rename : w32api/include/cderr.h => wslapi/include/cderr.h rename : w32api/include/cguid.h => wslapi/include/cguid.h rename : w32api/include/cmnquery.h => wslapi/include/cmnquery.h rename : w32api/include/comcat.h => wslapi/include/comcat.h rename : w32api/include/commctrl.h => wslapi/include/commctrl.h rename : w32api/include/commdlg.h => wslapi/include/commdlg.h rename : w32api/include/control.h => wslapi/include/control.h rename : w32api/include/cpl.h => wslapi/include/cpl.h rename : w32api/include/cplext.h => wslapi/include/cplext.h rename : w32api/include/custcntl.h => wslapi/include/custcntl.h rename : w32api/include/dbt.h => wslapi/include/dbt.h rename : w32api/include/dde.h => wslapi/include/dde.h rename : w32api/include/ddeml.h => wslapi/include/ddeml.h rename : w32api/include/ddk/atm.h => wslapi/include/ddk/atm.h rename : w32api/include/ddk/batclass.h => wslapi/include/ddk/batclass.h rename : w32api/include/ddk/cfg.h => wslapi/include/ddk/cfg.h rename : w32api/include/ddk/cfgmgr32.h => wslapi/include/ddk/cfgmgr32.h rename : w32api/include/ddk/d4drvif.h => wslapi/include/ddk/d4drvif.h rename : w32api/include/ddk/d4iface.h => wslapi/include/ddk/d4iface.h rename : w32api/include/ddk/ddkmapi.h => wslapi/include/ddk/ddkmapi.h rename : w32api/include/ddk/hidclass.h => wslapi/include/ddk/hidclass.h rename : w32api/include/ddk/hidpi.h => wslapi/include/ddk/hidpi.h rename : w32api/include/ddk/hidsdi.h => wslapi/include/ddk/hidsdi.h rename : w32api/include/ddk/hidusage.h => wslapi/include/ddk/hidusage.h rename : w32api/include/ddk/kbdmou.h => wslapi/include/ddk/kbdmou.h rename : w32api/include/ddk/mcd.h => wslapi/include/ddk/mcd.h rename : w32api/include/ddk/miniport.h => wslapi/include/ddk/miniport.h rename : w32api/include/ddk/minitape.h => wslapi/include/ddk/minitape.h rename : w32api/include/ddk/mountdev.h => wslapi/include/ddk/mountdev.h rename : w32api/include/ddk/mountmgr.h => wslapi/include/ddk/mountmgr.h rename : w32api/include/ddk/ndis.h => wslapi/include/ddk/ndis.h rename : w32api/include/ddk/ndisguid.h => wslapi/include/ddk/ndisguid.h rename : w32api/include/ddk/ndistapi.h => wslapi/include/ddk/ndistapi.h rename : w32api/include/ddk/ndiswan.h => wslapi/include/ddk/ndiswan.h rename : w32api/include/ddk/netevent.h => wslapi/include/ddk/netevent.h rename : w32api/include/ddk/netpnp.h => wslapi/include/ddk/netpnp.h rename : w32api/include/ddk/newdev.h => wslapi/include/ddk/newdev.h rename : w32api/include/ddk/ntapi.h => wslapi/include/ddk/ntapi.h rename : w32api/include/ddk/ntdd8042.h => wslapi/include/ddk/ntdd8042.h rename : w32api/include/ddk/ntddbeep.h => wslapi/include/ddk/ntddbeep.h rename : w32api/include/ddk/ntddcdrm.h => wslapi/include/ddk/ntddcdrm.h rename : w32api/include/ddk/ntddcdvd.h => wslapi/include/ddk/ntddcdvd.h rename : w32api/include/ddk/ntddchgr.h => wslapi/include/ddk/ntddchgr.h rename : w32api/include/ddk/ntdddisk.h => wslapi/include/ddk/ntdddisk.h rename : w32api/include/ddk/ntddk.h => wslapi/include/ddk/ntddk.h rename : w32api/include/ddk/ntddkbd.h => wslapi/include/ddk/ntddkbd.h rename : w32api/include/ddk/ntddmou.h => wslapi/include/ddk/ntddmou.h rename : w32api/include/ddk/ntddndis.h => wslapi/include/ddk/ntddndis.h rename : w32api/include/ddk/ntddpar.h => wslapi/include/ddk/ntddpar.h rename : w32api/include/ddk/ntddpcm.h => wslapi/include/ddk/ntddpcm.h rename : w32api/include/ddk/ntddscsi.h => wslapi/include/ddk/ntddscsi.h rename : w32api/include/ddk/ntddser.h => wslapi/include/ddk/ntddser.h rename : w32api/include/ddk/ntddstor.h => wslapi/include/ddk/ntddstor.h rename : w32api/include/ddk/ntddtape.h => wslapi/include/ddk/ntddtape.h rename : w32api/include/ddk/ntddtdi.h => wslapi/include/ddk/ntddtdi.h rename : w32api/include/ddk/ntddvdeo.h => wslapi/include/ddk/ntddvdeo.h rename : w32api/include/ddk/ntddvol.h => wslapi/include/ddk/ntddvol.h rename : w32api/include/ddk/ntifs.h => wslapi/include/ddk/ntifs.h rename : w32api/include/ddk/ntpoapi.h => wslapi/include/ddk/ntpoapi.h rename : w32api/include/ddk/ntstatus.h => wslapi/include/ddk/ntstatus.h rename : w32api/include/ddk/parallel.h => wslapi/include/ddk/parallel.h rename : w32api/include/ddk/pfhook.h => wslapi/include/ddk/pfhook.h rename : w32api/include/ddk/poclass.h => wslapi/include/ddk/poclass.h rename : w32api/include/ddk/scsi.h => wslapi/include/ddk/scsi.h rename : w32api/include/ddk/scsiscan.h => wslapi/include/ddk/scsiscan.h rename : w32api/include/ddk/scsiwmi.h => wslapi/include/ddk/scsiwmi.h rename : w32api/include/ddk/smbus.h => wslapi/include/ddk/smbus.h rename : w32api/include/ddk/srb.h => wslapi/include/ddk/srb.h rename : w32api/include/ddk/storport.h => wslapi/include/ddk/storport.h rename : w32api/include/ddk/tdi.h => wslapi/include/ddk/tdi.h rename : w32api/include/ddk/tdiinfo.h => wslapi/include/ddk/tdiinfo.h rename : w32api/include/ddk/tdikrnl.h => wslapi/include/ddk/tdikrnl.h rename : w32api/include/ddk/tdistat.h => wslapi/include/ddk/tdistat.h rename : w32api/include/ddk/tvout.h => wslapi/include/ddk/tvout.h rename : w32api/include/ddk/upssvc.h => wslapi/include/ddk/upssvc.h rename : w32api/include/ddk/usb.h => wslapi/include/ddk/usb.h rename : w32api/include/ddk/usb100.h => wslapi/include/ddk/usb100.h rename : w32api/include/ddk/usbcamdi.h => wslapi/include/ddk/usbcamdi.h rename : w32api/include/ddk/usbdi.h => wslapi/include/ddk/usbdi.h rename : w32api/include/ddk/usbioctl.h => wslapi/include/ddk/usbioctl.h rename : w32api/include/ddk/usbiodef.h => wslapi/include/ddk/usbiodef.h rename : w32api/include/ddk/usbscan.h => wslapi/include/ddk/usbscan.h rename : w32api/include/ddk/usbuser.h => wslapi/include/ddk/usbuser.h rename : w32api/include/ddk/video.h => wslapi/include/ddk/video.h rename : w32api/include/ddk/videoagp.h => wslapi/include/ddk/videoagp.h rename : w32api/include/ddk/win2k.h => wslapi/include/ddk/win2k.h rename : w32api/include/ddk/winddi.h => wslapi/include/ddk/winddi.h rename : w32api/include/ddk/winddk.h => wslapi/include/ddk/winddk.h rename : w32api/include/ddk/winnt4.h => wslapi/include/ddk/winnt4.h rename : w32api/include/ddk/winxp.h => wslapi/include/ddk/winxp.h rename : w32api/include/ddk/ws2san.h => wslapi/include/ddk/ws2san.h rename : w32api/include/ddk/xfilter.h => wslapi/include/ddk/xfilter.h rename : w32api/include/devguid.h => wslapi/include/devguid.h rename : w32api/include/dhcpcsdk.h => wslapi/include/dhcpcsdk.h rename : w32api/include/directx/d3d9.h => wslapi/include/directx/d3d9.h rename : w32api/include/directx/d3d9caps.h => wslapi/include/directx/d3d9caps.h rename : w32api/include/directx/d3d9types.h => wslapi/include/directx/d3d9types.h rename : w32api/include/directx/dxerr8.h => wslapi/include/directx/dxerr8.h rename : w32api/include/directx/dxerr9.h => wslapi/include/directx/dxerr9.h rename : w32api/include/dlgs.h => wslapi/include/dlgs.h rename : w32api/include/docobj.h => wslapi/include/docobj.h rename : w32api/include/dsadmin.h => wslapi/include/dsadmin.h rename : w32api/include/dsclient.h => wslapi/include/dsclient.h rename : w32api/include/dsgetdc.h => wslapi/include/dsgetdc.h rename : w32api/include/dshow.h => wslapi/include/dshow.h rename : w32api/include/dsquery.h => wslapi/include/dsquery.h rename : w32api/include/dsrole.h => wslapi/include/dsrole.h rename : w32api/include/dvdevcod.h => wslapi/include/dvdevcod.h rename : w32api/include/dvdmedia.h => wslapi/include/dvdmedia.h rename : w32api/include/edevdefs.h => wslapi/include/edevdefs.h rename : w32api/include/errorrep.h => wslapi/include/errorrep.h rename : w32api/include/errors.h => wslapi/include/errors.h rename : w32api/include/evcode.h => wslapi/include/evcode.h rename : w32api/include/exdisp.h => wslapi/include/exdisp.h rename : w32api/include/exdispid.h => wslapi/include/exdispid.h rename : w32api/include/fltdefs.h => wslapi/include/fltdefs.h rename : w32api/include/gdiplus.h => wslapi/include/gdiplus.h rename : w32api/include/gdiplus/gdiplus.h => wslapi/include/gdiplus/gdiplus.h rename : w32api/include/gdiplus/gdiplusbase.h => wslapi/include/gdiplus/gdiplusbase.h rename : w32api/include/gdiplus/gdiplusbrush.h => wslapi/include/gdiplus/gdiplusbrush.h rename : w32api/include/gdiplus/gdipluscolor.h => wslapi/include/gdiplus/gdipluscolor.h rename : w32api/include/gdiplus/gdipluscolormatrix.h => wslapi/include/gdiplus/gdipluscolormatrix.h rename : w32api/include/gdiplus/gdipluseffects.h => wslapi/include/gdiplus/gdipluseffects.h rename : w32api/include/gdiplus/gdiplusenums.h => wslapi/include/gdiplus/gdiplusenums.h rename : w32api/include/gdiplus/gdiplusflat.h => wslapi/include/gdiplus/gdiplusflat.h rename : w32api/include/gdiplus/gdiplusgpstubs.h => wslapi/include/gdiplus/gdiplusgpstubs.h rename : w32api/include/gdiplus/gdiplusgraphics.h => wslapi/include/gdiplus/gdiplusgraphics.h rename : w32api/include/gdiplus/gdiplusheaders.h => wslapi/include/gdiplus/gdiplusheaders.h rename : w32api/include/gdiplus/gdiplusimageattributes.h => wslapi/include/gdiplus/gdiplusimageattributes.h rename : w32api/include/gdiplus/gdiplusimagecodec.h => wslapi/include/gdiplus/gdiplusimagecodec.h rename : w32api/include/gdiplus/gdiplusimaging.h => wslapi/include/gdiplus/gdiplusimaging.h rename : w32api/include/gdiplus/gdiplusimpl.h => wslapi/include/gdiplus/gdiplusimpl.h rename : w32api/include/gdiplus/gdiplusinit.h => wslapi/include/gdiplus/gdiplusinit.h rename : w32api/include/gdiplus/gdipluslinecaps.h => wslapi/include/gdiplus/gdipluslinecaps.h rename : w32api/include/gdiplus/gdiplusmatrix.h => wslapi/include/gdiplus/gdiplusmatrix.h rename : w32api/include/gdiplus/gdiplusmem.h => wslapi/include/gdiplus/gdiplusmem.h rename : w32api/include/gdiplus/gdiplusmetafile.h => wslapi/include/gdiplus/gdiplusmetafile.h rename : w32api/include/gdiplus/gdiplusmetaheader.h => wslapi/include/gdiplus/gdiplusmetaheader.h rename : w32api/include/gdiplus/gdipluspath.h => wslapi/include/gdiplus/gdipluspath.h rename : w32api/include/gdiplus/gdipluspen.h => wslapi/include/gdiplus/gdipluspen.h rename : w32api/include/gdiplus/gdipluspixelformats.h => wslapi/include/gdiplus/gdipluspixelformats.h rename : w32api/include/gdiplus/gdiplusstringformat.h => wslapi/include/gdiplus/gdiplusstringformat.h rename : w32api/include/gdiplus/gdiplustypes.h => wslapi/include/gdiplus/gdiplustypes.h rename : w32api/include/httpext.h => wslapi/include/httpext.h rename : w32api/include/icm.h => wslapi/include/icm.h rename : w32api/include/idispids.h => wslapi/include/idispids.h rename : w32api/include/il21dec.h => wslapi/include/il21dec.h rename : w32api/include/imagehlp.h => wslapi/include/imagehlp.h rename : w32api/include/imm.h => wslapi/include/imm.h rename : w32api/include/initguid.h => wslapi/include/initguid.h rename : w32api/include/intshcut.h => wslapi/include/intshcut.h rename : w32api/include/ipexport.h => wslapi/include/ipexport.h rename : w32api/include/iphlpapi.h => wslapi/include/iphlpapi.h rename : w32api/include/ipifcons.h => wslapi/include/ipifcons.h rename : w32api/include/ipinfoid.h => wslapi/include/ipinfoid.h rename : w32api/include/iprtrmib.h => wslapi/include/iprtrmib.h rename : w32api/include/iptypes.h => wslapi/include/iptypes.h rename : w32api/include/ipxconst.h => wslapi/include/ipxconst.h rename : w32api/include/ipxrtdef.h => wslapi/include/ipxrtdef.h rename : w32api/include/ipxtfflt.h => wslapi/include/ipxtfflt.h rename : w32api/include/isguids.h => wslapi/include/isguids.h rename : w32api/include/ks.h => wslapi/include/ks.h rename : w32api/include/ksmedia.h => wslapi/include/ksmedia.h rename : w32api/include/largeint.h => wslapi/include/largeint.h rename : w32api/include/lm.h => wslapi/include/lm.h rename : w32api/include/lmaccess.h => wslapi/include/lmaccess.h rename : w32api/include/lmalert.h => wslapi/include/lmalert.h rename : w32api/include/lmapibuf.h => wslapi/include/lmapibuf.h rename : w32api/include/lmat.h => wslapi/include/lmat.h rename : w32api/include/lmaudit.h => wslapi/include/lmaudit.h rename : w32api/include/lmbrowsr.h => wslapi/include/lmbrowsr.h rename : w32api/include/lmchdev.h => wslapi/include/lmchdev.h rename : w32api/include/lmconfig.h => wslapi/include/lmconfig.h rename : w32api/include/lmcons.h => wslapi/include/lmcons.h rename : w32api/include/lmerr.h => wslapi/include/lmerr.h rename : w32api/include/lmerrlog.h => wslapi/include/lmerrlog.h rename : w32api/include/lmmsg.h => wslapi/include/lmmsg.h rename : w32api/include/lmremutl.h => wslapi/include/lmremutl.h rename : w32api/include/lmrepl.h => wslapi/include/lmrepl.h rename : w32api/include/lmserver.h => wslapi/include/lmserver.h rename : w32api/include/lmshare.h => wslapi/include/lmshare.h rename : w32api/include/lmsname.h => wslapi/include/lmsname.h rename : w32api/include/lmstats.h => wslapi/include/lmstats.h rename : w32api/include/lmsvc.h => wslapi/include/lmsvc.h rename : w32api/include/lmuse.h => wslapi/include/lmuse.h rename : w32api/include/lmuseflg.h => wslapi/include/lmuseflg.h rename : w32api/include/lmwksta.h => wslapi/include/lmwksta.h rename : w32api/include/lzexpand.h => wslapi/include/lzexpand.h rename : w32api/include/mapi.h => wslapi/include/mapi.h rename : w32api/include/mciavi.h => wslapi/include/mciavi.h rename : w32api/include/mcx.h => wslapi/include/mcx.h rename : w32api/include/mgm.h => wslapi/include/mgm.h rename : w32api/include/mgmtapi.h => wslapi/include/mgmtapi.h rename : w32api/include/mlang.h => wslapi/include/mlang.h rename : w32api/include/mmreg.h => wslapi/include/mmreg.h rename : w32api/include/mmsystem.h => wslapi/include/mmsystem.h rename : w32api/include/mpegtype.h => wslapi/include/mpegtype.h rename : w32api/include/mprapi.h => wslapi/include/mprapi.h rename : w32api/include/mq.h => wslapi/include/mq.h rename : w32api/include/msacm.h => wslapi/include/msacm.h rename : w32api/include/mshtml.h => wslapi/include/mshtml.h rename : w32api/include/mswsock.h => wslapi/include/mswsock.h rename : w32api/include/nb30.h => wslapi/include/nb30.h rename : w32api/include/nddeapi.h => wslapi/include/nddeapi.h rename : w32api/include/nspapi.h => wslapi/include/nspapi.h rename : w32api/include/ntdef.h => wslapi/include/ntdef.h rename : w32api/include/ntdll.h => wslapi/include/ntdll.h rename : w32api/include/ntdsapi.h => wslapi/include/ntdsapi.h rename : w32api/include/ntdsbcli.h => wslapi/include/ntdsbcli.h rename : w32api/include/ntldap.h => wslapi/include/ntldap.h rename : w32api/include/ntsecapi.h => wslapi/include/ntsecapi.h rename : w32api/include/ntsecpkg.h => wslapi/include/ntsecpkg.h rename : w32api/include/oaidl.h => wslapi/include/oaidl.h rename : w32api/include/objbase.h => wslapi/include/objbase.h rename : w32api/include/objfwd.h => wslapi/include/objfwd.h rename : w32api/include/objidl.h => wslapi/include/objidl.h rename : w32api/include/objsafe.h => wslapi/include/objsafe.h rename : w32api/include/objsel.h => wslapi/include/objsel.h rename : w32api/include/obsolete.h.in => wslapi/include/obsolete.h.in rename : w32api/include/ocidl.h => wslapi/include/ocidl.h rename : w32api/include/odbcinst.h => wslapi/include/odbcinst.h rename : w32api/include/ole.h => wslapi/include/ole.h rename : w32api/include/ole2.h => wslapi/include/ole2.h rename : w32api/include/ole2ver.h => wslapi/include/ole2ver.h rename : w32api/include/oleacc.h => wslapi/include/oleacc.h rename : w32api/include/oleauto.h => wslapi/include/oleauto.h rename : w32api/include/olectl.h => wslapi/include/olectl.h rename : w32api/include/olectlid.h => wslapi/include/olectlid.h rename : w32api/include/oledlg.h => wslapi/include/oledlg.h rename : w32api/include/oleidl.h => wslapi/include/oleidl.h rename : w32api/include/poppack.h => wslapi/include/poppack.h rename : w32api/include/powrprof.h => wslapi/include/powrprof.h rename : w32api/include/prsht.h => wslapi/include/prsht.h rename : w32api/include/psapi.h => wslapi/include/psapi.h rename : w32api/include/pshpack1.h => wslapi/include/pshpack1.h rename : w32api/include/pshpack2.h => wslapi/include/pshpack2.h rename : w32api/include/pshpack4.h => wslapi/include/pshpack4.h rename : w32api/include/pshpack8.h => wslapi/include/pshpack8.h rename : w32api/include/qedit.h => wslapi/include/qedit.h rename : w32api/include/rapi.h => wslapi/include/rapi.h rename : w32api/include/ras.h => wslapi/include/ras.h rename : w32api/include/rasdlg.h => wslapi/include/rasdlg.h rename : w32api/include/raserror.h => wslapi/include/raserror.h rename : w32api/include/rassapi.h => wslapi/include/rassapi.h rename : w32api/include/reason.h => wslapi/include/reason.h rename : w32api/include/regstr.h => wslapi/include/regstr.h rename : w32api/include/richedit.h => wslapi/include/richedit.h rename : w32api/include/richole.h => wslapi/include/richole.h rename : w32api/include/routprot.h => wslapi/include/routprot.h rename : w32api/include/rpc.h => wslapi/include/rpc.h rename : w32api/include/rpcdce.h => wslapi/include/rpcdce.h rename : w32api/include/rpcdce2.h => wslapi/include/rpcdce2.h rename : w32api/include/rpcdcep.h => wslapi/include/rpcdcep.h rename : w32api/include/rpcndr.h => wslapi/include/rpcndr.h rename : w32api/include/rpcnsi.h => wslapi/include/rpcnsi.h rename : w32api/include/rpcnsip.h => wslapi/include/rpcnsip.h rename : w32api/include/rpcnterr.h => wslapi/include/rpcnterr.h rename : w32api/include/rpcproxy.h => wslapi/include/rpcproxy.h rename : w32api/include/rtutils.h => wslapi/include/rtutils.h rename : w32api/include/schannel.h => wslapi/include/schannel.h rename : w32api/include/schnlsp.h => wslapi/include/schnlsp.h rename : w32api/include/scrnsave.h => wslapi/include/scrnsave.h rename : w32api/include/sddl.h => wslapi/include/sddl.h rename : w32api/include/sdkddkver.h => wslapi/include/sdkddkver.h rename : w32api/include/secext.h => wslapi/include/secext.h rename : w32api/include/security.h => wslapi/include/security.h rename : w32api/include/servprov.h => wslapi/include/servprov.h rename : w32api/include/setupapi.h => wslapi/include/setupapi.h rename : w32api/include/shellapi.h => wslapi/include/shellapi.h rename : w32api/include/shldisp.h => wslapi/include/shldisp.h rename : w32api/include/shlguid.h => wslapi/include/shlguid.h rename : w32api/include/shlobj.h => wslapi/include/shlobj.h rename : w32api/include/shlwapi.h => wslapi/include/shlwapi.h rename : w32api/include/shobjidl.h => wslapi/include/shobjidl.h rename : w32api/include/snmp.h => wslapi/include/snmp.h rename : w32api/include/specstrings.h => wslapi/include/specstrings.h rename : w32api/include/sql.h => wslapi/include/sql.h rename : w32api/include/sqlext.h => wslapi/include/sqlext.h rename : w32api/include/sqltypes.h => wslapi/include/sqltypes.h rename : w32api/include/sqlucode.h => wslapi/include/sqlucode.h rename : w32api/include/sspi.h => wslapi/include/sspi.h rename : w32api/include/stm.h => wslapi/include/stm.h rename : w32api/include/strmif.h => wslapi/include/strmif.h rename : w32api/include/subauth.h => wslapi/include/subauth.h rename : w32api/include/svcguid.h => wslapi/include/svcguid.h rename : w32api/include/tlhelp32.h => wslapi/include/tlhelp32.h rename : w32api/include/tmschema.h => wslapi/include/tmschema.h rename : w32api/include/unknwn.h => wslapi/include/unknwn.h rename : w32api/include/userenv.h => wslapi/include/userenv.h rename : w32api/include/usp10.h => wslapi/include/usp10.h rename : w32api/include/uxtheme.h => wslapi/include/uxtheme.h rename : w32api/include/vfw.h => wslapi/include/vfw.h rename : w32api/include/vidcap.h => wslapi/include/vidcap.h rename : w32api/include/vmr9.h => wslapi/include/vmr9.h rename : w32api/include/vptype.h => wslapi/include/vptype.h rename : w32api/include/w32api.h.in => wslapi/include/w32api.h.in rename : w32api/include/winbase.h => wslapi/include/winbase.h rename : w32api/include/winber.h => wslapi/include/winber.h rename : w32api/include/wincon.h => wslapi/include/wincon.h rename : w32api/include/wincrypt.h => wslapi/include/wincrypt.h rename : w32api/include/windef.h => wslapi/include/windef.h rename : w32api/include/windns.h => wslapi/include/windns.h rename : w32api/include/windows.h => wslapi/include/windows.h rename : w32api/include/windowsx.h => wslapi/include/windowsx.h rename : w32api/include/winerror.h => wslapi/include/winerror.h rename : w32api/include/wingdi.h => wslapi/include/wingdi.h rename : w32api/include/wininet.h => wslapi/include/wininet.h rename : w32api/include/winioctl.h => wslapi/include/winioctl.h rename : w32api/include/winldap.h => wslapi/include/winldap.h rename : w32api/include/winnetwk.h => wslapi/include/winnetwk.h rename : w32api/include/winnls.h => wslapi/include/winnls.h rename : w32api/include/winnt.h => wslapi/include/winnt.h rename : w32api/include/winperf.h => wslapi/include/winperf.h rename : w32api/include/winreg.h => wslapi/include/winreg.h rename : w32api/include/winresrc.h => wslapi/include/winresrc.h rename : w32api/include/winsnmp.h => wslapi/include/winsnmp.h rename : w32api/include/winsock.h => wslapi/include/winsock.h rename : w32api/include/winsock2.h => wslapi/include/winsock2.h rename : w32api/include/winspool.h => wslapi/include/winspool.h rename : w32api/include/winsvc.h => wslapi/include/winsvc.h rename : w32api/include/winuser.h => wslapi/include/winuser.h rename : w32api/include/winver.h => wslapi/include/winver.h rename : w32api/include/ws2spi.h => wslapi/include/ws2spi.h rename : w32api/include/ws2tcpip.h => wslapi/include/ws2tcpip.h rename : w32api/include/wsahelp.h => wslapi/include/wsahelp.h rename : w32api/include/wsipx.h => wslapi/include/wsipx.h rename : w32api/include/wsnetbs.h => wslapi/include/wsnetbs.h rename : w32api/include/wtsapi32.h => wslapi/include/wtsapi32.h rename : w32api/include/wtypes.h => wslapi/include/wtypes.h rename : w32api/include/xprtdefs.h => wslapi/include/xprtdefs.h rename : w32api/include/zmouse.h => wslapi/include/zmouse.h rename : w32api/lib/aclui.def => wslapi/lib/aclui.def rename : w32api/lib/advapi32.def => wslapi/lib/advapi32.def rename : w32api/lib/ativscp-uuid.c => wslapi/lib/ativscp-uuid.c rename : w32api/lib/avicap32.def => wslapi/lib/avicap32.def rename : w32api/lib/avifil32.def => wslapi/lib/avifil32.def rename : w32api/lib/bthprops.def => wslapi/lib/bthprops.def rename : w32api/lib/cap.def => wslapi/lib/cap.def rename : w32api/lib/cguid-uuid.c => wslapi/lib/cguid-uuid.c rename : w32api/lib/comcat-uuid.c => wslapi/lib/comcat-uuid.c rename : w32api/lib/comctl32.def => wslapi/lib/comctl32.def rename : w32api/lib/comdlg32.def => wslapi/lib/comdlg32.def rename : w32api/lib/crypt32.def => wslapi/lib/crypt32.def rename : w32api/lib/ctl3d32.def => wslapi/lib/ctl3d32.def rename : w32api/lib/ddk/apcups.def => wslapi/lib/ddk/apcups.def rename : w32api/lib/ddk/cfgmgr32.def => wslapi/lib/ddk/cfgmgr32.def rename : w32api/lib/ddk/dxapi.def => wslapi/lib/ddk/dxapi.def rename : w32api/lib/ddk/hal.def => wslapi/lib/ddk/hal.def rename : w32api/lib/ddk/hid.def => wslapi/lib/ddk/hid.def rename : w32api/lib/ddk/hidparse.def => wslapi/lib/ddk/hidparse.def rename : w32api/lib/ddk/mcd.def => wslapi/lib/ddk/mcd.def rename : w32api/lib/ddk/ndis.def => wslapi/lib/ddk/ndis.def rename : w32api/lib/ddk/newdev.def => wslapi/lib/ddk/newdev.def rename : w32api/lib/ddk/ntoskrnl.def => wslapi/lib/ddk/ntoskrnl.def rename : w32api/lib/ddk/scsiport.def => wslapi/lib/ddk/scsiport.def rename : w32api/lib/ddk/tdi.def => wslapi/lib/ddk/tdi.def rename : w32api/lib/ddk/usbcamd.def => wslapi/lib/ddk/usbcamd.def rename : w32api/lib/ddk/usbcamd2.def => wslapi/lib/ddk/usbcamd2.def rename : w32api/lib/ddk/videoprt.def => wslapi/lib/ddk/videoprt.def rename : w32api/lib/ddk/win32k.def => wslapi/lib/ddk/win32k.def rename : w32api/lib/devguid.c => wslapi/lib/devguid.c rename : w32api/lib/dhcpcsvc.def => wslapi/lib/dhcpcsvc.def rename : w32api/lib/directx/d3d8.def => wslapi/lib/directx/d3d8.def rename : w32api/lib/directx/d3d9.def => wslapi/lib/directx/d3d9.def rename : w32api/lib/directx/d3dim.def => wslapi/lib/directx/d3dim.def rename : w32api/lib/directx/d3drm.def => wslapi/lib/directx/d3drm.def rename : w32api/lib/directx/d3dx8d.def => wslapi/lib/directx/d3dx8d.def rename : w32api/lib/directx/d3dx9d.def => wslapi/lib/directx/d3dx9d.def rename : w32api/lib/directx/d3dxof.def => wslapi/lib/directx/d3dxof.def rename : w32api/lib/directx/ddraw.def => wslapi/lib/directx/ddraw.def rename : w32api/lib/directx/dinput.def => wslapi/lib/directx/dinput.def rename : w32api/lib/directx/dinput8.def => wslapi/lib/directx/dinput8.def rename : w32api/lib/directx/dinput_joy.c => wslapi/lib/directx/dinput_joy.c rename : w32api/lib/directx/dinput_joy2.c => wslapi/lib/directx/dinput_joy2.c rename : w32api/lib/directx/dinput_kbd.c => wslapi/lib/directx/dinput_kbd.c rename : w32api/lib/directx/dinput_mouse.c => wslapi/lib/directx/dinput_mouse.c rename : w32api/lib/directx/dinput_mouse2.c => wslapi/lib/directx/dinput_mouse2.c rename : w32api/lib/directx/dinput_private.h => wslapi/lib/directx/dinput_private.h rename : w32api/lib/directx/dmoguids.c => wslapi/lib/directx/dmoguids.c rename : w32api/lib/directx/dplayx.def => wslapi/lib/directx/dplayx.def rename : w32api/lib/directx/dpnaddr.def => wslapi/lib/directx/dpnaddr.def rename : w32api/lib/directx/dpnet.def => wslapi/lib/directx/dpnet.def rename : w32api/lib/directx/dpnlobby.def => wslapi/lib/directx/dpnlobby.def rename : w32api/lib/directx/dpvoice.def => wslapi/lib/directx/dpvoice.def rename : w32api/lib/directx/dsetup.def => wslapi/lib/directx/dsetup.def rename : w32api/lib/directx/dsound.def => wslapi/lib/directx/dsound.def rename : w32api/lib/directx/dxerr.c => wslapi/lib/directx/dxerr.c rename : w32api/lib/directx/dxerr8.c => wslapi/lib/directx/dxerr8.c rename : w32api/lib/directx/dxerr8w.c => wslapi/lib/directx/dxerr8w.c rename : w32api/lib/directx/dxerr9.c => wslapi/lib/directx/dxerr9.c rename : w32api/lib/directx/dxerr9w.c => wslapi/lib/directx/dxerr9w.c rename : w32api/lib/directx/dxguid.c => wslapi/lib/directx/dxguid.c rename : w32api/lib/directx/ksproxy.def => wslapi/lib/directx/ksproxy.def rename : w32api/lib/directx/ksuser.c => wslapi/lib/directx/ksuser.c rename : w32api/lib/directx/ksuser.def => wslapi/lib/directx/ksuser.def rename : w32api/lib/directx/msdmo.def => wslapi/lib/directx/msdmo.def rename : w32api/lib/directx/strmiids.c => wslapi/lib/directx/strmiids.c rename : w32api/lib/directx/test.c => wslapi/lib/directx/test.c rename : w32api/lib/dlcapi.def => wslapi/lib/dlcapi.def rename : w32api/lib/dnsapi.def => wslapi/lib/dnsapi.def rename : w32api/lib/docobj-uuid.c => wslapi/lib/docobj-uuid.c rename : w32api/lib/exdisp-uuid.c => wslapi/lib/exdisp-uuid.c rename : w32api/lib/extras-uuid.c => wslapi/lib/extras-uuid.c rename : w32api/lib/faultrep.def => wslapi/lib/faultrep.def rename : w32api/lib/gdi32.def => wslapi/lib/gdi32.def rename : w32api/lib/gdiplus.c => wslapi/lib/gdiplus.c rename : w32api/lib/gdiplus.def => wslapi/lib/gdiplus.def rename : w32api/lib/glaux.def => wslapi/lib/glaux.def rename : w32api/lib/glu32.def => wslapi/lib/glu32.def rename : w32api/lib/hlguids-uuid.c => wslapi/lib/hlguids-uuid.c rename : w32api/lib/hlink-uuid.c => wslapi/lib/hlink-uuid.c rename : w32api/lib/icmui.def => wslapi/lib/icmui.def rename : w32api/lib/igmpagnt.def => wslapi/lib/igmpagnt.def rename : w32api/lib/imagehlp.def => wslapi/lib/imagehlp.def rename : w32api/lib/imm32.def => wslapi/lib/imm32.def rename : w32api/lib/iphlpapi.def => wslapi/lib/iphlpapi.def rename : w32api/lib/kernel32.def => wslapi/lib/kernel32.def rename : w32api/lib/largeint.c => wslapi/lib/largeint.c rename : w32api/lib/lz32.def => wslapi/lib/lz32.def rename : w32api/lib/mapi32.def => wslapi/lib/mapi32.def rename : w32api/lib/mfcuia32.def => wslapi/lib/mfcuia32.def rename : w32api/lib/mgmtapi.def => wslapi/lib/mgmtapi.def rename : w32api/lib/mlang-uuid.c => wslapi/lib/mlang-uuid.c rename : w32api/lib/mpr.def => wslapi/lib/mpr.def rename : w32api/lib/mprapi.def => wslapi/lib/mprapi.def rename : w32api/lib/mqrt.def => wslapi/lib/mqrt.def rename : w32api/lib/msacm32.def => wslapi/lib/msacm32.def rename : w32api/lib/mscms.def => wslapi/lib/mscms.def rename : w32api/lib/mshtml-uuid.c => wslapi/lib/mshtml-uuid.c rename : w32api/lib/msimg32.def => wslapi/lib/msimg32.def rename : w32api/lib/msvcp60.def => wslapi/lib/msvcp60.def rename : w32api/lib/msvfw32.def => wslapi/lib/msvfw32.def rename : w32api/lib/mswsock.def => wslapi/lib/mswsock.def rename : w32api/lib/msxml-uuid.c => wslapi/lib/msxml-uuid.c rename : w32api/lib/nddeapi.def => wslapi/lib/nddeapi.def rename : w32api/lib/netapi32.def => wslapi/lib/netapi32.def rename : w32api/lib/ntdll.def => wslapi/lib/ntdll.def rename : w32api/lib/oaidl-uuid.c => wslapi/lib/oaidl-uuid.c rename : w32api/lib/objidl-uuid.c => wslapi/lib/objidl-uuid.c rename : w32api/lib/objsafe-uuid.c => wslapi/lib/objsafe-uuid.c rename : w32api/lib/ocidl-uuid.c => wslapi/lib/ocidl-uuid.c rename : w32api/lib/odbc32.def => wslapi/lib/odbc32.def rename : w32api/lib/odbccp32.def => wslapi/lib/odbccp32.def rename : w32api/lib/ole32.def => wslapi/lib/ole32.def rename : w32api/lib/oleacc-uuid.c => wslapi/lib/oleacc-uuid.c rename : w32api/lib/oleacc.def => wslapi/lib/oleacc.def rename : w32api/lib/oleaut32.def => wslapi/lib/oleaut32.def rename : w32api/lib/olecli32.def => wslapi/lib/olecli32.def rename : w32api/lib/olectlid-uuid.c => wslapi/lib/olectlid-uuid.c rename : w32api/lib/oledlg.def => wslapi/lib/oledlg.def rename : w32api/lib/oleidl-uuid.c => wslapi/lib/oleidl-uuid.c rename : w32api/lib/olepro32.def => wslapi/lib/olepro32.def rename : w32api/lib/olesvr32.def => wslapi/lib/olesvr32.def rename : w32api/lib/opengl32.def => wslapi/lib/opengl32.def rename : w32api/lib/penwin32.def => wslapi/lib/penwin32.def rename : w32api/lib/pkpd32.def => wslapi/lib/pkpd32.def rename : w32api/lib/power-uuid.c => wslapi/lib/power-uuid.c rename : w32api/lib/powrprof.def => wslapi/lib/powrprof.def rename : w32api/lib/psapi.def => wslapi/lib/psapi.def rename : w32api/lib/quartz.def => wslapi/lib/quartz.def rename : w32api/lib/rapi.def => wslapi/lib/rapi.def rename : w32api/lib/rasapi32.def => wslapi/lib/rasapi32.def rename : w32api/lib/rasdlg.def => wslapi/lib/rasdlg.def rename : w32api/lib/res.rc => wslapi/lib/res.rc rename : w32api/lib/rpcdce4.def => wslapi/lib/rpcdce4.def rename : w32api/lib/rpcns4.def => wslapi/lib/rpcns4.def rename : w32api/lib/rpcrt4.def => wslapi/lib/rpcrt4.def rename : w32api/lib/rtm.def => wslapi/lib/rtm.def rename : w32api/lib/rtutils.def => wslapi/lib/rtutils.def rename : w32api/lib/scrnsave.c => wslapi/lib/scrnsave.c rename : w32api/lib/secur32.def => wslapi/lib/secur32.def rename : w32api/lib/servprov-uuid.c => wslapi/lib/servprov-uuid.c rename : w32api/lib/setupapi.def => wslapi/lib/setupapi.def rename : w32api/lib/shell32.c => wslapi/lib/shell32.c rename : w32api/lib/shell32.def => wslapi/lib/shell32.def rename : w32api/lib/shfolder.def => wslapi/lib/shfolder.def rename : w32api/lib/shlwapi.def => wslapi/lib/shlwapi.def rename : w32api/lib/shobjidl-uuid.c => wslapi/lib/shobjidl-uuid.c rename : w32api/lib/snmpapi.def => wslapi/lib/snmpapi.def rename : w32api/lib/svrapi.def => wslapi/lib/svrapi.def rename : w32api/lib/tapi32.def => wslapi/lib/tapi32.def rename : w32api/lib/test.c => wslapi/lib/test.c rename : w32api/lib/thunk32.def => wslapi/lib/thunk32.def rename : w32api/lib/unknwn-uuid.c => wslapi/lib/unknwn-uuid.c rename : w32api/lib/url.def => wslapi/lib/url.def rename : w32api/lib/urlmon-uuid.c => wslapi/lib/urlmon-uuid.c rename : w32api/lib/user32.def => wslapi/lib/user32.def rename : w32api/lib/userenv.def => wslapi/lib/userenv.def rename : w32api/lib/usp10.def => wslapi/lib/usp10.def rename : w32api/lib/uxtheme.def => wslapi/lib/uxtheme.def rename : w32api/lib/vdmdbg.def => wslapi/lib/vdmdbg.def rename : w32api/lib/version.def => wslapi/lib/version.def rename : w32api/lib/vfw32.mri => wslapi/lib/vfw32.mri rename : w32api/lib/win32spl.def => wslapi/lib/win32spl.def rename : w32api/lib/wininet.def => wslapi/lib/wininet.def rename : w32api/lib/winmm.def => wslapi/lib/winmm.def rename : w32api/lib/winspool.def => wslapi/lib/winspool.def rename : w32api/lib/winstrm.def => wslapi/lib/winstrm.def rename : w32api/lib/wldap32.def => wslapi/lib/wldap32.def rename : w32api/lib/wow32.def => wslapi/lib/wow32.def rename : w32api/lib/ws2_32.c => wslapi/lib/ws2_32.c rename : w32api/lib/ws2_32.def => wslapi/lib/ws2_32.def rename : w32api/lib/wsnmp32.def => wslapi/lib/wsnmp32.def rename : w32api/lib/wsock32.def => wslapi/lib/wsock32.def rename : w32api/lib/wst.def => wslapi/lib/wst.def rename : w32api/lib/wtsapi32.def => wslapi/lib/wtsapi32.def rename : w32api/tests/Makefile.in => wslapi/tests/Makefile.in rename : w32api/tests/atlocal.in => wslapi/tests/atlocal.in rename : w32api/tests/headers.at => wslapi/tests/headers.at rename : w32api/tests/testsuite.at.in => wslapi/tests/testsuite.at.in rename : w32api/tests/winsock.at => wslapi/tests/winsock.at --- diff --git a/ChangeLog b/ChangeLog index 8492771..4fccec2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2017-11-09 Keith Marshall + + Avoid an implication that the API is exclusively 32-bit. + + * w32api: Rename directory to... + * wslapi: ...this, thus removing any implied 32-bit specificity. + * configure.ac (AC_CONFIG_SUBDIRS): Update directory name reference + from "w32api" to "wslapi" accordingly. + + * Makefile.comm (w32api_srcdir): Rename macro... + (wslapi_srcdir): ...to this. + 2017-11-08 Earnie Boyd Prepare environment for Earnie's tools. diff --git a/Makefile.comm b/Makefile.comm index af83ded..788aba1 100644 --- a/Makefile.comm +++ b/Makefile.comm @@ -77,7 +77,7 @@ configure: configure.ac aclocal.m4 VERSION.m4 # w32api.h header files, from their respective templates with each of # the package version macro definitions completed. # -vpath %.h.in ${mingwrt_srcdir}/include ${w32api_srcdir}/include +vpath %.h.in ${mingwrt_srcdir}/include ${wslapi_srcdir}/include _mingw.h w32api.h: %.h: %.h.in VERSION.m4 $(PACKAGE_VERSION_SCRIPT) $< > $@ diff --git a/configure.ac b/configure.ac index 39303e1..7024ee3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac -*- Autoconf -*- vim: filetype=config # -# Process this file with autoconf, to create a configure script for -# the composite MinGW.org Runtime Library and Win32-API packages. +# Process this file with "autoreconf -I ..", to create configure scripts +# for the composite MinGW.org Runtime Library and Win-API packages. # # $Id$ # @@ -35,7 +35,7 @@ AC_PROG_MKDIR_P AC_PATH_PROG([LN],[ln],[ln]) - AC_CONFIG_SUBDIRS([mingwrt w32api]) + AC_CONFIG_SUBDIRS([mingwrt wslapi]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT # diff --git a/mingwrt/ChangeLog b/mingwrt/ChangeLog index 1fed35f..89eb707 100644 --- a/mingwrt/ChangeLog +++ b/mingwrt/ChangeLog @@ -1,3 +1,18 @@ +2017-11-09 Keith Marshall + + Avoid an implication that the API is exclusively 32-bit. + + * configure.ac (MINGW_AC_CONFIG_EXTRA_SUBDIR): Update directory name + reference from "w32api" to "wslapi", per top level rename. + + * Makefile.in (w32api_srcdir): Rename macro and AC_SUBST variable... + (wslapi_srcdir): ...to this; update all references. + + * tests/Makefile.in (install-w32api-headers): Update directory name + reference, to ensure that the testsuite finds the corresponding target + in the build directory's wslapi/Makefile; do NOT change the target + name until it has been updated in wslapi/Makefile.in itself! + 2017-10-25 Keith Marshall Include, and make test suite safe. diff --git a/mingwrt/Makefile.in b/mingwrt/Makefile.in index 7e2be61..e185ffa 100644 --- a/mingwrt/Makefile.in +++ b/mingwrt/Makefile.in @@ -50,7 +50,7 @@ NTDDI_VERSION_SPEC := $(NTDDI_VERSION:%=-D NTDDI_VERSION=%) srcdir = @srcdir@ top_srcdir = @top_srcdir@ mingwrt_srcdir = @srcdir@ -w32api_srcdir = @w32api_srcdir@ +wslapi_srcdir = @wslapi_srcdir@ abs_builddir = @abs_builddir@ CC = @CC@ @@ -123,7 +123,7 @@ include $(call shared_include_file,${top_srcdir},Makefile.comm) # sinclude *.d DEPFLAGS = -MD -MP -INCLUDES = -nostdinc -I . -I ${top_srcdir}/include -I ${w32api_srcdir}/include \ +INCLUDES = -nostdinc -I . -I ${top_srcdir}/include -I ${wslapi_srcdir}/include \ -I ${top_srcdir} -I ${top_srcdir}/profile -iwithprefixbefore include ALL_CFLAGS = $(CFLAGS) $(DEPFLAGS) $(INCLUDES) $(NTDDI_VERSION_SPEC) diff --git a/mingwrt/configure.ac b/mingwrt/configure.ac index 117b3e4..2328a66 100644 --- a/mingwrt/configure.ac +++ b/mingwrt/configure.ac @@ -35,7 +35,7 @@ AC_PREFIX_DEFAULT([/mingw]) AC_CONFIG_SRCDIR([include/_mingw.h.in]) - MINGW_AC_CONFIG_EXTRA_SRCDIR([w32api],[include/w32api.h.in]) + MINGW_AC_CONFIG_EXTRA_SRCDIR([wslapi],[include/w32api.h.in]) MINGW_AC_PROG_CC_COMPILE_ONLY MINGW_AC_PROG_COMPILE_SX diff --git a/mingwrt/tests/Makefile.in b/mingwrt/tests/Makefile.in index 2bdf904..0cc294f 100644 --- a/mingwrt/tests/Makefile.in +++ b/mingwrt/tests/Makefile.in @@ -141,7 +141,7 @@ install-mingwrt: chkconfig = ($1/config.status --version | grep $2) 2>&1 > /dev/null install-w32api-headers: - @for dir in ../../w32api*; do \ + @for dir in ../../wslapi*; do \ if $(call chkconfig,$$dir,'MinGW Win32 API'); then \ $(MAKE) -C $$dir --no-print-directory prefix=${CURDIR} $@; break; \ fi; \ diff --git a/w32api/CONTRIBUTIONS b/wslapi/CONTRIBUTIONS similarity index 100% rename from w32api/CONTRIBUTIONS rename to wslapi/CONTRIBUTIONS diff --git a/w32api/ChangeLog b/wslapi/ChangeLog similarity index 99% rename from w32api/ChangeLog rename to wslapi/ChangeLog index 092ff33..903fd14 100644 --- a/w32api/ChangeLog +++ b/wslapi/ChangeLog @@ -1,3 +1,10 @@ +2017-11-09 Keith Marshall + + Avoid an implication that the API is exclusively 32-bit. + + * Makefile.in (w32api_srcdir): Rename macro... + (wslapi_srcdir): ...to this; update all references. + 2017-11-08 Keith Marshall Overhaul WinSock fd_set content management macros. diff --git a/w32api/Makefile.in b/wslapi/Makefile.in similarity index 98% rename from w32api/Makefile.in rename to wslapi/Makefile.in index ba39f7b..57a4cbd 100644 --- a/w32api/Makefile.in +++ b/wslapi/Makefile.in @@ -50,7 +50,7 @@ NTDDI_VERSION_SPEC := $(NTDDI_VERSION:%=-D NTDDI_VERSION=%) srcdir = @srcdir@ top_srcdir = @top_srcdir@ mingwrt_srcdir = @mingwrt_srcdir@ -w32api_srcdir = @srcdir@ +wslapi_srcdir = @srcdir@ abs_builddir = @abs_builddir@ CC = @CC@ @@ -309,9 +309,9 @@ mingwrt-srcdist w32api-srcdist: %-srcdist: %-srcdist-dir %-srcdist-files xz -c > $*-$(PACKAGE_RELEASE_TAG)-src.tar.xz $(RM) -r dist/$*-$(PACKAGE_VERSION) -w32api-srcdist-testsuite-files: $(wildcard ${w32api_srcdir}/tests/*.at) -w32api-srcdist-testsuite-files: $(wildcard ${w32api_srcdir}/tests/*.in) - (cd ${w32api_srcdir} && tar chf - $(addprefix tests/,$(notdir $^))) | \ +w32api-srcdist-testsuite-files: $(wildcard ${wslapi_srcdir}/tests/*.at) +w32api-srcdist-testsuite-files: $(wildcard ${wslapi_srcdir}/tests/*.in) + (cd ${wslapi_srcdir} && tar chf - $(addprefix tests/,$(notdir $^))) | \ (cd dist/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) && tar xf -) mingwrt-srcdist-dir w32api-srcdist-dir: %-srcdist-dir: diff --git a/w32api/README.w32api b/wslapi/README.w32api similarity index 100% rename from w32api/README.w32api rename to wslapi/README.w32api diff --git a/w32api/TODO b/wslapi/TODO similarity index 100% rename from w32api/TODO rename to wslapi/TODO diff --git a/w32api/configure.ac b/wslapi/configure.ac similarity index 100% rename from w32api/configure.ac rename to wslapi/configure.ac diff --git a/w32api/include/GL/gl.h b/wslapi/include/GL/gl.h similarity index 100% rename from w32api/include/GL/gl.h rename to wslapi/include/GL/gl.h diff --git a/w32api/include/GL/glext.h b/wslapi/include/GL/glext.h similarity index 100% rename from w32api/include/GL/glext.h rename to wslapi/include/GL/glext.h diff --git a/w32api/include/GL/glu.h b/wslapi/include/GL/glu.h similarity index 100% rename from w32api/include/GL/glu.h rename to wslapi/include/GL/glu.h diff --git a/w32api/include/accctrl.h b/wslapi/include/accctrl.h similarity index 100% rename from w32api/include/accctrl.h rename to wslapi/include/accctrl.h diff --git a/w32api/include/aclapi.h b/wslapi/include/aclapi.h similarity index 100% rename from w32api/include/aclapi.h rename to wslapi/include/aclapi.h diff --git a/w32api/include/aclui.h b/wslapi/include/aclui.h similarity index 100% rename from w32api/include/aclui.h rename to wslapi/include/aclui.h diff --git a/w32api/include/adsprop.h b/wslapi/include/adsprop.h similarity index 100% rename from w32api/include/adsprop.h rename to wslapi/include/adsprop.h diff --git a/w32api/include/afxres.h b/wslapi/include/afxres.h similarity index 100% rename from w32api/include/afxres.h rename to wslapi/include/afxres.h diff --git a/w32api/include/amaudio.h b/wslapi/include/amaudio.h similarity index 100% rename from w32api/include/amaudio.h rename to wslapi/include/amaudio.h diff --git a/w32api/include/amvideo.h b/wslapi/include/amvideo.h similarity index 100% rename from w32api/include/amvideo.h rename to wslapi/include/amvideo.h diff --git a/w32api/include/audevcod.h b/wslapi/include/audevcod.h similarity index 100% rename from w32api/include/audevcod.h rename to wslapi/include/audevcod.h diff --git a/w32api/include/aviriff.h b/wslapi/include/aviriff.h similarity index 100% rename from w32api/include/aviriff.h rename to wslapi/include/aviriff.h diff --git a/w32api/include/aygshell.h b/wslapi/include/aygshell.h similarity index 100% rename from w32api/include/aygshell.h rename to wslapi/include/aygshell.h diff --git a/w32api/include/basetsd.h b/wslapi/include/basetsd.h similarity index 100% rename from w32api/include/basetsd.h rename to wslapi/include/basetsd.h diff --git a/w32api/include/basetyps.h b/wslapi/include/basetyps.h similarity index 100% rename from w32api/include/basetyps.h rename to wslapi/include/basetyps.h diff --git a/w32api/include/bdatypes.h b/wslapi/include/bdatypes.h similarity index 100% rename from w32api/include/bdatypes.h rename to wslapi/include/bdatypes.h diff --git a/w32api/include/cderr.h b/wslapi/include/cderr.h similarity index 100% rename from w32api/include/cderr.h rename to wslapi/include/cderr.h diff --git a/w32api/include/cguid.h b/wslapi/include/cguid.h similarity index 100% rename from w32api/include/cguid.h rename to wslapi/include/cguid.h diff --git a/w32api/include/cmnquery.h b/wslapi/include/cmnquery.h similarity index 100% rename from w32api/include/cmnquery.h rename to wslapi/include/cmnquery.h diff --git a/w32api/include/comcat.h b/wslapi/include/comcat.h similarity index 100% rename from w32api/include/comcat.h rename to wslapi/include/comcat.h diff --git a/w32api/include/commctrl.h b/wslapi/include/commctrl.h similarity index 100% rename from w32api/include/commctrl.h rename to wslapi/include/commctrl.h diff --git a/w32api/include/commdlg.h b/wslapi/include/commdlg.h similarity index 100% rename from w32api/include/commdlg.h rename to wslapi/include/commdlg.h diff --git a/w32api/include/control.h b/wslapi/include/control.h similarity index 100% rename from w32api/include/control.h rename to wslapi/include/control.h diff --git a/w32api/include/cpl.h b/wslapi/include/cpl.h similarity index 100% rename from w32api/include/cpl.h rename to wslapi/include/cpl.h diff --git a/w32api/include/cplext.h b/wslapi/include/cplext.h similarity index 100% rename from w32api/include/cplext.h rename to wslapi/include/cplext.h diff --git a/w32api/include/custcntl.h b/wslapi/include/custcntl.h similarity index 100% rename from w32api/include/custcntl.h rename to wslapi/include/custcntl.h diff --git a/w32api/include/dbt.h b/wslapi/include/dbt.h similarity index 100% rename from w32api/include/dbt.h rename to wslapi/include/dbt.h diff --git a/w32api/include/dde.h b/wslapi/include/dde.h similarity index 100% rename from w32api/include/dde.h rename to wslapi/include/dde.h diff --git a/w32api/include/ddeml.h b/wslapi/include/ddeml.h similarity index 100% rename from w32api/include/ddeml.h rename to wslapi/include/ddeml.h diff --git a/w32api/include/ddk/atm.h b/wslapi/include/ddk/atm.h similarity index 100% rename from w32api/include/ddk/atm.h rename to wslapi/include/ddk/atm.h diff --git a/w32api/include/ddk/batclass.h b/wslapi/include/ddk/batclass.h similarity index 100% rename from w32api/include/ddk/batclass.h rename to wslapi/include/ddk/batclass.h diff --git a/w32api/include/ddk/cfg.h b/wslapi/include/ddk/cfg.h similarity index 100% rename from w32api/include/ddk/cfg.h rename to wslapi/include/ddk/cfg.h diff --git a/w32api/include/ddk/cfgmgr32.h b/wslapi/include/ddk/cfgmgr32.h similarity index 100% rename from w32api/include/ddk/cfgmgr32.h rename to wslapi/include/ddk/cfgmgr32.h diff --git a/w32api/include/ddk/d4drvif.h b/wslapi/include/ddk/d4drvif.h similarity index 100% rename from w32api/include/ddk/d4drvif.h rename to wslapi/include/ddk/d4drvif.h diff --git a/w32api/include/ddk/d4iface.h b/wslapi/include/ddk/d4iface.h similarity index 100% rename from w32api/include/ddk/d4iface.h rename to wslapi/include/ddk/d4iface.h diff --git a/w32api/include/ddk/ddkmapi.h b/wslapi/include/ddk/ddkmapi.h similarity index 100% rename from w32api/include/ddk/ddkmapi.h rename to wslapi/include/ddk/ddkmapi.h diff --git a/w32api/include/ddk/hidclass.h b/wslapi/include/ddk/hidclass.h similarity index 100% rename from w32api/include/ddk/hidclass.h rename to wslapi/include/ddk/hidclass.h diff --git a/w32api/include/ddk/hidpi.h b/wslapi/include/ddk/hidpi.h similarity index 100% rename from w32api/include/ddk/hidpi.h rename to wslapi/include/ddk/hidpi.h diff --git a/w32api/include/ddk/hidsdi.h b/wslapi/include/ddk/hidsdi.h similarity index 100% rename from w32api/include/ddk/hidsdi.h rename to wslapi/include/ddk/hidsdi.h diff --git a/w32api/include/ddk/hidusage.h b/wslapi/include/ddk/hidusage.h similarity index 100% rename from w32api/include/ddk/hidusage.h rename to wslapi/include/ddk/hidusage.h diff --git a/w32api/include/ddk/kbdmou.h b/wslapi/include/ddk/kbdmou.h similarity index 100% rename from w32api/include/ddk/kbdmou.h rename to wslapi/include/ddk/kbdmou.h diff --git a/w32api/include/ddk/mcd.h b/wslapi/include/ddk/mcd.h similarity index 100% rename from w32api/include/ddk/mcd.h rename to wslapi/include/ddk/mcd.h diff --git a/w32api/include/ddk/miniport.h b/wslapi/include/ddk/miniport.h similarity index 100% rename from w32api/include/ddk/miniport.h rename to wslapi/include/ddk/miniport.h diff --git a/w32api/include/ddk/minitape.h b/wslapi/include/ddk/minitape.h similarity index 100% rename from w32api/include/ddk/minitape.h rename to wslapi/include/ddk/minitape.h diff --git a/w32api/include/ddk/mountdev.h b/wslapi/include/ddk/mountdev.h similarity index 100% rename from w32api/include/ddk/mountdev.h rename to wslapi/include/ddk/mountdev.h diff --git a/w32api/include/ddk/mountmgr.h b/wslapi/include/ddk/mountmgr.h similarity index 100% rename from w32api/include/ddk/mountmgr.h rename to wslapi/include/ddk/mountmgr.h diff --git a/w32api/include/ddk/ndis.h b/wslapi/include/ddk/ndis.h similarity index 100% rename from w32api/include/ddk/ndis.h rename to wslapi/include/ddk/ndis.h diff --git a/w32api/include/ddk/ndisguid.h b/wslapi/include/ddk/ndisguid.h similarity index 100% rename from w32api/include/ddk/ndisguid.h rename to wslapi/include/ddk/ndisguid.h diff --git a/w32api/include/ddk/ndistapi.h b/wslapi/include/ddk/ndistapi.h similarity index 100% rename from w32api/include/ddk/ndistapi.h rename to wslapi/include/ddk/ndistapi.h diff --git a/w32api/include/ddk/ndiswan.h b/wslapi/include/ddk/ndiswan.h similarity index 100% rename from w32api/include/ddk/ndiswan.h rename to wslapi/include/ddk/ndiswan.h diff --git a/w32api/include/ddk/netevent.h b/wslapi/include/ddk/netevent.h similarity index 100% rename from w32api/include/ddk/netevent.h rename to wslapi/include/ddk/netevent.h diff --git a/w32api/include/ddk/netpnp.h b/wslapi/include/ddk/netpnp.h similarity index 100% rename from w32api/include/ddk/netpnp.h rename to wslapi/include/ddk/netpnp.h diff --git a/w32api/include/ddk/newdev.h b/wslapi/include/ddk/newdev.h similarity index 100% rename from w32api/include/ddk/newdev.h rename to wslapi/include/ddk/newdev.h diff --git a/w32api/include/ddk/ntapi.h b/wslapi/include/ddk/ntapi.h similarity index 100% rename from w32api/include/ddk/ntapi.h rename to wslapi/include/ddk/ntapi.h diff --git a/w32api/include/ddk/ntdd8042.h b/wslapi/include/ddk/ntdd8042.h similarity index 100% rename from w32api/include/ddk/ntdd8042.h rename to wslapi/include/ddk/ntdd8042.h diff --git a/w32api/include/ddk/ntddbeep.h b/wslapi/include/ddk/ntddbeep.h similarity index 100% rename from w32api/include/ddk/ntddbeep.h rename to wslapi/include/ddk/ntddbeep.h diff --git a/w32api/include/ddk/ntddcdrm.h b/wslapi/include/ddk/ntddcdrm.h similarity index 100% rename from w32api/include/ddk/ntddcdrm.h rename to wslapi/include/ddk/ntddcdrm.h diff --git a/w32api/include/ddk/ntddcdvd.h b/wslapi/include/ddk/ntddcdvd.h similarity index 100% rename from w32api/include/ddk/ntddcdvd.h rename to wslapi/include/ddk/ntddcdvd.h diff --git a/w32api/include/ddk/ntddchgr.h b/wslapi/include/ddk/ntddchgr.h similarity index 100% rename from w32api/include/ddk/ntddchgr.h rename to wslapi/include/ddk/ntddchgr.h diff --git a/w32api/include/ddk/ntdddisk.h b/wslapi/include/ddk/ntdddisk.h similarity index 100% rename from w32api/include/ddk/ntdddisk.h rename to wslapi/include/ddk/ntdddisk.h diff --git a/w32api/include/ddk/ntddk.h b/wslapi/include/ddk/ntddk.h similarity index 100% rename from w32api/include/ddk/ntddk.h rename to wslapi/include/ddk/ntddk.h diff --git a/w32api/include/ddk/ntddkbd.h b/wslapi/include/ddk/ntddkbd.h similarity index 100% rename from w32api/include/ddk/ntddkbd.h rename to wslapi/include/ddk/ntddkbd.h diff --git a/w32api/include/ddk/ntddmou.h b/wslapi/include/ddk/ntddmou.h similarity index 100% rename from w32api/include/ddk/ntddmou.h rename to wslapi/include/ddk/ntddmou.h diff --git a/w32api/include/ddk/ntddndis.h b/wslapi/include/ddk/ntddndis.h similarity index 100% rename from w32api/include/ddk/ntddndis.h rename to wslapi/include/ddk/ntddndis.h diff --git a/w32api/include/ddk/ntddpar.h b/wslapi/include/ddk/ntddpar.h similarity index 100% rename from w32api/include/ddk/ntddpar.h rename to wslapi/include/ddk/ntddpar.h diff --git a/w32api/include/ddk/ntddpcm.h b/wslapi/include/ddk/ntddpcm.h similarity index 100% rename from w32api/include/ddk/ntddpcm.h rename to wslapi/include/ddk/ntddpcm.h diff --git a/w32api/include/ddk/ntddscsi.h b/wslapi/include/ddk/ntddscsi.h similarity index 100% rename from w32api/include/ddk/ntddscsi.h rename to wslapi/include/ddk/ntddscsi.h diff --git a/w32api/include/ddk/ntddser.h b/wslapi/include/ddk/ntddser.h similarity index 100% rename from w32api/include/ddk/ntddser.h rename to wslapi/include/ddk/ntddser.h diff --git a/w32api/include/ddk/ntddstor.h b/wslapi/include/ddk/ntddstor.h similarity index 100% rename from w32api/include/ddk/ntddstor.h rename to wslapi/include/ddk/ntddstor.h diff --git a/w32api/include/ddk/ntddtape.h b/wslapi/include/ddk/ntddtape.h similarity index 100% rename from w32api/include/ddk/ntddtape.h rename to wslapi/include/ddk/ntddtape.h diff --git a/w32api/include/ddk/ntddtdi.h b/wslapi/include/ddk/ntddtdi.h similarity index 100% rename from w32api/include/ddk/ntddtdi.h rename to wslapi/include/ddk/ntddtdi.h diff --git a/w32api/include/ddk/ntddvdeo.h b/wslapi/include/ddk/ntddvdeo.h similarity index 100% rename from w32api/include/ddk/ntddvdeo.h rename to wslapi/include/ddk/ntddvdeo.h diff --git a/w32api/include/ddk/ntddvol.h b/wslapi/include/ddk/ntddvol.h similarity index 100% rename from w32api/include/ddk/ntddvol.h rename to wslapi/include/ddk/ntddvol.h diff --git a/w32api/include/ddk/ntifs.h b/wslapi/include/ddk/ntifs.h similarity index 100% rename from w32api/include/ddk/ntifs.h rename to wslapi/include/ddk/ntifs.h diff --git a/w32api/include/ddk/ntpoapi.h b/wslapi/include/ddk/ntpoapi.h similarity index 100% rename from w32api/include/ddk/ntpoapi.h rename to wslapi/include/ddk/ntpoapi.h diff --git a/w32api/include/ddk/ntstatus.h b/wslapi/include/ddk/ntstatus.h similarity index 100% rename from w32api/include/ddk/ntstatus.h rename to wslapi/include/ddk/ntstatus.h diff --git a/w32api/include/ddk/parallel.h b/wslapi/include/ddk/parallel.h similarity index 100% rename from w32api/include/ddk/parallel.h rename to wslapi/include/ddk/parallel.h diff --git a/w32api/include/ddk/pfhook.h b/wslapi/include/ddk/pfhook.h similarity index 100% rename from w32api/include/ddk/pfhook.h rename to wslapi/include/ddk/pfhook.h diff --git a/w32api/include/ddk/poclass.h b/wslapi/include/ddk/poclass.h similarity index 100% rename from w32api/include/ddk/poclass.h rename to wslapi/include/ddk/poclass.h diff --git a/w32api/include/ddk/scsi.h b/wslapi/include/ddk/scsi.h similarity index 100% rename from w32api/include/ddk/scsi.h rename to wslapi/include/ddk/scsi.h diff --git a/w32api/include/ddk/scsiscan.h b/wslapi/include/ddk/scsiscan.h similarity index 100% rename from w32api/include/ddk/scsiscan.h rename to wslapi/include/ddk/scsiscan.h diff --git a/w32api/include/ddk/scsiwmi.h b/wslapi/include/ddk/scsiwmi.h similarity index 100% rename from w32api/include/ddk/scsiwmi.h rename to wslapi/include/ddk/scsiwmi.h diff --git a/w32api/include/ddk/smbus.h b/wslapi/include/ddk/smbus.h similarity index 100% rename from w32api/include/ddk/smbus.h rename to wslapi/include/ddk/smbus.h diff --git a/w32api/include/ddk/srb.h b/wslapi/include/ddk/srb.h similarity index 100% rename from w32api/include/ddk/srb.h rename to wslapi/include/ddk/srb.h diff --git a/w32api/include/ddk/storport.h b/wslapi/include/ddk/storport.h similarity index 100% rename from w32api/include/ddk/storport.h rename to wslapi/include/ddk/storport.h diff --git a/w32api/include/ddk/tdi.h b/wslapi/include/ddk/tdi.h similarity index 100% rename from w32api/include/ddk/tdi.h rename to wslapi/include/ddk/tdi.h diff --git a/w32api/include/ddk/tdiinfo.h b/wslapi/include/ddk/tdiinfo.h similarity index 100% rename from w32api/include/ddk/tdiinfo.h rename to wslapi/include/ddk/tdiinfo.h diff --git a/w32api/include/ddk/tdikrnl.h b/wslapi/include/ddk/tdikrnl.h similarity index 100% rename from w32api/include/ddk/tdikrnl.h rename to wslapi/include/ddk/tdikrnl.h diff --git a/w32api/include/ddk/tdistat.h b/wslapi/include/ddk/tdistat.h similarity index 100% rename from w32api/include/ddk/tdistat.h rename to wslapi/include/ddk/tdistat.h diff --git a/w32api/include/ddk/tvout.h b/wslapi/include/ddk/tvout.h similarity index 100% rename from w32api/include/ddk/tvout.h rename to wslapi/include/ddk/tvout.h diff --git a/w32api/include/ddk/upssvc.h b/wslapi/include/ddk/upssvc.h similarity index 100% rename from w32api/include/ddk/upssvc.h rename to wslapi/include/ddk/upssvc.h diff --git a/w32api/include/ddk/usb.h b/wslapi/include/ddk/usb.h similarity index 100% rename from w32api/include/ddk/usb.h rename to wslapi/include/ddk/usb.h diff --git a/w32api/include/ddk/usb100.h b/wslapi/include/ddk/usb100.h similarity index 100% rename from w32api/include/ddk/usb100.h rename to wslapi/include/ddk/usb100.h diff --git a/w32api/include/ddk/usbcamdi.h b/wslapi/include/ddk/usbcamdi.h similarity index 100% rename from w32api/include/ddk/usbcamdi.h rename to wslapi/include/ddk/usbcamdi.h diff --git a/w32api/include/ddk/usbdi.h b/wslapi/include/ddk/usbdi.h similarity index 100% rename from w32api/include/ddk/usbdi.h rename to wslapi/include/ddk/usbdi.h diff --git a/w32api/include/ddk/usbioctl.h b/wslapi/include/ddk/usbioctl.h similarity index 100% rename from w32api/include/ddk/usbioctl.h rename to wslapi/include/ddk/usbioctl.h diff --git a/w32api/include/ddk/usbiodef.h b/wslapi/include/ddk/usbiodef.h similarity index 100% rename from w32api/include/ddk/usbiodef.h rename to wslapi/include/ddk/usbiodef.h diff --git a/w32api/include/ddk/usbscan.h b/wslapi/include/ddk/usbscan.h similarity index 100% rename from w32api/include/ddk/usbscan.h rename to wslapi/include/ddk/usbscan.h diff --git a/w32api/include/ddk/usbuser.h b/wslapi/include/ddk/usbuser.h similarity index 100% rename from w32api/include/ddk/usbuser.h rename to wslapi/include/ddk/usbuser.h diff --git a/w32api/include/ddk/video.h b/wslapi/include/ddk/video.h similarity index 100% rename from w32api/include/ddk/video.h rename to wslapi/include/ddk/video.h diff --git a/w32api/include/ddk/videoagp.h b/wslapi/include/ddk/videoagp.h similarity index 100% rename from w32api/include/ddk/videoagp.h rename to wslapi/include/ddk/videoagp.h diff --git a/w32api/include/ddk/win2k.h b/wslapi/include/ddk/win2k.h similarity index 100% rename from w32api/include/ddk/win2k.h rename to wslapi/include/ddk/win2k.h diff --git a/w32api/include/ddk/winddi.h b/wslapi/include/ddk/winddi.h similarity index 100% rename from w32api/include/ddk/winddi.h rename to wslapi/include/ddk/winddi.h diff --git a/w32api/include/ddk/winddk.h b/wslapi/include/ddk/winddk.h similarity index 100% rename from w32api/include/ddk/winddk.h rename to wslapi/include/ddk/winddk.h diff --git a/w32api/include/ddk/winnt4.h b/wslapi/include/ddk/winnt4.h similarity index 100% rename from w32api/include/ddk/winnt4.h rename to wslapi/include/ddk/winnt4.h diff --git a/w32api/include/ddk/winxp.h b/wslapi/include/ddk/winxp.h similarity index 100% rename from w32api/include/ddk/winxp.h rename to wslapi/include/ddk/winxp.h diff --git a/w32api/include/ddk/ws2san.h b/wslapi/include/ddk/ws2san.h similarity index 100% rename from w32api/include/ddk/ws2san.h rename to wslapi/include/ddk/ws2san.h diff --git a/w32api/include/ddk/xfilter.h b/wslapi/include/ddk/xfilter.h similarity index 100% rename from w32api/include/ddk/xfilter.h rename to wslapi/include/ddk/xfilter.h diff --git a/w32api/include/devguid.h b/wslapi/include/devguid.h similarity index 100% rename from w32api/include/devguid.h rename to wslapi/include/devguid.h diff --git a/w32api/include/dhcpcsdk.h b/wslapi/include/dhcpcsdk.h similarity index 100% rename from w32api/include/dhcpcsdk.h rename to wslapi/include/dhcpcsdk.h diff --git a/w32api/include/directx/d3d9.h b/wslapi/include/directx/d3d9.h similarity index 100% rename from w32api/include/directx/d3d9.h rename to wslapi/include/directx/d3d9.h diff --git a/w32api/include/directx/d3d9caps.h b/wslapi/include/directx/d3d9caps.h similarity index 100% rename from w32api/include/directx/d3d9caps.h rename to wslapi/include/directx/d3d9caps.h diff --git a/w32api/include/directx/d3d9types.h b/wslapi/include/directx/d3d9types.h similarity index 100% rename from w32api/include/directx/d3d9types.h rename to wslapi/include/directx/d3d9types.h diff --git a/w32api/include/directx/dxerr8.h b/wslapi/include/directx/dxerr8.h similarity index 100% rename from w32api/include/directx/dxerr8.h rename to wslapi/include/directx/dxerr8.h diff --git a/w32api/include/directx/dxerr9.h b/wslapi/include/directx/dxerr9.h similarity index 100% rename from w32api/include/directx/dxerr9.h rename to wslapi/include/directx/dxerr9.h diff --git a/w32api/include/dlgs.h b/wslapi/include/dlgs.h similarity index 100% rename from w32api/include/dlgs.h rename to wslapi/include/dlgs.h diff --git a/w32api/include/docobj.h b/wslapi/include/docobj.h similarity index 100% rename from w32api/include/docobj.h rename to wslapi/include/docobj.h diff --git a/w32api/include/dsadmin.h b/wslapi/include/dsadmin.h similarity index 100% rename from w32api/include/dsadmin.h rename to wslapi/include/dsadmin.h diff --git a/w32api/include/dsclient.h b/wslapi/include/dsclient.h similarity index 100% rename from w32api/include/dsclient.h rename to wslapi/include/dsclient.h diff --git a/w32api/include/dsgetdc.h b/wslapi/include/dsgetdc.h similarity index 100% rename from w32api/include/dsgetdc.h rename to wslapi/include/dsgetdc.h diff --git a/w32api/include/dshow.h b/wslapi/include/dshow.h similarity index 100% rename from w32api/include/dshow.h rename to wslapi/include/dshow.h diff --git a/w32api/include/dsquery.h b/wslapi/include/dsquery.h similarity index 100% rename from w32api/include/dsquery.h rename to wslapi/include/dsquery.h diff --git a/w32api/include/dsrole.h b/wslapi/include/dsrole.h similarity index 100% rename from w32api/include/dsrole.h rename to wslapi/include/dsrole.h diff --git a/w32api/include/dvdevcod.h b/wslapi/include/dvdevcod.h similarity index 100% rename from w32api/include/dvdevcod.h rename to wslapi/include/dvdevcod.h diff --git a/w32api/include/dvdmedia.h b/wslapi/include/dvdmedia.h similarity index 100% rename from w32api/include/dvdmedia.h rename to wslapi/include/dvdmedia.h diff --git a/w32api/include/edevdefs.h b/wslapi/include/edevdefs.h similarity index 100% rename from w32api/include/edevdefs.h rename to wslapi/include/edevdefs.h diff --git a/w32api/include/errorrep.h b/wslapi/include/errorrep.h similarity index 100% rename from w32api/include/errorrep.h rename to wslapi/include/errorrep.h diff --git a/w32api/include/errors.h b/wslapi/include/errors.h similarity index 100% rename from w32api/include/errors.h rename to wslapi/include/errors.h diff --git a/w32api/include/evcode.h b/wslapi/include/evcode.h similarity index 100% rename from w32api/include/evcode.h rename to wslapi/include/evcode.h diff --git a/w32api/include/exdisp.h b/wslapi/include/exdisp.h similarity index 100% rename from w32api/include/exdisp.h rename to wslapi/include/exdisp.h diff --git a/w32api/include/exdispid.h b/wslapi/include/exdispid.h similarity index 100% rename from w32api/include/exdispid.h rename to wslapi/include/exdispid.h diff --git a/w32api/include/fltdefs.h b/wslapi/include/fltdefs.h similarity index 100% rename from w32api/include/fltdefs.h rename to wslapi/include/fltdefs.h diff --git a/w32api/include/gdiplus.h b/wslapi/include/gdiplus.h similarity index 100% rename from w32api/include/gdiplus.h rename to wslapi/include/gdiplus.h diff --git a/w32api/include/gdiplus/gdiplus.h b/wslapi/include/gdiplus/gdiplus.h similarity index 100% rename from w32api/include/gdiplus/gdiplus.h rename to wslapi/include/gdiplus/gdiplus.h diff --git a/w32api/include/gdiplus/gdiplusbase.h b/wslapi/include/gdiplus/gdiplusbase.h similarity index 100% rename from w32api/include/gdiplus/gdiplusbase.h rename to wslapi/include/gdiplus/gdiplusbase.h diff --git a/w32api/include/gdiplus/gdiplusbrush.h b/wslapi/include/gdiplus/gdiplusbrush.h similarity index 100% rename from w32api/include/gdiplus/gdiplusbrush.h rename to wslapi/include/gdiplus/gdiplusbrush.h diff --git a/w32api/include/gdiplus/gdipluscolor.h b/wslapi/include/gdiplus/gdipluscolor.h similarity index 100% rename from w32api/include/gdiplus/gdipluscolor.h rename to wslapi/include/gdiplus/gdipluscolor.h diff --git a/w32api/include/gdiplus/gdipluscolormatrix.h b/wslapi/include/gdiplus/gdipluscolormatrix.h similarity index 100% rename from w32api/include/gdiplus/gdipluscolormatrix.h rename to wslapi/include/gdiplus/gdipluscolormatrix.h diff --git a/w32api/include/gdiplus/gdipluseffects.h b/wslapi/include/gdiplus/gdipluseffects.h similarity index 100% rename from w32api/include/gdiplus/gdipluseffects.h rename to wslapi/include/gdiplus/gdipluseffects.h diff --git a/w32api/include/gdiplus/gdiplusenums.h b/wslapi/include/gdiplus/gdiplusenums.h similarity index 100% rename from w32api/include/gdiplus/gdiplusenums.h rename to wslapi/include/gdiplus/gdiplusenums.h diff --git a/w32api/include/gdiplus/gdiplusflat.h b/wslapi/include/gdiplus/gdiplusflat.h similarity index 100% rename from w32api/include/gdiplus/gdiplusflat.h rename to wslapi/include/gdiplus/gdiplusflat.h diff --git a/w32api/include/gdiplus/gdiplusgpstubs.h b/wslapi/include/gdiplus/gdiplusgpstubs.h similarity index 100% rename from w32api/include/gdiplus/gdiplusgpstubs.h rename to wslapi/include/gdiplus/gdiplusgpstubs.h diff --git a/w32api/include/gdiplus/gdiplusgraphics.h b/wslapi/include/gdiplus/gdiplusgraphics.h similarity index 100% rename from w32api/include/gdiplus/gdiplusgraphics.h rename to wslapi/include/gdiplus/gdiplusgraphics.h diff --git a/w32api/include/gdiplus/gdiplusheaders.h b/wslapi/include/gdiplus/gdiplusheaders.h similarity index 100% rename from w32api/include/gdiplus/gdiplusheaders.h rename to wslapi/include/gdiplus/gdiplusheaders.h diff --git a/w32api/include/gdiplus/gdiplusimageattributes.h b/wslapi/include/gdiplus/gdiplusimageattributes.h similarity index 100% rename from w32api/include/gdiplus/gdiplusimageattributes.h rename to wslapi/include/gdiplus/gdiplusimageattributes.h diff --git a/w32api/include/gdiplus/gdiplusimagecodec.h b/wslapi/include/gdiplus/gdiplusimagecodec.h similarity index 100% rename from w32api/include/gdiplus/gdiplusimagecodec.h rename to wslapi/include/gdiplus/gdiplusimagecodec.h diff --git a/w32api/include/gdiplus/gdiplusimaging.h b/wslapi/include/gdiplus/gdiplusimaging.h similarity index 100% rename from w32api/include/gdiplus/gdiplusimaging.h rename to wslapi/include/gdiplus/gdiplusimaging.h diff --git a/w32api/include/gdiplus/gdiplusimpl.h b/wslapi/include/gdiplus/gdiplusimpl.h similarity index 100% rename from w32api/include/gdiplus/gdiplusimpl.h rename to wslapi/include/gdiplus/gdiplusimpl.h diff --git a/w32api/include/gdiplus/gdiplusinit.h b/wslapi/include/gdiplus/gdiplusinit.h similarity index 100% rename from w32api/include/gdiplus/gdiplusinit.h rename to wslapi/include/gdiplus/gdiplusinit.h diff --git a/w32api/include/gdiplus/gdipluslinecaps.h b/wslapi/include/gdiplus/gdipluslinecaps.h similarity index 100% rename from w32api/include/gdiplus/gdipluslinecaps.h rename to wslapi/include/gdiplus/gdipluslinecaps.h diff --git a/w32api/include/gdiplus/gdiplusmatrix.h b/wslapi/include/gdiplus/gdiplusmatrix.h similarity index 100% rename from w32api/include/gdiplus/gdiplusmatrix.h rename to wslapi/include/gdiplus/gdiplusmatrix.h diff --git a/w32api/include/gdiplus/gdiplusmem.h b/wslapi/include/gdiplus/gdiplusmem.h similarity index 100% rename from w32api/include/gdiplus/gdiplusmem.h rename to wslapi/include/gdiplus/gdiplusmem.h diff --git a/w32api/include/gdiplus/gdiplusmetafile.h b/wslapi/include/gdiplus/gdiplusmetafile.h similarity index 100% rename from w32api/include/gdiplus/gdiplusmetafile.h rename to wslapi/include/gdiplus/gdiplusmetafile.h diff --git a/w32api/include/gdiplus/gdiplusmetaheader.h b/wslapi/include/gdiplus/gdiplusmetaheader.h similarity index 100% rename from w32api/include/gdiplus/gdiplusmetaheader.h rename to wslapi/include/gdiplus/gdiplusmetaheader.h diff --git a/w32api/include/gdiplus/gdipluspath.h b/wslapi/include/gdiplus/gdipluspath.h similarity index 100% rename from w32api/include/gdiplus/gdipluspath.h rename to wslapi/include/gdiplus/gdipluspath.h diff --git a/w32api/include/gdiplus/gdipluspen.h b/wslapi/include/gdiplus/gdipluspen.h similarity index 100% rename from w32api/include/gdiplus/gdipluspen.h rename to wslapi/include/gdiplus/gdipluspen.h diff --git a/w32api/include/gdiplus/gdipluspixelformats.h b/wslapi/include/gdiplus/gdipluspixelformats.h similarity index 100% rename from w32api/include/gdiplus/gdipluspixelformats.h rename to wslapi/include/gdiplus/gdipluspixelformats.h diff --git a/w32api/include/gdiplus/gdiplusstringformat.h b/wslapi/include/gdiplus/gdiplusstringformat.h similarity index 100% rename from w32api/include/gdiplus/gdiplusstringformat.h rename to wslapi/include/gdiplus/gdiplusstringformat.h diff --git a/w32api/include/gdiplus/gdiplustypes.h b/wslapi/include/gdiplus/gdiplustypes.h similarity index 100% rename from w32api/include/gdiplus/gdiplustypes.h rename to wslapi/include/gdiplus/gdiplustypes.h diff --git a/w32api/include/httpext.h b/wslapi/include/httpext.h similarity index 100% rename from w32api/include/httpext.h rename to wslapi/include/httpext.h diff --git a/w32api/include/icm.h b/wslapi/include/icm.h similarity index 100% rename from w32api/include/icm.h rename to wslapi/include/icm.h diff --git a/w32api/include/idispids.h b/wslapi/include/idispids.h similarity index 100% rename from w32api/include/idispids.h rename to wslapi/include/idispids.h diff --git a/w32api/include/il21dec.h b/wslapi/include/il21dec.h similarity index 100% rename from w32api/include/il21dec.h rename to wslapi/include/il21dec.h diff --git a/w32api/include/imagehlp.h b/wslapi/include/imagehlp.h similarity index 100% rename from w32api/include/imagehlp.h rename to wslapi/include/imagehlp.h diff --git a/w32api/include/imm.h b/wslapi/include/imm.h similarity index 100% rename from w32api/include/imm.h rename to wslapi/include/imm.h diff --git a/w32api/include/initguid.h b/wslapi/include/initguid.h similarity index 100% rename from w32api/include/initguid.h rename to wslapi/include/initguid.h diff --git a/w32api/include/intshcut.h b/wslapi/include/intshcut.h similarity index 100% rename from w32api/include/intshcut.h rename to wslapi/include/intshcut.h diff --git a/w32api/include/ipexport.h b/wslapi/include/ipexport.h similarity index 100% rename from w32api/include/ipexport.h rename to wslapi/include/ipexport.h diff --git a/w32api/include/iphlpapi.h b/wslapi/include/iphlpapi.h similarity index 100% rename from w32api/include/iphlpapi.h rename to wslapi/include/iphlpapi.h diff --git a/w32api/include/ipifcons.h b/wslapi/include/ipifcons.h similarity index 100% rename from w32api/include/ipifcons.h rename to wslapi/include/ipifcons.h diff --git a/w32api/include/ipinfoid.h b/wslapi/include/ipinfoid.h similarity index 100% rename from w32api/include/ipinfoid.h rename to wslapi/include/ipinfoid.h diff --git a/w32api/include/iprtrmib.h b/wslapi/include/iprtrmib.h similarity index 100% rename from w32api/include/iprtrmib.h rename to wslapi/include/iprtrmib.h diff --git a/w32api/include/iptypes.h b/wslapi/include/iptypes.h similarity index 100% rename from w32api/include/iptypes.h rename to wslapi/include/iptypes.h diff --git a/w32api/include/ipxconst.h b/wslapi/include/ipxconst.h similarity index 100% rename from w32api/include/ipxconst.h rename to wslapi/include/ipxconst.h diff --git a/w32api/include/ipxrtdef.h b/wslapi/include/ipxrtdef.h similarity index 100% rename from w32api/include/ipxrtdef.h rename to wslapi/include/ipxrtdef.h diff --git a/w32api/include/ipxtfflt.h b/wslapi/include/ipxtfflt.h similarity index 100% rename from w32api/include/ipxtfflt.h rename to wslapi/include/ipxtfflt.h diff --git a/w32api/include/isguids.h b/wslapi/include/isguids.h similarity index 100% rename from w32api/include/isguids.h rename to wslapi/include/isguids.h diff --git a/w32api/include/ks.h b/wslapi/include/ks.h similarity index 100% rename from w32api/include/ks.h rename to wslapi/include/ks.h diff --git a/w32api/include/ksmedia.h b/wslapi/include/ksmedia.h similarity index 100% rename from w32api/include/ksmedia.h rename to wslapi/include/ksmedia.h diff --git a/w32api/include/largeint.h b/wslapi/include/largeint.h similarity index 100% rename from w32api/include/largeint.h rename to wslapi/include/largeint.h diff --git a/w32api/include/lm.h b/wslapi/include/lm.h similarity index 100% rename from w32api/include/lm.h rename to wslapi/include/lm.h diff --git a/w32api/include/lmaccess.h b/wslapi/include/lmaccess.h similarity index 100% rename from w32api/include/lmaccess.h rename to wslapi/include/lmaccess.h diff --git a/w32api/include/lmalert.h b/wslapi/include/lmalert.h similarity index 100% rename from w32api/include/lmalert.h rename to wslapi/include/lmalert.h diff --git a/w32api/include/lmapibuf.h b/wslapi/include/lmapibuf.h similarity index 100% rename from w32api/include/lmapibuf.h rename to wslapi/include/lmapibuf.h diff --git a/w32api/include/lmat.h b/wslapi/include/lmat.h similarity index 100% rename from w32api/include/lmat.h rename to wslapi/include/lmat.h diff --git a/w32api/include/lmaudit.h b/wslapi/include/lmaudit.h similarity index 100% rename from w32api/include/lmaudit.h rename to wslapi/include/lmaudit.h diff --git a/w32api/include/lmbrowsr.h b/wslapi/include/lmbrowsr.h similarity index 100% rename from w32api/include/lmbrowsr.h rename to wslapi/include/lmbrowsr.h diff --git a/w32api/include/lmchdev.h b/wslapi/include/lmchdev.h similarity index 100% rename from w32api/include/lmchdev.h rename to wslapi/include/lmchdev.h diff --git a/w32api/include/lmconfig.h b/wslapi/include/lmconfig.h similarity index 100% rename from w32api/include/lmconfig.h rename to wslapi/include/lmconfig.h diff --git a/w32api/include/lmcons.h b/wslapi/include/lmcons.h similarity index 100% rename from w32api/include/lmcons.h rename to wslapi/include/lmcons.h diff --git a/w32api/include/lmerr.h b/wslapi/include/lmerr.h similarity index 100% rename from w32api/include/lmerr.h rename to wslapi/include/lmerr.h diff --git a/w32api/include/lmerrlog.h b/wslapi/include/lmerrlog.h similarity index 100% rename from w32api/include/lmerrlog.h rename to wslapi/include/lmerrlog.h diff --git a/w32api/include/lmmsg.h b/wslapi/include/lmmsg.h similarity index 100% rename from w32api/include/lmmsg.h rename to wslapi/include/lmmsg.h diff --git a/w32api/include/lmremutl.h b/wslapi/include/lmremutl.h similarity index 100% rename from w32api/include/lmremutl.h rename to wslapi/include/lmremutl.h diff --git a/w32api/include/lmrepl.h b/wslapi/include/lmrepl.h similarity index 100% rename from w32api/include/lmrepl.h rename to wslapi/include/lmrepl.h diff --git a/w32api/include/lmserver.h b/wslapi/include/lmserver.h similarity index 100% rename from w32api/include/lmserver.h rename to wslapi/include/lmserver.h diff --git a/w32api/include/lmshare.h b/wslapi/include/lmshare.h similarity index 100% rename from w32api/include/lmshare.h rename to wslapi/include/lmshare.h diff --git a/w32api/include/lmsname.h b/wslapi/include/lmsname.h similarity index 100% rename from w32api/include/lmsname.h rename to wslapi/include/lmsname.h diff --git a/w32api/include/lmstats.h b/wslapi/include/lmstats.h similarity index 100% rename from w32api/include/lmstats.h rename to wslapi/include/lmstats.h diff --git a/w32api/include/lmsvc.h b/wslapi/include/lmsvc.h similarity index 100% rename from w32api/include/lmsvc.h rename to wslapi/include/lmsvc.h diff --git a/w32api/include/lmuse.h b/wslapi/include/lmuse.h similarity index 100% rename from w32api/include/lmuse.h rename to wslapi/include/lmuse.h diff --git a/w32api/include/lmuseflg.h b/wslapi/include/lmuseflg.h similarity index 100% rename from w32api/include/lmuseflg.h rename to wslapi/include/lmuseflg.h diff --git a/w32api/include/lmwksta.h b/wslapi/include/lmwksta.h similarity index 100% rename from w32api/include/lmwksta.h rename to wslapi/include/lmwksta.h diff --git a/w32api/include/lzexpand.h b/wslapi/include/lzexpand.h similarity index 100% rename from w32api/include/lzexpand.h rename to wslapi/include/lzexpand.h diff --git a/w32api/include/mapi.h b/wslapi/include/mapi.h similarity index 100% rename from w32api/include/mapi.h rename to wslapi/include/mapi.h diff --git a/w32api/include/mciavi.h b/wslapi/include/mciavi.h similarity index 100% rename from w32api/include/mciavi.h rename to wslapi/include/mciavi.h diff --git a/w32api/include/mcx.h b/wslapi/include/mcx.h similarity index 100% rename from w32api/include/mcx.h rename to wslapi/include/mcx.h diff --git a/w32api/include/mgm.h b/wslapi/include/mgm.h similarity index 100% rename from w32api/include/mgm.h rename to wslapi/include/mgm.h diff --git a/w32api/include/mgmtapi.h b/wslapi/include/mgmtapi.h similarity index 100% rename from w32api/include/mgmtapi.h rename to wslapi/include/mgmtapi.h diff --git a/w32api/include/mlang.h b/wslapi/include/mlang.h similarity index 100% rename from w32api/include/mlang.h rename to wslapi/include/mlang.h diff --git a/w32api/include/mmreg.h b/wslapi/include/mmreg.h similarity index 100% rename from w32api/include/mmreg.h rename to wslapi/include/mmreg.h diff --git a/w32api/include/mmsystem.h b/wslapi/include/mmsystem.h similarity index 100% rename from w32api/include/mmsystem.h rename to wslapi/include/mmsystem.h diff --git a/w32api/include/mpegtype.h b/wslapi/include/mpegtype.h similarity index 100% rename from w32api/include/mpegtype.h rename to wslapi/include/mpegtype.h diff --git a/w32api/include/mprapi.h b/wslapi/include/mprapi.h similarity index 100% rename from w32api/include/mprapi.h rename to wslapi/include/mprapi.h diff --git a/w32api/include/mq.h b/wslapi/include/mq.h similarity index 100% rename from w32api/include/mq.h rename to wslapi/include/mq.h diff --git a/w32api/include/msacm.h b/wslapi/include/msacm.h similarity index 100% rename from w32api/include/msacm.h rename to wslapi/include/msacm.h diff --git a/w32api/include/mshtml.h b/wslapi/include/mshtml.h similarity index 100% rename from w32api/include/mshtml.h rename to wslapi/include/mshtml.h diff --git a/w32api/include/mswsock.h b/wslapi/include/mswsock.h similarity index 100% rename from w32api/include/mswsock.h rename to wslapi/include/mswsock.h diff --git a/w32api/include/nb30.h b/wslapi/include/nb30.h similarity index 100% rename from w32api/include/nb30.h rename to wslapi/include/nb30.h diff --git a/w32api/include/nddeapi.h b/wslapi/include/nddeapi.h similarity index 100% rename from w32api/include/nddeapi.h rename to wslapi/include/nddeapi.h diff --git a/w32api/include/nspapi.h b/wslapi/include/nspapi.h similarity index 100% rename from w32api/include/nspapi.h rename to wslapi/include/nspapi.h diff --git a/w32api/include/ntdef.h b/wslapi/include/ntdef.h similarity index 100% rename from w32api/include/ntdef.h rename to wslapi/include/ntdef.h diff --git a/w32api/include/ntdll.h b/wslapi/include/ntdll.h similarity index 100% rename from w32api/include/ntdll.h rename to wslapi/include/ntdll.h diff --git a/w32api/include/ntdsapi.h b/wslapi/include/ntdsapi.h similarity index 100% rename from w32api/include/ntdsapi.h rename to wslapi/include/ntdsapi.h diff --git a/w32api/include/ntdsbcli.h b/wslapi/include/ntdsbcli.h similarity index 100% rename from w32api/include/ntdsbcli.h rename to wslapi/include/ntdsbcli.h diff --git a/w32api/include/ntldap.h b/wslapi/include/ntldap.h similarity index 100% rename from w32api/include/ntldap.h rename to wslapi/include/ntldap.h diff --git a/w32api/include/ntsecapi.h b/wslapi/include/ntsecapi.h similarity index 100% rename from w32api/include/ntsecapi.h rename to wslapi/include/ntsecapi.h diff --git a/w32api/include/ntsecpkg.h b/wslapi/include/ntsecpkg.h similarity index 100% rename from w32api/include/ntsecpkg.h rename to wslapi/include/ntsecpkg.h diff --git a/w32api/include/oaidl.h b/wslapi/include/oaidl.h similarity index 100% rename from w32api/include/oaidl.h rename to wslapi/include/oaidl.h diff --git a/w32api/include/objbase.h b/wslapi/include/objbase.h similarity index 100% rename from w32api/include/objbase.h rename to wslapi/include/objbase.h diff --git a/w32api/include/objfwd.h b/wslapi/include/objfwd.h similarity index 100% rename from w32api/include/objfwd.h rename to wslapi/include/objfwd.h diff --git a/w32api/include/objidl.h b/wslapi/include/objidl.h similarity index 100% rename from w32api/include/objidl.h rename to wslapi/include/objidl.h diff --git a/w32api/include/objsafe.h b/wslapi/include/objsafe.h similarity index 100% rename from w32api/include/objsafe.h rename to wslapi/include/objsafe.h diff --git a/w32api/include/objsel.h b/wslapi/include/objsel.h similarity index 100% rename from w32api/include/objsel.h rename to wslapi/include/objsel.h diff --git a/w32api/include/obsolete.h.in b/wslapi/include/obsolete.h.in similarity index 100% rename from w32api/include/obsolete.h.in rename to wslapi/include/obsolete.h.in diff --git a/w32api/include/ocidl.h b/wslapi/include/ocidl.h similarity index 100% rename from w32api/include/ocidl.h rename to wslapi/include/ocidl.h diff --git a/w32api/include/odbcinst.h b/wslapi/include/odbcinst.h similarity index 100% rename from w32api/include/odbcinst.h rename to wslapi/include/odbcinst.h diff --git a/w32api/include/ole.h b/wslapi/include/ole.h similarity index 100% rename from w32api/include/ole.h rename to wslapi/include/ole.h diff --git a/w32api/include/ole2.h b/wslapi/include/ole2.h similarity index 100% rename from w32api/include/ole2.h rename to wslapi/include/ole2.h diff --git a/w32api/include/ole2ver.h b/wslapi/include/ole2ver.h similarity index 100% rename from w32api/include/ole2ver.h rename to wslapi/include/ole2ver.h diff --git a/w32api/include/oleacc.h b/wslapi/include/oleacc.h similarity index 100% rename from w32api/include/oleacc.h rename to wslapi/include/oleacc.h diff --git a/w32api/include/oleauto.h b/wslapi/include/oleauto.h similarity index 100% rename from w32api/include/oleauto.h rename to wslapi/include/oleauto.h diff --git a/w32api/include/olectl.h b/wslapi/include/olectl.h similarity index 100% rename from w32api/include/olectl.h rename to wslapi/include/olectl.h diff --git a/w32api/include/olectlid.h b/wslapi/include/olectlid.h similarity index 100% rename from w32api/include/olectlid.h rename to wslapi/include/olectlid.h diff --git a/w32api/include/oledlg.h b/wslapi/include/oledlg.h similarity index 100% rename from w32api/include/oledlg.h rename to wslapi/include/oledlg.h diff --git a/w32api/include/oleidl.h b/wslapi/include/oleidl.h similarity index 100% rename from w32api/include/oleidl.h rename to wslapi/include/oleidl.h diff --git a/w32api/include/poppack.h b/wslapi/include/poppack.h similarity index 100% rename from w32api/include/poppack.h rename to wslapi/include/poppack.h diff --git a/w32api/include/powrprof.h b/wslapi/include/powrprof.h similarity index 100% rename from w32api/include/powrprof.h rename to wslapi/include/powrprof.h diff --git a/w32api/include/prsht.h b/wslapi/include/prsht.h similarity index 100% rename from w32api/include/prsht.h rename to wslapi/include/prsht.h diff --git a/w32api/include/psapi.h b/wslapi/include/psapi.h similarity index 100% rename from w32api/include/psapi.h rename to wslapi/include/psapi.h diff --git a/w32api/include/pshpack1.h b/wslapi/include/pshpack1.h similarity index 100% rename from w32api/include/pshpack1.h rename to wslapi/include/pshpack1.h diff --git a/w32api/include/pshpack2.h b/wslapi/include/pshpack2.h similarity index 100% rename from w32api/include/pshpack2.h rename to wslapi/include/pshpack2.h diff --git a/w32api/include/pshpack4.h b/wslapi/include/pshpack4.h similarity index 100% rename from w32api/include/pshpack4.h rename to wslapi/include/pshpack4.h diff --git a/w32api/include/pshpack8.h b/wslapi/include/pshpack8.h similarity index 100% rename from w32api/include/pshpack8.h rename to wslapi/include/pshpack8.h diff --git a/w32api/include/qedit.h b/wslapi/include/qedit.h similarity index 100% rename from w32api/include/qedit.h rename to wslapi/include/qedit.h diff --git a/w32api/include/rapi.h b/wslapi/include/rapi.h similarity index 100% rename from w32api/include/rapi.h rename to wslapi/include/rapi.h diff --git a/w32api/include/ras.h b/wslapi/include/ras.h similarity index 100% rename from w32api/include/ras.h rename to wslapi/include/ras.h diff --git a/w32api/include/rasdlg.h b/wslapi/include/rasdlg.h similarity index 100% rename from w32api/include/rasdlg.h rename to wslapi/include/rasdlg.h diff --git a/w32api/include/raserror.h b/wslapi/include/raserror.h similarity index 100% rename from w32api/include/raserror.h rename to wslapi/include/raserror.h diff --git a/w32api/include/rassapi.h b/wslapi/include/rassapi.h similarity index 100% rename from w32api/include/rassapi.h rename to wslapi/include/rassapi.h diff --git a/w32api/include/reason.h b/wslapi/include/reason.h similarity index 100% rename from w32api/include/reason.h rename to wslapi/include/reason.h diff --git a/w32api/include/regstr.h b/wslapi/include/regstr.h similarity index 100% rename from w32api/include/regstr.h rename to wslapi/include/regstr.h diff --git a/w32api/include/richedit.h b/wslapi/include/richedit.h similarity index 100% rename from w32api/include/richedit.h rename to wslapi/include/richedit.h diff --git a/w32api/include/richole.h b/wslapi/include/richole.h similarity index 100% rename from w32api/include/richole.h rename to wslapi/include/richole.h diff --git a/w32api/include/routprot.h b/wslapi/include/routprot.h similarity index 100% rename from w32api/include/routprot.h rename to wslapi/include/routprot.h diff --git a/w32api/include/rpc.h b/wslapi/include/rpc.h similarity index 100% rename from w32api/include/rpc.h rename to wslapi/include/rpc.h diff --git a/w32api/include/rpcdce.h b/wslapi/include/rpcdce.h similarity index 100% rename from w32api/include/rpcdce.h rename to wslapi/include/rpcdce.h diff --git a/w32api/include/rpcdce2.h b/wslapi/include/rpcdce2.h similarity index 100% rename from w32api/include/rpcdce2.h rename to wslapi/include/rpcdce2.h diff --git a/w32api/include/rpcdcep.h b/wslapi/include/rpcdcep.h similarity index 100% rename from w32api/include/rpcdcep.h rename to wslapi/include/rpcdcep.h diff --git a/w32api/include/rpcndr.h b/wslapi/include/rpcndr.h similarity index 100% rename from w32api/include/rpcndr.h rename to wslapi/include/rpcndr.h diff --git a/w32api/include/rpcnsi.h b/wslapi/include/rpcnsi.h similarity index 100% rename from w32api/include/rpcnsi.h rename to wslapi/include/rpcnsi.h diff --git a/w32api/include/rpcnsip.h b/wslapi/include/rpcnsip.h similarity index 100% rename from w32api/include/rpcnsip.h rename to wslapi/include/rpcnsip.h diff --git a/w32api/include/rpcnterr.h b/wslapi/include/rpcnterr.h similarity index 100% rename from w32api/include/rpcnterr.h rename to wslapi/include/rpcnterr.h diff --git a/w32api/include/rpcproxy.h b/wslapi/include/rpcproxy.h similarity index 100% rename from w32api/include/rpcproxy.h rename to wslapi/include/rpcproxy.h diff --git a/w32api/include/rtutils.h b/wslapi/include/rtutils.h similarity index 100% rename from w32api/include/rtutils.h rename to wslapi/include/rtutils.h diff --git a/w32api/include/schannel.h b/wslapi/include/schannel.h similarity index 100% rename from w32api/include/schannel.h rename to wslapi/include/schannel.h diff --git a/w32api/include/schnlsp.h b/wslapi/include/schnlsp.h similarity index 100% rename from w32api/include/schnlsp.h rename to wslapi/include/schnlsp.h diff --git a/w32api/include/scrnsave.h b/wslapi/include/scrnsave.h similarity index 100% rename from w32api/include/scrnsave.h rename to wslapi/include/scrnsave.h diff --git a/w32api/include/sddl.h b/wslapi/include/sddl.h similarity index 100% rename from w32api/include/sddl.h rename to wslapi/include/sddl.h diff --git a/w32api/include/sdkddkver.h b/wslapi/include/sdkddkver.h similarity index 100% rename from w32api/include/sdkddkver.h rename to wslapi/include/sdkddkver.h diff --git a/w32api/include/secext.h b/wslapi/include/secext.h similarity index 100% rename from w32api/include/secext.h rename to wslapi/include/secext.h diff --git a/w32api/include/security.h b/wslapi/include/security.h similarity index 100% rename from w32api/include/security.h rename to wslapi/include/security.h diff --git a/w32api/include/servprov.h b/wslapi/include/servprov.h similarity index 100% rename from w32api/include/servprov.h rename to wslapi/include/servprov.h diff --git a/w32api/include/setupapi.h b/wslapi/include/setupapi.h similarity index 100% rename from w32api/include/setupapi.h rename to wslapi/include/setupapi.h diff --git a/w32api/include/shellapi.h b/wslapi/include/shellapi.h similarity index 100% rename from w32api/include/shellapi.h rename to wslapi/include/shellapi.h diff --git a/w32api/include/shldisp.h b/wslapi/include/shldisp.h similarity index 100% rename from w32api/include/shldisp.h rename to wslapi/include/shldisp.h diff --git a/w32api/include/shlguid.h b/wslapi/include/shlguid.h similarity index 100% rename from w32api/include/shlguid.h rename to wslapi/include/shlguid.h diff --git a/w32api/include/shlobj.h b/wslapi/include/shlobj.h similarity index 100% rename from w32api/include/shlobj.h rename to wslapi/include/shlobj.h diff --git a/w32api/include/shlwapi.h b/wslapi/include/shlwapi.h similarity index 100% rename from w32api/include/shlwapi.h rename to wslapi/include/shlwapi.h diff --git a/w32api/include/shobjidl.h b/wslapi/include/shobjidl.h similarity index 100% rename from w32api/include/shobjidl.h rename to wslapi/include/shobjidl.h diff --git a/w32api/include/snmp.h b/wslapi/include/snmp.h similarity index 100% rename from w32api/include/snmp.h rename to wslapi/include/snmp.h diff --git a/w32api/include/specstrings.h b/wslapi/include/specstrings.h similarity index 100% rename from w32api/include/specstrings.h rename to wslapi/include/specstrings.h diff --git a/w32api/include/sql.h b/wslapi/include/sql.h similarity index 100% rename from w32api/include/sql.h rename to wslapi/include/sql.h diff --git a/w32api/include/sqlext.h b/wslapi/include/sqlext.h similarity index 100% rename from w32api/include/sqlext.h rename to wslapi/include/sqlext.h diff --git a/w32api/include/sqltypes.h b/wslapi/include/sqltypes.h similarity index 100% rename from w32api/include/sqltypes.h rename to wslapi/include/sqltypes.h diff --git a/w32api/include/sqlucode.h b/wslapi/include/sqlucode.h similarity index 100% rename from w32api/include/sqlucode.h rename to wslapi/include/sqlucode.h diff --git a/w32api/include/sspi.h b/wslapi/include/sspi.h similarity index 100% rename from w32api/include/sspi.h rename to wslapi/include/sspi.h diff --git a/w32api/include/stm.h b/wslapi/include/stm.h similarity index 100% rename from w32api/include/stm.h rename to wslapi/include/stm.h diff --git a/w32api/include/strmif.h b/wslapi/include/strmif.h similarity index 100% rename from w32api/include/strmif.h rename to wslapi/include/strmif.h diff --git a/w32api/include/subauth.h b/wslapi/include/subauth.h similarity index 100% rename from w32api/include/subauth.h rename to wslapi/include/subauth.h diff --git a/w32api/include/svcguid.h b/wslapi/include/svcguid.h similarity index 100% rename from w32api/include/svcguid.h rename to wslapi/include/svcguid.h diff --git a/w32api/include/tlhelp32.h b/wslapi/include/tlhelp32.h similarity index 100% rename from w32api/include/tlhelp32.h rename to wslapi/include/tlhelp32.h diff --git a/w32api/include/tmschema.h b/wslapi/include/tmschema.h similarity index 100% rename from w32api/include/tmschema.h rename to wslapi/include/tmschema.h diff --git a/w32api/include/unknwn.h b/wslapi/include/unknwn.h similarity index 100% rename from w32api/include/unknwn.h rename to wslapi/include/unknwn.h diff --git a/w32api/include/userenv.h b/wslapi/include/userenv.h similarity index 100% rename from w32api/include/userenv.h rename to wslapi/include/userenv.h diff --git a/w32api/include/usp10.h b/wslapi/include/usp10.h similarity index 100% rename from w32api/include/usp10.h rename to wslapi/include/usp10.h diff --git a/w32api/include/uxtheme.h b/wslapi/include/uxtheme.h similarity index 100% rename from w32api/include/uxtheme.h rename to wslapi/include/uxtheme.h diff --git a/w32api/include/vfw.h b/wslapi/include/vfw.h similarity index 100% rename from w32api/include/vfw.h rename to wslapi/include/vfw.h diff --git a/w32api/include/vidcap.h b/wslapi/include/vidcap.h similarity index 100% rename from w32api/include/vidcap.h rename to wslapi/include/vidcap.h diff --git a/w32api/include/vmr9.h b/wslapi/include/vmr9.h similarity index 100% rename from w32api/include/vmr9.h rename to wslapi/include/vmr9.h diff --git a/w32api/include/vptype.h b/wslapi/include/vptype.h similarity index 100% rename from w32api/include/vptype.h rename to wslapi/include/vptype.h diff --git a/w32api/include/w32api.h.in b/wslapi/include/w32api.h.in similarity index 100% rename from w32api/include/w32api.h.in rename to wslapi/include/w32api.h.in diff --git a/w32api/include/winbase.h b/wslapi/include/winbase.h similarity index 100% rename from w32api/include/winbase.h rename to wslapi/include/winbase.h diff --git a/w32api/include/winber.h b/wslapi/include/winber.h similarity index 100% rename from w32api/include/winber.h rename to wslapi/include/winber.h diff --git a/w32api/include/wincon.h b/wslapi/include/wincon.h similarity index 100% rename from w32api/include/wincon.h rename to wslapi/include/wincon.h diff --git a/w32api/include/wincrypt.h b/wslapi/include/wincrypt.h similarity index 100% rename from w32api/include/wincrypt.h rename to wslapi/include/wincrypt.h diff --git a/w32api/include/windef.h b/wslapi/include/windef.h similarity index 100% rename from w32api/include/windef.h rename to wslapi/include/windef.h diff --git a/w32api/include/windns.h b/wslapi/include/windns.h similarity index 100% rename from w32api/include/windns.h rename to wslapi/include/windns.h diff --git a/w32api/include/windows.h b/wslapi/include/windows.h similarity index 100% rename from w32api/include/windows.h rename to wslapi/include/windows.h diff --git a/w32api/include/windowsx.h b/wslapi/include/windowsx.h similarity index 100% rename from w32api/include/windowsx.h rename to wslapi/include/windowsx.h diff --git a/w32api/include/winerror.h b/wslapi/include/winerror.h similarity index 100% rename from w32api/include/winerror.h rename to wslapi/include/winerror.h diff --git a/w32api/include/wingdi.h b/wslapi/include/wingdi.h similarity index 100% rename from w32api/include/wingdi.h rename to wslapi/include/wingdi.h diff --git a/w32api/include/wininet.h b/wslapi/include/wininet.h similarity index 100% rename from w32api/include/wininet.h rename to wslapi/include/wininet.h diff --git a/w32api/include/winioctl.h b/wslapi/include/winioctl.h similarity index 100% rename from w32api/include/winioctl.h rename to wslapi/include/winioctl.h diff --git a/w32api/include/winldap.h b/wslapi/include/winldap.h similarity index 100% rename from w32api/include/winldap.h rename to wslapi/include/winldap.h diff --git a/w32api/include/winnetwk.h b/wslapi/include/winnetwk.h similarity index 100% rename from w32api/include/winnetwk.h rename to wslapi/include/winnetwk.h diff --git a/w32api/include/winnls.h b/wslapi/include/winnls.h similarity index 100% rename from w32api/include/winnls.h rename to wslapi/include/winnls.h diff --git a/w32api/include/winnt.h b/wslapi/include/winnt.h similarity index 100% rename from w32api/include/winnt.h rename to wslapi/include/winnt.h diff --git a/w32api/include/winperf.h b/wslapi/include/winperf.h similarity index 100% rename from w32api/include/winperf.h rename to wslapi/include/winperf.h diff --git a/w32api/include/winreg.h b/wslapi/include/winreg.h similarity index 100% rename from w32api/include/winreg.h rename to wslapi/include/winreg.h diff --git a/w32api/include/winresrc.h b/wslapi/include/winresrc.h similarity index 100% rename from w32api/include/winresrc.h rename to wslapi/include/winresrc.h diff --git a/w32api/include/winsnmp.h b/wslapi/include/winsnmp.h similarity index 100% rename from w32api/include/winsnmp.h rename to wslapi/include/winsnmp.h diff --git a/w32api/include/winsock.h b/wslapi/include/winsock.h similarity index 100% rename from w32api/include/winsock.h rename to wslapi/include/winsock.h diff --git a/w32api/include/winsock2.h b/wslapi/include/winsock2.h similarity index 100% rename from w32api/include/winsock2.h rename to wslapi/include/winsock2.h diff --git a/w32api/include/winspool.h b/wslapi/include/winspool.h similarity index 100% rename from w32api/include/winspool.h rename to wslapi/include/winspool.h diff --git a/w32api/include/winsvc.h b/wslapi/include/winsvc.h similarity index 100% rename from w32api/include/winsvc.h rename to wslapi/include/winsvc.h diff --git a/w32api/include/winuser.h b/wslapi/include/winuser.h similarity index 100% rename from w32api/include/winuser.h rename to wslapi/include/winuser.h diff --git a/w32api/include/winver.h b/wslapi/include/winver.h similarity index 100% rename from w32api/include/winver.h rename to wslapi/include/winver.h diff --git a/w32api/include/ws2spi.h b/wslapi/include/ws2spi.h similarity index 100% rename from w32api/include/ws2spi.h rename to wslapi/include/ws2spi.h diff --git a/w32api/include/ws2tcpip.h b/wslapi/include/ws2tcpip.h similarity index 100% rename from w32api/include/ws2tcpip.h rename to wslapi/include/ws2tcpip.h diff --git a/w32api/include/wsahelp.h b/wslapi/include/wsahelp.h similarity index 100% rename from w32api/include/wsahelp.h rename to wslapi/include/wsahelp.h diff --git a/w32api/include/wsipx.h b/wslapi/include/wsipx.h similarity index 100% rename from w32api/include/wsipx.h rename to wslapi/include/wsipx.h diff --git a/w32api/include/wsnetbs.h b/wslapi/include/wsnetbs.h similarity index 100% rename from w32api/include/wsnetbs.h rename to wslapi/include/wsnetbs.h diff --git a/w32api/include/wtsapi32.h b/wslapi/include/wtsapi32.h similarity index 100% rename from w32api/include/wtsapi32.h rename to wslapi/include/wtsapi32.h diff --git a/w32api/include/wtypes.h b/wslapi/include/wtypes.h similarity index 100% rename from w32api/include/wtypes.h rename to wslapi/include/wtypes.h diff --git a/w32api/include/xprtdefs.h b/wslapi/include/xprtdefs.h similarity index 100% rename from w32api/include/xprtdefs.h rename to wslapi/include/xprtdefs.h diff --git a/w32api/include/zmouse.h b/wslapi/include/zmouse.h similarity index 100% rename from w32api/include/zmouse.h rename to wslapi/include/zmouse.h diff --git a/w32api/lib/aclui.def b/wslapi/lib/aclui.def similarity index 100% rename from w32api/lib/aclui.def rename to wslapi/lib/aclui.def diff --git a/w32api/lib/advapi32.def b/wslapi/lib/advapi32.def similarity index 100% rename from w32api/lib/advapi32.def rename to wslapi/lib/advapi32.def diff --git a/w32api/lib/ativscp-uuid.c b/wslapi/lib/ativscp-uuid.c similarity index 100% rename from w32api/lib/ativscp-uuid.c rename to wslapi/lib/ativscp-uuid.c diff --git a/w32api/lib/avicap32.def b/wslapi/lib/avicap32.def similarity index 100% rename from w32api/lib/avicap32.def rename to wslapi/lib/avicap32.def diff --git a/w32api/lib/avifil32.def b/wslapi/lib/avifil32.def similarity index 100% rename from w32api/lib/avifil32.def rename to wslapi/lib/avifil32.def diff --git a/w32api/lib/bthprops.def b/wslapi/lib/bthprops.def similarity index 100% rename from w32api/lib/bthprops.def rename to wslapi/lib/bthprops.def diff --git a/w32api/lib/cap.def b/wslapi/lib/cap.def similarity index 100% rename from w32api/lib/cap.def rename to wslapi/lib/cap.def diff --git a/w32api/lib/cguid-uuid.c b/wslapi/lib/cguid-uuid.c similarity index 100% rename from w32api/lib/cguid-uuid.c rename to wslapi/lib/cguid-uuid.c diff --git a/w32api/lib/comcat-uuid.c b/wslapi/lib/comcat-uuid.c similarity index 100% rename from w32api/lib/comcat-uuid.c rename to wslapi/lib/comcat-uuid.c diff --git a/w32api/lib/comctl32.def b/wslapi/lib/comctl32.def similarity index 100% rename from w32api/lib/comctl32.def rename to wslapi/lib/comctl32.def diff --git a/w32api/lib/comdlg32.def b/wslapi/lib/comdlg32.def similarity index 100% rename from w32api/lib/comdlg32.def rename to wslapi/lib/comdlg32.def diff --git a/w32api/lib/crypt32.def b/wslapi/lib/crypt32.def similarity index 100% rename from w32api/lib/crypt32.def rename to wslapi/lib/crypt32.def diff --git a/w32api/lib/ctl3d32.def b/wslapi/lib/ctl3d32.def similarity index 100% rename from w32api/lib/ctl3d32.def rename to wslapi/lib/ctl3d32.def diff --git a/w32api/lib/ddk/apcups.def b/wslapi/lib/ddk/apcups.def similarity index 100% rename from w32api/lib/ddk/apcups.def rename to wslapi/lib/ddk/apcups.def diff --git a/w32api/lib/ddk/cfgmgr32.def b/wslapi/lib/ddk/cfgmgr32.def similarity index 100% rename from w32api/lib/ddk/cfgmgr32.def rename to wslapi/lib/ddk/cfgmgr32.def diff --git a/w32api/lib/ddk/dxapi.def b/wslapi/lib/ddk/dxapi.def similarity index 100% rename from w32api/lib/ddk/dxapi.def rename to wslapi/lib/ddk/dxapi.def diff --git a/w32api/lib/ddk/hal.def b/wslapi/lib/ddk/hal.def similarity index 100% rename from w32api/lib/ddk/hal.def rename to wslapi/lib/ddk/hal.def diff --git a/w32api/lib/ddk/hid.def b/wslapi/lib/ddk/hid.def similarity index 100% rename from w32api/lib/ddk/hid.def rename to wslapi/lib/ddk/hid.def diff --git a/w32api/lib/ddk/hidparse.def b/wslapi/lib/ddk/hidparse.def similarity index 100% rename from w32api/lib/ddk/hidparse.def rename to wslapi/lib/ddk/hidparse.def diff --git a/w32api/lib/ddk/mcd.def b/wslapi/lib/ddk/mcd.def similarity index 100% rename from w32api/lib/ddk/mcd.def rename to wslapi/lib/ddk/mcd.def diff --git a/w32api/lib/ddk/ndis.def b/wslapi/lib/ddk/ndis.def similarity index 100% rename from w32api/lib/ddk/ndis.def rename to wslapi/lib/ddk/ndis.def diff --git a/w32api/lib/ddk/newdev.def b/wslapi/lib/ddk/newdev.def similarity index 100% rename from w32api/lib/ddk/newdev.def rename to wslapi/lib/ddk/newdev.def diff --git a/w32api/lib/ddk/ntoskrnl.def b/wslapi/lib/ddk/ntoskrnl.def similarity index 100% rename from w32api/lib/ddk/ntoskrnl.def rename to wslapi/lib/ddk/ntoskrnl.def diff --git a/w32api/lib/ddk/scsiport.def b/wslapi/lib/ddk/scsiport.def similarity index 100% rename from w32api/lib/ddk/scsiport.def rename to wslapi/lib/ddk/scsiport.def diff --git a/w32api/lib/ddk/tdi.def b/wslapi/lib/ddk/tdi.def similarity index 100% rename from w32api/lib/ddk/tdi.def rename to wslapi/lib/ddk/tdi.def diff --git a/w32api/lib/ddk/usbcamd.def b/wslapi/lib/ddk/usbcamd.def similarity index 100% rename from w32api/lib/ddk/usbcamd.def rename to wslapi/lib/ddk/usbcamd.def diff --git a/w32api/lib/ddk/usbcamd2.def b/wslapi/lib/ddk/usbcamd2.def similarity index 100% rename from w32api/lib/ddk/usbcamd2.def rename to wslapi/lib/ddk/usbcamd2.def diff --git a/w32api/lib/ddk/videoprt.def b/wslapi/lib/ddk/videoprt.def similarity index 100% rename from w32api/lib/ddk/videoprt.def rename to wslapi/lib/ddk/videoprt.def diff --git a/w32api/lib/ddk/win32k.def b/wslapi/lib/ddk/win32k.def similarity index 100% rename from w32api/lib/ddk/win32k.def rename to wslapi/lib/ddk/win32k.def diff --git a/w32api/lib/devguid.c b/wslapi/lib/devguid.c similarity index 100% rename from w32api/lib/devguid.c rename to wslapi/lib/devguid.c diff --git a/w32api/lib/dhcpcsvc.def b/wslapi/lib/dhcpcsvc.def similarity index 100% rename from w32api/lib/dhcpcsvc.def rename to wslapi/lib/dhcpcsvc.def diff --git a/w32api/lib/directx/d3d8.def b/wslapi/lib/directx/d3d8.def similarity index 100% rename from w32api/lib/directx/d3d8.def rename to wslapi/lib/directx/d3d8.def diff --git a/w32api/lib/directx/d3d9.def b/wslapi/lib/directx/d3d9.def similarity index 100% rename from w32api/lib/directx/d3d9.def rename to wslapi/lib/directx/d3d9.def diff --git a/w32api/lib/directx/d3dim.def b/wslapi/lib/directx/d3dim.def similarity index 100% rename from w32api/lib/directx/d3dim.def rename to wslapi/lib/directx/d3dim.def diff --git a/w32api/lib/directx/d3drm.def b/wslapi/lib/directx/d3drm.def similarity index 100% rename from w32api/lib/directx/d3drm.def rename to wslapi/lib/directx/d3drm.def diff --git a/w32api/lib/directx/d3dx8d.def b/wslapi/lib/directx/d3dx8d.def similarity index 100% rename from w32api/lib/directx/d3dx8d.def rename to wslapi/lib/directx/d3dx8d.def diff --git a/w32api/lib/directx/d3dx9d.def b/wslapi/lib/directx/d3dx9d.def similarity index 100% rename from w32api/lib/directx/d3dx9d.def rename to wslapi/lib/directx/d3dx9d.def diff --git a/w32api/lib/directx/d3dxof.def b/wslapi/lib/directx/d3dxof.def similarity index 100% rename from w32api/lib/directx/d3dxof.def rename to wslapi/lib/directx/d3dxof.def diff --git a/w32api/lib/directx/ddraw.def b/wslapi/lib/directx/ddraw.def similarity index 100% rename from w32api/lib/directx/ddraw.def rename to wslapi/lib/directx/ddraw.def diff --git a/w32api/lib/directx/dinput.def b/wslapi/lib/directx/dinput.def similarity index 100% rename from w32api/lib/directx/dinput.def rename to wslapi/lib/directx/dinput.def diff --git a/w32api/lib/directx/dinput8.def b/wslapi/lib/directx/dinput8.def similarity index 100% rename from w32api/lib/directx/dinput8.def rename to wslapi/lib/directx/dinput8.def diff --git a/w32api/lib/directx/dinput_joy.c b/wslapi/lib/directx/dinput_joy.c similarity index 100% rename from w32api/lib/directx/dinput_joy.c rename to wslapi/lib/directx/dinput_joy.c diff --git a/w32api/lib/directx/dinput_joy2.c b/wslapi/lib/directx/dinput_joy2.c similarity index 100% rename from w32api/lib/directx/dinput_joy2.c rename to wslapi/lib/directx/dinput_joy2.c diff --git a/w32api/lib/directx/dinput_kbd.c b/wslapi/lib/directx/dinput_kbd.c similarity index 100% rename from w32api/lib/directx/dinput_kbd.c rename to wslapi/lib/directx/dinput_kbd.c diff --git a/w32api/lib/directx/dinput_mouse.c b/wslapi/lib/directx/dinput_mouse.c similarity index 100% rename from w32api/lib/directx/dinput_mouse.c rename to wslapi/lib/directx/dinput_mouse.c diff --git a/w32api/lib/directx/dinput_mouse2.c b/wslapi/lib/directx/dinput_mouse2.c similarity index 100% rename from w32api/lib/directx/dinput_mouse2.c rename to wslapi/lib/directx/dinput_mouse2.c diff --git a/w32api/lib/directx/dinput_private.h b/wslapi/lib/directx/dinput_private.h similarity index 100% rename from w32api/lib/directx/dinput_private.h rename to wslapi/lib/directx/dinput_private.h diff --git a/w32api/lib/directx/dmoguids.c b/wslapi/lib/directx/dmoguids.c similarity index 100% rename from w32api/lib/directx/dmoguids.c rename to wslapi/lib/directx/dmoguids.c diff --git a/w32api/lib/directx/dplayx.def b/wslapi/lib/directx/dplayx.def similarity index 100% rename from w32api/lib/directx/dplayx.def rename to wslapi/lib/directx/dplayx.def diff --git a/w32api/lib/directx/dpnaddr.def b/wslapi/lib/directx/dpnaddr.def similarity index 100% rename from w32api/lib/directx/dpnaddr.def rename to wslapi/lib/directx/dpnaddr.def diff --git a/w32api/lib/directx/dpnet.def b/wslapi/lib/directx/dpnet.def similarity index 100% rename from w32api/lib/directx/dpnet.def rename to wslapi/lib/directx/dpnet.def diff --git a/w32api/lib/directx/dpnlobby.def b/wslapi/lib/directx/dpnlobby.def similarity index 100% rename from w32api/lib/directx/dpnlobby.def rename to wslapi/lib/directx/dpnlobby.def diff --git a/w32api/lib/directx/dpvoice.def b/wslapi/lib/directx/dpvoice.def similarity index 100% rename from w32api/lib/directx/dpvoice.def rename to wslapi/lib/directx/dpvoice.def diff --git a/w32api/lib/directx/dsetup.def b/wslapi/lib/directx/dsetup.def similarity index 100% rename from w32api/lib/directx/dsetup.def rename to wslapi/lib/directx/dsetup.def diff --git a/w32api/lib/directx/dsound.def b/wslapi/lib/directx/dsound.def similarity index 100% rename from w32api/lib/directx/dsound.def rename to wslapi/lib/directx/dsound.def diff --git a/w32api/lib/directx/dxerr.c b/wslapi/lib/directx/dxerr.c similarity index 100% rename from w32api/lib/directx/dxerr.c rename to wslapi/lib/directx/dxerr.c diff --git a/w32api/lib/directx/dxerr8.c b/wslapi/lib/directx/dxerr8.c similarity index 100% rename from w32api/lib/directx/dxerr8.c rename to wslapi/lib/directx/dxerr8.c diff --git a/w32api/lib/directx/dxerr8w.c b/wslapi/lib/directx/dxerr8w.c similarity index 100% rename from w32api/lib/directx/dxerr8w.c rename to wslapi/lib/directx/dxerr8w.c diff --git a/w32api/lib/directx/dxerr9.c b/wslapi/lib/directx/dxerr9.c similarity index 100% rename from w32api/lib/directx/dxerr9.c rename to wslapi/lib/directx/dxerr9.c diff --git a/w32api/lib/directx/dxerr9w.c b/wslapi/lib/directx/dxerr9w.c similarity index 100% rename from w32api/lib/directx/dxerr9w.c rename to wslapi/lib/directx/dxerr9w.c diff --git a/w32api/lib/directx/dxguid.c b/wslapi/lib/directx/dxguid.c similarity index 100% rename from w32api/lib/directx/dxguid.c rename to wslapi/lib/directx/dxguid.c diff --git a/w32api/lib/directx/ksproxy.def b/wslapi/lib/directx/ksproxy.def similarity index 100% rename from w32api/lib/directx/ksproxy.def rename to wslapi/lib/directx/ksproxy.def diff --git a/w32api/lib/directx/ksuser.c b/wslapi/lib/directx/ksuser.c similarity index 100% rename from w32api/lib/directx/ksuser.c rename to wslapi/lib/directx/ksuser.c diff --git a/w32api/lib/directx/ksuser.def b/wslapi/lib/directx/ksuser.def similarity index 100% rename from w32api/lib/directx/ksuser.def rename to wslapi/lib/directx/ksuser.def diff --git a/w32api/lib/directx/msdmo.def b/wslapi/lib/directx/msdmo.def similarity index 100% rename from w32api/lib/directx/msdmo.def rename to wslapi/lib/directx/msdmo.def diff --git a/w32api/lib/directx/strmiids.c b/wslapi/lib/directx/strmiids.c similarity index 100% rename from w32api/lib/directx/strmiids.c rename to wslapi/lib/directx/strmiids.c diff --git a/w32api/lib/directx/test.c b/wslapi/lib/directx/test.c similarity index 100% rename from w32api/lib/directx/test.c rename to wslapi/lib/directx/test.c diff --git a/w32api/lib/dlcapi.def b/wslapi/lib/dlcapi.def similarity index 100% rename from w32api/lib/dlcapi.def rename to wslapi/lib/dlcapi.def diff --git a/w32api/lib/dnsapi.def b/wslapi/lib/dnsapi.def similarity index 100% rename from w32api/lib/dnsapi.def rename to wslapi/lib/dnsapi.def diff --git a/w32api/lib/docobj-uuid.c b/wslapi/lib/docobj-uuid.c similarity index 100% rename from w32api/lib/docobj-uuid.c rename to wslapi/lib/docobj-uuid.c diff --git a/w32api/lib/exdisp-uuid.c b/wslapi/lib/exdisp-uuid.c similarity index 100% rename from w32api/lib/exdisp-uuid.c rename to wslapi/lib/exdisp-uuid.c diff --git a/w32api/lib/extras-uuid.c b/wslapi/lib/extras-uuid.c similarity index 100% rename from w32api/lib/extras-uuid.c rename to wslapi/lib/extras-uuid.c diff --git a/w32api/lib/faultrep.def b/wslapi/lib/faultrep.def similarity index 100% rename from w32api/lib/faultrep.def rename to wslapi/lib/faultrep.def diff --git a/w32api/lib/gdi32.def b/wslapi/lib/gdi32.def similarity index 100% rename from w32api/lib/gdi32.def rename to wslapi/lib/gdi32.def diff --git a/w32api/lib/gdiplus.c b/wslapi/lib/gdiplus.c similarity index 100% rename from w32api/lib/gdiplus.c rename to wslapi/lib/gdiplus.c diff --git a/w32api/lib/gdiplus.def b/wslapi/lib/gdiplus.def similarity index 100% rename from w32api/lib/gdiplus.def rename to wslapi/lib/gdiplus.def diff --git a/w32api/lib/glaux.def b/wslapi/lib/glaux.def similarity index 100% rename from w32api/lib/glaux.def rename to wslapi/lib/glaux.def diff --git a/w32api/lib/glu32.def b/wslapi/lib/glu32.def similarity index 100% rename from w32api/lib/glu32.def rename to wslapi/lib/glu32.def diff --git a/w32api/lib/hlguids-uuid.c b/wslapi/lib/hlguids-uuid.c similarity index 100% rename from w32api/lib/hlguids-uuid.c rename to wslapi/lib/hlguids-uuid.c diff --git a/w32api/lib/hlink-uuid.c b/wslapi/lib/hlink-uuid.c similarity index 100% rename from w32api/lib/hlink-uuid.c rename to wslapi/lib/hlink-uuid.c diff --git a/w32api/lib/icmui.def b/wslapi/lib/icmui.def similarity index 100% rename from w32api/lib/icmui.def rename to wslapi/lib/icmui.def diff --git a/w32api/lib/igmpagnt.def b/wslapi/lib/igmpagnt.def similarity index 100% rename from w32api/lib/igmpagnt.def rename to wslapi/lib/igmpagnt.def diff --git a/w32api/lib/imagehlp.def b/wslapi/lib/imagehlp.def similarity index 100% rename from w32api/lib/imagehlp.def rename to wslapi/lib/imagehlp.def diff --git a/w32api/lib/imm32.def b/wslapi/lib/imm32.def similarity index 100% rename from w32api/lib/imm32.def rename to wslapi/lib/imm32.def diff --git a/w32api/lib/iphlpapi.def b/wslapi/lib/iphlpapi.def similarity index 100% rename from w32api/lib/iphlpapi.def rename to wslapi/lib/iphlpapi.def diff --git a/w32api/lib/kernel32.def b/wslapi/lib/kernel32.def similarity index 100% rename from w32api/lib/kernel32.def rename to wslapi/lib/kernel32.def diff --git a/w32api/lib/largeint.c b/wslapi/lib/largeint.c similarity index 100% rename from w32api/lib/largeint.c rename to wslapi/lib/largeint.c diff --git a/w32api/lib/lz32.def b/wslapi/lib/lz32.def similarity index 100% rename from w32api/lib/lz32.def rename to wslapi/lib/lz32.def diff --git a/w32api/lib/mapi32.def b/wslapi/lib/mapi32.def similarity index 100% rename from w32api/lib/mapi32.def rename to wslapi/lib/mapi32.def diff --git a/w32api/lib/mfcuia32.def b/wslapi/lib/mfcuia32.def similarity index 100% rename from w32api/lib/mfcuia32.def rename to wslapi/lib/mfcuia32.def diff --git a/w32api/lib/mgmtapi.def b/wslapi/lib/mgmtapi.def similarity index 100% rename from w32api/lib/mgmtapi.def rename to wslapi/lib/mgmtapi.def diff --git a/w32api/lib/mlang-uuid.c b/wslapi/lib/mlang-uuid.c similarity index 100% rename from w32api/lib/mlang-uuid.c rename to wslapi/lib/mlang-uuid.c diff --git a/w32api/lib/mpr.def b/wslapi/lib/mpr.def similarity index 100% rename from w32api/lib/mpr.def rename to wslapi/lib/mpr.def diff --git a/w32api/lib/mprapi.def b/wslapi/lib/mprapi.def similarity index 100% rename from w32api/lib/mprapi.def rename to wslapi/lib/mprapi.def diff --git a/w32api/lib/mqrt.def b/wslapi/lib/mqrt.def similarity index 100% rename from w32api/lib/mqrt.def rename to wslapi/lib/mqrt.def diff --git a/w32api/lib/msacm32.def b/wslapi/lib/msacm32.def similarity index 100% rename from w32api/lib/msacm32.def rename to wslapi/lib/msacm32.def diff --git a/w32api/lib/mscms.def b/wslapi/lib/mscms.def similarity index 100% rename from w32api/lib/mscms.def rename to wslapi/lib/mscms.def diff --git a/w32api/lib/mshtml-uuid.c b/wslapi/lib/mshtml-uuid.c similarity index 100% rename from w32api/lib/mshtml-uuid.c rename to wslapi/lib/mshtml-uuid.c diff --git a/w32api/lib/msimg32.def b/wslapi/lib/msimg32.def similarity index 100% rename from w32api/lib/msimg32.def rename to wslapi/lib/msimg32.def diff --git a/w32api/lib/msvcp60.def b/wslapi/lib/msvcp60.def similarity index 100% rename from w32api/lib/msvcp60.def rename to wslapi/lib/msvcp60.def diff --git a/w32api/lib/msvfw32.def b/wslapi/lib/msvfw32.def similarity index 100% rename from w32api/lib/msvfw32.def rename to wslapi/lib/msvfw32.def diff --git a/w32api/lib/mswsock.def b/wslapi/lib/mswsock.def similarity index 100% rename from w32api/lib/mswsock.def rename to wslapi/lib/mswsock.def diff --git a/w32api/lib/msxml-uuid.c b/wslapi/lib/msxml-uuid.c similarity index 100% rename from w32api/lib/msxml-uuid.c rename to wslapi/lib/msxml-uuid.c diff --git a/w32api/lib/nddeapi.def b/wslapi/lib/nddeapi.def similarity index 100% rename from w32api/lib/nddeapi.def rename to wslapi/lib/nddeapi.def diff --git a/w32api/lib/netapi32.def b/wslapi/lib/netapi32.def similarity index 100% rename from w32api/lib/netapi32.def rename to wslapi/lib/netapi32.def diff --git a/w32api/lib/ntdll.def b/wslapi/lib/ntdll.def similarity index 100% rename from w32api/lib/ntdll.def rename to wslapi/lib/ntdll.def diff --git a/w32api/lib/oaidl-uuid.c b/wslapi/lib/oaidl-uuid.c similarity index 100% rename from w32api/lib/oaidl-uuid.c rename to wslapi/lib/oaidl-uuid.c diff --git a/w32api/lib/objidl-uuid.c b/wslapi/lib/objidl-uuid.c similarity index 100% rename from w32api/lib/objidl-uuid.c rename to wslapi/lib/objidl-uuid.c diff --git a/w32api/lib/objsafe-uuid.c b/wslapi/lib/objsafe-uuid.c similarity index 100% rename from w32api/lib/objsafe-uuid.c rename to wslapi/lib/objsafe-uuid.c diff --git a/w32api/lib/ocidl-uuid.c b/wslapi/lib/ocidl-uuid.c similarity index 100% rename from w32api/lib/ocidl-uuid.c rename to wslapi/lib/ocidl-uuid.c diff --git a/w32api/lib/odbc32.def b/wslapi/lib/odbc32.def similarity index 100% rename from w32api/lib/odbc32.def rename to wslapi/lib/odbc32.def diff --git a/w32api/lib/odbccp32.def b/wslapi/lib/odbccp32.def similarity index 100% rename from w32api/lib/odbccp32.def rename to wslapi/lib/odbccp32.def diff --git a/w32api/lib/ole32.def b/wslapi/lib/ole32.def similarity index 100% rename from w32api/lib/ole32.def rename to wslapi/lib/ole32.def diff --git a/w32api/lib/oleacc-uuid.c b/wslapi/lib/oleacc-uuid.c similarity index 100% rename from w32api/lib/oleacc-uuid.c rename to wslapi/lib/oleacc-uuid.c diff --git a/w32api/lib/oleacc.def b/wslapi/lib/oleacc.def similarity index 100% rename from w32api/lib/oleacc.def rename to wslapi/lib/oleacc.def diff --git a/w32api/lib/oleaut32.def b/wslapi/lib/oleaut32.def similarity index 100% rename from w32api/lib/oleaut32.def rename to wslapi/lib/oleaut32.def diff --git a/w32api/lib/olecli32.def b/wslapi/lib/olecli32.def similarity index 100% rename from w32api/lib/olecli32.def rename to wslapi/lib/olecli32.def diff --git a/w32api/lib/olectlid-uuid.c b/wslapi/lib/olectlid-uuid.c similarity index 100% rename from w32api/lib/olectlid-uuid.c rename to wslapi/lib/olectlid-uuid.c diff --git a/w32api/lib/oledlg.def b/wslapi/lib/oledlg.def similarity index 100% rename from w32api/lib/oledlg.def rename to wslapi/lib/oledlg.def diff --git a/w32api/lib/oleidl-uuid.c b/wslapi/lib/oleidl-uuid.c similarity index 100% rename from w32api/lib/oleidl-uuid.c rename to wslapi/lib/oleidl-uuid.c diff --git a/w32api/lib/olepro32.def b/wslapi/lib/olepro32.def similarity index 100% rename from w32api/lib/olepro32.def rename to wslapi/lib/olepro32.def diff --git a/w32api/lib/olesvr32.def b/wslapi/lib/olesvr32.def similarity index 100% rename from w32api/lib/olesvr32.def rename to wslapi/lib/olesvr32.def diff --git a/w32api/lib/opengl32.def b/wslapi/lib/opengl32.def similarity index 100% rename from w32api/lib/opengl32.def rename to wslapi/lib/opengl32.def diff --git a/w32api/lib/penwin32.def b/wslapi/lib/penwin32.def similarity index 100% rename from w32api/lib/penwin32.def rename to wslapi/lib/penwin32.def diff --git a/w32api/lib/pkpd32.def b/wslapi/lib/pkpd32.def similarity index 100% rename from w32api/lib/pkpd32.def rename to wslapi/lib/pkpd32.def diff --git a/w32api/lib/power-uuid.c b/wslapi/lib/power-uuid.c similarity index 100% rename from w32api/lib/power-uuid.c rename to wslapi/lib/power-uuid.c diff --git a/w32api/lib/powrprof.def b/wslapi/lib/powrprof.def similarity index 100% rename from w32api/lib/powrprof.def rename to wslapi/lib/powrprof.def diff --git a/w32api/lib/psapi.def b/wslapi/lib/psapi.def similarity index 100% rename from w32api/lib/psapi.def rename to wslapi/lib/psapi.def diff --git a/w32api/lib/quartz.def b/wslapi/lib/quartz.def similarity index 100% rename from w32api/lib/quartz.def rename to wslapi/lib/quartz.def diff --git a/w32api/lib/rapi.def b/wslapi/lib/rapi.def similarity index 100% rename from w32api/lib/rapi.def rename to wslapi/lib/rapi.def diff --git a/w32api/lib/rasapi32.def b/wslapi/lib/rasapi32.def similarity index 100% rename from w32api/lib/rasapi32.def rename to wslapi/lib/rasapi32.def diff --git a/w32api/lib/rasdlg.def b/wslapi/lib/rasdlg.def similarity index 100% rename from w32api/lib/rasdlg.def rename to wslapi/lib/rasdlg.def diff --git a/w32api/lib/res.rc b/wslapi/lib/res.rc similarity index 100% rename from w32api/lib/res.rc rename to wslapi/lib/res.rc diff --git a/w32api/lib/rpcdce4.def b/wslapi/lib/rpcdce4.def similarity index 100% rename from w32api/lib/rpcdce4.def rename to wslapi/lib/rpcdce4.def diff --git a/w32api/lib/rpcns4.def b/wslapi/lib/rpcns4.def similarity index 100% rename from w32api/lib/rpcns4.def rename to wslapi/lib/rpcns4.def diff --git a/w32api/lib/rpcrt4.def b/wslapi/lib/rpcrt4.def similarity index 100% rename from w32api/lib/rpcrt4.def rename to wslapi/lib/rpcrt4.def diff --git a/w32api/lib/rtm.def b/wslapi/lib/rtm.def similarity index 100% rename from w32api/lib/rtm.def rename to wslapi/lib/rtm.def diff --git a/w32api/lib/rtutils.def b/wslapi/lib/rtutils.def similarity index 100% rename from w32api/lib/rtutils.def rename to wslapi/lib/rtutils.def diff --git a/w32api/lib/scrnsave.c b/wslapi/lib/scrnsave.c similarity index 100% rename from w32api/lib/scrnsave.c rename to wslapi/lib/scrnsave.c diff --git a/w32api/lib/secur32.def b/wslapi/lib/secur32.def similarity index 100% rename from w32api/lib/secur32.def rename to wslapi/lib/secur32.def diff --git a/w32api/lib/servprov-uuid.c b/wslapi/lib/servprov-uuid.c similarity index 100% rename from w32api/lib/servprov-uuid.c rename to wslapi/lib/servprov-uuid.c diff --git a/w32api/lib/setupapi.def b/wslapi/lib/setupapi.def similarity index 100% rename from w32api/lib/setupapi.def rename to wslapi/lib/setupapi.def diff --git a/w32api/lib/shell32.c b/wslapi/lib/shell32.c similarity index 100% rename from w32api/lib/shell32.c rename to wslapi/lib/shell32.c diff --git a/w32api/lib/shell32.def b/wslapi/lib/shell32.def similarity index 100% rename from w32api/lib/shell32.def rename to wslapi/lib/shell32.def diff --git a/w32api/lib/shfolder.def b/wslapi/lib/shfolder.def similarity index 100% rename from w32api/lib/shfolder.def rename to wslapi/lib/shfolder.def diff --git a/w32api/lib/shlwapi.def b/wslapi/lib/shlwapi.def similarity index 100% rename from w32api/lib/shlwapi.def rename to wslapi/lib/shlwapi.def diff --git a/w32api/lib/shobjidl-uuid.c b/wslapi/lib/shobjidl-uuid.c similarity index 100% rename from w32api/lib/shobjidl-uuid.c rename to wslapi/lib/shobjidl-uuid.c diff --git a/w32api/lib/snmpapi.def b/wslapi/lib/snmpapi.def similarity index 100% rename from w32api/lib/snmpapi.def rename to wslapi/lib/snmpapi.def diff --git a/w32api/lib/svrapi.def b/wslapi/lib/svrapi.def similarity index 100% rename from w32api/lib/svrapi.def rename to wslapi/lib/svrapi.def diff --git a/w32api/lib/tapi32.def b/wslapi/lib/tapi32.def similarity index 100% rename from w32api/lib/tapi32.def rename to wslapi/lib/tapi32.def diff --git a/w32api/lib/test.c b/wslapi/lib/test.c similarity index 100% rename from w32api/lib/test.c rename to wslapi/lib/test.c diff --git a/w32api/lib/thunk32.def b/wslapi/lib/thunk32.def similarity index 100% rename from w32api/lib/thunk32.def rename to wslapi/lib/thunk32.def diff --git a/w32api/lib/unknwn-uuid.c b/wslapi/lib/unknwn-uuid.c similarity index 100% rename from w32api/lib/unknwn-uuid.c rename to wslapi/lib/unknwn-uuid.c diff --git a/w32api/lib/url.def b/wslapi/lib/url.def similarity index 100% rename from w32api/lib/url.def rename to wslapi/lib/url.def diff --git a/w32api/lib/urlmon-uuid.c b/wslapi/lib/urlmon-uuid.c similarity index 100% rename from w32api/lib/urlmon-uuid.c rename to wslapi/lib/urlmon-uuid.c diff --git a/w32api/lib/user32.def b/wslapi/lib/user32.def similarity index 100% rename from w32api/lib/user32.def rename to wslapi/lib/user32.def diff --git a/w32api/lib/userenv.def b/wslapi/lib/userenv.def similarity index 100% rename from w32api/lib/userenv.def rename to wslapi/lib/userenv.def diff --git a/w32api/lib/usp10.def b/wslapi/lib/usp10.def similarity index 100% rename from w32api/lib/usp10.def rename to wslapi/lib/usp10.def diff --git a/w32api/lib/uxtheme.def b/wslapi/lib/uxtheme.def similarity index 100% rename from w32api/lib/uxtheme.def rename to wslapi/lib/uxtheme.def diff --git a/w32api/lib/vdmdbg.def b/wslapi/lib/vdmdbg.def similarity index 100% rename from w32api/lib/vdmdbg.def rename to wslapi/lib/vdmdbg.def diff --git a/w32api/lib/version.def b/wslapi/lib/version.def similarity index 100% rename from w32api/lib/version.def rename to wslapi/lib/version.def diff --git a/w32api/lib/vfw32.mri b/wslapi/lib/vfw32.mri similarity index 100% rename from w32api/lib/vfw32.mri rename to wslapi/lib/vfw32.mri diff --git a/w32api/lib/win32spl.def b/wslapi/lib/win32spl.def similarity index 100% rename from w32api/lib/win32spl.def rename to wslapi/lib/win32spl.def diff --git a/w32api/lib/wininet.def b/wslapi/lib/wininet.def similarity index 100% rename from w32api/lib/wininet.def rename to wslapi/lib/wininet.def diff --git a/w32api/lib/winmm.def b/wslapi/lib/winmm.def similarity index 100% rename from w32api/lib/winmm.def rename to wslapi/lib/winmm.def diff --git a/w32api/lib/winspool.def b/wslapi/lib/winspool.def similarity index 100% rename from w32api/lib/winspool.def rename to wslapi/lib/winspool.def diff --git a/w32api/lib/winstrm.def b/wslapi/lib/winstrm.def similarity index 100% rename from w32api/lib/winstrm.def rename to wslapi/lib/winstrm.def diff --git a/w32api/lib/wldap32.def b/wslapi/lib/wldap32.def similarity index 100% rename from w32api/lib/wldap32.def rename to wslapi/lib/wldap32.def diff --git a/w32api/lib/wow32.def b/wslapi/lib/wow32.def similarity index 100% rename from w32api/lib/wow32.def rename to wslapi/lib/wow32.def diff --git a/w32api/lib/ws2_32.c b/wslapi/lib/ws2_32.c similarity index 100% rename from w32api/lib/ws2_32.c rename to wslapi/lib/ws2_32.c diff --git a/w32api/lib/ws2_32.def b/wslapi/lib/ws2_32.def similarity index 100% rename from w32api/lib/ws2_32.def rename to wslapi/lib/ws2_32.def diff --git a/w32api/lib/wsnmp32.def b/wslapi/lib/wsnmp32.def similarity index 100% rename from w32api/lib/wsnmp32.def rename to wslapi/lib/wsnmp32.def diff --git a/w32api/lib/wsock32.def b/wslapi/lib/wsock32.def similarity index 100% rename from w32api/lib/wsock32.def rename to wslapi/lib/wsock32.def diff --git a/w32api/lib/wst.def b/wslapi/lib/wst.def similarity index 100% rename from w32api/lib/wst.def rename to wslapi/lib/wst.def diff --git a/w32api/lib/wtsapi32.def b/wslapi/lib/wtsapi32.def similarity index 100% rename from w32api/lib/wtsapi32.def rename to wslapi/lib/wtsapi32.def diff --git a/w32api/tests/Makefile.in b/wslapi/tests/Makefile.in similarity index 100% rename from w32api/tests/Makefile.in rename to wslapi/tests/Makefile.in diff --git a/w32api/tests/atlocal.in b/wslapi/tests/atlocal.in similarity index 100% rename from w32api/tests/atlocal.in rename to wslapi/tests/atlocal.in diff --git a/w32api/tests/headers.at b/wslapi/tests/headers.at similarity index 100% rename from w32api/tests/headers.at rename to wslapi/tests/headers.at diff --git a/w32api/tests/testsuite.at.in b/wslapi/tests/testsuite.at.in similarity index 100% rename from w32api/tests/testsuite.at.in rename to wslapi/tests/testsuite.at.in diff --git a/w32api/tests/winsock.at b/wslapi/tests/winsock.at similarity index 100% rename from w32api/tests/winsock.at rename to wslapi/tests/winsock.at