December 2015 - Wine-Commits

Michael Stefaniuc : dsound: Use a better name for IDirectSoundBufferImpl_Create().
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: bb72548f3870b1df03ad9fe7ad2e543a69d5d574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb72548f3870b1df03ad9fe7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 22 10:50:34 2015 +0100 dsound: Use a better name for IDirectSoundBufferImpl_Create(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 24 +++++++++--------------- dlls/dsound/dsound.c | 7 ++----- dlls/dsound/dsound_private.h | 6 ++---- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index d7717fd..2a80c3f 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -983,19 +983,15 @@ static const IDirectSoundBuffer8Vtbl dsbvt = IDirectSoundBufferImpl_GetObjectInPath }; -HRESULT IDirectSoundBufferImpl_Create( - DirectSoundDevice * device, - IDirectSoundBufferImpl **pdsb, - LPCDSBUFFERDESC dsbd) +HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, + IDirectSoundBuffer **buffer) { IDirectSoundBufferImpl *dsb; LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; - TRACE("(%p,%p,%p)\n",device,pdsb,dsbd); - - *pdsb = NULL; + TRACE("(%p,%p,%p)\n", device, dsbd, buffer); if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) { WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes); @@ -1107,14 +1103,12 @@ HRESULT IDirectSoundBufferImpl_Create( RtlInitializeResource(&dsb->lock); - /* register buffer if not primary */ - if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { - err = DirectSoundDevice_AddBuffer(device, dsb); - if (err == DS_OK) - *pdsb = dsb; - else - IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); - } + /* register buffer */ + err = DirectSoundDevice_AddBuffer(device, dsb); + if (err == DS_OK) + *buffer = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; + else + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return err; } diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index e50ef58..ccefd1f 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -469,8 +469,6 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( WARN("primarybuffer_create() failed\n"); } } else { - IDirectSoundBufferImpl * dsb; - if (dsbd->lpwfxFormat == NULL) { WARN("invalid parameter: dsbd->lpwfxFormat can't be NULL for " "secondary buffer\n"); @@ -547,9 +545,8 @@ static HRESULT DirectSoundDevice_CreateSoundBuffer( return DSERR_INVALIDPARAM; } - hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); - if (dsb) { - *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; + hres = secondarybuffer_create(device, dsbd, ppdsb); + if (SUCCEEDED(hres)) { if (dsbd->dwFlags & DSBCAPS_LOCHARDWARE) device->drvcaps.dwFreeHwMixingAllBuffers--; } else diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 9c001ed..07bda48 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -182,10 +182,8 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; -HRESULT IDirectSoundBufferImpl_Create( - DirectSoundDevice *device, - IDirectSoundBufferImpl **ppdsb, - LPCDSBUFFERDESC dsbd) DECLSPEC_HIDDEN; +HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, + IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb,

1 0

Bruno Jesus : ws2_32: Add WSAPoll() implementation.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 5913a107d8a6d257fa9838bdbca47f0d45b7a3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5913a107d8a6d257fa9838bdb… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Dec 22 21:15:41 2015 +0800 ws2_32: Add WSAPoll() implementation. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 4 +++ dlls/ws2_32/ws2_32.spec | 1 + include/winsock2.h | 4 +-- 4 files changed, 101 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d31f0b4..f62c9cd 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -773,6 +773,17 @@ static const int ws_eai_map[][2] = { 0, 0 } }; +static const int ws_poll_map[][2] = +{ + MAP_OPTION( POLLERR ), + MAP_OPTION( POLLHUP ), + MAP_OPTION( POLLNVAL ), + MAP_OPTION( POLLWRNORM ), + MAP_OPTION( POLLWRBAND ), + MAP_OPTION( POLLRDNORM ), + { WS_POLLRDBAND, POLLPRI } +}; + static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS @@ -1415,6 +1426,40 @@ convert_socktype_u2w(int unixsocktype) { return -1; } +static int convert_poll_w2u(int events) +{ + int i, ret; + for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + { + if (ws_poll_map[i][0] & events) + { + ret |= ws_poll_map[i][1]; + events &= ~ws_poll_map[i][0]; + } + } + + if (events) + FIXME("Unsupported WSAPoll() flags 0x%x\n", events); + return ret; +} + +static int convert_poll_u2w(int events) +{ + int i, ret; + for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + { + if (ws_poll_map[i][1] & events) + { + ret |= ws_poll_map[i][0]; + events &= ~ws_poll_map[i][1]; + } + } + + if (events) + FIXME("Unsupported poll() flags 0x%x\n", events); + return ret; +} + static int set_ipx_packettype(int sock, int ptype) { #ifdef HAS_IPX @@ -5227,6 +5272,55 @@ int WINAPI WS_select(int nfds, WS_fd_set *ws_readfds, return ret; } +/*********************************************************************** + * WSAPoll + */ +int WINAPI WSAPoll(WSAPOLLFD *wfds, ULONG count, int timeout) +{ + int i, ret; + struct pollfd *ufds; + + if (!count) + { + SetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + if (!wfds) + { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + + if (!(ufds = HeapAlloc(GetProcessHeap(), 0, count * sizeof(ufds[0])))) + { + SetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + + for (i = 0; i < count; i++) + { + ufds[i].fd = get_sock_fd(wfds[i].fd, 0, NULL); + ufds[i].events = convert_poll_w2u(wfds[i].events); + ufds[i].revents = 0; + } + + ret = do_poll(ufds, count, timeout); + + for (i = 0; i < count; i++) + { + if (ufds[i].fd != -1) + { + release_sock_fd(wfds[i].fd, ufds[i].fd); + wfds[i].revents = convert_poll_u2w(ufds[i].revents); + } + else + wfds[i].revents = WS_POLLNVAL; + } + + HeapFree(GetProcessHeap(), 0, ufds); + return ret; +} + /* helper to send completion messages for client-only i/o operation case */ static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS CompletionStatus, ULONG Information ) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 00fac77..aeb7a62 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6634,6 +6634,7 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine ok(POLL_ISSET(fdWrite, POLLHUP), "fdWrite socket events incorrect\n"); ret = recv(fdWrite, tmp_buf, sizeof(tmp_buf), 0); ok(ret == 0, "expected 0, got %d\n", ret); @@ -6652,6 +6653,7 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN | POLLOUT); poll_timeout = 2000; ret = pWSAPoll(fds, ix, poll_timeout); +todo_wine ok(ret == 0, "expected 0, got %d\n", ret); len = sizeof(id); id = 0xdeadbeef; @@ -6673,6 +6675,7 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN | POLLOUT); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine ok(POLL_ISSET(fdWrite, POLLWRNORM | POLLHUP) || broken(POLL_ISSET(fdWrite, POLLWRNORM)) /* <= 2008 */, "fdWrite socket events incorrect\n"); closesocket(fdWrite); @@ -6696,6 +6699,7 @@ static void test_WSAPoll(void) POLL_SET(fdWrite, POLLIN); ret = pWSAPoll(fds, ix, poll_timeout); ok(ret == 1, "expected 1, got %d\n", ret); +todo_wine ok(POLL_ISSET(fdWrite, POLLNVAL), "fdWrite socket events incorrect\n"); WaitForSingleObject (thread_handle, 1000); closesocket(fdRead); diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index 6de888f..7625f38 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -91,6 +91,7 @@ @ stdcall WSANSPIoctl(ptr long ptr long ptr long ptr ptr) @ stdcall WSANtohl(long long ptr) @ stdcall WSANtohs(long long ptr) +@ stdcall WSAPoll(ptr long long) @ stdcall WSAProviderConfigChange(ptr ptr ptr) @ stdcall WSARecv(long ptr long ptr ptr ptr ptr) @ stdcall WSARecvDisconnect(long ptr) diff --git a/include/winsock2.h b/include/winsock2.h index 461b90c..24f0ea3 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -113,8 +113,8 @@ extern "C" { #define SD_BOTH 0x02 /* Constants for WSAPoll() */ -#ifndef __WINE_WINE_PORT_H #ifndef USE_WS_PREFIX +#ifndef __WINE_WINE_PORT_H #define POLLERR 0x0001 #define POLLHUP 0x0002 #define POLLNVAL 0x0004 @@ -125,6 +125,7 @@ extern "C" { #define POLLPRI 0x0400 #define POLLIN (POLLRDNORM|POLLRDBAND) #define POLLOUT (POLLWRNORM) +#endif #else #define WS_POLLERR 0x0001 #define WS_POLLHUP 0x0002 @@ -137,7 +138,6 @@ extern "C" { #define WS_POLLIN (WS_POLLRDNORM|WS_POLLRDBAND) #define WS_POLLOUT (WS_POLLWRNORM) #endif -#endif /* Constants for WSAIoctl() */ #ifdef USE_WS_PREFIX

1 0

Michael Stefaniuc : dsound: Simplify error handling when creating a sound buffer.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: d51d55bab8995f94dcc78ce8418a4149836c27b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d51d55bab8995f94dcc78ce84… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 22 10:49:10 2015 +0100 dsound: Simplify error handling when creating a sound buffer. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 5aa2834..d7717fd 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -992,29 +992,28 @@ HRESULT IDirectSoundBufferImpl_Create( LPWAVEFORMATEX wfex = dsbd->lpwfxFormat; HRESULT err = DS_OK; DWORD capf = 0; + TRACE("(%p,%p,%p)\n",device,pdsb,dsbd); + *pdsb = NULL; + if (dsbd->dwBufferBytes < DSBSIZE_MIN || dsbd->dwBufferBytes > DSBSIZE_MAX) { WARN("invalid parameter: dsbd->dwBufferBytes = %d\n", dsbd->dwBufferBytes); - *pdsb = NULL; return DSERR_INVALIDPARAM; /* FIXME: which error? */ } dsb = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(*dsb)); - if (dsb == 0) { - WARN("out of memory\n"); - *pdsb = NULL; + if (!dsb) return DSERR_OUTOFMEMORY; - } TRACE("Created buffer at %p\n", dsb); - dsb->ref = 0; + dsb->ref = 1; dsb->refn = 0; dsb->ref3D = 0; dsb->refiks = 0; - dsb->numIfaces = 0; + dsb->numIfaces = 1; dsb->device = device; dsb->IDirectSoundBuffer8_iface.lpVtbl = &dsbvt; dsb->IDirectSoundNotify_iface.lpVtbl = &dsnvt; @@ -1025,9 +1024,8 @@ HRESULT IDirectSoundBufferImpl_Create( CopyMemory(&dsb->dsbd, dsbd, dsbd->dwSize); dsb->pwfx = DSOUND_CopyFormat(wfex); - if (dsb->pwfx == NULL) { - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; + if (!dsb->pwfx) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } @@ -1052,22 +1050,16 @@ HRESULT IDirectSoundBufferImpl_Create( /* Allocate an empty buffer */ dsb->buffer = HeapAlloc(GetProcessHeap(),0,sizeof(*(dsb->buffer))); - if (dsb->buffer == NULL) { - WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; + if (!dsb->buffer) { + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } /* Allocate system memory for buffer */ dsb->buffer->memory = HeapAlloc(GetProcessHeap(),0,dsb->buflen); - if (dsb->buffer->memory == NULL) { + if (!dsb->buffer->memory) { WARN("out of memory\n"); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb->buffer); - HeapFree(GetProcessHeap(),0,dsb); - *pdsb = NULL; + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); return DSERR_OUTOFMEMORY; } @@ -1118,18 +1110,12 @@ HRESULT IDirectSoundBufferImpl_Create( /* register buffer if not primary */ if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { err = DirectSoundDevice_AddBuffer(device, dsb); - if (err != DS_OK) { - HeapFree(GetProcessHeap(),0,dsb->buffer->memory); - HeapFree(GetProcessHeap(),0,dsb->buffer); - RtlDeleteResource(&dsb->lock); - HeapFree(GetProcessHeap(),0,dsb->pwfx); - HeapFree(GetProcessHeap(),0,dsb); - dsb = NULL; - } + if (err == DS_OK) + *pdsb = dsb; + else + IDirectSoundBuffer8_Release(&dsb->IDirectSoundBuffer8_iface); } - IDirectSoundBuffer8_AddRef(&dsb->IDirectSoundBuffer8_iface); - *pdsb = dsb; return err; }

1 0

Austin English : setupx.dll16: Add DiBuildDriverIndex stub.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 296ac8cf320336353fc5f5da3897c808a65556e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=296ac8cf320336353fc5f5da3… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 11:48:35 2015 -0600 setupx.dll16: Add DiBuildDriverIndex stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupx.dll16/setupx.dll16.spec | 2 +- dlls/setupx.dll16/setupx_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/setupx.dll16/setupx.dll16.spec b/dlls/setupx.dll16/setupx.dll16.spec index 615e92f..34e6b68 100644 --- a/dlls/setupx.dll16/setupx.dll16.spec +++ b/dlls/setupx.dll16/setupx.dll16.spec @@ -205,7 +205,7 @@ 409 stub IPGETDRIVERVERSION 410 stub IpGetVersionString #(str str ptr word str) 411 pascal VcpExplain(ptr long) VcpExplain16 -412 stub DiBuildDriverIndex #(word) +412 pascal DiBuildDriverIndex(word) DiBuildDriverIndex16 413 stub DiAddSingleInfToDrvIdx #(str word word) 414 stub FCEGETFLAGS 450 stub UiMakeDlgNonBold #(word) diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index adc5900..db15cfe 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -628,3 +628,12 @@ RETERR16 WINAPI CtlSetLddPath16(LOGDISKID16 ldid, LPSTR szPath) ldd.pszPath = szPath; return CtlSetLdd16(&ldd); } + +/*********************************************************************** + * DiBuildDriverIndex (SETUPX.412) + */ +RETERR16 WINAPI DiBuildDriverIndex16( WORD w1 ) +{ + FIXME( "%x: stub\n", w1 ); + return 0; +}

1 0

Nikolay Sivov : comdlg32/fontdlg: Remove dead assignment (Coverity).
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 1a7121b3275fd549fd964dcfe4a8638cb5e03549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7121b3275fd549fd964dcfe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 01:19:33 2015 +0300 comdlg32/fontdlg: Remove dead assignment (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/fontdlg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 37c82db..344a356 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -1011,7 +1011,7 @@ static LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFO /* face name */ i=SendDlgItemMessageW(hDlg,cmb1,CB_GETCURSEL,0,0); if (i==CB_ERR) - i=GetDlgItemTextW( hDlg, cmb1, str, 256 ); + GetDlgItemTextW( hDlg, cmb1, str, sizeof(str)/sizeof(str[0]) ); else { SendDlgItemMessageW(hDlg,cmb1,CB_GETLBTEXT,i,

1 0

Piotr Caban : msvcp110: Always return empty string in _Read_dir on end of enumeration or error.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 77ec614ac4630eed384d24895503372817007720 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ec614ac4630eed384d24895… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 22 11:11:03 2015 +0100 msvcp110: Always return empty string in _Read_dir on end of enumeration or error. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 7440aff..6a75476 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14483,18 +14483,16 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) { WIN32_FIND_DATAA data; + TRACE("(%p %p %p)\n", target, handle, type); - if(!FindNextFileA(handle, &data)) { - *type = status_unknown; - *target = '\0'; - return target; - } - while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")) { + + do { if(!FindNextFileA(handle, &data)) { *type = status_unknown; - return NULL; + *target = '\0'; + return target; } - } + } while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")); strcpy(target, data.cFileName); if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)

1 0

Austin English : tdi.sys: Add a stub dll.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 7eec8cb4a660508edef376390d374b5e4755176e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eec8cb4a660508edef376390… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 21 20:41:46 2015 -0600 tdi.sys: Add a stub dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/tdi.sys/Makefile.in | 5 +++++ dlls/tdi.sys/main.c | 38 ++++++++++++++++++++++++++++++++ dlls/tdi.sys/tdi.sys.spec | 56 +++++++++++++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 ++ 6 files changed, 104 insertions(+) diff --git a/configure b/configure index 0db4d30..8fe1910 100755 --- a/configure +++ b/configure @@ -1312,6 +1312,7 @@ enable_sxs enable_t2embed enable_tapi32 enable_taskschd +enable_tdi_sys enable_traffic enable_twain_32 enable_ucrtbase @@ -17884,6 +17885,7 @@ wine_fn_config_dll t2embed enable_t2embed wine_fn_config_dll tapi32 enable_tapi32 implib wine_fn_config_dll taskschd enable_taskschd clean wine_fn_config_test dlls/taskschd/tests taskschd_test +wine_fn_config_dll tdi.sys enable_tdi_sys wine_fn_config_dll toolhelp.dll16 enable_win16 wine_fn_config_dll traffic enable_traffic wine_fn_config_dll twain.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 86f12c5..ffeecf4 100644 --- a/configure.ac +++ b/configure.ac @@ -3224,6 +3224,7 @@ WINE_CONFIG_DLL(t2embed) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) WINE_CONFIG_TEST(dlls/taskschd/tests) +WINE_CONFIG_DLL(tdi.sys) WINE_CONFIG_DLL(toolhelp.dll16,enable_win16) WINE_CONFIG_DLL(traffic) WINE_CONFIG_DLL(twain.dll16,enable_win16) diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in new file mode 100644 index 0000000..1b5f5f3 --- /dev/null +++ b/dlls/tdi.sys/Makefile.in @@ -0,0 +1,5 @@ +MODULE = tdi.sys +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + main.c diff --git a/dlls/tdi.sys/main.c b/dlls/tdi.sys/main.c new file mode 100644 index 0000000..d9fbcb1 --- /dev/null +++ b/dlls/tdi.sys/main.c @@ -0,0 +1,38 @@ +/* + * tdi.sys + * + * Copyright 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(tdi); + +NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) +{ + TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) ); + + return STATUS_SUCCESS; +} diff --git a/dlls/tdi.sys/tdi.sys.spec b/dlls/tdi.sys/tdi.sys.spec new file mode 100644 index 0000000..9e3d2e4 --- /dev/null +++ b/dlls/tdi.sys/tdi.sys.spec @@ -0,0 +1,56 @@ +@ stub CTEAllocateString +@ stub CTEBlock +@ stub CTEBlockWithTracker +@ stub CTEInitEvent +@ stub CTEInitString +@ stub CTEInitTimer +@ stub CTEInitialize +@ stub CTEInsertBlockTracker +@ stub CTELogEvent +@ stub CTERemoveBlockTracker +@ stub CTEScheduleCriticalEvent +@ stub CTEScheduleDelayedEvent +@ stub CTEScheduleEvent +@ stub CTESignal +@ stub CTEStartTimer +@ stub CTESystemUpTime +@ stub DllInitialize +@ stub DllUnload +@ stub TdiBuildNetbiosAddress +@ stub TdiBuildNetbiosAddressEa +@ stub TdiCopyBufferToMdl +@ stub TdiCopyBufferToMdlWithReservedMappingAtDpcLevel +@ stub TdiCopyMdlChainToMdlChain +@ stub TdiCopyMdlToBuffer +@ stub TdiDefaultChainedRcvDatagramHandler +@ stub TdiDefaultChainedRcvExpeditedHandler +@ stub TdiDefaultChainedReceiveHandler +@ stub TdiDefaultConnectHandler +@ stub TdiDefaultDisconnectHandler +@ stub TdiDefaultErrorHandler +@ stub TdiDefaultRcvDatagramHandler +@ stub TdiDefaultRcvExpeditedHandler +@ stub TdiDefaultReceiveHandler +@ stub TdiDefaultSendPossibleHandler +@ stub TdiDeregisterAddressChangeHandler +@ stub TdiDeregisterDeviceObject +@ stub TdiDeregisterNetAddress +@ stub TdiDeregisterNotificationHandler +@ stub TdiDeregisterPnPHandlers +@ stub TdiDeregisterProvider +@ stub TdiEnumerateAddresses +@ stub TdiGet9FTriageBlock +@ stub TdiInitialize +@ stub TdiMapUserRequest +@ stub TdiMatchPdoWithChainedReceiveContext +@ stub TdiOpenNetbiosAddress +@ stub TdiPnPPowerComplete +@ stub TdiPnPPowerRequest +@ stub TdiProviderReady +@ stub TdiRegisterAddressChangeHandler +@ stub TdiRegisterDeviceObject +@ stub TdiRegisterNetAddress +@ stub TdiRegisterNotificationHandler +@ stub TdiRegisterPnPHandlers +@ stub TdiRegisterProvider +@ stub TdiReturnChainedReceives diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7c0ad09..fb2583d 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2514,6 +2514,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,fltmgr.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- +12,,tdi.sys,- ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,- @@ -2555,6 +2556,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 12,,fltmgr.sys 12,,mountmgr.sys 12,,ndis.sys +12,,tdi.sys ; skip .NET fake dlls in Wine Mono package 11,,aspnet_regiis.exe,- 11,,ngen.exe,-

1 0

Paul Gofman : msvcrt: Rename __libm_sse2_* functions to fix compilation when using Intel compiler.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: a3c818b33d2bbe92ca74783564dc896e24c1002a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3c818b33d2bbe92ca7478356… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Dec 22 15:08:58 2015 +0300 msvcrt: Rename __libm_sse2_* functions to fix compilation when using Intel compiler. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 42 ++++++++++++++--------------- dlls/msvcr110/msvcr110.spec | 64 ++++++++++++++++++++++----------------------- dlls/msvcr120/msvcr120.spec | 64 ++++++++++++++++++++++----------------------- dlls/msvcr80/msvcr80.spec | 42 ++++++++++++++--------------- dlls/msvcr90/msvcr90.spec | 42 ++++++++++++++--------------- dlls/msvcrt/math.c | 44 +++++++++++++++---------------- dlls/msvcrt/msvcrt.spec | 42 ++++++++++++++--------------- dlls/ucrtbase/ucrtbase.spec | 64 ++++++++++++++++++++++----------------------- 8 files changed, 202 insertions(+), 202 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3c818b33d2bbe92ca747…

1 0

Alistair Leslie-Hughes : oledb32: Convert to a BSTR to work out it size.
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: 9c70026092f49872ee3d6f3a71df45f28cf2bed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c70026092f49872ee3d6f3a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Dec 22 21:09:45 2015 +1100 oledb32: Convert to a BSTR to work out it size. This makes code for handling variants with DBTYPE_STR and DBTYPE_WSTR types consistent. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 72714d3..891b31c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1372,10 +1372,16 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, switch (src_type) { case DBTYPE_VARIANT: - if(V_VT((VARIANT*)src) == VT_BSTR) - *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR); - else - WARN("DBTYPE_VARIANT(%d)->DBTYPE_WSTR unimplemented\n", V_VT((VARIANT*)src)); + { + VARIANT v; + + VariantInit(&v); + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + { + *dst_len = (SysStringLen(V_BSTR(&v))+1) * sizeof(WCHAR); + VariantClear(&v); + } + } break; case DBTYPE_STR: if(src_len)

1 0

Nikolay Sivov : regedit: Fix potential buffer leak, simplify error handling (Coverity).
by Alexandre Julliard Dec. 22, 2015

Dec. 22, 2015

Module: wine Branch: master Commit: c9fb3b7f8f1924e58ccc36caa73617f366853d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fb3b7f8f1924e58ccc36caa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 22 00:55:00 2015 +0300 regedit: Fix potential buffer leak, simplify error handling (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 008e6a1..7afc7bf 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -95,17 +95,17 @@ static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPWSTR* pKe LPWSTR GetItemPath(HWND hwndTV, HTREEITEM hItem, HKEY* phRootKey) { - int pathLen = 0, maxLen; + int pathLen = 0, maxLen = 1024; WCHAR *pathBuffer; - pathBuffer = HeapAlloc(GetProcessHeap(), 0, 1024*sizeof(WCHAR)); + if (!hItem) { + hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); + if (!hItem) return NULL; + } + + pathBuffer = HeapAlloc(GetProcessHeap(), 0, maxLen*sizeof(WCHAR)); if (!pathBuffer) return NULL; *pathBuffer = 0; - maxLen = HeapSize(GetProcessHeap(), 0, pathBuffer); - if (maxLen == (SIZE_T) - 1) return NULL; - maxLen = maxLen / sizeof(WCHAR); - if (!hItem) hItem = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); - if (!hItem) return NULL; if (!get_item_path(hwndTV, hItem, phRootKey, &pathBuffer, &pathLen, &maxLen)) return NULL; return pathBuffer; }

1 0