wineoss: Drop "oss_" prefix in unixlib enum, apply it to the functions instead.

dlls/wineoss.drv/ossmidi.c

@@ -522,7 +522,7 @@ static UINT midi_exit(void)
     return 0;
 }
 
-NTSTATUS midi_release(void *args)
+NTSTATUS oss_midi_release(void *args)
 {
     /* stop the notify_wait thread */
     notify_post(NULL);
@@ -1685,7 +1685,7 @@ static UINT midi_in_reset(WORD dev_id, struct notify_context *notify)
     return err;
 }
 
-NTSTATUS midi_out_message(void *args)
+NTSTATUS oss_midi_out_message(void *args)
 {
     struct midi_out_message_params *params = args;
 
@@ -1745,7 +1745,7 @@ NTSTATUS midi_out_message(void *args)
     return STATUS_SUCCESS;
 }
 
-NTSTATUS midi_in_message(void *args)
+NTSTATUS oss_midi_in_message(void *args)
 {
     struct midi_in_message_params *params = args;
 
@@ -1802,7 +1802,7 @@ NTSTATUS midi_in_message(void *args)
     return STATUS_SUCCESS;
 }
 
-NTSTATUS midi_notify_wait(void *args)
+NTSTATUS oss_midi_notify_wait(void *args)
 {
     struct midi_notify_wait_params *params = args;
 
@@ -1906,7 +1906,7 @@ static UINT wow64_midi_out_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT h
     return MMSYSERR_NOERROR;
 }
 
-NTSTATUS wow64_midi_out_message(void *args)
+NTSTATUS oss_wow64_midi_out_message(void *args)
 {
     struct
     {
@@ -1977,7 +1977,7 @@ NTSTATUS wow64_midi_out_message(void *args)
         return STATUS_SUCCESS;
     }
 
-    midi_out_message(&params);
+    oss_midi_out_message(&params);
 
     switch (params32->msg)
     {
@@ -2030,7 +2030,7 @@ static UINT wow64_midi_in_unprepare(WORD dev_id, struct midi_hdr32 *hdr, UINT hd
     return MMSYSERR_NOERROR;
 }
 
-NTSTATUS wow64_midi_in_message(void *args)
+NTSTATUS oss_wow64_midi_in_message(void *args)
 {
     struct
     {
@@ -2102,7 +2102,7 @@ NTSTATUS wow64_midi_in_message(void *args)
         return STATUS_SUCCESS;
     }
 
-    midi_in_message(&params);
+    oss_midi_in_message(&params);
 
     switch (params32->msg)
     {
@@ -2137,7 +2137,7 @@ NTSTATUS wow64_midi_in_message(void *args)
     return STATUS_SUCCESS;
 }
 
-NTSTATUS wow64_midi_notify_wait(void *args)
+NTSTATUS oss_wow64_midi_notify_wait(void *args)
 {
     struct
     {
@@ -2155,7 +2155,7 @@ NTSTATUS wow64_midi_notify_wait(void *args)
     };
     notify32->send_notify = FALSE;
 
-    midi_notify_wait(&params);
+    oss_midi_notify_wait(&params);
 
     if (!*params.quit && notify.send_notify)
     {

dlls/wineoss.drv/unixlib.h

@@ -262,47 +262,47 @@ struct aux_message_params
 
 enum oss_funcs
 {
-    oss_test_connect,
-    oss_get_endpoint_ids,
-    oss_create_stream,
-    oss_release_stream,
-    oss_start,
-    oss_stop,
-    oss_reset,
-    oss_timer_loop,
-    oss_get_render_buffer,
-    oss_release_render_buffer,
-    oss_get_capture_buffer,
-    oss_release_capture_buffer,
-    oss_is_format_supported,
-    oss_get_mix_format,
-    oss_get_buffer_size,
-    oss_get_latency,
-    oss_get_current_padding,
-    oss_get_next_packet_size,
-    oss_get_frequency,
-    oss_get_position,
-    oss_set_volumes,
-    oss_set_event_handle,
-    oss_is_started,
-    oss_midi_release,
-    oss_midi_out_message,
-    oss_midi_in_message,
-    oss_midi_notify_wait,
-    oss_aux_message,
+    test_connect,
+    get_endpoint_ids,
+    create_stream,
+    release_stream,
+    start,
+    stop,
+    reset,
+    timer_loop,
+    get_render_buffer,
+    release_render_buffer,
+    get_capture_buffer,
+    release_capture_buffer,
+    is_format_supported,
+    get_mix_format,
+    get_buffer_size,
+    get_latency,
+    get_current_padding,
+    get_next_packet_size,
+    get_frequency,
+    get_position,
+    set_volumes,
+    set_event_handle,
+    is_started,
+    midi_release,
+    midi_out_message,
+    midi_in_message,
+    midi_notify_wait,
+    aux_message,
 };
 
-NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN;
-NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN;
-NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN;
-NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN;
+NTSTATUS oss_midi_release(void *args) DECLSPEC_HIDDEN;
+NTSTATUS oss_midi_out_message(void *args) DECLSPEC_HIDDEN;
+NTSTATUS oss_midi_in_message(void *args) DECLSPEC_HIDDEN;
+NTSTATUS oss_midi_notify_wait(void *args) DECLSPEC_HIDDEN;
 
 #ifdef _WIN64
-NTSTATUS wow64_midi_out_message(void *args) DECLSPEC_HIDDEN;
-NTSTATUS wow64_midi_in_message(void *args) DECLSPEC_HIDDEN;
-NTSTATUS wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN;
+NTSTATUS oss_wow64_midi_out_message(void *args) DECLSPEC_HIDDEN;
+NTSTATUS oss_wow64_midi_in_message(void *args) DECLSPEC_HIDDEN;
+NTSTATUS oss_wow64_midi_notify_wait(void *args) DECLSPEC_HIDDEN;
 #endif
 
 extern unixlib_handle_t oss_handle;
 
-#define OSS_CALL(func, params) __wine_unix_call(oss_handle, oss_ ## func, params)
+#define OSS_CALL(func, params) __wine_unix_call(oss_handle, func, params)