January 2007 - Wine-Commits

Reinhard Karcher : server: Fix 0 timeout handling for serial I/O.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 41c93895b8274741b5464da873970e28feed8964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c93895b8274741b5464da87… Author: Reinhard Karcher <rkarcher(a)frey.de> Date: Mon Jan 1 17:47:04 2007 +0100 server: Fix 0 timeout handling for serial I/O. --- server/serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/serial.c b/server/serial.c index 03909d0..866547b 100644 --- a/server/serial.c +++ b/server/serial.c @@ -272,7 +272,7 @@ static void serial_queue_async( struct f } add_timeout( &when, timeout ); - if (!create_async( current, &when, queue, apc, user, iosb )) return; + if (!create_async( current, timeout ? &when : NULL, queue, apc, user, iosb )) return; /* Check if the new pending request can be served immediately */ events = check_fd_events( fd, serial_get_poll_events( fd ) );

1 0

Reinhard Karcher : user32: Speed improvement for 16bit comm support.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: dff43b732b10e603f3aee38db2f684dc7404aa4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dff43b732b10e603f3aee38db… Author: Reinhard Karcher <rkarcher(a)frey.de> Date: Mon Jan 1 17:45:06 2007 +0100 user32: Speed improvement for 16bit comm support. --- dlls/user32/comm16.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c index 9329c82..0164196 100644 --- a/dlls/user32/comm16.c +++ b/dlls/user32/comm16.c @@ -719,9 +719,8 @@ INT16 WINAPI GetCommError16(INT16 cid,LP stol = (unsigned char *)COM[cid].unknown + COMM_MSR_OFFSET; COMM_MSRUpdate( ptr->handle, stol ); - if (lpStat) { - lpStat->status = 0; - + if (lpStat) { + lpStat->status = 0; SleepEx(1,TRUE); lpStat->cbOutQue = comm_outbuf(ptr);

1 0

Reinhard Karcher : ntdll: Fix DTR and CTS controls in serial code.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 64c1c017c4f30a16ba75e076438f3ceaba3d6e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c1c017c4f30a16ba75e0764… Author: Reinhard Karcher <rkarcher(a)frey.de> Date: Mon Jan 1 17:41:52 2007 +0100 ntdll: Fix DTR and CTS controls in serial code. --- dlls/ntdll/serial.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index fe5111b..750b750 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -595,13 +595,13 @@ static NTSTATUS set_handflow(int fd, con if (shf->ControlHandShake & SERIAL_DTR_HANDSHAKE) { WARN("DSR/DTR flow control not supported\n"); - } else if (shf->ControlHandShake & SERIAL_DTR_CONTROL) + } else if (!(shf->ControlHandShake & SERIAL_DTR_CONTROL)) whack_modem(fd, ~TIOCM_DTR, 0); - else + else whack_modem(fd, 0, TIOCM_DTR); #endif #ifdef TIOCM_RTS - if (!(shf->ControlHandShake & SERIAL_DSR_HANDSHAKE)) + if (!(shf->ControlHandShake & SERIAL_CTS_HANDSHAKE)) { if ((shf->FlowReplace & (SERIAL_RTS_CONTROL|SERIAL_RTS_HANDSHAKE)) == 0) whack_modem(fd, ~TIOCM_RTS, 0);

1 0

Mike McCormack : kernel32: Store resources to be updated in a tree.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 9196a3720124c78242f214e2b1433256a635db48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9196a3720124c78242f214e2b… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Jan 3 17:32:52 2007 +0900 kernel32: Store resources to be updated in a tree. --- dlls/kernel32/resource.c | 191 +++++++++++++++++++++++++++++++++++++++- dlls/kernel32/tests/resource.c | 6 +- 2 files changed, 190 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index c817fcb..23833f5 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -616,16 +616,200 @@ DWORD WINAPI SizeofResource( HINSTANCE h return ((PIMAGE_RESOURCE_DATA_ENTRY)hRsrc)->Size; } +/* + * Data structure for updating resources. + * Type/Name/Language is a keyset for accessing resource data. + * + * QUEUEDUPDATES (root) -> + * list of struct resouce_dir_entry (Type) -> + * list of struct resouce_dir_entry (Name) -> + * list of struct resouce_data Language + Data + */ + typedef struct { LPWSTR pFileName; + struct list root; } QUEUEDUPDATES; +/* this structure is shared for types and names */ +struct resource_dir_entry { + struct list entry; + LPWSTR id; + struct list children; +}; + +/* this structure is the leaf */ +struct resource_data { + struct list entry; + LANGID lang; + DWORD codepage; + DWORD cbData; + BYTE data[1]; +}; + +int resource_strcmp( LPCWSTR a, LPCWSTR b ) +{ + if ( a == b ) + return 0; + if (HIWORD( a ) && HIWORD( b ) ) + return lstrcmpW( a, b ); + /* strings come before ids */ + if (HIWORD( a ) && !HIWORD( b )) + return -1; + if (HIWORD( b ) && !HIWORD( a )) + return 1; + return ( a < b ) ? -1 : 1; +} + +struct resource_dir_entry *find_resource_dir_entry( struct list *dir, LPCWSTR id ) +{ + struct resource_dir_entry *ent; + + /* match either IDs or strings */ + LIST_FOR_EACH_ENTRY( ent, dir, struct resource_dir_entry, entry ) + if (!resource_strcmp( id, ent->id )) + return ent; + + return NULL; +} + +struct resource_data *find_resource_data( struct list *dir, LANGID lang ) +{ + struct resource_data *res_data; + + /* match only languages here */ + LIST_FOR_EACH_ENTRY( res_data, dir, struct resource_data, entry ) + if ( lang == res_data->lang ) + return res_data; + + return NULL; +} + +void add_resource_dir_entry( struct list *dir, struct resource_dir_entry *resdir ) +{ + struct resource_dir_entry *ent; + + LIST_FOR_EACH_ENTRY( ent, dir, struct resource_dir_entry, entry ) + { + if (0>resource_strcmp( ent->id, resdir->id )) + continue; + + list_add_before( &ent->entry, &resdir->entry ); + return; + } + list_add_tail( dir, &resdir->entry ); +} + +void add_resource_data_entry( struct list *dir, struct resource_data *resdata ) +{ + struct resource_data *ent; + + LIST_FOR_EACH_ENTRY( ent, dir, struct resource_data, entry ) + { + if (ent->lang < resdata->lang) + continue; + + list_add_before( &ent->entry, &resdata->entry ); + return; + } + list_add_tail( dir, &resdata->entry ); +} + +LPWSTR res_strdupW( LPCWSTR str ) +{ + LPWSTR ret; + UINT len; + + if (HIWORD(str) == 0) + return (LPWSTR) (UINT_PTR) LOWORD(str); + len = (lstrlenW( str ) + 1) * sizeof (WCHAR); + ret = HeapAlloc( GetProcessHeap(), 0, len ); + memcpy( ret, str, len ); + return ret; +} + +void res_free_str( LPWSTR str ) +{ + if (HIWORD(str)) + HeapFree( GetProcessHeap(), 0, str ); +} + BOOL update_add_resource( QUEUEDUPDATES *updates, LPCWSTR Type, LPCWSTR Name, WORD Language, DWORD codepage, LPCVOID lpData, DWORD cbData ) { - FIXME("%p %s %s %04x %p %d bytes\n", updates, debugstr_w(Type), debugstr_w(Name), Language, lpData, cbData); - return FALSE; + struct resource_dir_entry *restype, *resname; + struct resource_data *resdata; + + TRACE("%p %s %s %04x %04x %p %d bytes\n", updates, debugstr_w(Type), debugstr_w(Name), Language, codepage, lpData, cbData); + + if (!lpData || !cbData) + return FALSE; + + restype = find_resource_dir_entry( &updates->root, Type ); + if (!restype) + { + restype = HeapAlloc( GetProcessHeap(), 0, sizeof *restype ); + restype->id = res_strdupW( Type ); + list_init( &restype->children ); + add_resource_dir_entry( &updates->root, restype ); + } + + resname = find_resource_dir_entry( &restype->children, Name ); + if (!resname) + { + resname = HeapAlloc( GetProcessHeap(), 0, sizeof *resname ); + resname->id = res_strdupW( Name ); + list_init( &resname->children ); + add_resource_dir_entry( &restype->children, resname ); + } + + /* + * If there's an existing resource entry with matching (Type,Name,Language) + * it needs to be removed before adding the new data. + */ + resdata = find_resource_data( &resname->children, Language ); + if (resdata) + { + list_remove( &resdata->entry ); + HeapFree( GetProcessHeap(), 0, resdata ); + } + + resdata = HeapAlloc( GetProcessHeap(), 0, sizeof *resdata + cbData ); + resdata->lang = Language; + resdata->codepage = codepage; + resdata->cbData = cbData; + memcpy( resdata->data, lpData, cbData ); + + add_resource_data_entry( &resname->children, resdata ); + + return TRUE; +} + +void free_resource_directory( struct list *head, int level ) +{ + struct list *ptr = NULL; + + while ((ptr = list_head( head ))) + { + list_remove( ptr ); + if (level) + { + struct resource_dir_entry *ent; + + ent = LIST_ENTRY( ptr, struct resource_dir_entry, entry ); + res_free_str( ent->id ); + free_resource_directory( &ent->children, level - 1 ); + HeapFree(GetProcessHeap(), 0, ent); + } + else + { + struct resource_data *data; + + data = LIST_ENTRY( ptr, struct resource_data, entry ); + HeapFree( GetProcessHeap(), 0, data ); + } + } } IMAGE_NT_HEADERS *get_nt_header( void *base, DWORD mapping_size ) @@ -740,6 +924,7 @@ HANDLE WINAPI BeginUpdateResourceW( LPCW updates = GlobalLock(hUpdate); if (updates) { + list_init( &updates->root ); updates->pFileName = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(pFileName)+1)*sizeof(WCHAR)); if (updates->pFileName) { @@ -797,6 +982,8 @@ BOOL WINAPI EndUpdateResourceW( HANDLE h ret = fDiscard || write_raw_resources( updates ); + free_resource_directory( &updates->root, 2 ); + HeapFree( GetProcessHeap(), 0, updates->pFileName ); GlobalUnlock( hUpdate ); GlobalFree( hUpdate ); diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 0c84757..9a26a12 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -178,7 +178,6 @@ void update_resources_version(void) res = BeginUpdateResource( filename, TRUE ); ok( res != NULL, "BeginUpdateResource failed\n"); - todo_wine { memset( &hdr, 0, sizeof hdr ); r = UpdateResource( res, RT_VERSION, @@ -186,7 +185,6 @@ void update_resources_version(void) MAKELANGID(LANG_ENGLISH, SUBLANG_NEUTRAL), &hdr, sizeof hdr ); ok( r, "UpdateResouce failed\n"); - } r = UpdateResource( res, MAKEINTRESOURCE(0x1230), @@ -195,7 +193,6 @@ void update_resources_version(void) NULL, 0 ); ok( r == FALSE, "UpdateResouce failed\n"); - todo_wine { r = UpdateResource( res, MAKEINTRESOURCE(0x1230), MAKEINTRESOURCE(0x4567), @@ -204,8 +201,7 @@ void update_resources_version(void) ok( r == TRUE, "UpdateResouce failed\n"); r = EndUpdateResource( res, FALSE ); - ok( r, "EndUpdateResouce failed\n"); - } + todo_wine ok( r, "EndUpdateResouce failed\n"); }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarImp.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 1c85155eaac6ab8ad6a6f3cbdfcac8bd833d940f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c85155eaac6ab8ad6a6f3cbd… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:56:15 2007 -0500 oleaut32: Support for VT_DISPATCH in VarImp. --- dlls/oleaut32/variant.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b3d1906..03c1537 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5623,6 +5623,29 @@ HRESULT WINAPI VarImp(LPVARIANT left, LP VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; VARIANT lv,rv; double d; + VARIANT tempLeft, tempRight; + + VariantInit(&lv); + VariantInit(&rv); + VariantInit(&tempLeft); + VariantInit(&tempRight); + + TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), + debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(left, &tempLeft); + if (FAILED(hres)) goto VarImp_Exit; + left = &tempLeft; + } + if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH) + { + hres = VARIANT_FetchDispatchValue(right, &tempRight); + if (FAILED(hres)) goto VarImp_Exit; + right = &tempRight; + } leftvt = V_VT(left)&VT_TYPEMASK; rightvt = V_VT(right)&VT_TYPEMASK; @@ -5630,25 +5653,29 @@ HRESULT WINAPI VarImp(LPVARIANT left, LP rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); if (leftExtraFlags != rightExtraFlags) - return DISP_E_BADVARTYPE; + { + hres = DISP_E_BADVARTYPE; + goto VarImp_Exit; + } ExtraFlags = leftExtraFlags; - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); - /* Native VarImp always returns a error when using any extra * flags or if the variants are I8 and INT. */ if ((leftvt == VT_I8 && rightvt == VT_INT) || ExtraFlags != 0) - return DISP_E_BADVARTYPE; + { + hres = DISP_E_BADVARTYPE; + goto VarImp_Exit; + } /* Determine result type */ else if ((leftvt == VT_NULL && rightvt == VT_NULL) || (leftvt == VT_NULL && rightvt == VT_EMPTY)) { V_VT(result) = VT_NULL; - return S_OK; + hres = S_OK; + goto VarImp_Exit; } else if (leftvt == VT_I8 || rightvt == VT_I8) resvt = VT_I8; @@ -5677,9 +5704,6 @@ HRESULT WINAPI VarImp(LPVARIANT left, LP leftvt == VT_BSTR || rightvt == VT_BSTR) resvt = VT_BOOL; - VariantInit(&lv); - VariantInit(&rv); - /* VT_NULL requires special handling for when the opposite * variant is equal to something other than -1. * (NULL Imp 0 = NULL, NULL Imp n = n) @@ -5824,6 +5848,8 @@ VarImp_Exit: VariantClear(&lv); VariantClear(&rv); + VariantClear(&tempLeft); + VariantClear(&tempRight); return hres; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarPow.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: e02b224d57a4c97946f966ef0ef4f0193b685e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02b224d57a4c97946f966ef0… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:55:39 2007 -0500 oleaut32: Support for VT_DISPATCH in VarPow. --- dlls/oleaut32/variant.c | 51 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 239f975..b3d1906 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5502,17 +5502,34 @@ end: */ HRESULT WINAPI VarPow(LPVARIANT left, LPVARIANT right, LPVARIANT result) { - HRESULT hr; + HRESULT hr = S_OK; VARIANT dl,dr; VARTYPE resvt = VT_EMPTY; VARTYPE leftvt,rightvt; VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; + VARIANT tempLeft, tempRight; TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); VariantInit(&dl); VariantInit(&dr); + VariantInit(&tempLeft); + VariantInit(&tempRight); + + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) + { + hr = VARIANT_FetchDispatchValue(left, &tempLeft); + if (FAILED(hr)) goto end; + left = &tempLeft; + } + if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH) + { + hr = VARIANT_FetchDispatchValue(right, &tempRight); + if (FAILED(hr)) goto end; + right = &tempRight; + } leftvt = V_VT(left)&VT_TYPEMASK; rightvt = V_VT(right)&VT_TYPEMASK; @@ -5520,17 +5537,24 @@ HRESULT WINAPI VarPow(LPVARIANT left, LP rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); if (leftExtraFlags != rightExtraFlags) - return DISP_E_BADVARTYPE; + { + hr = DISP_E_BADVARTYPE; + goto end; + } ExtraFlags = leftExtraFlags; /* Native VarPow always returns a error when using any extra flags */ if (ExtraFlags != 0) - return DISP_E_BADVARTYPE; + { + hr = DISP_E_BADVARTYPE; + goto end; + } /* Determine return type */ else if (leftvt == VT_NULL || rightvt == VT_NULL) { V_VT(result) = VT_NULL; - return S_OK; + hr = S_OK; + goto end; } else if ((leftvt == VT_EMPTY || leftvt == VT_I2 || leftvt == VT_I4 || leftvt == VT_R4 || @@ -5546,30 +5570,35 @@ HRESULT WINAPI VarPow(LPVARIANT left, LP (rightvt >= VT_I1 && rightvt <= VT_UINT))) resvt = VT_R8; else - return DISP_E_BADVARTYPE; + { + hr = DISP_E_BADVARTYPE; + goto end; + } hr = VariantChangeType(&dl,left,0,resvt); if (!SUCCEEDED(hr)) { ERR("Could not change passed left argument to VT_R8, handle it differently.\n"); - VariantClear(&dl); - return E_FAIL; + hr = E_FAIL; + goto end; } hr = VariantChangeType(&dr,right,0,resvt); if (!SUCCEEDED(hr)) { ERR("Could not change passed right argument to VT_R8, handle it differently.\n"); - VariantClear(&dl); - VariantClear(&dr); - return E_FAIL; + hr = E_FAIL; + goto end; } V_VT(result) = VT_R8; V_R8(result) = pow(V_R8(&dl),V_R8(&dr)); +end: VariantClear(&dl); VariantClear(&dr); + VariantClear(&tempLeft); + VariantClear(&tempRight); - return S_OK; + return hr; } /**********************************************************************

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarMod.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 90844e2067322fb9a4a3997596e99f83e3fbaa06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90844e2067322fb9a4a399759… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:55:01 2007 -0500 oleaut32: Support for VT_DISPATCH in VarMod. --- dlls/oleaut32/variant.c | 84 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 61 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 7233ef9..239f975 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5264,13 +5264,30 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP HRESULT rc = E_FAIL; int resT = 0; VARIANT lv,rv; + VARIANT tempLeft, tempRight; + VariantInit(&tempLeft); + VariantInit(&tempRight); VariantInit(&lv); VariantInit(&rv); TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(left) & VT_TYPEMASK) == VT_DISPATCH) + { + rc = VARIANT_FetchDispatchValue(left, &tempLeft); + if (FAILED(rc)) goto end; + left = &tempLeft; + } + if ((V_VT(right) & VT_TYPEMASK) == VT_DISPATCH) + { + rc = VARIANT_FetchDispatchValue(right, &tempRight); + if (FAILED(rc)) goto end; + right = &tempRight; + } + /* check for invalid inputs */ lOk = TRUE; switch (V_VT(left) & VT_TYPEMASK) { @@ -5296,17 +5313,21 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP case VT_VARIANT: case VT_UNKNOWN: V_VT(result) = VT_EMPTY; - return DISP_E_TYPEMISMATCH; + rc = DISP_E_TYPEMISMATCH; + goto end; case VT_ERROR: - return DISP_E_TYPEMISMATCH; + rc = DISP_E_TYPEMISMATCH; + goto end; case VT_RECORD: V_VT(result) = VT_EMPTY; - return DISP_E_TYPEMISMATCH; + rc = DISP_E_TYPEMISMATCH; + goto end; case VT_NULL: break; default: V_VT(result) = VT_EMPTY; - return DISP_E_BADVARTYPE; + rc = DISP_E_BADVARTYPE; + goto end; } @@ -5320,13 +5341,15 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP if((V_VT(left) == VT_INT) && (V_VT(right) == VT_I8)) { V_VT(result) = VT_EMPTY; - return DISP_E_TYPEMISMATCH; + rc = DISP_E_TYPEMISMATCH; + goto end; } case VT_INT : if((V_VT(right) == VT_INT) && (V_VT(left) == VT_I8)) { V_VT(result) = VT_EMPTY; - return DISP_E_TYPEMISMATCH; + rc = DISP_E_TYPEMISMATCH; + goto end; } case VT_UI1 : case VT_UI2 : @@ -5339,7 +5362,8 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP if(V_VT(left) == VT_EMPTY) { V_VT(result) = VT_I4; - return S_OK; + rc = S_OK; + goto end; } case VT_EMPTY: case VT_DATE : @@ -5347,53 +5371,61 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP if(V_VT(left) == VT_ERROR) { V_VT(result) = VT_EMPTY; - return DISP_E_TYPEMISMATCH; + rc = DISP_E_TYPEMISMATCH; + goto end; } case VT_BSTR: if(V_VT(left) == VT_NULL) { V_VT(result) = VT_NULL; - return S_OK; + rc = S_OK; + goto end; } break; case VT_VOID: V_VT(result) = VT_EMPTY; - return DISP_E_BADVARTYPE; + rc = DISP_E_BADVARTYPE; + goto end; case VT_NULL: if(V_VT(left) == VT_VOID) { V_VT(result) = VT_EMPTY; - return DISP_E_BADVARTYPE; + rc = DISP_E_BADVARTYPE; } else if((V_VT(left) == VT_NULL) || (V_VT(left) == VT_EMPTY) || (V_VT(left) == VT_ERROR) || lOk) { V_VT(result) = VT_NULL; - return S_OK; + rc = S_OK; } else { V_VT(result) = VT_NULL; - return DISP_E_BADVARTYPE; + rc = DISP_E_BADVARTYPE; } + goto end; case VT_VARIANT: case VT_UNKNOWN: V_VT(result) = VT_EMPTY; - return DISP_E_TYPEMISMATCH; + rc = DISP_E_TYPEMISMATCH; + goto end; case VT_ERROR: - return DISP_E_TYPEMISMATCH; + rc = DISP_E_TYPEMISMATCH; + goto end; case VT_RECORD: if((V_VT(left) == 15) || ((V_VT(left) >= 24) && (V_VT(left) <= 35)) || !lOk) { V_VT(result) = VT_EMPTY; - return DISP_E_BADVARTYPE; + rc = DISP_E_BADVARTYPE; } else { V_VT(result) = VT_EMPTY; - return DISP_E_TYPEMISMATCH; + rc = DISP_E_TYPEMISMATCH; } + goto end; default: V_VT(result) = VT_EMPTY; - return DISP_E_BADVARTYPE; + rc = DISP_E_BADVARTYPE; + goto end; } /* determine the result type */ @@ -5414,21 +5446,22 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP if(FAILED(rc)) { FIXME("Could not convert left type %d to %d? rc == 0x%X\n", V_VT(left), VT_I8, rc); - return rc; + goto end; } rc = VariantChangeType(&rv, right, 0, VT_I8); if(FAILED(rc)) { FIXME("Could not convert right type %d to %d? rc == 0x%X\n", V_VT(right), VT_I8, rc); - return rc; + goto end; } /* if right is zero set VT_EMPTY and return divide by zero */ if(V_I8(&rv) == 0) { V_VT(result) = VT_EMPTY; - return DISP_E_DIVBYZERO; + rc = DISP_E_DIVBYZERO; + goto end; } /* perform the modulo operation */ @@ -5442,10 +5475,15 @@ HRESULT WINAPI VarMod(LPVARIANT left, LP if(FAILED(rc)) { FIXME("Could not convert 0x%x to %d?\n", V_VT(result), resT); - return rc; + /* fall to end of function */ } - return S_OK; +end: + VariantClear(&lv); + VariantClear(&rv); + VariantClear(&tempLeft); + VariantClear(&tempRight); + return rc; } /**********************************************************************

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarIdiv.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: cdceb02319238a2bcbb337d69d3497847164663d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdceb02319238a2bcbb337d69… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:54:20 2007 -0500 oleaut32: Support for VT_DISPATCH in VarIdiv. --- dlls/oleaut32/variant.c | 50 ++++++++++++++++++++++++++-------------------- 1 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 2a90b06..7233ef9 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5109,6 +5109,15 @@ HRESULT WINAPI VarIdiv(LPVARIANT left, L VARTYPE leftvt,rightvt; VARTYPE rightExtraFlags,leftExtraFlags,ExtraFlags; VARIANT lv,rv; + VARIANT tempLeft, tempRight; + + TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), + debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); + + VariantInit(&lv); + VariantInit(&rv); + VariantInit(&tempLeft); + VariantInit(&tempRight); leftvt = V_VT(left)&VT_TYPEMASK; rightvt = V_VT(right)&VT_TYPEMASK; @@ -5116,12 +5125,12 @@ HRESULT WINAPI VarIdiv(LPVARIANT left, L rightExtraFlags = V_VT(right)&(~VT_TYPEMASK); if (leftExtraFlags != rightExtraFlags) - return DISP_E_BADVARTYPE; + { + hres = DISP_E_BADVARTYPE; + goto end; + } ExtraFlags = leftExtraFlags; - TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", left, debugstr_VT(left), - debugstr_VF(left), right, debugstr_VT(right), debugstr_VF(right), result); - /* Native VarIdiv always returns a error when using any extra * flags or if the variant combination is I8 and INT. */ @@ -5129,13 +5138,17 @@ HRESULT WINAPI VarIdiv(LPVARIANT left, L (leftvt == VT_INT && rightvt == VT_I8) || (rightvt == VT_EMPTY && leftvt != VT_NULL) || ExtraFlags != 0) - return DISP_E_BADVARTYPE; + { + hres = DISP_E_BADVARTYPE; + goto end; + } /* Determine variant type */ else if (leftvt == VT_NULL || rightvt == VT_NULL) { V_VT(result) = VT_NULL; - return S_OK; + hres = S_OK; + goto end; } else if (leftvt == VT_I8 || rightvt == VT_I8) resvt = VT_I8; @@ -5160,26 +5173,16 @@ HRESULT WINAPI VarIdiv(LPVARIANT left, L else if (leftvt == VT_UI1 || rightvt == VT_UI1) resvt = VT_UI1; else - return DISP_E_BADVARTYPE; - - VariantInit(&lv); - VariantInit(&rv); + { + hres = DISP_E_BADVARTYPE; + goto end; + } /* coerce to the result type */ hres = VariantChangeType(&lv, left, 0, resvt); - if (hres != S_OK) - { - VariantClear(&lv); - VariantClear(&rv); - return hres; - } + if (hres != S_OK) goto end; hres = VariantChangeType(&rv, right, 0, resvt); - if (hres != S_OK) - { - VariantClear(&lv); - VariantClear(&rv); - return hres; - } + if (hres != S_OK) goto end; /* do the math */ V_VT(result) = resvt; @@ -5226,8 +5229,11 @@ HRESULT WINAPI VarIdiv(LPVARIANT left, L leftvt,rightvt); } +end: VariantClear(&lv); VariantClear(&rv); + VariantClear(&tempLeft); + VariantClear(&tempRight); return hres; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarOr.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: e98a49dee469cf1257c13c77147c4424a1f928f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e98a49dee469cf1257c13c771… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:52:52 2007 -0500 oleaut32: Support for VT_DISPATCH in VarOr. --- dlls/oleaut32/variant.c | 90 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 70 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 7a7909e..318ebfc 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3960,16 +3960,40 @@ HRESULT WINAPI VarOr(LPVARIANT pVarLeft, VARTYPE vt = VT_I4; VARIANT varLeft, varRight, varStr; HRESULT hRet; + VARIANT tempLeft, tempRight; + + VariantInit(&tempLeft); + VariantInit(&tempRight); + VariantInit(&varLeft); + VariantInit(&varRight); + VariantInit(&varStr); TRACE("(%p->(%s%s),%p->(%s%s),%p)\n", pVarLeft, debugstr_VT(pVarLeft), debugstr_VF(pVarLeft), pVarRight, debugstr_VT(pVarRight), debugstr_VF(pVarRight), pVarOut); + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(pVarLeft) & VT_TYPEMASK) == VT_DISPATCH) + { + hRet = VARIANT_FetchDispatchValue(pVarLeft, &tempLeft); + if (FAILED(hRet)) goto VarOr_Exit; + pVarLeft = &tempLeft; + } + if ((V_VT(pVarRight) & VT_TYPEMASK) == VT_DISPATCH) + { + hRet = VARIANT_FetchDispatchValue(pVarRight, &tempRight); + if (FAILED(hRet)) goto VarOr_Exit; + pVarRight = &tempRight; + } + if (V_EXTRA_TYPE(pVarLeft) || V_EXTRA_TYPE(pVarRight) || V_VT(pVarLeft) == VT_UNKNOWN || V_VT(pVarRight) == VT_UNKNOWN || V_VT(pVarLeft) == VT_DISPATCH || V_VT(pVarRight) == VT_DISPATCH || V_VT(pVarLeft) == VT_RECORD || V_VT(pVarRight) == VT_RECORD) - return DISP_E_BADVARTYPE; + { + hRet = DISP_E_BADVARTYPE; + goto VarOr_Exit; + } V_VT(&varLeft) = V_VT(&varRight) = V_VT(&varStr) = VT_EMPTY; @@ -3987,49 +4011,62 @@ HRESULT WINAPI VarOr(LPVARIANT pVarLeft, case VT_DATE: case VT_R8: if (V_R8(pVarLeft)) goto VarOr_AsEmpty; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_BOOL: if (V_BOOL(pVarLeft)) *pVarOut = *pVarLeft; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_I2: case VT_UI2: if (V_I2(pVarLeft)) goto VarOr_AsEmpty; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_I1: if (V_I1(pVarLeft)) goto VarOr_AsEmpty; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_UI1: if (V_UI1(pVarLeft)) *pVarOut = *pVarLeft; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_R4: if (V_R4(pVarLeft)) goto VarOr_AsEmpty; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_I4: case VT_UI4: case VT_INT: case VT_UINT: if (V_I4(pVarLeft)) goto VarOr_AsEmpty; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_CY: if (V_CY(pVarLeft).int64) goto VarOr_AsEmpty; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_I8: case VT_UI8: if (V_I8(pVarLeft)) goto VarOr_AsEmpty; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_DECIMAL: if (DEC_HI32(&V_DECIMAL(pVarLeft)) || DEC_LO64(&V_DECIMAL(pVarLeft))) goto VarOr_AsEmpty; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; case VT_BSTR: { VARIANT_BOOL b; if (!V_BSTR(pVarLeft)) - return DISP_E_BADVARTYPE; + { + hRet = DISP_E_BADVARTYPE; + goto VarOr_Exit; + } hRet = VarBoolFromStr(V_BSTR(pVarLeft), LOCALE_USER_DEFAULT, VAR_LOCALBOOL, &b); if (SUCCEEDED(hRet) && b) @@ -4037,13 +4074,15 @@ HRESULT WINAPI VarOr(LPVARIANT pVarLeft, V_VT(pVarOut) = VT_BOOL; V_BOOL(pVarOut) = b; } - return hRet; + goto VarOr_Exit; } case VT_NULL: case VT_EMPTY: V_VT(pVarOut) = VT_NULL; - return S_OK; + hRet = S_OK; + goto VarOr_Exit; default: - return DISP_E_BADVARTYPE; + hRet = DISP_E_BADVARTYPE; + goto VarOr_Exit; } } @@ -4061,7 +4100,10 @@ VarOr_AsEmpty: { case VT_BSTR: if (!V_BSTR(pVarLeft)) - return DISP_E_BADVARTYPE; + { + hRet = DISP_E_BADVARTYPE; + goto VarOr_Exit; + } hRet = VariantCopy(&varStr, pVarLeft); if (FAILED(hRet)) @@ -4083,7 +4125,8 @@ VarOr_AsEmpty: V_VT(pVarOut) = VT_I8; break; default: - return DISP_E_BADVARTYPE; + hRet = DISP_E_BADVARTYPE; + goto VarOr_Exit; } hRet = VariantCopy(&varLeft, pVarLeft); if (FAILED(hRet)) @@ -4097,14 +4140,16 @@ VarOr_AsEmpty: { V_VT(pVarOut) = VT_BOOL; V_BOOL(pVarOut) = V_BOOL(pVarLeft) | V_BOOL(pVarRight); - return S_OK; + hRet = S_OK; + goto VarOr_Exit; } if (V_VT(pVarLeft) == VT_UI1 && V_VT(pVarRight) == VT_UI1) { V_VT(pVarOut) = VT_UI1; V_UI1(pVarOut) = V_UI1(pVarLeft) | V_UI1(pVarRight); - return S_OK; + hRet = S_OK; + goto VarOr_Exit; } if (V_VT(pVarLeft) == VT_BSTR) @@ -4133,7 +4178,10 @@ VarOr_AsEmpty: else if (V_VT(pVarLeft) == VT_I8 || V_VT(pVarRight) == VT_I8) { if (V_VT(pVarLeft) == VT_INT || V_VT(pVarRight) == VT_INT) - return DISP_E_TYPEMISMATCH; + { + hRet = DISP_E_TYPEMISMATCH; + goto VarOr_Exit; + } vt = VT_I8; } @@ -4193,6 +4241,8 @@ VarOr_Exit: VariantClear(&varStr); VariantClear(&varLeft); VariantClear(&varRight); + VariantClear(&tempLeft); + VariantClear(&tempRight); return hRet; }

