Add ReportEvent to _winapi

Author: aisk

Include/internal/pycore_global_objects_fini_generated.h

@@ -428,6 +428,9 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(env)
         STRUCT_FOR_ID(errors)
         STRUCT_FOR_ID(event)
+        STRUCT_FOR_ID(event_category)
+        STRUCT_FOR_ID(event_id)
+        STRUCT_FOR_ID(event_type)
         STRUCT_FOR_ID(eventmask)
         STRUCT_FOR_ID(exc)
         STRUCT_FOR_ID(exc_type)
@@ -681,6 +684,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(query)
         STRUCT_FOR_ID(quotetabs)
         STRUCT_FOR_ID(raw)
+        STRUCT_FOR_ID(raw_data)
         STRUCT_FOR_ID(read)
         STRUCT_FOR_ID(read1)
         STRUCT_FOR_ID(readable)
@@ -740,7 +744,6 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(sock)
         STRUCT_FOR_ID(sort)
         STRUCT_FOR_ID(source)
-        STRUCT_FOR_ID(source_name)
         STRUCT_FOR_ID(source_traceback)
         STRUCT_FOR_ID(spam)
         STRUCT_FOR_ID(src)
@@ -760,6 +763,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(strict)
         STRUCT_FOR_ID(strict_mode)
         STRUCT_FOR_ID(string)
+        STRUCT_FOR_ID(strings)
         STRUCT_FOR_ID(sub_key)
         STRUCT_FOR_ID(subcalls)
         STRUCT_FOR_ID(symmetric_difference_update)
@@ -800,7 +804,6 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(tzinfo)
         STRUCT_FOR_ID(tzname)
         STRUCT_FOR_ID(uid)
-        STRUCT_FOR_ID(unc_server_name)
         STRUCT_FOR_ID(unlink)
         STRUCT_FOR_ID(unraisablehook)
         STRUCT_FOR_ID(updates)

Include/internal/pycore_global_strings.h

@@ -163,10 +163,32 @@ def test_event_source_registration(self):
         handle = _winapi.RegisterEventSource(None, source_name)
         self.assertNotEqual(handle, _winapi.INVALID_HANDLE_VALUE)
 
-        _winapi.DeregisterEventSource(handle)
+        # Test ReportEvent with the registered event source
+        try:
+            # Test with strings and raw data
+            test_strings = ["Test message 1", "Test message 2"]
+            test_data = b"test raw data"
+            _winapi.ReportEvent(handle, 4, 1, 1002, test_strings, test_data)
+
+            # Test with empty strings list
+            # _winapi.ReportEvent(handle, 2, 0, 1003, [], None) # TODO
+        finally:
+            _winapi.DeregisterEventSource(handle)
 
         with self.assertRaises(OSError):
             _winapi.RegisterEventSource(None, "")
 
         with self.assertRaises(OSError):
             _winapi.DeregisterEventSource(_winapi.INVALID_HANDLE_VALUE)
+
+        # Test ReportEvent with invalid handle
+        with self.assertRaises(OSError):
+            _winapi.ReportEvent(_winapi.INVALID_HANDLE_VALUE, 1, 0, 1001, [], test_data)
+
+        # Test ReportEvent with invalid string types
+        handle2 = _winapi.RegisterEventSource(None, "PythonTestEventSource2")
+        try:
+            with self.assertRaises(TypeError):
+                _winapi.ReportEvent(handle2, 1, 0, 1001, ["string", 123], test_data)
+        finally:
+            _winapi.DeregisterEventSource(handle2)

Include/internal/pycore_runtime_init_generated.h

@@ -2985,17 +2985,18 @@ _winapi.RegisterEventSource -> HANDLE
         If NULL, registers the event source on the local computer.
     source_name: LPCWSTR
         The name of the event source to register.
+    /
 [clinic start generated code]*/
 
 static HANDLE
 _winapi_RegisterEventSource_impl(PyObject *module, LPCWSTR unc_server_name,
                                  LPCWSTR source_name)
