June 2011 - Wine-Commits - list.winehq.org

Frédéric Delanoy : cmd/tests: Get rid of obsolete @todo_space@ construct.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 5cb45138daa9d0173210b2e73eb213d539459c3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb45138daa9d0173210b2e73… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jun 13 22:19:44 2011 +0200 cmd/tests: Get rid of obsolete @todo_space@ construct. --- programs/cmd/tests/batch.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 0f01dbf..3c12fe7 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -142,7 +142,6 @@ static const char *compare_line(const char *out_line, const char *out_end, const const char *err = NULL; static const char pwd_cmd[] = {'@','p','w','d','@'}; - static const char todo_space_cmd[] = {'@','t','o','d','o','_','s','p','a','c','e','@'}; static const char space_cmd[] = {'@','s','p','a','c','e','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; @@ -159,13 +158,6 @@ static const char *compare_line(const char *out_line, const char *out_end, const out_ptr += workdir_len; continue; } - }else if(exp_ptr+sizeof(todo_space_cmd) <= exp_end - && !memcmp(exp_ptr, todo_space_cmd, sizeof(todo_space_cmd))) { - exp_ptr += sizeof(todo_space_cmd); - todo_wine ok(*out_ptr == ' ', "expected space\n"); - if(out_ptr < out_end && *out_ptr == ' ') - out_ptr++; - continue; }else if(exp_ptr+sizeof(space_cmd) <= exp_end && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { exp_ptr += sizeof(space_cmd);

1 0

Vincent Povirk : user32: Add a test to find the queue containing hotkey messages.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 1e2e3d1a0509f6a1f262cc204de4d278602b7a9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e2e3d1a0509f6a1f262cc204… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 13 12:31:08 2011 -0500 user32: Add a test to find the queue containing hotkey messages. --- dlls/user32/tests/msg.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2d993e2..3d9452d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13078,6 +13078,22 @@ static const struct message WmHotkeyReleaseLWIN[] = { { WM_KEYUP, sent|wparam|lparam, VK_LWIN, 0xc0000001 }, { 0 } }; +static const struct message WmHotkeyCombined[] = { + { WM_KEYDOWN, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED }, + { WM_KEYDOWN, kbd_hook|lparam, 0, LLKHF_INJECTED }, + { WM_KEYUP, kbd_hook|lparam, 0, LLKHF_INJECTED|LLKHF_UP }, + { WM_KEYUP, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED|LLKHF_UP }, + { WM_APP, sent, 0, 0 }, + { WM_HOTKEY, sent|wparam, 5 }, + { WM_APP+1, sent, 0, 0 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_LWIN, 1 }, + { HCBT_KEYSKIPPED, hook|optional, 0, 0x80000001 }, + { WM_KEYUP, sent, 0, 0x80000001 }, /* lparam not checked so the sequence isn't a todo */ + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_LWIN, 0xc0000001 }, + { 0 } +}; static int hotkey_letter; @@ -13223,6 +13239,24 @@ static void test_hotkey(void) DispatchMessage(&msg); ok_sequence(WmHotkeyReleaseLWIN, "window hotkey release LWIN", FALSE); + /* Send and process all messages at once */ + PostMessage(test_window, WM_APP, 0, 0); + keybd_event(VK_LWIN, 0, 0, 0); + keybd_event(hotkey_letter, 0, 0, 0); + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); + + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + { + if (msg.message == WM_HOTKEY) + { + ok(msg.hwnd == test_window, "unexpected hwnd %p\n", msg.hwnd); + ok(msg.lParam == MAKELPARAM(MOD_WIN, hotkey_letter), "unexpected WM_HOTKEY lparam %lx\n", msg.lParam); + } + DispatchMessage(&msg); + } + ok_sequence(WmHotkeyCombined, "window hotkey combined", FALSE); + /* Register same hwnd/id with different key combination */ ret = RegisterHotKey(test_window, 5, 0, hotkey_letter); ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError());

1 0

Alexandre Julliard : urlmon: Remove unneded stubs for IWindowForBindingUI.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 75116153698817457ff9f7e41b7b3ff144617d67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75116153698817457ff9f7e41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 12:56:59 2011 +0200 urlmon: Remove unneded stubs for IWindowForBindingUI. --- dlls/urlmon/usrmarshal.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/usrmarshal.c b/dlls/urlmon/usrmarshal.c index 6ff8f04..e6b468a 100644 --- a/dlls/urlmon/usrmarshal.c +++ b/dlls/urlmon/usrmarshal.c @@ -146,17 +146,3 @@ HRESULT __RPC_STUB IBinding_GetBindResult_Stub(IBinding* This, FIXME("stub\n"); return E_NOTIMPL; } - -HRESULT STDMETHODCALLTYPE IWindowForBindingUI_GetWindow_Proxy( - IWindowForBindingUI* This, REFGUID rguidReason, HWND *phwnd) -{ - FIXME("stub\n"); - return E_NOTIMPL; -} - -void __RPC_STUB IWindowForBindingUI_GetWindow_Stub(IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase) -{ - FIXME("stub\n"); -}

