fix remaining build issue

Author: DarkFire01

dll/win32/kernel32/kernel32.spec

@@ -174,7 +174,7 @@
 @ stdcall -stub -version=0x600+ CreateThreadpoolIo(ptr ptr ptr ptr)
 @ stdcall -stub -version=0x600+ CreateThreadpoolTimer(ptr ptr ptr)
 @ stdcall -stub -version=0x600+ CreateThreadpoolWait(ptr ptr ptr)
-@ stdcall -version=0x600+ CreateThreadpoolWork(ptr ptr ptr)
+@ stdcall -version=0x600+ CreateThreadpoolWork(ptr ptr ptr) ntdll.TpAllocWork
 @ stdcall CreateTimerQueue()
 @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long)
 @ stdcall CreateToolhelp32Snapshot(long long)

sdk/include/wine/CMakeLists.txt

@@ -1,6 +1,2 @@
 
-<<<<<<< HEAD
-add_idl_headers(wineheaders fil_data.idl iaccessible2.idl irot.idl irpcss.idl itss.idl orpc.idl)
-=======
-add_idl_headers(wineheaders fil_data.idl irot.idl irpcss.idl itss.idl orpc.idl winedxgi.idl)
->>>>>>> af250d9dc4e ([SDK][DIRECTX:WINE] Build the New WINED3D Stack)
+add_idl_headers(wineheaders fil_data.idl iaccessible2.idl irot.idl irpcss.idl itss.idl orpc.idl winedxgi.idl)

sdk/lib/CMakeLists.txt

@@ -62,7 +62,6 @@ add_subdirectory(vcstartup)
 add_subdirectory(vkd3d)
 add_subdirectory(wine2ros)
 add_subdirectory(wdmguid)
-add_subdirectory(wine2ros)
 
 else()