February 2007 - Wine-commits

Vitaliy Margolen : dinput: Don' t reset dead zone and saturation when setting data format.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: a06821765a86b783fb45487a50630b26a9f6a96b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a06821765a86b783fb45487a5… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Tue Feb 6 09:47:17 2007 -0700 dinput: Don't reset dead zone and saturation when setting data format. Additional tests indicate that native doesn't touch previously set properties. --- dlls/dinput/joystick_linux.c | 32 +++----------------------------- dlls/dinput/joystick_linuxinput.c | 13 ++++++++++++- dlls/dinput/tests/joystick.c | 23 ++++++++++++++++++++++- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3fa906d..26a62b5 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -474,7 +474,7 @@ static HRESULT alloc_device(REFGUID rgui newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)"DINPUT_joystick"; /* setup_dinput_options may change these */ - newDevice->deadzone = 5000; + newDevice->deadzone = 0; newDevice->devcaps.dwButtons = newDevice->buttons; newDevice->devcaps.dwAxes = newDevice->axes; newDevice->devcaps.dwPOVs = 0; @@ -672,32 +672,6 @@ static ULONG WINAPI JoystickAImpl_Releas } /****************************************************************************** - * SetDataFormat : the application can choose the format of the data - * the device driver sends back with GetDeviceState. - */ -static HRESULT WINAPI JoystickAImpl_SetDataFormat( - LPDIRECTINPUTDEVICE8A iface, - LPCDIDATAFORMAT df) -{ - JoystickImpl *This = (JoystickImpl *)iface; - unsigned int i; - HRESULT hr; - - TRACE("(%p,%p)\n",This,df); - - hr = IDirectInputDevice2AImpl_SetDataFormat(iface, df); - if (FAILED(hr)) return hr; - - for (i = 0; i < This->base.data_format.wine_df->dwNumObjs; i++) - { - This->props[i].lDeadZone = 1000; - This->props[i].lSaturation = 0; - } - - return DI_OK; -} - -/****************************************************************************** * Acquire : gets exclusive control of the joystick */ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) @@ -1250,7 +1224,7 @@ static const IDirectInputDevice8AVtbl Jo JoystickAImpl_Unacquire, JoystickAImpl_GetDeviceState, IDirectInputDevice2AImpl_GetDeviceData, - JoystickAImpl_SetDataFormat, + IDirectInputDevice2AImpl_SetDataFormat, IDirectInputDevice2AImpl_SetEventNotification, IDirectInputDevice2AImpl_SetCooperativeLevel, JoystickAImpl_GetObjectInfo, @@ -1292,7 +1266,7 @@ static const IDirectInputDevice8WVtbl Sy XCAST(Unacquire)JoystickAImpl_Unacquire, XCAST(GetDeviceState)JoystickAImpl_GetDeviceState, XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData, - XCAST(SetDataFormat)JoystickAImpl_SetDataFormat, + XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat, XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification, XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel, IDirectInputDevice2WImpl_GetObjectInfo, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 12fcf6d..8df801e 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -923,9 +923,20 @@ static HRESULT WINAPI JoystickAImpl_GetP TRACE("range(%d, %d) obj=%d\n", pr->lMin, pr->lMax, obj); break; } + case (DWORD) DIPROP_DEADZONE: + { + LPDIPROPDWORD pd = (LPDIPROPDWORD)pdiph; + int obj = find_property(&This->base.data_format, pdiph); + + if (obj < 0) return DIERR_OBJECTNOTFOUND; + + pd->dwData = This->props[obj].deadzone; + TRACE("deadzone(%d) obj=%d\n", pd->dwData, obj); + break; + } default: - return IDirectInputDevice2AImpl_GetProperty(iface, rguid, pdiph); + return IDirectInputDevice2AImpl_GetProperty(iface, rguid, pdiph); } return DI_OK; diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 7ca690a..61d1426 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -82,6 +82,7 @@ typedef struct tagJoystickInfo DWORD pov; DWORD button; LONG lMin, lMax; + DWORD dZone; } JoystickInfo; static BOOL CALLBACK EnumAxes( @@ -97,13 +98,21 @@ static BOOL CALLBACK EnumAxes( IsEqualIID(&pdidoi->guidType, &GUID_RxAxis) || IsEqualIID(&pdidoi->guidType, &GUID_RyAxis) || IsEqualIID(&pdidoi->guidType, &GUID_RzAxis) || - IsEqualIID(&pdidoi->guidType, &GUID_Slider)) { + IsEqualIID(&pdidoi->guidType, &GUID_Slider)) + { DIPROPRANGE diprg; + DIPROPDWORD dipdw; + diprg.diph.dwSize = sizeof(DIPROPRANGE); diprg.diph.dwHeaderSize = sizeof(DIPROPHEADER); diprg.diph.dwHow = DIPH_BYID; diprg.diph.dwObj = pdidoi->dwType; + dipdw.diph.dwSize = sizeof(dipdw); + dipdw.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dipdw.diph.dwHow = DIPH_BYID; + dipdw.diph.dwObj = pdidoi->dwType; + hr = IDirectInputDevice_GetProperty(info->pJoystick, DIPROP_RANGE, &diprg.diph); ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() failed: %s\n", DXGetErrorString8(hr)); ok(info->lMin == diprg.lMin && info->lMax == diprg.lMax, "Min/Max range invalid: " @@ -119,6 +128,17 @@ static BOOL CALLBACK EnumAxes( hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_RANGE, &diprg.diph); ok(hr==DI_OK,"IDirectInputDevice_SetProperty() failed: %s\n", DXGetErrorString8(hr)); + /* dead zone */ + hr = IDirectInputDevice_GetProperty(info->pJoystick, DIPROP_DEADZONE, &dipdw.diph); + ok(SUCCEEDED(hr), "IDirectInputDevice_GetProperty() failed: %s\n", DXGetErrorString8(hr)); + ok(info->dZone == dipdw.dwData, "deadzone invalid: expected %d got %d\n", + info->dZone, dipdw.dwData); + + dipdw.dwData = 123; + + hr = IDirectInputDevice_SetProperty(info->pJoystick, DIPROP_DEADZONE, &dipdw.diph); + ok(hr==DI_OK,"IDirectInputDevice_SetProperty() failed: %s\n", DXGetErrorString8(hr)); + info->axis++; } else if (IsEqualIID(&pdidoi->guidType, &GUID_POV)) info->pov++; @@ -263,6 +283,7 @@ static BOOL CALLBACK EnumJoysticks( ok(hr==DI_OK,"IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); info.lMin = -2000; info.lMax = +2000; + info.dZone= 123; hr = IDirectInputDevice_EnumObjects(pJoystick, EnumAxes, (VOID*)&info, DIDFT_ALL); ok(hr==DI_OK,"IDirectInputDevice_EnumObjects() failed: %s\n", DXGetErrorString8(hr));

