Started update of dwrite, update gdi32, iphlpapi, kernelbase, ntext, …

…powrprof, shell32 and user32.
Skulltrail192 · Dec 6, 2023 · be10123 · be10123
1 parent 2e3c0b4
commit be10123
Show file tree

Hide file tree

Showing 26 changed files with 495 additions and 1,326 deletions.
diff --git a/wrappers/base/comdlg32_wrapper/itemdlg.c b/wrappers/base/comdlg32_wrapper/itemdlg.c
@@ -2460,8 +2460,8 @@ static HRESULT create_dialog(FileDialogImpl *This, HWND parent)
         ERR("Failed to show dialog (LastError: %ld)\n", GetLastError());
         return E_FAIL;
     }else{
-		//IShellItem *shellItem;
-		SHCreateItemFromParsingName(ofn.lpstrFile,NULL,&IID_IShellItem, &This->psia_result);
+		IShellItem *shellItem;
+		SHCreateItemFromParsingName(ofn.lpstrFile,NULL,&IID_IShellItem, IID_PPV_ARGS(&shellItem));
 		// SHCreateShellItemArrayFromShellItem(&shellItem,&IID_IShellItemArray, (void**)&This->psia_results);
 	}
 

diff --git a/wrappers/base/gdi32_wrapper/CMakeLists.txt b/wrappers/base/gdi32_wrapper/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/3rdparty/freetype/include/free
 spec2def(gdi32_wrapper.dll gdi32_wrapper.spec)
 
 if(ARCH STREQUAL "amd64")
-	set(baseaddress_gdi32_wrapper     0x7c3e0000)
+	set(baseaddress_gdi32_wrapper     0x7FC90000)
 elseif(ARCH STREQUAL "i386")
 	set(baseaddress_gdi32_wrapper     0x7c4c0000)
 endif()

diff --git a/wrappers/base/gdi32_wrapper/d3dkmt.c b/wrappers/base/gdi32_wrapper/d3dkmt.c
@@ -33,6 +33,11 @@
 
 #define D3DKMT_MAX_ADAPTER_NAME_LENGTH 32
 
+typedef struct _D3DKMT_CHECKSHAREDRESOURCEACCESS {
+  D3DKMT_HANDLE hResource;
+  UINT          ClientPid;
+} D3DKMT_CHECKSHAREDRESOURCEACCESS;
+
 /*Hack, i don't know how require these funcions really*/
 DWORD
 APIENTRY
@@ -654,4 +659,38 @@ D3DKMTQueryVideoMemoryInfo(
     }
 
     return Ret;	
+}
+
+NTSTATUS
+WINAPI
+D3DKMTCheckSharedResourceAccess(
+  const D3DKMT_CHECKSHAREDRESOURCEACCESS *unnamedParam1
+)
+{
+	if(unnamedParam1->ClientPid == GetCurrentProcessId())
+		return STATUS_SUCCESS;
+	else
+		return STATUS_INVALID_PARAMETER;
+}
+
+BOOL
+WINAPI
+NtGdiBeginGdiRendering(
+    HBITMAP hbm,
+    BOOL bDiscard
+)
+{
+	return TRUE;
+}
+
+BOOL
+WINAPI
+NtGdiEndGdiRendering(
+    HBITMAP hbm,
+    BOOL bDiscard,
+    BOOL* pbDeviceRemoved
+)
+{
+	*pbDeviceRemoved = TRUE;
+	return TRUE;	
 }
diff --git a/wrappers/base/gdi32_wrapper/gdi32_wrapper.spec b/wrappers/base/gdi32_wrapper/gdi32_wrapper.spec
@@ -610,6 +610,7 @@
 
 #Vista functions
 @ stdcall D3DKMTCheckMonitorPowerState(ptr)
+@ stdcall D3DKMTCheckSharedResourceAccess(ptr)
 @ stdcall D3DKMTCheckVidPnExclusiveOwnership(ptr)
 #@ stdcall D3DKMTCloseAdapter(ptr)
 @ stdcall D3DKMTCreateDCFromMemory(ptr) gdibase.D3DKMTCreateDCFromMemory
@@ -679,6 +680,9 @@
 @ stdcall D3DKMTWaitForVerticalBlankEvent(ptr) d3dkmt.D3DKMTWaitForVerticalBlankEvent
 
 #Win7 functions
+@ stdcall BeginGdiRendering(long long) NtGdiBeginGdiRendering
+@ stdcall EndGdiRendering(long long ptr) NtGdiEndGdiRendering
+@ stdcall CreateBitmapFromDxSurface(long long long long ptr) gdibase.CreateBitmapFromDxSurface
 @ stdcall GetFontFileData(long long int64 ptr long)
 @ stdcall GetFontFileInfo(long long ptr long long)
 @ stdcall GetFontRealizationInfo(long ptr)

diff --git a/wrappers/base/iphlpapi_wrapper/CMakeLists.txt b/wrappers/base/iphlpapi_wrapper/CMakeLists.txt
@@ -10,8 +10,12 @@ list(APPEND SOURCE
     ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi_wrapper_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/iphlpapi_wrapper.def)
 
-set(baseaddress_iphlpapi_wrapper     0x7c3e0000)	
-
+if(ARCH STREQUAL "amd64")
+	set(baseaddress_iphlpapi_wrapper     0x76CF0000)
+elseif(ARCH STREQUAL "i386")
+	set(baseaddress_iphlpapi_wrapper     0x7c3e0000)
+endif()
+
 add_library(iphlpapi_wrapper SHARED ${SOURCE})
 set_module_type(iphlpapi_wrapper win32dll)
 target_link_libraries(iphlpapi_wrapper wine tdilib)