@@ -49,33 +49,29 @@ static const char* detectWithWmi(FFlist* result) {
4949
5050 ULONG status = WmiOpenBlock (& WmiMonitorBrightnessGuid , WMIGUID_QUERY , & hBlock );
5151 if (status != 0 ) {
52- FF_DEBUG ("WMI: WmiOpenBlock failed, status=%lu, error=% s" , status , ffDebugWin32Error (GetLastError () ));
52+ FF_DEBUG ("WMI: WmiOpenBlock failed: % s" , ffDebugWin32Error (status ));
5353 return "WmiOpenBlock() failed" ;
5454 }
5555
5656 ULONG bufferSize = 0 ;
5757 status = WmiQueryAllDataW (hBlock , & bufferSize , NULL );
5858 if (status != ERROR_SUCCESS && status != ERROR_INSUFFICIENT_BUFFER ) {
59- FF_DEBUG ("WMI: first WmiQueryAllDataW failed, status=%lu, bufferSize=%lu, error= %s" , status , bufferSize , ffDebugWin32Error (GetLastError () ));
59+ FF_DEBUG ("WMI: first WmiQueryAllDataW failed, bufferSize=%lu: %s" , bufferSize , ffDebugWin32Error (status ));
6060 return "WmiQueryAllDataW() failed" ;
6161 }
6262
63- FF_DEBUG ("WMI: initial query status=%lu, bufferSize=%lu" , status , bufferSize );
63+ FF_DEBUG ("WMI: initial query bufferSize=%lu" , bufferSize );
6464
6565 if (bufferSize == 0 ) {
6666 FF_DEBUG ("WMI: WmiQueryAllDataW returned empty buffer" );
6767 return "WmiQueryAllDataW() returned no data" ;
6868 }
6969
7070 FF_AUTO_FREE PWNODE_ALL_DATA pAllData = (PWNODE_ALL_DATA ) malloc (bufferSize );
71- if (!pAllData ) {
72- FF_DEBUG ("WMI: malloc failed, bufferSize=%lu" , bufferSize );
73- return "malloc() failed" ;
74- }
7571
7672 status = WmiQueryAllDataW (hBlock , & bufferSize , pAllData );
7773 if (status != ERROR_SUCCESS ) {
78- FF_DEBUG ("WMI: second WmiQueryAllDataW failed, status=%lu, bufferSize=%lu, error= %s" , status , bufferSize , ffDebugWin32Error (GetLastError () ));
74+ FF_DEBUG ("WMI: second WmiQueryAllDataW failed, bufferSize=%lu: %s" , bufferSize , ffDebugWin32Error (status ));
7975 return "WmiQueryAllDataW() failed" ;
8076 }
8177
@@ -133,7 +129,7 @@ static const char* detectWithDdcci(const FFDisplayServerResult* displayServer, F
133129
134130 void * gdi32 = ffLibraryGetModule (L"gdi32.dll" );
135131 if (!gdi32 ) {
136- FF_DEBUG ("DDC/CI: failed to load gdi32.dll: %s" , ffDebugWin32Error ( GetLastError ()) );
132+ FF_DEBUG ("DDC/CI: failed to load gdi32.dll" );
137133 return "ffLibraryGetModule(gdi32.dll) failed" ;
138134 }
139135 FF_LIBRARY_LOAD_SYMBOL_MESSAGE (gdi32 , GetPhysicalMonitors )
0 commit comments