1 0

Clinton Stimpson : user32: WM_SETFONT on button doesn't repaint directly.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: f3bcc0c4f80e62e62b3f72367bda062bd11e258d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3bcc0c4f80e62e62b3f72367… Author: Clinton Stimpson <cjstimpson(a)utwire.net> Date: Tue Feb 6 11:10:15 2007 -0700 user32: WM_SETFONT on button doesn't repaint directly. --- dlls/user32/button.c | 2 +- dlls/user32/tests/msg.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 87fa590..b7b75fc 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -410,7 +410,7 @@ static LRESULT WINAPI ButtonWndProc_comm case WM_SETFONT: set_button_font( hWnd, (HFONT)wParam ); - if (lParam) paint_button( hWnd, btn_type, ODA_DRAWENTIRE ); + if (lParam) InvalidateRect(hWnd, NULL, TRUE); break; case WM_GETFONT: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8a21146..0ebde39 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4229,6 +4229,14 @@ static const struct message WmLButtonUpS { WM_CAPTURECHANGED, sent|wparam|defwinproc, 0 }, { 0 } }; +static const struct message WmSetFontButtonSeq[] = +{ + { WM_SETFONT, sent }, + { WM_PAINT, sent }, + { WM_ERASEBKGND, sent|defwinproc }, + { WM_CTLCOLORBTN, sent|defwinproc }, + { 0 } +}; static WNDPROC old_button_proc; @@ -4309,6 +4317,7 @@ static void test_button_messages(void) unsigned int i; HWND hwnd; DWORD dlg_code; + HFONT zfont; subclass_button(); @@ -4348,6 +4357,13 @@ static void test_button_messages(void) SendMessageA(hwnd, WM_LBUTTONUP, 0, 0); ok_sequence(WmLButtonUpSeq, "WM_LBUTTONUP on a button", FALSE); + + flush_sequence(); + zfont = (HFONT)GetStockObject(SYSTEM_FONT); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)zfont, TRUE); + UpdateWindow(hwnd); + ok_sequence(WmSetFontButtonSeq, "WM_SETFONT on a button", FALSE); + DestroyWindow(hwnd); }