1 0

Hans Leidekker : ws2_32: Accept NULL lpNumberOfBytesSent for overlapped calls to WSASend/To.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 3581d2c6d176fe922ee4c8b05768f18c59c93008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3581d2c6d176fe922ee4c8b05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 14 10:31:26 2011 +0200 ws2_32: Accept NULL lpNumberOfBytesSent for overlapped calls to WSASend/To. --- dlls/ws2_32/socket.c | 25 +++++++++++++------------ dlls/ws2_32/tests/sock.c | 24 +++++++++++++++++++++++- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e1a32fb..0c51985 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3790,9 +3790,10 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { unsigned int i, options; int n, fd, err; - struct ws2_async *wsa; + struct ws2_async *wsa = NULL; int totalLength = 0; ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; + DWORD bytes_sent; TRACE("socket %04lx, wsabuf %p, nbufs %d, flags %d, to %p, tolen %d, ovl %p, func %p\n", s, lpBuffers, dwBufferCount, dwFlags, @@ -3803,6 +3804,11 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if ( fd == -1 ) return SOCKET_ERROR; + if (!lpOverlapped && !lpNumberOfBytesSent) + { + err = WSAEFAULT; + goto error; + } if (!(wsa = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET(struct ws2_async, iovec[dwBufferCount]) ))) { err = WSAEFAULT; @@ -3824,12 +3830,6 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, totalLength += lpBuffers[i].len; } - if (!lpNumberOfBytesSent) - { - err = WSAEFAULT; - goto error; - } - for (;;) { n = WS2_send( fd, wsa ); @@ -3881,7 +3881,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, iosb->u.Status = STATUS_SUCCESS; iosb->Information = n; - *lpNumberOfBytesSent = n; + if (lpNumberOfBytesSent) *lpNumberOfBytesSent = n; if (!wsa->completion_func) { if (cvalue) WS_AddCompletion( s, cvalue, STATUS_SUCCESS, n ); @@ -3900,7 +3900,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, * sending blocks until the entire buffer is sent. */ DWORD timeout_start = GetTickCount(); - *lpNumberOfBytesSent = n == -1 ? 0 : n; + bytes_sent = n == -1 ? 0 : n; while (wsa->first_iovec < wsa->n_iovecs) { @@ -3930,7 +3930,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } if (n >= 0) - *lpNumberOfBytesSent += n; + bytes_sent += n; } } else /* non-blocking */ @@ -3942,11 +3942,12 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, err = WSAEWOULDBLOCK; goto error; } - *lpNumberOfBytesSent = n; + bytes_sent = n; } - TRACE(" -> %i bytes\n", *lpNumberOfBytesSent); + TRACE(" -> %i bytes\n", bytes_sent); + if (lpNumberOfBytesSent) *lpNumberOfBytesSent = bytes_sent; HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); WSASetLastError(0); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ef01ed2..de9c400 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3030,8 +3030,9 @@ static void test_send(void) goto end; bytes_sent = 0; + WSASetLastError(12345); ret = WSASend(dst, &buf, 1, &bytes_sent, 0, &ov, NULL); - ok((ret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen), + ok((ret == SOCKET_ERROR && WSAGetLastError() == ERROR_IO_PENDING) || broken(bytes_sent == buflen), "Failed to start overlapped send %d - %d - %d/%d\n", ret, WSAGetLastError(), bytes_sent, buflen); /* don't check for completion yet, we may need to drain the buffer while still sending */ @@ -3064,6 +3065,16 @@ static void test_send(void) "Got %d instead of %d (%d - %d)\n", bytes_sent, buflen, bret, GetLastError()); } + WSASetLastError(12345); + ret = WSASend(INVALID_SOCKET, &buf, 1, NULL, 0, &ov, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTSOCK, + "WSASend failed %d - %d\n", ret, WSAGetLastError()); + + WSASetLastError(12345); + ret = WSASend(dst, &buf, 1, NULL, 0, &ov, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == ERROR_IO_PENDING, + "Failed to start overlapped send %d - %d\n", ret, WSAGetLastError()); + end: if (src != INVALID_SOCKET) closesocket(src); @@ -3903,6 +3914,7 @@ static void test_WSASendTo(void) char buf[12] = "hello world"; WSABUF data_buf; DWORD bytesSent; + int ret; addr.sin_family = AF_INET; addr.sin_port = htons(139); @@ -3916,6 +3928,16 @@ static void test_WSASendTo(void) } WSASetLastError(12345); + ret = WSASendTo(INVALID_SOCKET, &data_buf, 1, NULL, 0, (struct sockaddr*)&addr, sizeof(addr), NULL, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAENOTSOCK, + "WSASendTo() failed: %d/%d\n", ret, WSAGetLastError()); + + WSASetLastError(12345); + ret = WSASendTo(s, &data_buf, 1, NULL, 0, (struct sockaddr*)&addr, sizeof(addr), NULL, NULL); + ok(ret == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "WSASendTo() failed: %d/%d\n", ret, WSAGetLastError()); + + WSASetLastError(12345); if(WSASendTo(s, &data_buf, 1, &bytesSent, 0, (struct sockaddr*)&addr, sizeof(addr), NULL, NULL)) { ok(0, "WSASendTo() failed error: %d\n", WSAGetLastError()); return;

1 0

Andrew Eikum : winecoreaudio.drv: Initialize audio description flags.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 4b62257b144e9c1f231a0d3853778cd8ec5e49f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b62257b144e9c1f231a0d385… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 13 15:23:14 2011 -0500 winecoreaudio.drv: Initialize audio description flags. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index d32e62a..26c9286 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -604,6 +604,8 @@ static HRESULT ca_get_audiodesc(AudioStreamBasicDescription *desc, { const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; + desc->mFormatFlags = 0; + if(fmt->wFormatTag == WAVE_FORMAT_PCM || (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){

1 0

Andrew Eikum : mmdevapi: Sessions should be unique per-device.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: bc10fd3ce68f3d51a4e5fbb6395758e9c957f5a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc10fd3ce68f3d51a4e5fbb63… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 13 15:23:09 2011 -0500 mmdevapi: Sessions should be unique per-device. --- dlls/mmdevapi/devenum.c | 2 +- dlls/mmdevapi/mmdevapi.h | 2 +- dlls/winealsa.drv/mmdevdrv.c | 61 +++++++++++++------------ dlls/winealsa.drv/winealsa.drv.spec | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 61 +++++++++++++------------ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 2 +- dlls/wineoss.drv/mmdevdrv.c | 61 +++++++++++++------------ dlls/wineoss.drv/wineoss.drv.spec | 2 +- 8 files changed, 101 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc10fd3ce68f3d51a4e5f…

1 0

Francois Gouget : comdlg32: Use macros for the resource IDs instead of numeric literals.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: aa005d7deecde1fa59d288304cc4b1325f582d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa005d7deecde1fa59d288304… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 13 16:11:55 2011 +0200 comdlg32: Use macros for the resource IDs instead of numeric literals. --- dlls/comdlg32/cdlg_Bg.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Ca.rc | 46 ++++++++++---------- dlls/comdlg32/cdlg_Cs.rc | 48 +++++++++++----------- dlls/comdlg32/cdlg_Da.rc | 48 +++++++++++----------- dlls/comdlg32/cdlg_De.rc | 46 ++++++++++---------- dlls/comdlg32/cdlg_El.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_En.rc | 72 ++++++++++++++++---------------- dlls/comdlg32/cdlg_Eo.rc | 50 +++++++++++----------- dlls/comdlg32/cdlg_Es.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Fi.rc | 58 +++++++++++++------------- dlls/comdlg32/cdlg_Fr.rc | 72 ++++++++++++++++---------------- dlls/comdlg32/cdlg_He.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Hu.rc | 46 ++++++++++---------- dlls/comdlg32/cdlg_It.rc | 46 ++++++++++---------- dlls/comdlg32/cdlg_Ja.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Ko.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Lt.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Nl.rc | 46 ++++++++++---------- dlls/comdlg32/cdlg_No.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Pl.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Pt.rc | 92 ++++++++++++++++++++-------------------- dlls/comdlg32/cdlg_Ro.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Ru.rc | 46 ++++++++++---------- dlls/comdlg32/cdlg_Si.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Sk.rc | 56 ++++++++++++------------ dlls/comdlg32/cdlg_Sr.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Sv.rc | 46 ++++++++++---------- dlls/comdlg32/cdlg_Th.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Tr.rc | 62 ++++++++++++++-------------- dlls/comdlg32/cdlg_Uk.rc | 46 ++++++++++---------- dlls/comdlg32/cdlg_Wa.rc | 46 ++++++++++---------- dlls/comdlg32/cdlg_Zh.rc | 104 +++++++++++++++++++++++----------------------- 32 files changed, 941 insertions(+), 941 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa005d7deecde1fa59d28…

1 0

Hans Leidekker : msi: Pass the full custom action command to CreateProcess.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 5ca2277cc5ee5722de1b62c051890c8db950bacf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca2277cc5ee5722de1b62c05… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 14 10:45:10 2011 +0200 msi: Pass the full custom action command to CreateProcess. --- dlls/msi/custom.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 211bec0..8de6431 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -768,14 +768,65 @@ static UINT HANDLE_CustomType1(MSIPACKAGE *package, LPCWSTR source, return r; } -static HANDLE execute_command( const WCHAR *exe, WCHAR *arg, const WCHAR *dir ) +static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) { + static const WCHAR dotexeW[] = {'.','e','x','e',0}; STARTUPINFOW si; PROCESS_INFORMATION info; + WCHAR *exe = NULL, *cmd = NULL, *p; BOOL ret; + if (app) + { + int len_arg = 0; + DWORD len_exe; + + if (!(exe = msi_alloc( MAX_PATH * sizeof(WCHAR) ))) return INVALID_HANDLE_VALUE; + len_exe = SearchPathW( NULL, app, dotexeW, MAX_PATH, exe, NULL ); + if (len_exe >= MAX_PATH) + { + msi_free( exe ); + if (!(exe = msi_alloc( len_exe * sizeof(WCHAR) ))) return INVALID_HANDLE_VALUE; + len_exe = SearchPathW( NULL, app, dotexeW, len_exe, exe, NULL ); + } + if (!len_exe) + { + WARN("can't find executable %u\n", GetLastError()); + msi_free( exe ); + return INVALID_HANDLE_VALUE; + } + + if (arg) len_arg = strlenW( arg ); + if (!(cmd = msi_alloc( (len_exe + len_arg + 4) * sizeof(WCHAR) ))) + { + msi_free( exe ); + return INVALID_HANDLE_VALUE; + } + p = cmd; + if (strchrW( exe, ' ' )) + { + *p++ = '\"'; + memcpy( p, exe, len_exe * sizeof(WCHAR) ); + p += len_exe; + *p++ = '\"'; + *p = 0; + } + else + { + strcpyW( p, exe ); + p += len_exe; + } + if (arg) + { + *p++ = ' '; + memcpy( p, arg, len_arg * sizeof(WCHAR) ); + p[len_arg] = 0; + } + } memset( &si, 0, sizeof(STARTUPINFOW) ); - ret = CreateProcessW( exe, arg, NULL, NULL, FALSE, 0, NULL, dir, &si, &info ); + ret = CreateProcessW( exe, exe ? cmd : arg, NULL, NULL, FALSE, 0, NULL, dir, &si, &info ); + msi_free( cmd ); + msi_free( exe ); if (!ret) { WARN("unable to execute command %u\n", GetLastError());

1 0

Alexandre Julliard : widl: Move the pointer check functionality to typegen. c.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: c173399d62e6a65872bee60bd4e3d95d0e06431e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c173399d62e6a65872bee60bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 12:55:39 2011 +0200 widl: Move the pointer check functionality to typegen.c. --- tools/widl/client.c | 15 +-------------- tools/widl/proxy.c | 29 +---------------------------- tools/widl/typegen.c | 29 +++++++++++++++++++++++++++++ tools/widl/typegen.h | 1 + tools/widl/widltypes.h | 1 - 5 files changed, 32 insertions(+), 43 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 84f480b..be42b1b 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -50,19 +50,6 @@ static void print_client( const char *format, ... ) va_end(va); } - -static void check_pointers(const var_t *func) -{ - const var_t *var; - - if (!type_get_function_args(func->type)) - return; - - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - if (cant_be_null(var)) - print_client("if (!%s) RpcRaiseException(RPC_X_NULL_REF_POINTER);\n", var->name); -} - static void write_client_func_decl( const type_t *iface, const var_t *func ) { const char *callconv = get_attrp(func->type->attrs, ATTR_CALLCONV); @@ -173,7 +160,7 @@ static void write_function_stub( const type_t *iface, const var_t *func, write_full_pointer_init(client, indent, func, FALSE); /* check pointers */ - check_pointers(func); + write_pointer_checks( client, indent, func ); print_client("RpcTryFinally\n"); print_client("{\n"); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 2ff8ea1..8e2db07 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -120,23 +120,6 @@ static void clear_output_vars( const var_list_t *args ) } } -int cant_be_null(const var_t *v) -{ - switch (typegen_detect_type(v->type, v->attrs, TDT_IGNORE_STRINGS)) - { - case TGT_ARRAY: - if (!type_array_is_decl_as_ptr( v->type )) return 0; - /* fall through */ - case TGT_POINTER: - return (get_pointer_fc(v->type, v->attrs, TRUE) == RPC_FC_RP); - case TGT_CTXT_HANDLE_POINTER: - return TRUE; - default: - return 0; - } - -} - static int need_delegation(const type_t *iface) { const type_t *parent = type_iface_get_inherit( iface ); @@ -161,16 +144,6 @@ static int need_delegation_indirect(const type_t *iface) return get_delegation_indirect(iface, NULL); } -static void proxy_check_pointers( const var_list_t *args ) -{ - const var_t *arg; - - if (!args) return; - LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) - if (cant_be_null(arg)) - print_proxy( "if (!%s) RpcRaiseException(RPC_X_NULL_REF_POINTER);\n", arg->name ); -} - static void free_variable( const var_t *arg, const char *local_var_prefix ) { unsigned int type_offset = arg->type->typestring_offset; @@ -303,7 +276,7 @@ static void gen_proxy(type_t *iface, const var_t *func, int idx, print_proxy( "{\n" ); indent++; print_proxy( "NdrProxyInitialize(This, &_RpcMessage, &__frame->_StubMsg, &Object_StubDesc, %d);\n", idx); - proxy_check_pointers( type_get_function_args(func->type) ); + write_pointer_checks( proxy, indent, func ); print_proxy( "RpcTryFinally\n" ); print_proxy( "{\n" ); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1a2329d..0096c32 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -373,6 +373,23 @@ enum typegen_type typegen_detect_type(const type_t *type, const attr_list_t *att return TGT_INVALID; } +static int cant_be_null(const var_t *v) +{ + switch (typegen_detect_type(v->type, v->attrs, TDT_IGNORE_STRINGS)) + { + case TGT_ARRAY: + if (!type_array_is_decl_as_ptr( v->type )) return 0; + /* fall through */ + case TGT_POINTER: + return (get_pointer_fc(v->type, v->attrs, TRUE) == RPC_FC_RP); + case TGT_CTXT_HANDLE_POINTER: + return TRUE; + default: + return 0; + } + +} + static int get_padding(const var_list_t *fields) { unsigned short offset = 0; @@ -4720,6 +4737,18 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun print_file( file, 0, "\n" ); } +void write_pointer_checks( FILE *file, int indent, const var_t *func ) +{ + const var_list_t *args = type_get_function_args( func->type ); + const var_t *var; + + if (!args) return; + + LIST_FOR_EACH_ENTRY( var, args, const var_t, entry ) + if (cant_be_null( var )) + print_file( file, indent, "if (!%s) RpcRaiseException(RPC_X_NULL_REF_POINTER);\n", var->name ); +} + int write_expr_eval_routines(FILE *file, const char *iface) { static const char *var_name = "pS"; diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 3efd421..c98aff8 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -77,6 +77,7 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char void declare_stub_args( FILE *file, int indent, const var_t *func ); void write_func_param_struct( FILE *file, const type_t *iface, const type_t *func, const char *var_decl, int add_retval ); +void write_pointer_checks( FILE *file, int indent, const var_t *func ); int write_expr_eval_routines(FILE *file, const char *iface); void write_expr_eval_routine_list(FILE *file, const char *iface); void write_user_quad_list(FILE *file); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 9e9bec6..64c94e5 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -544,7 +544,6 @@ void clear_all_offsets(void); int is_ptr(const type_t *t); int is_array(const type_t *t); -int cant_be_null(const var_t *v); #define tsENUM 1 #define tsSTRUCT 2

1 0

Alexandre Julliard : widl: Allow unsized in,out string parameters.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: bcca410733f8a55157fd13e2d42a06730e4a518c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcca410733f8a55157fd13e2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 12:23:32 2011 +0200 widl: Allow unsized in,out string parameters. --- tools/widl/parser.y | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 24107fc..f034074 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2572,6 +2572,7 @@ static void check_remoting_args(const var_t *func) type_array_get_conformance(type)->type != EXPR_VOID) break; if (!type_array_has_conformance(type) && type_array_get_dim(type)) break; } + if (is_attr( arg->attrs, ATTR_IN )) break; error_loc_info(&arg->loc_info, "out parameter \'%s\' of function \'%s\' cannot be an unsized string\n", arg->name, funcname); break; case TGT_INVALID:

1 0