December 2005 - Wine-commits

Detlef Riekenberg : winspool: Added tests for OpenPrinter.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 4b418d6f2b900856d005548637e0e04e8b9cfc16 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4b418d6f2b900856d005548… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Dec 12 13:02:15 2005 +0100 winspool: Added tests for OpenPrinter. --- dlls/winspool/tests/Makefile.in | 2 dlls/winspool/tests/info.c | 234 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 216 insertions(+), 20 deletions(-)

1 0

Michael Jung : shell32: Fix drag-scrolling in the shellview object.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: edf6cf94ca84d1006f10792193588c86506b2daa URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=edf6cf94ca84d1006f10792… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Mon Dec 12 12:43:03 2005 +0100 shell32: Fix drag-scrolling in the shellview object. --- dlls/shell32/shlview.c | 86 +++++++++++++++--------------------------------- 1 files changed, 26 insertions(+), 60 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 99ca862..a887c6e 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -103,7 +103,8 @@ typedef struct IDropTarget* pCurDropTarget; /* The sub-item, which is currently dragged over */ IDataObject* pCurDataObject; /* The dragged data-object */ LONG iDragOverItem; /* Dragged over item's index, iff pCurDropTarget != NULL */ - UINT iActiveTimersMask; /* Bookkeeping of activated timers for drag scrolling */ + UINT cScrollDelay; /* Send a WM_*SCROLL msg every 250 ms during drag-scroll */ + POINT ptLastMousePos; /* Mouse position at last DragOver call */ } IShellViewImpl; static const IShellViewVtbl svvt; @@ -197,7 +198,9 @@ IShellView * IShellView_Constructor( ISh sv->pCurDropTarget = NULL; sv->pCurDataObject = NULL; sv->iDragOverItem = 0; - sv->iActiveTimersMask = 0; + sv->cScrollDelay = 0; + sv->ptLastMousePos.x = 0; + sv->ptLastMousePos.y = 0; TRACE("(%p)->(%p)\n",sv, pFolder); return (IShellView *) sv; @@ -2179,48 +2182,6 @@ static ULONG WINAPI ISVDropTarget_Releas } /****************************************************************************** - * scroll_timer_proc [Internal] - * - * Timer callback function for drag&drop scrolling - */ - -#define IDT_UP 0x1u -#define IDT_DOWN 0x2u -#define IDT_LEFT 0x4u -#define IDT_RIGHT 0x8u - -VOID CALLBACK scroll_timer_proc(HWND hwnd, UINT uMsg, UINT_PTR idTimer, DWORD dwTimer) { - switch (idTimer) { - case IDT_UP: - SendMessageW(hwnd, WM_VSCROLL, SB_LINEUP, 0); - break; - case IDT_DOWN: - SendMessageW(hwnd, WM_VSCROLL, SB_LINEDOWN, 0); - break; - case IDT_LEFT: - SendMessageW(hwnd, WM_HSCROLL, SB_LINEUP, 0); - break; - case IDT_RIGHT: - SendMessageW(hwnd, WM_HSCROLL, SB_LINEDOWN, 0); - break; - } -} - -/****************************************************************************** - * start_stop_timer [Internal] - */ -static inline void start_stop_timer(IShellViewImpl *This, UINT_PTR idTimer, BOOL fStart) { - if (fStart && !(This->iActiveTimersMask & idTimer)) { - SetTimer(This->hWndList, idTimer, 200, scroll_timer_proc); - This->iActiveTimersMask |= idTimer; - } - if (!fStart && This->iActiveTimersMask & idTimer) { - KillTimer(This->hWndList, idTimer); - This->iActiveTimersMask &= ~idTimer; - } -} - -/****************************************************************************** * drag_notify_subitem [Internal] * * Figure out the shellfolder object, which is currently under the mouse cursor @@ -2246,13 +2207,28 @@ static HRESULT drag_notify_subitem(IShel ScreenToClient(This->hWndList, &htinfo.pt); lResult = SendMessageW(This->hWndList, LVM_HITTEST, 0, (LPARAM)&htinfo); - /* Start or stop the drag scrolling timers */ + /* Send WM_*SCROLL messages every 250 ms during drag-scrolling */ GetClientRect(This->hWndList, &clientRect); - start_stop_timer(This, IDT_LEFT, htinfo.pt.x < SCROLLAREAWIDTH); - start_stop_timer(This, IDT_RIGHT, htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH); - start_stop_timer(This, IDT_UP, htinfo.pt.y < SCROLLAREAWIDTH); - start_stop_timer(This, IDT_DOWN, htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH); - + if (htinfo.pt.x == This->ptLastMousePos.x && htinfo.pt.y == This->ptLastMousePos.y && + (htinfo.pt.x < SCROLLAREAWIDTH || htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH || + htinfo.pt.y < SCROLLAREAWIDTH || htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH )) + { + This->cScrollDelay = (This->cScrollDelay + 1) % 5; /* DragOver is called every 50 ms */ + if (This->cScrollDelay == 0) { /* Mouse did hover another 250 ms over the scroll-area */ + if (htinfo.pt.x < SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_HSCROLL, SB_LINEUP, 0); + if (htinfo.pt.x > clientRect.right - SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_HSCROLL, SB_LINEDOWN, 0); + if (htinfo.pt.y < SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_VSCROLL, SB_LINEUP, 0); + if (htinfo.pt.y > clientRect.bottom - SCROLLAREAWIDTH) + SendMessageW(This->hWndList, WM_VSCROLL, SB_LINEDOWN, 0); + } + } else { + This->cScrollDelay = 0; /* Reset, if the cursor is not over the listview's scroll-area */ + } + This->ptLastMousePos = htinfo.pt; + /* If we are still over the previous sub-item, notify it via DragOver and return. */ if (This->pCurDropTarget && lResult == This->iDragOverItem) return IDropTarget_DragOver(This->pCurDropTarget, grfKeyState, pt, pdwEffect); @@ -2321,11 +2297,6 @@ static HRESULT WINAPI ISVDropTarget_Drag This->pCurDropTarget = NULL; This->iDragOverItem = 0; - start_stop_timer(This, IDT_LEFT, FALSE); - start_stop_timer(This, IDT_RIGHT, FALSE); - start_stop_timer(This, IDT_UP, FALSE); - start_stop_timer(This, IDT_DOWN, FALSE); - return S_OK; } @@ -2342,11 +2313,6 @@ static HRESULT WINAPI ISVDropTarget_Drop This->pCurDropTarget = NULL; This->iDragOverItem = 0; - start_stop_timer(This, IDT_LEFT, FALSE); - start_stop_timer(This, IDT_RIGHT, FALSE); - start_stop_timer(This, IDT_UP, FALSE); - start_stop_timer(This, IDT_DOWN, FALSE); - return S_OK; }