1 0

Huw Davies : oleaut32: Call SearchPath before LoadLibrary so that we get the full path of native exes and dlls .
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: a09cd1b88a321751ce9dcf9a7050d2818e1b964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a09cd1b88a321751ce9dcf9a7… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 6 14:01:37 2007 +0000 oleaut32: Call SearchPath before LoadLibrary so that we get the full path of native exes and dlls. For builtin dlls prepend the system directory. --- dlls/oleaut32/typelib.c | 49 ++++++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9525ee8..4970f23 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2214,37 +2214,41 @@ static int TLB_ReadTypeLib(LPCWSTR pszFi int ret = TYPE_E_CANTLOADLIBRARY; INT index = 1; HINSTANCE hinstDLL; + LPWSTR index_str, file = (LPWSTR)pszFileName; *ppTypeLib = NULL; - lstrcpynW(pszPath, pszFileName, cchPath); - - /* first try loading as a dll and access the typelib as a resource */ - hinstDLL = LoadLibraryExW(pszFileName, 0, DONT_RESOLVE_DLL_REFERENCES | - LOAD_LIBRARY_AS_DATAFILE | LOAD_WITH_ALTERED_SEARCH_PATH); - if (!hinstDLL) + index_str = strrchrW(pszFileName, '\\'); + if(index_str && *++index_str != '\0') { - /* it may have been specified with resource index appended to the - * path, so remove it and try again */ - const WCHAR *pIndexStr = strrchrW(pszFileName, '\\'); - if(pIndexStr && pIndexStr != pszFileName && *++pIndexStr != '\0') + LPWSTR end_ptr; + long idx = strtolW(index_str, &end_ptr, 10); + if(*end_ptr == '\0') { - index = atoiW(pIndexStr); - pszPath[pIndexStr - pszFileName - 1] = '\0'; - - hinstDLL = LoadLibraryExW(pszPath, 0, DONT_RESOLVE_DLL_REFERENCES | - LOAD_LIBRARY_AS_DATAFILE | LOAD_WITH_ALTERED_SEARCH_PATH); + int str_len = index_str - pszFileName - 1; + index = idx; + file = HeapAlloc(GetProcessHeap(), 0, (str_len + 1) * sizeof(WCHAR)); + memcpy(file, pszFileName, str_len * sizeof(WCHAR)); + file[str_len] = 0; } } - /* get the path to the specified typelib file */ - if (!hinstDLL) + if(!SearchPathW(NULL, file, NULL, cchPath, pszPath, NULL)) { - /* otherwise, try loading as a regular file */ - if (!SearchPathW(NULL, pszFileName, NULL, cchPath, pszPath, NULL)) - return TYPE_E_CANTLOADLIBRARY; + if(strchrW(file, '\\')) + { + lstrcpyW(pszPath, file); + } + else + { + int len = GetSystemDirectoryW(pszPath, cchPath); + pszPath[len] = '\\'; + memcpy(pszPath + len + 1, file, (strlenW(file) + 1) * sizeof(WCHAR)); + } } + if(file != pszFileName) HeapFree(GetProcessHeap(), 0, file); + TRACE_(typelib)("File %s index %d\n", debugstr_w(pszPath), index); /* We look the path up in the typelib cache. If found, we just addref it, and return the pointer. */ @@ -2257,13 +2261,16 @@ static int TLB_ReadTypeLib(LPCWSTR pszFi *ppTypeLib = (ITypeLib2*)entry; ITypeLib_AddRef(*ppTypeLib); LeaveCriticalSection(&cache_section); - FreeLibrary(hinstDLL); return S_OK; } } LeaveCriticalSection(&cache_section); /* now actually load and parse the typelib */ + + hinstDLL = LoadLibraryExW(pszPath, 0, DONT_RESOLVE_DLL_REFERENCES | + LOAD_LIBRARY_AS_DATAFILE | LOAD_WITH_ALTERED_SEARCH_PATH); + if (hinstDLL) { static const WCHAR TYPELIBW[] = {'T','Y','P','E','L','I','B',0};

1 0

Rob Shearman : credui: Fix the order of the controls in the dialog so that the
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: aa4f89c84da915906fd6731a368ffc0e87c6a347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4f89c84da915906fd6731a3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Feb 6 16:11:06 2007 +0000 credui: Fix the order of the controls in the dialog so that the keyboard shortcuts work correctly and so that tabbing through the controls behaves as the user expects. --- dlls/credui/credui.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/credui/credui.rc b/dlls/credui/credui.rc index 7490026..0417aa5 100644 --- a/dlls/credui/credui.rc +++ b/dlls/credui/credui.rc @@ -31,12 +31,12 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_ CAPTION "Enter User Name and Password" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,7,61,50,14 - PUSHBUTTON "Cancel",IDCANCEL,67,61,50,14 LTEXT "&User Name:",IDC_STATIC,7,10,72,12,SS_CENTERIMAGE - LTEXT "&Password:",IDC_STATIC,7,27,72,12,SS_CENTERIMAGE - LTEXT "&Domain Name",IDC_STATIC,7,44,72,12,SS_CENTERIMAGE EDITTEXT IDC_USERNAME,80,10,130,12,ES_AUTOHSCROLL + LTEXT "&Password:",IDC_STATIC,7,27,72,12,SS_CENTERIMAGE EDITTEXT IDC_PASSWORD,80,27,130,12,ES_PASSWORD | ES_AUTOHSCROLL + LTEXT "&Domain Name",IDC_STATIC,7,44,72,12,SS_CENTERIMAGE EDITTEXT IDC_DOMAIN,80,44,130,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK",IDOK,7,61,50,14 + PUSHBUTTON "Cancel",IDCANCEL,67,61,50,14 END

1 0

Alexandre Julliard : widl: Use the correct type offset when freeing proxy variables.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 82b7eecf6ca11e5dc15b5afcb0f1ba810d30cd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b7eecf6ca11e5dc15b5afcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 18:01:43 2007 +0100 widl: Use the correct type offset when freeing proxy variables. --- tools/widl/proxy.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index cfe13bc..e07d2af 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -191,10 +191,9 @@ static void proxy_check_pointers( const } } -static void free_variable( const var_t *arg ) +static void free_variable( const var_t *arg, unsigned int type_offset ) { var_t *constraint; - int index = 0; /* FIXME */ type_t *type; expr_list_t *expr; @@ -202,11 +201,11 @@ static void free_variable( const var_t * if (expr) { const expr_t *size = LIST_ENTRY( list_head(expr), const expr_t, entry ); - print_proxy( "_StubMsg.MaxCount = ", arg->name ); + print_proxy( "_StubMsg.MaxCount = " ); write_expr(proxy, size, 0); fprintf(proxy, ";\n\n"); print_proxy( "NdrClearOutParameters( &_StubMsg, "); - fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], ", index ); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%u], ", type_offset ); fprintf(proxy, "(void*)%s );\n", arg->name ); return; } @@ -232,7 +231,7 @@ static void free_variable( const var_t * if( constraint ) print_proxy( "_StubMsg.MaxCount = (unsigned long) ( %s );\n",constraint->name); print_proxy( "NdrClearOutParameters( &_StubMsg, "); - fprintf(proxy, "&__MIDL_TypeFormatString.Format[%d], ", index ); + fprintf(proxy, "&__MIDL_TypeFormatString.Format[%u], ", type_offset ); fprintf(proxy, "(void*)%s );\n", arg->name ); break; @@ -241,7 +240,7 @@ static void free_variable( const var_t * } } -static void proxy_free_variables( var_list_t *args ) +static void proxy_free_variables( var_list_t *args, unsigned int type_offset ) { const var_t *arg; @@ -250,9 +249,10 @@ static void proxy_free_variables( var_li { if (is_attr(arg->attrs, ATTR_OUT)) { - free_variable( arg ); + free_variable( arg, type_offset ); fprintf(proxy, "\n"); } + type_offset += get_size_typeformatstring_var(arg); } } @@ -301,7 +301,7 @@ static void gen_proxy(type_t *iface, con print_proxy( "NdrProxyGetBuffer(This, &_StubMsg);\n" ); offset = *type_offset; - write_remoting_arguments(proxy, indent, cur, type_offset, PASS_IN, PHASE_MARSHAL); + write_remoting_arguments(proxy, indent, cur, &offset, PASS_IN, PHASE_MARSHAL); print_proxy( "NdrProxySendReceive(This, &_StubMsg);\n" ); fprintf(proxy, "\n"); @@ -314,7 +314,8 @@ static void gen_proxy(type_t *iface, con indent--; fprintf(proxy, "\n"); - write_remoting_arguments(proxy, indent, cur, &offset, PASS_OUT, PHASE_UNMARSHAL); + offset = *type_offset; + write_remoting_arguments(proxy, indent, cur, type_offset, PASS_OUT, PHASE_UNMARSHAL); if (has_ret) print_phase_basetype(proxy, indent, PHASE_UNMARSHAL, PASS_RETURN, def, "_RetVal"); @@ -334,7 +335,7 @@ static void gen_proxy(type_t *iface, con print_proxy( "{\n" ); if (has_ret) { indent++; - proxy_free_variables( cur->args ); + proxy_free_variables( cur->args, offset ); print_proxy( "_RetVal = NdrProxyErrorHandler(RpcExceptionCode());\n" ); indent--; }

1 0

Alexandre Julliard : ntdll: Clear the DebugInfo field when a shared heap critical section is made global .
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 6f2dd76750a57c7e66f7c97ad6af49f31f6e177f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2dd76750a57c7e66f7c97ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 18:02:16 2007 +0100 ntdll: Clear the DebugInfo field when a shared heap critical section is made global. --- dlls/ntdll/heap.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 2f52aec..7079054 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -664,6 +664,8 @@ static BOOL HEAP_InitSubHeap( HEAP *heap NtDuplicateObject( NtCurrentProcess(), sem, NtCurrentProcess(), &sem, 0, 0, DUP_HANDLE_MAKE_GLOBAL | DUP_HANDLE_SAME_ACCESS | DUP_HANDLE_CLOSE_SOURCE ); heap->critSection.LockSemaphore = sem; + RtlFreeHeap( processHeap, 0, heap->critSection.DebugInfo ); + heap->critSection.DebugInfo = NULL; } }

1 0

Misha Koshelev : kernel32: CreateThread returns NULL on error, not INVALID_HANDLE_VALUE.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 12e3d642dd25c89307fd123e72e010bce4454398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12e3d642dd25c89307fd123e7… Author: Misha Koshelev <mk144210(a)bcm.tmc.edu> Date: Tue Feb 6 08:41:09 2007 -0600 kernel32: CreateThread returns NULL on error, not INVALID_HANDLE_VALUE. --- dlls/kernel32/tests/change.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 0774caf..54bdffa 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -65,7 +65,7 @@ static HANDLE StartNotificationThread(LP thread = CreateThread(NULL, 0, NotificationThread, (LPVOID)change, 0, &threadId); - ok(thread != INVALID_HANDLE_VALUE, "CreateThread error: %d\n", GetLastError()); + ok(thread != NULL, "CreateThread error: %d\n", GetLastError()); return thread; }

1 0

Alexandre Julliard : widl: Take array dimensions into account when computing buffer size.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 3bfa88dc49a5044a7426590667279a35c6ce2dae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bfa88dc49a5044a742659066… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 15:55:49 2007 +0100 widl: Take array dimensions into account when computing buffer size. --- tools/widl/typegen.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c1e26ab..938764f 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1543,8 +1543,10 @@ static unsigned int get_required_buffer_ const type_t *type, int ptr_level, const array_dims_t *array, const char *name, unsigned int *alignment) { + size_t size = 0; + *alignment = 0; - if (ptr_level == 0 && !array) + if (ptr_level == 0) { switch (type->type) { @@ -1553,25 +1555,29 @@ static unsigned int get_required_buffer_ case RPC_FC_USMALL: case RPC_FC_SMALL: *alignment = 4; - return 1; + size = 1; + break; case RPC_FC_WCHAR: case RPC_FC_USHORT: case RPC_FC_SHORT: *alignment = 4; - return 2; + size = 2; + break; case RPC_FC_ULONG: case RPC_FC_LONG: case RPC_FC_FLOAT: case RPC_FC_ERROR_STATUS_T: *alignment = 4; - return 4; + size = 4; + break; case RPC_FC_HYPER: case RPC_FC_DOUBLE: *alignment = 8; - return 8; + size = 8; + break; case RPC_FC_IGNORE: case RPC_FC_BIND_PRIMITIVE: @@ -1579,7 +1585,6 @@ static unsigned int get_required_buffer_ case RPC_FC_STRUCT: { - size_t size = 0; const var_t *field; if (!type->fields) return 0; LIST_FOR_EACH_ENTRY( field, type->fields, const var_t, entry ) @@ -1589,20 +1594,21 @@ static unsigned int get_required_buffer_ field->type, field->ptr_level, field->array, field->name, &alignment); } - return size; + break; } case RPC_FC_RP: if (is_base_type( type->ref->type ) || type->ref->type == RPC_FC_STRUCT) - return get_required_buffer_size_type( type->ref, 0, NULL, name, alignment ); - return 0; + size = get_required_buffer_size_type( type->ref, 0, NULL, name, alignment ); + break; default: error("get_required_buffer_size: Unknown/unsupported type: %s (0x%02x)\n", name, type->type); return 0; } + if (array) size *= get_array_size( array ); } - return 0; + return size; } static unsigned int get_required_buffer_size(const var_t *var, unsigned int *alignment, enum pass pass)