-/*[clinic end generated code: output=e376c8950a89ae8f input=ee83ab132b89b99c]*/
+/*[clinic end generated code: output=e376c8950a89ae8f input=16ae3c812a905cab]*/
 {
     HANDLE handle;
 
     Py_BEGIN_ALLOW_THREADS
-    handle = RegisterEventSource(unc_server_name, source_name);
+    handle = RegisterEventSourceW(unc_server_name, source_name);
     Py_END_ALLOW_THREADS
 
     if (handle == NULL) {
@@ -3011,11 +3012,12 @@ _winapi.DeregisterEventSource
 
     handle: HANDLE
         The handle to the event log to be deregistered.
+    /
 [clinic start generated code]*/
 
 static PyObject *
 _winapi_DeregisterEventSource_impl(PyObject *module, HANDLE handle)
-/*[clinic end generated code: output=7387ff34c7358bce input=07d42083b03ba7b0]*/
+/*[clinic end generated code: output=7387ff34c7358bce input=0973c68eddcfd5a7]*/
 {
     BOOL success;
 
@@ -3029,6 +3031,92 @@ _winapi_DeregisterEventSource_impl(PyObject *module, HANDLE handle)
     Py_RETURN_NONE;
 }
 
+/*[clinic input]
+_winapi.ReportEvent
+
+    handle: HANDLE
+        The handle to the event log.
+    event_type: int
+        The type of event being reported.
+    event_category: int
+        The event category.
+    event_id: int
+        The event identifier.
+    strings: object(subclass_of='&PyList_Type')
+        A list of strings to be inserted into the event message.
+    raw_data: Py_buffer
+        The raw data for the event.
+[clinic start generated code]*/
+
+static PyObject *
+_winapi_ReportEvent_impl(PyObject *module, HANDLE handle, int event_type,
+                         int event_category, int event_id, PyObject *strings,
+                         Py_buffer *raw_data)
+/*[clinic end generated code: output=9066f114cdfdf5f2 input=fc37cfe1816d02d7]*/
+{
+    BOOL success;
+    LPCWSTR *string_array = NULL;
+    WORD num_strings = 0;
+    LPVOID data = NULL;
+    DWORD data_size = 0;
+
+    // Handle strings list
+    if (strings != Py_None && PyList_Check(strings)) {
+        Py_ssize_t size = PyList_Size(strings);
+        num_strings = (WORD)size;
+
+        if (num_strings > 0) {
+            string_array = (LPCWSTR *)PyMem_Malloc(num_strings * sizeof(LPCWSTR));
+            if (!string_array) {
+                return PyErr_NoMemory();
+            }
+
+            for (WORD i = 0; i < num_strings; i++) {
+                PyObject *item = PyList_GetItem(strings, i);
+                if (!PyUnicode_Check(item)) {
+                    PyMem_Free(string_array);
+                    PyErr_SetString(PyExc_TypeError, "All strings must be unicode");
+                    return NULL;
+                }
+                string_array[i] = PyUnicode_AsWideCharString(item, NULL);
+                if (!string_array[i]) {
+                    // Clean up already allocated strings
+                    for (WORD j = 0; j < i; j++) {
+                        PyMem_Free((void *)string_array[j]);
+                    }
+                    PyMem_Free(string_array);
+                    return NULL;
+                }
+            }
+        }
+    }
+
+    // Handle raw data
+    if (raw_data->buf != NULL) {
+        data = raw_data->buf;
+        data_size = (DWORD) raw_data->len;
+    }
+
+    Py_BEGIN_ALLOW_THREADS
+    success = ReportEventW(handle, event_type, event_category, event_id,
+                          NULL, num_strings, data_size,
+                          string_array, data);
+    Py_END_ALLOW_THREADS
+
+    // Clean up allocated strings
+    if (string_array) {
+        for (WORD i = 0; i < num_strings; i++) {
+            PyMem_Free((void *)string_array[i]);
+        }
+        PyMem_Free(string_array);
+    }
+
+    if (!success)
+        return PyErr_SetFromWindowsErr(0);
+
+    Py_RETURN_NONE;
+}
+
 
 static PyMethodDef winapi_functions[] = {
     _WINAPI_CLOSEHANDLE_METHODDEF
@@ -3059,6 +3147,7 @@ static PyMethodDef winapi_functions[] = {
     _WINAPI_OPENPROCESS_METHODDEF
     _WINAPI_PEEKNAMEDPIPE_METHODDEF
     _WINAPI_REGISTEREVENTSOURCE_METHODDEF
+    _WINAPI_REPORTEVENT_METHODDEF
     _WINAPI_LCMAPSTRINGEX_METHODDEF
     _WINAPI_READFILE_METHODDEF
     _WINAPI_RELEASEMUTEX_METHODDEF