1 0

Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarXor.
by Alexandre Julliard Jan. 3, 2007

Jan. 3, 2007

Module: wine Branch: master Commit: 5aacee9550cac739ad7ae43e527dd29fade4668f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aacee9550cac739ad7ae43e5… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Tue Jan 2 18:53:37 2007 -0500 oleaut32: Support for VT_DISPATCH in VarXor. --- dlls/oleaut32/variant.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 318ebfc..2a90b06 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -4520,6 +4520,7 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft { VARTYPE vt; VARIANT varLeft, varRight; + VARIANT tempLeft, tempRight; double d; HRESULT hRet; @@ -4542,6 +4543,23 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft return S_OK; } + VariantInit(&tempLeft); + VariantInit(&tempRight); + + /* Handle VT_DISPATCH by storing and taking address of returned value */ + if ((V_VT(pVarLeft) & VT_TYPEMASK) == VT_DISPATCH) + { + hRet = VARIANT_FetchDispatchValue(pVarLeft, &tempLeft); + if (FAILED(hRet)) goto VarXor_Exit; + pVarLeft = &tempLeft; + } + if ((V_VT(pVarRight) & VT_TYPEMASK) == VT_DISPATCH) + { + hRet = VARIANT_FetchDispatchValue(pVarRight, &tempRight); + if (FAILED(hRet)) goto VarXor_Exit; + pVarRight = &tempRight; + } + /* Copy our inputs so we don't disturb anything */ V_VT(&varLeft) = V_VT(&varRight) = VT_EMPTY; @@ -4576,7 +4594,10 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft if (V_VT(&varLeft) == VT_I8 || V_VT(&varRight) == VT_I8) { if (V_VT(pVarLeft) == VT_INT || V_VT(pVarRight) == VT_INT) - return DISP_E_TYPEMISMATCH; + { + hRet = DISP_E_TYPEMISMATCH; + goto VarXor_Exit; + } vt = VT_I8; } else @@ -4654,6 +4675,8 @@ HRESULT WINAPI VarXor(LPVARIANT pVarLeft VarXor_Exit: VariantClear(&varLeft); VariantClear(&varRight); + VariantClear(&tempLeft); + VariantClear(&tempRight); return hRet; }

1 0