1 0

Alexandre Julliard : widl: size_is and length_is are expression lists now.
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 3c2a9f5df8211debd2195d6bb93d0871592f9f32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2a9f5df8211debd2195d6bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 15:59:24 2007 +0100 widl: size_is and length_is are expression lists now. --- tools/widl/header.c | 10 +++++++ tools/widl/header.h | 1 + tools/widl/proxy.c | 5 ++- tools/widl/typegen.c | 73 ++++++++++++++++++++++++++++++------------------- 4 files changed, 59 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c2a9f5df8211debd2195…

1 0

Alexandre Julliard : widl: Added support for iid_is conformance descriptors .
by Alexandre Julliard 06 Feb '07

06 Feb '07

Module: wine Branch: master Commit: 936455edd72558c29720f77150892f13adb68505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=936455edd72558c29720f7715… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 6 16:00:41 2007 +0100 widl: Added support for iid_is conformance descriptors. --- tools/widl/typegen.c | 76 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 56 insertions(+), 20 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e4f9de2..72d32fc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -465,7 +465,7 @@ static size_t write_conf_or_var_desc(FIL { const var_t *var; - offset = 0; + offset = sizeof(void *); if (func->args) LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) { if (!strcmp(var->name, subexpr->u.sval)) @@ -514,6 +514,21 @@ static size_t write_conf_or_var_desc(FIL param_type = RPC_FC_ULONG; param_type_string = "FC_ULONG"; break; + case RPC_FC_RP: + case RPC_FC_UP: + case RPC_FC_OP: + case RPC_FC_FP: + if (sizeof(void *) == 4) /* FIXME */ + { + param_type = RPC_FC_LONG; + param_type_string = "FC_LONG"; + } + else + { + param_type = RPC_FC_HYPER; + param_type_string = "FC_HYPER"; + } + break; default: error("write_conf_or_var_desc: conformance variable type not supported 0x%x\n", correlation_variable_type); @@ -1313,28 +1328,49 @@ static size_t write_union_tfs(FILE *file return *typeformat_offset; } -static size_t write_ip_tfs(FILE *file, const attr_list_t *attrs, - const char *name, unsigned int *typeformat_offset) +static size_t write_ip_tfs(FILE *file, const func_t *func, const var_t *var, + unsigned int *typeformat_offset) { size_t i; size_t start_offset = *typeformat_offset; - const UUID *uuid = get_attrp(attrs, ATTR_UUID); + const var_t *iid = get_attrp(var->attrs, ATTR_IIDIS); - if (! uuid) - error("%s: interface %s missing UUID\n", __FUNCTION__, name); + if (iid) + { + expr_t expr; + expr_list_t expr_list; + + expr.type = EXPR_IDENTIFIER; + expr.ref = NULL; + expr.u.sval = iid->name; + expr.is_const = FALSE; + list_init( &expr_list ); + list_add_head( &expr_list, &expr.entry ); + print_file(file, 2, "0x2f, /* FC_IP */\n"); + print_file(file, 2, "0x5c, /* FC_PAD */\n"); + *typeformat_offset += write_conf_or_var_desc(file, func, NULL, &expr_list) + 2; + } + else + { + const type_t *base = is_ptr(var->type) ? var->type->ref : var->type; + const UUID *uuid = get_attrp(base->attrs, ATTR_UUID); - print_file(file, 2, "0x2f,\t/* FC_IP */\n"); - print_file(file, 2, "0x5a,\t/* FC_CONSTANT_IID */\n"); - print_file(file, 2, "NdrFcLong(0x%08lx),\n", uuid->Data1); - print_file(file, 2, "NdrFcShort(0x%04x),\n", uuid->Data2); - print_file(file, 2, "NdrFcShort(0x%04x),\n", uuid->Data3); - for (i = 0; i < 8; ++i) - print_file(file, 2, "0x%02x,\n", uuid->Data4[i]); + if (! uuid) + error("%s: interface %s missing UUID\n", __FUNCTION__, base->name); - if (file) - fprintf(file, "\n"); + print_file(file, 2, "0x2f,\t/* FC_IP */\n"); + print_file(file, 2, "0x5a,\t/* FC_CONSTANT_IID */\n"); + print_file(file, 2, "NdrFcLong(0x%08lx),\n", uuid->Data1); + print_file(file, 2, "NdrFcShort(0x%04x),\n", uuid->Data2); + print_file(file, 2, "NdrFcShort(0x%04x),\n", uuid->Data3); + for (i = 0; i < 8; ++i) + print_file(file, 2, "0x%02x,\n", uuid->Data4[i]); + + if (file) + fprintf(file, "\n"); - *typeformat_offset += 18; + *typeformat_offset += 18; + } return start_offset; } @@ -1351,7 +1387,7 @@ static int get_ptr_attr(const type_t *t, } } -static size_t write_typeformatstring_var(FILE *file, int indent, +static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *func, const var_t *var, unsigned int *typeformat_offset) { const type_t *type = var->type; @@ -1443,7 +1479,7 @@ static size_t write_typeformatstring_var if (base->type == RPC_FC_IP) { - return write_ip_tfs(file, base->attrs, base->name, typeformat_offset); + return write_ip_tfs(file, func, var, typeformat_offset); } /* special case for pointers to base types */ @@ -1530,7 +1566,7 @@ void write_typeformatstring(FILE *file, current_func = func; if (func->args) LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) - write_typeformatstring_var(file, indent, var, + write_typeformatstring_var(file, indent, func, var, &typeformat_offset); } } @@ -2084,7 +2120,7 @@ size_t get_size_procformatstring_func(co size_t get_size_typeformatstring_var(const var_t *var) { unsigned int type_offset = 0; - write_typeformatstring_var(NULL, 0, var, &type_offset); + write_typeformatstring_var(NULL, 0, NULL, var, &type_offset); return type_offset; }

1 0