November 2021 - Wine-commits

Huw Davies : winecoreaudio: Move midi_in_get_devcaps to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 6f0b73a68d3df3a4749432b408ceec9b04bdee4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f0b73a68d3df3a4749432b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:42 2021 +0000 winecoreaudio: Move midi_in_get_devcaps to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 22 ++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 19 ------------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 38608b0851c..983d0676b16 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -826,6 +826,25 @@ static DWORD midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; } +static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size) +{ + TRACE("dev_id = %d caps = %p size = %d\n", dev_id, caps, size); + + if (!caps) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + + memcpy(caps, &srcs[dev_id].caps, min(size, sizeof(*caps))); + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -907,6 +926,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_UNPREPARE: *params->err = midi_in_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MIDM_GETDEVCAPS: + *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 9adf10953f9..35da144c927 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,23 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_GetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) -{ - TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); - - if (lpCaps == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - memcpy(lpCaps, &sources[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_GetNumDevs(void) { TRACE("\n"); @@ -437,8 +420,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR switch (wMsg) { case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETDEVCAPS: - return MIDIIn_GetDevCaps(wDevID, (LPMIDIINCAPSW) dwParam1, dwParam2); case MIDM_GETNUMDEVS: return MIDIIn_GetNumDevs(); case MIDM_START:

1 0

Huw Davies : winecoreaudio: Move midi_in_get_num_devs to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 15bb0e79d64b00f5a51d78acd922c65dab6eb9f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15bb0e79d64b00f5a51d78ac… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:43 2021 +0000 winecoreaudio: Move midi_in_get_num_devs to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 9 +++++++++ dlls/winecoreaudio.drv/midi.c | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 983d0676b16..eae68ec153e 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -845,6 +845,12 @@ static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size) return MMSYSERR_NOERROR; } +static DWORD midi_in_get_num_devs(void) +{ + TRACE("\n"); + return num_srcs; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -929,6 +935,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETDEVCAPS: *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); break; + case MIDM_GETNUMDEVS: + *params->err = midi_in_get_num_devs(); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 35da144c927..6456568be85 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,12 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_GetNumDevs(void) -{ - TRACE("\n"); - return MIDIIn_NumDevs; -} - static DWORD MIDIIn_Start(WORD wDevID) { TRACE("%d\n", wDevID); @@ -420,8 +414,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR switch (wMsg) { case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETNUMDEVS: - return MIDIIn_GetNumDevs(); case MIDM_START: return MIDIIn_Start(wDevID); case MIDM_STOP:

1 0

Huw Davies : winecoreaudio: Move midi_in_start and midi_in_stop to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 05731b14d30107e73027aad2d9480a2f31450cf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05731b14d30107e73027aad2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:44 2021 +0000 winecoreaudio: Move midi_in_start and midi_in_stop to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 33 +++++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 28 ---------------------------- 2 files changed, 33 insertions(+), 28 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index eae68ec153e..0e146ce86f6 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -851,6 +851,33 @@ static DWORD midi_in_get_num_devs(void) return num_srcs; } +static DWORD midi_in_start(WORD dev_id) +{ + TRACE("%d\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + srcs[dev_id].state = 1; + srcs[dev_id].startTime = NtGetTickCount(); + return MMSYSERR_NOERROR; +} + +static DWORD midi_in_stop(WORD dev_id) +{ + TRACE("%d\n", dev_id); + + if (dev_id >= num_srcs) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + srcs[dev_id].state = 0; + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -938,6 +965,12 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = midi_in_get_num_devs(); break; + case MIDM_START: + *params->err = midi_in_start(params->dev_id); + break; + case MIDM_STOP: + *params->err = midi_in_stop(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 6456568be85..559aae2f939 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -194,30 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MMSYSERR_NOERROR; } -static DWORD MIDIIn_Start(WORD wDevID) -{ - TRACE("%d\n", wDevID); - - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - sources[wDevID].state = 1; - sources[wDevID].startTime = GetTickCount(); - return MMSYSERR_NOERROR; -} - -static DWORD MIDIIn_Stop(WORD wDevID) -{ - TRACE("%d\n", wDevID); - if (wDevID >= MIDIIn_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - sources[wDevID].state = 0; - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_Reset(WORD wDevID) { DWORD dwTime = GetTickCount(); @@ -414,10 +390,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR switch (wMsg) { case MIDM_ADDBUFFER: return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_START: - return MIDIIn_Start(wDevID); - case MIDM_STOP: - return MIDIIn_Stop(wDevID); case MIDM_RESET: return MIDIIn_Reset(wDevID); }

1 0

Huw Davies : winecoreaudio: Move the midi in lock to the unixlib.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 9eeee3ddbfaebbc5d2a92c199203d3888ba38344 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eeee3ddbfaebbc5d2a92c19… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 29 11:26:45 2021 +0000 winecoreaudio: Move the midi in lock to the unixlib. The syscall itself is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 2 ++ dlls/winecoreaudio.drv/coremidi.c | 13 +++++++++++++ dlls/winecoreaudio.drv/midi.c | 32 ++++++++++++++------------------ dlls/winecoreaudio.drv/unixlib.h | 3 +++ 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index b3aa39bf485..420021a53ea 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1633,4 +1633,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_release, midi_out_message, midi_in_message, + + midi_in_lock, /* temporary */ }; diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 0e146ce86f6..8e12ad1a3c5 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -72,6 +72,8 @@ #undef HRESULT #undef STDMETHODCALLTYPE +#include <pthread.h> + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -112,6 +114,17 @@ static struct midi_dest *dests; static struct midi_src *srcs; static CFStringRef midi_in_thread_port_name; +static pthread_mutex_t midi_in_mutex = PTHREAD_MUTEX_INITIALIZER; + +NTSTATUS midi_in_lock(void *args) +{ + BOOL lock = !!args; + + if (lock) pthread_mutex_lock(&midi_in_mutex); + else pthread_mutex_unlock(&midi_in_mutex); + return STATUS_SUCCESS; +} + static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, DWORD_PTR param_1, DWORD_PTR param_2) { diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 559aae2f939..7894b4da906 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); static DWORD MIDIIn_NumDevs = 0; -static CRITICAL_SECTION midiInLock; /* Critical section for MIDI In */ + static CFStringRef MIDIInThreadPortName; static DWORD WINAPI MIDIIn_MessageThread(LPVOID p); @@ -89,9 +89,6 @@ static LONG CoreAudio_MIDIInit(void) if (MIDIIn_NumDevs > 0) { - InitializeCriticalSection(&midiInLock); - midiInLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": midiInLock"); - MIDIInThreadPortName = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("MIDIInThreadPortName.%u"), getpid()); CloseHandle( CreateThread(NULL, 0, MIDIIn_MessageThread, NULL, 0, NULL)); } @@ -105,12 +102,6 @@ static LONG CoreAudio_MIDIRelease(void) UNIX_CALL(midi_release, NULL); sources = NULL; - if (MIDIIn_NumDevs > 0) - { - midiInLock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&midiInLock); - } - return DRV_SUCCESS; } @@ -146,6 +137,11 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } +static void midi_lock( BOOL lock ) +{ + UNIX_CALL(midi_in_lock, (void *)lock); +} + static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) { TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); @@ -175,7 +171,7 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) return MIDIERR_UNPREPARED; } - EnterCriticalSection(&midiInLock); + midi_lock( TRUE ); lpMidiHdr->dwFlags &= ~WHDR_DONE; lpMidiHdr->dwFlags |= MHDR_INQUEUE; lpMidiHdr->dwBytesRecorded = 0; @@ -189,7 +185,7 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) ptr = ptr->lpNext); ptr->lpNext = lpMidiHdr; } - LeaveCriticalSection(&midiInLock); + midi_lock( FALSE ); return MMSYSERR_NOERROR; } @@ -204,7 +200,7 @@ static DWORD MIDIIn_Reset(WORD wDevID) return MMSYSERR_BADDEVICEID; } - EnterCriticalSection(&midiInLock); + midi_lock( TRUE ); while (sources[wDevID].lpQueueHdr) { LPMIDIHDR lpMidiHdr = sources[wDevID].lpQueueHdr; sources[wDevID].lpQueueHdr = lpMidiHdr->lpNext; @@ -213,7 +209,7 @@ static DWORD MIDIIn_Reset(WORD wDevID) /* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); } - LeaveCriticalSection(&midiInLock); + midi_lock( FALSE ); return MMSYSERR_NOERROR; } @@ -258,7 +254,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD src->state |= 2; } - EnterCriticalSection(&midiInLock); + midi_lock( TRUE ); currentTime = GetTickCount() - src->startTime; while (len) { @@ -289,11 +285,11 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } } - LeaveCriticalSection(&midiInLock); + midi_lock( FALSE ); return NULL; } - EnterCriticalSection(&midiInLock); + midi_lock( TRUE ); currentTime = GetTickCount() - src->startTime; while (pos < msg->length) @@ -320,7 +316,7 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD } MIDI_NotifyClient(msg->devID, MIM_DATA, sendData, currentTime); } - LeaveCriticalSection(&midiInLock); + midi_lock( FALSE ); break; default: CFRunLoopStop(CFRunLoopGetCurrent()); diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 767309bb763..2f0464ad322 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -252,12 +252,15 @@ enum unix_funcs unix_midi_release, unix_midi_out_message, unix_midi_in_message, + + unix_midi_in_lock, /* temporary */ }; NTSTATUS midi_init( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_release( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_in_message( void * ) DECLSPEC_HIDDEN; +NTSTATUS midi_in_lock( void * ) DECLSPEC_HIDDEN; extern unixlib_handle_t coreaudio_handle;

1 0

André Zwing : sechost: Fix some spec file entries.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 5c8241aa51f62ce735082c62751d189b87cbecf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c8241aa51f62ce735082c62… Author: André Zwing <nerv(a)dawncrow.de> Date: Sat Nov 27 21:43:08 2021 +0100 sechost: Fix some spec file entries. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sechost/sechost.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/sechost/sechost.spec b/dlls/sechost/sechost.spec index 0867412c1cb..12f4ff64412 100644 --- a/dlls/sechost/sechost.spec +++ b/dlls/sechost/sechost.spec @@ -21,7 +21,7 @@ @ stub CapabilityCheckForSingleSessionSku @ stdcall ChangeServiceConfig2A(long long ptr) @ stdcall ChangeServiceConfig2W(long long ptr) -@ stdcall ChangeServiceConfigA(long long long long wstr str ptr str str str str) +@ stdcall ChangeServiceConfigA(long long long long str str ptr str str str str) @ stdcall ChangeServiceConfigW(long long long long wstr wstr ptr wstr wstr wstr wstr) @ stdcall CloseServiceHandle(long) @ stdcall CloseTrace(int64) @@ -37,7 +37,7 @@ @ stub ConvertStringSDToSDDomainW @ stub ConvertStringSDToSDRootDomainW @ stdcall ConvertStringSecurityDescriptorToSecurityDescriptorW(wstr long ptr ptr) -@ stdcall ConvertStringSidToSidW(ptr ptr) +@ stdcall ConvertStringSidToSidW(wstr ptr) @ stdcall CreateServiceA(long str str long long long long str str ptr str str str) @ stub CreateServiceEx @ stdcall CreateServiceW(long wstr wstr long long long long wstr wstr ptr wstr wstr wstr)

1 0

André Zwing : wineps: Fix some spec file entries.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 10fab74e5101651a98dabaa625402d9d47315a8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=10fab74e5101651a98dabaa6… Author: André Zwing <nerv(a)dawncrow.de> Date: Sat Nov 27 21:43:09 2021 +0100 wineps: Fix some spec file entries. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/wineps.drv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/wineps.drv.spec b/dlls/wineps.drv/wineps.drv.spec index 4dbdc0a2998..470bbd8e5c6 100644 --- a/dlls/wineps.drv/wineps.drv.spec +++ b/dlls/wineps.drv/wineps.drv.spec @@ -2,4 +2,4 @@ # Printer driver config exports @ stdcall DrvDeviceCapabilities(ptr wstr long ptr ptr) -@ stdcall DrvDocumentProperties(long ptr wstr ptr long) +@ stdcall DrvDocumentProperties(long wstr ptr ptr long)

1 0

André Zwing : iphlpapi: Fix some spec file entries.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 6893f515d63161645177b71d527c1f126cb09143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6893f515d63161645177b71d… Author: André Zwing <nerv(a)dawncrow.de> Date: Sat Nov 27 21:43:10 2021 +0100 iphlpapi: Fix some spec file entries. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index ce188084c01..90bf290c9bd 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -12,7 +12,7 @@ @ stdcall CancelMibChangeNotify2( ptr ) @ stdcall ConvertGuidToStringA( ptr ptr long ) @ stdcall ConvertGuidToStringW( ptr ptr long ) -@ stdcall ConvertInterfaceAliasToLuid( ptr ptr ) +@ stdcall ConvertInterfaceAliasToLuid( wstr ptr ) @ stdcall ConvertInterfaceGuidToLuid( ptr ptr ) @ stdcall ConvertInterfaceIndexToLuid( long ptr ) @ stdcall ConvertInterfaceLuidToAlias( ptr ptr long ) @@ -32,7 +32,7 @@ #@ stub ConvertRemoteInterfaceLuidToGuid #@ stub ConvertRemoteInterfaceLuidToIndex #@ stub ConvertStringToGuidA -@ stdcall ConvertStringToGuidW( ptr ptr ) +@ stdcall ConvertStringToGuidW( wstr ptr ) #@ stub ConvertStringToInterfacePhysicalAddress #@ stub CPNatfwtCreateProviderInstance #@ stub CPNatfwtDeregisterProviderInstance

1 0

Piotr Caban : make_specfiles: Merge -arch options if there are multiple exports with the same name.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: wine Branch: master Commit: 64534e9b5bc9b31c9efb55b45c9f1a3364b9d326 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64534e9b5bc9b31c9efb55b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Nov 28 16:19:34 2021 +0100 make_specfiles: Merge -arch options if there are multiple exports with the same name. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_specfiles | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 019f16d3f14..49a032ef14c 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -578,7 +578,24 @@ sub read_spec_file($) next unless %descr; my $func = $descr{name}; - next if defined $funcs{$func}; + if (defined $funcs{$func}) + { + my %update = %{$funcs{$func}}; + next if $update{ordinal} ne $descr{ordinal} or $update{callconv} ne $descr{callconv} or $update{args} ne $descr{args}; + + my $arch = $1 if $update{flags} =~ /-arch=(\S+)/; + my $new_arch = $1 if $descr{flags} =~ /-arch=(\S+)/; + next if !defined $arch or !defined $new_arch; + + if (($arch eq "win32" and $new_arch eq "win64") or ($arch eq "win64" and $new_arch eq "win32")) + { + $funcs{$func}{flags} =~ s/-arch=\S+\s+//; + next; + } + + $funcs{$func}{flags} =~ s/-arch=$arch/-arch=$arch,$new_arch/; + next; + } next if $func eq "@"; $funcs{$func} = \%descr; }

1 0

Xiaoxuan Xue : Simplified Chinese translation for WWN 407.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: website Branch: master Commit: 13ade855414a399a88f60d9d7d1911e1dac30158 URL: https://source.winehq.org/git/website.git/?a=commit;h=13ade855414a399a88f60… Author: Xiaoxuan Xue <xx94xuan(a)gmail.com> Date: Mon Nov 29 00:24:06 2021 +0800 Simplified Chinese translation for WWN 407. Signed-off-by: Xiaoxuan Xue <xx94xuan(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/zh-cn/2021111201.xml | 12 +++++++ wwn/zh-cn/wn20211112_407.xml | 85 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/news/zh-cn/2021111201.xml b/news/zh-cn/2021111201.xml new file mode 100644 index 00000000..4e4ecf20 --- /dev/null +++ b/news/zh-cn/2021111201.xml @@ -0,0 +1,12 @@ +<news> + <date>十一月 12，2021</date> + <title>World Wine News 第 407 期</title> + <body> + <a href="{$root}/wwn/407">WWN 407 期</a> 今天发布了。 + <ul> + <li><a href="{$root}/wwn/407#Musings">插播</a></li> + <li><a href="{$root}/wwn/407#Wine Adds DWARF 3 and 4 Support">Wine 增加了对 DWARF 3 和 4 的支持</a></li> + <li><a href="{$root}/wwn/407#VKD3D-Proton v2.5 Released">VKD3D-Proton v2.5 发布</a></li> + </ul> + </body> +</news> diff --git a/wwn/zh-cn/wn20211112_407.xml b/wwn/zh-cn/wn20211112_407.xml new file mode 100644 index 00000000..edffa765 --- /dev/null +++ b/wwn/zh-cn/wn20211112_407.xml @@ -0,0 +1,85 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn(a)winehq.org">Cressida Silver</author> + <issue num="407" date="11/12/2021"/> + <intro> + <p> + 这是 World Wine News 第 407 期，为您带来 Wine 的最新动态。 + Wine 是基于 X 和 Unix 的 Windows API 的开源实现，可将其视为 Windows 的兼容层。 + Wine 的运行不需要依赖 Windows 系统，因为它是由 100% 无微软代码组成的、完全替代 Windows 的实现。 + 当然，它也可以选择使用原生系统的 DLL（如果可用）。可以在 <a href="http://www.winehq.org">www.winehq.org</a> 这里找到更多信息。 + </p> + </intro> + + <section title="Musings" subject="" archive="" posts=""> + <p> + 嗯…有一个不怎么明显的更新：AppDB/Bugzilla 的统计数据部分，在上一期中去掉了。（眼尖的人也能发现它在本期中也没有了。）关于是否要尊重传统保留它们进行了很多讨论，然后，目前为止一致的看法是去掉它们，虽然这在将来可能会有所改变。 + </p> + <p> + 照惯例，如果对我们正在做的东西有什么想法，无论好的不好的，都请随时与<a href="mailto:wwn(a)winehq.org">我</a>联系。 + </p> + <p> + <b>另外友情提示，Wine 7.0 即将到来，大家要为 12 月份某个时间的代码冻结做好准备喔。</b> + </p> + </section> + + <section title="Wine Adds DWARF 3 and 4 Support" subject="" archive="" posts=""> + <p> + Wine 正在努力使 DWARF 4 成为默认的调试格式。DWARF 是很多编译器和调试器用来支持源代码级调试的调试文件格式。在深入研究之前，让我们讨论一下它的命名。根据 <a href="http://wiki.dwarfstd.org/index.php?title=DWARF_FAQ">DWARF 调试标准</a> 的常问问题，DWARF（小矮人）这个名字是作为一个双关语来演绎与它一起开发的 Executable and Linkable Format 首字母缩写词 - ELF（精灵）。 + </p> + <p> + Windows 空间中的编译器使用 PDB/CodeView 调试信息。Linux 空间中的编译器使用 DWARF 调试信息（比如：从 <a href="https://gcc.gnu.org/">GCC</a> 到 <a href="https://llvm.org/">LLVM</a>）。尽管 LLVM/Clang 也支持 PDB/CodeView，大多数 Windows 调试器，以及 Wine 的调试器（winedbg）都依赖 dbghelp.dll 来访问调试信息（比如：符号，类型或变量）。所以 Wine 的 dbghelp.dll 实现覆盖了 PDB/CodeView 和 DWARF，而原生的 dbghelp.dll 只支持 PDB/CodeView。 + </p> + <p> + Linux 在 1990 年代后期才用了 DWARF 2。至少在之后的 15 年里，Wine 一直使用着 DWARF 2。同时，DWARF 联盟发布了另外 3 个版本，如下： + <ul> + <li>DWARF 3 — 2005</li> + <li>DWARF 4 — 2010</li> + <li>DWARF 5 — 2017</li> + </ul> + </p> + <p> + 过去半年到一年的时间里，GCC 和大多数的 Linux 发行版都使用了 DWARF 5 作为它们默认的格式，Wine 需要跟随这些编译器，未来可能会减少对 DWARF 2 的支持。感谢 Eric 的辛勤工作，Wine 的 dbghelp.dll 现在支持大多数常见的 DWARF 4 元素，以及 DWARF 和 PDB/CodeView 的内联函数。更不用说 Wine Staging 正在使用 DWARF 4。 + </p> + <p> + 在 DWARF 4 成为 Wine 的默认调试格式之前，<a href="https://www.winehq.org/pipermail/wine-devel/2021-November/199884.html">测试和反馈</a>是必需的。一旦完成了 DWARF 4 的工作，就可以开始 DWARF 5 的工作，这就是目标…只是需要时间。 + </p> + </section> + + <section title="VKD3D-Proton v2.5 Released" subject="" archive="" posts=""> + <p> + VKD3D-Proton 是 Direct3D 12 以游戏为中心的实现，专为与 Proton 一起使用而开发。并且在 10 月 18 日（这可能是旧新闻，但它<b>现在是</b>新闻），v2.5 发布了。 + </p> + <p> + 该版本包含以下几方面的更新： + <ul> + <li>DirectX 光线追踪支持</li> + <li>由 NVIDIA 贡献的，在 D3D12 中启用 DLSS 支持的集成 API</li> + <li>DXIL 跟随原生驱动的翻译支持</li> + </ul> + </p> + + <p> + 它还包括改进以下游戏的修复和临时解决方案： + <ul> + <li>死亡循环</li> + <li>F1 2021</li> + <li>世界汽车拉力锦标赛 10</li> + <li>尘埃 5</li> + <li>暗黑破坏神 II</li> + <li>意航员 2</li> + <li>孤岛惊魂 6</li> + <li>邪恶天才 2：世界统治</li> + <li>杀手 3</li> + <li>纪元 1800</li> + </ul> + </p> + + <p> + 完整的 VKD3D-Proton v2.5 发布说明可在 <a href="https://github.com/HansKristian-Work/vkd3d-proton/releases/tag/v2.5">这里</a> 获得。 + </p> + <p> + 成绩优异想要获得附加分的人，可以看看 Hans-Kristian Arntzen 写的 <a href="https://themaister.net/blog/2021/11/07/my-personal-hell-of-translating-dxil…">这篇文章</a>。别担心，我不会考你。 + </p> + </section> +</kc>

1 0

Xiaoxuan Xue : Simplified Chinese translation for WWN 406.
by Alexandre Julliard 29 Nov '21

29 Nov '21

Module: website Branch: master Commit: 3c2bd914bc1de9380796ecb7a29eda5b1aea2fb1 URL: https://source.winehq.org/git/website.git/?a=commit;h=3c2bd914bc1de9380796e… Author: Xiaoxuan Xue <xx94xuan(a)gmail.com> Date: Mon Nov 29 00:24:07 2021 +0800 Simplified Chinese translation for WWN 406. Signed-off-by: Xiaoxuan Xue <xx94xuan(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/zh-cn/2021102901.xml | 14 +++++++ wwn/zh-cn/wn20211029_406.xml | 99 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/news/zh-cn/2021102901.xml b/news/zh-cn/2021102901.xml new file mode 100644 index 00000000..6c088d1f --- /dev/null +++ b/news/zh-cn/2021102901.xml @@ -0,0 +1,14 @@ +<news> + <date>十月 29，2021</date> + <title>World Wine News 第 406 期</title> + <body> + <a href="{$root}/wwn/406">WWN 406 期</a> 今天发布了。 + <ul> + <li><a href="{$root}/wwn/406#New Author">新作者</a></li> + <li><a href="{$root}/wwn/406#Highlights From Wine 6.18 to Today">Wine 从 6.18 到现在的亮点</a></li> + <li><a href="{$root}/wwn/406#Dinput Now Uses HID">Dinput 使用 HID（人体学接口设备）</a></li> + <li><a href="{$root}/wwn/406#Unicode 14">Unicode 14</a></li> + <li><a href="{$root}/wwn/406#Wine Mono">Wine Mono</a></li> + </ul> + </body> +</news> diff --git a/wwn/zh-cn/wn20211029_406.xml b/wwn/zh-cn/wn20211029_406.xml new file mode 100644 index 00000000..bd9584fa --- /dev/null +++ b/wwn/zh-cn/wn20211029_406.xml @@ -0,0 +1,99 @@ +<kc> + <title>Wine Traffic</title> + <author contact="mailto:wwn(a)winehq.org">Cressida Silver</author> + <issue num="406" date="10/29/2021"/> + <intro> + <p> + 这是 World Wine News 第 406 期，为您带来 Wine 的最新动态。 + Wine 是基于 X 和 Unix 的 Windows API 的开源实现，可将其视为 Windows 的兼容层。 + Wine 的运行不需要依赖 Windows 系统，因为它是由 100% 无微软代码组成的、完全替代 Windows 的实现。 + 当然，它也可以选择使用原生系统的 DLL（如果可用）。可以在 <a href="http://www.winehq.org">www.winehq.org</a> 这里找到更多信息。</p> + </intro> + + <section title="New Author" subject="WWN" archive="" posts=""> + <p> + 初来乍到，我是 Cressida Silver，希望接下来能跟大家交个朋友。我最近从前公司离职加入 CodeWeavers，目前为止一切都好。我会在每次 Wine 发布新版后的下一个周五您带来一期 WWN。请随时通过<a href="mailto:wwn(a)winehq.org">这里</a>提供技巧、建议、见解，或者喷我（如果你一定要这么做）。 + </p> + + <p> + 好了，现在这已经不碍事了，我们都是朋友了，让我们进入正题吧。 + </p> + </section> + + <section title="Highlights From Wine 6.18 to Today" subject="Overview" archive="" posts=""> + <p> + <b>Wine 6.18</b> + <ul> + <li>Shell32 和 WineBus 库转换成可移植性可执行文件（PE）</li> + <li>Unicode 数据更新到 Unicode 14</li> + <li>Mono 引擎更新到 6.4.0版本，改进了 COM</li> + <li>对 Dwarf 3/4 的调试有更多的支持</li> + <li>默认启用 HID 游戏杆</li> + </ul> + </p> + + <p> + <b>Wine 6.19</b> + <ul> + <li>IPHlpApi、NsiProxy、WineDbg 和一些其它模块转换成可移植性可执行文件</li> + <li>关于 HID 的额外支持</li> + <li>GDI 的内核部分移到 Win32u</li> + <li>对 Dwarf 3/4 的调试有更多的支持</li> + </ul> + </p> + + <p> + <b>Wine 6.20</b> + <ul> + <li>MSXml、XAudio、DInput 和一些其它模块转换成可移植性可执行文件</li> + <li>一些系统库和源代码捆绑在一起以支持可移植性可执行文件的构建</li> + <li>HID 游戏杆现在是 DirectInput 中唯一支持的游戏杆后端</li> + <li>更好地支持 Winelib 中的 MSVCRT 构建</li> + </ul> + </p> + </section> + + <section title="Dinput Now Uses HID" subject="HID" archive="" posts=""> + <p> + 感谢 Rémi 这次做的更新。以前 Wine DirectInput 的实现（dinput.dll 和 dinput8.dll）是直接跟硬件通信，Wine 底层的 HID API 的实现也是如此。有人发现了吗？没错，Wine 在两个地方与硬件通信，导致了冗余代码，这不太理想。 + </p> + + <p> + Windows 最近基于底层 API 实现了 dinput。Rémi 这次做的工作是，把 dinput 放到底层 API 之上而不是让它直接跟硬件通信，以此来让 Wine 匹配新设计。这将让 Wine 更精确地反映 Windows 行为，允许应用程序与 HID 和 Dinput 通信，以及彼此间传输信息。 + </p> + + <p> + 与硬件通信的 API 越少意味着代码越少，代码越少意味着代码出错的几率越少。另外，这些修改未来会对更容易支持后端。新设计意味着 Wine 更精确地反映 Windows 行为，使控制器支持更加一致，并改进同时使用 HID 和 dinput API 的 Windows 应用程序的功能。 + </p> + </section> + + <section title="Unicode 14" subject="Unicode 14" archive="https://www.winehq.org/pipermail/wine-devel/2021-September/195389.html" posts="1"> + <p> + Nikolay 把 Wine 从乏味的 Unicode 13 世界转换到了 Unicode 14 的美丽新世界。谁愿意住在一个没有甜美的笑脸或者咬伤下唇的世界里？至少，我们不愿意。当 Unicode 14 被广泛应用于互联网时，将会有合计 144,697 个字符。当然，Wine 需要底层文字系统来支持新的 Unicode 字符，这需要一些时间。 + </p> + + <p> + 总共 144,697 个字符…这需要一段时间，与此同时，你可以在<a href="//unicode.org/versions/Unicode14.0.0/">这里</a>了解更多关于 Unicode 14 的信息。 + </p> + </section> + + <section title="Wine Mono" subject="Wine Mono" archive="" posts=""> + <p> + Esme 对 Wine Mono（.NET 框架的开源、跨平台实现）的更新，以下这些游戏可以从她的工作受益： + <ul> + <li>IL-2 捍卫雄鹰</li> + <li>Bizhawk</li> + <li>魔能</li> + <li>FLY’N</li> + <li>模拟人生 3（启动器）</li> + <li>唯一幸存者</li> + <li>Stride</li> + <li>LiveSplit</li> + </ul> + </p> + + <p> + 同样不可忽视的是，Esme 已将 FNA 更新至 21.08，将 SDL 更新至 2.0.16。FNA 现在用 mfplat 而不是 libtheorafile 进行媒体文件处理，如果 Wine 有了必要的支持，则可以加载 .wmv 和 .wma 文件。 + </p> + </section> +</kc>

1 0