1 0

Eric Pouech : Functions with no paramters must be (void).
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 681b71ed9ab6d630005f36be7cb2a98737c23fb6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=681b71ed9ab6d630005f36b… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 12:42:44 2005 +0100 Functions with no paramters must be (void). --- dlls/msvcrt/msvcrt.h | 8 ++++---- dlls/ntdll/relay.c | 4 ++-- dlls/ole32/ole16.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 9680114..d46f738 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -65,10 +65,10 @@ typedef long MSVCRT_clock_t; typedef long MSVCRT_time_t; typedef __int64 MSVCRT_fpos_t; -typedef void (*MSVCRT_terminate_handler)(); -typedef void (*MSVCRT_terminate_function)(); -typedef void (*MSVCRT_unexpected_handler)(); -typedef void (*MSVCRT_unexpected_function)(); +typedef void (*MSVCRT_terminate_handler)(void); +typedef void (*MSVCRT_terminate_function)(void); +typedef void (*MSVCRT_unexpected_handler)(void); +typedef void (*MSVCRT_unexpected_function)(void); typedef void (*MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); typedef void (*MSVCRT__beginthread_start_routine_t)(void *); typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 32da763..9adc522 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -266,8 +266,8 @@ typedef struct tagSNOOP_RETURNENTRIES { #include "poppack.h" -extern void WINAPI SNOOP_Entry(); -extern void WINAPI SNOOP_Return(); +extern void WINAPI SNOOP_Entry(void); +extern void WINAPI SNOOP_Return(void); static SNOOP_DLL *firstdll; static SNOOP_RETURNENTRIES *firstrets; diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index 15e054f..117d484 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -173,7 +173,7 @@ LPVOID IMalloc16_fnHeapMinimize(IMalloc1 * IMalloc16_Constructor [VTABLE] */ LPMALLOC16 -IMalloc16_Constructor() +IMalloc16_Constructor(void) { static IMalloc16Vtbl vt16; static SEGPTR msegvt16;

1 0

Michael Jung : ole32: Periodically call IDropTarger::DragOver during Drag&Drop.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 892fc1093d3b7994570938da01554c988fe3e437 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=892fc1093d3b7994570938d… Author: Michael Jung <mjung(a)iss.tu-darmstadt.de> Date: Mon Dec 12 12:42:53 2005 +0100 ole32: Periodically call IDropTarger::DragOver during Drag&Drop. --- dlls/ole32/ole2.c | 129 ++++++++++++++--------------------------------------- 1 files changed, 34 insertions(+), 95 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 4bc815e..fd55930 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -79,6 +79,8 @@ typedef struct tagTrackerWindowInfo HWND curTargetHWND; /* window the mouse is hovering over */ HWND curDragTargetHWND; /* might be a ancestor of curTargetHWND */ IDropTarget* curDragTarget; + POINTL curMousePos; /* current position of the mouse in screen coordinates */ + DWORD dwKeyState; /* current state of the shift and ctrl keys and the mouse buttons */ } TrackerWindowInfo; typedef struct tagOleMenuDescriptor /* OleMenuDescriptor */ @@ -158,13 +160,9 @@ static LRESULT WINAPI OLEDD_DragTracker WPARAM wParam, LPARAM lParam); static void OLEDD_TrackMouseMove( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState); + TrackerWindowInfo* trackerInfo); static void OLEDD_TrackStateChange( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState); + TrackerWindowInfo* trackerInfo); static DWORD OLEDD_GetButtonState(void); @@ -533,6 +531,10 @@ HRESULT WINAPI DoDragDrop ( */ while (!trackerInfo.trackingDone && GetMessageA(&msg, 0, 0, 0) ) { + trackerInfo.curMousePos.x = msg.pt.x; + trackerInfo.curMousePos.y = msg.pt.y; + trackerInfo.dwKeyState = OLEDD_GetButtonState(); + if ( (msg.message >= WM_KEYFIRST) && (msg.message <= WM_KEYLAST) ) { @@ -551,9 +553,7 @@ HRESULT WINAPI DoDragDrop ( /* * Notify the drop source. */ - OLEDD_TrackStateChange(&trackerInfo, - msg.pt, - OLEDD_GetButtonState()); + OLEDD_TrackStateChange(&trackerInfo); } else { @@ -2033,6 +2033,9 @@ static DropTargetNode* OLEDD_FindDropTar * to receive the user input and act upon it. This procedure is in charge * of this behavior. */ + +#define DRAG_TIMER_ID 1 + static LRESULT WINAPI OLEDD_DragTrackerWindowProc( HWND hwnd, UINT uMsg, @@ -2046,27 +2049,14 @@ static LRESULT WINAPI OLEDD_DragTrackerW LPCREATESTRUCTA createStruct = (LPCREATESTRUCTA)lParam; SetWindowLongA(hwnd, 0, (LONG)createStruct->lpCreateParams); - + SetTimer(hwnd, DRAG_TIMER_ID, 50, NULL); break; } + case WM_TIMER: case WM_MOUSEMOVE: { - TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLongA(hwnd, 0); - POINT mousePos; - - /* - * Get the current mouse position in screen coordinates. - */ - mousePos.x = LOWORD(lParam); - mousePos.y = HIWORD(lParam); - ClientToScreen(hwnd, &mousePos); - - /* - * Track the movement of the mouse. - */ - OLEDD_TrackMouseMove(trackerInfo, mousePos, wParam); - + OLEDD_TrackMouseMove((TrackerWindowInfo*)GetWindowLongA(hwnd, 0)); break; } case WM_LBUTTONUP: @@ -2076,22 +2066,12 @@ static LRESULT WINAPI OLEDD_DragTrackerW case WM_MBUTTONDOWN: case WM_RBUTTONDOWN: { - TrackerWindowInfo* trackerInfo = (TrackerWindowInfo*)GetWindowLongA(hwnd, 0); - POINT mousePos; - - /* - * Get the current mouse position in screen coordinates. - */ - mousePos.x = LOWORD(lParam); - mousePos.y = HIWORD(lParam); - ClientToScreen(hwnd, &mousePos); - - /* - * Notify everyone that the button state changed - * TODO: Check if the "escape" key was pressed. - */ - OLEDD_TrackStateChange(trackerInfo, mousePos, wParam); - + OLEDD_TrackStateChange((TrackerWindowInfo*)GetWindowLongA(hwnd, 0)); + break; + } + case WM_DESTROY: + { + KillTimer(hwnd, DRAG_TIMER_ID); break; } } @@ -2114,23 +2094,19 @@ static LRESULT WINAPI OLEDD_DragTrackerW * trackerInfo - Pointer to the structure identifying the * drag & drop operation that is currently * active. - * mousePos - Current position of the mouse in screen - * coordinates. - * keyState - Contains the state of the shift keys and the - * mouse buttons (MK_LBUTTON and the like) */ -static void OLEDD_TrackMouseMove( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState) +static void OLEDD_TrackMouseMove(TrackerWindowInfo* trackerInfo) { HWND hwndNewTarget = 0; HRESULT hr = S_OK; + POINT pt; /* * Get the handle of the window under the mouse */ - hwndNewTarget = WindowFromPoint(mousePos); + pt.x = trackerInfo->curMousePos.x; + pt.y = trackerInfo->curMousePos.y; + hwndNewTarget = WindowFromPoint(pt); /* * Every time, we re-initialize the effects passed to the @@ -2145,19 +2121,9 @@ static void OLEDD_TrackMouseMove( if ( (trackerInfo->curDragTarget != 0) && (trackerInfo->curTargetHWND == hwndNewTarget) ) { - POINTL mousePosParam; - - /* - * The documentation tells me that the coordinate should be in the target - * window's coordinate space. However, the tests I made tell me the - * coordinates should be in screen coordinates. - */ - mousePosParam.x = mousePos.x; - mousePosParam.y = mousePos.y; - IDropTarget_DragOver(trackerInfo->curDragTarget, - keyState, - mousePosParam, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, trackerInfo->pdwEffect); } else @@ -2197,20 +2163,10 @@ static void OLEDD_TrackMouseMove( */ if (trackerInfo->curDragTarget!=0) { - POINTL mousePosParam; - - /* - * The documentation tells me that the coordinate should be in the target - * window's coordinate space. However, the tests I made tell me the - * coordinates should be in screen coordinates. - */ - mousePosParam.x = mousePos.x; - mousePosParam.y = mousePos.y; - IDropTarget_DragEnter(trackerInfo->curDragTarget, trackerInfo->dataObject, - keyState, - mousePosParam, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, trackerInfo->pdwEffect); } } @@ -2276,15 +2232,8 @@ static void OLEDD_TrackMouseMove( * trackerInfo - Pointer to the structure identifying the * drag & drop operation that is currently * active. - * mousePos - Current position of the mouse in screen - * coordinates. - * keyState - Contains the state of the shift keys and the - * mouse buttons (MK_LBUTTON and the like) */ -static void OLEDD_TrackStateChange( - TrackerWindowInfo* trackerInfo, - POINT mousePos, - DWORD keyState) +static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) { /* * Ask the drop source what to do with the operation. @@ -2292,7 +2241,7 @@ static void OLEDD_TrackStateChange( trackerInfo->returnValue = IDropSource_QueryContinueDrag( trackerInfo->dropSource, trackerInfo->escPressed, - keyState); + trackerInfo->dwKeyState); /* * All the return valued will stop the operation except the S_OK @@ -2325,20 +2274,10 @@ static void OLEDD_TrackStateChange( */ case DRAGDROP_S_DROP: { - POINTL mousePosParam; - - /* - * The documentation tells me that the coordinate should be - * in the target window's coordinate space. However, the tests - * I made tell me the coordinates should be in screen coordinates. - */ - mousePosParam.x = mousePos.x; - mousePosParam.y = mousePos.y; - IDropTarget_Drop(trackerInfo->curDragTarget, trackerInfo->dataObject, - keyState, - mousePosParam, + trackerInfo->dwKeyState, + trackerInfo->curMousePos, trackerInfo->pdwEffect); break; }

1 0

Robert Shearman : widl: Generate FC_ERROR_STATUS_T proc format.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: ccdc119da025ecde55223159226d6a994189ee8b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ccdc119da025ecde5522315… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:14:31 2005 +0100 widl: Generate FC_ERROR_STATUS_T proc format. - Include the header file for the functions implemented in typegen.c. - Generate proc format for FC_ERROR_STATUS_T type. --- tools/widl/typegen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 14817da..6cdff1f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -39,6 +39,7 @@ #include "windef.h" #include "widl.h" +#include "typegen.h" static int print_file(FILE *file, int indent, const char *format, ...) { @@ -75,6 +76,7 @@ static void write_procformatstring_var(F CASE_BASETYPE(FC_SMALL); CASE_BASETYPE(FC_FLOAT); CASE_BASETYPE(FC_DOUBLE); + CASE_BASETYPE(FC_ERROR_STATUS_T); #undef CASE_BASETYPE default: error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type);

1 0

Robert Shearman : widl: Support explicit binding handles.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 12159aec96d3b0ee5cdda45557f747b6093d51cd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=12159aec96d3b0ee5cdda45… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:14:03 2005 +0100 widl: Support explicit binding handles. --- tools/widl/client.c | 30 ++++++++++++++++++++++++++++-- tools/widl/header.c | 41 +++++++++++++++++++++++++++++++++++++++++ tools/widl/header.h | 1 + tools/widl/server.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 2 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 773b318..24bcda8 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -124,6 +124,7 @@ static void write_function_stubs(type_t { func_t *func = iface->funcs; char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); var_t *var; int method_count = 0; unsigned int proc_offset = 0; @@ -132,6 +133,26 @@ static void write_function_stubs(type_t while (func) { var_t *def = func->def; + var_t* explicit_handle_var; + + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (explicit_handle) + { + if (!explicit_handle_var) + { + error("%s() does not define an explicit binding handle!\n", def->name); + return; + } + } + else if (implicit_handle) + { + if (explicit_handle_var) + { + error("%s() must not define a binding handle!\n", def->name); + return; + } + } write_type(client, def->type, def, def->tname); fprintf(client, " "); @@ -157,7 +178,7 @@ static void write_function_stubs(type_t fprintf(client, " _RetVal;\n"); } - if (implicit_handle) + if (implicit_handle || explicit_handle_var) print_client("RPC_BINDING_HANDLE _Handle = 0;\n"); print_client("RPC_MESSAGE _RpcMessage;\n"); @@ -181,6 +202,11 @@ static void write_function_stubs(type_t print_client("_Handle = %s;\n", implicit_handle); fprintf(client, "\n"); } + else if (explicit_handle_var) + { + print_client("_Handle = %s;\n", explicit_handle_var->name); + fprintf(client, "\n"); + } /* emit the message buffer size */ print_client("_StubMsg.BufferLength ="); @@ -191,7 +217,7 @@ static void write_function_stubs(type_t indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); - if (implicit_handle) + if (implicit_handle || explicit_handle_var) print_client("_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name); diff --git a/tools/widl/header.c b/tools/widl/header.c index 070657a..f68844b 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -502,6 +502,28 @@ void write_library(const char *name, att fprintf(header, "\n"); } + +var_t* get_explicit_handle_var(func_t* func) +{ + var_t* var; + + if (!func->args) + return NULL; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + if (var->type->type == RPC_FC_IGNORE) + return var; + + var = PREV_LINK(var); + } + + return NULL; +} + + /********** INTERFACES **********/ int is_object(attr_t *a) @@ -739,10 +761,29 @@ static void write_method_proto(type_t *i static void write_function_proto(type_t *iface) { + char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); + var_t* explicit_handle_var; + func_t *cur = iface->funcs; while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); while (cur) { var_t *def = cur->def; + + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(cur); + if (explicit_handle) { + if (!explicit_handle_var) { + error("%s() does not define an explicit binding handle!\n", def->name); + return; + } + } else if (implicit_handle) { + if (explicit_handle_var) { + error("%s() must not define a binding handle!\n", def->name); + return; + } + } + /* FIXME: do we need to handle call_as? */ write_type(header, def->type, def, def->tname); fprintf(header, " "); diff --git a/tools/widl/header.h b/tools/widl/header.h index 5ecb8aa..c649513 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -42,5 +42,6 @@ extern void write_constdef(var_t *v); extern void write_externdef(var_t *v); extern void write_library(const char *name, attr_t *attr); extern void write_user_types(void); +extern var_t* get_explicit_handle_var(func_t* func); #endif diff --git a/tools/widl/server.c b/tools/widl/server.c index 2abfe83..4c9fcbd 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -89,8 +89,11 @@ static void write_parameters_init(func_t static void write_function_stubs(type_t *iface) { + char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); func_t *func = iface->funcs; var_t *var; + var_t* explicit_handle_var; unsigned int proc_offset = 0; while (NEXT_LINK(func)) func = NEXT_LINK(func); @@ -98,6 +101,25 @@ static void write_function_stubs(type_t { var_t *def = func->def; + /* check for a defined binding handle */ + explicit_handle_var = get_explicit_handle_var(func); + if (explicit_handle) + { + if (!explicit_handle_var) + { + error("%s() does not define an explicit binding handle!\n", def->name); + return; + } + } + else if (implicit_handle) + { + if (explicit_handle_var) + { + error("%s() must not define a binding handle!\n", def->name); + return; + } + } + write_type(server, def->type, def, def->tname); fprintf(server, " __RPC_STUB\n"); fprintf(server, "%s_", iface->name); @@ -152,6 +174,12 @@ static void write_function_stubs(type_t write_parameters_init(func); + if (explicit_handle_var) + { + print_server("%s = _pRpcMessage->Handle;\n", explicit_handle_var->name); + fprintf(server, "\n"); + } + print_server("RpcTryFinally\n"); print_server("{\n"); indent++;

1 0

Robert Shearman : widl: Calculate the size of buffer required.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: dfb716f3d614fd0d21022d2c686efef19023292a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dfb716f3d614fd0d21022d2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:12:50 2005 +0100 widl: Calculate the size of buffer required. - Calculate the size of buffer required. - Fix a typo. - Set the buffer start and buffer end markers. --- tools/widl/client.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 61 insertions(+), 4 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 7d583a0..773b318 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -66,6 +66,60 @@ static int print_client( const char *for } +static void print_message_buffer_size(func_t *func) +{ + unsigned int total_size = 0; + + if (func->args) + { + var_t *var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + unsigned int alignment = 8; + + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + total_size += 1; + alignment = 1; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + total_size += 2 + alignment % 2; + alignment = 2; + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + total_size += 4 + alignment % 4; + alignment = 4; + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + total_size += 8 + alignment % 8; + alignment = 8; + break; + + default: + alignment = 1; + } + + var = PREV_LINK(var); + } + } + fprintf(client, " %u", total_size); +} + + static void write_function_stubs(type_t *iface) { func_t *func = iface->funcs; @@ -130,7 +184,7 @@ static void write_function_stubs(type_t /* emit the message buffer size */ print_client("_StubMsg.BufferLength ="); - print_client("0"); /* FIXME */ + print_message_buffer_size(func); fprintf(client, ";\n"); print_client("NdrGetBuffer(\n"); @@ -138,7 +192,7 @@ static void write_function_stubs(type_t print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("_StubMsg.BufferLength,\n"); if (implicit_handle) - print_client("%_Handle);\n"); + print_client("_Handle);\n"); else print_client("%s__MIDL_AutoBindHandle);\n", iface->name); indent--; @@ -150,14 +204,17 @@ static void write_function_stubs(type_t /* send/receive message */ /* print_client("NdrNsSendReceive(\n"); */ + /* print_client("(unsigned char *)_StubMsg.Buffer,\n"); */ + /* print_client("(RPC_BINDING_HANDLE *) &%s__MIDL_AutoBindHandle);\n", iface->name); */ print_client("NdrSendReceive(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); print_client("(unsigned char *)_StubMsg.Buffer);\n"); - /* print_client("(unsigned char *)_StubMsg.Buffer,\n"); */ - /* print_client("(RPC_BINDING_HANDLE *) &%s__MIDL_AutoBindHandle);\n", iface->name); */ indent--; + print_client("_StubMsg.BufferStart = (unsigned char *)_RpcMessage.Buffer;\n"); + print_client("_StubMsg.BufferEnd = _StubMsg.BufferStart + _RpcMessage.BufferLength;\n"); + /* unmarshal return value */ if (!is_void(def->type, NULL)) {

1 0

Robert Shearman : widl: Zero initialize parameters in the generated server code.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 759e3c9fe3b9012937227e1618d33f492a506ccc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=759e3c9fe3b9012937227e1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:13:43 2005 +0100 widl: Zero initialize parameters in the generated server code. Zero initialize parameters in the generated code. Based on a patch by Eric Kohl. --- tools/widl/server.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 2ddbc41..2abfe83 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -68,6 +68,25 @@ static int print_server(const char *form } +static void write_parameters_init(func_t *func) +{ + var_t *var; + + if (!func->args) + return; + + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + print_server("%s = 0;\n", var->name); + + var = PREV_LINK(var); + } + fprintf(server, "\n"); +} + + static void write_function_stubs(type_t *iface) { func_t *func = iface->funcs; @@ -131,6 +150,8 @@ static void write_function_stubs(type_t indent--; fprintf(server, "\n"); + write_parameters_init(func); + print_server("RpcTryFinally\n"); print_server("{\n"); indent++;

1 0

Robert Shearman : widl: Don't cast buffer pointers to long in generated server code.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: fc3821f475bb2f9a85180da6e0ccab2d288617d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fc3821f475bb2f9a85180da… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 12:12:06 2005 +0100 widl: Don't cast buffer pointers to long in generated server code. --- tools/widl/server.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/server.c b/tools/widl/server.c index 68b46e6..2ddbc41 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -235,7 +235,7 @@ static void write_function_stubs(type_t fprintf(server, "\n"); print_server("_pRpcMessage->BufferLength =\n"); indent++; - print_server("(unsigned int)((long)_StubMsg.Buffer - (long)_pRpcMessage->Buffer);\n"); + print_server("(unsigned int)(_StubMsg.Buffer - (unsigned char *)_pRpcMessage->Buffer);\n"); indent--; indent--; fprintf(server, "}\n");

1 0

Eric Kohl : widl: Support multiple interfaces per file.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 6744d4e3ea2ead8a44a6a15d5a709fdb4bff51ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6744d4e3ea2ead8a44a6a15… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Mon Dec 12 12:11:44 2005 +0100 widl: Support multiple interfaces per file. --- tools/widl/client.c | 48 +++++++++++++++++++++++++++++------------------- tools/widl/server.c | 46 ++++++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 37 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 6c33692..7d583a0 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -386,37 +386,47 @@ static void init_client(void) void write_client(ifref_t *ifaces) { - ifref_t *lcur = ifaces; + ifref_t *iface = ifaces; if (!do_client) return; - if (!lcur) + if (!iface) return; - END_OF_LIST(lcur); + END_OF_LIST(iface); init_client(); if (!client) return; - write_formatstringsdecl(lcur->iface); - write_implicithandledecl(lcur->iface); + while (iface) + { + fprintf(client, "/*****************************************************************************\n"); + fprintf(client, " * %s interface\n", iface->iface->name); + fprintf(client, " */\n"); + fprintf(client, "\n"); + + write_formatstringsdecl(iface->iface); + write_implicithandledecl(iface->iface); + + write_clientinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); + write_bindinghandledecl(iface->iface); + + write_function_stubs(iface->iface); + write_stubdescriptor(iface->iface); + + print_client("#if !defined(__RPC_WIN32__)\n"); + print_client("#error Invalid build platform for this stub.\n"); + print_client("#endif\n"); + fprintf(client, "\n"); - write_clientinterfacedecl(lcur->iface); - write_stubdescdecl(lcur->iface); - write_bindinghandledecl(lcur->iface); + write_procformatstring(client, iface->iface); + write_typeformatstring(client); - write_function_stubs(lcur->iface); - write_stubdescriptor(lcur->iface); + fprintf(client, "\n"); - print_client("#if !defined(__RPC_WIN32__)\n"); - print_client("#error Invalid build platform for this stub.\n"); - print_client("#endif\n"); - fprintf(client, "\n"); - - write_procformatstring(client, lcur->iface); - write_typeformatstring(client); - - fprintf(client, "\n"); + iface = PREV_LINK(iface); + } fclose(client); } diff --git a/tools/widl/server.c b/tools/widl/server.c index 668e492..68b46e6 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -432,36 +432,46 @@ static void init_server(void) void write_server(ifref_t *ifaces) { - ifref_t *lcur = ifaces; + ifref_t *iface = ifaces; if (!do_server) return; - if (!lcur) + if (!iface) return; - END_OF_LIST(lcur); + END_OF_LIST(iface); init_server(); if (!server) return; - write_formatstringsdecl(lcur->iface); - write_serverinterfacedecl(lcur->iface); - write_stubdescdecl(lcur->iface); + while (iface) + { + fprintf(server, "/*****************************************************************************\n"); + fprintf(server, " * %s interface\n", iface->iface->name); + fprintf(server, " */\n"); + fprintf(server, "\n"); + + write_formatstringsdecl(iface->iface); + write_serverinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); + + write_function_stubs(iface->iface); + + write_stubdescriptor(iface->iface); + write_dispatchtable(iface->iface); + + print_server("#if !defined(__RPC_WIN32__)\n"); + print_server("#error Invalid build platform for this stub.\n"); + print_server("#endif\n"); + fprintf(server, "\n"); - write_function_stubs(lcur->iface); + write_procformatstring(server, iface->iface); + write_typeformatstring(server); - write_stubdescriptor(lcur->iface); - write_dispatchtable(lcur->iface); + fprintf(server, "\n"); - print_server("#if !defined(__RPC_WIN32__)\n"); - print_server("#error Invalid build platform for this stub.\n"); - print_server("#endif\n"); - fprintf(server, "\n"); - - write_procformatstring(server, lcur->iface); - write_typeformatstring(server); - - fprintf(server, "\n"); + iface = PREV_LINK(iface); + } fclose(server); }

1 0